Merge master into staging-next

This commit is contained in:
github-actions[bot] 2024-10-11 00:14:02 +00:00 committed by GitHub
commit aa2334f4a8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
46 changed files with 309 additions and 161 deletions

View File

@ -63,7 +63,7 @@ let
};
url = mkOption {
type = types.str;
example = "fedimint://p2p.myfedimint.com";
example = "fedimint://p2p.myfedimint.com:8173";
description = ''
Public address for p2p connections from peers
'';
@ -159,6 +159,12 @@ let
example = "api.myfedimint.com";
description = "Public domain of the API address of the reverse proxy/tls terminator.";
};
path = mkOption {
type = types.str;
example = "/";
default = "/ws/";
description = "Path to host the API on and forward to the daemon's api port";
};
config = mkOption {
type = types.submodule (
recursiveUpdate (import ../web-servers/nginx/vhost-options.nix {
@ -286,8 +292,7 @@ in
# overriden by default value from vhost-options.nix
enableACME = mkOverride 99 true;
forceSSL = mkOverride 99 true;
# Currently Fedimint API only support JsonRPC on `/ws/` endpoint, so no need to handle `/`
locations."/ws/" = {
locations.${cfg.nginx.path} = {
proxyPass = "http://127.0.0.1:${toString cfg.api.port}/";
proxyWebsockets = true;
extraConfig = ''

View File

@ -6,7 +6,7 @@
, stdenv
, lib
, udev
, wrapGAppsHook3
, buildPackages
, cpio
, xar
, libdbusmenu
@ -97,7 +97,7 @@ let
autoPatchelfHook
dpkg
makeWrapper
wrapGAppsHook3
(buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; })
];
buildInputs = [
@ -137,7 +137,7 @@ let
];
preFixup = ''
gappsWrapperArgs+=(--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --ozone-platform=wayland --enable-features=WaylandWindowDecorations}}")
gappsWrapperArgs+=(--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}")
'';
postFixup = ''

View File

@ -30,7 +30,7 @@ mkDerivation rec {
src =
let
base_url = "https://dl.tvcdn.de/download/linux/version_${lib.versions.major version}x";
base_url = "https://dl.teamviewer.com/download/linux/version_${lib.versions.major version}x";
in
{
x86_64-linux = fetchurl {

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "picard-tools";
version = "3.2.0";
version = "3.3.0";
src = fetchurl {
url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
sha256 = "sha256-4lj6Lj9fphzWeZ7I4HP0mpX73OrxY9imCXGyYZuG+kE=";
sha256 = "sha256-WIGadmBka3SzTigvXU0hyNuuoi3e/5bjJYdV2voPhtw=";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -1,13 +1,16 @@
{
autoPatchelfHook,
common-updater-scripts,
curl,
fetchurl,
ffmpeg,
lib,
mkDerivation,
fetchurl,
autoPatchelfHook,
pkg-config,
curl,
ffmpeg,
openssl,
pkg-config,
qtbase,
rubyPackages,
writeShellApplication,
zlib,
withJava ? true,
@ -15,21 +18,21 @@
}:
let
version = "1.17.7";
version = "1.17.8";
# Using two URLs as the first one will break as soon as a new version is released
src_bin = fetchurl {
urls = [
"http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz"
"http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz"
];
hash = "sha256-jFvIMbyVKx+HPMhFDGTjktsLJHm2JtGA8P/JZWaJUdA=";
hash = "sha256-jg9UdDDZr+7ZdseJtb7N+y7Prhyq3hLo4+EZpzRxcEE=";
};
src_oss = fetchurl {
urls = [
"http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz"
"http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz"
];
hash = "sha256-di5VLUb57HWnxi3LfZfA/Z5qFRINDvb1oIDO4pHToO8=";
hash = "sha256-knUrzj/J+Xk5N1tg0q9iIXT+hqStkkjL3Yc2Yp5tvIo=";
};
in
mkDerivation {
@ -83,6 +86,35 @@ mkDerivation {
runHook postInstall
'';
passthru = {
srcs = {
inherit src_bin src_oss;
};
updateScript = lib.getExe (writeShellApplication {
name = "update-makemkv";
runtimeInputs = [
common-updater-scripts
curl
rubyPackages.nokogiri
];
text = ''
get_version() {
# shellcheck disable=SC2016
curl --fail --silent 'https://forum.makemkv.com/forum/viewtopic.php?f=3&t=224' \
| nokogiri -e 'puts $_.css("head title").first.text.match(/\bMakeMKV (\d+\.\d+\.\d+) /)[1]'
}
oldVersion=${lib.escapeShellArg version}
newVersion=$(get_version)
if [[ $oldVersion == "$newVersion" ]]; then
echo "$0: New version same as old version, nothing to do." >&2
exit
fi
update-source-version makemkv "$newVersion" --source-key=passthru.srcs.src_bin
update-source-version makemkv "$newVersion" --source-key=passthru.srcs.src_oss --ignore-same-version
'';
});
};
meta = with lib; {
description = "Convert blu-ray and dvd to mkv";
longDescription = ''

View File

@ -0,0 +1,46 @@
{
lib,
fetchFromGitHub,
python3,
coercer,
}:
python3.pkgs.buildPythonApplication rec {
pname = "adcskiller";
version = "0-unstable-2024-05-19";
format = "other";
src = fetchFromGitHub {
owner = "grimlockx";
repo = "ADCSKiller";
rev = "d74bfea91f24a09df74262998d60f213609b45c6";
hash = "sha256-ekyGDM9up3h6h21uLEstgn33x+KngX4tOLMhL4B6BA8=";
};
buildInputs = [
coercer
];
propagatedBuildInputs = with python3.pkgs; [
ldap3
certipy
];
installPhase = ''
runHook preInstall
install -vD $pname.py $out/bin/$pname
substituteInPlace $out/bin/$pname --replace '"Coercer"' '"coercer"'
runHook postInstall
'';
meta = with lib; {
description = "Python-based tool designed to automate the process of discovering and exploiting Active Directory Certificate Services (ADCS) vulnerabilities";
homepage = "https://github.com/grimlockx/ADCSKiller";
license = licenses.mit;
maintainers = with maintainers; [ exploitoverload ];
mainProgram = "ADCSKiller";
};
}

View File

@ -13,13 +13,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "bngblaster";
version = "0.9.7";
version = "0.9.8";
src = fetchFromGitHub {
owner = "rtbrick";
repo = "bngblaster";
rev = finalAttrs.version;
hash = "sha256-h4m/tPiLFRi3Dwh6QPmnCCZR4XNOZaz9xoDhOXAcIEQ=";
hash = "sha256-6pOkFu5BQHyESGW4Yxq5QjUG+fZOGxT2OAnglrav6fE=";
};
nativeBuildInputs = [ cmake ];

View File

@ -12,13 +12,13 @@
stdenv.mkDerivation {
pname = "darcs-to-git";
version = "0-unstable-2024-02-20";
version = "0-unstable-2024-09-30";
src = fetchFromGitHub {
owner = "purcell";
repo = "darcs-to-git";
rev = "2a31a95726658fef1b48e1f0010928fc2a69d5bf";
hash = "sha256-ep36lAYUnO3kX0ff3PxrBHog5CIGsJaERiNN5DmmAQI=";
rev = "9d556cb7daa06b9de3cb97487b98bab2869a7fe7";
hash = "sha256-0GKSzqgJgi1w4uZOqixp/F6i7hK2ZmuQI0px8FEDFXM=";
};
patchPhase =

View File

@ -17,7 +17,7 @@
}:
python3Packages.buildPythonApplication rec {
pname = "errands";
version = "46.2.4";
version = "46.2.5";
pyproject = false;
@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec {
owner = "mrvladus";
repo = "Errands";
rev = "refs/tags/${version}";
hash = "sha256-qk3CbxMj3PiuK7KkgtmH/A549mpNd70gYAW56P5nmu8=";
hash = "sha256-peIsTSmqjLHdmd5Xrqh6XKXjEbwhNE+FOH/pEY0QqdI=";
};
nativeBuildInputs = [

View File

@ -1,33 +1,34 @@
{
lib,
buildGoModule,
buildGo123Module,
fetchFromGitHub,
pnpm,
nodejs,
go,
go_1_23,
git,
cacert,
nixosTests,
}:
let
pname = "homebox";
version = "0.13.0";
version = "0.15.2";
src = fetchFromGitHub {
owner = "sysadminsmedia";
repo = "homebox";
rev = "v${version}";
hash = "sha256-mhb4q0ja94TjvOzl28WVb3uzkR9MKlqifFJgUo6hfrA=";
hash = "sha256-2jB2Oo0dK36n5tQPrGNyPO3Q0yNkUms4RPQzXiDzuks=";
};
in
buildGoModule {
buildGo123Module {
inherit pname version src;
vendorHash = "sha256-QRmP6ichKjwDWEx13sEs1oetc4nojGyJnKafAATTNTA=";
vendorHash = "sha256-Ftm5tR3w8S3mjYLJG0+17nYP5kDbaAd8QkbZpNt7WuE=";
modRoot = "backend";
# the goModules derivation inherits our buildInputs and buildPhases
# Since we do pnpm thing in those it fails if we don't explicitely remove them
overrideModAttrs = _: {
nativeBuildInputs = [
go
go_1_23
git
cacert
];
@ -37,7 +38,7 @@ buildGoModule {
pnpmDeps = pnpm.fetchDeps {
inherit pname version;
src = "${src}/frontend";
hash = "sha256-MdTZJ/Ichpwc54r7jZjiFD12YOdRzHSuzRZ/PnDk2mY=";
hash = "sha256-SyKET+W9Fn1WETzF4KlAtLOzNI/DOavHUbC7Yfv6kFw=";
};
pnpmRoot = "../frontend";
@ -72,6 +73,12 @@ buildGoModule {
"-X main.commit=${version}"
];
passthru = {
tests = {
inherit (nixosTests) homebox;
};
};
meta = {
mainProgram = "api";
homepage = "https://homebox.software/";

View File

@ -1,22 +1,23 @@
{ lib, stdenv, fetchurl, fetchsvn, makeWrapper, unzip, jre, libXxf86vm
{ lib, stdenv, fetchurl, fetchFromGitHub, makeWrapper, unzip, jre, libXxf86vm
, extraJavaOpts ? "-Djosm.restart=true -Djava.net.useSystemProxies=true"
}:
let
pname = "josm";
version = "19207";
version = "19230";
srcs = {
jar = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
hash = "sha256-dYDJmGXIKd2GhjyKBpQjoIfz9giBsgFdC0TaKplxiPY=";
hash = "sha256-d2KyTPIw7N+ZveNUa5W3yiV6pCouigTq+GICSEkTiis=";
};
macosx = fetchurl {
url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java21.zip";
hash = "sha256-A34nd+RBipON5zOKBD57L1l2KACYEUHNjxs0N6xqoXc=";
hash = "sha256-IrFtRlNdXZI6ucfZC6yEancV4E5lEP7+VNhaZ6p9t4I=";
};
pkg = fetchsvn {
url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";
rev = version;
hash = "sha256-L7P6FtqKLB4e+ezPzXePM33qj5esNoRlTFXi0/GhdsA=";
pkg = fetchFromGitHub {
owner = "JOSM";
repo = "josm";
rev = "refs/tags/${version}-tested";
hash = "sha256-s6vc09qdQbJb2b0j4t7CVPmbfWpjc5Pl3JBCPgGVZMY=";
};
};
@ -41,7 +42,7 @@ stdenv.mkDerivation rec {
${unzip}/bin/unzip ${srcs.macosx} 'JOSM.app/*' -d $out/Applications
'' else ''
install -Dm644 ${srcs.jar} $out/share/josm/josm.jar
cp -R ${srcs.pkg}/usr/share $out
cp -R ${srcs.pkg}/native/linux/tested/usr/share $out
# Add libXxf86vm to path because it is needed by at least Kendzi3D plugin
makeWrapper ${jre}/bin/java $out/bin/josm \
@ -49,14 +50,14 @@ stdenv.mkDerivation rec {
--prefix LD_LIBRARY_PATH ":" '${libXxf86vm}/lib'
'';
meta = with lib; {
meta = {
description = "Extensible editor for OpenStreetMap";
homepage = "https://josm.openstreetmap.de/";
changelog = "https://josm.openstreetmap.de/wiki/Changelog";
sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.gpl2Plus;
maintainers = with maintainers; [ rycee sikmir ];
platforms = platforms.all;
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ rycee sikmir ];
platforms = lib.platforms.all;
mainProgram = "josm";
};
}

View File

@ -15,7 +15,7 @@
ffmpeg,
cmake,
pkg-config,
buildGoModule,
buildGo123Module,
makeWrapper,
ncurses,
which,
@ -147,8 +147,8 @@ let
src = fetchFromGitHub {
owner = "ggerganov";
repo = "llama.cpp";
rev = "fc54ef0d1c138133a01933296d50a36a1ab64735";
hash = "sha256-o87EhrA2Oa98pwyb6GSUgwERY0/GWJiX7kvlxDv4zb4=";
rev = "70392f1f81470607ba3afef04aa56c9f65587664";
hash = "sha256-PgdH3Q4lM45a7aLeN/19i0Ld4NuTfzh/caYOSdooFao=";
fetchSubmodules = true;
};
postPatch =
@ -299,8 +299,8 @@ let
src = fetchFromGitHub {
owner = "ggerganov";
repo = "whisper.cpp";
rev = "9e3c5345cd46ea718209db53464e426c3fe7a25e";
hash = "sha256-JOptyveuaKRLzeZ6GuB3A70IM7dk4we95g5o25XVXJI=";
rev = "0d2e2aed80109e8696791083bde3b58e190b7812";
hash = "sha256-HE9FLwLGVCggEF7VjWtdNhNnhe7c1RQp30spEIkK4TI=";
};
nativeBuildInputs = [
@ -431,12 +431,12 @@ let
stdenv;
pname = "local-ai";
version = "2.20.1";
version = "2.21.1";
src = fetchFromGitHub {
owner = "go-skynet";
repo = "LocalAI";
rev = "v${version}";
hash = "sha256-FeZZC0Tg9JT9Yj0e27GOLSdHEtWl17AHK3j7epwPyY8=";
hash = "sha256-UlXBg/FKv/GNz2PCEVvzhILNdyQvTfkw157sNpunf2I=";
};
prepare-sources =
@ -457,10 +457,10 @@ let
${cp} ${if with_tinydream then go-tiny-dream else go-tiny-dream.src} sources/go-tiny-dream
'';
self = buildGoModule.override { stdenv = effectiveStdenv; } {
self = buildGo123Module.override { stdenv = effectiveStdenv; } {
inherit pname version src;
vendorHash = "sha256-mDxp5frUIECSHKjxaJVqIP7mnIusvdT45Xlxc9+P5tE=";
vendorHash = "sha256-tb2nVUCUdaOWHpJz4zMqgfJ4PYUqGwV/0lj76n36sUg=";
env.NIX_CFLAGS_COMPILE = lib.optionalString with_stablediffusion " -isystem ${opencv}/include/opencv4";

View File

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "lutgen";
version = "0.11.0";
version = "0.11.2";
src = fetchFromGitHub {
owner = "ozwaldorf";
repo = "lutgen-rs";
rev = "v${version}";
hash = "sha256-ybaapL9OUUQ+sO8P0JH1MuxCFmTihKp9gXJpM7KLY7U=";
hash = "sha256-jmMVeDDVb/TuxulDYj+8y4Kl42EJTAWb3tAsanfWduE=";
};
cargoHash = "sha256-Fxecnq7QKcDe6aAsKj9uye3sFdfkgFEKYmdqnvQDiAQ=";
cargoHash = "sha256-cT999TukdiKmmNUpK7SE1uiuNoLhmjdtz/2cYXFC6dk=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -33,13 +33,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "picom";
version = "12.1";
version = "12.2";
src = fetchFromGitHub {
owner = "yshui";
repo = "picom";
rev = "v${finalAttrs.version}";
hash = "sha256-XBFSPSrG6C4n5oQUQbWXyy9iCuEdrdaxU0CPR73juzk=";
hash = "sha256-tT4OIzIX+phbze2+9f3WQN6RuGKlSQ+Ocp4xodvdPC0=";
fetchSubmodules = true;
};

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "upbound";
version = "0.33.0";
version = "0.34.0";
src = fetchFromGitHub {
owner = pname;
repo = "up";
rev = "v${version}";
hash = "sha256-PJMOR/XpWqtSIb3x61o0iLwETCHA5e07etmEZYQtzXw=";
hash = "sha256-npWCGR0/iXAF7efreWhpwqboXJ24lqk5TPaB7glwEFI=";
};
vendorHash = "sha256-WLRXj4G49JEbQc2aFAjLLCpQrDhN94jazWxfM70hHqs=";
vendorHash = "sha256-f/RPyjrC5FsOjC5wnBtqEbLeVX7VeiVYFpRXcQ2lTc4=";
subPackages = [ "cmd/docker-credential-up" "cmd/up" ];

View File

@ -1,14 +1,14 @@
{
"darwin": {
"hash": "sha256-zbnOkld+6UnSeMfvc6P6qZ474KaHcx1Qzyr4HCWsv98=",
"version": "0.2024.09.24.08.02.stable_01"
"hash": "sha256-Awr2NvXsWaEeJpdCA94q7kxQ04IDpwNxnm7GxB4J09w=",
"version": "0.2024.10.08.08.02.stable_01"
},
"linux_x86_64": {
"hash": "sha256-SeTzKFsY+p0oJFTmBEmj64tOPS7BlBLtYdoIJ9jmTD0=",
"version": "0.2024.09.24.08.02.stable_01"
"hash": "sha256-fNY+wXqlqUSdRVptDNuk1ouddSlIKQrBFPIij9Qa0jM=",
"version": "0.2024.10.08.08.02.stable_01"
},
"linux_aarch64": {
"hash": "sha256-lAiu20udBEJhu29vqiS8vYauuu0fcX1LlvqEqYN5WXU=",
"version": "0.2024.09.24.08.02.stable_01"
"hash": "sha256-EdQjc8uXG4cpkgnIYRaBXLeuYqhbN7rs4bU+L/Cc7XA=",
"version": "0.2024.10.08.08.02.stable_01"
}
}

View File

@ -2,7 +2,7 @@
let
themeName = "Dracula";
version = "4.0.0-unstable-2024-09-24";
version = "4.0.0-unstable-2024-10-03";
in
stdenvNoCC.mkDerivation {
pname = "dracula-theme";
@ -11,8 +11,8 @@ stdenvNoCC.mkDerivation {
src = fetchFromGitHub {
owner = "dracula";
repo = "gtk";
rev = "f2d2ea560a83ebdef6734b70dd9683272b47894d";
hash = "sha256-/xgvlcMC4AHITy15dVHhdTIeu1mcA6Luhdanpr1as4Q=";
rev = "b5b7f3aed7060e14b848ca449a1d575c872f4e73";
hash = "sha256-hsWyvmxEBJKdNem+eYbGF+UBopP3p90SdFNP7wBuE74=";
};
propagatedUserEnvPkgs = [

View File

@ -27,13 +27,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mediascanner2";
version = "0.115";
version = "0.116";
src = fetchFromGitLab {
owner = "ubports";
repo = "development/core/mediascanner2";
rev = finalAttrs.version;
hash = "sha256-UEwFe65VB2asxQhuWGEAVow/9rEvZxry4dd2/60fXN4=";
hash = "sha256-aRNT3DSPxz/vf6gqipf5Qc5zyDGFMHWONevAslwOrCY=";
};
outputs = [

View File

@ -75,13 +75,13 @@ let
in stdenv.mkDerivation (finalAttrs: {
pname = "yosys";
version = "0.45";
version = "0.46";
src = fetchFromGitHub {
owner = "YosysHQ";
repo = "yosys";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-NF4NQ7mCfARuMsMTJVBbJk39puJ8+D41woYEPgthfUI=";
hash = "sha256-OnSKsX5G8Tc6AMFCmuWg6AekJvvG+K5Zr5rZZll+c/o=";
fetchSubmodules = true;
leaveDotGit = true;
postFetch = ''

View File

@ -2,19 +2,19 @@
rustPlatform.buildRustPackage rec {
pname = "wasmtime";
version = "25.0.1";
version = "25.0.2";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = pname;
rev = "v${version}";
hash = "sha256-l0tkEV4roec3xK57oXV49ofNdpuZ+hCuzde6YazYPZc=";
hash = "sha256-5Wu5gK3g7nkMDwUGkwnx400PRkb0jknX/GKeEAJ9Vgg=";
fetchSubmodules = true;
};
# Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
auditable = false;
cargoHash = "sha256-0pt3wZlhLuN0E6f6AU0uC0qmkuII2OXxUTChuzQjvqI=";
cargoHash = "sha256-jLdVxWjfJSkfHcmw5i02gXI2uEUB7KxiEfdFtfc020U=";
cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ];
outputs = [ "out" "dev" ];

View File

@ -8,13 +8,13 @@ assert enableShared || enableStatic;
stdenv.mkDerivation rec {
pname = "redis-plus-plus";
version = "1.3.12";
version = "1.3.13";
src = fetchFromGitHub {
owner = "sewenew";
repo = "redis-plus-plus";
rev = version;
sha256 = "sha256-RI7lLvRmS5BglvwRQ8OzSpYIyaKkf/DKrJ3fn1mWYfs=";
sha256 = "sha256-bZxs1qnVAkh0BO0CyP1zL/+K3NZYmFy9ryg1QcRLcmg=";
};
patches = [

View File

@ -7,12 +7,12 @@
}:
buildPythonPackage rec {
pname = "conda-package-handling";
version = "2.3.0";
version = "2.4.0";
src = fetchFromGitHub {
owner = "conda";
repo = "conda-package-handling";
rev = "refs/tags/${version}";
hash = "sha256-Mo3qCNA/NtVtrsJmJ96ST6GMt2basSh5KlFBkrJ4pGE=";
hash = "sha256-AvuxHl3gUH7zIyMhZGeXqpMy0rJ99wj1/SrdTvlaX9A=";
};
pyproject = true;

View File

@ -8,14 +8,14 @@
}:
buildPythonPackage rec {
pname = "conda-package-streaming";
version = "0.10.0";
version = "0.11.0";
pyproject = true;
src = fetchFromGitHub {
owner = "conda";
repo = "conda-package-streaming";
rev = "refs/tags/v${version}";
hash = "sha256-3TSjVISnUTReyKtt58RXCD30VodhiDDfJssM3PkP5Yk=";
hash = "sha256-Y0moewJROhybbyo263akbO20Q6As245ULKJikkWU4XE=";
};
build-system = [ flit-core ];

View File

@ -0,0 +1,41 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
flask,
python-ldap,
setuptools,
}:
buildPythonPackage rec {
pname = "flask-simpleldap";
version = "2.0.0";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "alexferl";
repo = "flask-simpleldap";
rev = "refs/tags/v${version}";
hash = "sha256-WcedTtEwaSc3BYFE3L0FZrtKKdbwk7r3qSPP8evtYlc=";
};
build-system = [
setuptools
];
dependencies = [
flask
python-ldap
];
pythonImportsCheck = [ "flask_simpleldap" ];
meta = with lib; {
description = "LDAP authentication extension for Flask";
homepage = "https://github.com/alexferl/flask-simpleldap";
license = licenses.mit;
maintainers = with maintainers; [ kip93 ];
};
}

View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "hcloud";
version = "2.2.1";
version = "2.3.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-3Bcvj+VkIdoU2AiGtbkgwrqwgb8RjHMqQxjBf03iWG4=";
hash = "sha256-6QHSmLES8dLUVo2DAPPOGd/ngr3vP/nEFwJqgeFu6VY=";
};
build-system = [ setuptools ];

View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "ncclient";
version = "0.6.15";
version = "0.6.16";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-mdFoSTUS4QhY05rY0fqKTpRQTR9oLvOMTVr4kWJbiUQ=";
hash = "sha256-IMCMlGt5/G4PRz525ZomsovU55vBnGhHndBtC7ym6lc=";
};
propagatedBuildInputs = [

View File

@ -5,55 +5,64 @@
colorlog,
fetchFromGitHub,
hatchling,
importlib-metadata,
jinja2,
packaging,
pytestCheckHook,
pythonOlder,
tomli,
tox,
typing-extensions,
uv,
virtualenv,
}:
buildPythonPackage rec {
pname = "nox";
version = "2024.04.15";
format = "pyproject";
version = "2024.10.09";
pyproject = true;
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "wntrblm";
repo = pname;
repo = "nox";
rev = "refs/tags/${version}";
hash = "sha256-PagZR2IdS1gS/ukl4b0Al9sdEsFnFwP8oy0eOGKJHMs=";
hash = "sha256-GdNz34A8IKwPG/270sY5t3SoggGCZMWfDq/Wyhk0ez8=";
};
nativeBuildInputs = [ hatchling ];
build-system = [ hatchling ];
propagatedBuildInputs =
dependencies =
[
argcomplete
colorlog
packaging
virtualenv
]
++ lib.optionals (pythonOlder "3.8") [
typing-extensions
importlib-metadata
++ lib.optionals (pythonOlder "3.11") [
tomli
];
nativeCheckInputs = [
jinja2
tox
pytestCheckHook
];
optional-dependencies = {
tox_to_nox = [
jinja2
tox
];
uv = [ uv ];
};
nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (builtins.attrValues optional-dependencies);
preCheck = ''
export HOME=$(mktemp -d)
'';
pythonImportsCheck = [ "nox" ];
disabledTests = [
# our conda is not available on 3.11
"test__create_venv_options"
# Assertion errors
"test_uv"
];
disabledTestPaths = [

View File

@ -26,14 +26,14 @@
buildPythonPackage rec {
pname = "plotly";
version = "5.24.0";
version = "5.24.1";
pyproject = true;
src = fetchFromGitHub {
owner = "plotly";
repo = "plotly.py";
rev = "refs/tags/v${version}";
hash = "sha256-frSUybQxst4wG8g8U43Nay9dYCUXuR3dBealwPVyFdI=";
hash = "sha256-ONuX5/GlirPF8+7bZtib1Xsv5llcXcSelFfGyeTc5L8=";
};
sourceRoot = "${src.name}/packages/python/plotly";

View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "rns";
version = "0.8.2";
version = "0.8.3";
pyproject = true;
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "markqvist";
repo = "Reticulum";
rev = "refs/tags/${version}";
hash = "sha256-H3n3TywMkyefX5X6QhjX73dy9xCnLRjJh0cmx8HSdVU=";
hash = "sha256-A1ZDyYHjbC2jz+m4EHRPlOMzkpwCCxo902bMK4I/+I4=";
};
patches = [
@ -49,6 +49,9 @@ buildPythonPackage rec {
homepage = "https://github.com/markqvist/Reticulum";
changelog = "https://github.com/markqvist/Reticulum/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
maintainers = with maintainers; [
fab
qbit
];
};
}

View File

@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "scikit-posthocs";
version = "0.9.0";
version = "0.9.1";
pyproject = true;
src = fetchFromGitHub {
owner = "maximtrp";
repo = "scikit-posthocs";
rev = "refs/tags/v${version}";
hash = "sha256-sRop5DKakrZEBswzTvumn68wKqU15zM5aCLfZ/PdsFg=";
hash = "sha256-ssaTd+A7lzd4tlKHGkgKixi3XjZLQBcPs6UOEzX/hrk=";
};
nativeBuildInputs = [

View File

@ -11,12 +11,12 @@
}:
buildPythonPackage rec {
pname = "shippinglabel";
version = "2.0.0";
version = "2.1.0";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-hZYsK+IX/a4bZMtD+hMEYDnwgqhdkkEHkG0MPkAgy20=";
hash = "sha256-XwE/b7TQ7i+2hMSdZJhyVjl2lieweZLbA6PXcSJTnFE=";
};
build-system = [ setuptools ];

View File

@ -17,14 +17,14 @@
}:
buildPythonPackage rec {
pname = "uxsim";
version = "1.6.0";
version = "1.7.0";
pyproject = true;
src = fetchFromGitHub {
owner = "toruseo";
repo = "UXsim";
rev = "refs/tags/v${version}";
hash = "sha256-+nJsP/XAp6F7LZQI559rI3OCFnMTXJ4eFKEEJyEDHDg=";
hash = "sha256-FZ8eGA3sSKaUqAd+jTlIIZDeEoXeqdpsSgJ+ZHuWyJM=";
};
patches = [ ./add-qt-plugin-path-to-env.patch ];

View File

@ -1,7 +1,6 @@
{
lib,
buildPythonPackage,
cryptography,
fetchFromGitHub,
pytestCheckHook,
pythonOlder,
@ -12,7 +11,7 @@
buildPythonPackage rec {
pname = "xknxproject";
version = "3.8.0";
version = "3.8.1";
pyproject = true;
disabled = pythonOlder "3.9";
@ -21,13 +20,12 @@ buildPythonPackage rec {
owner = "XKNX";
repo = "xknxproject";
rev = "refs/tags/${version}";
hash = "sha256-TiFeyXgu7JKrCEzGCnamguWEP+HN4DRzYOErmdlWZFY=";
hash = "sha256-iuW83gKDJTgFkfSW32OPOuwyGLyFoZGKQGUDJkVUGAM=";
};
build-system = [ setuptools ];
dependencies = [
cryptography
pyzipper
striprtf
];

View File

@ -6,13 +6,13 @@
}:
buildGoModule rec {
pname = "devbox";
version = "0.13.3";
version = "0.13.4";
src = fetchFromGitHub {
owner = "jetpack-io";
repo = pname;
rev = version;
hash = "sha256-A1dl5bQ7+Qe+MxzplQ2duGqWwgZYHd6M2MQUPPFlx14=";
hash = "sha256-+3AKBhxf1m6cBNtEx8xmUmJ2PUk0LNPaS+cZhsXJoTs=";
};
ldflags = [

View File

@ -1,14 +1,18 @@
{ lib, stdenv, fetchurl }:
{ lib, stdenv, fetchurl, autoreconfHook }:
stdenv.mkDerivation rec {
pname = "chrpath";
version = "0.16";
version = "0.17";
src = fetchurl {
url = "https://alioth-archive.debian.org/releases/${pname}/${pname}/${version}/${pname}-${version}.tar.gz";
sha256 = "0yvfq891mcdkf8g18gjjkn2m5rvs8z4z4cl1vwdhx6f2p9a4q3dv";
url = "https://codeberg.org/pere/chrpath/archive/release-${version}.tar.gz";
hash = "sha256-Sh2syR9OrxyMP3Z/2IHrH+OlCaINBii/l2DZCsEkvQw=";
};
nativeBuildInputs = [
autoreconfHook
];
meta = with lib; {
description = "Command line tool to adjust the RPATH or RUNPATH of ELF binaries";
mainProgram = "chrpath";
@ -17,8 +21,8 @@ stdenv.mkDerivation rec {
binary. The rpath, or runpath if it is present, is where the runtime
linker should look for the libraries needed for a program.
'';
homepage = "https://tracker.debian.org/pkg/chrpath";
license = licenses.gpl2;
homepage = "https://codeberg.org/pere/chrpath";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};

View File

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "devspace";
version = "6.3.13";
version = "6.3.14";
src = fetchFromGitHub {
owner = "devspace-sh";
repo = "devspace";
rev = "v${version}";
hash = "sha256-MWFDAyr4oHBe1K9ag5mC3iJAyJgs3ePa6W9//6T2G9A=";
hash = "sha256-Qdx7x42QKfyEu2PB350mek2MwYO/ClFAwKC9UHftaKE=";
};
vendorHash = null;

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "protoc-gen-go";
version = "1.34.2";
version = "1.35.1";
src = fetchFromGitHub {
owner = "protocolbuffers";
repo = "protobuf-go";
rev = "v${version}";
hash = "sha256-467+AhA3tADBg6+qbTd1SvLW+INL/1QVR8PzfAMYKFA=";
hash = "sha256-SYSGC7LtKHdGuEQnjTzqRo8NxyxYXs4nMMflztRwJok=";
};
vendorHash = "sha256-nGI/Bd6eMEoY0sBwWEtyhFowHVvwLKjbT4yfzFz6Z3E=";

View File

@ -2,18 +2,18 @@
buildGoModule rec {
pname = "sqldef";
version = "0.17.19";
version = "0.17.20";
src = fetchFromGitHub {
owner = "k0kubun";
repo = "sqldef";
rev = "v${version}";
hash = "sha256-euIP6ev1qc+75MA9vlTZHY7LT03AM8hya+sPWohvCWI=";
hash = "sha256-r175nhzPLoU4CBjEiktsQIuQTgRJ64uW1MhDKHEDR+4=";
};
proxyVendor = true;
vendorHash = "sha256-+5vfQoTRCbwY/Ydq21VG/xt6CeOWHIup8bxWI/2v24A=";
vendorHash = "sha256-reYZUuZTNeNFrbrDQPVXwx+UuBGdEmTdSowbneZc/No=";
ldflags = [ "-s" "-w" "-X main.version=${version}" ];

View File

@ -216,22 +216,22 @@ in rec {
extrakto = mkTmuxPlugin {
pluginName = "extrakto";
version = "unstable-2021-04-04";
version = "0-unstable-2024-08-25";
src = fetchFromGitHub {
owner = "laktak";
repo = "extrakto";
rev = "de8ac3e8a9fa887382649784ed8cae81f5757f77";
sha256 = "0mkp9r6mipdm7408w7ls1vfn6i3hj19nmir2bvfcp12b69zlzc47";
rev = "bf9e666f2a6a8172ebe99fff61b574ba740cffc2";
sha256 = "sha256-kIhJKgo1BDTeFyAPa//f/TrhPfV9Rfk9y4qMhIpCydk=";
};
nativeBuildInputs = [ pkgs.makeWrapper ];
buildInputs = [ pkgs.python3 ];
postInstall = ''
for f in extrakto.sh open.sh tmux-extrakto.sh; do
wrapProgram $target/scripts/$f \
--prefix PATH : ${with pkgs; lib.makeBinPath (
[ pkgs.fzf pkgs.python3 pkgs.xclip ]
)}
done
patchShebangs extrakto.py extrakto_plugin.py
wrapProgram $target/scripts/open.sh \
--prefix PATH : ${ with pkgs; lib.makeBinPath
[ fzf xclip wl-clipboard ]
}
'';
meta = {
homepage = "https://github.com/laktak/extrakto";

View File

@ -11,12 +11,12 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "raycast";
version = "1.83.2";
version = "1.84.2";
src = fetchurl {
name = "Raycast.dmg";
url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal";
hash = "sha256-/oFzkC4I4fuHIaw6V6YyhmlHb/nGVeeqnawr3GjgAGw=";
hash = "sha256-9bONKZyOEPj6eGQKx6IyZSf7ZZhwL985AzN/imNsoys=";
};
dontPatch = true;

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "pgbouncer-exporter";
version = "0.9.0";
version = "0.10.0";
src = fetchFromGitHub {
owner = "prometheus-community";
repo = "pgbouncer_exporter";
rev = "v${version}";
hash = "sha256-fKoyRHYLwVefsZ014eazVCD5B9eV8/CUkuHE4mbUqVo=";
hash = "sha256-9Sa9BimyKwYTjh0ELlDlUS3kc5gnkK1i7xiO84vVPYA=";
};
vendorHash = "sha256-IxmxfF9WsF0Hbym4G0UecyW8hAvucoaCFUE1kXUljJs=";
vendorHash = "sha256-PjoS56MdYpDOuSTHHo5lGL9KlWlu3ycA08qim8jrnSU=";
meta = with lib; {
description = "Prometheus exporter for PgBouncer";

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "weaviate";
version = "1.26.4";
version = "1.26.6";
src = fetchFromGitHub {
owner = "weaviate";
repo = "weaviate";
rev = "v${version}";
hash = "sha256-JnzQ+B5zxbKZQ/jzOsD7r58f+TaCivN4BTJyNImi9xE=";
hash = "sha256-Vi8jcWfG3MvzXDcVFd6wC+KEpPQUL1uBCk7GJwyO0gU=";
};
vendorHash = "sha256-QwB97LNUFK8yuKK8JSy1uH2hu+8ZAlvc+9VlTIld83U=";
vendorHash = "sha256-HzEnt/eagDw6/7HV0MRMQDcp56mLv1kE9HCfBouxDRs=";
subPackages = [ "cmd/weaviate-server" ];

View File

@ -12,13 +12,13 @@ stdenv.mkDerivation {
# as ssdfs-utils, not ssdfs-tools.
pname = "ssdfs-utils";
# The version is taken from `configure.ac`, there are no tags.
version = "4.45";
version = "4.46";
src = fetchFromGitHub {
owner = "dubeyko";
repo = "ssdfs-tools";
rev = "f78ebf2a19eb338ae6858aa4f28133b117507df7";
hash = "sha256-RKVcXZakYDd7Vfd1w0pNs9/oMRzvzRr8VabpUBRcKc8=";
rev = "7528ee1d923115c1536d97b119fd2a0ee978b59e";
hash = "sha256-SL5BY+vLxRWRHkIp0hTQsi3w/fXRGe4OHpaapZFZBZo=";
};
strictDeps = true;

View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "fh";
version = "0.1.17";
version = "0.1.18";
src = fetchFromGitHub {
owner = "DeterminateSystems";
repo = "fh";
rev = "v${version}";
hash = "sha256-+Q7mZ2uzMjShKWVvYLz9qH8g0w8oP93lNlJiYxFFoAI=";
hash = "sha256-McfJXbr/oadsfQV7hzB6sEMy9sfXthHcjsbOiQs2+rU=";
};
cargoHash = "sha256-DJOj9EJswnPIm66u585k4ZWSi6Su/naQ+myQuLiGLFE=";
cargoHash = "sha256-PGXd4spD2gNyQIloVZuhWZ1VQtacXPLMCQiBekZbEp4=";
nativeBuildInputs = [
installShellFiles

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "jumppad";
version = "0.14.0";
version = "0.15.0";
src = fetchFromGitHub {
owner = "jumppad-labs";
repo = "jumppad";
rev = version;
hash = "sha256-f9V3dws4zvjh3H61FWNv9r/G9EplWR0aA2af2EdjhBs=";
hash = "sha256-UO1a8CoHLNoo74zJkzgSlTkB7XWWHWu2EUiqCvLOQj8=";
};
vendorHash = "sha256-S4SyuidH8sxJbuG7yHgSP/iHcuP1h5EHaW8X6gG4GNw=";

View File

@ -4577,6 +4577,8 @@ self: super: with self; {
flask-silk = callPackage ../development/python-modules/flask-silk { };
flask-simpleldap = callPackage ../development/python-modules/flask-simpleldap { };
flask-sock = callPackage ../development/python-modules/flask-sock { };
flask-socketio = callPackage ../development/python-modules/flask-socketio { };