Merge master into staging-nixos
This commit is contained in:
nixpkgs-ci[bot]
@@ -13,18 +13,24 @@
|
||||
];
|
||||
};
|
||||
|
||||
# copy the config for nixos-rebuild
|
||||
system.activationScripts.config =
|
||||
# Create a default configuration.nix on first boot so nixos-rebuild works
|
||||
# out of the box.
|
||||
systemd.services.incus-create-nixos-config =
|
||||
let
|
||||
config = pkgs.replaceVars ./incus-container-image-inner.nix {
|
||||
configFile = pkgs.replaceVars ./incus-container-image-inner.nix {
|
||||
stateVersion = lib.trivial.release;
|
||||
};
|
||||
in
|
||||
''
|
||||
if [ ! -e /etc/nixos/configuration.nix ]; then
|
||||
install -m 0644 -D ${config} /etc/nixos/configuration.nix
|
||||
fi
|
||||
'';
|
||||
{
|
||||
description = "Create default NixOS configuration for Incus";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
unitConfig.ConditionPathExists = "!/etc/nixos/configuration.nix";
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
ExecStart = "${pkgs.coreutils}/bin/install -m 0644 -D ${configFile} /etc/nixos/configuration.nix";
|
||||
};
|
||||
};
|
||||
|
||||
networking = {
|
||||
dhcpcd.enable = false;
|
||||
|
||||
@@ -13,18 +13,24 @@
|
||||
];
|
||||
};
|
||||
|
||||
# copy the config for nixos-rebuild
|
||||
system.activationScripts.config =
|
||||
# Create a default configuration.nix on first boot so nixos-rebuild works
|
||||
# out of the box.
|
||||
systemd.services.incus-create-nixos-config =
|
||||
let
|
||||
config = pkgs.replaceVars ./incus-virtual-machine-image-inner.nix {
|
||||
configFile = pkgs.replaceVars ./incus-virtual-machine-image-inner.nix {
|
||||
stateVersion = lib.trivial.release;
|
||||
};
|
||||
in
|
||||
''
|
||||
if [ ! -e /etc/nixos/configuration.nix ]; then
|
||||
install -m 0644 -D ${config} /etc/nixos/configuration.nix
|
||||
fi
|
||||
'';
|
||||
{
|
||||
description = "Create default NixOS configuration for Incus";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
unitConfig.ConditionPathExists = "!/etc/nixos/configuration.nix";
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
ExecStart = "${pkgs.coreutils}/bin/install -m 0644 -D ${configFile} /etc/nixos/configuration.nix";
|
||||
};
|
||||
};
|
||||
|
||||
# Network
|
||||
networking = {
|
||||
|
||||
@@ -79,8 +79,9 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
# Install new init script
|
||||
system.activationScripts.installInitScript = ''
|
||||
ln -fs $systemConfig/init /init
|
||||
# Update /init symlink when switching configurations so the container
|
||||
# boots the new system on restart.
|
||||
system.build.installBootLoader = pkgs.writeShellScript "install-docker-init" ''
|
||||
${pkgs.coreutils}/bin/ln -fs "$1/init" /init
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -640,6 +640,7 @@ in
|
||||
listen 127.0.0.1:5000;
|
||||
|
||||
# vod settings
|
||||
vod_hls_version 6;
|
||||
vod_base_url "";
|
||||
vod_segments_base_url "";
|
||||
vod_mode mapped;
|
||||
|
||||
@@ -136,8 +136,5 @@
|
||||
|
||||
systemd.packages = [ pkgs.distrobuilder.generator ];
|
||||
|
||||
system.activationScripts.installInitScript = lib.mkForce ''
|
||||
ln -fs $systemConfig/init /sbin/init
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
||||
@@ -156,6 +156,16 @@ in
|
||||
|
||||
server.succeed(f"incus exec {instance_name} -- test -e /dev/tpm0")
|
||||
server.succeed(f"incus exec {instance_name} -- test -e /dev/tpmrm0")
|
||||
|
||||
with subtest("[${image_id}] default configuration.nix is created on first boot"):
|
||||
server.succeed(f"incus exec {instance_name} -- test -f /etc/nixos/configuration.nix")
|
||||
|
||||
with subtest("[${image_id}] configuration.nix create service does not overwrite existing config"):
|
||||
server.succeed(f"incus exec {instance_name} -- systemctl restart incus-create-nixos-config.service")
|
||||
status = server.succeed(
|
||||
f"incus exec {instance_name} -- systemctl show -p ActiveState incus-create-nixos-config.service"
|
||||
).strip()
|
||||
assert "inactive" in status, f"Expected inactive (ConditionPathExists should prevent start), got {status}"
|
||||
''
|
||||
#
|
||||
# container specific
|
||||
@@ -164,6 +174,21 @@ in
|
||||
lib.optionalString (config.type == "container")
|
||||
# python
|
||||
''
|
||||
with subtest("[${image_id}] switch-to-configuration updates /sbin/init via installBootLoader"):
|
||||
# Remove /sbin/init so we can verify installBootLoader recreates it
|
||||
server.succeed(f"incus exec {instance_name} -- rm -f /sbin/init")
|
||||
server.fail(f"incus exec {instance_name} -- test -e /sbin/init")
|
||||
|
||||
server.succeed(
|
||||
f"incus exec {instance_name} -- /run/current-system/bin/switch-to-configuration switch"
|
||||
)
|
||||
|
||||
# Verify installBootLoader recreated /sbin/init pointing to the system's init
|
||||
server.succeed(f"incus exec {instance_name} -- test -x /sbin/init")
|
||||
target = server.succeed(f"incus exec {instance_name} -- readlink -f /sbin/init").strip()
|
||||
current = server.succeed(f"incus exec {instance_name} -- readlink -f /run/current-system/init").strip()
|
||||
assert target == current, f"/sbin/init -> {target}, expected {current}"
|
||||
|
||||
# TODO troubleshoot VM hot memory resizing which was introduced in 6.12
|
||||
with subtest("[${image_id}] memory limits can be hotplug changed"):
|
||||
server.set_instance_config(instance_name, "limits.memory 512MB")
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "gambatte";
|
||||
version = "0-unstable-2026-03-31";
|
||||
version = "0-unstable-2026-04-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "gambatte-libretro";
|
||||
rev = "9669d1f9266684e60ac1c5ed9b438bd2a02a3b4d";
|
||||
hash = "sha256-/mxkjVG7fkjUZ1LHNtFYA0/7ZTyvAYtcF5xO8cxWkzc=";
|
||||
rev = "483a1f13f7e8a1c2b3076eb8bfc38e668e640c17";
|
||||
hash = "sha256-efpehssNF3FmSbJAqRS1PkYWTs1v0y0KTdBiRV8K/WY=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "play";
|
||||
version = "0-unstable-2026-03-31";
|
||||
version = "0-unstable-2026-04-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jpd002";
|
||||
repo = "Play-";
|
||||
rev = "cd1dba563cb39925796175f2b8ce95a15c90ee1a";
|
||||
hash = "sha256-nP22juzUOuD/SQqrIm3AXfa1x98Uqf9rKLhzhXA4yQI=";
|
||||
rev = "d862ad9cae6c76cbe494db54fa985f21bfcef2a8";
|
||||
hash = "sha256-//P/ApU/36TamIMepjoBWsUHs2tR5K47V9Gf5HG3goE=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
+4
-2
@@ -45,14 +45,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "telegram-desktop-unwrapped";
|
||||
version = "6.6.2";
|
||||
version = "6.7.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "telegramdesktop";
|
||||
repo = "tdesktop";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-sMg7h+he+mlqTu8wSLAsSJzCmwTX3t+suTEY77RH+aI=";
|
||||
hash = "sha256-HsXNTZY/+Xz7pIT7durOd5T/u7jML0rVBOPb4pnIXow=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -104,6 +104,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# We're allowed to used the API ID of the Snap package:
|
||||
(lib.cmakeFeature "TDESKTOP_API_ID" "611335")
|
||||
(lib.cmakeFeature "TDESKTOP_API_HASH" "d524b414d21f4d37f08684c1df41ac9c")
|
||||
# swift 6 is not available in nixpkgs
|
||||
(lib.cmakeBool "DESKTOP_APP_DISABLE_SWIFT6" true)
|
||||
];
|
||||
|
||||
installPhase = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
|
||||
@@ -10,13 +10,13 @@ telegram-desktop.override {
|
||||
inherit withWebkit;
|
||||
unwrapped = telegram-desktop.unwrapped.overrideAttrs (old: rec {
|
||||
pname = "64gram-unwrapped";
|
||||
version = "1.1.94";
|
||||
version = "1.1.99";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TDesktop-x64";
|
||||
repo = "tdesktop";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-pMcG0B3YxrvvaLsC2yWJsm9wHpv5+xLtp+wQhRtJ38Q=";
|
||||
hash = "sha256-p1mdNoTjftbAeoWJ+AKVPFr87BoxOLIT5fDzWY3VXMQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "ananicy-rules-cachyos";
|
||||
version = "0-unstable-2026-03-30";
|
||||
version = "0-unstable-2026-04-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CachyOS";
|
||||
repo = "ananicy-rules";
|
||||
rev = "7460ed8d375425f50517119b0df3a57b876b504e";
|
||||
hash = "sha256-hFBQGmGKUw/LT1DiyfnTsYO5Lt2c7LBMLRVBMmjYakY=";
|
||||
rev = "ca5e3e7714eb051de7d70ee0324c11b5cecf10f8";
|
||||
hash = "sha256-a0T6KYB6ZpCCIbEIgvkx7mb0iOS75r9aC5xmmhR5/f0=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -1,22 +1,22 @@
|
||||
{
|
||||
"version": "1.21.9",
|
||||
"version": "1.22.2",
|
||||
"vscodeVersion": "1.107.0",
|
||||
"sources": {
|
||||
"x86_64-linux": {
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.21.9-4905428782546944/linux-x64/Antigravity.tar.gz",
|
||||
"sha256": "85ea4d55f52d32fbbf9d92fddc747f10e8d04c1bd00a07721b571fa7f2ef5226"
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.22.2-5206900187463680/linux-x64/Antigravity.tar.gz",
|
||||
"sha256": "85c6b2decfefef2c6e0adaf161b602da7c1ecb2db6157ec0a4caffcfe4811209"
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.21.9-4905428782546944/linux-arm/Antigravity.tar.gz",
|
||||
"sha256": "76d56462e0fad95a98efaf25d06be9c4789e3b8551fe5b936a6858b14c723364"
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.22.2-5206900187463680/linux-arm/Antigravity.tar.gz",
|
||||
"sha256": "601fe7d97bf49fe06ebde331f1385e9e7e58269d23667808ae58256a87929a23"
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.21.9-4905428782546944/darwin-x64/Antigravity.zip",
|
||||
"sha256": "a8ebdbf3b18c75d39b876541904c95576422e281fd92e45f7f7f4e7231ac769c"
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.22.2-5206900187463680/darwin-x64/Antigravity.zip",
|
||||
"sha256": "14686d6b15741b33abaf52b19a10f18e8427796461efa285a2fa2ddb30e0dcad"
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.21.9-4905428782546944/darwin-arm/Antigravity.zip",
|
||||
"sha256": "f9ec42d0a791cc13cbb57a1f7c36b2421e67f180cd0bdfb01fd8fa23ad87440b"
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.22.2-5206900187463680/darwin-arm/Antigravity.zip",
|
||||
"sha256": "51e1f488da34f4e38c63806eed28a6b4bd5b583c275907945871710bed0f85d5"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "azurehound";
|
||||
version = "2.11.0";
|
||||
version = "2.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SpecterOps";
|
||||
repo = "AzureHound";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-HelzDMnQOZP8LBcF5eoQfgTOk6fBK5oCx+gu4v638JA=";
|
||||
hash = "sha256-+3h9/R909/Bkxq0Y7oN0xpE6OH8+0Xvs/8X1NBQFrMg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QCZFIDUL/RbSMrDfQ8L0A6xJPcWJorBXvHhdIA1WK4Q=";
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "betterleaks";
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "betterleaks";
|
||||
repo = "betterleaks";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-PJGFvm+QoExUMliL6rvBAKKjt8Ce5VZfQxCYbpXUXfU=";
|
||||
hash = "sha256-JgwusK6iYuFkba1Gekir9ufKStqL8phmKbIgNzF+JDE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lIblIctRnq//ic+most3g9Ff92XhfqbFfHrLdI0beQQ=";
|
||||
vendorHash = "sha256-wAYKsNI4FxF702Jb/82u5Ga/u2+ReRPo3LamPIHw6tM=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -21,11 +21,12 @@ stdenvNoCC.mkDerivation {
|
||||
dontBuild = true;
|
||||
dontWrapQtApps = true;
|
||||
|
||||
propagatedUserEnvPkgs = with qt6; [
|
||||
qt5compat
|
||||
qtwayland
|
||||
qtquick3d
|
||||
qtsvg
|
||||
propagatedBuildInputs = with qt6; [
|
||||
# avoid .dev outputs propagation
|
||||
qt5compat.out
|
||||
qtwayland.out
|
||||
qtquick3d.out
|
||||
qtsvg.out
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -35,7 +35,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
kdePackages.qtsvg
|
||||
# avoid .dev outputs propagation
|
||||
kdePackages.qtsvg.out
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@@ -91,11 +92,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
mkdir -p $out/nix-support
|
||||
echo ${kdePackages.qtsvg} >> $out/nix-support/propagated-user-env-packages
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Soothing pastel theme for SDDM";
|
||||
homepage = "https://github.com/catppuccin/sddm";
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
buildNpmPackage rec {
|
||||
pname = "clever-tools";
|
||||
|
||||
version = "4.7.1";
|
||||
version = "4.8.0";
|
||||
|
||||
nodejs = nodejs_22;
|
||||
|
||||
@@ -19,10 +19,10 @@ buildNpmPackage rec {
|
||||
owner = "CleverCloud";
|
||||
repo = "clever-tools";
|
||||
rev = version;
|
||||
hash = "sha256-FUhqvUN4ml3uCKnU6YJLp96rX27/+LL+mrUul+LV4Vs=";
|
||||
hash = "sha256-ei5wwx9rUfKe6hGbHuNU65kGo5quvTtRKb6sHjkEzQE=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-sT3rNYPli6hy7fv3v++JQ9Pex6y5h1tyCWAU1TekqLw=";
|
||||
npmDepsHash = "sha256-3gmDTBi0WpmtN+qTQXDvuXGkw0g/wdxuruMdyD4UMIc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
makeWrapper,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
|
||||
nodejs,
|
||||
pnpm,
|
||||
@@ -15,13 +16,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "context7-mcp";
|
||||
version = "2.1.4";
|
||||
version = "2.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "upstash";
|
||||
repo = "context7";
|
||||
tag = "${tag-prefix}@${finalAttrs.version}";
|
||||
hash = "sha256-bQXmKY4I5k5uaQ2FVEOPkym5X3mR87nALf3+jqJjJjE=";
|
||||
hash = "sha256-u0sFNX19ZBWvA7HYWdM4iI9AvEVz/CK6dLfZ80Rxa9c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -34,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-EjEdbPKXJbxaDBuAg/j+BSjI/W3HdsqbtDky0TPUB88=";
|
||||
hash = "sha256-8RRHfCTZVC91T1Qx+ACCo2oG4ZwMNy5WYakCjmBhe3Q=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
@@ -62,28 +63,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
|
||||
echo "Executing custom version check for MCP stdio server..."
|
||||
|
||||
output=$(< /dev/null $out/bin/context7-mcp 2>&1 || true)
|
||||
|
||||
if echo "$output" | grep -Fq "v${finalAttrs.version}"; then
|
||||
echo "versionCheckPhase: found version v${finalAttrs.version}"
|
||||
else
|
||||
echo "versionCheckPhase: failed to find version v${finalAttrs.version}"
|
||||
echo "Output was:"
|
||||
echo "$output"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [ "--version-regex '${tag-prefix}@(.*)'" ];
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"${tag-prefix}@(.*)"
|
||||
];
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -8,15 +8,15 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "7.1.120";
|
||||
version = "7.1.140";
|
||||
srcs = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://github.com/aunetx/deezer-linux/releases/download/v${version}/deezer-desktop-${version}-x64.tar.xz";
|
||||
hash = "sha256-RrsM8Rx/uYJpH9+w/XX0RoPw+N/+nzJCC+KFdbYzSdc=";
|
||||
hash = "sha256-e7wgUH7sh8SwyRq/llCBu8ZuB74LTPiDEW35dfX8da4=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://github.com/aunetx/deezer-linux/releases/download/v${version}/deezer-desktop-${version}-arm64.tar.xz";
|
||||
hash = "sha256-WgCfX7Av8YoCHmhACyyVtxut0FUfAdgTAXaIBydWTRI=";
|
||||
hash = "sha256-6PA/f7QOXR9BZGtINtNW00BRQ6ghWVIJudQ+/lx7kZc=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "dn42-registry-wizard";
|
||||
version = "0.4.19";
|
||||
version = "0.4.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kioubit";
|
||||
repo = "dn42_registry_wizard";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-axtNkBX0OTm/3HwpZATsAefW/LEFDtTODLJgHJiFws8=";
|
||||
hash = "sha256-WFU1K0Ib1ETSib2WJkwus3zHYJXoVOtFDqv4/QNiP7E=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-VfdxsS8VIgDDyhNXML5jVl+9uxwHa83aWB6nJ7mHflI=";
|
||||
cargoHash = "sha256-o8MF6uqk8f0Zc2fjBqLGElh56TKjLRRtNxrll5nY+bM=";
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/{registry_wizard,dn42-registry-wizard}
|
||||
|
||||
@@ -27,7 +27,8 @@ stdenvNoCC.mkDerivation {
|
||||
|
||||
dontWrapQtApps = true;
|
||||
propagatedBuildInputs = [
|
||||
kdePackages.qt5compat
|
||||
# avoid .dev outputs propagation
|
||||
kdePackages.qt5compat.out
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -17,16 +17,16 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.304.0";
|
||||
version = "0.304.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evcc-io";
|
||||
repo = "evcc";
|
||||
tag = version;
|
||||
hash = "sha256-zT/V3b0SQbstUk/dLmCN7bufQ7NsS5UTHIzmQsnaHIU=";
|
||||
hash = "sha256-BViPo9P3c5ptI+pvKfpPVrYJFbbV5cF3Nn1eZ90BaRM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-7Uz/VYuVnRjpDHvwPO2LLif9iWrGDvxdsre0fENBiwU=";
|
||||
vendorHash = "sha256-CDbFutP+pLHt9IJWaCdVxoM/PE/tJ/XU7SStqMd6A6Y=";
|
||||
|
||||
commonMeta = {
|
||||
license = lib.licenses.mit;
|
||||
@@ -52,7 +52,7 @@ buildGo126Module rec {
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit src;
|
||||
hash = "sha256-/M/htYm3T5DJfNKLMudItfKKQ179mrUWdL/EVGSt2ss=";
|
||||
hash = "sha256-DmpwSART/Aw2vLMAp9fxoZ6iDZiSfDfvNCFLlAdDDRU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ffizer";
|
||||
version = "2.13.7";
|
||||
version = "2.13.8";
|
||||
|
||||
buildFeatures = [ "cli" ];
|
||||
|
||||
@@ -18,10 +18,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "ffizer";
|
||||
repo = "ffizer";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-r4jaqjHYDZxftU7J6hGMXW/Oq+8biy9bFoHIOt33ta8=";
|
||||
hash = "sha256-TV1+bupdJFmq72F4MbqyyvE/p9PufdeOUo24mPYvuAc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-+aXhumywpcynKz0R0wWPWhEMfqiPBuwLbIFsABvWTnA=";
|
||||
cargoHash = "sha256-iEdNyzY4fzfQkayXIKthv4ofl11+U2KfV63VvXrR6HQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -69,6 +69,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
]
|
||||
);
|
||||
|
||||
# Remove after https://github.com/warmcat/libwebsockets/pull/3567 has been merged or otherwise addressed
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isStatic ''
|
||||
substituteInPlace "cmake/libwebsockets-config.cmake.in" --replace-fail \
|
||||
"set(LIBWEBSOCKETS_LIBRARIES websockets websockets_shared)" \
|
||||
"set(LIBWEBSOCKETS_LIBRARIES websockets)"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# Fix path that will be incorrect on move to "dev" output.
|
||||
substituteInPlace "$out/lib/cmake/libwebsockets/LibwebsocketsTargets-release.cmake" \
|
||||
|
||||
@@ -149,13 +149,11 @@ stdenvNoCC.mkDerivation {
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
# Propagate sddm theme dependencies to user env otherwise sddm
|
||||
# does not find them. Putting them in buildInputs is not enough.
|
||||
|
||||
mkdir -p $sddm/nix-support
|
||||
|
||||
printWords ${kdePackages.breeze-icons} ${kdePackages.libplasma} ${kdePackages.plasma-workspace} \
|
||||
>> $sddm/nix-support/propagated-user-env-packages
|
||||
# avoid .dev outputs propagation
|
||||
printWords ${kdePackages.breeze-icons.out} ${kdePackages.libplasma.out} ${kdePackages.plasma-workspace.out} \
|
||||
>> $sddm/nix-support/propagated-build-inputs
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -94,7 +94,7 @@ let
|
||||
|
||||
cudaToolkit = buildEnv {
|
||||
# ollama hardcodes the major version in the Makefile to support different variants.
|
||||
# - https://github.com/ollama/ollama/blob/v0.20.3/CMakePresets.json#L21-L47
|
||||
# - https://github.com/ollama/ollama/blob/v0.20.4/CMakePresets.json#L21-L47
|
||||
name = "cuda-merged-${cudaMajorVersion}";
|
||||
paths = map lib.getLib cudaLibs ++ [
|
||||
(lib.getOutput "static" cudaPackages.cuda_cudart)
|
||||
@@ -140,13 +140,13 @@ let
|
||||
in
|
||||
goBuild (finalAttrs: {
|
||||
pname = "ollama";
|
||||
version = "0.20.3";
|
||||
version = "0.20.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ollama";
|
||||
repo = "ollama";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-o9iCqdOfNMxfIyThQAOSSQZE2ZyBuyJWFr6wqvQo1A0=";
|
||||
hash = "sha256-8TbZvxxaUdROpe3gnBx0XzX62tbQ9QeJP3Yp7XXJoTQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Lc1Ktdqtv2VhJQssk8K1UOimeEjVNvDWePE9WkamCos=";
|
||||
@@ -232,7 +232,7 @@ goBuild (finalAttrs: {
|
||||
'';
|
||||
|
||||
# ollama looks for acceleration libs in ../lib/ollama/ (now also for CPU-only with arch specific optimizations)
|
||||
# https://github.com/ollama/ollama/blob/v0.20.3/docs/development.md#library-detection
|
||||
# https://github.com/ollama/ollama/blob/v0.20.4/docs/development.md#library-detection
|
||||
postInstall = ''
|
||||
mkdir -p $out/lib
|
||||
cp -r build/lib/ollama $out/lib/
|
||||
|
||||
@@ -30,7 +30,9 @@ stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
libsForQt5.qtgraphicaleffects
|
||||
# avoid .dev outputs propagation
|
||||
libsForQt5.qtgraphicaleffects.out
|
||||
libsForQt5.qtquickcontrols.out
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
@@ -43,11 +45,6 @@ stdenv.mkDerivation {
|
||||
mv * $out/share/sddm/themes/chili/
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
mkdir -p $out/nix-support
|
||||
|
||||
echo ${libsForQt5.qtgraphicaleffects} >> $out/nix-support/propagated-user-env-packages
|
||||
'';
|
||||
meta = {
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ sents ];
|
||||
|
||||
@@ -20,7 +20,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
buildInputs = with libsForQt5.qt5; [ qtgraphicaleffects ];
|
||||
propagatedBuildInputs = [
|
||||
# avoid .dev outputs propagation
|
||||
libsForQt5.qtgraphicaleffects.out
|
||||
];
|
||||
|
||||
installPhase =
|
||||
let
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "secrethound";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rafabd1";
|
||||
repo = "SecretHound";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-mZ2rZMjNKLJ+AQQlEGUwgSpIAhqbHG53wUNDIEtJXwI=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ca0AwD1oFBB8F2J4gLMtaDssacczugAkkSYdBTvT4VQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-oTyI3/+evDTzyH+BjfSP0A1r2bYVAMxtWRsg0G1d2zQ=";
|
||||
@@ -23,8 +23,9 @@ buildGoModule (finalAttrs: {
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "A powerful CLI tool designed to find secrets in JavaScript files, web pages, and other text sources.";
|
||||
description = "CLI tool designed to find secrets in JavaScript files, web pages, and other text sources";
|
||||
homepage = "https://github.com/rafabd1/SecretHound";
|
||||
changelog = "https://github.com/rafabd1/SecretHound/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.michaelBelsanti ];
|
||||
mainProgram = "secrethound";
|
||||
|
||||
@@ -7,12 +7,12 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sfeed";
|
||||
version = "2.3";
|
||||
version = "2.4";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.codemadness.org/sfeed";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-VvPBRc2mRuDXaCz0Ds8012wSbcRo+2bZ4n7KKwDmvhw=";
|
||||
hash = "sha256-4ItAZ3HYmFc/OlUErAhUANm/BkeCIHvPtriWn9N29lg=";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
@@ -22,13 +22,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "solarus";
|
||||
version = "2.0.3";
|
||||
version = "2.0.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "solarus-games";
|
||||
repo = "solarus";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-gfKf4ERdZd2g+aiMAM/16/W04G1rNDLaSO3QbhatRxU=";
|
||||
hash = "sha256-dgsRxP0tZQjwlQhgEd8RwPtO/oU62xyy8WrHECBRMjQ=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "supabase-cli";
|
||||
version = "2.84.2";
|
||||
version = "2.88.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "supabase";
|
||||
repo = "cli";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-0S+FV1aty/RzkLA6WK4Me/eKEr4LduDfIVdruQO9ZrM=";
|
||||
hash = "sha256-v4H+sABhR53vKreq+yX9iJK7+5xlM+KXcuEUawDFZto=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-7BkSPFR5ciEVA/i1gy53SZu26MMkZNC+VwRHMoLJSxI=";
|
||||
vendorHash = "sha256-5DWsFaZ700FGb6AnqTs3ewhieHuTl4SrnQHdbiNZBY4=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
@@ -60,6 +60,7 @@ buildGoModule (finalAttrs: {
|
||||
maintainers = with lib.maintainers; [
|
||||
gerschtli
|
||||
kashw2
|
||||
yuannan
|
||||
];
|
||||
mainProgram = "supabase";
|
||||
};
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "the-powder-toy";
|
||||
version = "99.3.384";
|
||||
version = "99.5.394";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "The-Powder-Toy";
|
||||
repo = "The-Powder-Toy";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-vlswHNkjyxM9sZT+mwiCMfNbdAbhYyx06w+ZLfaPaEQ=";
|
||||
hash = "sha256-ejkWIxlS6J9DHw/XNmEC94oc0xmqvj+hFu3TBPyCqwg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -16,12 +16,15 @@ stdenv.mkDerivation {
|
||||
hash = "sha256-moLgBFR+BgoiEBzV3y/LA6JZfLHrG1weL1+h8LN9ztA=";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = with kdePackages; [
|
||||
breeze-icons
|
||||
kdeclarative
|
||||
dontWrapQtApps = true;
|
||||
|
||||
propagatedBuildInputs = with kdePackages; [
|
||||
# avoid .dev outputs propagation
|
||||
qt5compat.out
|
||||
kirigami
|
||||
libplasma
|
||||
plasma-workspace
|
||||
libplasma.out
|
||||
plasma5support.out
|
||||
plasma-workspace.out
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -43,12 +43,13 @@ lib.checkListOfEnum "where-is-my-sddm-theme: variant" validVariants variants
|
||||
hash = "sha256-+R0PX84SL2qH8rZMfk3tqkhGWPR6DpY1LgX9bifNYCg=";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs =
|
||||
propagatedBuildInputs =
|
||||
[ ]
|
||||
++ lib.optionals (lib.elem "qt5" variants) [ libsForQt5.qtgraphicaleffects ]
|
||||
# avoid .dev outputs propagation
|
||||
++ lib.optionals (lib.elem "qt6" variants) [
|
||||
qt6.qt5compat
|
||||
qt6.qtsvg
|
||||
qt6.qt5compat.out
|
||||
qt6.qtsvg.out
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -24,7 +24,7 @@ let
|
||||
ptmap
|
||||
camlp5
|
||||
sha
|
||||
luv
|
||||
luv-0-5-12
|
||||
extlib
|
||||
]
|
||||
else
|
||||
@@ -37,7 +37,7 @@ let
|
||||
ptmap
|
||||
camlp5
|
||||
sha
|
||||
luv
|
||||
luv-0-5-12
|
||||
extlib-1-7-7
|
||||
];
|
||||
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
# nixpkgs-update: no auto update
|
||||
# haxe depends on specific version of luv
|
||||
{
|
||||
lib,
|
||||
buildDunePackage,
|
||||
ocaml,
|
||||
fetchurl,
|
||||
ctypes,
|
||||
result,
|
||||
@@ -11,51 +8,59 @@
|
||||
file,
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "luv";
|
||||
version = "0.5.12";
|
||||
let
|
||||
generic =
|
||||
{
|
||||
version,
|
||||
sha256,
|
||||
}:
|
||||
buildDunePackage rec {
|
||||
pname = "luv";
|
||||
inherit version;
|
||||
|
||||
minimalOCamlVersion = "4.03";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/aantron/luv/releases/download/${version}/luv-${version}.tar.gz";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/aantron/luv/releases/download/${version}/luv-${version}.tar.gz";
|
||||
patches = lib.optional (lib.versionOlder version "0.5.14") ./incompatible-pointer-type-fix.diff;
|
||||
|
||||
postConfigure = ''
|
||||
substituteInPlace "src/c/vendor/configure/ltmain.sh" --replace-fail /usr/bin/file file
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ file ];
|
||||
propagatedBuildInputs = [
|
||||
ctypes
|
||||
result
|
||||
];
|
||||
checkInputs = [ alcotest ];
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/aantron/luv";
|
||||
description = "Binding to libuv: cross-platform asynchronous I/O";
|
||||
# MIT-licensed, extra licenses apply partially to libuv vendor
|
||||
license = with lib.licenses; [
|
||||
mit
|
||||
bsd2
|
||||
bsd3
|
||||
cc-by-sa-40
|
||||
];
|
||||
maintainers = with lib.maintainers; [
|
||||
locallycompact
|
||||
sternenseemann
|
||||
];
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
luv-0-5-12 = generic {
|
||||
version = "0.5.12";
|
||||
sha256 = "sha256-dp9qCIYqSdROIAQ+Jw73F3vMe7hnkDe8BgZWImNMVsA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# backport of patch to fix incompatible pointer type. remove next update
|
||||
# https://github.com/aantron/luv/commit/ad7f953fccb8732fe4eb9018556e8d4f82abf8f2
|
||||
./incompatible-pointer-type-fix.diff
|
||||
];
|
||||
|
||||
postConfigure = ''
|
||||
for f in src/c/vendor/configure/{ltmain.sh,configure}; do
|
||||
substituteInPlace "$f" --replace /usr/bin/file file
|
||||
done
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ file ];
|
||||
propagatedBuildInputs = [
|
||||
ctypes
|
||||
result
|
||||
];
|
||||
checkInputs = [ alcotest ];
|
||||
# Alcotest depends on fmt that needs 4.08 or newer
|
||||
doCheck = lib.versionAtLeast ocaml.version "4.08";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/aantron/luv";
|
||||
description = "Binding to libuv: cross-platform asynchronous I/O";
|
||||
# MIT-licensed, extra licenses apply partially to libuv vendor
|
||||
license = with lib.licenses; [
|
||||
mit
|
||||
bsd2
|
||||
bsd3
|
||||
cc-by-sa-40
|
||||
];
|
||||
maintainers = with lib.maintainers; [
|
||||
locallycompact
|
||||
sternenseemann
|
||||
];
|
||||
luv = generic {
|
||||
version = "0.5.14";
|
||||
sha256 = "sha256-jgG0pQyIds3ZjY4kXAaHxNxNiDrtFhrZxazh+x/arpk=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,25 +2,25 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
flit-core,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "ebcdic";
|
||||
version = "1.1.1";
|
||||
version = "2.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "roskakori";
|
||||
repo = "CodecMapper";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-gRyZychcF3wYocgVbdF255cSuZh/cl8X0WH/Iplkmxc=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-71EMWUGoJrsc3EOVHeV4xqSJRKoA7Sz2dvmZJ1sjQCg=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/${pname}";
|
||||
sourceRoot = "${finalAttrs.src.name}/${finalAttrs.pname}";
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
build-system = [ flit-core ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
@@ -40,4 +40,4 @@ buildPythonPackage rec {
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -31,13 +31,13 @@ buildPythonPackage (finalAttrs: {
|
||||
hash = "sha256-n/v3ubgzWlWqLXZfy1O7+FvTJoLMtgL7DFPL39SZnfM=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"beautifulsoup4"
|
||||
"ebcdic"
|
||||
];
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
beautifulsoup4
|
||||
compressed-rtf
|
||||
|
||||
@@ -7,11 +7,12 @@
|
||||
msoffcrypto-tool,
|
||||
olefile,
|
||||
pcodedmp,
|
||||
setuptools,
|
||||
pyparsing,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "oletools";
|
||||
version = "0.60.2";
|
||||
format = "setuptools";
|
||||
@@ -19,11 +20,15 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "decalage2";
|
||||
repo = "oletools";
|
||||
rev = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ons1VeWStxUZw2CPpnX9p5I3Q7cMhi34JU8TeuUDt+Y=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pythonRelaxDeps = [ "pyparsing" ];
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
colorclass
|
||||
easygui
|
||||
msoffcrypto-tool
|
||||
@@ -34,15 +39,14 @@ buildPythonPackage rec {
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "pyparsing>=2.1.0,<3" "pyparsing>=2.1.0"
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# Test fails with AssertionError: Tuples differ: ('MS Word 2007+...
|
||||
"test_all"
|
||||
"test_xlm"
|
||||
# AssertionError: Found "warn" in output...
|
||||
"test_empty_behaviour"
|
||||
"test_rtf_behaviour"
|
||||
"test_text_behaviour"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "oletools" ];
|
||||
@@ -50,10 +54,11 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Module to analyze MS OLE2 files and MS Office documents";
|
||||
homepage = "https://github.com/decalage2/oletools";
|
||||
changelog = "https://github.com/decalage2/oletools/releases/tag/${finalAttrs.src.tag}";
|
||||
license = with lib.licenses; [
|
||||
bsd2 # and
|
||||
mit
|
||||
];
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "py-ocsf-models";
|
||||
version = "0.8.1";
|
||||
version = "0.9.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prowler-cloud";
|
||||
repo = "py-ocsf-models";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Wtls4Ei1160hxvZjdyH0rJCQWEN/CwpxfllwgGTzMog=";
|
||||
hash = "sha256-MdDpCr6FuPEt67PUjF0MjWXiA+ZyKLiACc/XPp+NoII=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "python-fsutil";
|
||||
version = "0.16.0";
|
||||
version = "0.16.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fabiocaccamo";
|
||||
repo = "python-fsutil";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-1XYyfBuaUED+xnVrILEtB+fUpc8sk4BDzGp8Hln/rlc=";
|
||||
hash = "sha256-/KlnQdN8R95qjxMGui0SofLFZl10vq6ufl05JuVuhDw=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -998,35 +998,35 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
vod = {
|
||||
vod = rec {
|
||||
name = "vod";
|
||||
version = "1.7.0";
|
||||
|
||||
src = applyPatches {
|
||||
name = "vod";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kaltura";
|
||||
owner = "dio-az";
|
||||
repo = "nginx-vod-module";
|
||||
tag = "1.33";
|
||||
hash = "sha256-hf4iprkdNP7lVlrm/7kMkrp/8440PuTZiL1hv/Icfm4=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-IcXbbmAs16F9qOEJWgH6XqP5sBMYszclGByVghj0eBM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace vod/media_set.h \
|
||||
--replace-fail "MAX_CLIPS (128)" "MAX_CLIPS (1024)"
|
||||
substituteInPlace vod/subtitle/dfxp_format.c \
|
||||
--replace-fail '(!ctxt->wellFormed && !ctxt->recovery))' '!ctxt->wellFormed)'
|
||||
# https://github.com/kaltura/nginx-vod-module/pull/1593
|
||||
substituteInPlace ngx_http_vod_module.c \
|
||||
--replace-fail 'ngx_http_vod_exit_process()' 'ngx_http_vod_exit_process(ngx_cycle_t *cycle)'
|
||||
'';
|
||||
};
|
||||
|
||||
inputs = [
|
||||
ffmpeg_6-headless
|
||||
ffmpeg-headless
|
||||
fdk_aac
|
||||
openssl
|
||||
libxml2
|
||||
libiconv
|
||||
];
|
||||
|
||||
passthru.tests = nixosTests.frigate;
|
||||
|
||||
meta = {
|
||||
description = "VOD packager";
|
||||
homepage = "https://github.com/kaltura/nginx-vod-module";
|
||||
|
||||
@@ -1147,9 +1147,12 @@ let
|
||||
|
||||
lutils = callPackage ../development/ocaml-modules/lutils { };
|
||||
|
||||
luv = callPackage ../development/ocaml-modules/luv {
|
||||
inherit (pkgs) file;
|
||||
};
|
||||
inherit
|
||||
(callPackage ../development/ocaml-modules/luv {
|
||||
})
|
||||
luv-0-5-12
|
||||
luv
|
||||
;
|
||||
|
||||
lwd = callPackage ../development/ocaml-modules/lwd { };
|
||||
|
||||
|
||||
Reference in New Issue
Block a user