From ed8deb083e0a622c15bc74f7d5cde91bdae9e037 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 May 2025 05:20:55 +0000 Subject: [PATCH 1/9] open-policy-agent: 1.4.0 -> 1.4.2 --- pkgs/by-name/op/open-policy-agent/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/open-policy-agent/package.nix b/pkgs/by-name/op/open-policy-agent/package.nix index 5a95a91a117b..01ff13010866 100644 --- a/pkgs/by-name/op/open-policy-agent/package.nix +++ b/pkgs/by-name/op/open-policy-agent/package.nix @@ -14,13 +14,13 @@ assert buildGoModule (finalAttrs: { pname = "open-policy-agent"; - version = "1.4.0"; + version = "1.4.2"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; tag = "v${finalAttrs.version}"; - hash = "sha256-oFtF/Uze9X1aaDzQXpZwbRXi11VnTTkkosfSSIeIxcc="; + hash = "sha256-4FRNTB24JWyF3Zuhx3T6LjNs83+wDh4gmE9rh3cu/Vk="; }; vendorHash = null; From 4f8431266ce9a84b5c524a310e931681b2d7db5a Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 18 Apr 2025 14:07:50 -0700 Subject: [PATCH 2/9] llvmPackages.libunwind: add fake libgcc --- pkgs/development/compilers/llvm/common/libunwind/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/compilers/llvm/common/libunwind/default.nix b/pkgs/development/compilers/llvm/common/libunwind/default.nix index 0695d8f2be5b..25520428bacb 100644 --- a/pkgs/development/compilers/llvm/common/libunwind/default.nix +++ b/pkgs/development/compilers/llvm/common/libunwind/default.nix @@ -12,6 +12,7 @@ python3, libcxx, enableShared ? !stdenv.hostPlatform.isStatic, + doFakeLibgcc ? stdenv.hostPlatform.useLLVM, devExtraCmakeFlags ? [ ], getVersionFile, }: @@ -105,6 +106,10 @@ stdenv.mkDerivation ( '' + lib.optionalString (enableShared && stdenv.hostPlatform.isWindows) '' ln -s $out/lib/libunwind.dll.a $out/lib/libunwind_shared.dll.a + '' + + lib.optionalString (doFakeLibgcc) '' + ln -s $out/lib/libunwind.so $out/lib/libgcc_s.so + ln -s $out/lib/libunwind.so $out/lib/libgcc_s.so.1 ''; meta = llvm_meta // { From e0c93a51dc9eb0094802c5384d2f4a7340428753 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 May 2025 17:27:22 +0000 Subject: [PATCH 3/9] enzyme: 0.0.175 -> 0.0.176 --- pkgs/by-name/en/enzyme/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/en/enzyme/package.nix b/pkgs/by-name/en/enzyme/package.nix index 9665dd19831f..9facb5849f56 100644 --- a/pkgs/by-name/en/enzyme/package.nix +++ b/pkgs/by-name/en/enzyme/package.nix @@ -7,13 +7,13 @@ }: llvmPackages.stdenv.mkDerivation rec { pname = "enzyme"; - version = "0.0.175"; + version = "0.0.176"; src = fetchFromGitHub { owner = "EnzymeAD"; repo = "Enzyme"; rev = "v${version}"; - hash = "sha256-6uqPnkJeyn4R1mc/vVSVIl6sarSo41drKe9tTqWDJU0="; + hash = "sha256-/c8gxv9i4oHp3/7z6c1lU1lWPsPK27xkjjNjrPwieZE="; }; postPatch = '' From a956c9434ce57750243fac374145d96dd6d969df Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 May 2025 20:06:19 +0000 Subject: [PATCH 4/9] autobrr: 1.61.0 -> 1.62.0 --- pkgs/by-name/au/autobrr/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/au/autobrr/package.nix b/pkgs/by-name/au/autobrr/package.nix index f86b5707d816..dd8665d419f6 100644 --- a/pkgs/by-name/au/autobrr/package.nix +++ b/pkgs/by-name/au/autobrr/package.nix @@ -13,12 +13,12 @@ let pname = "autobrr"; - version = "1.61.0"; + version = "1.62.0"; src = fetchFromGitHub { owner = "autobrr"; repo = "autobrr"; tag = "v${version}"; - hash = "sha256-qFLHszkdpnOZj7dalwSPX/NSlAtLcVpIcEXxbtE8lLU="; + hash = "sha256-lygDs92WiIzHYgYqel2nseWcXgBFEQV+i5tC0NYpYUE="; }; autobrr-web = stdenvNoCC.mkDerivation { @@ -40,7 +40,7 @@ let src sourceRoot ; - hash = "sha256-ifzkLoXTdySr3uTy4Mc4WvDA6yd0RBVXbTtozHequsA="; + hash = "sha256-XFGxutHWk1RHnrN//WVTr4RyARIkygdG2C1Af5W0dBc="; }; postBuild = '' @@ -60,7 +60,7 @@ buildGoModule rec { src ; - vendorHash = "sha256-bbIoNW32b6N6t/MvCfSN/BdoHN0rZIMqWsJHL2amKPE="; + vendorHash = "sha256-/MOP06po885vg1C6j+let8UC710j68oP+L3j9oEU0Lw="; preBuild = '' cp -r ${autobrr-web}/* web/dist From 26c7e99111285f5eb8c05695e9cbc90c9569c8f5 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Wed, 7 May 2025 23:33:24 +0200 Subject: [PATCH 5/9] darwin.libsbuf: add meta.platforms --- .../os-specific/darwin/apple-source-releases/libsbuf/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsbuf/package.nix b/pkgs/os-specific/darwin/apple-source-releases/libsbuf/package.nix index 57467f657755..121ef395aac2 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsbuf/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsbuf/package.nix @@ -81,5 +81,6 @@ bootstrapStdenv.mkDerivation (finalAttrs: { lib.licenses.bsd2 lib.licenses.bsd3 ]; + platforms = lib.platforms.darwin; }; }) From 9fcab6502661b0a0c4035d28df36a2ccf50fc9dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 May 2025 22:50:09 +0000 Subject: [PATCH 6/9] double-entry-generator: 2.8.0 -> 2.9.0 --- pkgs/by-name/do/double-entry-generator/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/do/double-entry-generator/package.nix b/pkgs/by-name/do/double-entry-generator/package.nix index ca1d3f03ca11..228b06a68c13 100644 --- a/pkgs/by-name/do/double-entry-generator/package.nix +++ b/pkgs/by-name/do/double-entry-generator/package.nix @@ -6,15 +6,15 @@ }: buildGoModule rec { pname = "double-entry-generator"; - version = "2.8.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "deb-sig"; repo = "double-entry-generator"; - hash = "sha256-DsNcQacbdBzOMK9mVuuK8yz9RXqykYLhXE5YSFYmipA="; + hash = "sha256-GscpYNS30npOVZzRmbuCQvJzamgaK4riBiSngBg7szc="; rev = "v${version}"; }; - vendorHash = "sha256-/QMt8zPvHM9znUc0+iUC82bOUJoBmH+shJ9D7AHiQ1E="; + vendorHash = "sha256-NoWUaawApdTSWGRul9mpOxgRZWTE7LTz3pJgwU2NWVU="; excludedPackages = [ "hack" ]; From d27ac263ab1d09c415f41841ea9437e31ae1b60a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 May 2025 01:19:57 +0000 Subject: [PATCH 7/9] home-assistant-custom-lovelace-modules.universal-remote-card: 4.4.3 -> 4.4.4 --- .../universal-remote-card/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix index fd617a294dbf..12d7b3f63520 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix @@ -6,18 +6,18 @@ buildNpmPackage rec { pname = "universal-remote-card"; - version = "4.4.3"; + version = "4.4.4"; src = fetchFromGitHub { owner = "Nerwyn"; repo = "android-tv-card"; rev = version; - hash = "sha256-LhA4yDodTyeKxSr3BAYea/gohrHdsQIb2+MVixOBjC8="; + hash = "sha256-+FBNhN1sW4tjwWxGXAnKIPDR5gZtKoekh/N8mioXo+8="; }; patches = [ ./dont-call-git.patch ]; - npmDepsHash = "sha256-/0bxOC9e8+mfWAyj/yPXVGS4OAdFNU5H3x8z9aS0LBA="; + npmDepsHash = "sha256-KzxcEItSMTAeARjYRCmGjEIGuMLrdFjs+3AfcLr6AHc="; installPhase = '' runHook preInstall From 839d9c7974129098ec1bed1066e304b93dec2271 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 May 2025 03:42:24 +0200 Subject: [PATCH 8/9] rstcheck: cleanup dependencies, expose sphinx extra --- .../python-modules/rstcheck/default.nix | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/rstcheck/default.nix b/pkgs/development/python-modules/rstcheck/default.nix index 96c5bcea3ecc..e188bd30c836 100644 --- a/pkgs/development/python-modules/rstcheck/default.nix +++ b/pkgs/development/python-modules/rstcheck/default.nix @@ -1,17 +1,14 @@ { lib, - stdenv, buildPythonPackage, - docutils, fetchFromGitHub, setuptools, setuptools-scm, - pydantic, pytestCheckHook, pythonOlder, rstcheck-core, + sphinx, typer, - types-docutils, }: buildPythonPackage rec { @@ -34,20 +31,15 @@ buildPythonPackage rec { ]; dependencies = [ - docutils rstcheck-core - types-docutils - pydantic typer ]; - nativeCheckInputs = [ pytestCheckHook ]; + optional-dependencies = { + sphinx = [ sphinx ]; + }; - disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ - # Disabled until https://github.com/rstcheck/rstcheck-core/issues/19 is resolved. - "test_error_without_config_file_macos" - "test_file_1_is_bad_without_config_macos" - ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "rstcheck" ]; From 20df1577c16f025219d866edd6add173bb272138 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 May 2025 04:17:40 +0200 Subject: [PATCH 9/9] rstcheckWithSphinx: init flavor with sphinx This is useful to get it cached and usable in downstream CI jobs. --- pkgs/top-level/all-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8bf80e166da9..98db1754b3cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4362,6 +4362,10 @@ with pkgs; rstcheck = with python3Packages; toPythonApplication rstcheck; + rstcheckWithSphinx = rstcheck.overridePythonAttrs (oldAttrs: { + dependencies = oldAttrs.dependencies ++ oldAttrs.optional-dependencies.sphinx; + }); + rtmpdump_gnutls = rtmpdump.override { gnutlsSupport = true; opensslSupport = false;