Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2023-08-11 06:01:25 +00:00 committed by GitHub
commit b4856800a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
90 changed files with 1736 additions and 690 deletions

View file

@ -644,6 +644,11 @@
githubId = 43479487;
name = "Titouan Biteau";
};
albertchae = {
github = "albertchae";
githubId = 217050;
name = "Albert Chae";
};
aldoborrero = {
email = "aldoborrero+nixos@pm.me";
github = "aldoborrero";
@ -1722,6 +1727,11 @@
githubId = 135230;
name = "Aycan iRiCAN";
};
aynish = {
github = "Chickensoupwithrice";
githubId = 22575913;
name = "Anish Lakhwara";
};
azahi = {
name = "Azat Bahawi";
email = "azat@bahawi.net";
@ -4323,6 +4333,11 @@
githubId = 997543;
name = "Dmitry Malikov";
};
DMills27 = {
github = "DMills27";
githubId = 5251658;
name = "Dominic Mills";
};
DmitryTsygankov = {
email = "dmitry.tsygankov@gmail.com";
github = "DmitryTsygankov";

View file

@ -732,6 +732,7 @@ with lib.maintainers; {
fridh
hexa
jonringer
tjni
];
scope = "Maintain the Python interpreter and related packages.";
shortName = "Python";

View file

@ -697,7 +697,7 @@ let
session required ${config.systemd.package}/lib/security/pam_systemd_home.so
'' +
optionalString cfg.makeHomeDir ''
session required ${pkgs.pam}/lib/security/pam_mkhomedir.so silent skel=${config.security.pam.makeHomeDir.skelDirectory} umask=0077
session required ${pkgs.pam}/lib/security/pam_mkhomedir.so silent skel=${config.security.pam.makeHomeDir.skelDirectory} umask=${config.security.pam.makeHomeDir.umask}
'' +
optionalString cfg.updateWtmp ''
session required ${pkgs.pam}/lib/security/pam_lastlog.so silent
@ -902,6 +902,16 @@ in
'';
};
security.pam.makeHomeDir.umask = mkOption {
type = types.str;
default = "0077";
example = "0022";
description = lib.mdDoc ''
The user file mode creation mask to use on home directories
newly created by `pam_mkhomedir`.
'';
};
security.pam.enableSSHAgentAuth = mkOption {
type = types.bool;
default = false;

View file

@ -153,6 +153,18 @@ in {
type = types.bool;
};
processAgentPackage = mkOption {
default = pkgs.datadog-process-agent;
defaultText = literalExpression "pkgs.datadog-process-agent";
description = lib.mdDoc ''
Which DataDog v7 agent package to use. Note that the provided
package is expected to have an overridable `pythonPackages`-attribute
which configures the Python environment with the Datadog
checks.
'';
type = types.package;
};
enableTraceAgent = mkOption {
description = lib.mdDoc ''
Whether to enable the trace agent.
@ -270,7 +282,7 @@ in {
path = [ ];
script = ''
export DD_API_KEY=$(head -n 1 ${cfg.apiKeyFile})
${pkgs.datadog-process-agent}/bin/process-agent --config /etc/datadog-agent/datadog.yaml
${cfg.processAgentPackage}/bin/process-agent --config /etc/datadog-agent/datadog.yaml
'';
});

View file

@ -20,8 +20,8 @@ in
unitConfig = {
Description = "dae Service";
Documentation = "https://github.com/daeuniverse/dae";
After = [ "network.target" "systemd-sysctl.service" ];
Wants = [ "network.target" ];
After = [ "network-online.target" "systemd-sysctl.service" ];
Wants = [ "network-online.target" ];
};
serviceConfig = {

View file

@ -30,8 +30,8 @@ in
dataDir = mkOption {
default = [ "/var/lib/minio/data" ];
type = types.listOf types.path;
description = lib.mdDoc "The list of data directories for storing the objects. Use one path for regular operation and the minimum of 4 endpoints for Erasure Code mode.";
type = types.listOf (types.either types.path types.str);
description = lib.mdDoc "The list of data directories or nodes for storing the objects. Use one path for regular operation and the minimum of 4 endpoints for Erasure Code mode.";
};
configDir = mkOption {
@ -99,7 +99,7 @@ in
systemd = lib.mkMerge [{
tmpfiles.rules = [
"d '${cfg.configDir}' - minio minio - -"
] ++ (map (x: "d '" + x + "' - minio minio - - ") cfg.dataDir);
] ++ (map (x: "d '" + x + "' - minio minio - - ") (builtins.filter lib.types.path.check cfg.dataDir));
services.minio = {
description = "Minio Object Storage";

View file

@ -2,10 +2,10 @@
let
pname = "framesh";
version = "0.6.6";
version = "0.6.7";
src = fetchurl {
url = "https://github.com/floating/frame/releases/download/v${version}/Frame-${version}.AppImage";
sha256 = "sha256-5LLnITQP9m2lMdnB/rrK/M+p3AA3rYZ9GOrDdCFA/r4=";
sha256 = "sha256-yPNgrC9ZQcl1gCStMXMbZvk15jZylM2NgKM9H3XcJVQ=";
};
appimageContents = appimageTools.extractType2 {

View file

@ -65,11 +65,12 @@ stdenv.mkDerivation rec {
];
meta = with lib; {
changelog = "https://codeberg.org/dnkl/fuzzel/releases/tag/${version}";
description = "Wayland-native application launcher, similar to rofis drun mode";
homepage = "https://codeberg.org/dnkl/fuzzel";
license = with licenses; [ mit zlib ];
mainProgram = "fuzzel";
maintainers = with maintainers; [ fionera polykernel rodrgz ];
platforms = with platforms; linux;
changelog = "https://codeberg.org/dnkl/fuzzel/releases/tag/${version}";
};
}

View file

@ -10,11 +10,11 @@
}:
let
pname = "jetbrains-toolbox";
version = "2.0.0.16559";
version = "2.0.1.16621";
src = fetchzip {
url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}.tar.gz";
sha256 = "sha256-z+udyilfVwcVnaFhp6GYHCXqh1d7T5fj/TbbjMoen2I=";
sha256 = "sha256-FZuoLzouwi3HfTJct+Sh8DNzdzQoEsErBb04SgYrZN0=";
stripRoot = false;
};

View file

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
owner = "jtheoof";
repo = pname;
rev = "v${version}";
sha256 = "sha256-/XPvy98Il4i8cDl9vH6f0/AZmiSqseSXnen7HfMqCDo=";
hash = "sha256-/XPvy98Il4i8cDl9vH6f0/AZmiSqseSXnen7HfMqCDo=";
};
nativeBuildInputs = [ glib meson ninja pkg-config scdoc wrapGAppsHook ];
@ -40,9 +40,10 @@ stdenv.mkDerivation rec {
];
meta = with lib; {
homepage = "https://github.com/jtheoof/swappy";
description = "A Wayland native snapshot editing tool, inspired by Snappy on macOS";
homepage = "https://github.com/jtheoof/swappy";
license = licenses.mit;
mainProgram = "swappy";
maintainers = [ maintainers.matthiasbeyer ];
platforms = platforms.linux;
};

View file

@ -6,22 +6,23 @@
buildGoModule rec {
pname = "k0sctl";
version = "0.15.2";
version = "0.15.4";
src = fetchFromGitHub {
owner = "k0sproject";
repo = pname;
rev = "v${version}";
sha256 = "sha256-pti52JlnIxinKg2DxNfLewoJuhMohsAVmHgvR2N5shg=";
sha256 = "sha256-sMMYuE/KIWScZTCuzW9WQpCDHI+Og1zRxGlZzOuHgNo=";
};
vendorSha256 = "sha256-K4/sIHWVe1Wj8LJgrqfoOg1hHXvH3HEgU5vq82tzMSk=";
vendorSha256 = "sha256-6UWRh0NHFr7adJJSmrfTjzXH75Dmjed/+KxH6Kz//jk=";
ldflags = [
"-s"
"-w"
"-X github.com/k0sproject/k0sctl/version.Environment=production"
"-X github.com/k0sproject/k0sctl/version.Version=${version}"
"-X github.com/carlmjohnson/versioninfo.Version=${version}"
"-X github.com/carlmjohnson/versioninfo.Revision=${version}"
];
nativeBuildInputs = [ installShellFiles ];
@ -37,6 +38,6 @@ buildGoModule rec {
description = "A bootstrapping and management tool for k0s clusters.";
homepage = "https://k0sproject.io/";
license = licenses.asl20;
maintainers = with maintainers; [ nickcao ];
maintainers = with maintainers; [ nickcao qjoly ];
};
}

View file

@ -110,13 +110,13 @@
"vendorHash": null
},
"aws": {
"hash": "sha256-y4KAw4hX+Hl+laVzOoNVxUXo4AkjWEKYSf87ffpSh2w=",
"hash": "sha256-ajASdZaw61sDn5JsxLhvY0kI14KBF07Uc1GiRrQ7f8c=",
"homepage": "https://registry.terraform.io/providers/hashicorp/aws",
"owner": "hashicorp",
"repo": "terraform-provider-aws",
"rev": "v5.11.0",
"rev": "v5.12.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-lf/bx9Uwf2jkOKfgYc2JPJ9Rt0PKHpIHzHW5Dfmt5rM="
"vendorHash": "sha256-hDiazrFZDqBn4ErjYGZamjHMuQ3ImZu3eSeXKImm9Ww="
},
"azuread": {
"hash": "sha256-aLckXkWxMsDS1ddPucAmjFS6+mkwHeAO1+BlPNaF6cI=",
@ -128,11 +128,11 @@
"vendorHash": null
},
"azurerm": {
"hash": "sha256-7ekMsiMvyJuwp+/fzKJcvp7RirunsGykTH62Z8Znz4Q=",
"hash": "sha256-6a6JXzTpXRIscWf1sSZwubnDww1KTFrDnGNO7+aqjoY=",
"homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
"owner": "hashicorp",
"repo": "terraform-provider-azurerm",
"rev": "v3.68.0",
"rev": "v3.69.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -146,11 +146,11 @@
"vendorHash": null
},
"baiducloud": {
"hash": "sha256-n+Rk2J7ZqQ93GQSvdLfnjKW2R3v7+iWj+P6EZQ5QxhA=",
"hash": "sha256-exVqL9iUP27PwLGxncFCnnhFnnVWd6KcPqv412W9YMA=",
"homepage": "https://registry.terraform.io/providers/baidubce/baiducloud",
"owner": "baidubce",
"repo": "terraform-provider-baiducloud",
"rev": "v1.19.10",
"rev": "v1.19.11",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -191,13 +191,13 @@
"vendorHash": "sha256-oVXrSI+DU6NgmVIPcS4He4mHVrkA2tMxFUpxMnv0bu4="
},
"checkly": {
"hash": "sha256-69oRZpJNRFJCwAZNcmVfYTNKmtBgFocvEUZpr4jbJQg=",
"hash": "sha256-tOTrAi6hd4HFbHAj0p/LTYdxQl1R1WuQ9L4hzqmDVqI=",
"homepage": "https://registry.terraform.io/providers/checkly/checkly",
"owner": "checkly",
"repo": "terraform-provider-checkly",
"rev": "v1.6.8",
"rev": "v1.6.9",
"spdx": null,
"vendorHash": "sha256-cnvXf0zJrJvpRbQMm2pF7f2cuazxDR4193JCbyGuL2Y="
"vendorHash": "sha256-EhsfA53xkGFgiwJxBtpD1ZKjb0+14dKD9rQ0Jrrm3ck="
},
"ciscoasa": {
"hash": "sha256-xzc44FEy2MPo51Faq/VFwg411JK9e0kQucpt0vdN8yg=",
@ -664,13 +664,13 @@
"vendorHash": "sha256-9AmfvoEf7E6lAblPIWizElng5GQJG/hQ5o6Mo3AN+EA="
},
"launchdarkly": {
"hash": "sha256-dK7JxmC/GRjsMpiJb2e8EyFl+V/KcxKlw8/5IbyFlXY=",
"hash": "sha256-gXpnYX4G+KYEPr4385VgbVfbfkNRc0z2txaaH16nJqI=",
"homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly",
"owner": "launchdarkly",
"repo": "terraform-provider-launchdarkly",
"rev": "v2.13.4",
"rev": "v2.14.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-jggXSnERsraNqkQKFpUtlglSOi02n4eAp4graJ6K+ZA="
"vendorHash": "sha256-I+9hfKWBbclXXpthQc9LAHhZ7MYr/8I89mLeIVeae+Q="
},
"libvirt": {
"hash": "sha256-VO9fbRLz7mDYT8WORodnN4l3II2j+TdpV8cZ9M+NjTM=",
@ -872,13 +872,13 @@
"vendorHash": "sha256-NnB8deqIeiB66Kba9LWT62fyI23HL57VcsTickoTRwI="
},
"opentelekomcloud": {
"hash": "sha256-+goODpTThegmo2cew5bKxGhtqAHd2ObeEzSG2vxWK4w=",
"hash": "sha256-WL7eER7FsuIpdFsp4K1RlrrhEEK6hMou7HYAn/XbvLU=",
"homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
"owner": "opentelekomcloud",
"repo": "terraform-provider-opentelekomcloud",
"rev": "v1.35.4",
"rev": "v1.35.5",
"spdx": "MPL-2.0",
"vendorHash": "sha256-VPQml9PAb/41wwLHAFtHDSwGLwPYG9ePiPgKhtfdt9Y="
"vendorHash": "sha256-C2wZjhO6PAiHuoKWN97QJLnC0tYNEyDXMSErGlv2Zpg="
},
"opsgenie": {
"hash": "sha256-Jz3JMq39C2NvA0kvJdjjkOHNvZOMuw4Fq2+nyVHRIL4=",

View file

@ -1,6 +1,6 @@
{ buildGoModule, lib, installShellFiles, fetchFromGitHub }:
let
short_hash = "86497a5";
short_hash = "63b9742";
in buildGoModule rec {
pname = "deck";
version = "1.26.0";

View file

@ -25,10 +25,6 @@ buildGoModule rec {
subPackages = [ "cmd/ipfs" ];
buildInputs = [ openssl ];
nativeBuildInputs = [ pkg-config ];
tags = [ "openssl" ];
passthru.tests.kubo = nixosTests.kubo;
vendorSha256 = null;

View file

@ -56,7 +56,8 @@ stdenv.mkDerivation rec {
description = "Fast incremental file transfer utility";
homepage = "https://rsync.samba.org/";
license = licenses.gpl3Plus;
platforms = platforms.unix;
mainProgram = "rsync";
maintainers = with lib.maintainers; [ ehmry kampfschlaefer ivan ];
platforms = platforms.unix;
};
}

View file

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "cbmc";
version = "5.88.1";
version = "5.89.0";
src = fetchFromGitHub {
owner = "diffblue";
repo = pname;
rev = "${pname}-${version}";
sha256 = "sha256-bfrtYqTMU/Nib0wZjS/t0kg5sBsuQuq9GaHX4PxL7tU=";
sha256 = "sha256-pgZdR1X0aOCfCKAGo2h9bAIO2XTTiWL8ERgandOQj/M=";
};
nativeBuildInputs = [

View file

@ -140,6 +140,7 @@ rustPlatform.buildRustPackage rec {
description = "GPU-accelerated cross-platform terminal emulator and multiplexer written by @wez and implemented in Rust";
homepage = "https://wezfurlong.org/wezterm";
license = licenses.mit;
mainProgram = "wezterm";
maintainers = with maintainers; [ SuperSandro2000 mimame ];
};
}

View file

@ -2,18 +2,19 @@
stdenvNoCC.mkDerivation rec {
pname = "mpv-playlistmanager";
version = "unstable-2022-08-26";
version = "unstable-2023-08-09";
src = fetchFromGitHub {
owner = "jonniek";
repo = "mpv-playlistmanager";
rev = "07393162f7f78f8188e976f616f1b89813cec741";
sha256 = "sha256-Vgh5F6c90ijp5LVrP2cdAOXo+QtJ9aXI9G/3C2HGqd4=";
rev = "e479cbc7e83a07c5444f335cfda13793681bcbd8";
sha256 = "sha256-Nh4g8uSkHWPjwl5wyqWtM+DW9fkEbmCcOsZa4eAF6Cs=";
};
postPatch = ''
substituteInPlace playlistmanager.lua \
--replace "youtube-dl" "${lib.getBin yt-dlp}/bin/yt-dlp"
--replace 'youtube_dl_executable = "youtube-dl",' \
'youtube_dl_executable = "${lib.getBin yt-dlp}/bin/yt-dlp"',
'';
dontBuild = true;

View file

@ -45,8 +45,9 @@ python3Packages.buildPythonApplication rec {
];
meta = with lib; {
homepage = "https://streamlink.github.io/";
changelog = "https://github.com/streamlink/streamlink/raw/${version}/CHANGELOG.md";
description = "CLI for extracting streams from various websites to video player of your choosing";
homepage = "https://streamlink.github.io/";
longDescription = ''
Streamlink is a CLI utility that pipes videos from online
streaming services to a variety of video players such as VLC, or
@ -54,8 +55,8 @@ python3Packages.buildPythonApplication rec {
Streamlink is a fork of the livestreamer project.
'';
changelog = "https://github.com/streamlink/streamlink/raw/${version}/CHANGELOG.md";
license = licenses.bsd2;
mainProgram = "streamlink";
maintainers = with maintainers; [ dezgeg zraexy DeeUnderscore ];
};
}

View file

@ -26,14 +26,15 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Wallpaper tool for Wayland compositors";
inherit (src.meta) homepage;
longDescription = ''
A wallpaper utility for Wayland compositors, that is compatible with any
Wayland compositor which implements the following Wayland protocols:
wlr-layer-shell, xdg-output, and xdg-shell.
'';
inherit (src.meta) homepage;
license = licenses.mit;
platforms = platforms.linux;
mainProgram = "swaybg";
maintainers = with maintainers; [ primeos ];
platforms = platforms.linux;
};
}

View file

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
owner = "swaywm";
repo = "swayidle";
rev = version;
sha256 = "sha256-/U6Y9H5ZqIJph3TZVcwr9+Qfd6NZNYComXuC1D9uGHg=";
hash = "sha256-/U6Y9H5ZqIJph3TZVcwr9+Qfd6NZNYComXuC1D9uGHg=";
};
strictDeps = true;
@ -29,13 +29,14 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Idle management daemon for Wayland";
inherit (src.meta) homepage;
longDescription = ''
Sway's idle management daemon. It is compatible with any Wayland
compositor which implements the KDE idle protocol.
'';
inherit (src.meta) homepage;
license = licenses.mit;
platforms = platforms.linux;
mainProgram = "swayidle";
maintainers = with maintainers; [ primeos ];
platforms = platforms.linux;
};
}

View file

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "risor";
version = "0.12.0";
version = "0.13.0";
src = fetchFromGitHub {
owner = "risor-io";
repo = "risor";
rev = "v${version}";
hash = "sha256-4Tw8QJj14MYfuQ4mNkSO1z4F8/3/6HjORKgARljlfs8=";
hash = "sha256-lalT9kwq0+y3xaYAcl/DqcwGXE27lNuL1DCr1wEE8ZE=";
};
vendorHash = "sha256-diAbQwnlhMm43ZlLKq3llMl9mO3sIkc80aCI5UDn7F4=";

View file

@ -2,9 +2,10 @@
, stdenv
, fetchFromGitHub
, pkg-config
, libtool
, perl
, libtermkey
, unibilium
, libtool
}:
stdenv.mkDerivation rec {
pname = "libtickit";
@ -22,8 +23,21 @@ stdenv.mkDerivation rec {
"LIBTOOL=${lib.getExe libtool}"
];
nativeBuildInputs = [ pkg-config libtool ];
buildInputs = [ libtermkey unibilium ];
nativeBuildInputs = [
pkg-config
libtool
];
buildInputs = [
libtermkey
unibilium
];
nativeCheckInputs = [ perl ];
patches = [
./skipTestMacOS.patch
];
doCheck = true;
meta = with lib; {
description = "A terminal interface construction kit";

View file

@ -0,0 +1,27 @@
From 6179359c0b9247ae981b8b2a2897eabc921147fd Mon Sep 17 00:00:00 2001
From: Gustavo Coutinho de Souza <dev@onemoresuza.mailer.me>
Date: Tue, 8 Aug 2023 15:45:43 -0300
Subject: [PATCH] test: skip test 18 if on MacOS
---
t/18term-builder.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/t/18term-builder.c b/t/18term-builder.c
index 8b23ab4..c1b64a2 100644
--- a/t/18term-builder.c
+++ b/t/18term-builder.c
@@ -21,6 +21,11 @@ static void output(TickitTerm *tt, const char *bytes, size_t len, void *user)
int main(int argc, char *argv[])
{
+
+ #if defined(__APPLE__) || defined(__MACH__)
+ skip_all("the test does not seem to work on MacOS");
+ return exit_status();
+ #endif
// getstr override
{
/* We need a termtype that isn't xterm, but that will actually load.
--
2.41.0

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "maestro";
version = "1.30.4";
version = "1.31.0";
src = fetchurl {
url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip";
sha256 = "1dc02krdysaal1w3lrwr9xcz04r72jgm0kg3bpv70gd830yp9bkr";
sha256 = "0rgkviyxr0hwm0xhv8mfhdxk3wzhgqhbjpk8wv6c2b68xnwxwxha";
};
dontUnpack = true;

View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "aioairzone";
version = "0.6.4";
version = "0.6.5";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "Noltari";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-kOx28JmtB5hpCwsNk00bMLrU4K2tU/JY/ZWn6KmPDP4=";
hash = "sha256-HcO4t+9JigS6SVkwDk+rEWzqSfe0h5ZADdk3Jvxnr3Y=";
};
nativeBuildInputs = [

View file

@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "aiohomekit";
version = "2.6.14";
version = "2.6.15";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "Jc2k";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-JPI1+sQVZe2/5YxW6OxZRosp36e93KEW+V1DAcLaYNY=";
hash = "sha256-PX2OIgfVOlCEudObJrz/WRQXW7c6Gq9PQqD52D3lmmo=";
};
nativeBuildInputs = [

View file

@ -2,10 +2,13 @@
, async-timeout
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, pillow
, pytest-asyncio
, pytestCheckHook
, pythonOlder
, setuptools
, wheel
}:
buildPythonPackage rec {
@ -13,7 +16,7 @@ buildPythonPackage rec {
version = "2.3.3";
format = "pyproject";
disabled = pythonOlder "3.9";
disabled = pythonOlder "3.10";
src = fetchFromGitHub {
owner = "home-assistant-libs";
@ -22,8 +25,18 @@ buildPythonPackage rec {
hash = "sha256-d+PEzCF1Cw/7NmumxIRRlr3hojpNsZM/JMQ0KWdosXk=";
};
patches = [
# https://github.com/home-assistant-libs/aioslimproto/pull/189
(fetchpatch {
name = "unpin-setuptools-version.patch";
url = "https://github.com/home-assistant-libs/aioslimproto/commit/06fd56987be8903ff147bad38af84b21bc31bc18.patch";
hash = "sha256-kTu1+IwDrcdqelyK/vfhxw8MQBis5I1jag7YTytKQhs=";
})
];
nativeBuildInputs = [
setuptools
wheel
];
propagatedBuildInputs = [
@ -32,14 +45,10 @@ buildPythonPackage rec {
];
nativeCheckInputs = [
pytest-asyncio
pytestCheckHook
];
disabledTests = [
# AssertionError: assert ['mixer', 'volume', '50'] == ['volume', '50']
"test_msg_instantiation"
];
pythonImportsCheck = [
"aioslimproto"
];

View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "aiounifi";
version = "51";
version = "52";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "Kane610";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-XR/yZLxTHVHxm/QLCKrp9XFJ7yZybPjPxKEhf1SOzD0=";
hash = "sha256-mghAUZrRBKHM+mIeUGnbJqWD+NhZyikdGsIhf1uohiM=";
};
propagatedBuildInputs = [

View file

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "awkward-cpp";
version = "17";
version = "21";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-gTO7rxgkjdUgSkF6Ztq5bhti5VUpsrhocOLz7L6xllE=";
hash = "sha256-sobmPegDBI/4EvdpxrY28TsNO8vyLhuRsV9s+5WThR4=";
};
nativeBuildInputs = [

View file

@ -8,20 +8,21 @@
, numba
, numpy
, packaging
, setuptools
, typing-extensions
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "awkward";
version = "2.2.4";
version = "2.3.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-v06mYdoP/WfIfz6x6+MJvS4YOsTsyWqhCyAykZ1d5v4=";
hash = "sha256-NLROXEbh4MKvBFuj+4+Wa2u37P9vuQ0Ww8kK+CYWt5E=";
};
nativeBuildInputs = [
@ -42,6 +43,7 @@ buildPythonPackage rec {
nativeCheckInputs = [
pytestCheckHook
numba
setuptools
];
disabledTestPaths = [

View file

@ -86,6 +86,6 @@ buildPythonPackage rec {
homepage = "https://github.com/pypa/build";
changelog = "https://github.com/pypa/build/blob/${version}/CHANGELOG.rst";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
maintainers = teams.python.members ++ [ maintainers.fab ];
};
}

View file

@ -31,6 +31,14 @@ buildPythonPackage rec {
];
postPatch = ''
# The line below is in the [build-system] section, which is invalid and
# rejected by PyPA's build tool. It belongs in [project] but upstream has
# had problems with putting that there (see comment in pyproject.toml).
sed -i '/requires-python/d' pyproject.toml
substituteInPlace pyproject.toml \
--replace '"poetry>=1.3.2",' ""
patchShebangs tests
'';

View file

@ -11,6 +11,7 @@
, scipy
, scs
, setuptools
, wheel
, useOpenmp ? (!stdenv.isDarwin)
}:
@ -26,6 +27,16 @@ buildPythonPackage rec {
hash = "sha256-C2heUEDxmfPXA/MPXSLR+GVZdiNFUVPR3ddwJFrvCXU=";
};
# we need to patch out numpy version caps from upstream
postPatch = ''
sed -i 's/\(numpy>=[0-9.]*\),<[0-9.]*;/\1;/g' pyproject.toml
'';
nativeBuildInputs = [
setuptools
wheel
];
propagatedBuildInputs = [
cvxopt
ecos

View file

@ -2,6 +2,7 @@
, buildPythonPackage
, fetchPypi
, setuptools
, wheel
, cython
, pytestCheckHook
, hypothesis
@ -17,17 +18,20 @@ buildPythonPackage rec {
hash = "sha256-UlsI9jjVz2EV32zNgY5aASmM0jCy2skcj/LmSZ0Ydl0=";
};
postPatch = ''
substituteInPlace setup.py \
--replace '"pytest-runner", ' ""
'';
nativeBuildInputs = [
setuptools
wheel
cython
];
nativeCheckInputs = [
pytestCheckHook
];
checkInputs = [
hypothesis
pytestCheckHook
];
pythonImportsCheck = [ "datrie" ];

View file

@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "django-auth-ldap";
version = "4.4.0";
version = "4.5.0";
format = "pyproject";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
hash = "sha256-eXkxrF1VxMoUwXnViSQgzCqYqoHkQyPVlfVBnBtFwwY=";
hash = "sha256-B6L+NbQCUIluErjWLROW0eQ3AEYwNwN2BJPOzXkfqI8=";
};
nativeBuildInputs = [

View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "dvc-data";
version = "2.12.1";
version = "2.12.2";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-BmI2D1nMeqcV0jPMJ6jzHO38AscfzDMgwh91ekKlXEs=";
hash = "sha256-DNFnh+ajfKgsZEj5Vyfk+jqSs9nv/PHIIpkkarxugww=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "dvc-objects";
version = "0.24.1";
version = "0.25.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-DpRnbvGF6HOCAcQ7HRf9x1bzrHHnL95Fz/TzpCosRZo=";
hash = "sha256-RzVvF9fv2VtSWzhD3+TJ3I2WKSu016+MlfnFEFj3YxQ=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -22,7 +22,8 @@ buildPythonPackage rec {
meta = with lib; {
description = "Distribution-building parts of Flit. See flit package for more information";
homepage = "https://github.com/pypa/flit";
changelog = "https://github.com/pypa/flit/blob/${src.rev}/doc/history.rst";
license = licenses.bsd3;
maintainers = with maintainers; [ fridh ];
maintainers = teams.python.members;
};
}

View file

@ -0,0 +1,48 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pbr
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "git-url-parse";
version = "1.2.2";
format = "setuptools";
src = fetchFromGitHub {
owner = "coala";
repo = "git-url-parse";
rev = version;
hash = "sha256-+0V/C3wE02ppdDGn7iqdvmgsUwTR7THUakUilvkzoYg=";
};
postPatch = ''
substituteInPlace pytest.ini \
--replace " --cov giturlparse --cov-report term-missing" ""
'';
# Manually set version because prb wants to get it from the git
# upstream repository (and we are installing from tarball instead)
env.PBR_VERSION = version;
propagatedBuildInputs = [
pbr
];
pythonImportsCheck = [ "giturlparse" ];
nativeCheckInputs = [
pytestCheckHook
];
meta = with lib; {
description = "A simple GIT URL parser";
homepage = "https://github.com/coala/git-url-parse";
changelog = "https://github.com/coala/git-url-parse/blob/${src.rev}/CHANGELOG.rst";
license = licenses.mit;
maintainers = with maintainers; [ blaggacao ];
};
}

View file

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "glyphslib";
version = "6.2.5";
version = "6.3.0";
format = "pyproject";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "googlefonts";
repo = "glyphsLib";
rev = "refs/tags/v${version}";
hash = "sha256-El2hRY+ELzdW/Bv34JURsisRr74MEv19sFt9tWFHIes=";
hash = "sha256-wBtotr7nH7KL5ISaJFs4i8CCv4OCZnVOREUon8jhQdY=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "gsd";
version = "3.0.1";
version = "3.1.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "glotzerlab";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-jfik8Rz4gqBNQn8cb20VcSUodupS/FNgpQJtW/DMzPY=";
hash = "sha256-YeMdBELr5kfymVUEE8+cqGLgOPBqbbD+vh1e9XbRLB8=";
};
nativeBuildInputs = [

View file

@ -13,7 +13,7 @@ buildPythonPackage rec {
format = "pyproject";
src = fetchFromGitHub {
owner = "pradyunsg";
owner = "pypa";
repo = pname;
rev = version;
hash = "sha256-thHghU+1Alpay5r9Dc3v7ATRFfYKV8l9qR0nbGOOX/A=";
@ -27,10 +27,10 @@ buildPythonPackage rec {
];
meta = with lib; {
changelog = "https://github.com/pypa/installer/blob/${src.rev}/docs/changelog.md";
homepage = "https://github.com/pradyunsg/installer";
description = "A low-level library for installing a Python package from a wheel distribution";
homepage = "https://github.com/pypa/installer";
changelog = "https://github.com/pypa/installer/blob/${src.rev}/docs/changelog.md";
license = licenses.mit;
maintainers = with maintainers; [ cpcloud fridh ];
maintainers = teams.python.members ++ [ maintainers.cpcloud ];
};
}

View file

@ -1,43 +1,52 @@
{ lib, stdenv
{ lib
, buildPythonPackage
, pythonAtLeast
, fetchPypi
, flit-core
, mock
, pytest
, pbr
, pytest-mock
, pytestCheckHook
, pytz
, requests
, requests-kerberos
, toml
, six
}:
buildPythonPackage rec {
pname = "jenkinsapi";
version = "0.3.13";
format = "setuptools";
disabled = pythonAtLeast "3.6";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-JGqYpj5h9UoV0WEFyxVIjFZwc030HobHrw1dnAryQLk=";
};
propagatedBuildInputs = [ pytz requests ];
nativeCheckInputs = [ mock pytest pytest-mock requests-kerberos toml ];
# TODO requests-kerberos is broken on darwin, weeding out the broken tests without
# access to macOS is not an adventure I am ready to embark on - @rski
doCheck = !stdenv.isDarwin;
# don't run tests that try to spin up jenkins, and a few more that are mysteriously broken
checkPhase = ''
py.test jenkinsapi_tests \
-k "not systests and not test_plugins and not test_view"
'';
nativeBuildInputs = [
flit-core
pbr
];
propagatedBuildInputs = [
pytz
requests
six
];
nativeCheckInputs = [
mock
pytest-mock
pytestCheckHook
];
# don't run tests that try to spin up jenkins
disabledTests = [ "systests" ];
pythonImportsCheck = [ "jenkinsapi" ];
meta = with lib; {
description = "A Python API for accessing resources on a Jenkins continuous-integration server";
homepage = "https://github.com/salimfadhley/jenkinsapi";
maintainers = with maintainers; [ drets ];
maintainers = with maintainers; [ drets ] ++ teams.deshaw.members;
license = licenses.mit;
};

View file

@ -1,31 +1,33 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchpatch
, setuptools-scm
, fetchFromGitHub
, gmpy2
, isPyPy
, setuptools
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "mpmath";
version = "1.2.1";
version = "1.3.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "79ffb45cf9f4b101a807595bcb3e72e0396202e0b1d25d689134b48c4216a81a";
src = fetchFromGitHub {
owner = "mpmath";
repo = "mpmath";
rev = "refs/tags/${version}";
hash = "sha256-9BGcaC3TyolGeO65/H42T/WQY6z5vc1h+MA+8MGFChU=";
};
patches = [
(fetchpatch {
name = "CVE-2021-29063.patch";
url = "https://github.com/fredrik-johansson/mpmath/commit/46d44c3c8f3244017fe1eb102d564eb4ab8ef750.patch";
hash = "sha256-DaZ6nj9rEsjTAomu481Ujun364bL5E6lkXFvgBfHyeA=";
})
nativeBuildInputs = [
setuptools
];
nativeBuildInputs = [
setuptools-scm
];
passthru.optional-dependencies = {
gmpy = lib.optionals (!isPyPy) [
gmpy2
];
};
nativeCheckInputs = [
pytestCheckHook
@ -38,5 +40,4 @@ buildPythonPackage rec {
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.unix;
};
}

View file

@ -27,7 +27,8 @@
let
inherit (cudaPackages) cudatoolkit;
in buildPythonPackage rec {
# Using an untagged version, with numpy 1.25 support
# Using an untagged version, with numpy 1.25 support, when it's released
# also drop the versioneer patch in postPatch
version = "unstable-2023-08-02";
pname = "numba";
format = "setuptools";
@ -77,6 +78,13 @@ in buildPythonPackage rec {
cuda_toolkit_lib_path = cudatoolkit.lib;
})
];
# with untagged version we need to specify the correct version ourselves
postPatch = ''
substituteInPlace setup.py --replace "version=versioneer.get_version()" "version='0.57.1'"
substituteInPlace numba/_version.py \
--replace 'git_refnames = ""' 'git_refnames = "0.57.1"'
'';
postFixup = lib.optionalString cudaSupport ''
find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do

View file

@ -1,53 +1,61 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchpatch
, ipykernel
, ipywidgets
, pythonOlder
, pytestCheckHook
, pandas
, jinja2
, numpy
, pandas
, pytestCheckHook
, pythonOlder
, setuptools
, traitlets
, wheel
}:
buildPythonPackage rec {
pname = "pydeck";
version = "0.7.1";
version = "0.8.0";
format = "pyproject";
disabled = pythonOlder "3.7";
patches = [
# fixes build with latest setuptools
(fetchpatch {
url = "https://github.com/visgl/deck.gl/commit/9e68f73b28aa3bf0f2a887a4d8ccd2dc35677039.patch";
hash = "sha256-YVVoVbVdY5nV+17OwYIs9AwKGyzgKZHi655f4BLcdMU=";
stripLen = 2;
})
];
src = fetchPypi {
inherit pname version;
sha256 = "907601c99f7510e16d27d7cb62bfa145216d166a2b5c9c50cfe2b65b032ebd2e";
hash = "sha256-B+3egz98/O9nSRJDURlap9zSRmPUkJ/XiY29C2+8Aew=";
};
nativeBuildInputs = [
setuptools
wheel
];
propagatedBuildInputs = [
jinja2
numpy
];
passthru.optional-dependencies = {
carto = [
# pydeck-carto
];
jupyter = [
ipykernel
ipywidgets
traitlets
];
};
pythonImportsCheck = [ "pydeck" ];
nativeCheckInputs = [ pytestCheckHook pandas ];
nativeCheckInputs = [
pytestCheckHook
pandas
] ++ passthru.optional-dependencies.jupyter;
# tries to start a jupyter server
disabledTests = [ "test_nbconvert" ];
propagatedBuildInputs = [
ipykernel
ipywidgets
jinja2
numpy
traitlets
];
meta = with lib; {
homepage = "https://github.com/visgl/deck.gl/tree/master/bindings/pydeck";
description = "Large-scale interactive data visualization in Python";

View file

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pynina";
version = "0.3.1";
version = "0.3.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "PyNINA";
inherit version;
hash = "sha256-HyOk3W95dEl+p8YGh3xP29HcvbncqxsUaWSQUiKgTWM=";
hash = "sha256-uiNUkNL/3FGGhqctE9AZNdSD4o7jTk829GAT5Gy2Xeo=";
};
propagatedBuildInputs = [

View file

@ -26,8 +26,7 @@ buildPythonPackage rec {
flit-core
];
propagatedBuildInputs = [
] ++ lib.optionals (pythonOlder "3.11") [
propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [
tomli
];
@ -52,6 +51,6 @@ buildPythonPackage rec {
homepage = "https://github.com/pypa/pyproject-hooks";
changelog = "https://github.com/pypa/pyproject-hooks/blob/v${version}/docs/changelog.rst";
license = licenses.mit;
maintainers = with maintainers; [ hexa ];
maintainers = teams.python.members;
};
}

View file

@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, mako
, parse
, parse-type
@ -8,7 +9,6 @@
, pytest
, pytestCheckHook
, pythonOlder
, setuptools
, typing-extensions
}:
@ -26,6 +26,14 @@ buildPythonPackage rec {
hash = "sha256-+76jIgfDQPdIoesTr1+QUu8wmOnrdf4KT+TJr9F2Hqk=";
};
patches = [
(fetchpatch {
name = "remove-setuptools.patch";
url = "https://github.com/pytest-dev/pytest-bdd/commit/5d8eda3a30b47d3bd27849884a851adafca765cb.patch";
hash = "sha256-G2WHaRKlQ9HINufh8wl7+ly7HfDGobMLzzlbwDwd+o8=";
})
];
nativeBuildInputs = [
poetry-core
];
@ -43,7 +51,6 @@ buildPythonPackage rec {
nativeCheckInputs = [
pytestCheckHook
setuptools
];
preCheck = ''

View file

@ -18,6 +18,7 @@
, html5lib
# tests
, pip
, pytest-cov
, pytestCheckHook
}:
@ -53,7 +54,10 @@ buildPythonPackage rec {
];
};
__darwinAllowLocalNetworking = true;
nativeCheckInputs = [
pip
pytest-cov
pytestCheckHook
]

View file

@ -26,7 +26,7 @@
buildPythonPackage rec {
pname = "sagemaker";
version = "2.175.0";
version = "2.176.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -35,7 +35,7 @@ buildPythonPackage rec {
owner = "aws";
repo = "sagemaker-python-sdk";
rev = "refs/tags/v${version}";
hash = "sha256-7wITaGTHazC34bUF78ZFXFQYz48g1fZlPE8jvIBvE9w=";
hash = "sha256-Um1iL3muMyPlXgFj2OJ7eanvifCXrLvGG0V+pk00oqo=";
};
nativeBuildInputs = [

View file

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "scmrepo";
version = "1.1.0";
version = "1.2.1";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-ggqSS5SWJvKxYzCz4Q9LkA0hXmj/3iGhMKeNb/UQVXg=";
hash = "sha256-9xSuBh3y6vYvbwn7uslM+R7yhZKP/+Sjbae1a+QMoOA=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -2,88 +2,55 @@
, buildPythonPackage
, crc32c
, fetchFromGitHub
, fetchpatch
, lib
, matplotlib
, moto
, numpy
, pillow
, protobuf
, pytestCheckHook
, torch
, six
, setuptools-scm
, soundfile
, stdenv
, tensorboard
, torchvision
, which
}:
buildPythonPackage rec {
pname = "tensorboardx";
version = "2.5.1";
version = "2.6.2";
format = "setuptools";
src = fetchFromGitHub {
owner = "lanpa";
repo = "tensorboardX";
rev = "refs/tags/v${version}";
hash = "sha256-Np0Ibn51qL0ORwq1IY8lUle05MQDdb5XkI1uzGOKJno=";
hash = "sha256-m7RLDOMuRNLacnIudptBGjhcTlMk8+v/onz6Amqxb90=";
};
patches = [
(fetchpatch {
name = "fix-test-multiprocess-fork-on-darwin.patch";
url = "https://github.com/lanpa/tensorboardX/commit/246a867237ff12893351b9275a1e297ee2861319.patch";
hash = "sha256-ObUaIi1gFcGZAvDOEtZFd9TjZZUp3k89tYwmDQ5yOWg=";
})
# https://github.com/lanpa/tensorboardX/pull/706
(fetchpatch {
name = "fix-test-use-matplotlib-agg-backend.patch";
url = "https://github.com/lanpa/tensorboardX/commit/751821c7af7f7f2cb724938e36fa04e814c0e4de.patch";
hash = "sha256-Tu76ZRTh8fGj+/CzpqJO65hKrDFASbmzoLVIZ0kyLQA=";
})
# https://github.com/lanpa/tensorboardX/pull/707
(fetchpatch {
name = "fix-test-handle-numpy-float128-missing.patch";
url = "https://github.com/lanpa/tensorboardX/commit/38f57ffc3b3dd91e76b13ec97404278065fbc782.patch";
hash = "sha256-5Po41lHiO5hKi4ZtWR98/wwDe9HKZdADNTv40mgIEvk=";
})
# https://github.com/lanpa/tensorboardX/pull/708
(fetchpatch {
name = "fix-test-respect-tmpdir.patch";
url = "https://github.com/lanpa/tensorboardX/commit/b0191d1cfb8a23def76e465d20fd59302c894f32.patch";
hash = "sha256-6rSncJ16P1u70Cz9nObo8lMD7Go50BR3DZLgP4bODk4=";
})
];
postPatch = ''
# Version detection seems broken here, the version reported by python is
# newer than the protobuf package itself.
sed -i -e "s/'protobuf[^']*'/'protobuf'/" setup.py
'';
nativeBuildInputs = [
which
protobuf
setuptools-scm
];
# required to make tests deterministic
PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python";
env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python";
env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
propagatedBuildInputs = [
crc32c
numpy
six
soundfile
];
pythonImportsCheck = [ "tensorboardX" ];
nativeCheckInputs = [
boto3
matplotlib
moto
pillow
pytestCheckHook
soundfile
torch
tensorboard
torchvision
@ -107,7 +74,9 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library for writing tensorboard-compatible logs";
homepage = "https://github.com/lanpa/tensorboardX";
homepage = "https://tensorboardx.readthedocs.io";
downloadPage = "https://github.com/lanpa/tensorboardX";
changelog = "https://github.com/lanpa/tensorboardX/blob/${src.rev}/HISTORY.rst";
license = licenses.mit;
maintainers = with maintainers; [ lebastr akamaus ];
platforms = platforms.all;

View file

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "tubeup";
version = "2023.8.9";
version = "2023.8.10";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-v2fDB76OM/cpi/lJRKH/JnVXl9r/W9jCzlTAJ31N7VU=";
sha256 = "sha256-9jSPFKS1+mGprgGj1c6hOrOo/w2e7A+OXSUjQUm+NCg=";
};
nativeBuildInputs = [

View file

@ -34,9 +34,9 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python Data Validation for Humans";
homepage = "https://github.com/kvesteri/validators";
homepage = "https://github.com/python-validators/validators";
changelog = "https://github.com/python-validators/validators/blob/${version}/CHANGES.md";
license = licenses.bsd3;
license = licenses.mit;
maintainers = [ ];
};
}

View file

@ -1,9 +1,11 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, pytestCheckHook
, pythonOlder
, setuptools
, wheel
}:
buildPythonPackage rec {
@ -20,8 +22,17 @@ buildPythonPackage rec {
hash = "sha256-M3XGHG733X5qKuMS6mvFSFHYOwWPaBMXw+w0eYo6ByE=";
};
patches = [
(fetchpatch {
name = "remove-wheel-dependency-constraint.patch";
url = "https://github.com/jwodder/wheel-filename/commit/11cfa57c8a32fa2a52fb5fe537859997bb642e75.patch";
hash = "sha256-ssePCVlJuHPJpPyFET3FnnWRlslLnZbnfn42g52yVN4=";
})
];
nativeBuildInputs = [
setuptools
wheel
];
nativeCheckInputs = [

View file

@ -6,8 +6,9 @@
, pandas
, pytestCheckHook
, pythonOlder
, setuptoolsBuildHook
, setuptools
, setuptools-scm
, wheel
}:
buildPythonPackage rec {
@ -22,11 +23,12 @@ buildPythonPackage rec {
hash = "sha256-2s4v2/G3/xhdnBImokv4PCrlLzJT2/6A4X0RYmANBVw=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptoolsBuildHook
setuptools
setuptools-scm
wheel
];
propagatedBuildInputs = [

View file

@ -113,6 +113,7 @@ gem 'pry-byebug'
gem 'pry-doc'
gem 'public_suffix'
gem 'puma'
gem 'pwntools'
gem 'rails'
gem 'rainbow'
# gem 'rbczmq' deprecated

View file

@ -1,4 +1,6 @@
{ fetchFromGitHub, lib, mkDerivation
# for passthru.plugins
, pkgs
# nativeBuildInputs
, qmake, pkg-config, cmake
# Qt
@ -10,7 +12,7 @@
, wrapQtAppsHook
}:
mkDerivation rec {
let cutter = mkDerivation rec {
pname = "cutter";
version = "2.3.0";
@ -37,10 +39,24 @@ mkDerivation rec {
qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH")
'';
passthru = rec {
plugins = rizin.plugins // {
rz-ghidra = rizin.plugins.rz-ghidra.override {
inherit cutter qtbase qtsvg;
enableCutterPlugin = true;
};
};
withPlugins = filter: pkgs.callPackage ./wrapper.nix {
unwrapped = cutter;
inherit rizin;
plugins = filter plugins;
};
};
meta = with lib; {
description = "Free and Open Source Reverse Engineering Platform powered by rizin";
homepage = src.meta.homepage;
license = licenses.gpl3;
maintainers = with maintainers; [ mic92 dtzWill ];
};
}
}; in cutter

View file

@ -1,4 +1,5 @@
{ lib
, pkgs # for passthru.plugins
, stdenv
, fetchurl
, pkg-config
@ -22,7 +23,7 @@
, tree-sitter
}:
stdenv.mkDerivation rec {
let rizin = stdenv.mkDerivation rec {
pname = "rizin";
version = "0.6.0";
@ -42,8 +43,17 @@ stdenv.mkDerivation rec {
"-Duse_sys_openssl=enabled"
"-Duse_sys_libmspack=enabled"
"-Duse_sys_tree_sitter=enabled"
# this is needed for wrapping (adding plugins) to work
"-Dportable=true"
];
# Normally, Rizin only looks for files in the install prefix. With
# portable=true, it instead looks for files in relation to the parent
# of the directory of the binary file specified in /proc/self/exe,
# caching it. This patch replaces the entire logic to only look at
# the env var NIX_RZ_PREFIX
patches = [ ./librz-wrapper-support.patch ];
nativeBuildInputs = [
pkg-config
meson
@ -94,6 +104,25 @@ stdenv.mkDerivation rec {
--replace "import('python').find_installation()" "find_program('python3')"
'';
passthru = rec {
plugins = {
jsdec = pkgs.callPackage ./jsdec.nix {
inherit rizin openssl;
};
rz-ghidra = pkgs.libsForQt5.callPackage ./rz-ghidra.nix {
inherit rizin openssl;
enableCutterPlugin = false;
};
# sigdb isn't a real plugin, but it's separated from the main rizin
# derivation so that only those who need it will download it
sigdb = pkgs.callPackage ./sigdb.nix { };
};
withPlugins = filter: pkgs.callPackage ./wrapper.nix {
unwrapped = rizin;
plugins = filter plugins;
};
};
meta = {
description = "UNIX-like reverse engineering framework and command-line toolset.";
homepage = "https://rizin.re/";
@ -101,4 +130,4 @@ stdenv.mkDerivation rec {
maintainers = with lib.maintainers; [ raskin makefu mic92 ];
platforms = with lib.platforms; unix;
};
}
}; in rizin

View file

@ -0,0 +1,35 @@
{ lib
, stdenv
, fetchFromGitHub
, meson
, pkg-config
, ninja
, rizin
, openssl
}:
stdenv.mkDerivation rec {
pname = "jsdec";
version = "0.6.0";
src = fetchFromGitHub {
owner = "rizinorg";
repo = "jsdec";
rev = "v${version}";
hash = "sha256-iVaxxPBIJRhZrmejAOL/Fb4k66mGsZOBs7UikgMj5WA=";
};
nativeBuildInputs = [ meson ninja pkg-config ];
preConfigure = ''
cd p
'';
mesonFlags = [ "-Djsc_folder=.." ];
buildInputs = [ openssl rizin ];
meta = with lib; {
description = "Simple decompiler for Rizin";
homepage = src.meta.homepage;
license = with licenses; [ asl20 bsd3 mit ];
maintainers = with maintainers; [ chayleaf ];
};
}

View file

@ -0,0 +1,13 @@
diff --git a/librz/util/path.c b/librz/util/path.c
index 8ea3d67..f4a8918 100644
--- a/librz/util/path.c
+++ b/librz/util/path.c
@@ -35,6 +35,8 @@ static void fini_portable_prefix(void) {
}
static char *set_portable_prefix(void) {
+ return rz_sys_getenv("NIX_RZ_PREFIX");
+
char *pid_to_path = rz_sys_pid_to_path(rz_sys_getpid());
if (!pid_to_path) {
return NULL;

View file

@ -0,0 +1,62 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
# buildInputs
, rizin
, openssl
, pugixml
# optional buildInputs
, enableCutterPlugin ? true
, cutter
, qtbase
, qtsvg
}:
stdenv.mkDerivation rec {
pname = "rz-ghidra";
version = "0.6.0";
src = fetchFromGitHub {
owner = "rizinorg";
repo = "rz-ghidra";
rev = "v${version}";
hash = "sha256-tQAurouRr6fP1tbIkfd0a9UfeYcwiU1BpjOTcooXkT0=";
fetchSubmodules = true;
};
patches = [
(fetchpatch {
url = "https://github.com/rizinorg/rz-ghidra/pull/327/commits/eba20e2c743ed3dfc5d1be090a5018f7267baa49.patch";
hash = "sha256-aoXFClXZBcOnHl+6lLYrnui7sRb3cRJQhQfNDLxHtcs=";
})
];
nativeBuildInputs = [ cmake ];
buildInputs = [
openssl
pugixml
rizin
] ++ lib.optionals enableCutterPlugin [
cutter
qtbase
qtsvg
];
dontWrapQtApps = true;
cmakeFlags = [
"-DUSE_SYSTEM_PUGIXML=ON"
] ++ lib.optionals enableCutterPlugin [
"-DBUILD_CUTTER_PLUGIN=ON"
"-DCUTTER_INSTALL_PLUGDIR=share/rizin/cutter/plugins/native"
];
meta = with lib; {
description = "Deep ghidra decompiler and sleigh disassembler integration for rizin";
homepage = src.meta.homepage;
license = licenses.lgpl3;
maintainers = with maintainers; [ chayleaf ];
};
}

View file

@ -0,0 +1,36 @@
{ lib
, fetchFromGitHub
, stdenvNoCC
}:
stdenvNoCC.mkDerivation rec {
pname = "rizin-sigdb";
version = "unstable-2023-02-13";
src = fetchFromGitHub {
owner = "rizinorg";
# sigdb-source: source files (.pat and etc), around 2.5gb total
# sigdb: built and deflated .sig files, around 50mb total
repo = "sigdb";
rev = "829baf835e3515923266898fd597f7f75046ebd2";
hash = "sha256-zvGna2CEsDctc9P7hWTaz7kdtxAtPsXHNWOrRQ9ocdc=";
};
buildPhase = ''
mkdir installdir
cp -r elf pe installdir
.scripts/verify-sigs-install.sh
'';
installPhase = ''
mkdir -p $out/share/rizin
mv installdir $out/share/rizin/sigdb
'';
meta = with lib; {
description = "Rizin FLIRT Signature Database";
homepage = src.meta.homepage;
license = licenses.lgpl3;
maintainers = with lib.maintainers; [ chayleaf ];
};
}

View file

@ -0,0 +1,46 @@
{ lib
, makeWrapper
, symlinkJoin
, unwrapped
, plugins
# NIX_RZ_PREFIX only changes where *Rizin* locates files (plugins,
# themes, etc). But we must change it even for wrapping Cutter, because
# Cutter plugins often have associated Rizin plugins. This means that
# NIX_RZ_PREFIX must always contain Rizin files, even if we only wrap
# Cutter - so for Cutter, include Rizin to symlinkJoin paths.
, rizin ? null
}:
symlinkJoin {
name = "${unwrapped.pname}-with-plugins-${unwrapped.version}";
paths = [ unwrapped ] ++ lib.optional (rizin != null) rizin ++ plugins;
nativeBuildInputs = [ makeWrapper ];
passthru = {
inherit unwrapped;
};
postBuild = ''
rm $out/bin/*
wrapperArgs=(--set NIX_RZ_PREFIX $out)
if [ -d $out/share/rizin/cutter ]; then
wrapperArgs+=(--prefix XDG_DATA_DIRS : $out/share)
fi
for binary in $(ls ${unwrapped}/bin); do
makeWrapper ${unwrapped}/bin/$binary $out/bin/$binary "''${wrapperArgs[@]}"
done
${lib.optionalString (rizin != null) ''
for binary in $(ls ${rizin}/bin); do
makeWrapper ${rizin}/bin/$binary $out/bin/$binary "''${wrapperArgs[@]}"
done
''}
'';
meta = unwrapped.meta // {
# prefer wrapped over unwrapped, prefer cutter wrapper over rizin wrapper
# (because cutter versions of plugins also contain rizin plugins)
priority = (unwrapped.meta.priority or 0) - (if rizin != null then 2 else 1);
};
}

File diff suppressed because it is too large Load diff

View file

@ -1,34 +1,49 @@
{ lib
, rustPlatform
, fetchFromGitHub
, pkg-config
, openssl
, stdenv
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "typst-lsp";
version = "0.7.2";
version = "0.8.1";
src = fetchFromGitHub {
owner = "nvarner";
repo = pname;
repo = "typst-lsp";
rev = "v${version}";
hash = "sha256-z6IG0qJXzwisazR/tLq6dwsZzgzhYKh/NnKmnYySS18=";
hash = "sha256-Aq9KP9L9s42NmX45YVnGUMpP0MXKB1Pjd4W0f0U8T7o=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"elsa-1.8.1" = "sha256-/85IriplPxx24TE/CsvjIsve100QUZiVqS0TWgPFRbw=";
"svg2pdf-0.5.0" = "sha256-v/ARFI+Uw5KtLe2F3ty9u3uKkWSradRmLnD2VJ+jmSI=";
"typst-0.5.0" = "sha256-obUe9OVQ8M7MORudQGN7zaYjUv4zjeh7XidHHmUibTA=";
"svg2pdf-0.5.0" = "sha256-yBQpvDAnJ7C0PWIM/o0PzOg9JlDZCEiVdCTDDPSwrmE=";
"typst-0.6.0" = "sha256-8e6BNffKgAUNwic4uEfDh77y2nIyYt9BwZr+ypv+d5A=";
};
};
nativeBuildInputs = [
pkg-config
];
buildInputs = [
openssl
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];
patches = [
# typst-library tries to access the workspace with include_bytes, which
# fails when it is vendored as its own separate crate
# this patch moves the required assets into the crate and fixes the issue
# see https://github.com/typst/typst/pull/1515
./move-typst-assets.patch
# `rustPlatform.importCargoLock` has trouble parsing the `??` in the url
./remove-svg2pdf-patch.patch
];
checkFlags = [
# requires internet access
"--skip=workspace::package::external::repo::test::full_download"
];
meta = with lib; {

View file

@ -1,40 +0,0 @@
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2569,7 +2569,7 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a"
[[package]]
name = "typst"
version = "0.5.0"
-source = "git+https://github.com/typst/typst.git?tag=v0.5.0#3a8b9cce471934031ba57c5972d194ac1d7d2a6c"
+source = "git+https://github.com/typst/typst.git?rev=30bb33aafced4f1bf4a00803550f0e1e42672ded#30bb33aafced4f1bf4a00803550f0e1e42672ded"
dependencies = [
"bitflags 2.3.3",
"bytemuck",
@@ -2611,7 +2611,7 @@ dependencies = [
[[package]]
name = "typst-library"
version = "0.5.0"
-source = "git+https://github.com/typst/typst.git?tag=v0.5.0#3a8b9cce471934031ba57c5972d194ac1d7d2a6c"
+source = "git+https://github.com/typst/typst.git?rev=30bb33aafced4f1bf4a00803550f0e1e42672ded#30bb33aafced4f1bf4a00803550f0e1e42672ded"
dependencies = [
"az",
"chinese-number",
@@ -2685,7 +2685,7 @@ dependencies = [
[[package]]
name = "typst-macros"
version = "0.5.0"
-source = "git+https://github.com/typst/typst.git?tag=v0.5.0#3a8b9cce471934031ba57c5972d194ac1d7d2a6c"
+source = "git+https://github.com/typst/typst.git?rev=30bb33aafced4f1bf4a00803550f0e1e42672ded#30bb33aafced4f1bf4a00803550f0e1e42672ded"
dependencies = [
"heck",
"proc-macro2",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -49,6 +49,6 @@ tracing-subscriber = { version = "0.3.17", default-features = false, features =
"registry",
"fmt",
] }
-typst = { git = "https://github.com/typst/typst.git", tag = "v0.5.0" }
-typst-library = { git = "https://github.com/typst/typst.git", tag = "v0.5.0" }
+typst = { git = "https://github.com/typst/typst.git", rev = "30bb33aafced4f1bf4a00803550f0e1e42672ded" }
+typst-library = { git = "https://github.com/typst/typst.git", rev = "30bb33aafced4f1bf4a00803550f0e1e42672ded" }
walkdir = "2.3"

View file

@ -0,0 +1,27 @@
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2468,7 +2468,7 @@ dependencies = [
[[package]]
name = "svg2pdf"
version = "0.5.0"
-source = "git+https://github.com/typst/svg2pdf.git??tag=v0.5.0#39daf9fc2ee84b62b0e3b174ff8c9017f655af6b"
+source = "git+https://github.com/typst/svg2pdf.git#39daf9fc2ee84b62b0e3b174ff8c9017f655af6b"
dependencies = [
"image",
"miniz_oxide",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -84,13 +84,5 @@ reqwest = { version = "0.11.18", default-features = false, features = [
"rustls-tls",
] }
-
-# Typst 0.6.0 does not specify a tag or ref for svg2pdf, so provide one...
-# ...but Cargo doesn't want to make our lives too easy, and we can't replace the
-# dependency with another at the same URL. Use a workaroud inspired by
-# StackOverflow: https://stackoverflow.com/a/72261235
-[patch."https://github.com/typst/svg2pdf"]
-svg2pdf = { git = "https://github.com/typst/svg2pdf.git?", tag = "v0.5.0" }
-
[dev-dependencies]
temp-dir = "0.1.11"

View file

@ -10,15 +10,15 @@
, extensions ? [ ]
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "gf";
version = "unstable-2022-09-26";
version = "unstable-2023-08-09";
src = fetchFromGitHub {
repo = "gf";
owner = "nakst";
rev = "404fc6d66c60bb01e9bcbb69021e66c543bda2d5";
hash = "sha256-HRejpEN/29Q+wukU3Jv3vZoK6/VjZK6VnZdvPuFBC9I=";
rev = "4190211d63c1e5378a9e841d22fa2b96a1099e68";
hash = "sha256-28Xgw/KxwZ94r/TXsdISeUtXHSips4irB0D+tEefMYE=";
};
nativeBuildInputs = [ makeWrapper pkg-config ];
@ -59,6 +59,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/nakst/gf";
license = licenses.mit;
platforms = platforms.linux;
mainProgram = "gf2";
maintainers = with maintainers; [ _0xd61 ];
};
}

View file

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-binstall";
version = "1.1.2";
version = "1.2.0";
src = fetchFromGitHub {
owner = "cargo-bins";
repo = "cargo-binstall";
rev = "v${version}";
hash = "sha256-TAHM+R66S8I0QmCI5RHb0mJUf5Ffq6CKH28rxlFoE/I=";
hash = "sha256-baP7F9YL/zm1Ve8jUOby4QLkR+Gy9tSZewQ1JuP822Q=";
};
cargoHash = "sha256-ef7Q+qQRadNseQwoVvAHWADSE7IgrgKppMmMUL2JB10=";
cargoHash = "sha256-wzwLMjOxMJBC0UNIga4FT/gL9syjW0dg9cD60+rwZ/c=";
nativeBuildInputs = [
pkg-config

View file

@ -1,6 +1,6 @@
{
"name": "lemmy-ui",
"version": "0.18.3",
"version": "0.18.4",
"description": "An isomorphic UI for lemmy",
"repository": "https://github.com/LemmyNet/lemmy-ui",
"license": "AGPL-3.0",
@ -34,9 +34,9 @@
]
},
"dependencies": {
"@babel/plugin-proposal-decorators": "^7.21.0",
"@babel/plugin-transform-runtime": "^7.21.4",
"@babel/plugin-transform-typescript": "^7.21.3",
"@babel/plugin-proposal-decorators": "^7.21.5",
"@babel/plugin-transform-runtime": "^7.21.5",
"@babel/plugin-transform-typescript": "^7.21.5",
"@babel/preset-env": "7.21.5",
"@babel/preset-typescript": "^7.21.5",
"@babel/runtime": "^7.21.5",
@ -44,7 +44,7 @@
"autosize": "^6.0.1",
"babel-loader": "^9.1.2",
"babel-plugin-inferno": "^6.6.0",
"bootstrap": "^5.2.3",
"bootstrap": "^5.3.1",
"check-password-strength": "^2.0.7",
"classnames": "^2.3.1",
"clean-webpack-plugin": "^4.0.0",
@ -58,7 +58,7 @@
"express": "~4.18.2",
"history": "^5.3.0",
"html-to-text": "^9.0.5",
"i18next": "^23.2.8",
"i18next": "^23.3.0",
"inferno": "^8.2.2",
"inferno-create-element": "^8.2.2",
"inferno-helmet": "^5.2.1",
@ -81,20 +81,21 @@
"register-service-worker": "^1.7.2",
"run-node-webpack-plugin": "^1.3.0",
"sanitize-html": "^2.11.0",
"sass": "^1.63.6",
"sass": "^1.64.1",
"sass-loader": "^13.3.2",
"serialize-javascript": "^6.0.1",
"service-worker-webpack": "^1.0.0",
"sharp": "^0.32.1",
"sharp": "^0.32.4",
"tippy.js": "^6.3.7",
"toastify-js": "^1.12.0",
"tributejs": "^5.1.3",
"webpack": "5.88.1",
"webpack": "5.88.2",
"webpack-cli": "^5.1.4",
"webpack-node-externals": "^3.0.0"
},
"devDependencies": {
"@babel/core": "^7.21.8",
"@babel/core": "^7.21.5",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@types/autosize": "^4.0.0",
"@types/bootstrap": "^5.2.6",
"@types/cookie": "^0.5.1",
@ -102,29 +103,29 @@
"@types/html-to-text": "^9.0.0",
"@types/lodash.isequal": "^4.5.6",
"@types/markdown-it": "^12.2.3",
"@types/markdown-it-container": "^2.0.5",
"@types/node": "^20.4.0",
"@types/markdown-it-container": "^2.0.6",
"@types/node": "^20.4.5",
"@types/path-browserify": "^1.0.0",
"@types/sanitize-html": "^2.9.0",
"@types/serialize-javascript": "^5.0.1",
"@types/toastify-js": "^1.11.1",
"@typescript-eslint/eslint-plugin": "^5.61.0",
"@typescript-eslint/parser": "^5.61.0",
"eslint": "^8.44.0",
"@types/toastify-js": "^1.12.0",
"@typescript-eslint/eslint-plugin": "^6.2.0",
"@typescript-eslint/parser": "^6.2.0",
"eslint": "^8.45.0",
"eslint-plugin-inferno": "^7.32.2",
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-prettier": "^5.0.0",
"husky": "^8.0.3",
"import-sort-style-module": "^6.0.0",
"lint-staged": "^13.2.3",
"prettier": "^2.8.8",
"prettier": "^3.0.0",
"prettier-plugin-import-sort": "^0.0.7",
"prettier-plugin-organize-imports": "^3.2.2",
"prettier-plugin-packagejson": "^2.4.4",
"prettier-plugin-organize-imports": "^3.2.3",
"prettier-plugin-packagejson": "^2.4.5",
"rimraf": "^5.0.0",
"sortpack": "^2.3.4",
"style-loader": "^3.3.2",
"terser": "^5.18.2",
"terser": "^5.19.2",
"typescript": "^5.1.6",
"typescript-language-server": "^3.3.2",
"webpack-bundle-analyzer": "^4.9.0",

View file

@ -1,8 +1,8 @@
{
"serverVersion": "0.18.3",
"uiVersion": "0.18.3",
"serverHash": "sha256-1feDR3WX4hwaAPEGkM3syb+CsYS3zkzQb2q8be/4UC4=",
"serverCargoHash": "sha256-CVZyOwM0BAeIVy74tj4NNE6occ6yo8eWpMhMb1DnoJY=",
"uiHash": "sha256-asmn5KQ4hhy1yGoeUrQJZLWXPelnb16utQWYplDqIOg=",
"uiYarnDepsHash": "sha256-fRJpA9WstNNNOePoqotJKYmlikkcjc34iM0WO8+a/3Q="
"serverVersion": "0.18.4",
"uiVersion": "0.18.4",
"serverHash": "sha256-J+kjsirEcLz0th3IGVheSShVLbQma1Eip329/q5/3S8=",
"serverCargoHash": "sha256-0UDhHa2QvHoNYJIArpc/o+lkq87tBX/XVgXsr7y/+Rk=",
"uiHash": "sha256-E/rSNWVjiZE5Hl0iIocQfkIdOFSeB0zYXQDq9A3h3lI=",
"uiYarnDepsHash": "sha256-rLP1CQd75nVfI6C0sC21TUskzVfbGHm2fblcYr6JcGc="
}

View file

@ -1,5 +1,5 @@
#! /usr/bin/env nix-shell
#! nix shell -i python3 -p python3 python3.pkgs.semver nix-prefetch-github
#! nix-shell -i python3 -p python3 python3.pkgs.semver nix-prefetch-github
from urllib.request import Request, urlopen
import dataclasses
import subprocess

View file

@ -13,17 +13,17 @@
rustPlatform.buildRustPackage rec {
pname = "pict-rs";
version = "0.4.0";
version = "0.4.2";
src = fetchFromGitea {
domain = "git.asonix.dog";
owner = "asonix";
repo = pname;
rev = "v${version}";
sha256 = "sha256-1WNd7Ei21g01S5ko6y+uyhHP+xlGtnrwU8MLMxnW3P8=";
sha256 = "sha256-3iY16ld2yKf5PffaS1FUwhWD657OAdY4eWHe5f3fIuQ=";
};
cargoHash = "sha256-xD2LvB0xBDAShp4k4VnnhnOWowhU/0OKvkEzI6RzuJY=";
cargoHash = "sha256-uRDRBe3rxkTSmO/uWSLQ6JI/t0KFta2kkf2ZihVYw0A=";
# needed for internal protobuf c wrapper library
PROTOC = "${protobuf}/bin/protoc";

View file

@ -14,21 +14,14 @@
stdenv.mkDerivation rec {
pname = "pokefinder";
version = "4.1.1";
version = "4.1.2";
src = fetchFromGitHub {
owner = "Admiral-Fish";
repo = "PokeFinder";
rev = "v${version}";
sha256 = "fYBeWc9eYLbj4+ku1jwaO5ISL8a7WJnBHJ4qz4W8RHA=";
sha256 = "ps8F6IcbCNybrZ02tbLNyB3YEvKlcYgCpv5Em7Riv+Q=";
fetchSubmodules = true;
# the repo has identical cmake and CMake folders, causing issues on macOS
postFetch = if stdenv.isDarwin then ''
mv $out/cmake $out/cmake.tmp
mv $out/cmake.tmp $out/CMake
'' else ''
rm -rf $out/cmake
'';
};
patches = [ ./set-desktop-file-name.patch ];

View file

@ -5,12 +5,12 @@
stdenv.mkDerivation rec {
pname = "xfstests";
version = "2022.09.04";
version = "2023.05.14";
src = fetchgit {
url = "https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git";
rev = "v${version}";
sha256 = "sha256-hPFoqNmB8pewvBN1nzVMkTrMHCo0xc8tmmIODaiDeRw=";
sha256 = "sha256-yyjY9Q3eUH+q+o15zFUjOcNz1HpXPCwdcxWXoycOx98=";
};
nativeBuildInputs = [

View file

@ -1,7 +1,7 @@
{ lib
, stdenv
, cmake
, buildGoModule
, buildGo118Module
, makeWrapper
, fetchFromGitHub
, pythonPackages
@ -14,12 +14,12 @@
let
# keep this in sync with github.com/DataDog/agent-payload dependency
payloadVersion = "4.78.0";
payloadVersion = "5.0.89";
python = pythonPackages.python;
owner = "DataDog";
repo = "datadog-agent";
goPackagePath = "github.com/${owner}/${repo}";
version = "7.38.1";
version = "7.45.1";
src = fetchFromGitHub {
inherit owner repo;
@ -35,7 +35,7 @@ let
cmakeFlags = ["-DBUILD_DEMO=OFF" "-DDISABLE_PYTHON2=ON"];
};
in buildGoModule rec {
in buildGo118Module rec {
pname = "datadog-agent";
inherit src version;

View file

@ -47,14 +47,15 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Tool for retrieving files using HTTP, HTTPS, and FTP";
homepage = "https://www.gnu.org/software/wget/";
license = licenses.gpl3Plus;
longDescription =
'' GNU Wget is a free software package for retrieving files using HTTP,
HTTPS and FTP, the most widely-used Internet protocols. It is a
non-interactive commandline tool, so it may easily be called from
scripts, cron jobs, terminals without X-Windows support, etc.
'';
license = licenses.gpl3Plus;
homepage = "https://www.gnu.org/software/wget/";
mainProgram = "wget";
maintainers = with maintainers; [ fpletz ];
platforms = platforms.all;
};

View file

@ -60,10 +60,11 @@ python3.pkgs.buildPythonApplication rec {
'';
meta = with lib; {
changelog = "https://github.com/Mic92/nixpkgs-review/releases/tag/${version}";
description = "Review pull-requests on https://github.com/NixOS/nixpkgs";
homepage = "https://github.com/Mic92/nixpkgs-review";
changelog = "https://github.com/Mic92/nixpkgs-review/releases/tag/${version}";
license = licenses.mit;
mainProgram = "nixpkgs-review";
maintainers = with maintainers; [ figsoda mic92 ];
};
}

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "argocd-vault-plugin";
version = "1.15.0";
version = "1.16.0";
src = fetchFromGitHub {
owner = "argoproj-labs";
repo = pname;
rev = "v${version}";
hash = "sha256-59Q6T+k+bFvglhgbydH+GYqcLsZ7EeMTpVa+3EJrZpU=";
hash = "sha256-9gM4CD3MbZX3ZCZ3XCAkdOkE381jgGvg/swto4B74g8=";
};
vendorHash = "sha256-n/bRVShxRmaXL3obRdNQ8OVWVZqWZ9qt59gRxGEUtzk=";
vendorHash = "sha256-r9Pcm95gU0QTiREdiQiyJMOKZb5Lt2bIJywLerzgbdg=";
# integration tests require filesystem and network access for credentials
doCheck = false;

View file

@ -4,19 +4,25 @@
, maven, jdk, makeShellWrapper, glib, wrapGAppsHook
}:
maven.buildMavenPackage rec {
let
mavenJdk = maven.override {
jdk = jdk;
};
in
mavenJdk.buildMavenPackage rec {
pname = "cryptomator";
version = "1.8.0";
version = "1.9.1";
src = fetchFromGitHub {
owner = "cryptomator";
repo = "cryptomator";
rev = version;
hash = "sha256-4MjF2PDH0JB1biY4HO2wOC0i6EIGSlzkK6tDm8nzvIo=";
hash = "sha256-CiM18Rdt7B/TrU7AoNbxouFGC5Gfvm4oLxypYOCAFzA=";
};
mvnParameters = "-Dmaven.test.skip=true";
mvnHash = "sha256-rHLLYkZq3GGE0uhTgZT0tnsh+ChzQdpQ2e+SG1TwBvw=";
mvnHash = "sha256-7gv++Pc+wqmVYaAMgHhSy7xwChfVBgpDFxExzu3bXO0=";
preBuild = ''
VERSION=${version}

View file

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "trufflehog";
version = "3.46.3";
version = "3.47.0";
src = fetchFromGitHub {
owner = "trufflesecurity";
repo = "trufflehog";
rev = "refs/tags/v${version}";
hash = "sha256-IdLNDJYg86dTj+E2w7+sXmNf/MY7eqW9NMAmuhrzm10=";
hash = "sha256-qdVWq+YESSHAmylyOWLygchy1VBxHDOmgk9CxSl22es=";
};
vendorHash = "sha256-ecEms2Zf4EckP2OLoL41S1ZTTnGJhpdMDhknq/mO7qI=";
vendorHash = "sha256-AlyONwUP4Z8S8Qj3hbGFCyhUlYzlN6AIxGzrnQaXBLY=";
ldflags = [
"-s"

View file

@ -11,10 +11,10 @@ buildGoModule rec {
owner = "aswinkarthik";
repo = "csvdiff";
rev = "v${version}";
sha256 = "0cd1ikxsypjqisfnmr7zix3g7x8p892w77086465chyd39gpk97b";
hash = "sha256-66R5XxrNQ1YMMQicw0VCF/XzRo//5Gqdjlher/uMoTE=";
};
vendorSha256 = "1612s4kc0r8zw5y2n6agwdx9kwhxkdrjzagn4g22lzmjq02a64xf";
vendorHash = "sha256-rhOjBMCyfirEI/apL3ObHfKZeuNPGSt84R9lwCbRIpg=";
meta = with lib; {
homepage = "https://aswinkarthik.github.io/csvdiff/";

View file

@ -47,11 +47,12 @@ stdenv.mkDerivation (finalAttrs: {
mesonFlags = [ (lib.mesonEnable "man-pages" buildDocs) ];
meta = with lib; {
homepage = "https://github.com/emersion/slurp";
description = "Select a region in a Wayland compositor";
changelog = "https://github.com/emersion/slurp/releases/tag/v${finalAttrs.version}";
license = licenses.mit;
maintainers = with maintainers; [ buffet ];
description = "Select a region in a Wayland compositor";
inherit (wayland.meta) platforms;
homepage = "https://github.com/emersion/slurp";
license = licenses.mit;
mainProgram = "slurp";
maintainers = with maintainers; [ buffet ];
};
})

View file

@ -29,11 +29,12 @@ rustPlatform.buildRustPackage {
];
meta = with lib; {
inherit (wayland.meta) platforms;
homepage = "https://github.com/Linus789/wl-clip-persist";
description = "Keep Wayland clipboard even after programs close";
license = licenses.mit;
maintainers = with maintainers; [ thiagokokada ];
broken = stdenv.isDarwin;
description = "Keep Wayland clipboard even after programs close";
homepage = "https://github.com/Linus789/wl-clip-persist";
inherit (wayland.meta) platforms;
license = licenses.mit;
mainProgram = "wl-clip-persist";
maintainers = with maintainers; [ thiagokokada ];
};
}

View file

@ -19770,8 +19770,12 @@ with pkgs;
rizin = pkgs.callPackage ../development/tools/analysis/rizin { };
rizinPlugins = recurseIntoAttrs rizin.plugins;
cutter = libsForQt5.callPackage ../development/tools/analysis/rizin/cutter.nix { };
cutterPlugins = recurseIntoAttrs rizin.plugins;
ragel = ragelStable;
randoop = callPackage ../development/tools/analysis/randoop { };
@ -27555,7 +27559,7 @@ with pkgs;
criu = callPackage ../os-specific/linux/criu { };
cryptomator = callPackage ../tools/security/cryptomator {
jdk = jdk.override { enableJavaFX = true; };
jdk = jdk20.override { enableJavaFX = true; };
};
cryptsetup = callPackage ../os-specific/linux/cryptsetup { };

View file

@ -4238,6 +4238,8 @@ self: super: with self; {
git-sweep = callPackage ../development/python-modules/git-sweep { };
git-url-parse = callPackage ../development/python-modules/git-url-parse { };
gitdb = callPackage ../development/python-modules/gitdb { };
github-to-sqlite = callPackage ../development/python-modules/github-to-sqlite { };

View file

@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1d72cqx1h9c0yl1vc8xakvji00krg118ih6lwqlg5nbw50gbx25c";
sha256 = "1dbzp5lk7canhdrs8n8cap3mwnanfn6i7yn76ba8kzn0h1cx077a";
type = "gem";
};
version = "7.0.6";
version = "7.0.7";
};
actionmailbox = {
dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"];
@ -16,10 +16,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "12xkyfdpr7ljnd31yhc2kzl0rqrlwxzpg4qcn4yb2h364hwc6fh8";
sha256 = "09640w7sqmxv1gxsw9gfnfdl95qgm90s38n49jyqyqavxnwgnbbs";
type = "gem";
};
version = "7.0.6";
version = "7.0.7";
};
actionmailer = {
dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"];
@ -27,10 +27,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01x11ijfg56585vj7a7az0235idnxcnyjp1nb1jvkm08jjll5d1k";
sha256 = "15ni57icsw1ilz5srlasff4h31h2ckgmxbdd8jnbniscvz4x2sd0";
type = "gem";
};
version = "7.0.6";
version = "7.0.7";
};
actionpack = {
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
@ -38,10 +38,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0d66w1d9rhvafd0dilqyr1ymsvr060l8hi0xvwij7cyvzzxrlrbc";
sha256 = "150sjsk12vzj9aswjy3cz124l8n8sn52bhd0wwly73rwc1a750sg";
type = "gem";
};
version = "7.0.6";
version = "7.0.7";
};
actiontext = {
dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"];
@ -49,10 +49,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bpyfh8g0mzgkb8bxvf245mwnx1awbr1y6dxcdckyhsjjgrfynfl";
sha256 = "0m6bdgspimlsakvi2dwndlf6i9wc1iwcjcm2nmpdfn2jj836fprm";
type = "gem";
};
version = "7.0.6";
version = "7.0.7";
};
actionview = {
dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
@ -60,10 +60,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1icfh9pgjpd29apzn07cnqa9nlpvjv7i4vrygack5gp7hp54l8m7";
sha256 = "1nn21k5psxdv2fkwxs679lr0b8n1nzli2ks343cx4azn6snp8b8a";
type = "gem";
};
version = "7.0.6";
version = "7.0.7";
};
activejob = {
dependencies = ["activesupport" "globalid"];
@ -71,10 +71,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1gawwb6550ra1xgbrki03aq4q5wafa3xfrpdr3cva4ghy3qqn53q";
sha256 = "0s5r5z9jm57jjabh8w2823rpjd1agn8z2rlqgyyn4s9pbbhgalzy";
type = "gem";
};
version = "7.0.6";
version = "7.0.7";
};
activemodel = {
dependencies = ["activesupport"];
@ -82,10 +82,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "072iv0d3vpbp0xijg4jj99sjil1rykmqfj9addxj76bm5mbzwcaj";
sha256 = "1rspbw4yxx9fh2wyl2wvgwadwapfyx7j9zlirpd4pmk31wkhl4hf";
type = "gem";
};
version = "7.0.6";
version = "7.0.7";
};
activerecord = {
dependencies = ["activemodel" "activesupport"];
@ -93,10 +93,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1l0rn43bhyzlfa4wwcfz016vb4lkzvl0jf5zibkjy4sppxxixzrq";
sha256 = "1ygg145wxlgm12b1x5r0rsk2aa6i2wjz7bgb21j8vmyqyfl272cy";
type = "gem";
};
version = "7.0.6";
version = "7.0.7";
};
activestorage = {
dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"];
@ -104,10 +104,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "036mv935r5mmh7fljz10lyr43c5y5bn8b6h7gdkv8spfgwzihw4j";
sha256 = "1gaxpqw4mv7xrk1iaw9jspf4m201mkmchc0c22ax3snm3v6jg2qv";
type = "gem";
};
version = "7.0.6";
version = "7.0.7";
};
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
@ -115,10 +115,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1cjsf26656996hv48wgv2mkwxf0fy1qc68ikgzq7mzfq2mmvmayk";
sha256 = "1wzbnv3hns0yiwbgh1m3q5j0d7b0k52nlpwirhxyv3l0ycmljfr9";
type = "gem";
};
version = "7.0.6";
version = "7.0.7";
};
addressable = {
dependencies = ["public_suffix"];
@ -126,10 +126,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20";
sha256 = "05r1fwy487klqkya7vzia8hnklcxy4vr92m9dmni3prfwk6zpw33";
type = "gem";
};
version = "2.8.4";
version = "2.8.5";
};
algoliasearch = {
dependencies = ["httpclient" "json"];
@ -213,6 +213,16 @@
};
version = "1.2.0";
};
base64 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0cydk9p2cv25qysm0sn2pb97fcpz1isa7n3c8xm1gd99li8x6x8c";
type = "gem";
};
version = "0.1.1";
};
benchmark = {
groups = ["default"];
platforms = [];
@ -223,6 +233,16 @@
};
version = "0.2.1";
};
bindata = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "04y4zgh4bbcb8wmkxwfqg4saky1d1f3xw8z6yk543q13h8ky8rz5";
type = "gem";
};
version = "2.4.15";
};
builder = {
groups = ["default"];
platforms = [];
@ -685,10 +705,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "074162raa8pc92q6833hgqdlfr3z5jgid9avdz5k25cnls2rqwrf";
sha256 = "1lb5slzbqrca49h0gaifg82xky5r7i9xgm4560pin1xl5fp15lzx";
type = "gem";
};
version = "0.23.9";
version = "0.23.10";
};
concurrent-ruby = {
groups = ["default"];
@ -710,6 +730,17 @@
};
version = "2.4.1";
};
crabstone = {
dependencies = ["ffi"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "154g3l1flndm5pvnhjnrn47ndnsxvfm8y1kv4zhnwiys28pv40nb";
type = "gem";
};
version = "4.0.4";
};
crass = {
groups = ["default"];
platforms = [];
@ -771,6 +802,17 @@
};
version = "3.3.3";
};
dentaku = {
dependencies = ["concurrent-ruby"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ssmjs7x733n7x6zvcwkaq2rnl0sz1qslli19s730a7ny7pialqg";
type = "gem";
};
version = "3.4.2";
};
dep-selector-libgecode = {
groups = ["default"];
platforms = [];
@ -875,6 +917,17 @@
};
version = "0.1.0";
};
elftools = {
dependencies = ["bindata"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0p96wj4sz3sfv9yxyl8z530554bkbf82vj24w6x7yf91qa1p8z6i";
type = "gem";
};
version = "1.1.3";
};
em-websocket = {
dependencies = ["eventmachine" "http_parser.rb"];
groups = ["default"];
@ -1940,6 +1993,17 @@
};
version = "2.7.1";
};
keystone-engine = {
dependencies = ["ffi"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0waz2bj1dsl63416k1n0vvrwva425rm94gsza7ci49mm1wjdabh2";
type = "gem";
};
version = "0.9.0";
};
kramdown = {
dependencies = ["rexml"];
groups = ["default"];
@ -2145,20 +2209,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb";
sha256 = "1s95nyppk5wrpfgqrzf6f00g7nk0662zmxm4mr2vbdbl83q3k72x";
type = "gem";
};
version = "3.4.1";
version = "3.5.0";
};
mime-types-data = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pky3vzaxlgm9gw5wlqwwi7wsw3jrglrfflrppvvnsrlaiz043z9";
sha256 = "17zdim7kzrh5j8c97vjqp4xp78wbyz7smdp4hi5iyzk0s9imdn5a";
type = "gem";
};
version = "3.2023.0218.1";
version = "3.2023.0808";
};
mini_magick = {
groups = ["default"];
@ -2175,10 +2239,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5";
sha256 = "1vycif7pjzkr29mfk4dlqv3disc5dn0va04lkwajlpr1wkibg0c6";
type = "gem";
};
version = "1.1.2";
version = "1.1.5";
};
mini_portile2 = {
groups = ["default"];
@ -2362,10 +2426,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0yx0pb5fmziz92bw8qzbh8vf20lr56nd3s6q8h0gsgr307lki687";
sha256 = "1jyj6j7w9zpj2zhp4dyhdjiwsn9rqwksj7s7fzpnn7rx2xvz2a1a";
type = "gem";
};
version = "7.1.0";
version = "7.2.0";
};
netrc = {
groups = ["default"];
@ -2420,6 +2484,17 @@
};
version = "0.2.3";
};
one_gadget = {
dependencies = ["elftools"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0v079xkzzr1bjff5z2wlzs0k11nk4b04kgy1p63lwhbl12jl7qz1";
type = "gem";
};
version = "1.7.4";
};
openssl = {
groups = ["default"];
platforms = [];
@ -2662,6 +2737,17 @@
};
version = "6.3.0";
};
pwntools = {
dependencies = ["crabstone" "dentaku" "elftools" "keystone-engine" "method_source" "one_gadget" "rainbow" "ruby2ruby" "rubyserial"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0pxc3lcgnywglv0skzj1r8i4p8mwcj27hlwzwqf8sj2mn3iqyjnd";
type = "gem";
};
version = "1.2.1";
};
racc = {
groups = ["default"];
platforms = [];
@ -2677,10 +2763,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "16w217k9z02c4hqizym8dkj6bqmmzx4qdvqpnskgzf174a5pwdxk";
sha256 = "15rdwbyk71c9nxvd527bvb8jxkcys8r3dj3vqra5b3sa63qs30vv";
type = "gem";
};
version = "2.2.7";
version = "2.2.8";
};
rack-protection = {
dependencies = ["rack"];
@ -2688,10 +2774,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1kpm67az1wxlg76h620in2r7agfyhv177ps268j5ggsanzddzih8";
sha256 = "0xsz78hccgza144n37bfisdkzpr2c8m0xl6rnlzgxdbsm1zrkg7r";
type = "gem";
};
version = "3.0.6";
version = "3.1.0";
};
rack-test = {
dependencies = ["rack"];
@ -2710,10 +2796,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08glp6jhq5yh8i5jjxzqa3aqx819l6ci6m68bx1asmimla0x9ysx";
sha256 = "06rd03bpdg29gql5xb6ijdq9br5060v4bykaz739zx2qm8xnjs9j";
type = "gem";
};
version = "7.0.6";
version = "7.0.7";
};
rails-dom-testing = {
dependencies = ["activesupport" "minitest" "nokogiri"];
@ -2721,10 +2807,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "17g05y7q7934z0ib4aph8h71c2qwjmlakkm7nb2ab45q0aqkfgjd";
sha256 = "0fx9dx1ag0s1lr6lfr34lbx5i1bvn3bhyf3w3mx6h7yz90p725g5";
type = "gem";
};
version = "2.1.1";
version = "2.2.0";
};
rails-html-sanitizer = {
dependencies = ["loofah" "nokogiri"];
@ -2743,10 +2829,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0dcabk5bl5flmspnb9d2qcvclcaw0nd5yr9w6m5pzsmylg3y63pv";
sha256 = "0in2b84qqmfnigx0li9bgi6l4knmgbj3a29fzm1zzb5jnv4r1gbr";
type = "gem";
};
version = "7.0.6";
version = "7.0.7";
};
rainbow = {
groups = ["default"];
@ -2867,10 +2953,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "10r5z5mg1x5kjx3wvwx5d8bqgd2j8pc4dlaasq7nmnl3nsn7sn9k";
sha256 = "00qqqzgh7f0f2j6rkbm5v7976mg8ik4sapk2vnb3rq98m8xc1wfw";
type = "gem";
};
version = "5.0.6";
version = "5.0.7";
};
redis-client = {
dependencies = ["connection_pool"];
@ -2878,10 +2964,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ih4zghnb888jd5vh8ymvvkfx9bq7cyhi750zgvl7s64bzphwz9v";
sha256 = "0fbs2fbl1g5lra43qk6rawbvynj2qgdzyx1gnjsjcxbl8247bahl";
type = "gem";
};
version = "0.14.1";
version = "0.15.0";
};
redis-rack = {
dependencies = ["rack" "redis-store"];
@ -3033,15 +3119,15 @@
version = "3.12.1";
};
rubocop = {
dependencies = ["json" "language_server-protocol" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"];
dependencies = ["base64" "json" "language_server-protocol" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "17c94wl2abqzf4fj469mdxzap1sd3410x421nl6mh2w49jsgvpki";
sha256 = "1ig23w64f9y1gi6l4pv69m0nfhn3nnr3q4s81br9vl1b1z02n5cn";
type = "gem";
};
version = "1.55.0";
version = "1.56.0";
};
rubocop-ast = {
dependencies = ["parser"];
@ -3103,10 +3189,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1iyxcr34p3hy7rjgrrlg6z9libiqy1als62rk3d37ixsbjdy6iyd";
sha256 = "0xzl5na2n3g47w9arf0cj0dpdlxssd0bhbsg5h12kpa8lp24ki1y";
type = "gem";
};
version = "0.7.4";
version = "0.8.0";
};
ruby-lxc = {
groups = ["default"];
@ -3169,6 +3255,39 @@
};
version = "0.0.5";
};
ruby2ruby = {
dependencies = ["ruby_parser" "sexp_processor"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "04bz2jw3ida07mgk450l9m6xklhzbv0z4s6ak6bl7vp4rhcy41f8";
type = "gem";
};
version = "2.5.0";
};
ruby_parser = {
dependencies = ["sexp_processor"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0j8w4mqhqaw53jd27cfhq1mq02d1r606x9fmrpfzz0fwjnk8j8ld";
type = "gem";
};
version = "3.20.3";
};
rubyserial = {
dependencies = ["ffi"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vj5yan6srbvkf5vfp9d9b9z8wyygd0zxcy54c35yhkjl6kwd22q";
type = "gem";
};
version = "0.6.0";
};
rubyzip = {
groups = ["default"];
platforms = [];
@ -3269,10 +3388,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zm5lfvhc1j7nq73s7i4g93kfbb3fg81jicf3sbfh2w5gm59nq7v";
sha256 = "1jan1hyrsxi964caqm81w364fmczz4xrbd2fi9ciw1hmyb9cm7m4";
type = "gem";
};
version = "5.70.0";
version = "5.71.0";
};
sequel_pg = {
dependencies = ["pg" "sequel"];
@ -3285,6 +3404,16 @@
};
version = "1.17.1";
};
sexp_processor = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0vzz9mhg4kkdqf179pm30i204h7iskanxrk53j0csf0qrrs4iajd";
type = "gem";
};
version = "4.17.0";
};
simplecov = {
dependencies = ["docile" "simplecov-html" "simplecov_json_formatter"];
groups = ["default"];
@ -3333,10 +3462,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1q0ghxfqgjhg2dq9699mn5qx6m6q2cgldg312kh41pzwwy71a7hx";
sha256 = "00541cnypsh1mnilfxxqlz6va9afrixf9m1asn4wzjp5m59777p8";
type = "gem";
};
version = "3.0.6";
version = "3.1.0";
};
slather = {
dependencies = ["CFPropertyList" "activesupport" "clamp" "nokogiri" "xcodeproj"];
@ -3395,10 +3524,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0n197kk9nqf955lsphns835sbkz7wcgbpppad482iqx95bhf8i6l";
sha256 = "1abdrhb4sf5wwlvli87nh5jiy13dy2szv448h6a4bzyrg3nf47fx";
type = "gem";
};
version = "0.5.10932";
version = "0.5.10957";
};
sqlite3 = {
dependencies = ["mini_portile2"];
@ -3651,16 +3780,6 @@
};
version = "7.0.0";
};
webrick = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "13qm7s0gr2pmfcl7dxrmq38asaza4w0i2n9my4yzs499j731wh8r";
type = "gem";
};
version = "1.8.1";
};
websocket-driver = {
dependencies = ["websocket-extensions"];
groups = ["default"];
@ -3728,10 +3847,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0v14hl814knwi8pm2n09bpgcd107jafv4lnj9zmcsgfwbqxin3sq";
sha256 = "1mwdd445w63khz13hpv17m2br5xngyjl3jdj08xizjbm78i2zrxd";
type = "gem";
};
version = "2.6.9";
version = "2.6.11";
};
zookeeper = {
groups = ["default"];