mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-21 04:13:12 +00:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
4c8722e915
@ -15997,6 +15997,12 @@
|
||||
githubId = 43863;
|
||||
name = "Philip Taron";
|
||||
};
|
||||
philipwilk = {
|
||||
name = "Philip Wilk";
|
||||
email = "p.wilk@student.reading.ac.uk";
|
||||
github = "philipwilk";
|
||||
githubId = 50517631;
|
||||
};
|
||||
philtaken = {
|
||||
email = "philipp.herzog@protonmail.com";
|
||||
github = "philtaken";
|
||||
|
||||
@ -17,9 +17,7 @@ in
|
||||
|
||||
options = {
|
||||
programs.chromium = {
|
||||
enable = lib.mkEnableOption "the {command}`chromium` web browser";
|
||||
|
||||
package = lib.mkPackageOption pkgs "chromium" { };
|
||||
enable = lib.mkEnableOption "{command}`chromium` policies";
|
||||
|
||||
enablePlasmaBrowserIntegration = lib.mkEnableOption "Native Messaging Host for Plasma Browser Integration";
|
||||
|
||||
@ -121,9 +119,8 @@ in
|
||||
|
||||
###### implementation
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
environment.etc = {
|
||||
config = {
|
||||
environment.etc = lib.mkIf cfg.enable {
|
||||
# for chromium
|
||||
"chromium/native-messaging-hosts/org.kde.plasma.browser_integration.json" = lib.mkIf cfg.enablePlasmaBrowserIntegration
|
||||
{ source = "${cfg.plasmaBrowserIntegrationPackage}/etc/chromium/native-messaging-hosts/org.kde.plasma.browser_integration.json"; };
|
||||
|
||||
@ -194,4 +194,22 @@ declare-option -hidden str ansi_filter %{'"$out"'/bin/kak-ansi-filter}
|
||||
platforms = platforms.all;
|
||||
};
|
||||
};
|
||||
|
||||
kakoune-catppuccin = buildKakounePluginFrom2Nix {
|
||||
pname = "kakoune-catppuccin";
|
||||
version = "0-unstable-2024-03-29";
|
||||
src = fetchFromGitHub {
|
||||
owner = "catppuccin";
|
||||
repo = "kakoune";
|
||||
rev = "7f187d9da2867a7fda568b2135d29b9c00cfbb94";
|
||||
hash = "sha256-acBOQuJ8MgsMKdvFV5B2CxuxvXIYsg11n1mHEGqd120=";
|
||||
};
|
||||
meta = with lib; {
|
||||
description = "Soothing pastel theme for Kakoune";
|
||||
homepage = "https://github.com/catppuccin/kakoune/";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ philipwilk ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,16 +1,23 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, kubernetes-helm }:
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
testers,
|
||||
kubernetes-helm,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubernetes-helm";
|
||||
version = "3.15.3";
|
||||
version = "3.15.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "helm";
|
||||
repo = "helm";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-m5k1MUncx9xSGu49Qjy1MByl3h6Qz7VCNrveqRVjtdQ=";
|
||||
sha256 = "sha256-hFQX9v37cXJ4wv1aQnBOBlmVWUiZuKrjCJ/R4dzUa/4=";
|
||||
};
|
||||
vendorHash = "sha256-2q5IziYSW2FFfRZvWKz6dVnJfauRlE9lRrb4/l2EGC0=";
|
||||
vendorHash = "sha256-lR/6n+EH4Nhs1Q/BqEkMlugM74NtEtT+SKQQHc6+Zjk=";
|
||||
|
||||
subPackages = [ "cmd/helm" ];
|
||||
ldflags = [
|
||||
@ -68,6 +75,13 @@ buildGoModule rec {
|
||||
description = "Package manager for kubernetes";
|
||||
mainProgram = "helm";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ rlupton20 edude03 saschagrunert Frostman Chili-Man techknowlogick ];
|
||||
maintainers = with maintainers; [
|
||||
rlupton20
|
||||
edude03
|
||||
saschagrunert
|
||||
Frostman
|
||||
Chili-Man
|
||||
techknowlogick
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubectl-view-secret";
|
||||
version = "0.12.1";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elsesiy";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0/gz3fquqZCRbHQrBBLXs2rwQPkyktEcBMQ46GfMauo=";
|
||||
hash = "sha256-mdooeKlwoPxiAHaOuhMF+Zx1l0uZ1OYMgDADI7JbYDc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-OJboCLa+ntKOhmQ9zs5aF/mio5OFsr/f/IS0PAwAi6U=";
|
||||
vendorHash = "sha256-5mSS7UWfdk28oXk/ONnnjj4OMGJAtH26xGES4NGZuTc=";
|
||||
|
||||
subPackages = [ "./cmd/" ];
|
||||
|
||||
|
||||
@ -45,14 +45,14 @@ let
|
||||
|
||||
pname = "slack";
|
||||
|
||||
x86_64-darwin-version = "4.39.90";
|
||||
x86_64-darwin-sha256 = "0wdvsw0m1jks1n97anzamssicl9jfx9js480q3kl9hd80viz97lq";
|
||||
x86_64-darwin-version = "4.39.95";
|
||||
x86_64-darwin-sha256 = "1bvafqnh60ps5dba473l6zpm6hw7qcmpj55mxm6amakvkp63d92s";
|
||||
|
||||
x86_64-linux-version = "4.39.90";
|
||||
x86_64-linux-sha256 = "00ygbka304xnh99s17hh51lxjdkv2flh6nmn143dkj7qqabgrll8";
|
||||
x86_64-linux-version = "4.39.95";
|
||||
x86_64-linux-sha256 = "06d4mnvk3fj57laygf08nlh970wb4jvq1kycv27h1bq6bq365b6n";
|
||||
|
||||
aarch64-darwin-version = "4.39.90";
|
||||
aarch64-darwin-sha256 = "0rm0khbf2bqxs2ddlmss7m3sb5yy05lb96kv0a065ifadzcf5zsb";
|
||||
aarch64-darwin-version = "4.39.95";
|
||||
aarch64-darwin-sha256 = "0kmbf9nd6ccng8a9qb02i2n2mcrjk45cqphx0k7drwd4nyn6zzmy";
|
||||
|
||||
version = {
|
||||
x86_64-darwin = x86_64-darwin-version;
|
||||
|
||||
@ -3648,6 +3648,12 @@ dependencies = [
|
||||
"num-traits",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-conv"
|
||||
version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
|
||||
|
||||
[[package]]
|
||||
name = "num-derive"
|
||||
version = "0.3.3"
|
||||
@ -5554,12 +5560,13 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "time"
|
||||
version = "0.3.31"
|
||||
version = "0.3.36"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e"
|
||||
checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
|
||||
dependencies = [
|
||||
"deranged",
|
||||
"itoa",
|
||||
"num-conv",
|
||||
"powerfmt",
|
||||
"serde",
|
||||
"time-core",
|
||||
@ -5589,10 +5596,11 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "time-macros"
|
||||
version = "0.2.16"
|
||||
version = "0.2.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f"
|
||||
checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
|
||||
dependencies = [
|
||||
"num-conv",
|
||||
"time-core",
|
||||
]
|
||||
|
||||
|
||||
@ -43,6 +43,8 @@ rustPlatform.buildRustPackage rec {
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
cp ${./Cargo.lock} Cargo.lock
|
||||
|
||||
echo ${version} > .tag
|
||||
|
||||
# tests are failing with: Unable to exchange encryption keys
|
||||
|
||||
@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "delta";
|
||||
version = "0.17.0";
|
||||
version = "0.17.0-unstable-2024-08-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dandavison";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-r0ED9o2UP91fe6Bng5ioJra5S1bg+UEXMLeSQPkMswI=";
|
||||
rev = "a01141b72001f4c630d77cf5274267d7638851e4";
|
||||
hash = "sha256-My51pQw5a2Y2VTu39MmnjGfmCavg8pFqOmOntUildS0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-3CxRNhcjfDK/xUuM3w+GwqE0+X6WT92/LGj/qRp0TwA=";
|
||||
cargoHash = "sha256-Rlc3Bc6Jh89KLLEWBWQB5GjoeIuHnwIVZN/MVFMjY24=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
let
|
||||
defaultSingularity = singularity;
|
||||
in
|
||||
rec {
|
||||
lib.makeExtensible (final: {
|
||||
# TODO(@ShamrockLee): Remove after Nixpkgs 24.11 branch-off.
|
||||
shellScript =
|
||||
lib.warn
|
||||
@ -82,20 +82,28 @@ rec {
|
||||
util-linux
|
||||
];
|
||||
strictDeps = true;
|
||||
layerClosure = writeClosure contents;
|
||||
layerClosure = writeClosure (
|
||||
[
|
||||
bashInteractive
|
||||
runScriptFile
|
||||
]
|
||||
++ contents
|
||||
);
|
||||
preVM = vmTools.createEmptyImage {
|
||||
size = diskSize;
|
||||
fullName = "${projectName}-run-disk";
|
||||
# Leaving "$out" for the Singularity/Container image
|
||||
destination = "disk-image";
|
||||
};
|
||||
inherit memSize;
|
||||
}
|
||||
''
|
||||
rm -rf $out
|
||||
mkdir disk
|
||||
rmdir "$out"
|
||||
mkdir workspace
|
||||
mkfs -t ext3 -b 4096 /dev/${vmTools.hd}
|
||||
mount /dev/${vmTools.hd} disk
|
||||
mkdir -p disk/img
|
||||
cd disk/img
|
||||
mount /dev/${vmTools.hd} workspace
|
||||
mkdir -p workspace/img
|
||||
cd workspace/img
|
||||
mkdir proc sys dev
|
||||
|
||||
# Run root script
|
||||
@ -108,14 +116,20 @@ rec {
|
||||
|
||||
# Build /bin and copy across closure
|
||||
mkdir -p bin ./${builtins.storeDir}
|
||||
for f in $(cat $layerClosure) ; do
|
||||
cp -ar $f ./$f
|
||||
done
|
||||
# Loop over the line-separated paths in $layerClosure
|
||||
while IFS= read -r f; do
|
||||
cp -r "$f" "./$f"
|
||||
done < "$layerClosure"
|
||||
|
||||
for c in ${toString contents} ; do
|
||||
for f in $c/bin/* ; do
|
||||
if [ ! -e bin/$(basename $f) ] ; then
|
||||
ln -s $f bin/
|
||||
# TODO(@ShamrockLee):
|
||||
# Once vmTools.runInLinuxVMm works with `__structuredAttrs = true` (#334705),
|
||||
# set __structuredAttrs = true and pass contents as an attribute
|
||||
# so that we could loop with `for c in ''${contents[@]}`
|
||||
# instead of expanding all the paths in contents into the Bash string.
|
||||
for c in ${lib.escapeShellArgs contents} ; do
|
||||
for f in "$c"/bin/* ; do
|
||||
if [ ! -e "bin/$(basename "$f")" ] ; then
|
||||
ln -s "$f" bin/
|
||||
fi
|
||||
done
|
||||
done
|
||||
@ -135,10 +149,10 @@ rec {
|
||||
mkdir -p /var/lib/${projectName}/mnt/session
|
||||
echo "root:x:0:0:System administrator:/root:/bin/sh" > /etc/passwd
|
||||
echo > /etc/resolv.conf
|
||||
TMPDIR=$(pwd -P) ${projectName} build $out ./img
|
||||
TMPDIR="$(pwd -P)" ${projectName} build "$out" ./img
|
||||
''
|
||||
);
|
||||
|
||||
in
|
||||
result;
|
||||
}
|
||||
})
|
||||
|
||||
@ -289,9 +289,9 @@ let
|
||||
celery
|
||||
channels
|
||||
channels-redis
|
||||
codespell
|
||||
colorama
|
||||
dacite
|
||||
daphne
|
||||
deepmerge
|
||||
defusedxml
|
||||
django
|
||||
@ -324,7 +324,6 @@ let
|
||||
packaging
|
||||
paramiko
|
||||
psycopg
|
||||
pycryptodome
|
||||
pydantic
|
||||
pydantic-scim
|
||||
pyjwt
|
||||
@ -344,13 +343,15 @@ let
|
||||
uvicorn
|
||||
watchdog
|
||||
webauthn
|
||||
websockets
|
||||
wsproto
|
||||
xmlsec
|
||||
zxcvbn
|
||||
]
|
||||
++ uvicorn.optional-dependencies.standard
|
||||
++ [ codespell ];
|
||||
++ channels.optional-dependencies.daphne
|
||||
++ django-storages.optional-dependencies.s3
|
||||
++ opencontainers.optional-dependencies.reggie
|
||||
++ psycopg.optional-dependencies.c
|
||||
++ uvicorn.optional-dependencies.standard;
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/web $out/website
|
||||
|
||||
@ -69,6 +69,14 @@ py.pkgs.buildPythonApplication rec {
|
||||
hash = "sha256-HxFtMFeGR6XAMsP5LM0tvJ/ECWVpveIhWRTKvf8uYA0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Temporary test fix until https://github.com/aws/aws-cli/pull/8838 is merged upstream
|
||||
(fetchpatch {
|
||||
url = "https://github.com/aws/aws-cli/commit/b5f19fe136ab0752cd5fcab21ff0ab59bddbea99.patch";
|
||||
hash = "sha256-NM+nVlpxGAHVimrlV0m30d4rkFVb11tiH8Y6//2QhMI=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail 'awscrt>=0.19.18,<=0.20.11' 'awscrt>=0.19.18' \
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
let
|
||||
pname = "elvish";
|
||||
version = "0.20.1";
|
||||
version = "0.21.0";
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version;
|
||||
@ -15,10 +15,10 @@ buildGoModule {
|
||||
owner = "elves";
|
||||
repo = "elvish";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lKrX38gVUhYwwuNF25LcZ+TytP4vx/GO7ay6Au4BBZA=";
|
||||
hash = "sha256-+qkr0ziHWs3MVhBoqAxrwwbsQVvmGHRKrlqiujqBKvs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-sgVGqpncV7Ylok5FRcV01a3MCX6UdZvTt3nfVh5L2so=";
|
||||
vendorHash = "sha256-UjX1P8v97Mi5cLWv3n7pmxgnw+wCr4aRTHDHHd/9+Lo=";
|
||||
|
||||
subPackages = [ "cmd/elvish" ];
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fanbox-dl";
|
||||
version = "0.23.0";
|
||||
version = "0.23.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hareku";
|
||||
repo = "fanbox-dl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hR6aO9Mdm3lxRqt1l3Qryp4ggO5B+poYBcq9k1XNrvs=";
|
||||
hash = "sha256-EO1J90uH2J8EI51qGzIQyl4BbSwijkEi5ZQENgSMEm8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-GD5uxa5XWhlHHBztTpDKCTSym2pdkr/or6aGl9qF29U=";
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fast-float";
|
||||
version = "6.1.3";
|
||||
version = "6.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastfloat";
|
||||
repo = "fast_float";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-CMPk2RNbfPT+Pe2L9nS/i1JNXM0giuX+lOuF1g9tn9s=";
|
||||
hash = "sha256-0eVovauN7SnO3nSIWBRWAJ4dR7q5beZrIGUZ18M2pao=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -1,6 +1,9 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
stdenv,
|
||||
darwin,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jnv";
|
||||
@ -15,11 +18,22 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
cargoHash = "sha256-xF0sxoSo7z7lxrF3wFAmU7edREoWKBFBnZ6Xq22c8q0=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin (
|
||||
with darwin.apple_sdk.frameworks;
|
||||
[
|
||||
CoreGraphics
|
||||
AppKit
|
||||
]
|
||||
);
|
||||
|
||||
meta = with lib; {
|
||||
description = "Interactive JSON filter using jq";
|
||||
mainProgram = "jnv";
|
||||
homepage = "https://github.com/ynqa/jnv";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ nealfennimore nshalman ];
|
||||
maintainers = with maintainers; [
|
||||
nealfennimore
|
||||
nshalman
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,4 +1,18 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, gettext, libdnf, pkg-config, glib, libpeas, libsmartcols, help2man }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
gettext,
|
||||
libdnf,
|
||||
pkg-config,
|
||||
glib,
|
||||
libpeas,
|
||||
libsmartcols,
|
||||
help2man,
|
||||
zchunk,
|
||||
pcre2,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "microdnf";
|
||||
@ -11,15 +25,28 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-R7jOeH6pw/THLXxLezp2AmE8lUBagKMRJ0XfXgdLi2E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake gettext help2man ];
|
||||
buildInputs = [ libdnf glib libpeas libsmartcols ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
cmake
|
||||
gettext
|
||||
help2man
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
buildInputs = [
|
||||
libdnf
|
||||
glib
|
||||
libpeas
|
||||
libsmartcols
|
||||
zchunk
|
||||
pcre2.dev
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Lightweight implementation of dnf in C";
|
||||
homepage = "https://github.com/rpm-software-management/microdnf";
|
||||
license = licenses.gpl2Plus;
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ rb2k ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
mainProgram = "microdnf";
|
||||
};
|
||||
}
|
||||
@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mosdns";
|
||||
version = "5.3.1";
|
||||
version = "5.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IrineSistiana";
|
||||
repo = "mosdns";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-QujkDx899GAImEtQE28ru7H0Zym5SYXJbJEfSBkJYjo=";
|
||||
hash = "sha256-nSqSfbpi91W28DaLjCsWlPiLe1gLVHeZnstktc/CLag=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-0J5hXb1W8UruNG0KFaJBOQwHl2XiWg794A6Ktgv+ObM=";
|
||||
vendorHash = "sha256-RpvWkIDhHSNbdkpBCcXYbbvbmGiG15qyB5aEJRmg9s4=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "paper-age";
|
||||
version = "1.3.2";
|
||||
version = "1.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matiaskorhonen";
|
||||
repo = "paper-age";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-OnCE277CeU9k7NGO0fEF2wI9S1wxOw4lK7iSNp1D+KQ=";
|
||||
hash = "sha256-XnJSsxWe4/NLOqBjU7++bwLtVfIR9n8hpBxL3K8Bmho=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-2WhzXr5ugPu56BS++MiTNOzcJxSL9F17IM/+yfjkL8k=";
|
||||
cargoHash = "sha256-808+lQxjE9dxgNZm/FuZwFuBFJgx/7kCpNn+FrMvuoY=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Easy and secure paper backups of secrets";
|
||||
|
||||
@ -27,6 +27,7 @@ python3Packages.buildPythonApplication rec {
|
||||
in runCommand "${src-tarball.name}-unpacked" {} ''
|
||||
gunzip -ck ${src-tarball} | tar -xvf-
|
||||
mv rcu $out
|
||||
ln -s ${src-tarball} $out/src
|
||||
'';
|
||||
|
||||
patches = [
|
||||
|
||||
@ -95,9 +95,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "anstyle"
|
||||
version = "1.0.6"
|
||||
version = "1.0.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
|
||||
checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
|
||||
|
||||
[[package]]
|
||||
name = "anstyle-parse"
|
||||
@ -288,7 +288,7 @@ dependencies = [
|
||||
"android-tzdata",
|
||||
"iana-time-zone",
|
||||
"num-traits",
|
||||
"windows-targets 0.52.5",
|
||||
"windows-targets 0.52.6",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -320,9 +320,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "4.5.13"
|
||||
version = "4.5.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc"
|
||||
checksum = "11d8838454fda655dafd3accb2b6e2bea645b9e4078abe84a22ceb947235c5cc"
|
||||
dependencies = [
|
||||
"clap_builder",
|
||||
"clap_derive",
|
||||
@ -330,9 +330,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "clap_builder"
|
||||
version = "4.5.13"
|
||||
version = "4.5.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99"
|
||||
checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6"
|
||||
dependencies = [
|
||||
"anstream",
|
||||
"anstyle",
|
||||
@ -820,14 +820,14 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "filetime"
|
||||
version = "0.2.23"
|
||||
version = "0.2.24"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
|
||||
checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"redox_syscall",
|
||||
"windows-sys 0.52.0",
|
||||
"libredox",
|
||||
"windows-sys 0.59.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -1143,9 +1143,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "is-macro"
|
||||
version = "0.3.5"
|
||||
version = "0.3.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "59a85abdc13717906baccb5a1e435556ce0df215f242892f721dff62bf25288f"
|
||||
checksum = "2069faacbe981460232f880d26bf3c7634e322d49053aa48c27e3ae642f728f1"
|
||||
dependencies = [
|
||||
"Inflector",
|
||||
"proc-macro2",
|
||||
@ -1297,6 +1297,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
|
||||
dependencies = [
|
||||
"bitflags 2.6.0",
|
||||
"libc",
|
||||
"redox_syscall 0.5.3",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -1564,7 +1565,7 @@ checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"redox_syscall",
|
||||
"redox_syscall 0.4.1",
|
||||
"smallvec",
|
||||
"windows-targets 0.48.5",
|
||||
]
|
||||
@ -1899,6 +1900,7 @@ dependencies = [
|
||||
"ruff_python_ast",
|
||||
"ruff_python_parser",
|
||||
"ruff_python_stdlib",
|
||||
"ruff_source_file",
|
||||
"ruff_text_size",
|
||||
"rustc-hash 2.0.0",
|
||||
"salsa",
|
||||
@ -1918,6 +1920,7 @@ dependencies = [
|
||||
"libc",
|
||||
"lsp-server",
|
||||
"lsp-types",
|
||||
"red_knot_python_semantic",
|
||||
"red_knot_workspace",
|
||||
"ruff_db",
|
||||
"ruff_linter",
|
||||
@ -1941,6 +1944,7 @@ dependencies = [
|
||||
"console_log",
|
||||
"js-sys",
|
||||
"log",
|
||||
"red_knot_python_semantic",
|
||||
"red_knot_workspace",
|
||||
"ruff_db",
|
||||
"ruff_notebook",
|
||||
@ -1959,6 +1963,7 @@ dependencies = [
|
||||
"ruff_cache",
|
||||
"ruff_db",
|
||||
"ruff_python_ast",
|
||||
"ruff_text_size",
|
||||
"rustc-hash 2.0.0",
|
||||
"salsa",
|
||||
"thiserror",
|
||||
@ -1974,6 +1979,15 @@ dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "redox_syscall"
|
||||
version = "0.5.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
|
||||
dependencies = [
|
||||
"bitflags 2.6.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "redox_users"
|
||||
version = "0.4.5"
|
||||
@ -2046,7 +2060,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ruff"
|
||||
version = "0.5.7"
|
||||
version = "0.6.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"argfile",
|
||||
@ -2104,6 +2118,7 @@ dependencies = [
|
||||
"criterion",
|
||||
"mimalloc",
|
||||
"once_cell",
|
||||
"red_knot_python_semantic",
|
||||
"red_knot_workspace",
|
||||
"ruff_db",
|
||||
"ruff_linter",
|
||||
@ -2153,7 +2168,10 @@ dependencies = [
|
||||
"rustc-hash 2.0.0",
|
||||
"salsa",
|
||||
"tempfile",
|
||||
"thiserror",
|
||||
"tracing",
|
||||
"tracing-subscriber",
|
||||
"tracing-tree",
|
||||
"web-time",
|
||||
"zip",
|
||||
]
|
||||
@ -2234,7 +2252,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ruff_linter"
|
||||
version = "0.5.7"
|
||||
version = "0.6.0"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"annotate-snippets 0.9.2",
|
||||
@ -2554,7 +2572,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ruff_wasm"
|
||||
version = "0.5.7"
|
||||
version = "0.6.0"
|
||||
dependencies = [
|
||||
"console_error_panic_hook",
|
||||
"console_log",
|
||||
@ -2781,9 +2799,9 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.204"
|
||||
version = "1.0.206"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
|
||||
checksum = "5b3e4cd94123dd520a128bcd11e34d9e9e423e7e3e50425cb1b4b1e3549d0284"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
@ -2801,9 +2819,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.204"
|
||||
version = "1.0.206"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
|
||||
checksum = "fabfb6138d2383ea8208cf98ccf69cdfb1aff4088460681d84189aa259762f97"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@ -2823,9 +2841,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
version = "1.0.122"
|
||||
version = "1.0.124"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da"
|
||||
checksum = "66ad62847a56b3dba58cc891acd13884b9c61138d330c0d7b6181713d4fce38d"
|
||||
dependencies = [
|
||||
"itoa",
|
||||
"memchr",
|
||||
@ -2855,9 +2873,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "serde_test"
|
||||
version = "1.0.176"
|
||||
version = "1.0.177"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5a2f49ace1498612d14f7e0b8245519584db8299541dfe31a06374a828d620ab"
|
||||
checksum = "7f901ee573cab6b3060453d2d5f0bae4e6d628c23c0a962ff9b5f1d7c8d4f1ed"
|
||||
dependencies = [
|
||||
"serde",
|
||||
]
|
||||
@ -2984,9 +3002,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.72"
|
||||
version = "2.0.74"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
|
||||
checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@ -3006,15 +3024,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tempfile"
|
||||
version = "3.11.0"
|
||||
version = "3.12.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b8fcd239983515c23a32fb82099f97d0b11b8c72f654ed659363a95c3dad7a53"
|
||||
checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"fastrand",
|
||||
"once_cell",
|
||||
"rustix",
|
||||
"windows-sys 0.52.0",
|
||||
"windows-sys 0.59.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -3390,9 +3408,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
|
||||
|
||||
[[package]]
|
||||
name = "ureq"
|
||||
version = "2.10.0"
|
||||
version = "2.10.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "72139d247e5f97a3eff96229a7ae85ead5328a39efe76f8bf5a06313d505b6ea"
|
||||
checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a"
|
||||
dependencies = [
|
||||
"base64",
|
||||
"flate2",
|
||||
@ -3684,7 +3702,7 @@ version = "0.52.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
|
||||
dependencies = [
|
||||
"windows-targets 0.52.5",
|
||||
"windows-targets 0.52.6",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -3702,7 +3720,16 @@ version = "0.52.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
|
||||
dependencies = [
|
||||
"windows-targets 0.52.5",
|
||||
"windows-targets 0.52.6",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-sys"
|
||||
version = "0.59.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
|
||||
dependencies = [
|
||||
"windows-targets 0.52.6",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -3722,18 +3749,18 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "windows-targets"
|
||||
version = "0.52.5"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
|
||||
checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
|
||||
dependencies = [
|
||||
"windows_aarch64_gnullvm 0.52.5",
|
||||
"windows_aarch64_msvc 0.52.5",
|
||||
"windows_i686_gnu 0.52.5",
|
||||
"windows_aarch64_gnullvm 0.52.6",
|
||||
"windows_aarch64_msvc 0.52.6",
|
||||
"windows_i686_gnu 0.52.6",
|
||||
"windows_i686_gnullvm",
|
||||
"windows_i686_msvc 0.52.5",
|
||||
"windows_x86_64_gnu 0.52.5",
|
||||
"windows_x86_64_gnullvm 0.52.5",
|
||||
"windows_x86_64_msvc 0.52.5",
|
||||
"windows_i686_msvc 0.52.6",
|
||||
"windows_x86_64_gnu 0.52.6",
|
||||
"windows_x86_64_gnullvm 0.52.6",
|
||||
"windows_x86_64_msvc 0.52.6",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -3744,9 +3771,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_gnullvm"
|
||||
version = "0.52.5"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
|
||||
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_msvc"
|
||||
@ -3756,9 +3783,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_msvc"
|
||||
version = "0.52.5"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
|
||||
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
@ -3768,15 +3795,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
version = "0.52.5"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
|
||||
checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnullvm"
|
||||
version = "0.52.5"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
|
||||
checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
@ -3786,9 +3813,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
version = "0.52.5"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
|
||||
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
@ -3798,9 +3825,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
version = "0.52.5"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
|
||||
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnullvm"
|
||||
@ -3810,9 +3837,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnullvm"
|
||||
version = "0.52.5"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
|
||||
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
@ -3822,9 +3849,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
version = "0.52.5"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
|
||||
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
|
||||
|
||||
[[package]]
|
||||
name = "winnow"
|
||||
@ -13,13 +13,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ruff";
|
||||
version = "0.5.7";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astral-sh";
|
||||
repo = "ruff";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-swnh2bfmwPP1BHlnKbOtRdskMMArZgP/ErtrnXKRiC8=";
|
||||
hash = "sha256-s4JIqeOIxJ3NQ61fuBYYF0kSovEMcVHRExLB7kpICeg=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
@ -25,7 +25,7 @@ let
|
||||
# See upstream issue for rocksdb 9.X support
|
||||
# https://github.com/stalwartlabs/mail-server/issues/407
|
||||
rocksdb = rocksdb_8_11;
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "stalwart-mail";
|
||||
@ -34,14 +34,12 @@ rustPlatform.buildRustPackage {
|
||||
src = fetchFromGitHub {
|
||||
owner = "stalwartlabs";
|
||||
repo = "mail-server";
|
||||
# XXX: We need to use a revisoin two commits after v0.9.0, which includes fixes for test cases.
|
||||
# Can be reverted to "v${version}" next release.
|
||||
rev = "2a12e251f2591b7785d7a921364f125d2e9c1e6e";
|
||||
hash = "sha256-qoU09tLpOlsy5lKv2GdCV23bd70hnNZ0r/O5APGVDyw=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-7a2Vrrjo4Qd62dneQr3Xl2+HVUIfLa9AnGXEt2RWWZY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoHash = "sha256-rGCu3J+hTxiIENDIQM/jPz1wUNJr0ouoa1IkwWKfOWM=";
|
||||
cargoHash = "sha256-sAma3T9X9N8UjJ4leePIa6gvqpKW2QkpzYaIAFWLeVc=";
|
||||
|
||||
patches = [
|
||||
# Remove "PermissionsStartOnly" from systemd service files,
|
||||
@ -130,6 +128,12 @@ rustPlatform.buildRustPackage {
|
||||
# left: 0
|
||||
# right: 12
|
||||
"--skip=smtp::reporting::analyze::report_analyze"
|
||||
# thread 'smtp::inbound::dmarc::dmarc' panicked at tests/src/smtp/inbound/mod.rs:59:26:
|
||||
# Expected empty queue but got Reload
|
||||
"--skip=smtp::inbound::dmarc::dmarc"
|
||||
# thread 'smtp::queue::concurrent::concurrent_queue' panicked at tests/src/smtp/inbound/mod.rs:65:9:
|
||||
# assertion `left == right` failed
|
||||
"--skip=smtp::queue::concurrent::concurrent_queue"
|
||||
];
|
||||
|
||||
doCheck = !(stdenv.isLinux && stdenv.isAarch64);
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
, fetchYarnDeps
|
||||
, yarn
|
||||
, fixup_yarn_lock
|
||||
, fixup-yarn-lock
|
||||
, nodejs
|
||||
, asar
|
||||
|
||||
@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [
|
||||
yarn
|
||||
fixup_yarn_lock
|
||||
fixup-yarn-lock
|
||||
nodejs
|
||||
asar
|
||||
];
|
||||
@ -113,7 +113,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
export HOME=$(mktemp -d)
|
||||
yarn config --offline set yarn-offline-mirror ${offlineCache}
|
||||
fixup_yarn_lock yarn.lock
|
||||
fixup-yarn-lock yarn.lock
|
||||
yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
|
||||
patchShebangs node_modules/
|
||||
|
||||
|
||||
@ -24,6 +24,7 @@
|
||||
, extra-cmake-modules
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, wayland-scanner
|
||||
, enableX11 ? stdenv.isLinux
|
||||
, xorg
|
||||
}:
|
||||
@ -44,6 +45,8 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
] ++ lib.optionals enableWayland [
|
||||
wayland-scanner
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "clash-geoip";
|
||||
version = "20240712";
|
||||
version = "20240812";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Dreamacro/maxmind-geoip/releases/download/${version}/Country.mmdb";
|
||||
sha256 = "sha256-qCa1Udu3qcXggDcVRYqTs7Jvisudh0ZMb48oKVYCG+k=";
|
||||
sha256 = "sha256-wX5qBZIwdGFzOlk42SDs8T4QhDovEJ6twyghX/JRgjY=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@ -16,9 +16,9 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bx-py-utils";
|
||||
version = "93";
|
||||
version = "94";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
pyproject = true;
|
||||
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "boxine";
|
||||
repo = "bx_py_utils";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-4xZOj6A2RKz7zOhFkLcSM7D870PfOljI8jn2+gKeYk4=";
|
||||
hash = "sha256-IvmH0D3544zBukDQN6mea/nI1G4qZL+8KbIcF1Pehc8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cohere";
|
||||
version = "5.8.0";
|
||||
version = "5.8.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -32,7 +32,7 @@ buildPythonPackage rec {
|
||||
owner = "cohere-ai";
|
||||
repo = "cohere-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ejqsiT0hDBusqOjDGaK6Wda3xr3iyZuQPFj0EDugcew=";
|
||||
hash = "sha256-IU+6X2lyH+5SeWSfzogLLj0D5t1rRwkNbb8AyaaIxnA=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
let
|
||||
# 0.18.12 was yanked from PyPI, it refers to this issue:
|
||||
# https://github.com/deschler/django-modeltranslation/issues/701
|
||||
version = "0.19.6";
|
||||
version = "0.19.7";
|
||||
in
|
||||
buildPythonPackage {
|
||||
pname = "django-modeltranslation";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage {
|
||||
owner = "deschler";
|
||||
repo = "django-modeltranslation";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-zFY8YsM1Qp6rdcb+Upfk0/6mTv0o1zwxGqKzTupZ1zI=";
|
||||
hash = "sha256-jZm51HmK4pgEPeDirMkbLdLJQONspjuqSc2HgiSCtOY=";
|
||||
};
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
@ -86,6 +86,8 @@ buildPythonPackage rec {
|
||||
"test_delete_pattern_calls_scan_iter_with_count_if_itersize_given"
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Full featured redis cache backend for Django";
|
||||
homepage = "https://github.com/jazzband/django-redis";
|
||||
|
||||
@ -1,56 +1,48 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
fetchpatch,
|
||||
fetchFromGitHub,
|
||||
pythonOlder,
|
||||
mako,
|
||||
markdown,
|
||||
setuptools-git,
|
||||
setuptools-scm,
|
||||
unittestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pdoc3";
|
||||
version = "0.10.0";
|
||||
format = "setuptools";
|
||||
disabled = pythonOlder "3.7";
|
||||
version = "0.11.1";
|
||||
pyproject = true;
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-XyLnvLlpAGc44apCGcdaMvNMLWLUbcnS+y0+CwKH5Lc=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pdoc3";
|
||||
repo = "pdoc";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Opj1fU1eZvqsYJGCBliVwugxFV4H1hzOOTkjs4fOEWA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# test_Class_params fails in 0.10.0
|
||||
# https://github.com/pdoc3/pdoc/issues/355
|
||||
url = "https://github.com/pdoc3/pdoc/commit/4aa70de2221a34a3003a7e5f52a9b91965f0e359.patch";
|
||||
hash = "sha256-W7Dy516cA+Oj0ZCTQBB6MJ+fCTBeLRp+aW8nANdxSx8=";
|
||||
})
|
||||
# https://github.com/pdoc3/pdoc/issues/400
|
||||
(fetchpatch {
|
||||
name = "fix-test-for-python310.patch";
|
||||
url = "https://github.com/pdoc3/pdoc/commit/80af5d40d3ca39e2701c44941c1003ae6a280799.patch";
|
||||
hash = "sha256-69Cn+BY7feisSHugONIF/PRgEDEfnvnS/RBHWv1P8/w=";
|
||||
excludes = [ ".github/workflows/ci.yml" ];
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
setuptools-git
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
mako
|
||||
markdown
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
pythonImportsCheck = [ "pdoc" ];
|
||||
|
||||
nativeCheckInputs = [ unittestCheckHook ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/pdoc3/pdoc/blob/${src.rev}/CHANGELOG";
|
||||
description = "Auto-generate API documentation for Python projects";
|
||||
homepage = "https://pdoc3.github.io/pdoc/";
|
||||
license = with licenses; [ agpl3Plus ];
|
||||
maintainers = with maintainers; [ catern ];
|
||||
license = lib.licenses.agpl3Plus;
|
||||
mainProgram = "pdoc";
|
||||
maintainers = with lib.maintainers; [ catern ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "playwrightcapture";
|
||||
version = "1.25.11";
|
||||
version = "1.25.12";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -31,7 +31,7 @@ buildPythonPackage rec {
|
||||
owner = "Lookyloo";
|
||||
repo = "PlaywrightCapture";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-2nT6VRK0HQr1M8iUW/JUHEYhMwATZGWur4XL/KWZcRA=";
|
||||
hash = "sha256-nVRXTswisYm5Lbhb6brkUbl9okTkAcU+6WDe3Q+v6Cg=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
setuptools-scm,
|
||||
django-configurations,
|
||||
pytest,
|
||||
pytest-xdist,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
@ -19,17 +20,18 @@ buildPythonPackage rec {
|
||||
hash = "sha256-XQVP4BHFbzsQ+Xj0Go77Llrfx+aA7zb7VxraHyR3nZA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
buildInputs = [ pytest ];
|
||||
|
||||
propagatedBuildInputs = [ django ];
|
||||
dependencies = [ django ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
django-configurations
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
@ -49,7 +51,8 @@ buildPythonPackage rec {
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "py.test plugin for testing of Django applications";
|
||||
changelog = "https://github.com/pytest-dev/pytest-django/blob/v${version}/docs/changelog.rst";
|
||||
description = "Pytest plugin for testing of Django applications";
|
||||
homepage = "https://pytest-django.readthedocs.org/en/latest/";
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tencentcloud-sdk-python";
|
||||
version = "3.0.1211";
|
||||
version = "3.0.1212";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "TencentCloud";
|
||||
repo = "tencentcloud-sdk-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-/NIFYBZXVV/v83EGG2HDLvpErOZW/61jQ/+C3Lc3Zs4=";
|
||||
hash = "sha256-9+gDWklZVCNu+l0knZA+3LaAtq6PmUmt2LVITpWP/O4=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "flip-link";
|
||||
version = "0.1.8";
|
||||
version = "0.1.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "knurling-rs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-12eVZqW4+ZCDS0oszJI5rTREJY77km/y57LNDFJAwkk=";
|
||||
hash = "sha256-slidPVL0LAUtmCI2rlAwfGVUmB4WRF9bHqQhdgbO2oc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-75D38+QjEzj7J4CC30iMeuDXwcW4QT9YWgYyCILSv+g=";
|
||||
cargoHash = "sha256-x3JnqztoLol5dNMact/qMveQuvcMTg/jqHxW0lksB7Y=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin libiconv;
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "spruce";
|
||||
version = "1.31.0";
|
||||
version = "1.31.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "geofffranks";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7BZl3GPEuXdZptbkChlmdUkxfIkA3B3IdPFO46zejQ4=";
|
||||
hash = "sha256-wLxPHaCU0fciSIdK26dV4XOnJsp5EKKEXzgspWC1GvA=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -16,14 +16,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-update";
|
||||
version = "14.0.0";
|
||||
version = "14.0.2";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-TSqvT5YjnlfXvNjsiG7lR4f8QIzFoTG9Z70Wy66MhNM=";
|
||||
hash = "sha256-5fNypt1zezBWmt0eLDGxL7PmRUSuzQ3s4Aymz9ZMXT0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-hkKr/3mTrnznOWfySTWY+tmeWYjn7nAk+sP4ISPlqHs=";
|
||||
cargoHash = "sha256-NKo3Ry2bok7jxblrHjFJB24FFm62zclCxae+SxoYQqc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fastly";
|
||||
version = "10.12.3";
|
||||
version = "10.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastly";
|
||||
repo = "cli";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-rvutRCfySapyHHzU6hVUdcQ/QdC/mqjrDhx1KTJnWlE=";
|
||||
hash = "sha256-rzv1JRmk2yWe/mrvwYPYx5M0qEdU5JebWPMWAq0QlDk=";
|
||||
# The git commit is part of the `fastly version` original output;
|
||||
# leave that output the same in nixpkgs. Use the `.git` directory
|
||||
# to retrieve the commit SHA, and remove the directory afterwards,
|
||||
@ -33,7 +33,7 @@ buildGoModule rec {
|
||||
"cmd/fastly"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-rQLnCY4tdNKYJcCpRs/J5SII0hSkxHxtVZkl4O4Ytyk=";
|
||||
vendorHash = "sha256-WZfaIoVwLMoXU/NLVQAiwH6SuEU0BEKy4Vg887K6c6o=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@ -29,7 +29,7 @@ let
|
||||
else llvmPackages.stdenv).mkDerivation;
|
||||
in mkDerivation rec {
|
||||
pname = "clickhouse";
|
||||
version = "24.3.5.46";
|
||||
version = "24.3.7.30";
|
||||
|
||||
src = fetchFromGitHub rec {
|
||||
owner = "ClickHouse";
|
||||
@ -37,7 +37,7 @@ in mkDerivation rec {
|
||||
rev = "v${version}-lts";
|
||||
fetchSubmodules = true;
|
||||
name = "clickhouse-${rev}.tar.gz";
|
||||
hash = "sha256-YauScK9rIR9XgUbcxSq0XBH3nRAnXL/dDr/5oWCtvGw=";
|
||||
hash = "sha256-xIqn1cRbuD3NpUC2c7ZzvC8EAmg+XOXCkp+g/HTdIc0=";
|
||||
postFetch = ''
|
||||
# delete files that make the source too big
|
||||
rm -rf $out/contrib/llvm-project/llvm/test
|
||||
|
||||
@ -1,6 +1,9 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
python3,
|
||||
installShellFiles,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
@ -34,31 +37,28 @@ python3.pkgs.buildPythonApplication rec {
|
||||
tabulate
|
||||
];
|
||||
|
||||
# TODO: Completion needs to be adapted after support for latest click was added
|
||||
# $ source <(_HASS_CLI_COMPLETE=bash_source hass-cli) # for bash
|
||||
# $ source <(_HASS_CLI_COMPLETE=zsh_source hass-cli) # for zsh
|
||||
# $ eval (_HASS_CLI_COMPLETE=fish_source hass-cli) # for fish
|
||||
#postInstall = ''
|
||||
# mkdir -p "$out/share/bash-completion/completions" "$out/share/zsh/site-functions"
|
||||
# $out/bin/hass-cli completion bash > "$out/share/bash-completion/completions/hass-cli"
|
||||
# $out/bin/hass-cli completion zsh > "$out/share/zsh/site-functions/_hass-cli"
|
||||
#'';
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd hass-cli \
|
||||
--bash <(_HASS_CLI_COMPLETE=bash_source $out/bin/hass-cli) \
|
||||
--fish <(_HASS_CLI_COMPLETE=fish_source $out/bin/hass-cli) \
|
||||
--zsh <(_HASS_CLI_COMPLETE=zsh_source $out/bin/hass-cli)
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
pytestCheckHook
|
||||
requests-mock
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"homeassistant_cli"
|
||||
];
|
||||
pythonImportsCheck = [ "homeassistant_cli" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Command-line tool for Home Assistant";
|
||||
mainProgram = "hass-cli";
|
||||
homepage = "https://github.com/home-assistant-ecosystem/home-assistant-cli";
|
||||
changelog = "https://github.com/home-assistant-ecosystem/home-assistant-cli/releases/tag/${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = teams.home-assistant.members;
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = lib.teams.home-assistant.members;
|
||||
};
|
||||
}
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "marcolivierarsenault";
|
||||
domain = "moonraker";
|
||||
version = "1.2.2";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "marcolivierarsenault";
|
||||
repo = "moonraker-home-assistant";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-e1Bdhv6YSz9yhIx5SDKfRxq0f6Fr0oc0vzpOqPPMxmc=";
|
||||
hash = "sha256-kx18vCuMkM5sMUkVbKPVy4vkpjcOc/+VT/KJC73/B4E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ferretdb";
|
||||
version = "1.22.0";
|
||||
version = "1.23.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FerretDB";
|
||||
repo = "FerretDB";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LrlBudJLqFFOPHShl56Z5LcEZ9E5nPVxnheUuVkjOcQ=";
|
||||
hash = "sha256-Y4mMh/3I2ajXnHCR9PQXvuUA/BVIfgNrnAIU0/o7QFw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -20,7 +20,7 @@ buildGoModule rec {
|
||||
echo nixpkgs > build/version/package.txt
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-7kwKz70Q2ulOgl5VZv26rraO1M/zGYgc3zMZur56mgA=";
|
||||
vendorHash = "sha256-qBEaL0+sBcT8PTet4Znm4OPHFy+UcIuvwI2ywyv4nDc=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cyberchef";
|
||||
version = "10.19.0";
|
||||
version = "10.19.2";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/gchq/CyberChef/releases/download/v${version}/CyberChef_v${version}.zip";
|
||||
sha256 = "sha256-jhT1HcAXNRBNgZcRv6yYZ8xTIHo5EUe71KpAgUx8FCU=";
|
||||
sha256 = "sha256-+ICoJnW92IOi/QDwJXRNxP9tN99hNfH6BwLKJvzZFF4=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
20
pkgs/tools/networking/bandwhich/Cargo.lock
generated
20
pkgs/tools/networking/bandwhich/Cargo.lock
generated
@ -1074,6 +1074,12 @@ dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-conv"
|
||||
version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
|
||||
|
||||
[[package]]
|
||||
name = "num-derive"
|
||||
version = "0.3.3"
|
||||
@ -1728,9 +1734,9 @@ checksum = "32fea41aca09ee824cc9724996433064c89f7777e60762749a4170a14abbfa21"
|
||||
|
||||
[[package]]
|
||||
name = "simplelog"
|
||||
version = "0.12.1"
|
||||
version = "0.12.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "acee08041c5de3d5048c8b3f6f13fafb3026b24ba43c6a695a0c76179b844369"
|
||||
checksum = "16257adbfaef1ee58b1363bdc0664c9b8e1e30aed86049635fb5f147d065a9c0"
|
||||
dependencies = [
|
||||
"log",
|
||||
"termcolor",
|
||||
@ -1887,13 +1893,14 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "time"
|
||||
version = "0.3.31"
|
||||
version = "0.3.36"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e"
|
||||
checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
|
||||
dependencies = [
|
||||
"deranged",
|
||||
"itoa",
|
||||
"libc",
|
||||
"num-conv",
|
||||
"num_threads",
|
||||
"powerfmt",
|
||||
"serde",
|
||||
@ -1909,10 +1916,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
|
||||
|
||||
[[package]]
|
||||
name = "time-macros"
|
||||
version = "0.2.16"
|
||||
version = "0.2.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f"
|
||||
checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
|
||||
dependencies = [
|
||||
"num-conv",
|
||||
"time-core",
|
||||
]
|
||||
|
||||
|
||||
@ -30,6 +30,10 @@ rustPlatform.buildRustPackage rec {
|
||||
# 10 passed; 47 failed https://hydra.nixos.org/build/148943783/nixlog/1
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
postPatch = ''
|
||||
ln --force -s ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
export BANDWHICH_GEN_DIR=_shell-files
|
||||
mkdir -p $BANDWHICH_GEN_DIR
|
||||
|
||||
@ -1,38 +1,43 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, gettext
|
||||
, pkg-config
|
||||
, libsolv
|
||||
, openssl
|
||||
, check
|
||||
, json_c
|
||||
, libmodulemd
|
||||
, libsmartcols
|
||||
, sqlite
|
||||
, librepo
|
||||
, libyaml
|
||||
, rpm
|
||||
, zchunk
|
||||
, cppunit
|
||||
, python
|
||||
, swig
|
||||
, glib
|
||||
, sphinx
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
gettext,
|
||||
pkg-config,
|
||||
libsolv,
|
||||
openssl,
|
||||
check,
|
||||
json_c,
|
||||
libmodulemd,
|
||||
libsmartcols,
|
||||
sqlite,
|
||||
librepo,
|
||||
libyaml,
|
||||
rpm,
|
||||
zchunk,
|
||||
cppunit,
|
||||
python,
|
||||
swig,
|
||||
pcre2,
|
||||
sphinx,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdnf";
|
||||
version = "0.73.2";
|
||||
version = "0.73.3";
|
||||
|
||||
outputs = [ "out" "dev" "py" ];
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
"py"
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rpm-software-management";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-tdAbkIb3BAhNKFbjIGHEdVNwh3E1sKFLP+L4MhifsQM=";
|
||||
hash = "sha256-XzPpjnmL2wwLZnLAJLuOQGWXAoCJnij14P6qSXglMhY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -53,6 +58,7 @@ stdenv.mkDerivation rec {
|
||||
python
|
||||
swig
|
||||
sphinx
|
||||
pcre2.dev
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -67,9 +73,7 @@ stdenv.mkDerivation rec {
|
||||
cp ${libsolv}/share/cmake/Modules/FindLibSolv.cmake cmake/modules/
|
||||
'';
|
||||
|
||||
patches = [
|
||||
./fix-python-install-dir.patch
|
||||
];
|
||||
patches = [ ./fix-python-install-dir.patch ];
|
||||
|
||||
postPatch = ''
|
||||
# https://github.com/rpm-software-management/libdnf/issues/1518
|
||||
@ -82,7 +86,7 @@ stdenv.mkDerivation rec {
|
||||
cmakeFlags = [
|
||||
"-DWITH_GTKDOC=OFF"
|
||||
"-DWITH_HTML=OFF"
|
||||
"-DPYTHON_DESIRED=${lib.head (lib.splitString ["."] python.version)}"
|
||||
"-DPYTHON_DESIRED=${lib.head (lib.splitString [ "." ] python.version)}"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
@ -93,12 +97,15 @@ stdenv.mkDerivation rec {
|
||||
moveToOutput "lib/${python.libPrefix}" "$py"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Package management library";
|
||||
homepage = "https://github.com/rpm-software-management/libdnf";
|
||||
changelog = "https://github.com/rpm-software-management/libdnf/releases/tag/${version}";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ rb2k katexochen ];
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
maintainers = with lib.maintainers; [
|
||||
rb2k
|
||||
katexochen
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,15 +2,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "jumppad";
|
||||
version = "0.13.0";
|
||||
version = "0.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jumppad-labs";
|
||||
repo = "jumppad";
|
||||
rev = version;
|
||||
hash = "sha256-RgUjefOWOIIRPtXOLBkXaJoSprmsMRzyUPjt/RLVFFc=";
|
||||
hash = "sha256-XKn0Xr7fgds+TPgYm6Hbk2A4woWtXd25UCXN7jDTWBw=";
|
||||
};
|
||||
vendorHash = "sha256-HyG6gPl3uyDR3GZqrFktnbKihIgIj/BZdntE4S0KD2M=";
|
||||
vendorHash = "sha256-dqCnk1g8ksznC79En4C29oB1gmZcZMkxd70Lz62Adgc=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@ -10324,8 +10324,6 @@ with pkgs;
|
||||
|
||||
microbin = callPackage ../servers/microbin { };
|
||||
|
||||
microdnf = callPackage ../tools/package-management/microdnf { };
|
||||
|
||||
microplane = callPackage ../tools/misc/microplane { };
|
||||
|
||||
microserver = callPackage ../servers/microserver { };
|
||||
@ -38851,8 +38849,6 @@ with pkgs;
|
||||
|
||||
rucksack = callPackage ../development/tools/rucksack { };
|
||||
|
||||
ruff = callPackage ../development/tools/ruff { };
|
||||
|
||||
sam-ba = callPackage ../tools/misc/sam-ba { };
|
||||
|
||||
sndio = callPackage ../misc/sndio { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user