mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-21 08:01:31 +00:00
Merge staging-next into staging
This commit is contained in:
@@ -1,8 +1,7 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
name = "nginx-auth";
|
||||
|
||||
nodes = {
|
||||
containers = {
|
||||
webserver =
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
{
|
||||
name = "nginx-etag-compression";
|
||||
|
||||
nodes.machine =
|
||||
containers.machine =
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
services.nginx = {
|
||||
@@ -28,7 +28,7 @@
|
||||
};
|
||||
|
||||
testScript =
|
||||
{ nodes, ... }:
|
||||
{ containers, ... }:
|
||||
''
|
||||
machine.wait_for_unit("nginx")
|
||||
machine.wait_for_open_port(80)
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
{
|
||||
name = "nginx-globalredirect";
|
||||
|
||||
nodes = {
|
||||
containers = {
|
||||
webserver =
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
|
||||
@@ -13,7 +13,7 @@ builtins.listToAttrs (
|
||||
name = "nginx-http3-${pkgs.lib.getName nginxPackage}";
|
||||
meta.maintainers = with pkgs.lib.maintainers; [ izorkin ];
|
||||
|
||||
nodes = {
|
||||
containers = {
|
||||
server =
|
||||
{ lib, pkgs, ... }:
|
||||
{
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
meta.maintainers = [ lib.maintainers.kranzes ];
|
||||
|
||||
nodes.machine = {
|
||||
containers.machine = {
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
lua = {
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{ lib, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
name = "nginx-mime";
|
||||
meta.maintainers = with pkgs.lib.maintainers; [ izorkin ];
|
||||
|
||||
nodes = {
|
||||
containers = {
|
||||
server =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
{
|
||||
name = "nginx-modsecurity";
|
||||
|
||||
nodes.machine =
|
||||
containers.machine =
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
{
|
||||
name = "nginx-more-headers";
|
||||
|
||||
nodes = {
|
||||
containers = {
|
||||
webserver =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
name = "nginx-njs";
|
||||
|
||||
nodes.machine =
|
||||
containers.machine =
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
{
|
||||
name = "nginx-pubhtml";
|
||||
|
||||
nodes.machine =
|
||||
containers.machine =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
systemd.services.nginx.serviceConfig.ProtectHome = "read-only";
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
name = "nginx-redirectcode";
|
||||
meta.maintainers = with lib.maintainers; [ misterio77 ];
|
||||
|
||||
nodes = {
|
||||
containers = {
|
||||
webserver =
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
maintainers = with pkgs.lib.maintainers; [ ambroisie ];
|
||||
};
|
||||
|
||||
nodes.machine = {
|
||||
containers.machine = {
|
||||
services.nginx.sso = {
|
||||
enable = true;
|
||||
configuration = {
|
||||
|
||||
@@ -5,12 +5,13 @@
|
||||
maintainers = [ h7x4 ];
|
||||
};
|
||||
|
||||
nodes = {
|
||||
containers = {
|
||||
webserver =
|
||||
{ ... }:
|
||||
{
|
||||
virtualisation.vlans = [ 1 ];
|
||||
|
||||
services.resolved.enable = false;
|
||||
networking = {
|
||||
useNetworkd = true;
|
||||
useDHCP = false;
|
||||
@@ -36,6 +37,7 @@
|
||||
{
|
||||
virtualisation.vlans = [ 1 ];
|
||||
|
||||
services.resolved.enable = false;
|
||||
networking = {
|
||||
useNetworkd = true;
|
||||
useDHCP = false;
|
||||
|
||||
@@ -5,7 +5,7 @@ in
|
||||
{
|
||||
name = "nginx-tmpdir";
|
||||
|
||||
nodes.machine =
|
||||
containers.machine =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
environment.etc."tmpfiles.d/nginx-uploads.conf".text = "d ${dst-dir} 0755 nginx nginx 1d";
|
||||
|
||||
@@ -6,7 +6,7 @@ in
|
||||
{
|
||||
name = "nginx-unix-socket";
|
||||
|
||||
nodes = {
|
||||
containers = {
|
||||
webserver =
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ pkgs, runTest, ... }:
|
||||
{ runTest, ... }:
|
||||
builtins.listToAttrs (
|
||||
map
|
||||
(packageName: {
|
||||
@@ -6,7 +6,7 @@ builtins.listToAttrs (
|
||||
value = runTest {
|
||||
name = "nginx-variant-${packageName}";
|
||||
|
||||
nodes.machine =
|
||||
containers.machine =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
services.nginx = {
|
||||
|
||||
@@ -1238,11 +1238,11 @@
|
||||
"vendorHash": "sha256-skswuFKhN4FFpIunbom9rM/FVRJVOFb1WwHeAIaEjn8="
|
||||
},
|
||||
"spacelift-io_spacelift": {
|
||||
"hash": "sha256-k94bMIHlOBJ6zilasFCugt8fgZ4F5bl0kWOzdniy4D4=",
|
||||
"hash": "sha256-2EGyYs8fy1y9g241spfKFwpv7ZTRJePvf06OS7EFDaU=",
|
||||
"homepage": "https://registry.terraform.io/providers/spacelift-io/spacelift",
|
||||
"owner": "spacelift-io",
|
||||
"repo": "terraform-provider-spacelift",
|
||||
"rev": "v1.52.0",
|
||||
"rev": "v1.52.2",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-C8TE7uxMf6LOTS6v22mXwUdk2eqQRinwrCH4ZVUCx4k="
|
||||
},
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "7zip-zstd";
|
||||
version = "26.01-v1.5.7-R1";
|
||||
version = "26.02-v1.5.7-R1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mcmilk";
|
||||
@@ -24,9 +24,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash =
|
||||
if enableUnfree then
|
||||
"sha256-P6kwg3McroMwqB5bryfoS9dIBsxcd84bVzsjUv5Bk5k="
|
||||
"sha256-ugGYnyrQjhVwHP1mP/gVRhy7ZtlMFvTd0BHFaGFUpRE="
|
||||
else
|
||||
"sha256-WowqcjcA/DUwj7DJrKDTYKpCDWd/tTIZ3yiuBgqXpmU=";
|
||||
"sha256-L6Pj0ncXu9OMkEueZYQUCt9Sk8SjRgZVi84OrMWcrcA=";
|
||||
# remove the unRAR related code from the src drv
|
||||
# > the license requires that you agree to these use restrictions,
|
||||
# > or you must remove the software (source and binary) from your hard disks
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
# https://github.com/nianeyna/ao3downloader/blob/f8399bb8aca276ae7359157b90afd13925c90056/pyproject.toml#L8
|
||||
python312Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "ao3downloader";
|
||||
version = "2026.4.9";
|
||||
version = "2026.6.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nianeyna";
|
||||
repo = "ao3downloader";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-StaF62Ho/xz8kKE5NrLo8G5PdBv493VBshR6gdK9J20=";
|
||||
hash = "sha256-3SiJH594vjVahlW+wAzD+akRU7WLoQo+EIN9cxgAtks=";
|
||||
};
|
||||
|
||||
build-system = with python312Packages; [
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
}:
|
||||
let
|
||||
pname = "dependabot-cli";
|
||||
version = "1.89.0";
|
||||
version = "1.90.0";
|
||||
|
||||
# `tag` is what `dependabot` uses to find the relevant docker images.
|
||||
tag = "nixpkgs-dependabot-cli-${version}";
|
||||
@@ -20,12 +20,12 @@ let
|
||||
# Get these hashes from
|
||||
# nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy --image-tag latest --final-image-name dependabot-update-job-proxy --final-image-tag ${tag}
|
||||
updateJobProxy.imageDigest = "sha256:70cf9a8f006db9cde732faf9e33a4f60af895532bbe803268fc8fd2f70aa3202";
|
||||
updateJobProxy.hash = "sha256-5HeVcMfQn4yLTRxP5lqrnMFRvWIJ5FBh26rP6ln82MY=";
|
||||
updateJobProxy.hash = "sha256-S6ZbaFu6cGZJA26Qf4wCC8rj+cE4MpER3LOgdenM+k8=";
|
||||
|
||||
# Get these hashes from
|
||||
# nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/dependabot/dependabot-updater-github-actions --image-tag latest --final-image-name dependabot-updater-github-actions --final-image-tag ${tag}
|
||||
updaterGitHubActions.imageDigest = "sha256:a813afc4a1c03bfc62a5eeff6de7ae738e508bf2eabb3d355f498b9221caab38";
|
||||
updaterGitHubActions.hash = "sha256-sEzbD9wKJP3cLMYqpMqIh88UNdEXTzxntHuCOeuBmHY=";
|
||||
updaterGitHubActions.imageDigest = "sha256:7940ec1d1828ae4935ef6fc862a7849dbe7d91ca3e294b37493e7e856c5f4f76";
|
||||
updaterGitHubActions.hash = "sha256-o23JPAY+NErfiiK1j4hIHIjuaV3kiwE8D0yXbq8puaE=";
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version;
|
||||
@@ -34,7 +34,7 @@ buildGoModule {
|
||||
owner = "dependabot";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ALlJ6EC+3Ur89Zt7PNhsYx0KcQ/FQNo+S31uOp2i7x0=";
|
||||
hash = "sha256-MLdCSo89H5/G/V4ncdSAi/B6Nv1prRtF6e/ighHqH5U=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-mo/OOo+vw2jX0ggeEzNE8Qr5xXg0GEaTH6krdGQyeEE=";
|
||||
|
||||
@@ -26,11 +26,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dnsdist";
|
||||
version = "2.0.5";
|
||||
version = "2.0.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.powerdns.com/releases/dnsdist-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-I8Z9usIeVWTflbZ4merP7sfXwZQRiqv5jODnY8zVx64=";
|
||||
hash = "sha256-WGgPeAUXt4fmT+5M1NzFf0Ob5gcIT4nuRpl4nX1iaHU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) cargoRoot src;
|
||||
hash = "sha256-0CfOkjMe3p7xg62jlS3ASZRlr+/nqIJLRyRT+jcDiHQ=";
|
||||
hash = "sha256-xFh+cywfNWalzRfCtM2pPtPfq8/RAlTC1EdZYYEiwxA=";
|
||||
};
|
||||
|
||||
cargoRoot = "dnsdist-rust-lib/rust";
|
||||
@@ -89,11 +89,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) dnsdist;
|
||||
};
|
||||
passthru.tests = nixosTests.dnsdist;
|
||||
|
||||
meta = {
|
||||
changelog = "https://www.dnsdist.org/changelog.html";
|
||||
description = "DNS Loadbalancer";
|
||||
mainProgram = "dnsdist";
|
||||
homepage = "https://dnsdist.org";
|
||||
|
||||
@@ -146,6 +146,9 @@ freecad-utils.makeCustomizable (
|
||||
};
|
||||
};
|
||||
|
||||
# 6.9k object files, cuts down build time from 2-3 hours to 15 minutes
|
||||
requiredSystemFeatures = [ "big-parallel" ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.freecad.org";
|
||||
description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler";
|
||||
|
||||
@@ -10,17 +10,17 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "ghqr";
|
||||
version = "0.4.3";
|
||||
version = "0.5.0";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "ghqr";
|
||||
tag = "v.${finalAttrs.version}";
|
||||
hash = "sha256-KKuxl8odNdMom8l524Mac+sM/5ZdtpakLqazZDQcXJs=";
|
||||
hash = "sha256-MpCOeKMqLyZd2N1XL7bUHuCM7AjLgsHzQ1plUKMWn50=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-la/yXEZzAIt9l0q0P7+N8yCW0BQie9sLmAhLFK1qyGE=";
|
||||
vendorHash = "sha256-8lyQ1LDT1GAs+UDOpLxI/6BneU6Hqyt+PWsZIkq2rHY=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "kas";
|
||||
version = "5.3";
|
||||
version = "5.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "siemens";
|
||||
repo = "kas";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-XeAu8BNfcNmwDn25MA0uVmADjuYRkQxq+mG2XvRoJIE=";
|
||||
hash = "sha256-wETe3VgG5ZEQjWXgcC/u42ZzzPIMqrBEcZmaDcK5yRY=";
|
||||
};
|
||||
|
||||
patches = [ ./pass-terminfo-env.patch ];
|
||||
|
||||
@@ -2,14 +2,14 @@
|
||||
"audio_service_mpris": "sha256-IVv1ioBpiK0VbnOFqnc9NbNn3Z+l9VN2clpCQjckBRo=",
|
||||
"audio_service_win": "sha256-OZq2waTr0WLJ6uki/VLdUBdDdui25PvXnMNFohs7gjs=",
|
||||
"desktop_webview_window": "sha256-KWON5aTPlVVrLidmnfpV+syWPYEngChOvkN7miIFjvE=",
|
||||
"media_kit": "sha256-JnMA/Q3DcuD/if7vAu8ZztKVBtfXAQb3SmXmT+dxVmQ=",
|
||||
"media_kit_libs_android_video": "sha256-JnMA/Q3DcuD/if7vAu8ZztKVBtfXAQb3SmXmT+dxVmQ=",
|
||||
"media_kit_libs_ios_video": "sha256-JnMA/Q3DcuD/if7vAu8ZztKVBtfXAQb3SmXmT+dxVmQ=",
|
||||
"media_kit_libs_linux": "sha256-JnMA/Q3DcuD/if7vAu8ZztKVBtfXAQb3SmXmT+dxVmQ=",
|
||||
"media_kit_libs_macos_video": "sha256-JnMA/Q3DcuD/if7vAu8ZztKVBtfXAQb3SmXmT+dxVmQ=",
|
||||
"media_kit_libs_ohos": "sha256-JnMA/Q3DcuD/if7vAu8ZztKVBtfXAQb3SmXmT+dxVmQ=",
|
||||
"media_kit_libs_video": "sha256-JnMA/Q3DcuD/if7vAu8ZztKVBtfXAQb3SmXmT+dxVmQ=",
|
||||
"media_kit_libs_windows_video": "sha256-JnMA/Q3DcuD/if7vAu8ZztKVBtfXAQb3SmXmT+dxVmQ=",
|
||||
"media_kit_video": "sha256-JnMA/Q3DcuD/if7vAu8ZztKVBtfXAQb3SmXmT+dxVmQ=",
|
||||
"media_kit": "sha256-/HZQjVpT1MmsBvj7vwwS4z6z1KPkLogsdg57/y48kvs=",
|
||||
"media_kit_libs_android_video": "sha256-/HZQjVpT1MmsBvj7vwwS4z6z1KPkLogsdg57/y48kvs=",
|
||||
"media_kit_libs_ios_video": "sha256-/HZQjVpT1MmsBvj7vwwS4z6z1KPkLogsdg57/y48kvs=",
|
||||
"media_kit_libs_linux": "sha256-/HZQjVpT1MmsBvj7vwwS4z6z1KPkLogsdg57/y48kvs=",
|
||||
"media_kit_libs_macos_video": "sha256-/HZQjVpT1MmsBvj7vwwS4z6z1KPkLogsdg57/y48kvs=",
|
||||
"media_kit_libs_ohos": "sha256-/HZQjVpT1MmsBvj7vwwS4z6z1KPkLogsdg57/y48kvs=",
|
||||
"media_kit_libs_video": "sha256-/HZQjVpT1MmsBvj7vwwS4z6z1KPkLogsdg57/y48kvs=",
|
||||
"media_kit_libs_windows_video": "sha256-/HZQjVpT1MmsBvj7vwwS4z6z1KPkLogsdg57/y48kvs=",
|
||||
"media_kit_video": "sha256-/HZQjVpT1MmsBvj7vwwS4z6z1KPkLogsdg57/y48kvs=",
|
||||
"webview_windows": "sha256-afBTwbam9YA0xvIYMtiJe+CKi8GWit1HqDR3J72r2o0="
|
||||
}
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.1.6";
|
||||
version = "2.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Predidit";
|
||||
repo = "Kazumi";
|
||||
tag = version;
|
||||
hash = "sha256-J3lpzCVbw5syvErfVTntgY6dvMj6ITT+3CMPZRaAUk8=";
|
||||
hash = "sha256-+xt5Cd9GF13LY/MoL3R104npoBcTv000VPXvI3yYycU=";
|
||||
};
|
||||
in
|
||||
flutter.buildFlutterApplication {
|
||||
|
||||
@@ -1151,8 +1151,8 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"path": "media_kit",
|
||||
"ref": "87cdfef7dc4c14653068a1174d5eeaa7627e5a88",
|
||||
"resolved-ref": "87cdfef7dc4c14653068a1174d5eeaa7627e5a88",
|
||||
"ref": "11d02cb804b8faf944137834a1b0ac80880a4079",
|
||||
"resolved-ref": "11d02cb804b8faf944137834a1b0ac80880a4079",
|
||||
"url": "https://github.com/Predidit/media-kit.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -1162,8 +1162,8 @@
|
||||
"dependency": "direct overridden",
|
||||
"description": {
|
||||
"path": "libs/android/media_kit_libs_android_video",
|
||||
"ref": "87cdfef7dc4c14653068a1174d5eeaa7627e5a88",
|
||||
"resolved-ref": "87cdfef7dc4c14653068a1174d5eeaa7627e5a88",
|
||||
"ref": "11d02cb804b8faf944137834a1b0ac80880a4079",
|
||||
"resolved-ref": "11d02cb804b8faf944137834a1b0ac80880a4079",
|
||||
"url": "https://github.com/Predidit/media-kit.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -1173,8 +1173,8 @@
|
||||
"dependency": "direct overridden",
|
||||
"description": {
|
||||
"path": "libs/ios/media_kit_libs_ios_video",
|
||||
"ref": "87cdfef7dc4c14653068a1174d5eeaa7627e5a88",
|
||||
"resolved-ref": "87cdfef7dc4c14653068a1174d5eeaa7627e5a88",
|
||||
"ref": "11d02cb804b8faf944137834a1b0ac80880a4079",
|
||||
"resolved-ref": "11d02cb804b8faf944137834a1b0ac80880a4079",
|
||||
"url": "https://github.com/Predidit/media-kit.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -1184,8 +1184,8 @@
|
||||
"dependency": "direct overridden",
|
||||
"description": {
|
||||
"path": "libs/linux/media_kit_libs_linux",
|
||||
"ref": "87cdfef7dc4c14653068a1174d5eeaa7627e5a88",
|
||||
"resolved-ref": "87cdfef7dc4c14653068a1174d5eeaa7627e5a88",
|
||||
"ref": "11d02cb804b8faf944137834a1b0ac80880a4079",
|
||||
"resolved-ref": "11d02cb804b8faf944137834a1b0ac80880a4079",
|
||||
"url": "https://github.com/Predidit/media-kit.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -1195,8 +1195,8 @@
|
||||
"dependency": "direct overridden",
|
||||
"description": {
|
||||
"path": "libs/macos/media_kit_libs_macos_video",
|
||||
"ref": "87cdfef7dc4c14653068a1174d5eeaa7627e5a88",
|
||||
"resolved-ref": "87cdfef7dc4c14653068a1174d5eeaa7627e5a88",
|
||||
"ref": "11d02cb804b8faf944137834a1b0ac80880a4079",
|
||||
"resolved-ref": "11d02cb804b8faf944137834a1b0ac80880a4079",
|
||||
"url": "https://github.com/Predidit/media-kit.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -1206,8 +1206,8 @@
|
||||
"dependency": "direct overridden",
|
||||
"description": {
|
||||
"path": "libs/ohos/media_kit_libs_ohos",
|
||||
"ref": "87cdfef7dc4c14653068a1174d5eeaa7627e5a88",
|
||||
"resolved-ref": "87cdfef7dc4c14653068a1174d5eeaa7627e5a88",
|
||||
"ref": "11d02cb804b8faf944137834a1b0ac80880a4079",
|
||||
"resolved-ref": "11d02cb804b8faf944137834a1b0ac80880a4079",
|
||||
"url": "https://github.com/Predidit/media-kit.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -1217,8 +1217,8 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"path": "libs/universal/media_kit_libs_video",
|
||||
"ref": "87cdfef7dc4c14653068a1174d5eeaa7627e5a88",
|
||||
"resolved-ref": "87cdfef7dc4c14653068a1174d5eeaa7627e5a88",
|
||||
"ref": "11d02cb804b8faf944137834a1b0ac80880a4079",
|
||||
"resolved-ref": "11d02cb804b8faf944137834a1b0ac80880a4079",
|
||||
"url": "https://github.com/Predidit/media-kit.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -1228,8 +1228,8 @@
|
||||
"dependency": "direct overridden",
|
||||
"description": {
|
||||
"path": "libs/windows/media_kit_libs_windows_video",
|
||||
"ref": "87cdfef7dc4c14653068a1174d5eeaa7627e5a88",
|
||||
"resolved-ref": "87cdfef7dc4c14653068a1174d5eeaa7627e5a88",
|
||||
"ref": "11d02cb804b8faf944137834a1b0ac80880a4079",
|
||||
"resolved-ref": "11d02cb804b8faf944137834a1b0ac80880a4079",
|
||||
"url": "https://github.com/Predidit/media-kit.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -1239,8 +1239,8 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"path": "media_kit_video",
|
||||
"ref": "87cdfef7dc4c14653068a1174d5eeaa7627e5a88",
|
||||
"resolved-ref": "87cdfef7dc4c14653068a1174d5eeaa7627e5a88",
|
||||
"ref": "11d02cb804b8faf944137834a1b0ac80880a4079",
|
||||
"resolved-ref": "11d02cb804b8faf944137834a1b0ac80880a4079",
|
||||
"url": "https://github.com/Predidit/media-kit.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -2396,6 +2396,6 @@
|
||||
},
|
||||
"sdks": {
|
||||
"dart": ">=3.11.0 <4.0.0",
|
||||
"flutter": ">=3.44.2"
|
||||
"flutter": ">=3.44.3"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "parla";
|
||||
version = "0.5.6";
|
||||
version = "0.5.8";
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "trufae";
|
||||
repo = "parla";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ZCIEjpsGh4WjzTRapoUoZTt5ld4K/SranfLIUWM0htk=";
|
||||
hash = "sha256-R+7+UfBpBYjMmITFy0hJ+Be5QQJSxQYU9W7d5sQ37lY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "pscale";
|
||||
version = "0.286.0";
|
||||
version = "0.291.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "planetscale";
|
||||
repo = "cli";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-fYhw+zkbl/MKygF9flh3TIHG2FQXiIBVt6ubfudTetg=";
|
||||
sha256 = "sha256-dvWUriwAMgJMSkQPVNu5Ff4KFbp4KPE8lbY2OlttbzA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-dKL76vTkaniYBmHhozKRapJeyc0kY7GR+DBOXKUBtSE=";
|
||||
vendorHash = "sha256-n09VZjMHFnP/myZ0gqWdeD8QOQf3PpTJ9PUfb4x2zHo=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "supabase-cli";
|
||||
version = "2.105.0";
|
||||
version = "2.108.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -17,13 +17,13 @@ buildGoModule (finalAttrs: {
|
||||
owner = "supabase";
|
||||
repo = "cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-L56P2ao1N+M9+b76E4gjHfRVGU2JBKE31VxVaDeQk5E=";
|
||||
hash = "sha256-zhtt6JksIEZyfATxPDyZvf97syk9Z1kOXvzNgZxB1fI=";
|
||||
};
|
||||
|
||||
# Supabase is in the process of porting the CLI to TS, for now we continue with the Go cli.
|
||||
sourceRoot = "${finalAttrs.src.name}/apps/cli-go";
|
||||
|
||||
vendorHash = "sha256-1uzkvu1EcIk3+AVnv3GVCQLUPhCKNPvyFIstJvswET0=";
|
||||
vendorHash = "sha256-VKEhmPdj0IJYSVncCRhfxqbjdZ/1WwdIBZgxMkS/65o=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "tempo";
|
||||
version = "3.0.1";
|
||||
version = "3.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "tempo";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-KYb3QJ4jdPsEmxVCezpakRRDtdyeGc4JUgeCHkZTG50=";
|
||||
hash = "sha256-VMgHKeCk82CxbOi6rnt2U25su611wjeZJsRjEZffpiU=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "versatiles";
|
||||
version = "4.2.2";
|
||||
version = "4.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "versatiles-org";
|
||||
repo = "versatiles-rs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-PeZChWX+M/3th5vS7NWOvx/8vwKdS+Qf2yfd5pX7G54=";
|
||||
hash = "sha256-zdp64/uODLwGI6nyIr2ImTcwCSxTENe1p+7Rg24CKeI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-N/AHaQP0IymMO6IMbjx5xOxjG9L9ROg6iQYwJYDCbvY=";
|
||||
cargoHash = "sha256-AbBhYqD9YK3O0qLxtESTnFfWzwjMlM90aAh3M98gP3M=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "brother";
|
||||
version = "6.1.0";
|
||||
version = "6.1.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.12";
|
||||
@@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "bieniu";
|
||||
repo = "brother";
|
||||
tag = version;
|
||||
hash = "sha256-coV2jOxxqwP5LTh9QvyRvBcgVDENEm/IP9LRJu/Me+c=";
|
||||
hash = "sha256-7m0fakQCckIpG8Tc09P81xzHlIgeal9L2BwerUvBuX8=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pytest-mpl";
|
||||
version = "0.18.0";
|
||||
version = "0.19.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matplotlib";
|
||||
repo = "pytest-mpl";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-9fMhVgeEL4bjNIegmJV7lisrdzp27h0syn9pMwzX4Gg=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-qSOGGq2lOikm3kwZmGI1hFkuPU+zuh0iGL9TbH6ktEQ=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -43,6 +43,10 @@ buildPythonPackage rec {
|
||||
disabledTestPaths = [
|
||||
# Following are broken since at least a1548780dbc79d76360580691dc1bb4af4e837f6
|
||||
"tests/subtests/test_subtest.py"
|
||||
# https://github.com/matplotlib/pytest-mpl/issues/263
|
||||
"tests/test_baseline_path.py::test_config"
|
||||
"tests/test_results_always.py::test_config"
|
||||
"tests/test_use_full_test_name.py::test_config"
|
||||
];
|
||||
|
||||
# need to set MPLBACKEND=agg for headless matplotlib for darwin
|
||||
@@ -59,9 +63,10 @@ buildPythonPackage rec {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/matplotlib/pytest-mpl/blob/${finalAttrs.src.tag}/CHANGES.md";
|
||||
description = "Pytest plugin to help with testing figures output from Matplotlib";
|
||||
homepage = "https://github.com/matplotlib/pytest-mpl";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user