diff --git a/nixos/modules/services/continuous-integration/gocd-agent/default.nix b/nixos/modules/services/continuous-integration/gocd-agent/default.nix index dd5014542507..7e4fd63b19f5 100644 --- a/nixos/modules/services/continuous-integration/gocd-agent/default.nix +++ b/nixos/modules/services/continuous-integration/gocd-agent/default.nix @@ -216,7 +216,7 @@ in ${pkgs.git}/bin/git config --global --add http.sslCAinfo ${config.security.pki.caBundle} ${pkgs.jre}/bin/java ${lib.concatStringsSep " " cfg.startupOptions} \ ${lib.concatStringsSep " " cfg.extraOptions} \ - -jar ${pkgs.gocd-agent}/go-agent/agent-bootstrapper.jar \ + -jar ${pkgs.gocd-agent}/go-agent/lib/agent-bootstrapper.jar \ -serverUrl ${cfg.goServer} ''; diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix index 24abc3d9ac12..6c53a3bb8315 100644 --- a/nixos/modules/services/monitoring/netdata.nix +++ b/nixos/modules/services/monitoring/netdata.nix @@ -11,13 +11,14 @@ let mkdir -p $out/libexec/netdata/plugins.d ln -s /run/wrappers/bin/apps.plugin $out/libexec/netdata/plugins.d/apps.plugin ln -s /run/wrappers/bin/cgroup-network $out/libexec/netdata/plugins.d/cgroup-network - ln -s /run/wrappers/bin/perf.plugin $out/libexec/netdata/plugins.d/perf.plugin - ln -s /run/wrappers/bin/slabinfo.plugin $out/libexec/netdata/plugins.d/slabinfo.plugin + ln -s /run/wrappers/bin/debugfs.plugin $out/libexec/netdata/plugins.d/debugfs.plugin ln -s /run/wrappers/bin/freeipmi.plugin $out/libexec/netdata/plugins.d/freeipmi.plugin - ln -s /run/wrappers/bin/systemd-journal.plugin $out/libexec/netdata/plugins.d/systemd-journal.plugin ln -s /run/wrappers/bin/logs-management.plugin $out/libexec/netdata/plugins.d/logs-management.plugin ln -s /run/wrappers/bin/network-viewer.plugin $out/libexec/netdata/plugins.d/network-viewer.plugin - ln -s /run/wrappers/bin/debugfs.plugin $out/libexec/netdata/plugins.d/debugfs.plugin + ln -s /run/wrappers/bin/otel-plugin $out/libexec/netdata/plugins.d/otel-plugin + ln -s /run/wrappers/bin/perf.plugin $out/libexec/netdata/plugins.d/perf.plugin + ln -s /run/wrappers/bin/slabinfo.plugin $out/libexec/netdata/plugins.d/slabinfo.plugin + ln -s /run/wrappers/bin/systemd-journal.plugin $out/libexec/netdata/plugins.d/systemd-journal.plugin ''; plugins = [ @@ -452,7 +453,6 @@ in group = cfg.group; permissions = "u+rx,g+x,o-rwx"; }; - } // lib.optionalAttrs (cfg.package.withIpmi) { "freeipmi.plugin" = { @@ -481,6 +481,15 @@ in permissions = "u+rx,g+x,o-rwx"; }; } + // lib.optionalAttrs (cfg.package.withOtel) { + "otel-plugin" = { + source = "${cfg.package}/libexec/netdata/plugins.d/otel-plugin.org"; + setuid = true; + owner = "root"; + group = cfg.group; + permissions = "u+rx,g+x,o-rwx"; + }; + } // lib.optionalAttrs (cfg.package.withSystemdJournal) { "systemd-journal.plugin" = { source = "${cfg.package}/libexec/netdata/plugins.d/systemd-journal.plugin.org"; diff --git a/nixos/tests/charliecloud.nix b/nixos/tests/charliecloud.nix index abdb2d877c19..04cfea7cf040 100644 --- a/nixos/tests/charliecloud.nix +++ b/nixos/tests/charliecloud.nix @@ -15,6 +15,7 @@ in name = "charliecloud"; meta = with pkgs.lib.maintainers; { maintainers = [ bzizou ]; + broken = true; }; nodes = { diff --git a/nixos/tests/common/x11.nix b/nixos/tests/common/x11.nix index 3d4b2fb71105..16bdbfa7ae24 100644 --- a/nixos/tests/common/x11.nix +++ b/nixos/tests/common/x11.nix @@ -15,8 +15,15 @@ services.displayManager.defaultSession = lib.mkDefault "none+icewm"; services.xserver.windowManager.icewm.enable = true; - # Help with OCR - environment.etc."icewm/theme".text = '' - Theme="gtk2/default.theme" - ''; + environment.etc = { + # Help with OCR + "icewm/theme".text = '' + Theme="gtk2/default.theme" + ''; + # Remove task bar to avoid non-determinism + "icewm/preferences".text = '' + ShowTaskBar=0 + ''; + }; + } diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 29407ea9f3e3..77ff2a196ab4 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -16,16 +16,16 @@ let inherit tiling_wm; }; stableVersion = { - version = "2025.2.1.7"; # "Android Studio Otter | 2025.2.1" - sha256Hash = "sha256-Fq8foC10bkwYLYhS/zhZu6XBgnaO/qz6GKi4HWXnjLE="; + version = "2025.2.1.8"; # "Android Studio Otter | 2025.2.1 Patch 1" + sha256Hash = "sha256-eqai5G60OH3vH06iK4tKK2gCHvqFBlNHxBGHQ5/SUJY="; }; betaVersion = { - version = "2025.2.1.6"; # "Android Studio Otter | 2025.2.1 RC 1" - sha256Hash = "sha256-l+bJ0AWIrJ3qNcKJWiE+onrl6ZpLb6YWFXE3HtIejUs="; + version = "2025.2.2.5"; # "Android Studio Otter 2 Feature Drop | 2025.2.2 RC 1" + sha256Hash = "sha256-Z6HV0kx/28cn5IdUxQCWI5mhc8IIG64+9SAOzjzwcuI="; }; latestVersion = { - version = "2025.2.2.4"; # "Android Studio Otter 2 Feature Drop | 2025.2.2 Canary 4" - sha256Hash = "sha256-i7IcD1/qOXJZM0Wzah9DIV9vsU6T2XemSvc5RK33jBI="; + version = "2025.2.3.1"; # "Android Studio Otter 3 Feature Drop | 2025.2.3 Canary 1" + sha256Hash = "sha256-OHUKe2FBaxql3bS9kxrM8SSsSt6UpNYoZpkiPWfpafA="; }; in { diff --git a/pkgs/applications/editors/vim/macvim-xcode26.patch b/pkgs/applications/editors/vim/macvim-xcode26.patch new file mode 100644 index 000000000000..4850475b3df0 --- /dev/null +++ b/pkgs/applications/editors/vim/macvim-xcode26.patch @@ -0,0 +1,13 @@ +diff --git a/src/MacVim/MacVim.xcodeproj/project.pbxproj b/src/MacVim/MacVim.xcodeproj/project.pbxproj +index 7481870..6355242 100644 +--- a/src/MacVim/MacVim.xcodeproj/project.pbxproj ++++ b/src/MacVim/MacVim.xcodeproj/project.pbxproj +@@ -1191,7 +1191,7 @@ + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/zsh; +- shellScript = "# Copy the runtime files to the app bundle, under Resources/vim/runtime folder.\n# We cannot do a direct copy of the runtime folder as it contains misc test\n# scripts and also man pages and we should use the Vim's defined rules to\n# install them properly.\n\n# Note that this will also install man pages, under a \"man\" folder. This is\n# useful if the user really wants to point their man page to MacVim's verison\n# instead of builtin Vim, using MANPATH=/Applications/MacVim.app/Contents/man).\n\n# prefix: Reset to empty as it's set to /Applications for fallback rt-folder\n# VIMNAME: Use the default \"vim\" to make sure man pages use that instead of \"Vim\"\n# VIMRTDIR: Make sure to use \"runtime\" as by default it uses a \"vim90\" style folder which is mostly a relic.\n\ncd \"${SRCROOT}\"/..\nmake \\\n DESTDIR=\"${TARGET_BUILD_DIR}\" \\\n prefix= \\\n VIMNAME=vim \\\n VIMRTDIR=/runtime \\\n macvim-install-runtime\n\n# Also add man pages for \"mvim\"\nfor curdir in \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH\"/man/**/man1; do\n (cd $curdir; ln -f -s gvim.1 mvim.1)\ndone\n"; ++ shellScript = "# Copy the runtime files to the app bundle, under Resources/vim/runtime folder.\n# We cannot do a direct copy of the runtime folder as it contains misc test\n# scripts and also man pages and we should use the Vim's defined rules to\n# install them properly.\n\n# Note that this will also install man pages, under a \"man\" folder. This is\n# useful if the user really wants to point their man page to MacVim's verison\n# instead of builtin Vim, using MANPATH=/Applications/MacVim.app/Contents/man).\n\n# prefix: Reset to empty as it's set to /Applications for fallback rt-folder\n# VIMNAME: Use the default \"vim\" to make sure man pages use that instead of \"Vim\"\n# VIMRTDIR: Make sure to use \"runtime\" as by default it uses a \"vim90\" style folder which is mostly a relic.\n\nset -e\n\ncd \"${SRCROOT}\"/..\nfor x in ${(k)parameters}; do if [[ $x = *_DEPLOYMENT_TARGET ]]; then [[ $x = MACOSX_DEPLOYMENT_TARGET ]] || unset $x; fi; done\nmake --jobs=1 \\\n DESTDIR=\"${TARGET_BUILD_DIR}\" \\\n prefix= \\\n VIMNAME=vim \\\n VIMRTDIR=/runtime \\\n macvim-install-runtime\n\n# Also add man pages for \"mvim\"\nfor curdir in \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH\"/man/**/man1; do\n (cd $curdir; ln -f -s gvim.1 mvim.1)\ndone\n"; + showEnvVarsInLog = 0; + }; + 90C052E1251E889500E2D81E /* Copy vimtutor */ = { diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 943fd5b3b29e..19266316fd84 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - runCommand, + apple-sdk_14, ncurses, gettext, pkg-config, @@ -11,52 +11,45 @@ tcl, perl, luajit, - darwin, - libiconv, python3, - enablePython ? false, - rcodesign, + # Setting withXcodePath makes it use that instead of the system-default Xcode. + # This can be set to one of the `darwin.xcode_*` packages as well. + # If set, this should be a path to Xcode.app, e.g. `"/Applications/Xcode.app"`. + withXcodePath ? null, }: -let - inherit (lib) optional optionals optionalString; -in - # Try to match MacVim's documented script interface compatibility let # Ruby 3.4 ruby = ruby_3_4; - - # Building requires a few system tools to be in PATH. - # Some of these we could patch into the relevant source files (such as xcodebuild and - # qlmanage) but some are used by Xcode itself and we have no choice but to put them in PATH. - # Symlinking them in this way is better than just putting all of /usr/bin in there. - buildSymlinks = runCommand "macvim-build-symlinks" { } '' - mkdir -p $out/bin - ln -s /usr/bin/xcrun /usr/bin/xcodebuild /usr/bin/tiffutil /usr/bin/qlmanage $out/bin - ''; in stdenv.mkDerivation (finalAttrs: { pname = "macvim"; - version = "181"; + version = "182"; src = fetchFromGitHub { owner = "macvim-dev"; repo = "macvim"; - rev = "release-${finalAttrs.version}"; - hash = "sha256-Wdq+eXSaGs+y+75ZbxoNAcyopRkWRHHRm05T0SHBrow="; + tag = + let + releaseType = if lib.hasInfix "." finalAttrs.version then "prerelease" else "release"; + in + "${releaseType}-${finalAttrs.version}"; + hash = "sha256-JEb71wZcvFsz94vb3+gC83BhlEccjlPrpr9RCXDUEIo="; }; enableParallelBuilding = true; nativeBuildInputs = [ pkg-config - buildSymlinks - ] - ++ optional stdenv.isAarch64 rcodesign; + ]; buildInputs = [ + # MacVim references up to MAC_OS_VERSION_14_0 in its source + # Update this SDK if it adds APIs that use newer versions + # (check both MAC_OS_VERSION_* and MAC_OS_X_VERSION_*) + apple-sdk_14 gettext ncurses cscope @@ -64,10 +57,51 @@ stdenv.mkDerivation (finalAttrs: { ruby tcl perl - ] - ++ optional enablePython python3; + python3 + ]; - patches = [ ./macvim.patch ]; + patches = [ + ./macvim.patch + # Xcode 26.0 sets *_DEPLOYMENT_TARGET env vars for all platforms in shell script build phases. + # This breaks invocations of clang in those phases, as they target the wrong platform. + # Note: The shell script build phase in question uses /bin/zsh. + # This also adds --jobs=1 to the shell script build phase invocation of `make` as running in + # parallel is causing the gvim.1 manpage to go missing. + ./macvim-xcode26.patch + ]; + + # Fix clang version detection in configure script, it's getting tripped up + # because the InstalledDir matches the same pattern + postPatch = '' + substituteInPlace src/auto/configure \ + --replace-fail /usr/bin/grep grep \ + --replace-fail '$CC --version 2>/dev/null |' '$CC --version 2>/dev/null | head -1 |' + '' + # Remove $(VIMTARGET) from the installrtbase rule deps. MacVim already comments out the usage of + # this executable in this rule, and for some reason Xcode is deleting it after copying it into + # MacVim.app/Contents/MacOS/, so this is getting rebuilt unnecessarily and causing issues. + + '' + substituteInPlace src/Makefile \ + --replace-fail \ + 'installrtbase: $(HELPSOURCE)/vim.1 $(DEST_VIM) $(VIMTARGET) $(DEST_RT)' \ + 'installrtbase: $(HELPSOURCE)/vim.1 $(DEST_VIM) $(DEST_RT)' + '' + # Patch in the xcode path we want + + '' + xcodebuildPath=${ + if withXcodePath == null then + "$(DEVELOPER_DIR= /usr/bin/xcrun -find xcodebuild)" + else + lib.escapeShellArg "${withXcodePath}/Contents/Developer/usr/bin/xcodebuild" + } + substituteInPlace src/Makefile \ + --replace-fail xcodebuild "$xcodebuildPath" + '' + # QuickLookStephen calls `qlmanage -r` in a shell script phase + + '' + substituteInPlace src/MacVim/qlstephen/QuickLookStephen.xcodeproj/project.pbxproj \ + --replace-fail qlmanage /usr/bin/qlmanage + ''; configureFlags = [ "--enable-cscope" @@ -76,23 +110,15 @@ stdenv.mkDerivation (finalAttrs: { "--enable-gui=macvim" "--enable-multibyte" "--enable-nls" - "--enable-luainterp=dynamic" - ] - ++ optionals enablePython [ - "--enable-python3interp=dynamic" - ] - ++ [ - "--enable-perlinterp=dynamic" - "--enable-rubyinterp=dynamic" + "--enable-luainterp=yes" + "--enable-python3interp=yes" + "--enable-perlinterp=yes" + "--enable-rubyinterp=yes" "--enable-tclinterp=yes" "--without-local-dir" "--with-luajit" "--with-lua-prefix=${luajit}" - ] - ++ optionals enablePython [ "--with-python3-command=${python3}/bin/python3" - ] - ++ [ "--with-ruby-command=${ruby}/bin/ruby" "--with-tclsh=${tcl}/bin/tclsh" "--with-tlib=ncurses" @@ -100,90 +126,34 @@ stdenv.mkDerivation (finalAttrs: { "--disable-sparkle" ]; - # Remove references to Sparkle.framework from the project. - # It's unused (we disabled it with --disable-sparkle) and this avoids - # copying the unnecessary several-megabyte framework into the result. - postPatch = '' - echo "Patching file src/MacVim/MacVim.xcodeproj/project.pbxproj" - sed -e '/Sparkle\.framework/d' -i src/MacVim/MacVim.xcodeproj/project.pbxproj + preConfigure = '' + configureFlagsArray+=( + --with-developer-dir="$DEVELOPER_DIR" + CFLAGS="-Wno-error=implicit-function-declaration" + ) '' - # Xcode 26.0 sets *_DEPLOYMENT_TARGET env vars for all platforms in shell script build phases. - # This breaks invocations of clang in those phases, as they target the wrong platform. - # Note: The shell script build phase in question uses /bin/zsh. + # Having `$LD` set causes Xcode to invoke `ld` instead of `clang` as the linker, but it still + # passes flags intended for clang. + '' - substituteInPlace src/MacVim/MacVim.xcodeproj/project.pbxproj \ - --replace-fail 'make \' $'for x in ''${(k)parameters}; do if [[ $x = *_DEPLOYMENT_TARGET ]]; then [[ $x = MACOSX_DEPLOYMENT_TARGET ]] || unset $x; fi; done\nmake \\' + unset LD + '' + # When building with nix-daemon, we need to pass -derivedDataPath or else it tries to use + # a folder rooted in /var/empty and fails. Unfortunately we can't just pass -derivedDataPath + # by itself as this flag requires the use of -scheme or -xctestrun (not sure why), but MacVim + # by default just runs `xcodebuild -project src/MacVim/MacVim.xcodeproj`, relying on the default + # behavior to build the first target in the project. Experimentally, there seems to be a scheme + # called MacVim, so we'll explicitly select that. We also need to specify the configuration too + # as the scheme seems to have the wrong default. + # Passing ENABLE_CODE_COVERAGE=NO because it's defaulting on for some reason. + # Passing ONLY_ACTIVE_ARCH=YES because QuickLookStephen.xcodeproj is building Universal by default. + + '' + configureFlagsArray+=( + XCODEFLAGS="-scheme MacVim -derivedDataPath $NIX_BUILD_TOP/derivedData ENABLE_CODE_COVERAGE=NO ONLY_ACTIVE_ARCH=YES" + --with-xcodecfg="Release" + ) ''; - # This is unfortunate, but we need to use the same compiler as Xcode, but Xcode doesn't provide a - # way to configure the compiler. We also need to pull in lib/include paths for some of our build - # inputs since we don't have cc-wrapper to do that for us. - preConfigure = - let - # ideally we'd recurse, but we don't need that right now - inputs = [ ncurses ] ++ perl.propagatedBuildInputs; - ldflags = map (drv: "-L${lib.getLib drv}/lib") inputs ++ [ "-headerpad_max_install_names" ]; - cppflags = map (drv: "-isystem ${lib.getDev drv}/include") inputs; - in - '' - unset DEVELOPER_DIR # Use the system Xcode not the nixpkgs SDK. - - CC=/usr/bin/clang - - DEV_DIR=$(/usr/bin/xcode-select -print-path)/Platforms/MacOSX.platform/Developer - configureFlagsArray+=( - --with-developer-dir="$DEV_DIR" - LDFLAGS=${lib.escapeShellArg ldflags} - CPPFLAGS=${lib.escapeShellArg cppflags} - CFLAGS="-Wno-error=implicit-function-declaration" - ) - '' - # For some reason having LD defined causes PSMTabBarControl to fail at link-time as it - # passes arguments to ld that it meant for clang. - + '' - unset LD - '' - # When building with nix-daemon, we need to pass -derivedDataPath or else it tries to use - # a folder rooted in /var/empty and fails. Unfortunately we can't just pass -derivedDataPath - # by itself as this flag requires the use of -scheme or -xctestrun (not sure why), but MacVim - # by default just runs `xcodebuild -project src/MacVim/MacVim.xcodeproj`, relying on the default - # behavior to build the first target in the project. Experimentally, there seems to be a scheme - # called MacVim, so we'll explicitly select that. We also need to specify the configuration too - # as the scheme seems to have the wrong default. - + '' - configureFlagsArray+=( - XCODEFLAGS="-scheme MacVim -derivedDataPath $NIX_BUILD_TOP/derivedData LDFLAGS='\$(inherited) -headerpad_max_install_names' ENABLE_CODE_COVERAGE=NO" - --with-xcodecfg="Release" - ) - ''; - - # Because we're building with system clang, this means we're building against Xcode's SDK and - # linking against system libraries. The configure script is picking up Nix Libsystem (via ruby) - # so we need to patch that out or we'll get linker issues. The MacVim binary built by Xcode links - # against the system anyway so it doesn't really matter that the Vim binary will too. If we - # decide that matters, we can always patch it back to the Nix libsystem post-build. - # It also picks up libiconv, libunwind, and objc4 from Nix. These seem relatively harmless but - # let's strip them out too. - # - # Note: If we do add a post-build install_name_tool patch, we need to add the - # "LDFLAGS=-headerpad_max_install_names" flag to configureFlags and either patch it into the - # Xcode project or pass it as a flag to xcodebuild as well. postConfigure = '' - substituteInPlace src/auto/config.mk \ - --replace-warn " -L${stdenv.cc.libc}/lib" "" \ - --replace-warn " -L${darwin.libunwind}/lib" "" \ - --replace-warn " -L${libiconv}/lib" "" - - # All the libraries we stripped have -osx- in their name as of this time. - # Assert now that this pattern no longer appears in config.mk. - ( # scope variable - while IFS="" read -r line; do - if [[ "$line" == LDFLAGS*-osx-* ]]; then - echo "WARNING: src/auto/config.mk contains reference to Nix osx library" >&2 - fi - done &6; } +@@ -6686,10 +6686,7 @@ printf "%s\n" "not found" >&6; } for path in "${vi_cv_path_mzscheme_pfx}/lib" "${SCHEME_LIB}"; do if test "X$path" != "X"; then @@ -79,7 +66,7 @@ index ecf10c4..4b691d0 100755 MZSCHEME_LIBS="${path}/libmzscheme3m.a" MZSCHEME_CFLAGS="-DMZ_PRECISE_GC" elif test -f "${path}/libracket3m.a"; then -@@ -6646,23 +6643,6 @@ printf "%s\n" ">>> too old; need Perl version 5.003_01 or later <<<" >&6; } +@@ -7128,23 +7125,6 @@ printf "%s\n" ">>> too old; need Perl version 5.003_01 or later <<<" >&6; } fi if test "x$MACOS_X" = "xyes"; then @@ -97,13 +84,13 @@ index ecf10c4..4b691d0 100755 - if test -n "$PERL"; then - PERL_DIR="$dir" - PERL_CFLAGS="-DFEAT_PERL -I$darwindir/CORE" -- PERL_OBJ="objects/if_perl.o objects/if_perlsfio.o $darwindir/auto/DynaLoader/DynaLoader.a" +- PERL_OBJ="objects/if_perl.o $darwindir/auto/DynaLoader/DynaLoader.a" - PERL_LIBS="-L$darwindir/CORE -lperl" - fi PERL_LIBS=`echo "$PERL_LIBS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` PERL_CFLAGS=`echo "$PERL_CFLAGS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` fi -@@ -6902,13 +6882,7 @@ __: +@@ -7393,13 +7373,7 @@ __: eof eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" rm -f -- "${tmp_mkf}" @@ -114,19 +101,11 @@ index ecf10c4..4b691d0 100755 - vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python" - fi - else -+ ++ if true; then vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}" if test -n "${python_LINKFORSHARED}" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then python_link_symbol=`echo ${python_LINKFORSHARED} | sed 's/\([^ \t][^ \t]*[ \t][ \t]*[^ \t][^ \t]*\)[ \t].*/\1/'` -@@ -6923,7 +6897,6 @@ eof - fi - vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}" - vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//` -- fi - - fi - -@@ -7004,13 +6977,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ +@@ -7498,13 +7472,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ printf "%s\n" "no" >&6; } fi @@ -140,7 +119,7 @@ index ecf10c4..4b691d0 100755 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for Python are sane" >&5 printf %s "checking if compile and link flags for Python are sane... " >&6; } cflags_save=$CFLAGS -@@ -8060,11 +8026,7 @@ printf "%s\n" "$tclver - OK" >&6; }; +@@ -8593,11 +8560,7 @@ printf "%s\n" "$tclver - OK" >&6; }; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of Tcl include" >&5 printf %s "checking for location of Tcl include... " >&6; } @@ -152,7 +131,7 @@ index ecf10c4..4b691d0 100755 TCL_INC= for try in $tclinc; do if test -f "$try/tcl.h"; then -@@ -8082,13 +8044,8 @@ printf "%s\n" "" >&6; } +@@ -8615,13 +8578,8 @@ printf "%s\n" "" >&6; } if test -z "$SKIP_TCL"; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of tclConfig.sh script" >&5 printf %s "checking for location of tclConfig.sh script... " >&6; } @@ -166,9 +145,9 @@ index ecf10c4..4b691d0 100755 for try in $tclcnf; do if test -f "$try/tclConfig.sh"; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5 -@@ -8285,10 +8242,6 @@ printf "%s\n" "$rubyhdrdir" >&6; } +@@ -8819,10 +8777,6 @@ printf "%s\n" "$rubyhdrdir" >&6; } rubylibdir=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['libdir'])"` - if test -f "$rubylibdir/$librubya" || expr "$librubyarg" : "-lruby"; then + if test -f "$rubylibdir/$librubya" || expr "$librubyarg" : "-lruby" >/dev/null; then RUBY_LIBS="$RUBY_LIBS -L$rubylibdir" - elif test "$vi_cv_path_ruby" = "/usr/bin/ruby" -a -d "/System/Library/Frameworks/Ruby.framework"; then - RUBY_LIBS="-framework Ruby" @@ -177,25 +156,3 @@ index ecf10c4..4b691d0 100755 fi if test "X$librubyarg" != "X"; then -diff --git a/src/vim.h b/src/vim.h -index 6e33142..6185f45 100644 ---- a/src/vim.h -+++ b/src/vim.h -@@ -270,17 +270,6 @@ - # define SUN_SYSTEM - #endif - --// If we're compiling in C++ (currently only KVim), the system --// headers must have the correct prototypes or nothing will build. --// Conversely, our prototypes might clash due to throw() specifiers and --// cause compilation failures even though the headers are correct. For --// a concrete example, gcc-3.2 enforces exception specifications, and --// glibc-2.2.5 has them in their system headers. --#if !defined(__cplusplus) && defined(UNIX) \ -- && !defined(MACOS_X) // MACOS_X doesn't yet support osdef.h --# include "auto/osdef.h" // bring missing declarations in --#endif -- - #ifdef AMIGA - # include "os_amiga.h" - #endif diff --git a/pkgs/applications/networking/instant-messengers/discord/darwin.nix b/pkgs/applications/networking/instant-messengers/discord/darwin.nix index 876036b12a33..1f1422371640 100644 --- a/pkgs/applications/networking/instant-messengers/discord/darwin.nix +++ b/pkgs/applications/networking/instant-messengers/discord/darwin.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation { mv $out/Applications/${desktopName}.app/Contents/Resources/app.asar $out/Applications/${desktopName}.app/Contents/Resources/_app.asar mkdir $out/Applications/${desktopName}.app/Contents/Resources/app.asar echo '{"name":"discord","main":"index.js"}' > $out/Applications/${desktopName}.app/Contents/Resources/app.asar/package.json - echo 'require("${equicord}/patcher.js")' > $out/Applications/${desktopName}.app/Contents/Resources/app.asar/index.js + echo 'require("${equicord}/desktop/patcher.js")' > $out/Applications/${desktopName}.app/Contents/Resources/app.asar/index.js '' + lib.strings.optionalString withMoonlight '' mv $out/Applications/${desktopName}.app/Contents/Resources/app.asar $out/Applications/${desktopName}.app/Contents/Resources/_app.asar diff --git a/pkgs/applications/virtualization/singularity/generic.nix b/pkgs/applications/virtualization/singularity/generic.nix index 1d75a9885fb0..9b8be3879b2a 100644 --- a/pkgs/applications/virtualization/singularity/generic.nix +++ b/pkgs/applications/virtualization/singularity/generic.nix @@ -12,16 +12,6 @@ extraDescription ? "", extraMeta ? { }, }: - -let - # Backward compatibility layer for the obsolete workaround of - # the "vendor-related attributes not overridable" issue (#86349), - # whose solution (#225051) is merged and released. - # TODO(@ShamrockLee): Remove after the Nixpkgs 25.05 branch-off. - _defaultGoVendorArgs = { - inherit vendorHash deleteVendor proxyVendor; - }; -in { lib, buildGoModule, @@ -97,28 +87,9 @@ in # "path/to/source/file1" = [ "" "" ... ]; # } sourceFilesWithDefaultPaths ? { }, - # Placeholders for the obsolete workaround of #86349 - # TODO(@ShamrockLee): Remove after the Nixpkgs 25.05 branch-off. - vendorHash ? null, - deleteVendor ? null, - proxyVendor ? null, -}@args: +}: let - # Backward compatibility layer for the obsolete workaround of #86349 - # TODO(@ShamrockLee): Convert to simple inheritance after the Nixpkgs 25.05 branch-off. - moduleArgsOverridingCompat = - argName: - if args.${argName} or null == null then - _defaultGoVendorArgs.${argName} - else - lib.warn - "${projectName}: Override ${argName} with .override is deprecated. Use .overrideAttrs instead." - args.${argName}; - vendorHash = moduleArgsOverridingCompat "vendorHash"; - deleteVendor = moduleArgsOverridingCompat "deleteVendor"; - proxyVendor = moduleArgsOverridingCompat "proxyVendor"; - addShellDoubleQuotes = s: lib.escapeShellArg ''"'' + s + lib.escapeShellArg ''"''; in (buildGoModule { diff --git a/pkgs/by-name/ac/actual-server/package.nix b/pkgs/by-name/ac/actual-server/package.nix index 01e3b187e504..7b2724ee50f3 100644 --- a/pkgs/by-name/ac/actual-server/package.nix +++ b/pkgs/by-name/ac/actual-server/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - darwin, + cctools, fetchFromGitHub, jq, makeWrapper, @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.cctools + cctools ]; env = { diff --git a/pkgs/by-name/al/alsa-firmware/package.nix b/pkgs/by-name/al/alsa-firmware/package.nix index 9950b4933b0e..aeff48495bdb 100644 --- a/pkgs/by-name/al/alsa-firmware/package.nix +++ b/pkgs/by-name/al/alsa-firmware/package.nix @@ -58,5 +58,9 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; maintainers = [ ]; + sourceProvenance = with lib.sourceTypes; [ + binaryFirmware + fromSource + ]; }; }) diff --git a/pkgs/by-name/an/anki/package.nix b/pkgs/by-name/an/anki/package.nix index ec4f2405a974..c3504efd0962 100644 --- a/pkgs/by-name/an/anki/package.nix +++ b/pkgs/by-name/an/anki/package.nix @@ -311,12 +311,5 @@ python3Packages.buildPythonApplication rec { junestepp oxij ]; - # Reported to crash at launch on darwin (as of 2.1.65) - broken = stdenv.hostPlatform.isDarwin; - badPlatforms = [ - # pyqt6-webengine is broken on darwin - # https://github.com/NixOS/nixpkgs/issues/375059 - lib.systems.inspect.patterns.isDarwin - ]; }; } diff --git a/pkgs/by-name/an/antigravity/package.nix b/pkgs/by-name/an/antigravity/package.nix index 6326a37f26ab..44d58b796fb4 100644 --- a/pkgs/by-name/an/antigravity/package.nix +++ b/pkgs/by-name/an/antigravity/package.nix @@ -15,7 +15,7 @@ let (lib.importJSON ./sources.json)."${hostPlatform.system}" or (throw "antigravity: unsupported system ${hostPlatform.system}"); - version = "1.11.2-6251250307170304"; + version = "1.11.3-6583016683339776"; vscodeVersion = "1.104.0"; in callPackage vscode-generic { diff --git a/pkgs/by-name/an/antigravity/sources.json b/pkgs/by-name/an/antigravity/sources.json index 8e6d19778941..67d59f60d2d7 100644 --- a/pkgs/by-name/an/antigravity/sources.json +++ b/pkgs/by-name/an/antigravity/sources.json @@ -1,18 +1,18 @@ { "x86_64-linux": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.11.2-6251250307170304/linux-x64/Antigravity.tar.gz", - "hash": "sha256-0bERWudsJ1w3bqZg4eTS3CDrPnLWogawllBblEpfZLc=" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.11.3-6583016683339776/linux-x64/Antigravity.tar.gz", + "hash": "sha256-Al2lEvl5mnFU4sx1vAkIIBOCwazy6DePnaI1y4SlYVs=" }, "aarch64-linux": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.11.2-6251250307170304/linux-arm/Antigravity.tar.gz", - "hash": "sha256-UBVxx05mKcqdAy0Usc4heGCJ/UtK86+RSsQzgkngpx4=" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.11.3-6583016683339776/linux-arm/Antigravity.tar.gz", + "hash": "sha256-Mn9Zq2Fo3cLsJ/Ckx7IDOvSkThKREf5XLz3vSOu61TM=" }, "x86_64-darwin": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.11.2-6251250307170304/darwin-x64/Antigravity.zip", - "hash": "sha256-jrAUYtxPJqukW+SZK9oLFF0ewhDGOmJyV4ryflnyO+8=" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.11.3-6583016683339776/darwin-x64/Antigravity.zip", + "hash": "sha256-eNl0Z/+6G6B8vsx25KlaIpGIPkaOOisTH+k2viDKoqk=" }, "aarch64-darwin": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.11.2-6251250307170304/darwin-arm/Antigravity.zip", - "hash": "sha256-ZYlO1lZGQgTvbXgLTbEmh4A3HuCFgKTgWJfkMNyh4hw=" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.11.3-6583016683339776/darwin-arm/Antigravity.zip", + "hash": "sha256-cjFFkvpz/YBY2c78RN0kYbhOAM1roPjujJ7e511kEng=" } } diff --git a/pkgs/by-name/av/avalanche-cli/package.nix b/pkgs/by-name/av/avalanche-cli/package.nix index 02bb6c87346b..ffe4a5928830 100644 --- a/pkgs/by-name/av/avalanche-cli/package.nix +++ b/pkgs/by-name/av/avalanche-cli/package.nix @@ -14,17 +14,17 @@ }: buildGoModule (finalAttrs: { pname = "avalanche-cli"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "ava-labs"; repo = "avalanche-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-1sQdQTWlUNWM8F/9/DZjn/WS3F0RTG4hglmoN2jjOyc="; + hash = "sha256-4JHRfSop3JZ4ejAt5cnLHLkbXMRRiLwHRi9vBS46Wmo="; }; proxyVendor = true; - vendorHash = "sha256-bId5FDdpgI8DTtY44cgATf41qLu8udLR00XioZOAh/Y="; + vendorHash = "sha256-reL1ZJc/Wuh0LH+S+ZV4eVgVP5gvv3tFqLWNNTL5CDI="; # Fix error: 'Caught SIGILL in blst_cgo_init' # https://github.com/bnb-chain/bsc/issues/1521 diff --git a/pkgs/by-name/bu/buildstream/package.nix b/pkgs/by-name/bu/buildstream/package.nix index e60f938a8dc2..cd9f2d3a1d1f 100644 --- a/pkgs/by-name/bu/buildstream/package.nix +++ b/pkgs/by-name/bu/buildstream/package.nix @@ -2,6 +2,7 @@ lib, python3Packages, fetchFromGitHub, + nix-update-script, # buildInputs buildbox, @@ -112,6 +113,8 @@ python3Packages.buildPythonApplication rec { versionCheckProgram = "${placeholder "out"}/bin/bst"; versionCheckProgramArg = "--version"; + passthru.updateScript = nix-update-script { }; + meta = { description = "Powerful software integration tool"; downloadPage = "https://buildstream.build/install.html"; diff --git a/pkgs/by-name/ch/changedetection-io/package.nix b/pkgs/by-name/ch/changedetection-io/package.nix index b02957d48b1a..51b30a9845ba 100644 --- a/pkgs/by-name/ch/changedetection-io/package.nix +++ b/pkgs/by-name/ch/changedetection-io/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "changedetection-io"; - version = "0.50.43"; + version = "0.51.3"; format = "setuptools"; src = fetchFromGitHub { owner = "dgtlmoon"; repo = "changedetection.io"; tag = version; - hash = "sha256-a1hlHBYKMejaqi+Q0sCMLugKI0wolVSEgjOPOoIxNA4="; + hash = "sha256-R0IL2skCUKLD/Gt9jru23aIMUVpvpx+KxQvQr4YIono="; }; pythonRelaxDeps = true; diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix index 2554001f67c0..0831c455f627 100644 --- a/pkgs/by-name/de/deno/package.nix +++ b/pkgs/by-name/de/deno/package.nix @@ -223,8 +223,11 @@ rustPlatform.buildRustPackage (finalAttrs: { runHook postInstallCheck ''; - passthru.updateScript = ./update/update.ts; - passthru.tests = callPackage ./tests { }; + passthru = { + updateScript = ./update/update.ts; + tests = callPackage ./tests { }; + inherit librusty_v8; + }; meta = with lib; { homepage = "https://deno.land/"; diff --git a/pkgs/by-name/di/discordo/package.nix b/pkgs/by-name/di/discordo/package.nix index 241caa1bcb90..b1fcc8eb3355 100644 --- a/pkgs/by-name/di/discordo/package.nix +++ b/pkgs/by-name/di/discordo/package.nix @@ -50,7 +50,7 @@ buildGoModule (finalAttrs: { meta = { description = "Lightweight, secure, and feature-rich Discord terminal client"; homepage = "https://github.com/ayn2op/discordo"; - license = lib.licenses.mit; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ arian-d ]; mainProgram = "discordo"; }; diff --git a/pkgs/by-name/dr/drum-machine/package.nix b/pkgs/by-name/dr/drum-machine/package.nix index f64784a6b9be..d1dee1520619 100644 --- a/pkgs/by-name/dr/drum-machine/package.nix +++ b/pkgs/by-name/dr/drum-machine/package.nix @@ -13,18 +13,19 @@ pkg-config, python3Packages, wrapGAppsHook4, + ffmpeg-headless, }: python3Packages.buildPythonApplication rec { pname = "drum-machine"; - version = "1.4.0"; + version = "1.5.0"; pyproject = false; src = fetchFromGitHub { owner = "Revisto"; repo = "drum-machine"; tag = "v${version}"; - hash = "sha256-5NzbjPzmrsF/xKLBwQ4MDPxz6OjBHioO7vcLMzMhidA="; + hash = "sha256-F3h3BxLNkJq0jpfNOGcTbckpc8CksyA3Bc8GNKviB+I="; }; strictDeps = true; @@ -47,11 +48,15 @@ python3Packages.buildPythonApplication rec { mido pygame pygobject3 + numpy ]; dontWrapGApps = true; - makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ]; + makeWrapperArgs = [ + "\${gappsWrapperArgs[@]}" + "--prefix PATH : ${lib.makeBinPath [ ffmpeg-headless ]}" + ]; # NOTE: `postCheck` is intentionally not used here, as the entire checkPhase # is skipped by `buildPythonApplication` diff --git a/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json b/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json index 05a174b9a69d..46132950465b 100644 --- a/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json +++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json @@ -37,16 +37,16 @@ "jar": "sha256-a9QQVOJuuuiLDaWNxj7BEKcO+tXxLYcESTRwx8VJcZA=", "pom": "sha256-uFQ5wq04pYG40n+nWy+zC3HN4dT8A8ZE4yMvhN8kWqE=" }, - "io/freefair/gradle#lombok-plugin/9.0.0": { - "jar": "sha256-ztdLsqK5Eze6lAo1h7uXFujWXlUp49JEqlo8cOXED7Q=", - "module": "sha256-9FXPosuixaovzcBl0zcaRAKsxf/Jlfrq67a3IrQLd0Q=", - "pom": "sha256-Wx4uVjwtS7zUTDZNBfTQEV63SCsI/VA2NeyNfEW0Knk=" + "io/freefair/gradle#lombok-plugin/9.1.0": { + "jar": "sha256-m+M3IZ1CTu2TzqYzUaTAeBOFGaZ9hDP6/kgx3nttM/U=", + "module": "sha256-HjFAU3xu8TjyledDzt+GbL/i01S1gVvv5zFY2dzb30c=", + "pom": "sha256-b92sn7rJGFCpFNLpQ8QfslFO8g/WPS4m2YXxCLcKV20=" }, "io/freefair/jsass-java#io.freefair.jsass-java.gradle.plugin/6.5.0.2": { "pom": "sha256-hoEYwHzaHj3q/o0bF3HzOgyN0lEIEAu/pjFl3hzTvmg=" }, - "io/freefair/lombok#io.freefair.lombok.gradle.plugin/9.0.0": { - "pom": "sha256-s5rb7ywLx0jun0EFww8MhaElzsdorWrNDp+UKogG2w8=" + "io/freefair/lombok#io.freefair.lombok.gradle.plugin/9.1.0": { + "pom": "sha256-5CID94FoZkqCjhKblgYpII3eiII0ZncbJQ9cpna38aw=" }, "jakarta/platform#jakarta.jakartaee-bom/9.1.0": { "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ=" @@ -54,24 +54,24 @@ "jakarta/platform#jakartaee-api-parent/9.1.0": { "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA=" }, - "net/jsign#jsign-core/7.3": { - "jar": "sha256-bA9oYq6wsr2CyLAQI1/9kyg5InyW23aKyPsXhHkC9XA=", - "pom": "sha256-iBAcWvZMjJl+0DIQwLyFGLjInvcF0bKM5E49qse5F34=" + "net/jsign#jsign-core/7.4": { + "jar": "sha256-bf6U0PcZxNCuTZzoR7dIW1TUeHtvQ6ovY3lBzR4TmGk=", + "pom": "sha256-WDsKWZ10uJHibbchjHSZ7o6PMm7CEPUXdN0PS92sDTk=" }, - "net/jsign#jsign-crypto/7.3": { - "jar": "sha256-slHwB5e/C8I1QbLxK8q3/relDaudPFAFHIPtIk2ZiRo=", - "pom": "sha256-ewX0NDiexnCXAihAy7CBudcRK9n4xlUYdS20NSEAN6s=" + "net/jsign#jsign-crypto/7.4": { + "jar": "sha256-sTS75bQHGVwZIA+RCO88aT62stXmKsKjggOpJHX8HpY=", + "pom": "sha256-t+xxp4WbTBeaVOwnegX3Nyec8ZO5QcPX9QM3goWAgKY=" }, - "net/jsign#jsign-gradle-plugin/7.3": { - "jar": "sha256-hIO6LPpch+KPHBOAvReuXeGTU4Ogz4gdZ3Lb9v+P0R4=", - "module": "sha256-HZbhMlaO0Uhz0JHItnQ+4kL3q+79Ky0BCEJ/zXOAeY8=", - "pom": "sha256-QnV3M85vh7bSorpuyXrb0NZrJzua/Dw7KN4+txkF9Ac=" + "net/jsign#jsign-gradle-plugin/7.4": { + "jar": "sha256-JKdMYjCtPEgyaZQHyMqZQSizBsHSZY0aHsngSPq37RQ=", + "module": "sha256-El+LVF/u2qemFTEphwzSkNcBx+JyRokCCvgrjWKKwlg=", + "pom": "sha256-2g8IU78n3zOBNwV2SmVnQutvKkqfnrV8XbZ2HRirekI=" }, - "net/jsign#jsign-parent/7.3": { - "pom": "sha256-nI9hwRHaJ0oG5ImYa76vDGTOpYY+6vYNvVO+ugov0yg=" + "net/jsign#jsign-parent/7.4": { + "pom": "sha256-IJvf8v7lzdJp+GjKSRyxXuy7VnSnATqfpnsY7xEyiQg=" }, - "net/jsign#net.jsign.gradle.plugin/7.3": { - "pom": "sha256-1iba9d1D6mjxyJIpjy4Qpegv5jV/DLiQ2P3pb/p9a2c=" + "net/jsign#net.jsign.gradle.plugin/7.4": { + "pom": "sha256-/5WYYDWxSD/eKJvWKcvCT36NSuwTJdLLj1LyR1wxm1s=" }, "net/rdrei/android/buildtimetracker#net.rdrei.android.buildtimetracker.gradle.plugin/0.11.0": { "pom": "sha256-SbQtvX9N5DU8ntUmpcpTtrTdDhla7rQR7L213fZ6kG8=" @@ -145,17 +145,17 @@ "org/beryx/jlink#org.beryx.jlink.gradle.plugin/3.1.3": { "pom": "sha256-S9pQnIlx/bxI4ceXuEnuT8tqEMwnOAGzrlSVGEGsSH4=" }, - "org/bouncycastle#bcpkix-lts8on/2.73.8": { - "jar": "sha256-AgtkzuQZ0CaKLCKnTeTU1xWufs5X9RrFlLXsBpX5HEM=", - "pom": "sha256-OAjGyOTwGH32Y2sw8Vpf4eu7ZiHhiwNjLmyQbGgQ1g8=" + "org/bouncycastle#bcpkix-lts8on/2.73.9": { + "jar": "sha256-1bYV5Zh7H5lqiMTUcSc0hyYyeaQoJqoQ+v1qZyrBW4A=", + "pom": "sha256-FpQYr4RlBCUQP1NeRw7TvwPIhFSXFK9MNwvjg/POszs=" }, - "org/bouncycastle#bcprov-lts8on/2.73.8": { - "jar": "sha256-SSBJuSj4uqtTWvAYW7q4c00U4cdkiuKiA31YSGyvtnY=", - "pom": "sha256-6PCmhF6WFe84gsLRU+ODBMGPpssc4+dC6O2Z+5dnOYs=" + "org/bouncycastle#bcprov-lts8on/2.73.9": { + "jar": "sha256-zhHM/GFAa2G3DM7+p0TOcpz3I7Q7QOCDFmcBx0SwywQ=", + "pom": "sha256-pzAXw+cnYSFON7/hG8MTFVrz8Wkt2lRJoK7S6Xl2C/s=" }, - "org/bouncycastle#bcutil-lts8on/2.73.8": { - "jar": "sha256-6e94GRbugMR9GTYV2oXHvf7baNDeStqHEpPlDVgBWvc=", - "pom": "sha256-LDElCcPBJdLgHviCmBxFFuq+dgozRleHz7cVi+UbTLQ=" + "org/bouncycastle#bcutil-lts8on/2.73.9": { + "jar": "sha256-R8CyRfHYlX2/nCYLtjAABwX8qfxxfJjwl+Kkidvj3rk=", + "pom": "sha256-ozcJh3DKusOS8aMIsHboTgj91DgIWLmWpHIBSFBxHjk=" }, "org/eclipse/ee4j#project/1.0.7": { "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" @@ -240,8 +240,8 @@ "com/fasterxml/jackson#jackson-base/2.17.2": { "pom": "sha256-fPnFn70UyQVnRxN7kNcKleh3YN/huCRWufAjF9W1b68=" }, - "com/fasterxml/jackson#jackson-base/2.20.0": { - "pom": "sha256-/IgCjRnuqjftpZbmuY03SfIs/IrdGeoZdFq+g2iDzmY=" + "com/fasterxml/jackson#jackson-base/2.20.1": { + "pom": "sha256-C3SKsMx/KH21tgGMYUz+Z+fh9NgJQc4vQdMXzMO1tcU=" }, "com/fasterxml/jackson#jackson-bom/2.17.2": { "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI=" @@ -249,8 +249,8 @@ "com/fasterxml/jackson#jackson-bom/2.19.1": { "pom": "sha256-um1o7qs6HME6d6it4hl/+aMqoc/+rHKEfUm63YLhuc4=" }, - "com/fasterxml/jackson#jackson-bom/2.20.0": { - "pom": "sha256-9ig2R+cB/aHNMS3MIcsTKkD3mPGejkL6/D/jR8WlG7s=" + "com/fasterxml/jackson#jackson-bom/2.20.1": { + "pom": "sha256-DGRn7UyMc5JSTOcDymzj7YhZbuw5DxOwwmTy+WEwilQ=" }, "com/fasterxml/jackson#jackson-bom/2.9.4": { "pom": "sha256-ez/Ek1+/U/x5ypo75e1NLIL8pMU/hF0+EzgpMTic4CE=" @@ -282,20 +282,20 @@ "module": "sha256-OCgvt1xzPSOV3TTcC1nsy7Q6p8wxohomFrqqivy38jY=", "pom": "sha256-F4IeGYjoMnB6tHGvGjBvSl7lATTyLY0nF7WNqFnrNbs=" }, - "com/fasterxml/jackson/core#jackson-core/2.20.0": { - "jar": "sha256-vAz0YHWHcgH4QG7n3idBrn32wGb18EV72AYypxjAbnI=", - "module": "sha256-2oWNOW9/pritA4zVzLkDj7ORq3o2rmKWI+N6UyR537w=", - "pom": "sha256-XxZVisIjBzpvJHRA8wX1nwXv9QqvHurguq1BKAABb2g=" + "com/fasterxml/jackson/core#jackson-core/2.20.1": { + "jar": "sha256-/6tNlX2qJ5bPJMtm0LeKcJDxvL4Xw6RXjwmv+q8TcIk=", + "module": "sha256-GalAQ0Ic2ahuFUkSnDjBjgs1exQUWuT3Ns2gL4Bch8k=", + "pom": "sha256-FuBJqySPgqpssEjwTVLvPuH1TIDaHSY68k++UM9ueX4=" }, "com/fasterxml/jackson/core#jackson-databind/2.17.2": { "jar": "sha256-wEmT8zwPhFNCZTeE8U84Nz0AUoDmNZ21+AhwHPrnPAw=", "module": "sha256-9HC96JRNV9axUMqov1O7mCqZ6x1lkecxr8uXKrPddx8=", "pom": "sha256-0kUGmLrpC+M48rmfrtppTNRQrbUhJCE+elO0Ehm1QGI=" }, - "com/fasterxml/jackson/core#jackson-databind/2.20.0": { - "jar": "sha256-pw4Uamvyy6T5zTZxaXh/UK3Pu1cSK8LpyDkM0LOXrDA=", - "module": "sha256-oSgvNhZKyQG66p7bULqYE3L/7hjCz7F75CW5s/dYeuI=", - "pom": "sha256-zv7+0B3SwNlqiOEBuz4GX8FQBjtJjjAak4xpCwK8884=" + "com/fasterxml/jackson/core#jackson-databind/2.20.1": { + "jar": "sha256-NLvrRSb/9PhWWxIQa/haavy66FiWbUibVCFKxGsuJug=", + "module": "sha256-S1M7Mu5wZfVaSnsNbuTYn9WDdxSr83YUyJkRT7EhWHo=", + "pom": "sha256-vP3yeCUyMraDq1HeLcvI+Y8g9Hc4wRHs/SyFxBsTHOw=" }, "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.17.2": { "jar": "sha256-lBvNixOBuzsNcm+rQWJPqOzg7nts8oYK2V6BV85nM3Y=", @@ -305,18 +305,18 @@ "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.17.2": { "pom": "sha256-5pgyMzCpqCySDlqJtlsPciXI5zPBIqGPeWoEpuMfpcs=" }, - "com/fasterxml/jackson/datatype#jackson-datatype-jdk8/2.20.0": { - "jar": "sha256-Pq6dtKTruBwzBnq2aDobEpZzF5V/QzxdzsKoWSN8SHc=", - "module": "sha256-2gH0D0MTgHgHN4crpPKPY9nySFLjLWXg+kJPtY2KFgI=", - "pom": "sha256-n2YSsgn9bSeizmJPneGWtK/jQuakfx1OeXDG23fwmXk=" + "com/fasterxml/jackson/datatype#jackson-datatype-jdk8/2.20.1": { + "jar": "sha256-aCHN1pXpXE5oU+yFWnQyxx8vS+MYs8oZD7v4ouX5gfI=", + "module": "sha256-KXw0AzOai9ZZgmabTXxIKUkIh6XmGpOkwp8fQLxaDvc=", + "pom": "sha256-8wD9EAzEe+2gwdEzUYBk7JUxTro0Gx/ZF4wCFYC5HJ4=" }, - "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.20.0": { - "jar": "sha256-jDIVWXWpNbH3v9Z3ZHvVyM3uErFEuE5EkqRHteoulNU=", - "module": "sha256-GLsOOniabs0DmHNhBUEU3jf6hrB98wzeKuEO2L3LFgw=", - "pom": "sha256-DPgn58+QwbLF/C2PIXWgKO5ylG1rWN4YL7/ZDlTO1Zk=" + "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.20.1": { + "jar": "sha256-aSvoPH4u67U7mVwR2BPGA6fXFtYMnS1PuUhuyxBfkpE=", + "module": "sha256-Ym4ePGc34Ie1v0UXrorr1pQ1ChBIdvtHSmJ3h+HEq0Y=", + "pom": "sha256-8V/WLrJEdrAKsf93IPALFmtpc+YobRRwi7hmEuv5I9Q=" }, - "com/fasterxml/jackson/module#jackson-modules-java8/2.20.0": { - "pom": "sha256-jhXY4aWgLsdHIj8j4OSkmv5vZVUERDysO47pkvqWxSU=" + "com/fasterxml/jackson/module#jackson-modules-java8/2.20.1": { + "pom": "sha256-ARd18sV1jwGRus7bTlFDj6/crz2rJUi/xLfXlaRUNg0=" }, "com/github/jai-imageio#jai-imageio-core/1.4.0": { "jar": "sha256-itPGjp7/+xCsh/+LxYmt9ksEpynFGUwHnv0GQ2B/1yo=", @@ -424,9 +424,9 @@ "jar": "sha256-SqTKSPPf0wt4Igt4gdjLk+rECT7JQ2G2vvqUh5mKVQs=", "pom": "sha256-SEqTn/9TELjLXGuQKcLc8VXT+TuLjWKF8/VrsroJ/Ek=" }, - "commons-io#commons-io/2.20.0": { - "jar": "sha256-35C7oP48tYa38WTnj+j49No/LdXCf6ZF+IgQDMwl3XI=", - "pom": "sha256-vb34EHLBkO6aixgaXFj1vZF6dQ+xOiVt679T9dvTOio=" + "commons-io#commons-io/2.21.0": { + "jar": "sha256-fWQ6Kv6osFi3YqpvuQ5bJW9scpc5+LN4TDNw3cYJ6I0=", + "pom": "sha256-rkd5XnIYA+yP8d7tdL4oqBGgJxO9WjqwrGfCtYy2Nas=" }, "commons-io#commons-io/2.4": { "pom": "sha256-srXdRs+Zj6Ym62+KHBFPYWfI05JpQWTmJTPliY6bMfI=" @@ -467,16 +467,16 @@ "module": "sha256-iNmRuo7VjChtey18CPn2Mg/5novWYXPDaDkhAEb8f2I=", "pom": "sha256-oYHFieNi4sRp6IRc/PIKFaiQ9ISUoPny4T9ZSglq0Kk=" }, - "io/freefair/gradle#lombok-plugin/9.0.0": { - "jar": "sha256-ztdLsqK5Eze6lAo1h7uXFujWXlUp49JEqlo8cOXED7Q=", - "module": "sha256-9FXPosuixaovzcBl0zcaRAKsxf/Jlfrq67a3IrQLd0Q=", - "pom": "sha256-Wx4uVjwtS7zUTDZNBfTQEV63SCsI/VA2NeyNfEW0Knk=" + "io/freefair/gradle#lombok-plugin/9.1.0": { + "jar": "sha256-m+M3IZ1CTu2TzqYzUaTAeBOFGaZ9hDP6/kgx3nttM/U=", + "module": "sha256-HjFAU3xu8TjyledDzt+GbL/i01S1gVvv5zFY2dzb30c=", + "pom": "sha256-b92sn7rJGFCpFNLpQ8QfslFO8g/WPS4m2YXxCLcKV20=" }, "io/freefair/jsass-java#io.freefair.jsass-java.gradle.plugin/6.5.0.2": { "pom": "sha256-1C1ePfUKHTe6qhRrpb0ai7I5YZksPt9Fw6M5zqCTLd8=" }, - "io/freefair/lombok#io.freefair.lombok.gradle.plugin/9.0.0": { - "pom": "sha256-xWt36BjHjUZoXWbQ/2UJ85G5KE3+hrueEnARHrwBJYI=" + "io/freefair/lombok#io.freefair.lombok.gradle.plugin/9.1.0": { + "pom": "sha256-tpgzWerNrHsvyVyytKMu0Hi4szrLLhwSUXIko57oWoA=" }, "io/github/classgraph#classgraph/4.8.184": { "jar": "sha256-blZOKc7JWjkiaKYJ8JBx1WGZOD2QascOkXU6eZjRo+g=", @@ -505,10 +505,10 @@ "module": "sha256-2jn02k/u133+ELmAnVyysvO0Ra6nG2nhUjKkJpiThzs=", "pom": "sha256-chJrr7gKEse1WFJNCRkj5pYSODxHQay34Aw1ybBUazQ=" }, - "io/sentry#sentry/8.23.0": { - "jar": "sha256-qbL8cx7DCXkJ/pOOb6f9F3spGNIwsbPXt1j115CNUFk=", - "module": "sha256-WLKcCwmvgkJJ3XEihti2Q4hrLql1wX4NPfcMcoFt2EI=", - "pom": "sha256-wWqaLKt1YvEdl9DEdmBJAWFmzPEvanTKmzp93YvPEY4=" + "io/sentry#sentry/8.25.0": { + "jar": "sha256-UDhcOKUbPLNflsG7TgE5AHE9bhMcAYGUSVAXotmqYj8=", + "module": "sha256-+blsoZ7yK3Y+DZVazG9dURUrLGpiINAk43loTfgMM8A=", + "pom": "sha256-KdIuXH5APQk8ALJ2PbyNnTrXVxCvbWAmPSrJv7pDg0g=" }, "jakarta/json/bind#jakarta.json.bind-api/2.0.0": { "jar": "sha256-peYGtYiLQStIkHrWiLNN/k4wroGJxvJ8wEkbjzwDYoc=", @@ -675,6 +675,9 @@ "org/apache/commons#commons-parent/85": { "pom": "sha256-0Yn/LAAn6Wu2XTHm8iftKvlmFps2rx6XPdW6CJJtx7U=" }, + "org/apache/commons#commons-parent/91": { + "pom": "sha256-0vi2/UgAtqrxIPWjgibV+dX8bbg3r5ni+bMwZ4aLmHI=" + }, "org/apache/commons#commons-text/1.12.0": { "jar": "sha256-3gIyV/8WYESla9GqkSToQ80F2sWAbMcFqTEfNVbVoV8=", "pom": "sha256-stQ0HJIZgcs11VcPT8lzKgijSxUo3uhMBQfH8nGaM08=" @@ -844,75 +847,75 @@ "module": "sha256-6Vkoj94bGwUNm8CC/HhniRKNpdKFMJFGj8pQQQS99AA=", "pom": "sha256-16CKmbJQLwu2jNTh+YTwv2kySqogi9D3M2bAP8NUikI=" }, - "org/junit#junit-bom/5.14.0": { - "module": "sha256-etPdstdOanfWWuiaykXUaMl7+ZFba8UvRJ1nXk5vmzU=", - "pom": "sha256-9apHs2ZIPo0fm+8Q5noMZvZq/A8zHJ+WaxMQutYND28=" + "org/junit#junit-bom/5.14.1": { + "module": "sha256-J4rLEczJmYaUIkOG+W+0lBoi7bQstEbJLg8fMwFLa0g=", + "pom": "sha256-AbAd+jZlULQKxXYFSKfXKLYQnRfEUeg4ZNHl4M6GLJQ=" }, - "org/junit#junit-bom/6.0.0": { - "module": "sha256-R98chw1F2mEXtKYNzAYhRmrD332s6I2aL5TXhAYkbkU=", - "pom": "sha256-s9mDL1wRu7aw5ihRuTqinSeMOfsadR63cbRtAEohYhk=" + "org/junit#junit-bom/6.0.1": { + "module": "sha256-xI2Y9e3P2cVeefrLugEB98G6CIY0ib6EqRYrmaGG0cI=", + "pom": "sha256-4xXFzLsIchbc4ErnDDK/F2K+KguKQ++B47p4MXpM1cg=" }, - "org/junit/jupiter#junit-jupiter-api/6.0.0": { - "jar": "sha256-iNaQ0tNzzWYXB3DDF5dxls6eRl8jiJMPS8lmXohzhfY=", - "module": "sha256-ulAS9rG1AydsxsokGUPC2bJuJFkCXowg3VjsMeumcXU=", - "pom": "sha256-rNeSzwaDpEvqadPP/uujfRm5kAwdnogijjKfJsRBNQM=" + "org/junit/jupiter#junit-jupiter-api/6.0.1": { + "jar": "sha256-o8qMflZ0Ngk+SmcD1dSqwC2+o2EG6jL9E2e1beINTgI=", + "module": "sha256-zK14mBan6wSIQ0ad+9pkHonhhJ5juCSS8kvGCzBQu5s=", + "pom": "sha256-NjNXApnLjlv8KBYedmHSEfODqx4QndQNBWbGr6FDlxo=" }, - "org/junit/jupiter#junit-jupiter-engine/6.0.0": { - "jar": "sha256-j6HWw32ymm70cYO0mFHudnbwj9exwntozPOk5XzgL0g=", - "module": "sha256-/BOeA32ssQfRpQ6FVVg2h0+pwgKIwx17a86To9PoUEw=", - "pom": "sha256-qzyiIIkCJq8xuRVzeT+n8APHqBdSuskFZx3Krum5fXM=" + "org/junit/jupiter#junit-jupiter-engine/6.0.1": { + "jar": "sha256-dHalb0qqtX/C9FmEfNa/txKzvQSprAuJ7ZVz963CxVA=", + "module": "sha256-DNBLxyt1p94NOMErkbE3PcQ3OgP+Iv/3oV6MvRyfXfk=", + "pom": "sha256-w0n6QNgPtJ/b+0TyYlR2zSa4vpWQQP+or4in/bHiSPY=" }, - "org/junit/jupiter#junit-jupiter-params/6.0.0": { - "jar": "sha256-IIR+RcVT1R45JEbgM1UGnxOP4MUekdfvG9v/wNOvBFQ=", - "module": "sha256-VfWJwqiUZt40HEAL8AzdGihwp+bc1oUL2tcyLbONc7c=", - "pom": "sha256-91zeM8lEa0XsSlqaKC3LWyv7dj1KMKshv8+EgqZg5UI=" + "org/junit/jupiter#junit-jupiter-params/6.0.1": { + "jar": "sha256-lWbiSbTUx9U6bIkI9XeIXOLUxjE8kWvfv3/7xSa4o28=", + "module": "sha256-p9p+0ICwGl76I7bWB/qxxmMhEYc0EXoaVkde/DU7HMA=", + "pom": "sha256-sfUTKYkKt1oPR+kBQNZOJf6z57dM5KEHRZg9YViQbnM=" }, - "org/junit/jupiter#junit-jupiter/6.0.0": { - "jar": "sha256-jb8LIX4usBPWU9kW/BBgkklrfMrI8IQyiYHlXjZzrnE=", - "module": "sha256-YdlnTuitkcdk2IbQzTFjO1up967ad6okIPglNaJVXOE=", - "pom": "sha256-9j4gTo0IDEzis05lnzGVzHHYpKZrcyqAW5pv0rjyVrs=" + "org/junit/jupiter#junit-jupiter/6.0.1": { + "jar": "sha256-vXrygd/vjcwdCKUDzpMEWXtl4YUKDbgsmattjLEDGxQ=", + "module": "sha256-iuvBy0oYWd7uRjDJq3S2/KKMAdpl0h6Z7XgEp7ibGMo=", + "pom": "sha256-VICrz2YRG4YweP/+OFMKTcrtJoK9gCtO2VBdrzVleTM=" }, - "org/junit/platform#junit-platform-commons/1.14.0": { - "module": "sha256-Kwq1YmEUumwASZEJ6MOJoXy6XhP7+BEExBjoY3UNSLw=", - "pom": "sha256-Ed3u4UN656ybNGhLDophehZaIKobIjyk0YM3ZMxwZJI=" + "org/junit/platform#junit-platform-commons/1.14.1": { + "module": "sha256-SuQSly6ZIp5QFsuYmrio5gGHRdA4kM7DfcBAr4f0dIA=", + "pom": "sha256-AFNyKBaiOCD49xkGajg8/6LbksfbUhEok8nEc790Bhg=" }, - "org/junit/platform#junit-platform-commons/6.0.0": { - "jar": "sha256-huj6+H8xUaPVRYUIUqDyzFXqiiQ07ungj4OIHFLVWZI=", - "module": "sha256-oNE82wfx2950q74HZmT/XcQEOtXRO/+UD3i55gTyElE=", - "pom": "sha256-lDFdk3FOzUB6kg2TOcj0S0DPCEBBMWMu1/m3dwzxCgU=" + "org/junit/platform#junit-platform-commons/6.0.1": { + "jar": "sha256-+IU/RcEPOA3bFXz0KrupsHNHTwXMQDNbWFBV+FU43K0=", + "module": "sha256-mS8uNl3Y24i+YC+eXFwI+B/USwxbj6HPFzTzb8fh8f0=", + "pom": "sha256-E6l3Y7CJ0P0kyrrGE/d5pyEmm+5VHz5cHbr+mhzQ6tI=" }, - "org/junit/platform#junit-platform-engine/6.0.0": { - "jar": "sha256-b4GELpwT6ZfKxmtEYUUi82OUGeI4iuLQAMS8CmuS2T8=", - "module": "sha256-GcijGiINhY0hWr20mfYjuLxy/ig3jMBABI0ymTCliSE=", - "pom": "sha256-TD7A1PapQGLOgr3kLuvtHya5m7XLHWl24VmPzF+KSS0=" + "org/junit/platform#junit-platform-engine/6.0.1": { + "jar": "sha256-9JV3Bzp64YTHGNm0OuDY7cuKv8Wsc4c17jM51GUukr8=", + "module": "sha256-2aXeq5puUhW79Aw5/+2pCwZXdPjNAY5Xuyod7OI0VKQ=", + "pom": "sha256-oiRe8nBlLAfVls5x2NZw0KipklHNzvRU85ZRmaycTpo=" }, - "org/junit/platform#junit-platform-launcher/1.14.0": { - "module": "sha256-pJlI15aokT/22Jl1ITnUl2YxQ7AS3fgEqxzlMuC/1zw=", - "pom": "sha256-q41bLHzlSaDJEsG9E7yNV0dYOcLneiLlb4DxniPcdQI=" + "org/junit/platform#junit-platform-launcher/1.14.1": { + "module": "sha256-eI2j5KuAQTvLYylRt/cNtrhRrynQskIowFIcKue1cAI=", + "pom": "sha256-5AYKI9RxXTF6it+vKcZC1O+pgxhANROv0u7pklwAJYs=" }, - "org/junit/platform#junit-platform-launcher/6.0.0": { - "jar": "sha256-Xwl7AMZxS7cez7XexitZu0wveJdj+v0ezpbE7w5sKA8=", - "module": "sha256-/OwWMsXFlyf/nn6jCKmTh9ci/6iC2FzKUFKv7Iw47ug=", - "pom": "sha256-RwG8mhY9lbI1zhatdt4Z8qyFTFyjT689LsThAYsIzHQ=" + "org/junit/platform#junit-platform-launcher/6.0.1": { + "jar": "sha256-7nWN2wb6sf0aiQwLrkqs+NwATE82fhONv/yxE80J66w=", + "module": "sha256-QGPjXSBE9xraiSUfrtFB8KWvnOwm1uO3znI889Vz29c=", + "pom": "sha256-TNsMG5Lxon57UucN6Buik1shlBgC2MqoiOnZ4V+s/ho=" }, - "org/junit/platform#junit-platform-runner/1.14.0": { - "jar": "sha256-PtsxSpMnsqcyMAAOmFCmf0CnVcj03CKLiKTGsFO0gRM=", - "module": "sha256-QBQISBtUFXXU/7SRBPdRbfexxp8Nj+pcAQwdJ92v9lU=", - "pom": "sha256-Nl+KzheLaRQi9D6bMXgpQ+6jo6sHVnDVnhP/6I0dvEk=" + "org/junit/platform#junit-platform-runner/1.14.1": { + "jar": "sha256-lkBJCI+E7XAvA3yXGXj5GvVwr2w1dAKpNrGE4WMTiqo=", + "module": "sha256-yQEOM5EEz7Oz4ZJNVu1dok1lvzwdo8GmUIQkWBYGULE=", + "pom": "sha256-VGBGz94VMjxDaNEfYV4TMtu4yb7+/Yuw5wxAH0Ns94U=" }, - "org/junit/platform#junit-platform-suite-api/1.14.0": { - "module": "sha256-tx89J31twkIWiSbi7Bh/Krxruz+hW5aoR3ep3gxL068=", - "pom": "sha256-BDhG11banrl+29u1t5momv0fhNUBleBbVfKQMZlCmaY=" + "org/junit/platform#junit-platform-suite-api/1.14.1": { + "module": "sha256-xDB1DtPJy60WXkgXwhrZmh5sWED9IAzLlfOgC/0a2Ls=", + "pom": "sha256-iD7R5UYZ/OWqR4zxZ7Wsan01xDZdjrnX7yhX5ik9csM=" }, - "org/junit/platform#junit-platform-suite-api/6.0.0": { - "jar": "sha256-JDr0KmCoOf21WE7wCKNClWOSq3UXOI/v4jx8Iqm7PsY=", - "module": "sha256-GglozfimQNCDuT9Tb78XOzVS2vcnp6RXSqrXXjLixJc=", - "pom": "sha256-r+n5I0po+iwNbxJLD8gAm0nAuWpl9nh4t+StAk505s8=" + "org/junit/platform#junit-platform-suite-api/6.0.1": { + "jar": "sha256-15YF6JCgtjxijNcVdFHtwP+U7aqPUn3+U++5sPAwArY=", + "module": "sha256-I3Y94bDaswNBerh+dUsU2zh0TSXjom7zsnElQfcsWxU=", + "pom": "sha256-XeL27RopgZ67ZzLe7MSRIiq1zQ10gGZU2Lc2xFi7RNA=" }, - "org/junit/platform#junit-platform-suite-commons/1.14.0": { - "jar": "sha256-uGgjf4yy4ZN3Xj9xK5QFyz1P+qGAV5zIOn/h9tucXME=", - "module": "sha256-2b8/TF1wJ0gCDDgzNw47kevnlo80Eq9txTKGlrSfptE=", - "pom": "sha256-9Uvj4x1RgvEvW/xo8yuE5hfQtmuazPI9kukalCJojlA=" + "org/junit/platform#junit-platform-suite-commons/1.14.1": { + "jar": "sha256-F6/3EHR5qO68p/w5C5xhHjajLH3CpQsAGJSq4jFiU0I=", + "module": "sha256-1AhdvglATvhkaS1Ee6DGGHulGobZrrwrjOascI6fWF4=", + "pom": "sha256-APg5VtK2l7LAcIj9EwqPGzJx8fDeHHNIkt2kaKnF1nk=" }, "org/leadpony/justify#justify-parent/3.1.0": { "pom": "sha256-ckfhOlVhg4gPqnP7EeWQJ7R+fG1Ghx0sUIg3WwDbJY0=" @@ -1035,9 +1038,9 @@ "jar": "sha256-j4ds4qmqTpWx8ZUpUCVRA+JIdCUFCmVPMoVEe6YBwVQ=", "pom": "sha256-dVdRq2w3oaMa+1ueSllcDdLv0rUNcDshJVuCfFDtYVM=" }, - "org/projectlombok#lombok/1.18.40": { - "jar": "sha256-t2TDobDIZ0jJ4ugNZOA9RUAs4+3rYx+oHjCla/+m2vM=", - "pom": "sha256-1nxojbairP4dHNGr2cCKgSec4IFnu6k5gG+CqijxcF8=" + "org/projectlombok#lombok/1.18.42": { + "jar": "sha256-NIik6ZlMJllrqs7r7ljK02pQ472uxb5ytYNNPDtWAwY=", + "pom": "sha256-ptIdhmGC3OpTRZNsTCOjLrTjfHO7au+oYH7hERU0Bf0=" }, "org/rauschig#jarchivelib/0.6.0": { "jar": "sha256-u/9XGPF0HRYkJreWaPJKznhTPHicnEBJtbewxTF39BQ=", diff --git a/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix index 66882f5d6de2..50d4dfba078e 100644 --- a/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix +++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "ed-odyssey-materials-helper"; - version = "3.1.2"; + version = "3.1.3"; src = fetchFromGitHub { owner = "jixxed"; repo = "ed-odyssey-materials-helper"; tag = version; - hash = "sha256-2xUMl8AqZD/v+js/QyWBD4RfV8nfCAqVr0UgWaOtBrk="; + hash = "sha256-eKQ2Hvx+IIZNvd5ZNr/V+ii8vtDkoWToqdtPDI+3glI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ev/everest-bin/package.nix b/pkgs/by-name/ev/everest-bin/package.nix index 048f564c3507..d275af864884 100644 --- a/pkgs/by-name/ev/everest-bin/package.nix +++ b/pkgs/by-name/ev/everest-bin/package.nix @@ -8,15 +8,15 @@ let pname = "everest"; - version = "5961"; + version = "5986"; phome = "$out/lib/Celeste"; in stdenvNoCC.mkDerivation { inherit pname version; src = fetchzip { - url = "https://github.com/EverestAPI/Everest/releases/download/stable-1.5961.0/main.zip"; + url = "https://github.com/EverestAPI/Everest/releases/download/stable-1.5986.0/main.zip"; extension = "zip"; - hash = "sha256-zFGBzRbFJOnJ4d8396SoLEgnicDwEqvSbOZKqWSyR+w="; + hash = "sha256-SXArDyW9AzFkomsnIxoZLqZg9OWXBZG3lKI8sBffNjU="; }; buildInputs = [ icu diff --git a/pkgs/by-name/ev/everest/package.nix b/pkgs/by-name/ev/everest/package.nix index 18e42f537766..1ae3c19ddf1f 100644 --- a/pkgs/by-name/ev/everest/package.nix +++ b/pkgs/by-name/ev/everest/package.nix @@ -11,7 +11,7 @@ let pname = "everest"; - version = "5961"; + version = "5986"; phome = "$out/lib/Celeste"; in buildDotnetModule { @@ -20,11 +20,11 @@ buildDotnetModule { src = fetchFromGitHub { owner = "EverestAPI"; repo = "Everest"; - rev = "7972286159c1f4d1f219c1101273067d45cd1161"; + rev = "33ad712541e60374c2c5e86f7ad931b96291b1bd"; fetchSubmodules = true; # TODO: use leaveDotGit = true and modify external/MonoMod in postFetch to please SourceLink # Microsoft.SourceLink.Common.targets(53,5): warning : Source control information is not available - the generated source link is empty. - hash = "sha256-GkWeOfatzw9uLWkzNzjSEM8p+HWuJPbycv/0YNxTdqk="; + hash = "sha256-BDzTA+O9tuIN89uBgcZ4Tg5cgd/YcL+6w5aQ9KkN2xA="; }; nativeBuildInputs = [ autoPatchelfHook ]; diff --git a/pkgs/by-name/fi/firewalld/package.nix b/pkgs/by-name/fi/firewalld/package.nix index fbab1684c4e8..5443f135d9d2 100644 --- a/pkgs/by-name/fi/firewalld/package.nix +++ b/pkgs/by-name/fi/firewalld/package.nix @@ -44,13 +44,13 @@ let in stdenv.mkDerivation rec { pname = "firewalld"; - version = "2.3.1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "firewalld"; repo = "firewalld"; rev = "v${version}"; - sha256 = "sha256-ONpyJJjIn5kEnkudZe4Nf67wdQgWa+2qEkT1nxRBDpI="; + sha256 = "sha256-P48qdgvcF3BQZ5h+HaylHb70ECa2bmEvYiAi9CeH0qs="; }; patches = [ diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index 7a2c9857463e..b0e10e8dfe6a 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -170,11 +170,11 @@ let linux = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "142.0.7444.134"; + version = "142.0.7444.175"; src = fetchurl { url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-exTjuvwv/W2nemvBHyliD74At7i6ZcKypT9xaVPzcAE="; + hash = "sha256-jh1xtWvntfqM894lG8nW9OS2UAaXFC8PGpTFpexuLoU="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -272,11 +272,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "142.0.7444.135"; + version = "142.0.7444.176"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/e7ds3jjlib5cryamafm2t5wjce_142.0.7444.135/GoogleChrome-142.0.7444.135.dmg"; - hash = "sha256-kU6DBUW/O/RzbQUNQiKfuu3+h4ys22mg5nF0oKBPNy8="; + url = "http://dl.google.com/release2/chrome/adwwopanah7ruvzdwqiygodsggsq_142.0.7444.176/GoogleChrome-142.0.7444.176.dmg"; + hash = "sha256-sH/oPMJOxJNKw+znU2lX7BYtSN6vfcs0CyvxOXlPoFs="; }; dontPatch = true; diff --git a/pkgs/by-name/in/intel2200BGFirmware/package.nix b/pkgs/by-name/in/intel2200BGFirmware/package.nix index f419d57819ea..6fd21c618244 100644 --- a/pkgs/by-name/in/intel2200BGFirmware/package.nix +++ b/pkgs/by-name/in/intel2200BGFirmware/package.nix @@ -24,11 +24,12 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Firmware for Intel 2200BG cards"; homepage = "https://ipw2200.sourceforge.net/firmware.php"; - license = licenses.unfreeRedistributableFirmware; - maintainers = with maintainers; [ sternenseemann ]; - platforms = platforms.linux; + license = lib.licenses.unfreeRedistributableFirmware; + maintainers = with lib.maintainers; [ sternenseemann ]; + platforms = lib.platforms.linux; + sourceProvenance = with lib.sourceTypes; [ binaryFirmware ]; }; } diff --git a/pkgs/by-name/ki/kitsas/fix-qt610-euro-arg.patch b/pkgs/by-name/ki/kitsas/fix-qt610-euro-arg.patch new file mode 100644 index 000000000000..e271649ae8f2 --- /dev/null +++ b/pkgs/by-name/ki/kitsas/fix-qt610-euro-arg.patch @@ -0,0 +1,23 @@ +diff --git a/kitsas/kirjaus/kirjauswg.cpp b/kitsas/kirjaus/kirjauswg.cpp +--- a/kitsas/kirjaus/kirjauswg.cpp ++++ b/kitsas/kirjaus/kirjauswg.cpp +@@ -499,7 +499,7 @@ void KirjausWg::paivita(bool muokattu, int virheet, const Euro &debet, const Eu + } else if( virheet & Tosite::EITASMAAPVM) { + ui->varoTeksti->setText( tr("Debet ja kredit eivät täsmää jokaisella päivämäärällä.")); + } else if( debet ) { +- ui->varoTeksti->setText( tr("Summa %L1 €").arg(debet,0,'f',2) ); ++ ui->varoTeksti->setText( tr("Summa %L1 €").arg(debet.toDouble(),0,'f',2) ); + } + + +diff --git a/kitsas/selaus/tositeselausmodel.cpp b/kitsas/selaus/tositeselausmodel.cpp +--- a/kitsas/selaus/tositeselausmodel.cpp ++++ b/kitsas/selaus/tositeselausmodel.cpp +@@ -18,6 +18,7 @@ + #include + + #include ++#include + #include + + #include "db/yhteysmodel.h" diff --git a/pkgs/by-name/ki/kitsas/package.nix b/pkgs/by-name/ki/kitsas/package.nix index f39b61eb7638..0b3c345e17d7 100644 --- a/pkgs/by-name/ki/kitsas/package.nix +++ b/pkgs/by-name/ki/kitsas/package.nix @@ -19,6 +19,11 @@ stdenv.mkDerivation rec { hash = "sha256-4FCfpUFfi+N207SEAKz8nLpVS8MxfmDwM6r6i5pyqEM="; }; + patches = [ + # Fix Qt 6.10 compatibility: QString::arg() no longer accepts Euro type directly + ./fix-qt610-euro-arg.patch + ]; + nativeBuildInputs = [ pkg-config qt6.qmake diff --git a/pkgs/by-name/li/libaacs/package.nix b/pkgs/by-name/li/libaacs/package.nix index 01eacc918a74..f9bc443d8320 100644 --- a/pkgs/by-name/li/libaacs/package.nix +++ b/pkgs/by-name/li/libaacs/package.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { mainProgram = "aacs_info"; license = licenses.lgpl21; maintainers = [ ]; - platforms = with platforms; linux; + platforms = with platforms; unix; }; } diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json index 0c5756ea6805..f7320e324ac6 100644 --- a/pkgs/by-name/mi/mirrord/manifest.json +++ b/pkgs/by-name/mi/mirrord/manifest.json @@ -1,21 +1,21 @@ { - "version": "3.172.0", + "version": "3.173.2", "assets": { "x86_64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.172.0/mirrord_linux_x86_64", - "hash": "sha256-tzI03qPT28CjSL8MFeBLeCgzZQNVth96Csoyo5hkHYw=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.173.2/mirrord_linux_x86_64", + "hash": "sha256-EO+tPHF8+Nlo2JILPRU6/DvtUHBdhfhPfL3AV+ZN8Vw=" }, "aarch64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.172.0/mirrord_linux_aarch64", - "hash": "sha256-dQTBKtryMXvsAwswDW8T8HHHZBbebE4/s96HRS6zdtM=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.173.2/mirrord_linux_aarch64", + "hash": "sha256-jJtkC6FxPV26h/FMtNt3aqoTx/t8Bx6Oq5DQe5JZvfw=" }, "aarch64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.172.0/mirrord_mac_universal", - "hash": "sha256-8VgMZI7+rhNLfVIMOuIaF6xLuakeHEd7jer2dhJ2pgM=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.173.2/mirrord_mac_universal", + "hash": "sha256-mLy6bMpvLu9evv+sTYMG6FMUAvDg8J1XCF3mjfWMMWA=" }, "x86_64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.172.0/mirrord_mac_universal", - "hash": "sha256-8VgMZI7+rhNLfVIMOuIaF6xLuakeHEd7jer2dhJ2pgM=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.173.2/mirrord_mac_universal", + "hash": "sha256-mLy6bMpvLu9evv+sTYMG6FMUAvDg8J1XCF3mjfWMMWA=" } } } diff --git a/pkgs/by-name/ni/nightfox-gtk-theme/package.nix b/pkgs/by-name/ni/nightfox-gtk-theme/package.nix index 19cb96f8b529..930b58804aff 100644 --- a/pkgs/by-name/ni/nightfox-gtk-theme/package.nix +++ b/pkgs/by-name/ni/nightfox-gtk-theme/package.nix @@ -35,14 +35,19 @@ let "yellow" "all" ]; - tweakVariantList = [ - "nord" - "carbon" - "black" - "float" - "outline" - "macos" - ]; + tweakVariantList = + map (scheme: scheme + "fox") [ + "carbon" + "dusk" + "nord" + "tera" + ] + ++ [ + "black" + "float" + "outline" + "macos" + ]; iconVariantList = [ "Duskfox" "Duskfox-Alt" diff --git a/pkgs/by-name/ra/raspberrypiWirelessFirmware/package.nix b/pkgs/by-name/ra/raspberrypiWirelessFirmware/package.nix index bfc806b782ed..466f563cc754 100644 --- a/pkgs/by-name/ra/raspberrypiWirelessFirmware/package.nix +++ b/pkgs/by-name/ra/raspberrypiWirelessFirmware/package.nix @@ -53,11 +53,12 @@ stdenvNoCC.mkDerivation { runHook postInstall ''; - meta = with lib; { + meta = { description = "Firmware for builtin Wifi/Bluetooth devices in the Raspberry Pi 3+ and Zero W"; homepage = "https://github.com/RPi-Distro/firmware-nonfree"; - license = licenses.unfreeRedistributableFirmware; - platforms = platforms.linux; - maintainers = with maintainers; [ lopsided98 ]; + license = lib.licenses.unfreeRedistributableFirmware; + maintainers = with lib.maintainers; [ lopsided98 ]; + platforms = lib.platforms.linux; + sourceProvenance = with lib.sourceTypes; [ binaryFirmware ]; }; } diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index 869dfbc265ed..e5c0845ac7ea 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -35,20 +35,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "siyuan"; - version = "3.3.6"; + version = "3.4.0"; src = fetchFromGitHub { owner = "siyuan-note"; repo = "siyuan"; rev = "v${finalAttrs.version}"; - hash = "sha256-LG6JVeP5OmC/8OcUq+a3Xj/BTNB5C4XXhp0VVE8BZ6k="; + hash = "sha256-jeAT/4MlvCxLrwsk3LhVs/mVaBRR4NhSecsYkQSY6wM="; }; kernel = buildGoModule { name = "${finalAttrs.pname}-${finalAttrs.version}-kernel"; inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/kernel"; - vendorHash = "sha256-ZUSfehCqHUZyWHHisulg4x9v+YtnoktqaLDR7SjeGQo="; + vendorHash = "sha256-9GMlwqvU3LqzTc/HWQXFZM9RgGCk2V6OAXNoWIjzL4I="; patches = [ (replaceVars ./set-pandoc-path.patch { @@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch ; fetcherVersion = 1; - hash = "sha256-uAv/KTkLy/cvVctceBFA5xwlgGeSmbutgUP39zvZIhU="; + hash = "sha256-bteZZ9sgYLLvOPSVbqm9E0Hb5x1UdWMu8DtpQHGjbPU="; }; sourceRoot = "${finalAttrs.src.name}/app"; diff --git a/pkgs/by-name/so/sof-firmware/package.nix b/pkgs/by-name/so/sof-firmware/package.nix index a9e5405b42ad..9db60c606e91 100644 --- a/pkgs/by-name/so/sof-firmware/package.nix +++ b/pkgs/by-name/so/sof-firmware/package.nix @@ -42,6 +42,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { hmenke ]; platforms = with lib.platforms; linux; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + sourceProvenance = with lib.sourceTypes; [ binaryFirmware ]; }; }) diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix index 72e70f742112..426f7f9dcddb 100644 --- a/pkgs/by-name/ta/tailscale/package.nix +++ b/pkgs/by-name/ta/tailscale/package.nix @@ -24,7 +24,7 @@ buildGoModule (finalAttrs: { pname = "tailscale"; - version = "1.90.7"; + version = "1.90.8"; outputs = [ "out" @@ -35,7 +35,7 @@ buildGoModule (finalAttrs: { owner = "tailscale"; repo = "tailscale"; tag = "v${finalAttrs.version}"; - hash = "sha256-nmVVWjPLLhYBKV755zsOdIQCBkKIOaZUWwrfZweqlCU="; + hash = "sha256-opZ0EsHGBXE+ZGUKuxu8+RH7aA9RXJ08BuHpqDuKX60="; }; vendorHash = "sha256-AUOjLomba75qfzb9Vxc0Sktyeces6hBSuOMgboWcDnE="; diff --git a/pkgs/by-name/te/tetraproc/package.nix b/pkgs/by-name/te/tetraproc/package.nix index 915954bea577..3aa5b042a571 100644 --- a/pkgs/by-name/te/tetraproc/package.nix +++ b/pkgs/by-name/te/tetraproc/package.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "tetraproc"; - version = "0.9.2"; + version = "0.10.0"; src = fetchurl { url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; - sha256 = "sha256-kRak33RuYusG6U5FOf9b9vOJUjNK3zqoLL0V/bWBJqs="; + sha256 = "sha256-rDnFyjWaFdHcEdREdIEUGK95xg1Ghpj7rADgGq5VOXw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/zd/zd1211fw/package.nix b/pkgs/by-name/zd/zd1211fw/package.nix index 632a5c60ff88..cc5a9c776ab3 100644 --- a/pkgs/by-name/zd/zd1211fw/package.nix +++ b/pkgs/by-name/zd/zd1211fw/package.nix @@ -4,12 +4,12 @@ fetchurl, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "zd1211-firmware"; version = "1.5"; src = fetchurl { - url = "mirror://sourceforge/zd1211/${pname}-${version}.tar.bz2"; + url = "mirror://sourceforge/zd1211/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; hash = "sha256-8R04ENf3KDOZf2NFhKWG3M7XGjU/llq/gQYuxDHQKxI="; }; @@ -27,5 +27,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://sourceforge.net/projects/zd1211/"; license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; + sourceProvenance = with lib.sourceTypes; [ binaryFirmware ]; }; -} +}) diff --git a/pkgs/development/compilers/ghc/9.0.2-binary.nix b/pkgs/development/compilers/ghc/9.0.2-binary.nix index 3ff091165b39..4239212f2879 100644 --- a/pkgs/development/compilers/ghc/9.0.2-binary.nix +++ b/pkgs/development/compilers/ghc/9.0.2-binary.nix @@ -524,5 +524,6 @@ stdenv.mkDerivation { # `pkgsMusl`. platforms = builtins.attrNames ghcBinDists.${distSetName}; teams = [ lib.teams.haskell ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/development/compilers/ghc/9.8.4-binary.nix b/pkgs/development/compilers/ghc/9.8.4-binary.nix index 0ef74e55f430..35f692d41eb5 100644 --- a/pkgs/development/compilers/ghc/9.8.4-binary.nix +++ b/pkgs/development/compilers/ghc/9.8.4-binary.nix @@ -474,5 +474,6 @@ stdenv.mkDerivation { platforms = builtins.attrNames ghcBinDists.${distSetName}; maintainers = lib.teams.haskell.members; broken = !(import ./common-have-ncg.nix { inherit lib stdenv version; }); + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/development/libraries/libopenshot/default.nix b/pkgs/development/libraries/libopenshot/default.nix index 2257c44aa579..841190c1fc90 100644 --- a/pkgs/development/libraries/libopenshot/default.nix +++ b/pkgs/development/libraries/libopenshot/default.nix @@ -35,6 +35,13 @@ stdenv.mkDerivation (finalAttrs: { ./0001-link-magickcore.diff ]; + postPatch = '' + # Fix FFmpeg 8.0 API compatibility (FF_PROFILE_* -> AV_PROFILE_*) + substituteInPlace src/FFmpegWriter.cpp \ + --replace-fail "FF_PROFILE_H264_BASELINE" "AV_PROFILE_H264_BASELINE" \ + --replace-fail "FF_PROFILE_H264_CONSTRAINED" "AV_PROFILE_H264_CONSTRAINED" + ''; + nativeBuildInputs = [ cmake doxygen diff --git a/pkgs/development/libraries/wayland/scanner.nix b/pkgs/development/libraries/wayland/scanner.nix index 55366ac5c16c..844092c5eab0 100644 --- a/pkgs/development/libraries/wayland/scanner.nix +++ b/pkgs/development/libraries/wayland/scanner.nix @@ -1,6 +1,7 @@ { lib, stdenv, + testers, wayland, meson, pkg-config, @@ -10,7 +11,7 @@ libxml2, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "wayland-scanner"; inherit (wayland) version src; @@ -41,10 +42,18 @@ stdenv.mkDerivation { libxml2 ]; + passthru = { + tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + versionCheck = true; + }; + }; + meta = with lib; { inherit (wayland.meta) homepage license maintainers; mainProgram = "wayland-scanner"; description = "C code generator for Wayland protocol XML files"; platforms = platforms.unix; + pkgConfigModules = [ "wayland-scanner" ]; }; -} +}) diff --git a/pkgs/development/python-modules/aiohttp-socks/default.nix b/pkgs/development/python-modules/aiohttp-socks/default.nix index 2200c9260e96..958e24e0a4ae 100644 --- a/pkgs/development/python-modules/aiohttp-socks/default.nix +++ b/pkgs/development/python-modules/aiohttp-socks/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiohttp-socks"; - version = "0.10.1"; + version = "0.10.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "aiohttp_socks"; - hash = "sha256-SfLh+AUfKIVxm+sbd+MStaJ8Pktg8LBFo4jxlNmV4Gg="; + hash = "sha256-lC18huLleUGPx6c0YQ3ZfarwBwfHRi9sz2ebIyV2eTA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-socks/default.nix b/pkgs/development/python-modules/python-socks/default.nix index 183fdd950cb5..243c23baa07b 100644 --- a/pkgs/development/python-modules/python-socks/default.nix +++ b/pkgs/development/python-modules/python-socks/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "python-socks"; - version = "2.7.2"; + version = "2.7.3"; pyproject = true; disabled = pythonOlder "3.6.2"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "romis2012"; repo = "python-socks"; tag = "v${version}"; - hash = "sha256-9RzlK8iErM94vpVLeildYjqXbRxdiVyxASCZHKd0mao="; + hash = "sha256-n+RFHFGXy6/H3KwiK2kxY9KTe7PcYDcIoAYhnv7X62A="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/zeroc-ice/default.nix b/pkgs/development/python-modules/zeroc-ice/default.nix index bab5db2297c5..d6bb679931f8 100644 --- a/pkgs/development/python-modules/zeroc-ice/default.nix +++ b/pkgs/development/python-modules/zeroc-ice/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, + pythonAtLeast, fetchPypi, setuptools, bzip2, @@ -12,6 +13,11 @@ buildPythonPackage rec { version = "3.7.10.1"; pyproject = true; + # Upstream PR: https://github.com/zeroc-ice/ice/pull/2910 + # But this hasn't been merged into the 3.7 branch, and the patch doesn't + # apply cleanly. + disabled = pythonAtLeast "3.13"; + src = fetchPypi { pname = "zeroc_ice"; inherit version; diff --git a/pkgs/servers/kanidm/1_8.nix b/pkgs/servers/kanidm/1_8.nix index 3a15eab524eb..aaeeb0fee177 100644 --- a/pkgs/servers/kanidm/1_8.nix +++ b/pkgs/servers/kanidm/1_8.nix @@ -1,5 +1,5 @@ import ./generic.nix { - version = "1.8.0"; - hash = "sha256-KDXiveeAIsWJLJWhqSUBJjd6bDnww046XKd+iXrWJO0="; - cargoHash = "sha256-UDEOXOjfLTEd9j5ey+lbIAS1bAm+JgzIN9LTbYfHdB8="; + version = "1.8.1"; + hash = "sha256-IOAIt1fwpLdYlcmwvLDxtd+XnhVwGQVFh7vibfbSjPE="; + cargoHash = "sha256-skNYdWLqv8pg13LgbMdM217i9Ci4OBa+/niAcUNVVZk="; } diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index dfce039d8bb1..139c0fdb9e73 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -2,7 +2,9 @@ bash, bison, buildGoModule, + cargo, cmake, + corrosion, cups, curl, dlib, @@ -35,6 +37,8 @@ pkg-config, protobuf, replaceVars, + rustc, + rustPlatform, snappy, stdenv, systemd, @@ -53,282 +57,303 @@ withNdsudo ? false, withNetfilter ? stdenv.hostPlatform.isLinux, withNetworkViewer ? stdenv.hostPlatform.isLinux, + withOtel ? true, withSsl ? true, withSystemdJournal ? stdenv.hostPlatform.isLinux, withSystemdUnits ? stdenv.hostPlatform.isLinux, }: -stdenv.mkDerivation (finalAttrs: { - version = "2.6.3"; - pname = "netdata"; +stdenv.mkDerivation ( + finalAttrs: + { + pname = "netdata"; + version = "2.8.0"; - src = fetchFromGitHub { - owner = "netdata"; - repo = "netdata"; - rev = "v${finalAttrs.version}"; - hash = "sha256-J6QHeukhtHHLx92NGtoOmPwq6gvL9eyVYBQiDD1cEDk="; - fetchSubmodules = true; - }; + src = fetchFromGitHub { + owner = "netdata"; + repo = "netdata"; + rev = "v${finalAttrs.version}"; + hash = "sha256-QV9h+TMAuRCkYFr8KMOPhWq5fEnKpmA/HxQ8fV/jKBI="; + fetchSubmodules = true; + }; - strictDeps = true; + strictDeps = true; - nativeBuildInputs = [ - bison - cmake - flex - go - makeWrapper - ninja - pkg-config - ] - ++ lib.optionals withCups [ cups.dev ]; - - # bash is only used to rewrite shebangs - buildInputs = [ - bash - curl - jemalloc - json_c - libuv - libyaml - lz4 - protobuf - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libossp_uuid - ] - - ++ lib.optionals (stdenv.hostPlatform.isLinux) [ - libcap - libuuid - lm_sensors - ] - ++ lib.optionals withConnPrometheus [ snappy ] - ++ lib.optionals withConnPubSub [ - google-cloud-cpp - grpc - ] - ++ lib.optionals withCups [ cups ] - ++ lib.optionals withEbpf [ - libbpf - libelf - ] - ++ lib.optionals withIpmi [ freeipmi ] - ++ lib.optionals withLibbacktrace [ libbacktrace ] - ++ lib.optionals withNetfilter [ - libmnl - libnetfilter_acct - ] - ++ lib.optionals withSsl [ openssl ] - ++ lib.optionals withSystemdJournal [ systemd ] - ++ lib.optionals withSystemdUnits [ systemd ]; - - patches = [ - # Allow ndsudo to use non-hardcoded `PATH` - # See https://github.com/netdata/netdata/pull/17377#issuecomment-2183017868 - # https://github.com/netdata/netdata/security/advisories/GHSA-pmhq-4cxq-wj93 - ./ndsudo-fix-path.patch - - ./use-local-libbacktrace.patch - ] - ++ lib.optional withCloudUi ( - replaceVars ./dashboard-v3-add.patch { - # FIXME web.archive.org link can be replace once https://github.com/netdata/netdata-cloud/issues/1081 resolved - # last update 04/01/2025 04:45:14 - dashboardTarball = fetchurl { - url = "https://web.archive.org/web/20250401044514/https://app.netdata.cloud/agent.tar.gz"; - hash = "sha256-NtmM1I3VrvFErMoBl+w63Nt0DzOOsaB98cxE/axm8mE="; - }; - } - ); - - # Guard against unused build-time development inputs in closure. Without - # the ./skip-CONFIGURE_COMMAND.patch patch the closure retains inputs up - # to bootstrap tools: - # https://github.com/NixOS/nixpkgs/pull/175719 - # We pick zlib.dev as a simple canary package with pkg-config input. - disallowedReferences = lib.optional (!withDebug) zlib.dev; - - donStrip = withDebug || withLibbacktrace; - env.NIX_CFLAGS_COMPILE = lib.optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; - - postInstall = '' - # Relocate one folder above. - mv $out/usr/* $out/ - '' - + lib.optionalString (stdenv.hostPlatform.isLinux) '' - # rename this plugin so netdata will look for setuid wrapper - mv $out/libexec/netdata/plugins.d/apps.plugin \ - $out/libexec/netdata/plugins.d/apps.plugin.org - mv $out/libexec/netdata/plugins.d/cgroup-network \ - $out/libexec/netdata/plugins.d/cgroup-network.org - mv $out/libexec/netdata/plugins.d/perf.plugin \ - $out/libexec/netdata/plugins.d/perf.plugin.org - mv $out/libexec/netdata/plugins.d/slabinfo.plugin \ - $out/libexec/netdata/plugins.d/slabinfo.plugin.org - mv $out/libexec/netdata/plugins.d/debugfs.plugin \ - $out/libexec/netdata/plugins.d/debugfs.plugin.org - ${lib.optionalString withIpmi '' - mv $out/libexec/netdata/plugins.d/freeipmi.plugin \ - $out/libexec/netdata/plugins.d/freeipmi.plugin.org - ''} - ${lib.optionalString withNdsudo '' - mv $out/libexec/netdata/plugins.d/ndsudo \ - $out/libexec/netdata/plugins.d/ndsudo.org - - ln -s /var/lib/netdata/ndsudo/ndsudo $out/libexec/netdata/plugins.d/ndsudo - ''} - ${lib.optionalString withNetworkViewer '' - mv $out/libexec/netdata/plugins.d/network-viewer.plugin \ - $out/libexec/netdata/plugins.d/network-viewer.plugin.org - ''} - ${lib.optionalString withSystemdJournal '' - mv $out/libexec/netdata/plugins.d/systemd-journal.plugin \ - $out/libexec/netdata/plugins.d/systemd-journal.plugin.org - ''} - ${lib.optionalString withSystemdUnits '' - mv $out/libexec/netdata/plugins.d/systemd-units.plugin \ - $out/libexec/netdata/plugins.d/systemd-units.plugin.org - ''} - ''; - - preConfigure = '' - export GOCACHE=$TMPDIR/go-cache - export GOPATH=$TMPDIR/go - export GOSUMDB=off - - substituteInPlace packaging/cmake/Modules/NetdataGoTools.cmake \ - --replace-fail \ - 'GOPROXY=https://proxy.golang.org' \ - 'GOPROXY=file://${finalAttrs.passthru.netdata-go-modules},file://${finalAttrs.passthru.nd-mcp}' - - # Prevent the path to be caught into the Nix store path. - substituteInPlace CMakeLists.txt \ - --replace-fail 'set(CACHE_DIR "''${NETDATA_RUNTIME_PREFIX}/var/cache/netdata")' 'set(CACHE_DIR "/var/cache/netdata")' \ - --replace-fail 'set(CONFIG_DIR "''${NETDATA_RUNTIME_PREFIX}/etc/netdata")' 'set(CONFIG_DIR "/etc/netdata")' \ - --replace-fail 'set(LIBCONFIG_DIR "''${NETDATA_RUNTIME_PREFIX}/usr/lib/netdata/conf.d")' 'set(LIBCONFIG_DIR "${placeholder "out"}/share/netdata/conf.d")' \ - --replace-fail 'set(LOG_DIR "''${NETDATA_RUNTIME_PREFIX}/var/log/netdata")' 'set(LOG_DIR "/var/log/netdata")' \ - --replace-fail 'set(PLUGINS_DIR "''${NETDATA_RUNTIME_PREFIX}/usr/libexec/netdata/plugins.d")' 'set(PLUGINS_DIR "${placeholder "out"}/libexec/netdata/plugins.d")' \ - --replace-fail 'set(VARLIB_DIR "''${NETDATA_RUNTIME_PREFIX}/var/lib/netdata")' 'set(VARLIB_DIR "/var/lib/netdata")' \ - --replace-fail 'set(pkglibexecdir_POST "''${NETDATA_RUNTIME_PREFIX}/usr/libexec/netdata")' 'set(pkglibexecdir_POST "${placeholder "out"}/libexec/netdata")' \ - --replace-fail 'set(localstatedir_POST "''${NETDATA_RUNTIME_PREFIX}/var")' 'set(localstatedir_POST "/var")' \ - --replace-fail 'set(sbindir_POST "''${NETDATA_RUNTIME_PREFIX}/''${BINDIR}")' 'set(sbindir_POST "${placeholder "out"}/bin")' \ - --replace-fail 'set(configdir_POST "''${NETDATA_RUNTIME_PREFIX}/etc/netdata")' 'set(configdir_POST "/etc/netdata")' \ - --replace-fail 'set(libconfigdir_POST "''${NETDATA_RUNTIME_PREFIX}/usr/lib/netdata/conf.d")' 'set(libconfigdir_POST "${placeholder "out"}/share/netdata/conf.d")' \ - --replace-fail 'set(cachedir_POST "''${NETDATA_RUNTIME_PREFIX}/var/cache/netdata")' 'set(libconfigdir_POST "/var/cache/netdata")' \ - --replace-fail 'set(registrydir_POST "''${NETDATA_RUNTIME_PREFIX}/var/lib/netdata/registry")' 'set(registrydir_POST "/var/lib/netdata/registry")' \ - --replace-fail 'set(varlibdir_POST "''${NETDATA_RUNTIME_PREFIX}/var/lib/netdata")' 'set(varlibdir_POST "/var/lib/netdata")' \ - --replace-fail 'set(BUILD_INFO_CMAKE_CACHE_ARCHIVE_PATH "usr/share/netdata")' 'set(BUILD_INFO_CMAKE_CACHE_ARCHIVE_PATH "${placeholder "out"}/share/netdata")' - ''; - - cmakeFlags = [ - "-DWEB_DIR=share/netdata/web" - (lib.cmakeBool "ENABLE_DASHBOARD" withCloudUi) - (lib.cmakeBool "ENABLE_DBENGINE" withDBengine) - (lib.cmakeBool "ENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE" withConnPrometheus) - (lib.cmakeBool "ENABLE_JEMALLOC" true) - (lib.cmakeBool "ENABLE_LIBBACKTRACE" withLibbacktrace) - (lib.cmakeBool "ENABLE_ML" withML) - (lib.cmakeBool "ENABLE_PLUGIN_CUPS" withCups) - (lib.cmakeBool "ENABLE_PLUGIN_EBPF" withEbpf) - (lib.cmakeBool "ENABLE_PLUGIN_FREEIPMI" withIpmi) - (lib.cmakeBool "ENABLE_PLUGIN_NETWORK_VIEWER" withNetworkViewer) - (lib.cmakeBool "ENABLE_PLUGIN_SYSTEMD_JOURNAL" withSystemdJournal) - (lib.cmakeBool "ENABLE_PLUGIN_SYSTEMD_UNITS" withSystemdUnits) - (lib.cmakeBool "ENABLE_PLUGIN_XENSTAT" false) - # Suggested by upstream. - "-G Ninja" - ] - ++ lib.optional withML "-DNETDATA_DLIB_SOURCE_PATH=${dlib.src}"; - - postFixup = '' - wrapProgram $out/bin/netdata-claim.sh --prefix PATH : ${lib.makeBinPath [ openssl ]} - wrapProgram $out/libexec/netdata/plugins.d/cgroup-network-helper.sh --prefix PATH : ${lib.makeBinPath [ bash ]} - wrapProgram $out/bin/netdatacli --set NETDATA_PIPENAME /run/netdata/ipc - ${lib.optionalString (stdenv.hostPlatform.isLinux) '' - substituteInPlace $out/lib/netdata/conf.d/go.d/sensors.conf --replace-fail '/usr/bin/sensors' '${lm_sensors}/bin/sensors' - ''} - - # Time to cleanup the output directory. - unlink $out/sbin - cp $out/etc/netdata/edit-config $out/bin/netdata-edit-config - mv $out/lib/netdata/conf.d $out/share/netdata/conf.d - rm -rf $out/{var,usr,etc} - ''; - - enableParallelBuilding = true; - - passthru = rec { - nd-mcp = - (buildGoModule { - pname = "nd-mcp"; - version = finalAttrs.version; - inherit (finalAttrs) src; - - sourceRoot = "${finalAttrs.src.name}/src/web/mcp/bridges/stdio-golang"; - - vendorHash = "sha256-6JfHrBloJQ5wHyogIPTVDZjlITWZXbsv2m2lMlQmBUY="; - - proxyVendor = true; - doCheck = false; - - subPackages = [ "." ]; - - ldflags = [ - "-s" - "-w" - ]; - - meta = { - description = "Netdata Model Context Protocol (MCP) Integration"; - license = lib.licenses.gpl3Only; - }; - }).goModules; - - netdata-go-modules = - (buildGoModule { - pname = "netdata-go-plugins"; - inherit (finalAttrs) version src; - - sourceRoot = "${finalAttrs.src.name}/src/go/plugin/go.d"; - - vendorHash = "sha256-aOFmfBcBjnTfFHfMNemSJHbnMnhBojYrGe21zDxPxME="; - doCheck = false; - proxyVendor = true; - - ldflags = [ - "-s" - "-w" - "-X main.version=${finalAttrs.version}" - ]; - - passthru.tests = tests; - meta = finalAttrs.meta // { - description = "Netdata orchestrator for data collection modules written in Go"; - mainProgram = "godplugin"; - license = lib.licenses.gpl3Only; - }; - }).goModules; - inherit - withIpmi - withNdsudo - withNetworkViewer - withSystemdJournal - ; - tests.netdata = nixosTests.netdata; - }; - - meta = with lib; { - broken = stdenv.buildPlatform != stdenv.hostPlatform || withEbpf; - description = "Real-time performance monitoring tool"; - homepage = "https://www.netdata.cloud/"; - changelog = "https://github.com/netdata/netdata/releases/tag/v${version}"; - license = [ licenses.gpl3Plus ] ++ lib.optionals withCloudUi [ licenses.ncul1 ]; - mainProgram = "netdata"; - platforms = platforms.unix; - maintainers = with maintainers; [ - mkg20001 - rhoriguchi + nativeBuildInputs = [ + bison + cmake + flex + go + makeWrapper + ninja + pkg-config + ] + ++ lib.optionals withCups [ cups.dev ] + ++ lib.optionals (withOtel || withSystemdJournal) [ + cargo + corrosion + rustc + rustPlatform.cargoSetupHook ]; - }; -}) + + # bash is only used to rewrite shebangs + buildInputs = [ + bash + curl + jemalloc + json_c + libuv + libyaml + lz4 + protobuf + zlib + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libossp_uuid + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + libcap + libuuid + lm_sensors + ] + ++ lib.optionals withConnPrometheus [ snappy ] + ++ lib.optionals withConnPubSub [ + google-cloud-cpp + grpc + ] + ++ lib.optionals withCups [ cups ] + ++ lib.optionals withEbpf [ + libbpf + libelf + ] + ++ lib.optionals withIpmi [ freeipmi ] + ++ lib.optionals withLibbacktrace [ libbacktrace ] + ++ lib.optionals withNetfilter [ + libmnl + libnetfilter_acct + ] + ++ lib.optionals withSsl [ openssl ] + ++ lib.optionals (withSystemdJournal || withSystemdUnits) [ systemd ]; + + patches = [ + # Allow ndsudo to use non-hardcoded `PATH` + # See https://github.com/netdata/netdata/pull/17377#issuecomment-2183017868 + # https://github.com/netdata/netdata/security/advisories/GHSA-pmhq-4cxq-wj93 + ./ndsudo-fix-path.patch + + ./use-local-corrosion.patch + ./use-local-libbacktrace.patch + ] + ++ lib.optional withCloudUi ( + replaceVars ./dashboard-v3-add.patch { + # FIXME web.archive.org link can be replace once https://github.com/netdata/netdata-cloud/issues/1081 resolved + # last update 04/01/2025 04:45:14 + dashboardTarball = fetchurl { + url = "https://web.archive.org/web/20250401044514/https://app.netdata.cloud/agent.tar.gz"; + hash = "sha256-NtmM1I3VrvFErMoBl+w63Nt0DzOOsaB98cxE/axm8mE="; + }; + } + ); + + # Guard against unused build-time development inputs in closure. Without + # the ./skip-CONFIGURE_COMMAND.patch patch the closure retains inputs up + # to bootstrap tools: + # https://github.com/NixOS/nixpkgs/pull/175719 + # We pick zlib.dev as a simple canary package with pkg-config input. + disallowedReferences = lib.optional (!withDebug) zlib.dev; + + donStrip = withDebug || withLibbacktrace; + env.NIX_CFLAGS_COMPILE = lib.optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; + + postInstall = '' + # Relocate one folder above. + mv $out/usr/* $out/ + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + # rename this plugin so netdata will look for setuid wrapper + mv $out/libexec/netdata/plugins.d/apps.plugin \ + $out/libexec/netdata/plugins.d/apps.plugin.org + mv $out/libexec/netdata/plugins.d/cgroup-network \ + $out/libexec/netdata/plugins.d/cgroup-network.org + mv $out/libexec/netdata/plugins.d/perf.plugin \ + $out/libexec/netdata/plugins.d/perf.plugin.org + mv $out/libexec/netdata/plugins.d/slabinfo.plugin \ + $out/libexec/netdata/plugins.d/slabinfo.plugin.org + mv $out/libexec/netdata/plugins.d/debugfs.plugin \ + $out/libexec/netdata/plugins.d/debugfs.plugin.org + ${lib.optionalString withIpmi '' + mv $out/libexec/netdata/plugins.d/freeipmi.plugin \ + $out/libexec/netdata/plugins.d/freeipmi.plugin.org + ''} + ${lib.optionalString withNdsudo '' + mv $out/libexec/netdata/plugins.d/ndsudo \ + $out/libexec/netdata/plugins.d/ndsudo.org + + ln -s /var/lib/netdata/ndsudo/ndsudo $out/libexec/netdata/plugins.d/ndsudo + ''} + ${lib.optionalString withNetworkViewer '' + mv $out/libexec/netdata/plugins.d/network-viewer.plugin \ + $out/libexec/netdata/plugins.d/network-viewer.plugin.org + ''} + ${lib.optionalString withOtel '' + mv $out/libexec/netdata/plugins.d/otel-plugin \ + $out/libexec/netdata/plugins.d/otel-plugin.org + ''} + ${lib.optionalString withSystemdJournal '' + mv $out/libexec/netdata/plugins.d/systemd-journal.plugin \ + $out/libexec/netdata/plugins.d/systemd-journal.plugin.org + ''} + ${lib.optionalString withSystemdUnits '' + mv $out/libexec/netdata/plugins.d/systemd-units.plugin \ + $out/libexec/netdata/plugins.d/systemd-units.plugin.org + ''} + ''; + + preConfigure = '' + ${lib.optionalString (withOtel || withSystemdJournal) '' + export CMAKE_PREFIX_PATH="${corrosion}:$CMAKE_PREFIX_PATH" + ''} + + export GOCACHE=$TMPDIR/go-cache + export GOPATH=$TMPDIR/go + export GOSUMDB=off + + substituteInPlace packaging/cmake/Modules/NetdataGoTools.cmake \ + --replace-fail \ + 'GOPROXY=https://proxy.golang.org' \ + 'GOPROXY=file://${finalAttrs.passthru.netdata-go-modules},file://${finalAttrs.passthru.nd-mcp}' + + # Prevent the path to be caught into the Nix store path. + substituteInPlace CMakeLists.txt \ + --replace-fail 'set(CACHE_DIR "''${NETDATA_RUNTIME_PREFIX}/var/cache/netdata")' 'set(CACHE_DIR "/var/cache/netdata")' \ + --replace-fail 'set(CONFIG_DIR "''${NETDATA_RUNTIME_PREFIX}/etc/netdata")' 'set(CONFIG_DIR "/etc/netdata")' \ + --replace-fail 'set(LIBCONFIG_DIR "''${NETDATA_RUNTIME_PREFIX}/usr/lib/netdata/conf.d")' 'set(LIBCONFIG_DIR "${placeholder "out"}/share/netdata/conf.d")' \ + --replace-fail 'set(LOG_DIR "''${NETDATA_RUNTIME_PREFIX}/var/log/netdata")' 'set(LOG_DIR "/var/log/netdata")' \ + --replace-fail 'set(PLUGINS_DIR "''${NETDATA_RUNTIME_PREFIX}/usr/libexec/netdata/plugins.d")' 'set(PLUGINS_DIR "${placeholder "out"}/libexec/netdata/plugins.d")' \ + --replace-fail 'set(VARLIB_DIR "''${NETDATA_RUNTIME_PREFIX}/var/lib/netdata")' 'set(VARLIB_DIR "/var/lib/netdata")' \ + --replace-fail 'set(pkglibexecdir_POST "''${NETDATA_RUNTIME_PREFIX}/usr/libexec/netdata")' 'set(pkglibexecdir_POST "${placeholder "out"}/libexec/netdata")' \ + --replace-fail 'set(localstatedir_POST "''${NETDATA_RUNTIME_PREFIX}/var")' 'set(localstatedir_POST "/var")' \ + --replace-fail 'set(BINDIR usr/sbin)' 'set(BINDIR "${placeholder "out"}/sbin")' \ + --replace-fail 'set(BUILD_INFO_CMAKE_CACHE_ARCHIVE_PATH "usr/share/netdata")' 'set(BUILD_INFO_CMAKE_CACHE_ARCHIVE_PATH "${placeholder "out"}/share/netdata")' + ''; + + cmakeFlags = [ + "-DWEB_DIR=share/netdata/web" + (lib.cmakeBool "ENABLE_DASHBOARD" withCloudUi) + (lib.cmakeBool "ENABLE_DBENGINE" withDBengine) + (lib.cmakeBool "ENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE" withConnPrometheus) + (lib.cmakeBool "ENABLE_JEMALLOC" true) + (lib.cmakeBool "ENABLE_LIBBACKTRACE" withLibbacktrace) + (lib.cmakeBool "ENABLE_ML" withML) + (lib.cmakeBool "ENABLE_PLUGIN_CUPS" withCups) + (lib.cmakeBool "ENABLE_PLUGIN_EBPF" withEbpf) + (lib.cmakeBool "ENABLE_PLUGIN_FREEIPMI" withIpmi) + (lib.cmakeBool "ENABLE_PLUGIN_NETWORK_VIEWER" withNetworkViewer) + (lib.cmakeBool "ENABLE_PLUGIN_OTEL" withOtel) + (lib.cmakeBool "ENABLE_PLUGIN_SYSTEMD_JOURNAL" withSystemdJournal) + (lib.cmakeBool "ENABLE_PLUGIN_SYSTEMD_UNITS" withSystemdUnits) + (lib.cmakeBool "ENABLE_PLUGIN_XENSTAT" false) + # Suggested by upstream. + "-G Ninja" + ] + ++ lib.optional withML "-DNETDATA_DLIB_SOURCE_PATH=${dlib.src}"; + + postFixup = '' + wrapProgram $out/bin/netdata-claim.sh --prefix PATH : ${lib.makeBinPath [ openssl ]} + wrapProgram $out/libexec/netdata/plugins.d/cgroup-network-helper.sh --prefix PATH : ${lib.makeBinPath [ bash ]} + wrapProgram $out/bin/netdatacli --set NETDATA_PIPENAME /run/netdata/ipc + ${lib.optionalString stdenv.hostPlatform.isLinux '' + substituteInPlace $out/lib/netdata/conf.d/go.d/sensors.conf --replace-fail '/usr/bin/sensors' '${lm_sensors}/bin/sensors' + ''} + + # Time to cleanup the output directory. + unlink $out/sbin + cp $out/etc/netdata/edit-config $out/bin/netdata-edit-config + mv $out/lib/netdata/conf.d $out/share/netdata/conf.d + rm -rf $out/{var,usr,etc} + ''; + + enableParallelBuilding = true; + + passthru = { + nd-mcp = + (buildGoModule { + pname = "${finalAttrs.pname}-nd-mcp"; + inherit (finalAttrs) version src; + + sourceRoot = "${finalAttrs.src.name}/src/web/mcp/bridges/stdio-golang"; + + vendorHash = "sha256-jyCTp52Dc2IuRwzGT+sHFljO30oqAMfe3xVdEpV+R2c="; + proxyVendor = true; + doCheck = false; + + subPackages = [ "." ]; + + ldflags = [ + "-s" + "-w" + ]; + + meta = finalAttrs.meta // { + description = "Netdata Model Context Protocol (MCP) Integration"; + license = lib.licenses.gpl3Only; + }; + }).goModules; + + netdata-go-modules = + (buildGoModule { + pname = "${finalAttrs.pname}-go-plugins"; + inherit (finalAttrs) version src; + + sourceRoot = "${finalAttrs.src.name}/src/go/plugin/go.d"; + + vendorHash = "sha256-AVNUbKCvO+Z3eKE+bJ/VFDo1tS9DdlmMw6M3OSdHiIU="; + proxyVendor = true; + doCheck = false; + + ldflags = [ + "-s" + "-w" + "-X main.version=${finalAttrs.version}" + ]; + + meta = finalAttrs.meta // { + description = "Netdata orchestrator for data collection modules written in Go"; + mainProgram = "godplugin"; + license = lib.licenses.gpl3Only; + }; + }).goModules; + + inherit + withIpmi + withNdsudo + withNetworkViewer + withOtel + withSystemdJournal + ; + + tests.netdata = nixosTests.netdata; + }; + + meta = with lib; { + broken = stdenv.buildPlatform != stdenv.hostPlatform || withEbpf; + description = "Real-time performance monitoring tool"; + homepage = "https://www.netdata.cloud/"; + changelog = "https://github.com/netdata/netdata/releases/tag/v${version}"; + license = [ licenses.gpl3Plus ] ++ lib.optionals withCloudUi [ licenses.ncul1 ]; + mainProgram = "netdata"; + platforms = platforms.unix; + maintainers = with maintainers; [ + mkg20001 + rhoriguchi + ]; + }; + } + // lib.optionalAttrs (withOtel || withSystemdJournal) { + cargoDeps = rustPlatform.fetchCargoVendor { + pname = "${finalAttrs.pname}-nd-jf"; + inherit (finalAttrs) version src cargoRoot; + hash = "sha256-HY6OtKHP75mO9X+F2a6H6e+3M0pgZBOIIaxAI9OhgkQ="; + }; + cargoRoot = "src/crates/jf"; + } +) diff --git a/pkgs/tools/system/netdata/use-local-corrosion.patch b/pkgs/tools/system/netdata/use-local-corrosion.patch new file mode 100644 index 000000000000..0a4e80fa6515 --- /dev/null +++ b/pkgs/tools/system/netdata/use-local-corrosion.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 414a3c54b..cf1fcb7b4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -230,13 +230,8 @@ cmake_dependent_option(ENABLE_NETDATA_JOURNAL_FILE_READER "Enable netdata's jour + + # Setup Rust/Corrosion for plugins that need it + if(ENABLE_NETDATA_JOURNAL_FILE_READER OR ENABLE_PLUGIN_OTEL) +- include(FetchContent) +- FetchContent_Declare( +- Corrosion +- GIT_REPOSITORY https://github.com/netdata/corrosion.git +- GIT_TAG f3b91559efca32c6b54837866ef35ba98ff5b2ca # stable/v0.5 +- ) +- FetchContent_MakeAvailable(Corrosion) ++ find_package(Corrosion REQUIRED) ++ + corrosion_import_crate(MANIFEST_PATH src/crates/jf/Cargo.toml + CRATES journal_reader_ffi otel-plugin) + endif()