0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00

Merge master into staging-next

This commit is contained in:
github-actions[bot] 2024-12-17 18:05:12 +00:00 committed by GitHub
commit 5b61d758b5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
74 changed files with 364 additions and 226 deletions

View file

@ -119,7 +119,7 @@ in {
assertions = [ {
assertion = cfg.nginx != null || cfg.webServerUser != null;
message = "Either services.matomo.nginx or services.matomo.nginx.webServerUser is mandatory";
message = "Either services.matomo.nginx or services.matomo.webServerUser is mandatory";
}];
users.users.${user} = {

View file

@ -19,6 +19,7 @@ let
ps: with ps; [
epc
orjson
packaging
paramiko
rapidfuzz
setuptools
@ -30,13 +31,13 @@ let
in
melpaBuild {
pname = "lsp-bridge";
version = "0-unstable-2024-12-09";
version = "0-unstable-2024-12-16";
src = fetchFromGitHub {
owner = "manateelazycat";
repo = "lsp-bridge";
rev = "520d253a00d360d7aa47d85a9c4a99ea6702acde";
hash = "sha256-NQ7lkTC8JGfMAsDA//Zj8IGV03b2frOuHuvjRSVNGXE=";
rev = "b73717e6bdd39366ec734c3018578c06f9bc69ad";
hash = "sha256-FjcI60XyzKVvdhXzPj3wugkDMx6yKCKWk6yItzCuPy8=";
};
patches = [

View file

@ -9,15 +9,15 @@
buildGoModule rec {
pname = "kubernetes-helm";
version = "3.16.3";
version = "3.16.4";
src = fetchFromGitHub {
owner = "helm";
repo = "helm";
rev = "v${version}";
sha256 = "sha256-Uxb3nDcCTD61KHSon02eJJyj1MlJex/SmpOEIELdeMo=";
sha256 = "sha256-1dgBPDl5AtbqSKzfbAnCAzdBL+d6ZeO81LJFosmO7Bg=";
};
vendorHash = "sha256-4RKNNKUPLUv5bYde6pTL8u5/KXzN0Ai8n4fS9mbiZgw=";
vendorHash = "sha256-pkQ4J4JmEByu7bkUa/rg2bipY9s6t6uvPNiNyTyYkD8=";
subPackages = [ "cmd/helm" ];
ldflags = [

View file

@ -207,13 +207,13 @@
"vendorHash": "sha256-IQ2zYe1eqq+LIhcHBxGGzcPRs4Atmipn++ERYvLNmvg="
},
"ccloud": {
"hash": "sha256-bGyVfB9eenE6QZZw0bAxnve0KW0ZQ54slTaaWZXDBOc=",
"hash": "sha256-Dpx0eugcHCJV8GNPqjxx4P9ohgJgB10DTnHr+CeN/iQ=",
"homepage": "https://registry.terraform.io/providers/sapcc/ccloud",
"owner": "sapcc",
"repo": "terraform-provider-ccloud",
"rev": "v1.6.6",
"rev": "v1.6.7",
"spdx": "MPL-2.0",
"vendorHash": "sha256-uftDCqDU0HeDj7rjAevulsFCVFFQt3eg8vcFM9YJrow="
"vendorHash": "sha256-OqbnkuEy9w6F1DxmlYhRNYhBaYhWV0FtMK4wdwSybh8="
},
"checkly": {
"hash": "sha256-4J7pwtlAa920RXF6ZoSoi03qA15NBzUlXQCZRErI2Co=",

View file

@ -2,14 +2,12 @@
lib,
callPackage,
pkg-config,
stdenv,
hyprland,
}:
let
mkHyprlandPlugin =
hyprland:
args@{ pluginName, ... }:
stdenv.mkDerivation (
hyprland.stdenv.mkDerivation (
args
// {
pname = "${pluginName}";

View file

@ -3,18 +3,18 @@
mkHyprlandPlugin,
fetchFromGitHub,
hyprland,
unstableGitUpdater,
nix-update-script,
}:
mkHyprlandPlugin hyprland {
pluginName = "hypr-dynamic-cursors";
version = "0-unstable-2024-11-19";
version = "0-unstable-2024-12-14";
src = fetchFromGitHub {
owner = "VirtCode";
repo = "hypr-dynamic-cursors";
rev = "81f4b964f997a3174596ef22c7a1dee8a5f616c7";
hash = "sha256-3SDwq2i2QW9nu7HBCPuDtLmrwLt2kajzImBsawKRZ+s=";
rev = "f0cef070c531e3a3a1f713b7062bded357b4c468";
hash = "sha256-XFQqJWxo6xUqLpAKqc0bHg1pZ21eFQ1HueDTxw7N6r8=";
};
dontUseCmakeConfigure = true;
@ -28,7 +28,7 @@ mkHyprlandPlugin hyprland {
runHook postInstall
'';
passthru.updateScript = unstableGitUpdater { };
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
meta = {
description = "Plugin to make your Hyprland cursor more realistic";

View file

@ -3,6 +3,7 @@
mkHyprlandPlugin,
hyprland,
fetchFromGitHub,
nix-update-script,
}:
mkHyprlandPlugin hyprland {
@ -25,6 +26,7 @@ mkHyprlandPlugin hyprland {
runHook postInstall
'';
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
meta = {
homepage = "https://github.com/pyt0xic/hyprfocus";
description = "Focus animation plugin for Hyprland inspired by Flashfocus";

View file

@ -13,13 +13,13 @@
mkHyprlandPlugin hyprland {
pluginName = "hyprgrass";
version = "0.8.2-unstable-2024-10-30";
version = "0.8.2-unstable-2024-12-13";
src = fetchFromGitHub {
owner = "horriblename";
repo = "hyprgrass";
rev = "f97b6ac2b7de3bae194b776c388467db2604929f";
hash = "sha256-Jg5Q/v8tcNjopTMbra82y5n9QQdCnrbEFNgT1kA7pQE=";
rev = "dc19ccb209147312a4f60d76193b995c2634e756";
hash = "sha256-3ALmrImk37KT+UHt1EMi6PAHyj8WhL9Xw/Ar/ys4rtk=";
};
nativeBuildInputs = [

View file

@ -14,13 +14,13 @@ let
mkHyprlandPlugin,
}:
let
version = "0.45.0";
version = "0.46.0";
hyprland-plugins-src = fetchFromGitHub {
owner = "hyprwm";
repo = "hyprland-plugins";
rev = "refs/tags/v${version}";
hash = "sha256-hOljwsXpY4Y6guvcr51tWCnXo6c56yaBknnLXk1m3Vk=";
hash = "sha256-Q9bXV9d6xqxr8V1UKmmmHdCgky3I4n2hk1TDxZ/pBto=";
};
in
mkHyprlandPlugin hyprland {

View file

@ -4,18 +4,18 @@
hyprland,
cmake,
fetchFromGitHub,
unstableGitUpdater,
nix-update-script,
}:
mkHyprlandPlugin hyprland {
pluginName = "hyprscroller";
version = "0-unstable-2024-11-29";
version = "0-unstable-2024-12-17";
src = fetchFromGitHub {
owner = "dawsers";
repo = "hyprscroller";
rev = "50a87a8a7dc56494a5b71e95182ef4b907d71448";
hash = "sha256-4Gzj0HWovu0hzzw+2zEXne7vDmP6yIK2GmtURB1EZxQ=";
rev = "9dc46c3c98e875a8f3b2a118ef3859a3c714c887";
hash = "sha256-CifZc4Ev+CG4qHHOH6e6NLBLQNbFVn4gZEFNCX8e0QQ=";
};
nativeBuildInputs = [ cmake ];
@ -29,7 +29,7 @@ mkHyprlandPlugin hyprland {
runHook postInstall
'';
passthru.updateScript = unstableGitUpdater { };
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
meta = {
homepage = "https://github.com/dawsers/hyprscroller";

View file

@ -3,18 +3,18 @@
fetchFromGitHub,
hyprland,
mkHyprlandPlugin,
unstableGitUpdater,
nix-update-script,
}:
mkHyprlandPlugin hyprland {
pluginName = "hyprspace";
version = "0-unstable-2024-11-02";
version = "0-unstable-2024-12-08";
src = fetchFromGitHub {
owner = "KZDKM";
repo = "hyprspace";
rev = "260f386075c7f6818033b05466a368d8821cde2d";
hash = "sha256-cwbcYg+rPmvHFFtAEie7nw5IaBidrTYe5XsTlhOyoyQ=";
rev = "e2d561c933cd085d68bf0b39c4f78870ad0abbc2";
hash = "sha256-YiLUDw14NaavML8y9rxXxO7q+j3b/ghQhBmIy0+/Zmk=";
};
dontUseCmakeConfigure = true;
@ -28,7 +28,7 @@ mkHyprlandPlugin hyprland {
runHook postInstall
'';
passthru.updateScript = unstableGitUpdater { };
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
meta = {
homepage = "https://github.com/KZDKM/Hyprspace";

View file

@ -5,16 +5,17 @@
hyprland,
ninja,
mkHyprlandPlugin,
nix-update-script,
}:
mkHyprlandPlugin hyprland rec {
pluginName = "hyprsplit";
version = "0.45.0";
version = "0.46.0";
src = fetchFromGitHub {
owner = "shezdy";
repo = "hyprsplit";
rev = "refs/tags/v${version}";
hash = "sha256-otDIivy4sMZBN2t9eHVI5PaFacg2Je4U9gBPPcH/Vpo=";
hash = "sha256-R/aLxJTLUi3bYQu38vVosTDPrFHAYwz4n34JbO1PPm0=";
};
nativeBuildInputs = [
@ -22,6 +23,8 @@ mkHyprlandPlugin hyprland rec {
ninja
];
passthru.updateScript = nix-update-script { };
meta = {
homepage = "https://github.com/shezdy/hyprsplit";
description = "Hyprland plugin for awesome / dwm like workspaces";

View file

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "air";
version = "1.61.1";
version = "1.61.4";
src = fetchFromGitHub {
owner = "air-verse";
repo = "air";
rev = "v${version}";
hash = "sha256-IwPUbz3JYKz0TeK/kbEUzqFp0l8u/AFu9KEAyR8zlSQ=";
hash = "sha256-ML+rdjD20gR8ajyZSs8HEgy1kOFh/MnpnZetQUuZRo0=";
};
vendorHash = "sha256-BY2KnAwlrIyqSHWFLD0QU93EXAv4ta/ibvYWiHXvYMc=";
vendorHash = "sha256-tct0bWTvZhHslqPAe8uOwBx4z6gLAq57igcbV1tg9OU=";
ldflags = [
"-s"

View file

@ -8,11 +8,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "alt-tab-macos";
version = "7.7.0";
version = "7.12.0";
src = fetchurl {
url = "https://github.com/lwouis/alt-tab-macos/releases/download/v${finalAttrs.version}/AltTab-${finalAttrs.version}.zip";
hash = "sha256-ASFlOYOy1uAKPJyrohFmdCD0JwJybJahpaRTiz9rFUk=";
hash = "sha256-CUsbex5R3msKZYrp52snX6ZBTZjtVRN63t6ABDcDYfI=";
};
sourceRoot = ".";

View file

@ -10,11 +10,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "arc-browser";
version = "1.70.0-56062";
version = "1.73.0-56815";
src = fetchurl {
url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg";
hash = "sha256-x+QHlBsZGkmJm05VeZx43XFxpRJR1crLjEqNIQJwitQ=";
hash = "sha256-PbYX3p6QFnwDgah6ehHW83uSyC7itLfaE+ECC/mbYAU=";
};
nativeBuildInputs = [ undmg ];

View file

@ -2,10 +2,10 @@
let
pname = "bootstrap-studio";
version = "7.0.0";
version = "7.0.2";
src = fetchurl {
url = "https://releases.bootstrapstudio.io/${version}/Bootstrap%20Studio.AppImage";
sha256 = "sha256-jmYyPTtgGX9Cptv4nCwKhuz+NOvcc17uARtIuvU9y/s=";
sha256 = "sha256-HnDBSAhENeJMvFXMwmHTeGMoLkr8/0eQDKaX0U8tJcA=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };
in

View file

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-deb";
version = "2.9.1";
version = "2.9.3";
src = fetchFromGitHub {
owner = "kornelski";
repo = pname;
rev = "v${version}";
hash = "sha256-2Eq3gSvIBBVjsOjJPxrFLq1jgwFU2OHzKGV63SwDVTQ=";
hash = "sha256-cGt+oAWpBHTBDrKS3EC0UsjVlUOaApArSnTvC9gQdIM=";
};
cargoHash = "sha256-NqTZ+WCDWyPE3x8oiwb1EMxigIk3AIPfoQF49Cy/DFI=";
cargoHash = "sha256-qIiVBLP+eKaVj0J4CaWG0KcCjC5cbaY7r4ugFsIVJGQ=";
nativeBuildInputs = [
makeWrapper

View file

@ -14,11 +14,12 @@ let
in
stdenv.mkDerivation rec {
pname = "catalyst-browser";
version = "3.9.4";
version = "3.9.5";
src = fetchurl {
url = "https://github.com/CatalystDevOrg/Catalyst/releases/download/v${version}/catalyst-${version}.AppImage";
hash = "sha256-6t1RAxmRc/1fAQT4Qnd42kh3cxgRZr74k8gwebTb0Ic=";
hash = "sha256-7lODV9qbl3gcJ5v/0EiJ2IgGCW7pY6RQFlMzClGt2DU=
";
name = "catalyst-${version}.AppImage";
};
@ -44,7 +45,7 @@ stdenv.mkDerivation rec {
cp -a ${appimageContents}/locales $out/share/catalyst
cp -a ${appimageContents}/catalyst.desktop $out/share/applications/catalyst.desktop
mkdir -p $out/share/pixmaps
cp -r ${appimageContents}/usr/share/icons/hicolor/0x0/apps/catalyst.png $out/share/pixmaps/
cp -r ${appimageContents}/usr/share/icons/hicolor/1080x1080/apps/catalyst.png $out/share/pixmaps/
asar extract ${appimageContents}/resources/app.asar resources/
rm -rf resources/.github
rm -rf resources/.vscode

View file

@ -14,16 +14,16 @@ let
in
buildGoModule rec {
pname = "centrifugo";
version = "5.4.7";
version = "5.4.8";
src = fetchFromGitHub {
owner = "centrifugal";
repo = "centrifugo";
rev = "v${version}";
hash = "sha256-hAZT2jqDy0oppKxuLWg6UQxiCySLkPE0eLmqavaRN9I=";
hash = "sha256-B6V4Apnwcb/G//PYa/kHRcgRkYSM+fQmoRimNoe6yhY=";
};
vendorHash = "sha256-Xz8s3R2nOouEyH56y04X15nYtMRwL8toP/8WL0saYwQ=";
vendorHash = "sha256-n+5EsSA984VXd8G1eXlzBPjIlSQeL5fRcGIFIKZGQ4o=";
ldflags = [
"-s"

View file

@ -11,14 +11,14 @@
python3Packages.buildPythonApplication {
pname = "chirp";
version = "0.4.0-unstable-2024-11-22";
version = "0.4.0-unstable-2024-12-16";
pyproject = true;
src = fetchFromGitHub {
owner = "kk7ds";
repo = "chirp";
rev = "5b41e67d5e261da85523789e0d1e7ac377f419f6";
hash = "sha256-a1UAnSqQyud812NOxqn/PukW5PrIN0MxdEfr9jIvncY=";
rev = "48c33155d141e0444dd4a73e069422c8a25d51b4";
hash = "sha256-6FKzdf4GS0XpA5HUIAqdrBaeslOrNhaZqpHMRIagkpI=";
};
nativeBuildInputs = [
@ -39,6 +39,7 @@ python3Packages.buildPythonApplication {
requests
yattag
suds
lark
wxpython
];

View file

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "comrak";
version = "0.31.0";
version = "0.32.0";
src = fetchFromGitHub {
owner = "kivikakk";
repo = pname;
rev = "v${version}";
sha256 = "sha256-4Ea/YCh0a5xToEmyqpvt8fTtsbL/K0RcQBUitHNCKgo=";
sha256 = "sha256-sRYyInQ2jvtipmGkTL8P7ed0YHLnAQObaMX6N87bFHU=";
};
cargoHash = "sha256-pZ4aHmfiHMvatUY5oTvLtJiIVvknAi3NFVP30rcEmRo=";
cargoHash = "sha256-4Tl9MEZn8RAklqc32bLeWg+muVcjqMKRWSrt8BIq9n4=";
meta = with lib; {
description = "CommonMark-compatible GitHub Flavored Markdown parser and formatter";

View file

@ -2,10 +2,10 @@
buildDotnetGlobalTool {
pname = "csharpier";
version = "0.30.2";
version = "0.30.3";
executables = "dotnet-csharpier";
nugetHash = "sha256-MrpsVlIYyrlu3VvEPcLQRgD2lhfu8ZTN3pUZrZ9nQcA=";
nugetHash = "sha256-W+O6zrHkRru/s0MT0SGa58PlPHgFE4wxtqZj2GJDRos=";
meta = with lib; {
description = "Opinionated code formatter for C#";

View file

@ -0,0 +1,43 @@
{
fetchFromGitHub,
buildNpmPackage,
lib,
chromium,
}:
buildNpmPackage rec {
name = "decktape";
version = "3.14.0";
src = fetchFromGitHub {
owner = "astefanutti";
repo = "decktape";
rev = "v${version}";
hash = "sha256-V7JoYtwP7iQYFi/WhFpkELs7mNKF6CqrMyjWhxLkcTA=";
};
npmDepsHash = "sha256-rahrIhB0GhqvzN2Vu6137Cywr19aQ70gVbNSSYzFD+s=";
npmPackFlags = [ "--ignore-scripts" ];
dontNpmBuild = true;
env.PUPPETEER_SKIP_DOWNLOAD = 1;
postFixup = ''
wrapProgram $out/bin/decktape \
--add-flags "--chrome-path ${chromium}/bin/chromium" \
--set PATH ${
lib.makeBinPath [
chromium
]
}
'';
meta = {
description = "High-quality PDF exporter for HTML presentation frameworks";
mainProgram = "decktape";
homepage = "https://github.com/astefanutti/decktape";
changelog = "https://github.com/astefanutti/decktape/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fidgetingbits ];
};
}

View file

@ -11,7 +11,6 @@
espeak-ng,
sonic,
utf8cpp,
darwin,
}:
stdenv.mkDerivation (finalAttrs: {
@ -47,9 +46,9 @@ stdenv.mkDerivation (finalAttrs: {
espeak-ng
sonic
utf8cpp
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AudioUnit ];
];
meta = with lib; {
meta = {
description = "Chinese text-to-speech software";
homepage = "http://www.eguidedog.net/ekho.php";
longDescription = ''
@ -59,9 +58,9 @@ stdenv.mkDerivation (finalAttrs: {
(a dialect in Taiwan), Tibetan, Ngangien (an ancient Chinese before
Yuan Dynasty) and Korean (in trial).
'';
license = licenses.gpl2Plus;
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ aaronjheng ];
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.linux ++ lib.platforms.darwin;
maintainers = with lib.maintainers; [ aaronjheng ];
mainProgram = "ekho";
};
})

View file

@ -16,16 +16,16 @@
rustPlatform.buildRustPackage rec {
pname = "espup";
version = "0.13.0";
version = "0.14.0";
src = fetchFromGitHub {
owner = "esp-rs";
repo = "espup";
rev = "v${version}";
hash = "sha256-okB8K0ly3MvnkVve41eT0SNr5dPn5E5QXewqLHGL/Tc=";
hash = "sha256-LMzVxLwl24bw1o+OYiNcxm+KrnDyrg8tjkWhwsYYKzs=";
};
cargoHash = "sha256-n2tLG3logtc73Ut/R1UGuLSm7MpZ4Bxp/08SOhGL+80=";
cargoHash = "sha256-gl/Qdzt9vuSvijnJU5MqgC8gtVALp4+zR7dxKioKzDU=";
nativeBuildInputs = [
pkg-config

View file

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "flake-checker";
version = "0.2.1";
version = "0.2.3";
src = fetchFromGitHub {
owner = "DeterminateSystems";
repo = "flake-checker";
rev = "v${version}";
hash = "sha256-Uc3Fycn4SBYo2XWoAn4egAtjKt0XxBcyS0uN5a3bRKk=";
hash = "sha256-kWjq25+VKL4ANqFG5UyVv/TqO2i5q400mqaUVbKg4GE=";
};
cargoHash = "sha256-Muajqf7jcr10DLythl/hlFM2qG83i81Q3eGk3mg/4GU=";
cargoHash = "sha256-E2hjHTEflcSjDazSR2KBRn7jMhXhksRL/vNdWbyRsxM=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [
Security

View file

@ -11,7 +11,7 @@
darwin,
}:
let
version = "0.1.1";
version = "0.2.0";
in
rustPlatform.buildRustPackage {
pname = "forgejo-cli";
@ -22,10 +22,10 @@ rustPlatform.buildRustPackage {
owner = "Cyborus";
repo = "forgejo-cli";
rev = "v${version}";
hash = "sha256-367O4SpGA0gWM/IIJjIbCoi4+N/Vl58T5Jw/NVsE+7o=";
hash = "sha256-rHyPncAARIPakkv2/CD1/aF2G5AS9bb3T2x8QCQWl5o=";
};
cargoHash = "sha256-F7UBLqMXYS8heJs1mdmiFTHUfgoMKEb+KV4tiDsIRDY=";
cargoHash = "sha256-kIOEUDJg7/08L9c/qt7NrT8U+xN3Ya5PBWPWmWj0Yx8=";
nativeBuildInputs = [ pkg-config ];

View file

@ -58,7 +58,6 @@ stdenv.mkDerivation (finalAttrs: {
];
nativeBuildInputs = [
dbus # used for checks and pkg-config to install dbus service/s
docbook-xsl-nons # for goa-daemon.xml
gettext
gi-docgen
@ -73,6 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs =
[
dbus
gcr_4
glib
glib-networking

View file

@ -1,6 +1,7 @@
{
stdenv,
lib,
buildPackages,
gettext,
meson,
ninja,
@ -28,11 +29,17 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-H6wbuIAN+kitnD4ZaQ9+EOZ6T5lNnLF8rh0b3/yRRLo=";
};
preConfigure = ''
sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' \
-e 's,''${HTTP_MODULES_PATH},${apacheHttpd}/modules,' \
-i data/dav_user_2.4.conf
'';
preConfigure =
''
sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' \
-e 's,''${HTTP_MODULES_PATH},${apacheHttpd}/modules,' \
-i data/dav_user_2.4.conf
''
+ lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
substituteInPlace meson.build --replace-fail \
"run_command([httpd, '-v']" \
"run_command(['${stdenv.hostPlatform.emulator buildPackages}', httpd, '-v']"
'';
mesonFlags = [
"-Dhttpd=${apacheHttpd.out}/bin/httpd"
@ -45,6 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
meson
ninja
gettext
glib # for glib-compile-schemas
itstool
libxml2
wrapGAppsNoGuiHook
@ -56,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
];
doCheck = true;
strictDeps = true;
passthru = {
updateScript = gnome.updateScript {

View file

@ -6,7 +6,7 @@
buildGoModule rec {
pname = "go-md2man";
version = "2.0.5";
version = "2.0.6";
vendorHash = "sha256-aMLL/tmRLyGze3RSB9dKnoTv5ZK1eRtgV8fkajWEbU0=";
@ -14,7 +14,7 @@ buildGoModule rec {
rev = "v${version}";
owner = "cpuguy83";
repo = "go-md2man";
sha256 = "sha256-UX9FajFqZApVFED3MYcq167iPwztnIck25ehfcOeFD8=";
sha256 = "sha256-wJnHgp+NPchXkR71ARLMjo4VryzgGkz2tYWPsC+3eFo=";
};
meta = with lib; {

View file

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "gosmee";
version = "0.22.1";
version = "0.22.3";
src = fetchFromGitHub {
owner = "chmouel";
repo = "gosmee";
rev = "v${version}";
hash = "sha256-UnGzPkbw7x8l1+9xEXFiJZFzJT5yu7MCgPKkKzaFqkk=";
hash = "sha256-zfPD01ARc5nye3Iq01sziC72nnuY3LhZshNugBtdnXs=";
};
vendorHash = null;

View file

@ -52,6 +52,7 @@ gcc14Stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.lgpl3Only;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [
fufexan
khaneliman
];
};

View file

@ -1,7 +1,7 @@
{
"branch": "v0.45.2-b",
"commit_hash": "12f9a0d0b93f691d4d9923716557154d74777b0a",
"commit_message": "[gha] Nix: update inputs",
"date": "2024-11-19",
"tag": "v0.45.2"
"branch": "v0.46.1-b",
"commit_hash": "254fc2bc6000075f660b4b8ed818a6af544d1d64",
"commit_message": "version: bump to 0.46.1",
"date": "2024-12-17",
"tag": "v0.46.1"
}

View file

@ -14,6 +14,7 @@
epoll-shim,
git,
hyprcursor,
hyprgraphics,
hyprlang,
hyprutils,
hyprwayland-scanner,
@ -28,6 +29,7 @@
pciutils,
pkgconf,
python3,
re2,
systemd,
tomlplusplus,
wayland,
@ -82,14 +84,14 @@ assert assertMsg (!hidpiXWayland)
customStdenv.mkDerivation (finalAttrs: {
pname = "hyprland" + optionalString debug "-debug";
version = "0.45.2";
version = "0.46.1";
src = fetchFromGitHub {
owner = "hyprwm";
repo = "hyprland";
fetchSubmodules = true;
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-1pNsLGNStCFjXiBc2zMUxKzKk45CePTf+GwKlzTmrCY=";
hash = "sha256-0SVRQJeKsdwaTO7pMM0MwTXyVwKNQ4m1f2mvcPnZttM=";
};
postPatch = ''
@ -138,6 +140,7 @@ customStdenv.mkDerivation (finalAttrs: {
cairo
git
hyprcursor.dev
hyprgraphics
hyprlang
hyprutils
libGL
@ -148,6 +151,7 @@ customStdenv.mkDerivation (finalAttrs: {
libgbm
pango
pciutils
re2
tomlplusplus
wayland
wayland-protocols

View file

@ -15,16 +15,16 @@
rustPlatform.buildRustPackage {
pname = "inv-sig-helper";
version = "0-unstable-2024-12-10";
version = "0-unstable-2024-12-16";
src = fetchFromGitHub {
owner = "iv-org";
repo = "inv_sig_helper";
rev = "ac0269f1586df5a853c4321256866bcbea89802b";
hash = "sha256-w8ZvNCs6xz79RjAzIVhtYRJoLzC97RYm2U1ydao3Ons=";
rev = "23932bfa05397e5dfa2844128f0bee7207aabb0a";
hash = "sha256-BSOh+H3YKuW86wYeZuw18yMLc7yCTr/4NZk/86xKXoQ=";
};
cargoHash = "sha256-Y9q64ltv2QRtRUy5t40JIfwFh8ryO1D0Gdg7xO1azws=";
cargoHash = "sha256-/B12aXSFGoTtubrT4AqfGrjxZ2RHh7NUf8L0cYr28AQ=";
nativeBuildInputs = [
pkg-config

View file

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "jq-lsp";
version = "0.1.9";
version = "0.1.10";
src = fetchFromGitHub {
owner = "wader";
repo = "jq-lsp";
rev = "refs/tags/v${version}";
hash = "sha256-BvnSX8pDdmj3t9/DHdV8zf0IZiu4sm97/KJdWOumNEI=";
hash = "sha256-s+219cldEZ3ylP+qDycl8LXfiwatoJMJfueVFtQGA6M=";
};
vendorHash = "sha256-8sZGnoP7l09ZzLJqq8TUCquTOPF0qiwZcFhojUnnEIY=";

View file

@ -6,20 +6,19 @@
kclvm_cli,
kclvm,
lib,
makeWrapper,
nix-update-script,
stdenv,
}:
buildGoModule rec {
pname = "kcl";
version = "0.10.9";
version = "0.10.10";
src = fetchFromGitHub {
owner = "kcl-lang";
repo = "cli";
rev = "v${version}";
hash = "sha256-V9HLUv018gCkzrt1mGNENZVjXCSvqEneQIgIwxawxKM=";
hash = "sha256-zv1YH/0JmNcWbyx9RLhyWykPbL34jnUbdy1HSZiYz3s=";
};
vendorHash = "sha256-y8KWiy6onZmYdpanXcSQDmYv51pLfo1NTdg+EaR6p0E=";
@ -33,7 +32,6 @@ buildGoModule rec {
nativeBuildInputs = [
installShellFiles
makeWrapper
];
buildInputs =
@ -55,21 +53,19 @@ buildGoModule rec {
done
'';
doInstallCheck = true;
installCheckPhase = ''
runHook preInstallCheck
set -o pipefail
$out/bin/kcl --version | grep $version
$out/bin/kcl <(echo 'hello = "KCL"') | grep "hello: KCL"
runHook postInstallCheck
'';
# By default, libs and bins are stripped. KCL will crash on darwin if they are.
dontStrip = stdenv.hostPlatform.isDarwin;
# env vars https://github.com/kcl-lang/kcl-go/blob/main/pkg/env/env.go#L29
postFixup = ''
wrapProgram $out/bin/kcl \
--prefix PATH : "${
lib.makeBinPath [
kclvm
kclvm_cli
]
}" \
--prefix KCL_LIB_HOME : "${lib.makeLibraryPath [ kclvm ]}" \
--prefix KCL_GO_DISABLE_INSTALL_ARTIFACT : false
'';
doCheck = true;
updateScript = nix-update-script { };

View file

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "kittycad-kcl-lsp";
version = "0.1.61";
version = "0.1.65";
src = fetchFromGitHub {
owner = "KittyCAD";
repo = "kcl-lsp";
rev = "refs/tags/v${version}";
hash = "sha256-VtrR4v0BJWYdoYFDJpWnmVqDhZMlPGm+g9yjxYfcFxQ=";
hash = "sha256-3j7xiTrhDPBNTg53y2KyLpk8m4DrJbZWYkdIm5sxEfs=";
};
cargoHash = "sha256-51eFOJnc/GqgXtfVx/omR+KuC7x/oKGGR+s0z6nKXBg=";
cargoHash = "sha256-t7YnOnls0PZM2iTmmkBFt1WmFvqiY4eS8LBf0tvinJg=";
nativeBuildInputs = [ pkg-config ];

View file

@ -8,13 +8,13 @@
rustPlatform.buildRustPackage rec {
pname = "kubetui";
version = "1.5.3";
version = "1.5.4";
src = fetchFromGitHub {
owner = "sarub0b0";
repo = "kubetui";
rev = "refs/tags/v${version}";
hash = "sha256-0K0h/MaQClJDqgF0qQO2INb+hpzxfSikAti+751MX/8=";
hash = "sha256-Trgc3T+01u1izePfM0wPjer3IrA6PtIGsK+syEzs0V8=";
};
checkFlags = [
@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
frameworks.AppKit
]
);
cargoHash = "sha256-kfAErXqjdLn2jaCtr+eI0+0v4TcE8Hpx0DDECnuYp5w=";
cargoHash = "sha256-f9JrowyZx4NvfGJSU/HjyTfWKhkAANNfUgcK9CRPW7I=";
meta = {
homepage = "https://github.com/sarub0b0/kubetui";

View file

@ -8,11 +8,11 @@
let
pname = "ledger-live-desktop";
version = "2.92.1";
version = "2.94.0";
src = fetchurl {
url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
hash = "sha256-X4jJ7vDoU1CyZQm9Grghn6Rv+7OILE79PbN77BUhzG0=";
hash = "sha256-7nnsphM6PGvv/jy22Z7OFi5OEUYFaU5bIKNbgzCcwAc=";
};
appimageContents = appimageTools.extractType2 {

View file

@ -6,16 +6,16 @@
buildNpmPackage rec {
pname = "mainsail";
version = "2.13.0";
version = "2.13.1";
src = fetchFromGitHub {
owner = "mainsail-crew";
repo = "mainsail";
rev = "v${version}";
hash = "sha256-1DpGfCa1jw6PO/a1dfsA4Oo5J1NqE4vlEbF0KKbwM4w=";
hash = "sha256-Ugxy6bbLD0XJwKLW3YOM32GWrK9q8JsrcKGipZNZOsE=";
};
npmDepsHash = "sha256-jOuIV6yR7hIPYRiAy5odxk8LreHiVTlZ03stwV2Nf4o=";
npmDepsHash = "sha256-mlF8p9s5aGjZz1nfBOOECsW/BhaP2ToQ4f6gUU9sgSI=";
# Prevent Cypress binary download.
CYPRESS_INSTALL_BINARY = 0;

View file

@ -10,14 +10,14 @@
buildGoModule rec {
pname = "manifest-tool";
version = "2.1.8";
version = "2.1.9";
modRoot = "v2";
src = fetchFromGitHub {
owner = "estesp";
repo = "manifest-tool";
rev = "v${version}";
hash = "sha256-1zsNIG7U389L4hXmQ1XGkWCu2ZpyGimoJkoJatY99E0=";
hash = "sha256-tehdgYH73tmzjhJmTQuMWvciGYIyc6VeIMS2fFO7YP4=";
leaveDotGit = true;
postFetch = ''
git -C $out rev-parse HEAD > $out/.git-revision

View file

@ -1,13 +1,13 @@
{
"version": "3.125.0",
"version": "3.127.0",
"assets": {
"x86_64-linux": {
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.125.0/mirrord_linux_x86_64",
"hash": "sha256-xh5M/YG2W61wiNd4iB6LVUfidkHkB5OmbCzRh7yUpeU="
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.127.0/mirrord_linux_x86_64",
"hash": "sha256-CM0huCmv/jFwc4KBCIekfV4oFzCipg49F1VR4259/rg="
},
"aarch64-linux": {
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.125.0/mirrord_linux_aarch64",
"hash": "sha256-MWGdYeJXseSAKlndUT07NNWCpywJfGJ0hGRklEMQQmw="
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.127.0/mirrord_linux_aarch64",
"hash": "sha256-tTuzhRqACpMIs3WlTZoVVMmqy8SgfXymjGMI6un2zvc="
}
}
}

View file

@ -0,0 +1,36 @@
diff --git a/music_assistant/server/helpers/util.py b/music_assistant/server/helpers/util.py
index 3d342b73..a395fb46 100644
--- a/music_assistant/server/helpers/util.py
+++ b/music_assistant/server/helpers/util.py
@@ -117,30 +117,11 @@ async def load_provider_module(domain: str, requirements: list[str]) -> Provider
def _get_provider_module(domain: str) -> ProviderModuleType:
return importlib.import_module(f".{domain}", "music_assistant.server.providers")
- # ensure module requirements are met
- for requirement in requirements:
- if "==" not in requirement:
- # we should really get rid of unpinned requirements
- continue
- package_name, version = requirement.split("==", 1)
- installed_version = await get_package_version(package_name)
- if installed_version == "0.0.0":
- # ignore editable installs
- continue
- if installed_version != version:
- await install_package(requirement)
-
# try to load the module
try:
return await asyncio.to_thread(_get_provider_module, domain)
except ImportError:
- # (re)install ALL requirements
- for requirement in requirements:
- await install_package(requirement)
- # try loading the provider again to be safe
- # this will fail if something else is wrong (as it should)
- return await asyncio.to_thread(_get_provider_module, domain)
-
+ raise RuntimeError(f"Missing dependencies for provider {domain}.")
def create_tempfile():
"""Return a (named) temporary file."""

View file

@ -43,6 +43,9 @@ python.pkgs.buildPythonApplication rec {
ffmpeg = "${lib.getBin ffmpeg-headless}/bin/ffmpeg";
ffprobe = "${lib.getBin ffmpeg-headless}/bin/ffprobe";
})
# Disable interactive dependency resolution, which clashes with the immutable Python environment
./dont-install-deps.patch
];
postPatch = ''

View file

@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
#!nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ jinja2 mashumaro orjson aiofiles packaging ])" -p pyright ruff isort
#!nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ jinja2 mashumaro orjson aiofiles packaging ])" -p pyright ruff isort nixfmt-rfc-style
import asyncio
import json
import os.path
@ -49,6 +49,7 @@ ROOT: Final = (
.strip()
)
PACKAGE_SET = "music-assistant.python.pkgs"
PACKAGE_MAP = {
"git+https://github.com/MarvinSchenkel/pytube.git": "pytube",
}
@ -167,6 +168,11 @@ def resolve_package_attribute(package: str) -> str:
return matches.pop()
async def get_package_version(package: str) -> str:
version = cast(str, await Nix.eval(f"{PACKAGE_SET}.{package}.version"))
return version
@dataclass
class Provider:
domain: str
@ -180,7 +186,8 @@ class Provider:
return hash(self.domain)
def resolve_providers(manifests) -> Set:
async def resolve_providers(manifests) -> Set:
errors = []
providers = set()
for manifest in manifests:
provider = Provider(manifest.domain)
@ -188,30 +195,44 @@ def resolve_providers(manifests) -> Set:
# allow substituting requirement specifications that packaging cannot parse
if requirement in PACKAGE_MAP:
requirement = PACKAGE_MAP[requirement]
requirement = Requirement(requirement)
try:
provider.available.append(resolve_package_attribute(requirement.name))
attr = resolve_package_attribute(requirement.name)
provider.available.append(attr)
except TooManyMatches as ex:
print(ex, file=sys.stderr)
provider.missing.append(requirement.name)
continue
except NoMatch:
provider.missing.append(requirement.name)
continue
version = await get_package_version(attr)
if version not in requirement.specifier:
errors.append(f"{requirement} not satisifed by version {version}")
providers.add(provider)
if errors:
print("\n - ", end="")
print("\n - ".join(errors))
return providers
def render(version: str, providers: Set):
path = os.path.join(ROOT, "pkgs/by-name/mu/music-assistant/providers.nix")
def render(outpath: str, version: str, providers: Set):
env = Environment()
template = env.from_string(TEMPLATE)
template.stream(version=version, providers=providers).dump(path)
template.stream(version=version, providers=providers).dump(outpath)
async def main():
version: str = cast(str, await Nix.eval("music-assistant.version"))
manifests = await get_provider_manifests(version)
providers = resolve_providers(manifests)
render(version, providers)
providers = await resolve_providers(manifests)
outpath = os.path.join(ROOT, "pkgs/by-name/mu/music-assistant/providers.nix")
render(outpath, version, providers)
run_sync(["nixfmt", outpath])
if __name__ == "__main__":

View file

@ -3,9 +3,9 @@
stdenv,
rustPlatform,
fetchFromGitHub,
apple-sdk_11,
ntpd-rs,
installShellFiles,
darwin,
pandoc,
nixosTests,
nix-update-script,
@ -14,20 +14,19 @@
rustPlatform.buildRustPackage rec {
pname = "ntpd-rs";
version = "1.3.1";
version = "1.4.0";
src = fetchFromGitHub {
owner = "pendulum-project";
repo = "ntpd-rs";
rev = "refs/tags/v${version}";
hash = "sha256-WN+6Ba3oGnoiH5SC0ZHBHqS4F/XPqEyC3J71Fj+3CrQ=";
hash = "sha256-usLtf4qwKkn+lEYSQWCa1ap9h/52YYMVFDkpFJVD00k=";
};
cargoHash = "sha256-IksW8a6OGZzgEInX0P2sS/UMH8XaPRwXCesq7qxvURk=";
cargoHash = "sha256-ZB18YbCdJpuu7qTXdHgs2IgDCoc3Hs/aDn4dzXmKI8c=";
buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk_11_0.frameworks.Security
];
nativeBuildInputs = [
pandoc
installShellFiles

View file

@ -4,24 +4,22 @@
, autoPatchelfHook
, dpkg
, gtk3
, openssl_1_1
, openssl
, pcsclite
}:
stdenv.mkDerivation rec {
pname = "pcsc-safenet";
version = "10.8.28";
version = "10.8.1050";
debName = "Installation/Standard/Ubuntu-2004/safenetauthenticationclient_${version}_amd64.deb";
debName = "Installation/Standard/Ubuntu-2204/safenetauthenticationclient_${version}_amd64.deb";
# extract debian package from larger zip file
src =
let
versionWithUnderscores = builtins.replaceStrings ["."] ["_"] version;
in fetchzip {
url = "https://www.digicert.com/StaticFiles/SAC_${versionWithUnderscores}_GA_Build.zip";
hash = "sha256-7XWj3T9/KnmgQ05urOJV6dqgkAS/A2G7efnqjQO2ing=";
};
src = fetchzip {
# URL version name is different that the version name of the .deb file inside
url = "https://www.digicert.com/StaticFiles/Linux_SAC_10_8_R1_GA.zip";
hash = "sha256-Wh2Ax4ZVFKqn0yDwZmwvtUqwQNYyBng08IPfemHzZC0=";
};
dontBuild = true;
dontConfigure = true;
@ -32,12 +30,12 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk3
openssl_1_1
openssl
pcsclite
];
runtimeDependencies = [
openssl_1_1
openssl
];
nativeBuildInputs = [
@ -75,7 +73,7 @@ stdenv.mkDerivation rec {
done
) || exit
ln -sf ${lib.getLib openssl_1_1}/lib/libcrypto.so $out/lib/libcrypto.so.1.1.0
ln -sf ${lib.getLib openssl}/lib/libcrypto.so $out/lib/libcrypto.so.3
'';
dontAutoPatchelf = true;

View file

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "pulumictl";
version = "0.0.46";
version = "0.0.47";
src = fetchFromGitHub {
owner = "pulumi";
repo = "pulumictl";
rev = "v${version}";
sha256 = "sha256-7A6dx/5091FIQ2AB6C+Z2CjhTBx2e6iB21Du2u9EiHY=";
sha256 = "sha256-bZ7Di1DcvGECfOzW72QnfWRn76U+agsNsdsprBjx5Rw=";
};
vendorHash = "sha256-Wktr3TXSIIzbkiT3Gk5i4K58gahnxySi6ht30li+Z0o=";
vendorHash = "sha256-QYQk36e7NLZnl00fRW4i4UMy7jFVaGHlXcxXt/wqw3M=";
ldflags = [
"-s"

View file

@ -11,12 +11,12 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "raycast";
version = "1.87.4";
version = "1.88.3";
src = fetchurl {
name = "Raycast.dmg";
url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal";
hash = "sha256-tM8j9oFIn5gAskM7Fxu4xMRh3pRsmroDDLkGyaie9I0=";
hash = "sha256-MOJlEUQHLDw8YeQC9sG5QLSO8qhgcWG8HtyRZCPHb+M=";
};
dontPatch = true;

View file

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "rke";
version = "1.7.0";
version = "1.7.1";
src = fetchFromGitHub {
owner = "rancher";
repo = pname;
rev = "v${version}";
hash = "sha256-TbcjyUB0ni/n24vySZEUd0gFiWHr4FAdYhRB7BFPpCY=";
hash = "sha256-BatjRfUosYD5e3TNzgREuMeGSA2lknZMG3/y+0V2NkU=";
};
vendorHash = "sha256-Lp14xvhn4xzOurTa8sRk0A1X1c/sj1clw7niVTRgNeM=";

View file

@ -12,7 +12,7 @@
rustPlatform.buildRustPackage rec {
pname = "skim";
version = "0.15.0";
version = "0.15.5";
outputs = [
"out"
@ -24,14 +24,14 @@ rustPlatform.buildRustPackage rec {
owner = "skim-rs";
repo = "skim";
rev = "refs/tags/v${version}";
hash = "sha256-Y/MVjwpNyYXjQWB3s8WRblCukBr0z81k3gf3bf58KGE=";
hash = "sha256-ijuzEfoYSVLfWiBq4Wnxy3LbX0viDZZ6FZ4EvvUHf1M=";
};
postPatch = ''
sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim
'';
cargoHash = "sha256-llpNnZdIFHCmyyVla+tZOgpMTavu/m3ZGFZaS5EbiVo=";
cargoHash = "sha256-JGsKz361hnRoDDq5zpA64jkk8MB3fqrh8xA3l0ZV1Bs=";
nativeBuildInputs = [ installShellFiles ];
@ -64,7 +64,7 @@ rustPlatform.buildRustPackage rec {
meta = {
description = "Command-line fuzzy finder written in Rust";
homepage = "https://github.com/lotabout/skim";
homepage = "https://github.com/skim-rs/skim";
changelog = "https://github.com/skim-rs/skim/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [

View file

@ -5,7 +5,7 @@
}:
let
version = "16.11.0";
version = "16.12.0";
in
buildNpmPackage {
pname = "stylelint";
@ -15,10 +15,10 @@ buildNpmPackage {
owner = "stylelint";
repo = "stylelint";
rev = version;
hash = "sha256-LcnKytRxIZ5Fzz0tGMM7RBke2g3zu94BjtMkMseM4qc=";
hash = "sha256-tFM4HR7n7GP+kawa1tcV/Hleb+IoCOKEHiKgULQySww=";
};
npmDepsHash = "sha256-l1aP9fmXu5U9t4x5lvJoFTotDv3mLDD5mfc4eVNaZbc=";
npmDepsHash = "sha256-ypQBWWsQiHFsU8JG+ACbKjOjYoYyoPQ6Ws3IrNgAwsU=";
dontNpmBuild = true;

View file

@ -8,11 +8,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "txr";
version = "296";
version = "297";
src = fetchurl {
url = "https://www.kylheku.com/cgit/txr/snapshot/txr-${finalAttrs.version}.tar.bz2";
hash = "sha256-dT50wfEcEJpSNYVrXlgAkSuCZ+CCV6GibxfnTv1cKRc=";
hash = "sha256-S+0EryX+6AhQ6WjaSHYtLACkWk+pr9t9EqDkTPYlE4k=";
};
buildInputs = [ libffi ];

View file

@ -5,6 +5,7 @@
fetchFromGitHub,
pkg-config,
libffi,
audioSupport ? true,
alsa-lib,
webcamSupport ? false,
@ -33,9 +34,14 @@ rustPlatform.buildRustPackage rec {
lib.optionals (webcamSupport || stdenv.hostPlatform.isDarwin) [ rustPlatform.bindgenHook ]
++ lib.optionals audioSupport [ pkg-config ];
buildInputs = lib.optionals (audioSupport && stdenv.hostPlatform.isLinux) [ alsa-lib ];
buildInputs =
[ libffi ] # we force dynamic linking our own libffi below
++ lib.optionals (audioSupport && stdenv.hostPlatform.isLinux) [ alsa-lib ];
buildFeatures = lib.optional audioSupport "audio" ++ lib.optional webcamSupport "webcam";
buildFeatures =
[ "libffi/system" ] # force libffi to be linked dynamically instead of rebuilding it
++ lib.optional audioSupport "audio"
++ lib.optional webcamSupport "webcam";
passthru.updateScript = versionInfo.updateScript;
passthru.tests.run = runCommand "uiua-test-run" { nativeBuildInputs = [ uiua ]; } ''

View file

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "vault-medusa";
version = "0.7.2";
version = "0.7.3";
src = fetchFromGitHub {
owner = "jonasvinther";
repo = "medusa";
rev = "v${version}";
sha256 = "sha256-c5ldU54SQQKnKp2xxUiHVOaCRV9ttC24sN8AUMMuWzQ=";
sha256 = "sha256-pMCkJMY5KFkNsmv/LFYZrDmrq2G7fw1fl9HEYGAKuIM=";
};
vendorHash = "sha256-GdQiPeU5SWZlqWkyk8gU9yVTUQxJlurhY3l1xZXKeJY=";
vendorHash = "sha256-+bGuWOFmglvW/qB+6VlOPeoB9lwkikksQPuDKE/2kXw=";
meta = with lib; {
description = "Cli tool for importing and exporting Hashicorp Vault secrets";

View file

@ -1,14 +1,14 @@
{
"darwin": {
"hash": "sha256-+UIvrnsoHzGRKX+ULqr4/IC5N8WLtH4adsjf8axcppU=",
"version": "0.2024.12.10.15.55.stable_02"
"hash": "sha256-NK9/YhnEWdoxF8fkGJvYVFCsNh0XPSheXbw89wNkaio=",
"version": "0.2024.12.10.15.55.stable_04"
},
"linux_x86_64": {
"hash": "sha256-7QMYkqjurb5vgoYfhprAExlgPhhpTrBCYyLCO4hdV8g=",
"version": "0.2024.12.10.15.55.stable_02"
"hash": "sha256-wAzPAaigjaHl5JhuS92rkHXLZRAQtq7p8IB67sqPDlY=",
"version": "0.2024.12.10.15.55.stable_04"
},
"linux_aarch64": {
"hash": "sha256-WjyxQZGzf0dpwR/hpxhdd3q+rV8SS4m8GiQqtVd9MLE=",
"version": "0.2024.12.10.15.55.stable_02"
"hash": "sha256-GbirEK2Jhfunj9ORWp5uW/QHUzSnJRQRh1ezApr1p00=",
"version": "0.2024.12.10.15.55.stable_04"
}
}

View file

@ -9,13 +9,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "whatsapp-for-mac";
version = "2.24.11.85";
version = "2.24.23.82";
src = fetchzip {
extension = "zip";
name = "WhatsApp.app";
url = "https://web.whatsapp.com/desktop/mac_native/release/?version=${finalAttrs.version}&extension=zip&configuration=Release&branch=relbranch";
hash = "sha256-vbgym7AfRi6kzZVMPRA6lP+6pL8cXnR7yt9hWPnt3+E=";
hash = "sha256-FnXW3l4JUdJkDQ7eASlDeUzRdZ2N5l3WvEKcuBuE0nY=";
};
dontConfigure = true;

View file

@ -17,13 +17,13 @@ python3Packages.buildPythonApplication rec {
# The websites yt-dlp deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
version = "2024.12.6";
version = "2024.12.13";
pyproject = true;
src = fetchPypi {
inherit version;
pname = "yt_dlp";
hash = "sha256-dD2+CB6ocb4/X/CD4s2V2oZt6nc/xwrmsQmDjPv3KsQ=";
hash = "sha256-d+Fa+51GDstylKObteOdyfTopl86N+9NtYgAuU0JVRE=";
};
build-system = with python3Packages; [

View file

@ -32,6 +32,19 @@ index 53ecd5fc..78782357 100644
import Gio from 'gi://Gio';
import GObject from 'gi://GObject';
diff --git i/src/gsconnect-preferences w/src/gsconnect-preferences
index b16ddc7d..263dfb04 100755
--- a/src/gsconnect-preferences
+++ b/src/gsconnect-preferences
@@ -6,6 +6,8 @@
// -*- mode: js; -*-
+import './__nix-prepend-search-paths.js';
+
import Gdk from 'gi://Gdk?version=3.0';
import 'gi://GdkPixbuf?version=2.0';
import Gio from 'gi://Gio?version=2.0';
diff --git a/src/prefs.js b/src/prefs.js
index dd20fd20..5f82c53a 100644
--- a/src/prefs.js

View file

@ -31,14 +31,14 @@
buildPythonPackage rec {
pname = "accelerate";
version = "1.2.0";
version = "1.2.1";
pyproject = true;
src = fetchFromGitHub {
owner = "huggingface";
repo = "accelerate";
tag = "v${version}";
hash = "sha256-EH/WiEm2ILJBG7kuUOVmLs4eFiQ3xT8pFC+EhAJs6Q0=";
hash = "sha256-KnFf6ge0vUR/C7Rh/c6ZttCGKo9OUIWCUYxk5O+OW7c=";
};
buildInputs = [ llvmPackages.openmp ];

View file

@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "aiohomeconnect";
version = "0.7.0";
version = "0.7.2";
pyproject = true;
disabled = pythonOlder "3.11";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "MartinHjelmare";
repo = "aiohomeconnect";
rev = "refs/tags/v${version}";
hash = "sha256-OgHlYa5n8BnXnaJg/Ns27cXaGKDUkSddDFvl03rwNXM=";
hash = "sha256-E+2IQy3O+ccvZfjlORo+eTd+l41FSXk1dIE2Adrn3Ok=";
};
pythonRelaxDeps = [ "httpx" ];

View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "aiolifx-themes";
version = "0.5.7";
version = "0.5.8";
pyproject = true;
disabled = pythonOlder "3.9";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "Djelibeybi";
repo = "aiolifx-themes";
rev = "refs/tags/v${version}";
hash = "sha256-RrRwtWoOqHsHa0TtQFF2QXgF0RnAe+TsG2eAjjKtE0I=";
hash = "sha256-MeGhtjdvtL0armoLrlqPsV4SUCTWbkBvRTj6ReuKQpQ=";
};
build-system = [ poetry-core ];

View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "awsiotsdk";
version = "1.22.0";
version = "1.22.1";
pyproject = true;
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "aws";
repo = "aws-iot-device-sdk-python-v2";
rev = "refs/tags/v${version}";
hash = "sha256-2ZMNG+6yshEvjEpyN6uV62m11LZUrUHAzpRbm1foif0=";
hash = "sha256-Rgae9JzoW+OA4+sP/xdkmX8fbRJCJ7MqIpv81n08uXU=";
};
pythonRelaxDeps = [ "awscrt" ];

View file

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "bloodyad";
version = "2.1.1";
version = "2.1.2";
pyproject = true;
disabled = pythonOlder "3.8";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "CravateRouge";
repo = "bloodyAD";
rev = "refs/tags/v${version}";
hash = "sha256-c7qByStTu7ZSmpDzOoSQJiDo9KgiWCa9noyqJ/eWv3U=";
hash = "sha256-fPSPlG8BvS4trRfO2D7qyxjPoKgE3MYG4hwLV8lSvx8=";
};
build-system = [ hatchling ];

View file

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "google-cloud-netapp";
version = "0.3.16";
version = "0.3.17";
pyproject = true;
disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_netapp";
inherit version;
hash = "sha256-INSBGr5IslKzhmzWy+8zuncATFkldPh9QzGl6ddC9IY=";
hash = "sha256-VVgUqFHUbAJ0vFzPFM2Z2pPlKuIDnl8zSIcw7JFnDwo=";
};
build-system = [ setuptools ];

View file

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "google-cloud-trace";
version = "1.14.1";
version = "1.15.0";
pyproject = true;
disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_trace";
inherit version;
hash = "sha256-GXak86/llk1RftQKhjY4fjRNiXFMliZsryByneEczQQ=";
hash = "sha256-wgy+9eUr6MpiiiL+vmW49F/dpoW7Rv/KNvTs6keOxKM=";
};
build-system = [ setuptools ];

View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "holidays";
version = "0.62";
version = "0.63";
pyproject = true;
disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "vacanza";
repo = "python-holidays";
rev = "refs/tags/v${version}";
hash = "sha256-t0+kphN1pWmy0F9XzV/d5GVswcEu+a0R0gJIVrdj3qU=";
hash = "sha256-XA6XvxWHttt+ic5027Q/3VGqrFYznYCiExSFBHU7qcY=";
};
build-system = [

View file

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "nitransforms";
version = "24.0.2";
version = "24.1.0";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-7C0HaGmJhlABzGZ90glx865SnVNmt2wDlmOX3bnnJXI=";
hash = "sha256-QOOc3A/oADnjOtxgLqArwXIikwNDApVY4yHAYt9ENRU=";
};
build-system = [

View file

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "publicsuffixlist";
version = "1.0.2.20241216";
version = "1.0.2.20241217";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-t04snjgebEOHAMipwxtTNs58BYTlFieQsQS1/SfAomI=";
hash = "sha256-c46nDRPvPFSfSfYgEiwxQxHcxXCFMkH11SJ2opod6Ms=";
};
build-system = [ setuptools ];

View file

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "pygsl";
version = "2.4.1";
version = "2.5.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "pygsl";
repo = "pygsl";
rev = "refs/tags/v${version}";
hash = "sha256-85j57gzvomhBX/+Dif8IoMpNE9vJvyHPFHchKRF9OQM=";
tag = "v${version}";
hash = "sha256-ym7wCCaqY1y4Q7LDaNfGoao//DcG+H/6Fmg0YZUThOU=";
};
# error: no member named 'n' in 'gsl_bspline_workspace'

View file

@ -9,27 +9,31 @@
buildPythonPackage rec {
pname = "pyngrok";
version = "7.2.1";
version = "7.2.2";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-UJIbCcsQzKmFeH8gvfxFVN4ovT7eCnSHBsCCooInm/E=";
hash = "sha256-9ynOuiYYI6sR9hYlVgRTGu78O+roN3rBon1TNTLTvBo=";
};
nativeBuildInputs = [ setuptools ];
build-system = [
setuptools
];
propagatedBuildInputs = [ pyyaml ];
dependencies = [
pyyaml
];
pythonImportsCheck = [ "pyngrok" ];
meta = with lib; {
meta = {
description = "Python wrapper for ngrok";
homepage = "https://github.com/alexdlaird/pyngrok";
changelog = "https://github.com/alexdlaird/pyngrok/blob/${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ wegank ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ wegank ];
};
}

View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pynordpool";
version = "0.2.2";
version = "0.2.3";
pyproject = true;
disabled = pythonOlder "3.11";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "gjohansson-ST";
repo = "pynordpool";
rev = "refs/tags/v${version}";
hash = "sha256-JoH9ROT/npBd8BTEuynsF9gbE0jJgYLFPiwFv0s9sH4=";
hash = "sha256-QNPq2KKUDgxf2VQ/O+/dywLY6RcHfU2RaC2sohjVmaI=";
};
build-system = [ poetry-core ];

View file

@ -909,8 +909,8 @@ with pkgs;
};
akkoma = callPackage ../servers/akkoma {
elixir = elixir_1_16;
beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_16; });
elixir = beam_nox.interpreters.elixir_1_16;
beamPackages = beamPackages.extend (self: super: { elixir = beam_nox.interpreters.elixir_1_16; });
};
akkoma-frontends = recurseIntoAttrs {
akkoma-fe = callPackage ../servers/akkoma/akkoma-fe { };