diff --git a/doc/build-helpers/images/appimagetools.section.md b/doc/build-helpers/images/appimagetools.section.md index c469124c3bd5..2a9ac9a2b7b7 100644 --- a/doc/build-helpers/images/appimagetools.section.md +++ b/doc/build-helpers/images/appimagetools.section.md @@ -110,12 +110,12 @@ appimageTools.wrapType2 { extraPkgs = pkgs: [ pkgs.at-spi2-core ]; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} + mv $out/bin/irccloud-${version} $out/bin/irccloud install -m 444 -D ${appimageContents}/irccloud.desktop $out/share/applications/irccloud.desktop install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/irccloud.png \ $out/share/icons/hicolor/512x512/apps/irccloud.png substituteInPlace $out/share/applications/irccloud.desktop \ - --replace-fail 'Exec=AppRun' 'Exec=${pname}' + --replace-fail 'Exec=AppRun' 'Exec=irccloud' ''; } ``` @@ -125,11 +125,16 @@ appimageTools.wrapType2 { The argument passed to `extract` can also contain a `postExtract` attribute, which allows you to execute additional commands after the files are extracted from the AppImage. `postExtract` must be a string with commands to run. +:::{.warning} +When specifying `postExtract`, you should use `appimageTools.wrapAppImage` instead of `appimageTools.wrapType2`. +Otherwise `wrapType2` will extract the AppImage contents without respecting the `postExtract` instructions. +::: + :::{.example #ex-extracting-appimage-with-postextract} # Extracting an AppImage to install extra files, using `postExtract` -This is a rewrite of [](#ex-extracting-appimage) to use `postExtract`. +This is a rewrite of [](#ex-extracting-appimage) to use `postExtract` and `wrapAppImage`. ```nix { appimageTools, fetchurl }: @@ -145,21 +150,26 @@ let appimageContents = appimageTools.extract { inherit pname version src; postExtract = '' - substituteInPlace $out/irccloud.desktop --replace-fail 'Exec=AppRun' 'Exec=${pname}' + substituteInPlace $out/irccloud.desktop --replace-fail 'Exec=AppRun' 'Exec=irccloud' ''; }; in -appimageTools.wrapType2 { - inherit pname version src; +appimageTools.wrapAppImage { + inherit pname version; + + src = appimageContents; extraPkgs = pkgs: [ pkgs.at-spi2-core ]; extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} + mv $out/bin/irccloud-${version} $out/bin/irccloud install -m 444 -D ${appimageContents}/irccloud.desktop $out/share/applications/irccloud.desktop install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/irccloud.png \ $out/share/icons/hicolor/512x512/apps/irccloud.png ''; + + # specify src archive for nix-update + passthru.src = src; } ``` diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 1446a3a372ea..4046a3f3e3cd 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -843,8 +843,12 @@ with lib.maintainers; marketing = { members = [ + djacu + flyfloh + thilobillerbeck tomberek ]; + githubTeams = [ "marketing-team" ]; scope = "Marketing of Nix/NixOS/nixpkgs."; shortName = "Marketing"; enableFeatureFreezePing = true; diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index a9c686763ca9..bdd016ef63cf 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -274,7 +274,7 @@ in channel = mkOption { default = 0; example = 11; - type = types.ints.positive; + type = types.ints.unsigned; description = '' The channel to operate on. Use 0 to enable ACS (Automatic Channel Selection). Beware that not every device supports ACS in which case {command}`hostapd` diff --git a/nixos/modules/tasks/filesystems/bcachefs.nix b/nixos/modules/tasks/filesystems/bcachefs.nix index 1afc60b970a1..20324a144362 100644 --- a/nixos/modules/tasks/filesystems/bcachefs.nix +++ b/nixos/modules/tasks/filesystems/bcachefs.nix @@ -231,6 +231,10 @@ in lib.mkMerge [ { inherit assertions; + + # Bcachefs upstream recommends using the latest kernel + boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; + # needed for systemd-remount-fs system.fsPackages = [ cfg.package ]; services.udev.packages = [ cfg.package ]; diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix index 74c2fbe5a527..5e595be24ada 100644 --- a/pkgs/applications/editors/rednotebook/default.nix +++ b/pkgs/applications/editors/rednotebook/default.nix @@ -16,14 +16,14 @@ buildPythonApplication rec { pname = "rednotebook"; - version = "2.39"; + version = "2.41"; pyproject = true; src = fetchFromGitHub { owner = "jendrikseipp"; repo = "rednotebook"; tag = "v${version}"; - sha256 = "sha256-H7Ub4dCJQa4Y3DNBzeIYWlNkpYftezY2MNWokw8ocoA="; + sha256 = "sha256-sWfazIeROc3Pf4pUaUdcF00A5AV7bxzwI3R6eoSQkto="; }; # We have not packaged tests. diff --git a/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix index b46bf11bde83..97d9470852f3 100644 --- a/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix +++ b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix @@ -11,8 +11,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "calva"; publisher = "betterthantomorrow"; - version = "2.0.525"; - hash = "sha256-pTRyDsgxd9o8Y9p2rsZTT+uG6+mSBBM/k4nczvlYGrM="; + version = "2.0.528"; + hash = "sha256-YnY15/I0bJ14J4KDU7AI6Y2lE7SWug/yoH0X+upqKzA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index d9055becb608..4fb8a93b2706 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1584,8 +1584,8 @@ let mktplcRef = { name = "vscode-great-icons"; publisher = "emmanuelbeziat"; - version = "2.1.119"; - hash = "sha256-mE9VU5K/+NLjHk/XQ7fb+wZ9FNAfsIwmPu7IAoei8Iw="; + version = "2.1.120"; + hash = "sha256-m5CPmilGF1jguhTZhPAUMrfzU4HU5SkiWeGOMAD+D/Y="; }; meta = { license = lib.licenses.mit; @@ -3858,8 +3858,8 @@ let mktplcRef = { publisher = "redhat"; name = "java"; - version = "1.44.0"; - hash = "sha256-KlB0YlAIdVMuLzBv5S9DbANBBDQoTog1FC8ykFeTvnM="; + version = "1.45.0"; + hash = "sha256-aLyAU5J+65Cw3UsYey9Y2/bSMWFiz3TNOwBBvjev8dY="; }; buildInputs = [ jdk ]; meta = { @@ -3893,6 +3893,8 @@ let reditorsupport.r = callPackage ./reditorsupport.r { }; + reditorsupport.r-syntax = callPackage ./reditorsupport.r-syntax { }; + release-candidate.vscode-scheme-repl = callPackage ./release-candidate.vscode-scheme-repl { }; reloadedextensions.reloaded-cpp = buildVscodeMarketplaceExtension { diff --git a/pkgs/applications/editors/vscode/extensions/language-packs.nix b/pkgs/applications/editors/vscode/extensions/language-packs.nix index caa74d39cdca..bc4f4d12a55f 100644 --- a/pkgs/applications/editors/vscode/extensions/language-packs.nix +++ b/pkgs/applications/editors/vscode/extensions/language-packs.nix @@ -13,7 +13,7 @@ let buildVscodeLanguagePack = { language, - version ? "1.103.2025080609", + version ? "1.104.2025091009", hash, }: buildVscodeMarketplaceExtension { @@ -41,71 +41,71 @@ in # French vscode-language-pack-fr = buildVscodeLanguagePack { language = "fr"; - hash = "sha256-EN562YK/mAUpvwuNXL+reLMuh5EdY6TcVJbt7clSK2Q="; + hash = "sha256-7/TiCJ+PhrUpCLznMpxN10GpCObi4gclYz87vOsU2yI="; }; # Italian vscode-language-pack-it = buildVscodeLanguagePack { language = "it"; - hash = "sha256-gsYvAR3HvqzYzEQDUeJD7Wg4fpk+byUGz1IvQh6+oms="; + hash = "sha256-94b/U8yLMlomLx/zi9L/2yOZTb51OIqRgT1Z/xADzG0="; }; # German vscode-language-pack-de = buildVscodeLanguagePack { language = "de"; - hash = "sha256-l0lBj1gGGrTqCsjLVamIejbhchIzb7SpZfKed+nT/nQ="; + hash = "sha256-jUDGqsXZpHeKr+xgSwNYWKJTKs/3axV7o8iv7xlxP9w="; }; # Spanish vscode-language-pack-es = buildVscodeLanguagePack { language = "es"; - hash = "sha256-I6IHTWorrK4QnN+RRHIi4cS/SlxerjbYLhJuJeWzJW4="; + hash = "sha256-hXOdM867rympTOJJh3v8y6B6FIez3+jhQa4kqL2p+98="; }; # Russian vscode-language-pack-ru = buildVscodeLanguagePack { language = "ru"; - hash = "sha256-Tba4zLqxFLdupIPah2059oA9ZQVzq7Z77pwFAH96CLY="; + hash = "sha256-Qt4V5ro1YvZkSkk2mxB/HLXsI3ewmmKor2ZxsMDAHRg="; }; # Chinese (Simplified) vscode-language-pack-zh-hans = buildVscodeLanguagePack { language = "zh-hans"; - hash = "sha256-hSHHAh59Kwgm/fG21EMAEHgBuDnin4+3IrCUWSjbGJ8="; + hash = "sha256-IBXnZNAorbFVu68UOwaGyVBNyPTILYgEZBy6k/EUNjA="; }; # Chinese (Traditional) vscode-language-pack-zh-hant = buildVscodeLanguagePack { language = "zh-hant"; - hash = "sha256-hKZzKPXExkw3FGjE33eHJy8CiIxkQdRreRDHonHdt9A="; + hash = "sha256-iy3+HNkRFwJps/hqQMUjQfWxULewhF+sV1qg8BrMmQo="; }; # Japanese vscode-language-pack-ja = buildVscodeLanguagePack { language = "ja"; - hash = "sha256-UFhdArcnxzCXr4Ha9B5WGdJ8fV+jqitJYgS7bFdo7qU="; + hash = "sha256-wZgMj8mmg8lIxX3JCi2fwS0l3/tSrOWuQpuTsW+J4wg="; }; # Korean vscode-language-pack-ko = buildVscodeLanguagePack { language = "ko"; - hash = "sha256-SOu9WXhSy2VOlCuhRlyU2vwrHKAqtacEHqv1jmfVOe0="; + hash = "sha256-5GL95M9y60PjgNL7x/9JthV/g6+okoxT0uwmf/qPvqQ="; }; # Czech vscode-language-pack-cs = buildVscodeLanguagePack { language = "cs"; - hash = "sha256-AR+88WY5AhN2VCzuiFPR60K4KyO31nxlyI8g8Ya+278="; + hash = "sha256-PzhBxDl2X1LStXMHgqMPzl9v7XJ9VuL/8sCsdJ4mFfA="; }; # Portuguese (Brazil) vscode-language-pack-pt-br = buildVscodeLanguagePack { language = "pt-BR"; - hash = "sha256-oIdLJqu07BmyDhROvHt0pbsdITkmI+bMlWybuU9kwpU="; + hash = "sha256-a8eGCArxLbMdQjpRBtcZJ8xlp9+Mbabiy6/v3/HANTQ="; }; # Turkish vscode-language-pack-tr = buildVscodeLanguagePack { language = "tr"; - hash = "sha256-5G3f4mdT29R4ics/ukxgBDZJ8FT0iCe9r4LPfgKjRjc="; + hash = "sha256-ZE9RXpV+k/7KcKlpE8AwW+3y2tupARhXTnucKfM304I="; }; # Polish vscode-language-pack-pl = buildVscodeLanguagePack { language = "pl"; - hash = "sha256-nhF2DDvPGjOLQid++XxvG3vSU5OSZ3gVrHdujGCsQjA="; + hash = "sha256-V6E5BsIRIPkZhq3g7F65/ml02HibeZyIs17R4TtJQU0="; }; # Pseudo Language vscode-language-pack-qps-ploc = buildVscodeLanguagePack { language = "qps-ploc"; - hash = "sha256-DpsMvjzXo56RYUPgsctwpdvd7gTiFQSGiZeqZcJZU4k="; + hash = "sha256-Tzqd6BJDGSxtxbZodWvBS64FIvxOmP5SaB+iAl3kU5w="; }; } diff --git a/pkgs/applications/editors/vscode/extensions/reditorsupport.r-syntax/default.nix b/pkgs/applications/editors/vscode/extensions/reditorsupport.r-syntax/default.nix new file mode 100644 index 000000000000..bd024aed190a --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/reditorsupport.r-syntax/default.nix @@ -0,0 +1,21 @@ +{ lib, vscode-utils }: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "r-syntax"; + publisher = "REditorSupport"; + version = "0.1.3"; + hash = "sha256-grkfkmyERVUkB8kSH+NPd2Mv4WF/h/obw8ebmxPx5zU="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/REditorSupport.r-syntax/changelog"; + description = "R Synxtax Highlight for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=REditorSupport.r-syntax"; + homepage = "https://github.com/REditorSupport/vscode-R-syntax"; + license = lib.licenses.mit; + maintainers = [ + lib.maintainers.ivyfanchiang + lib.maintainers.pandapip1 + ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix b/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix index ab4a4f2cfa36..2bbfb02881a6 100644 --- a/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix +++ b/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix @@ -35,6 +35,9 @@ vscode-utils.buildVscodeMarketplaceExtension { downloadPage = "https://marketplace.visualstudio.com/items?itemName=REditorSupport.r"; homepage = "https://github.com/REditorSupport/vscode-R"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.pandapip1 ]; + maintainers = [ + lib.maintainers.pandapip1 + lib.maintainers.ivyfanchiang + ]; }; } diff --git a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix index a6f199a4c6b4..26b1ffee8a35 100644 --- a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix @@ -14,19 +14,19 @@ let { x86_64-linux = { arch = "linux-x64"; - hash = "sha256-4vZn0n2oQ0Bu1k/mOo5QYON9FyUCnifQWi7rt8v64Qw="; + hash = "sha256-wOlZPf43h/xHgmKRxPWuCdqqorft/cV/V1qlSR7/r3Y="; }; aarch64-linux = { arch = "linux-arm64"; - hash = "sha256-L7FproPmOySe3SuLyvaD5hje9/QecRpVgSATSzddD9U="; + hash = "sha256-LcNCD3OHq1IREEZ5y9fkCcdtjXBOd5UuhvG833oAx3Q="; }; x86_64-darwin = { arch = "darwin-x64"; - hash = "sha256-fJt5UXPdUSQHD1t1ThArnD2n+1hVpzXJD+CNKzQoaI0="; + hash = "sha256-I+2SYCPHXTIrZg2imWRpdj4KbuPcdJ3GQdrxu3bInbs="; }; aarch64-darwin = { arch = "darwin-arm64"; - hash = "sha256-u3H2+nz6lJtMXn38dDnshaJcnoC7cKJg2q2n0nCa0Dc="; + hash = "sha256-PaXHB8lMKpKgaOekBPvzmYPsokaR2pZTzJsIcYujS3A="; }; } .${system} or (throw "Unsupported system: ${system}"); @@ -38,7 +38,7 @@ vscode-utils.buildVscodeMarketplaceExtension { # Please update the corresponding binary (typos-lsp) # when updating this extension. # See pkgs/by-name/ty/typos-lsp/package.nix - version = "0.1.43"; + version = "0.1.44"; inherit (extInfo) hash arch; }; diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix index 03471b1fc0e3..9f7b43e257ed 100644 --- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix +++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix @@ -11,26 +11,26 @@ vscode-utils.buildVscodeMarketplaceExtension { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-EfUwtKKyoX1/JNoVe3YsfxoLmjHWkLgFHKQqwDMjGMs="; + hash = "sha256-cuCxSODDNf2nhiUwgQT5SRugRLYOhq3igsvgP/hzcZE="; }; "x86_64-darwin" = { arch = "darwin-x64"; - hash = "sha256-fZRQIFwDsUsIw9YwsjMhMPeMTOe/JATDBq66yKfJQRU="; + hash = "sha256-OQqw/f2gSmFLN9CDn/auxXY6ao/XieAY7XVcI/kf1TA="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-ig80H563Mv0Xs4Jh9Ni8Hn9vXAFYwycqNvSO3JJ3t+8="; + hash = "sha256-qMWJS/4afJkSENk+BdaPPAynjEMErT2jjeFAkOSMfZ4="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-9D1H/u8YvgCvVcvm/Cy8GqQrutkSj6E7aqZdyX96LDw="; + hash = "sha256-cj6cu/uSHflJHKub4LKaqPOMc7EC3Hlzxp7DfDpi9hU="; }; }; in { name = "visualjj"; publisher = "visualjj"; - version = "0.16.2"; + version = "0.16.4"; } // sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix index b0127ffb8a7d..598f149244da 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix @@ -10,11 +10,11 @@ buildMozillaMach rec { pname = "firefox-beta"; binaryName = pname; - version = "144.0b1"; + version = "144.0b4"; applicationName = "Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "a5a13bcb819523e936dadcb3d31ba6b24905f9b37104afd23ab267caf15d692bb048542b542012bd95048e0fb42aefd48e92bd38b536be9dd273c468c9def428"; + sha512 = "f49e852eae3c453e4de46cde42f3d23d977a71414e8193b49ceff7816d8aff4d11e915860b6c732a64922bb2b897ff39b9fe9919458eb943ffd03efbc1c75650"; }; meta = { diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix index f6739c897714..9fb46e612e35 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix @@ -10,13 +10,13 @@ buildMozillaMach rec { pname = "firefox-devedition"; binaryName = pname; - version = "144.0b1"; + version = "144.0b4"; applicationName = "Firefox Developer Edition"; requireSigning = false; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "f50d5ef185f77ab70b43bc52d8d7e5d2e4be731505b8b53fa5a28c18d7e8fb59b4c1d9af3a18b2a2f0a1047133face63ba52991995a848a3c1d956907ef4d926"; + sha512 = "144a10bc0c2121e22990def70e1b5bcc033a8b8cd7ad433a1b1d5db33599d05142d1f5c1e486f919e7b839849aaf83c6c4287df89f337151b82f220f9bd7fe52"; }; # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index fe84fd6fdca0..5c2ad6cd499b 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -130,6 +130,7 @@ ], withFonts ? false, withHelp ? true, + withJava ? true, kdeIntegration ? false, variant ? "fresh", debugLogging ? variant == "still", @@ -349,7 +350,6 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeBuildInputs = [ - ant autoconf automake bison @@ -359,7 +359,6 @@ stdenv.mkDerivation (finalAttrs: { gettext gperf icu - jdk21 libmysqlclient libtool libxml2 @@ -374,6 +373,10 @@ stdenv.mkDerivation (finalAttrs: { ] ++ optionals kdeIntegration [ qt6.qtbase + ] + ++ optionals withJava [ + ant + jdk21 ]; buildInputs = @@ -409,7 +412,6 @@ stdenv.mkDerivation (finalAttrs: { (harfbuzz.override { withIcu = true; }) hunspell icu - jre' lcms2 libGL libGLU @@ -474,6 +476,9 @@ stdenv.mkDerivation (finalAttrs: { qt6.qtbase kdePackages.kcoreaddons kdePackages.kio + ] + ++ optionals withJava [ + jre' ]; preConfigure = '' @@ -516,7 +521,6 @@ stdenv.mkDerivation (finalAttrs: { "--without-buildconfig-recorded" (lib.withFeature withHelp "help") - "--with-beanshell-jar=${bsh}" "--with-vendor=NixOS" "--disable-report-builder" "--disable-online-update" @@ -524,7 +528,7 @@ stdenv.mkDerivation (finalAttrs: { "--enable-dbus" "--enable-release-build" "--enable-epm" - "--with-ant-home=${ant.home}" + (lib.withFeature withJava "java") # Without these, configure does not finish "--without-junit" @@ -543,7 +547,6 @@ stdenv.mkDerivation (finalAttrs: { (lib.withFeature withFonts "fonts") "--without-doxygen" - "--with-system-beanshell" "--with-system-cairo" "--with-system-coinmp" "--with-system-headers" @@ -596,6 +599,11 @@ stdenv.mkDerivation (finalAttrs: { "--enable-kf6" "--enable-qt6" ] + ++ optionals withJava [ + "--with-system-beanshell" + "--with-ant-home=${ant.home}" + "--with-beanshell-jar=${bsh}" + ] ++ ( if variant == "fresh" || variant == "collabora" then [ @@ -670,7 +678,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { inherit srcs; - jdk = jre'; + jdk = if withJava then jre' else null; python = python311; # for unoconv updateScript = [ ./update.sh diff --git a/pkgs/by-name/al/alfaview/package.nix b/pkgs/by-name/al/alfaview/package.nix index 37bfb74560c1..bbf41d9cfd1d 100644 --- a/pkgs/by-name/al/alfaview/package.nix +++ b/pkgs/by-name/al/alfaview/package.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "alfaview"; - version = "9.22.12"; + version = "9.23.1"; src = fetchurl { url = "https://assets.alfaview.com/stable/linux/deb/${pname}_${version}.deb"; - hash = "sha256-WMy05L4z1j1izQthFX5gZGO0Vg3gPHnwXblP8E7psnk="; + hash = "sha256-T1RsG/8uuPtma7TCNww4V6tKzPK0Ds8zmdjk2duhMEw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ba/bazarr/package.nix b/pkgs/by-name/ba/bazarr/package.nix index af33ef7b074e..1d4e0db9b8d0 100644 --- a/pkgs/by-name/ba/bazarr/package.nix +++ b/pkgs/by-name/ba/bazarr/package.nix @@ -17,11 +17,11 @@ let in stdenv.mkDerivation rec { pname = "bazarr"; - version = "1.5.2"; + version = "1.5.3"; src = fetchzip { url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip"; - hash = "sha256-A6fm5zqlrml7iT3jS9r/XJbCyL+lr/V6WCisxtTKDjA="; + hash = "sha256-2JzsGnGgrkD5G0ZmrphkPZTnak3gdkHloXRKA+p9Y/0="; stripRoot = false; }; diff --git a/pkgs/by-name/bc/bcache-tools/package.nix b/pkgs/by-name/bc/bcache-tools/package.nix index 0b20b7d00475..9220ff281f25 100644 --- a/pkgs/by-name/bc/bcache-tools/package.nix +++ b/pkgs/by-name/bc/bcache-tools/package.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { -e "/INSTALL.*initcpio\/install/d" \ -e "/INSTALL.*dracut\/module-setup.sh/d" \ -e "/INSTALL.*probe-bcache/d" \ + -e "s/pkg-config/$PKG_CONFIG/" \ -i Makefile # * Remove probe-bcache which is handled by util-linux sed -e "/probe-bcache/d" \ diff --git a/pkgs/by-name/bi/bird3/package.nix b/pkgs/by-name/bi/bird3/package.nix index b0ef754298f1..83b65e3ccc35 100644 --- a/pkgs/by-name/bi/bird3/package.nix +++ b/pkgs/by-name/bi/bird3/package.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { pname = "bird"; - version = "3.1.2"; + version = "3.1.4"; src = fetchFromGitLab { domain = "gitlab.nic.cz"; owner = "labs"; repo = "bird"; rev = "v${version}"; - hash = "sha256-3Ms9yozF/Ox/kSP9rzKvkrA0VBPQb1VjtbEInl8/KZM="; + hash = "sha256-xLhx+GWUrbyTXNdacy67F3f9liWHTwVPEDF7O37Q5Es="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cm/cminpack/package.nix b/pkgs/by-name/cm/cminpack/package.nix index 7d2b48cd3d13..446161d2929f 100644 --- a/pkgs/by-name/cm/cminpack/package.nix +++ b/pkgs/by-name/cm/cminpack/package.nix @@ -3,21 +3,27 @@ stdenv, cmake, fetchFromGitHub, - withBlas ? true, + withBlas ? false, blas, + nix-update-script, }: stdenv.mkDerivation rec { pname = "cminpack"; - version = "1.3.8"; + version = "1.3.11"; src = fetchFromGitHub { owner = "devernay"; repo = "cminpack"; rev = "v${version}"; - hash = "sha256-eFJ43cHbSbWld+gPpMaNiBy1X5TIcN9aVxjh8PxvVDU="; + hash = "sha256-GF9HiITX/XV8hXrp5lJw2XM0Zyb/CBkMZkRFBbQj03A="; }; + postPatch = '' + substituteInPlace cmake/cminpack.pc.in \ + --replace-fail ''\'''${prefix}/' "" + ''; + strictDeps = true; nativeBuildInputs = [ @@ -33,6 +39,10 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" ]; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "Software for solving nonlinear equations and nonlinear least squares problems"; homepage = "http://devernay.free.fr/hacks/cminpack/"; diff --git a/pkgs/by-name/ec/ecs-agent/package.nix b/pkgs/by-name/ec/ecs-agent/package.nix index 7abbbb169cd6..8751d37efa46 100644 --- a/pkgs/by-name/ec/ecs-agent/package.nix +++ b/pkgs/by-name/ec/ecs-agent/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "amazon-ecs-agent"; - version = "1.98.0"; + version = "1.99.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "aws"; repo = "amazon-ecs-agent"; - hash = "sha256-zp1Rdl6Gl24hXFNMZX3qcf7p3eAdzE0EA5ZnwjW4guU="; + hash = "sha256-b+GxUVqKnMlZITrZ0/MO6kZVw5mLrrgLVdKAe0xS/7w="; }; vendorHash = null; diff --git a/pkgs/by-name/ex/expliot/package.nix b/pkgs/by-name/ex/expliot/package.nix index 68ff6ea92f53..ca03735602ec 100644 --- a/pkgs/by-name/ex/expliot/package.nix +++ b/pkgs/by-name/ex/expliot/package.nix @@ -1,5 +1,6 @@ { lib, + fetchFromGitHub, fetchFromGitLab, python3, }: @@ -14,6 +15,21 @@ let inherit version; hash = "sha256-cBqMmXXEq8ReXROQarFJ+Vn4EoaRBjRzI6P4msDoKmI="; }; + dependencies = oldAttrs.dependencies ++ [ + python3.pkgs.attrs + python3.pkgs.colorama + ]; + doCheck = false; + }); + + paho-mqtt = super.paho-mqtt.overridePythonAttrs (oldAttrs: rec { + version = "1.6.1"; + src = fetchFromGitHub { + inherit (oldAttrs.src) owner repo; + tag = "v${version}"; + hash = "sha256-9nH6xROVpmI+iTKXfwv2Ar1PAmWbEunI3HO0pZyK6Rg="; + }; + build-system = with self; [ setuptools ]; doCheck = false; }); }; @@ -24,12 +40,12 @@ with py.pkgs; buildPythonApplication rec { pname = "expliot"; version = "0.9.8"; - format = "setuptools"; + pyproject = true; src = fetchFromGitLab { owner = "expliot_framework"; repo = "expliot"; - rev = version; + tag = version; hash = "sha256-7Cuj3YKKwDxP2KKueJR9ZO5Bduv+lw0Y87Rw4b0jbGY="; }; @@ -42,10 +58,9 @@ buildPythonApplication rec { "zeroconf" ]; - nativeBuildInputs = [ - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiocoap awsiotpythonsdk bluepy @@ -67,13 +82,10 @@ buildPythonApplication rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ - "expliot" - ]; + pythonImportsCheck = [ "expliot" ]; meta = with lib; { description = "IoT security testing and exploitation framework"; - mainProgram = "expliot"; longDescription = '' EXPLIoT is a Framework for security testing and exploiting IoT products and IoT infrastructure. It provides a set of plugins @@ -83,7 +95,8 @@ buildPythonApplication rec { purpose of the framework i.e. IoT exploitation. ''; homepage = "https://expliot.readthedocs.io/"; - license = with licenses; [ agpl3Plus ]; + license = licenses.agpl3Plus; maintainers = with maintainers; [ fab ]; + mainProgram = "expliot"; }; } diff --git a/pkgs/by-name/fl/flac2all/package.nix b/pkgs/by-name/fl/flac2all/package.nix index 93ce231f9c54..50ed431311e5 100644 --- a/pkgs/by-name/fl/flac2all/package.nix +++ b/pkgs/by-name/fl/flac2all/package.nix @@ -11,12 +11,12 @@ python3Packages.buildPythonApplication rec { pname = "flac2all"; - version = "5.1"; + version = "5.4"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "OBjlr7cbSx2WOIfZUNwHy5Hpb2Fmh3vmZdc70JiWsiI="; + sha256 = "sha256-UGrkCQcpNzWH2hIRd1oTDryUeDumgHKuuxsbC87xaUI="; }; # Not sure why this is needed, but setup.py expects this to be set diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix index 4461581ea85d..106f7751f50d 100644 --- a/pkgs/by-name/gi/gitaly/package.nix +++ b/pkgs/by-name/gi/gitaly/package.nix @@ -7,7 +7,7 @@ }: let - version = "18.3.2"; + version = "18.4.0"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -21,10 +21,10 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-R/35xYOCq/dlwLQ/in6u+DLifxsGpqBx58flX+FrVCo="; + hash = "sha256-Xg+JRw/W93n6FGjjQRTULuCTRQxvPyyQJKACQNaYyyg="; }; - vendorHash = "sha256-JFGzGwYi4owq0oVLucm7UGuq8PE4FH9Gp8HyBRoE6cs="; + vendorHash = "sha256-DNZgdP7juELUX0cs0tnyqdf1yiUJ0S17nm0xqTk3KHQ="; ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" diff --git a/pkgs/by-name/gi/github-mcp-server/package.nix b/pkgs/by-name/gi/github-mcp-server/package.nix index a441d61db4a2..a7ebe6bffa3e 100644 --- a/pkgs/by-name/gi/github-mcp-server/package.nix +++ b/pkgs/by-name/gi/github-mcp-server/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "github-mcp-server"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "github"; repo = "github-mcp-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-IGjbuW4gPOZQrLMhyrZ3ii/GeRrgEyNVb0w3/Z0hihU="; + hash = "sha256-D6oEnaHrGnFfuO6NXRYbJ665OlWcwHo+JLfCPrdDkE4="; }; - vendorHash = "sha256-F6PR4bxFSixgYQX65zjrVxcxEQxCoavQqa5mBGrZH8o="; + vendorHash = "sha256-0QqgyjK3QID72aMI6l6ofXAUt94PYFqO8dWech7yaFw="; ldflags = [ "-s" diff --git a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/code-parser.nix b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/code-parser.nix new file mode 100644 index 000000000000..62188e2a805e --- /dev/null +++ b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/code-parser.nix @@ -0,0 +1,43 @@ +{ + lib, + fetchFromGitLab, + rustPlatform, + pkg-config, + openssl, + clang, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "gitlab-code-parser"; + version = "0.16.1"; + + src = fetchFromGitLab { + owner = "gitlab-org"; + repo = "rust/gitlab-code-parser"; + tag = "v${finalAttrs.version}"; + hash = "sha256-GskOPKv1Jp3eqd+a9nEwZPfHfOw6luyglPXzJZAPvBc="; + }; + + cargoHash = "sha256-g6FV8kX3/9wk692FJLNyGNzv3ffE8RWmMYmvmUIqzVs="; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + clang + ]; + buildInputs = [ + openssl.dev + ]; + + preInstall = '' + mkdir -p $out/include + cp crates/parser-c-bindings/target/include/parser-c-bindings.h $out/include + ''; + + meta = { + description = "A single, efficient and extensible static code‑analysis library"; + changelog = "https://gitlab.com/gitlab-org/rust/gitlab-code-parser/-/blob/v${finalAttrs.version}/CHANGELOG.md?ref_type=tags"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ leona ]; + }; +}) diff --git a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix index ea5fad14c940..af33bad7e8b5 100644 --- a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix +++ b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix @@ -1,28 +1,40 @@ { lib, + callPackage, buildGoModule, fetchFromGitLab, pkg-config, icu, }: - +let + codeParserBindings = callPackage ./code-parser.nix { }; +in buildGoModule rec { pname = "gitlab-elasticsearch-indexer"; - version = "5.7.0"; + version = "5.9.1"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-elasticsearch-indexer"; rev = "v${version}"; - hash = "sha256-Qlz8YT6lGUtnMXCrfZZjzmSz0AivzcCVEd/tEKzfoYg="; + hash = "sha256-Xt22fyTM4rfqUpNE6Q3yfT9r4vqME3KmqxYCqUKmnLQ="; }; - vendorHash = "sha256-C0B9fe/S5TODgVTMGBBD5oGH/DsxAvCB6tBLaRdswCA="; + vendorHash = "sha256-pY8hHFy0AxMwol00BN85jPR0ZnHVgno10Tp+Opz65tQ="; buildInputs = [ icu ]; nativeBuildInputs = [ pkg-config ]; + env = { + CGO_LDFLAGS = "-L${codeParserBindings}/lib"; + CGO_CFLAGS = "-I${codeParserBindings}/include"; + }; + + passthru = { + inherit codeParserBindings; + }; + meta = with lib; { description = "Indexes Git repositories into Elasticsearch for GitLab"; mainProgram = "gitlab-elasticsearch-indexer"; diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix index a5a09681da11..db0a76e54d20 100644 --- a/pkgs/by-name/gi/gitlab-pages/package.nix +++ b/pkgs/by-name/gi/gitlab-pages/package.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "18.3.2"; + version = "18.4.0"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-UrO7RIMr6+u8zfbw/AkUOOydt8Yozbu1ypZ5BNF3as0="; + hash = "sha256-yaIqPr5f2GdRtgLn2XQHNBf0n0O97WlOcCdIule53eA="; }; - vendorHash = "sha256-WCdpccNeVCEvo158uSyDlsGxneU72zKiV7J7JPhtPBw="; + vendorHash = "sha256-FdmozSo/eWTnAxrO+/TZOKataLwDkKfwGOXymkRBVCI="; subPackages = [ "." ]; ldflags = [ diff --git a/pkgs/by-name/gi/gitlab/data.json b/pkgs/by-name/gi/gitlab/data.json index 88a735eda0dd..85ef14d9b5aa 100644 --- a/pkgs/by-name/gi/gitlab/data.json +++ b/pkgs/by-name/gi/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "18.3.2", - "repo_hash": "0n234gk7w75n4vmfdgwjksbksfcnj69f1wczydcylinaxv2jm50n", - "yarn_hash": "0g1iafhfdgshy7d6p27qy042j8xyf6gj4rws9wrzdh51fmv4p3bj", + "version": "18.4.0", + "repo_hash": "0vp4wnipbl8v9vm4xjvwqgzgff4i9xn5p690vw4yvngs7gnclv11", + "yarn_hash": "1s9fz2apb7wkpppq14b3020b2pqdah917wblvzk32np8s2dqqc14", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v18.3.2-ee", + "rev": "v18.4.0-ee", "passthru": { - "GITALY_SERVER_VERSION": "18.3.2", - "GITLAB_PAGES_VERSION": "18.3.2", + "GITALY_SERVER_VERSION": "18.4.0", + "GITLAB_PAGES_VERSION": "18.4.0", "GITLAB_SHELL_VERSION": "14.45.2", - "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.7.0", - "GITLAB_WORKHORSE_VERSION": "18.3.2" + "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.9.1", + "GITLAB_WORKHORSE_VERSION": "18.4.0" } } diff --git a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix index f2481a076b1c..ee4461faf8d7 100644 --- a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix @@ -10,7 +10,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "18.3.2"; + version = "18.4.0"; # nixpkgs-update: no auto update src = fetchFromGitLab { @@ -22,7 +22,7 @@ buildGoModule rec { sourceRoot = "${src.name}/workhorse"; - vendorHash = "sha256-Nev8UXAjvxWItGT3LLcq0cs0wKKXWR6ml+1YBDiYJm4="; + vendorHash = "sha256-R9hI+y4n+6YM0dXIRvNZWwy1gAasdKHBWmFBXJaI1G0="; buildInputs = [ git ]; ldflags = [ "-X main.Version=${version}" ]; doCheck = false; diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile index a397580e896d..b9b538dd1b5e 100644 --- a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile +++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile @@ -26,9 +26,9 @@ gem 'bundler-checksum', '~> 0.1.0', path: 'gems/bundler-checksum', require: fals # See https://docs.gitlab.com/ee/development/gemfile.html#upgrade-rails for guidelines when upgrading Rails if next? - gem 'rails', '~> 7.2.2.1', feature_category: :shared + gem 'rails', '~> 7.2.2.2', feature_category: :shared else - gem 'rails', '~> 7.1.5.1', feature_category: :shared + gem 'rails', '~> 7.1.5.2', feature_category: :shared end gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab', feature_category: :shared @@ -81,7 +81,7 @@ gem 'logger', '~> 1.7.0', feature_category: :shared gem 'marginalia', '~> 1.11.1', feature_category: :database # Authorization -gem 'declarative_policy', '~> 1.1.0', feature_category: :shared +gem 'declarative_policy', '~> 2.0.1', feature_category: :shared # For source code paths mapping gem 'coverband', '6.1.5', require: false, feature_category: :shared @@ -152,7 +152,7 @@ gem 'gpgme', '~> 2.0.24', feature_category: :source_code_management # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master -gem 'gitlab_omniauth-ldap', '~> 2.2.0', require: 'omniauth-ldap', feature_category: :system_access +gem 'gitlab_omniauth-ldap', '~> 2.3.0', require: 'omniauth-ldap', feature_category: :system_access gem 'net-ldap', '~> 0.17.1', feature_category: :system_access # API @@ -171,12 +171,13 @@ gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api # Cells gem 'gitlab-topology-service-client', '~> 0.1', path: 'vendor/gems/gitlab-topology-service-client', + require: 'gitlab/cells/topology_service', feature_category: :cell # Duo Workflow -gem 'gitlab-duo-workflow-service-client', '~> 0.2', +gem 'gitlab-duo-workflow-service-client', '~> 0.3', path: 'vendor/gems/gitlab-duo-workflow-service-client', - feature_category: :duo_workflow + feature_category: :agent_foundations # Generate Fake data gem 'ffaker', '~> 2.24', feature_category: :shared @@ -192,6 +193,7 @@ gem 'hamlit', '~> 3.0.0', feature_category: :shared # Files attachments gem 'carrierwave', '~> 1.3', feature_category: :shared gem 'mini_magick', '~> 4.12', feature_category: :shared +gem 'marcel', '~> 1.0.4', feature_category: :shared # PDF generation gem 'prawn', feature_category: :vulnerability_management @@ -199,10 +201,8 @@ gem 'prawn-svg', feature_category: :vulnerability_management # for backups gem 'fog-aws', '~> 3.26', feature_category: :shared -# Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. -# Also see config/initializers/fog_core_patch.rb. -gem 'fog-core', '= 2.1.0', feature_category: :shared -gem 'fog-google', '~> 1.24.1', require: 'fog/google', feature_category: :shared +gem 'fog-core', '~> 2.5', feature_category: :shared +gem 'fog-google', '~> 1.25', require: 'fog/google', feature_category: :shared gem 'fog-local', '~> 0.8', feature_category: :shared # NOTE: # the fog-aliyun gem since v0.4 pulls in aliyun-sdk transitively, which monkey-patches @@ -211,25 +211,25 @@ gem 'fog-local', '~> 0.8', feature_category: :shared # We may want to update this dependency if this is ever addressed upstream, e.g. via # https://github.com/aliyun/aliyun-oss-ruby-sdk/pull/93 gem 'fog-aliyun', '~> 0.4', feature_category: :shared -gem 'gitlab-fog-azure-rm', '~> 2.2.0', require: 'fog/azurerm', feature_category: :shared +gem 'gitlab-fog-azure-rm', '~> 2.3.0', require: 'fog/azurerm', feature_category: :shared # for Google storage # Need this specific version of google-apis-storage_v1 so that fog-google will utilize the updated list_objects with # match_glob support in google-apis-core 0.11.1. Because of this we also have to bump google-cloud-storage to 1.45.0. gem 'google-apis-storage_v1', '~> 0.29', feature_category: :shared -gem 'google-cloud-storage', '~> 1.45.0', feature_category: :shared +gem 'google-cloud-storage', '~> 1.57.0', feature_category: :shared # We need >= 0.11.1 because that's when match_glob support is added to list_objects gem 'google-apis-core', '~> 0.18.0', '>= 0.18.0', feature_category: :shared -gem 'google-apis-compute_v1', '~> 0.127.0', feature_category: :shared +gem 'google-apis-compute_v1', '~> 0.129.0', feature_category: :shared gem 'google-apis-container_v1', '~> 0.100.0', feature_category: :shared -gem 'google-apis-container_v1beta1', '~> 0.43.0', feature_category: :shared +gem 'google-apis-container_v1beta1', '~> 0.90.0', feature_category: :shared gem 'google-apis-cloudbilling_v1', '~> 0.22.0', feature_category: :shared gem 'google-apis-cloudresourcemanager_v1', '~> 0.31.0', feature_category: :shared gem 'google-apis-iam_v1', '~> 0.73.0', feature_category: :shared gem 'google-apis-serviceusage_v1', '~> 0.28.0', feature_category: :shared gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0', feature_category: :shared -gem 'google-apis-androidpublisher_v3', '~> 0.84.0', feature_category: :shared +gem 'google-apis-androidpublisher_v3', '~> 0.86.0', feature_category: :shared gem 'googleauth', '~> 1.14', feature_category: :shared gem 'google-cloud-artifact_registry-v1', '~> 0.11.0', feature_category: :shared @@ -380,9 +380,9 @@ gem 'rack-proxy', '~> 0.7.7', feature_category: :shared gem 'cssbundling-rails', '1.4.3', feature_category: :shared gem 'terser', '1.0.2', feature_category: :shared -gem 'click_house-client', '0.3.5', feature_category: :database +gem 'click_house-client', '0.5.1', feature_category: :database gem 'addressable', '~> 2.8', feature_category: :shared -gem 'gon', '~> 6.4.0', feature_category: :shared +gem 'gon', '~> 6.5.0', feature_category: :shared gem 'request_store', '~> 1.7.0', feature_category: :shared gem 'base32', '~> 0.3.0', feature_category: :shared gem 'gitlab-license', '~> 2.6', feature_category: :shared @@ -403,7 +403,7 @@ gem 'gitlab-schema-validation', path: 'gems/gitlab-schema-validation', feature_c gem 'gitlab-http', path: 'gems/gitlab-http', feature_category: :shared gem 'premailer-rails', '~> 1.12.0', feature_category: :notifications -gem 'gitlab-labkit', '~> 0.39.0', feature_category: :shared +gem 'gitlab-labkit', '~> 0.40.0', feature_category: :shared gem 'thrift', '~> 0.22.0', feature_category: :shared # I18n @@ -430,12 +430,16 @@ gem 'prometheus-client-mmap', '~> 1.2.9', require: 'prometheus/client', feature_ # Event-driven reactor for Ruby # Required manually in config/initializers/require_async_gem -gem 'async', '~> 2.24.0', require: false, feature_category: :shared +gem 'async', '~> 2.28.0', require: false, feature_category: :shared gem 'io-event', '~> 1.12', require: false, feature_category: :shared # Security report schemas used to validate CI job artifacts of security jobs gem 'gitlab-security_report_schemas', '0.1.3.min15.0.0.max15.2.3', feature_category: :vulnerability_management +# Frontend bundling +gem 'vite_rails', '~> 3.0.17', feature_category: :shared +gem 'vite_ruby', '~> 3.9.0', feature_category: :shared + # OpenTelemetry group :opentelemetry do # Core OpenTelemetry gems @@ -470,7 +474,8 @@ gem 'warning', '~> 1.5.0', feature_category: :shared group :development do gem 'lefthook', '~> 1.12.0', require: false, feature_category: :tooling - gem 'rubocop', feature_category: :tooling + gem 'rubocop', feature_category: :tooling, require: false + gem 'debug', '~> 1.11.0', feature_category: :shared gem 'solargraph', '~> 0.54.0', require: false, feature_category: :shared gem 'solargraph-rspec', '~> 0.5.1', require: false, feature_category: :shared @@ -526,9 +531,6 @@ group :development, :test do gem 'benchmark-ips', '~> 2.14.0', require: false, feature_category: :shared gem 'benchmark-memory', '~> 0.1', require: false, feature_category: :shared - # Profiling data from CI/CD pipelines - gem 'influxdb-client', '~> 3.1', require: false, feature_category: :tooling - gem 'knapsack', '~> 4.0.0', feature_category: :tooling gem 'gitlab-crystalball', '~> 1.1.0', require: false, feature_category: :tooling gem 'test_file_finder', '~> 0.3.1', feature_category: :tooling @@ -543,11 +545,6 @@ group :development, :test do gem 'pact', '~> 1.64', feature_category: :shared - # For now we only use vite in development / test, and not for production builds - # See: https://gitlab.com/gitlab-org/frontend/rfcs/-/issues/106 - gem 'vite_rails', '~> 3.0.17', feature_category: :shared - gem 'vite_ruby', '~> 3.9.0', feature_category: :shared - gem 'gitlab-housekeeper', path: 'gems/gitlab-housekeeper', feature_category: :tooling gem 'yard', '~> 0.9', require: false, feature_category: :tooling @@ -607,7 +604,7 @@ group :test do # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 gem 'derailed_benchmarks', require: false, feature_category: :shared - gem 'gitlab_quality-test_tooling', '~> 2.18.0', require: false, feature_category: :tooling + gem 'gitlab_quality-test_tooling', '~> 2.20.0', require: false, feature_category: :tooling end gem 'octokit', '~> 9.0', feature_category: :importers @@ -643,10 +640,10 @@ gem 'ssh_data', '~> 1.3', feature_category: :shared gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 18.2.0', feature_category: :gitaly +gem 'gitaly', '~> 18.4.0.pre.rc1', feature_category: :gitaly # KAS GRPC protocol definitions -gem 'gitlab-kas-grpc', '~> 18.2.0', feature_category: :deployment_management +gem 'gitlab-kas-grpc', '~> 18.3.0', feature_category: :deployment_management gem 'grpc', '~> 1.74.0', feature_category: :shared @@ -684,7 +681,7 @@ gem 'lru_redux', feature_category: :shared # fix STARTTLS handling until https://github.com/mikel/mail/pull/1536 is # released. gem 'mail', '= 2.8.1', feature_category: :shared -gem 'mail-smtp_pool', '~> 0.1.0', path: 'vendor/gems/mail-smtp_pool', require: false, feature_category: :shared +gem 'mail-smtp_pool', '~> 0.1.0', path: 'gems/mail-smtp_pool', require: false, feature_category: :shared gem 'microsoft_graph_mailer', '~> 0.1.0', path: 'vendor/gems/microsoft_graph_mailer', feature_category: :shared @@ -700,7 +697,7 @@ gem 'json', '~> 2.13.0', feature_category: :shared gem 'json_schemer', '~> 2.3.0', feature_category: :shared gem 'oj', '~> 3.16.0', '>=3.16.10', feature_category: :shared gem 'oj-introspect', '~> 0.8', feature_category: :shared -gem 'multi_json', '~> 1.14.1', feature_category: :shared +gem 'multi_json', '~> 1.17.0', feature_category: :shared gem 'yajl-ruby', '~> 1.4.3', require: 'yajl', feature_category: :shared gem 'webauthn', '~> 3.0', feature_category: :shared @@ -725,7 +722,7 @@ gem 'cvss-suite', '~> 3.3.0', require: 'cvss_suite', feature_category: :software gem 'arr-pm', '~> 0.0.12', feature_category: :package_registry # Remote Development -gem 'devfile', '~> 0.4.4', feature_category: :workspaces +gem 'devfile', '~> 0.4.8', feature_category: :workspaces gem 'hashdiff', '~> 1.2.0', feature_category: :workspaces # Apple plist parsing @@ -733,7 +730,11 @@ gem 'CFPropertyList', '~> 3.0.0', feature_category: :mobile_devops gem 'app_store_connect', feature_category: :mobile_devops # For phone verification -gem 'telesignenterprise', '~> 2.2', feature_category: :insider_threat +gem 'telesignenterprise', '~> 2.6', feature_category: :insider_threat + +# NOTE: In Ruby 3.4 base64 was moved out of the stdlib +# This gem was added while upgrading `telesignenterprise` to 2.6.0 to ensure compatibility with Ruby 3.4 +gem "base64", "~> 0.2.0", feature_category: :shared # BufferedIO patch gem 'net-protocol', '~> 0.2.2', feature_category: :shared diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock index fc358bf41bd3..55bb4449a788 100644 --- a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock @@ -111,7 +111,7 @@ PATH PATH remote: gems/gitlab-utils specs: - gitlab-utils (0.1.0) + gitlab-utils (0.2.0) actionview (>= 6.1.7.2) activesupport (>= 6.1.7.2) addressable (~> 2.8) @@ -124,6 +124,13 @@ PATH diffy (~> 3.4) oj (~> 3.16, >= 3.16.10) +PATH + remote: gems/mail-smtp_pool + specs: + mail-smtp_pool (0.1.0) + connection_pool (~> 2.0) + mail (~> 2.8) + PATH remote: vendor/gems/devise-pbkdf2-encryptable specs: @@ -139,7 +146,7 @@ PATH PATH remote: vendor/gems/gitlab-duo-workflow-service-client specs: - gitlab-duo-workflow-service-client (0.2) + gitlab-duo-workflow-service-client (0.3) grpc PATH @@ -149,13 +156,6 @@ PATH google-protobuf (~> 3) grpc -PATH - remote: vendor/gems/mail-smtp_pool - specs: - mail-smtp_pool (0.1.0) - connection_pool (~> 2.0) - mail (~> 2.8) - PATH remote: vendor/gems/microsoft_graph_mailer specs: @@ -204,35 +204,35 @@ GEM base64 (~> 0.2) faraday (>= 1.0, < 3.0.0) faraday-retry (>= 1.0, < 3.0.0) - actioncable (7.1.5.1) - actionpack (= 7.1.5.1) - activesupport (= 7.1.5.1) + actioncable (7.1.5.2) + actionpack (= 7.1.5.2) + activesupport (= 7.1.5.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.1.5.1) - actionpack (= 7.1.5.1) - activejob (= 7.1.5.1) - activerecord (= 7.1.5.1) - activestorage (= 7.1.5.1) - activesupport (= 7.1.5.1) + actionmailbox (7.1.5.2) + actionpack (= 7.1.5.2) + activejob (= 7.1.5.2) + activerecord (= 7.1.5.2) + activestorage (= 7.1.5.2) + activesupport (= 7.1.5.2) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.1.5.1) - actionpack (= 7.1.5.1) - actionview (= 7.1.5.1) - activejob (= 7.1.5.1) - activesupport (= 7.1.5.1) + actionmailer (7.1.5.2) + actionpack (= 7.1.5.2) + actionview (= 7.1.5.2) + activejob (= 7.1.5.2) + activesupport (= 7.1.5.2) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.2) - actionpack (7.1.5.1) - actionview (= 7.1.5.1) - activesupport (= 7.1.5.1) + actionpack (7.1.5.2) + actionview (= 7.1.5.2) + activesupport (= 7.1.5.2) nokogiri (>= 1.8.5) racc rack (>= 2.2.4) @@ -240,35 +240,35 @@ GEM rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actiontext (7.1.5.1) - actionpack (= 7.1.5.1) - activerecord (= 7.1.5.1) - activestorage (= 7.1.5.1) - activesupport (= 7.1.5.1) + actiontext (7.1.5.2) + actionpack (= 7.1.5.2) + activerecord (= 7.1.5.2) + activestorage (= 7.1.5.2) + activesupport (= 7.1.5.2) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.1.5.1) - activesupport (= 7.1.5.1) + actionview (7.1.5.2) + activesupport (= 7.1.5.2) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (7.1.5.1) - activesupport (= 7.1.5.1) + activejob (7.1.5.2) + activesupport (= 7.1.5.2) globalid (>= 0.3.6) - activemodel (7.1.5.1) - activesupport (= 7.1.5.1) - activerecord (7.1.5.1) - activemodel (= 7.1.5.1) - activesupport (= 7.1.5.1) + activemodel (7.1.5.2) + activesupport (= 7.1.5.2) + activerecord (7.1.5.2) + activemodel (= 7.1.5.2) + activesupport (= 7.1.5.2) timeout (>= 0.4.0) - activestorage (7.1.5.1) - actionpack (= 7.1.5.1) - activejob (= 7.1.5.1) - activerecord (= 7.1.5.1) - activesupport (= 7.1.5.1) + activestorage (7.1.5.2) + actionpack (= 7.1.5.2) + activejob (= 7.1.5.2) + activerecord (= 7.1.5.2) + activesupport (= 7.1.5.2) marcel (~> 1.0) - activesupport (7.1.5.1) + activesupport (7.1.5.2) base64 benchmark (>= 0.3) bigdecimal @@ -308,12 +308,12 @@ GEM asciidoctor-plantuml (0.0.16) asciidoctor (>= 2.0.17, < 3.0.0) ast (2.4.2) - async (2.24.0) + async (2.28.0) console (~> 1.29) fiber-annotation - io-event (~> 1.9) + io-event (~> 1.11) metrics (~> 0.12) - traces (~> 0.15) + traces (~> 0.18) atlassian-jwt (0.2.1) jwt (~> 2.1) attr_encrypted (4.2.0) @@ -323,7 +323,7 @@ GEM awrence (1.2.1) aws-eventstream (1.3.0) aws-partitions (1.1001.0) - aws-sdk-cloudformation (1.133.0) + aws-sdk-cloudformation (1.134.0) aws-sdk-core (~> 3, >= 3.225.0) aws-sigv4 (~> 1.5) aws-sdk-core (3.226.3) @@ -421,7 +421,7 @@ GEM cork nap open4 (~> 1.3) - click_house-client (0.3.5) + click_house-client (0.5.1) activerecord (>= 7.0, < 9.0) activesupport (>= 7.0, < 9.0) addressable (~> 2.8) @@ -432,7 +432,7 @@ GEM colored2 (3.1.2) commonmarker (0.23.11) concurrent-ruby (1.3.5) - connection_pool (2.5.3) + connection_pool (2.5.4) console (1.29.2) fiber-annotation fiber-local (~> 1.1) @@ -480,12 +480,15 @@ GEM database_cleaner-core (2.0.1) date (3.4.1) deb_version (1.0.2) + debug (1.11.0) + irb (~> 1.10) + reline (>= 0.3.8) debug_inspector (1.1.0) deckar01-task_list (2.3.4) html-pipeline (~> 2.0) declarative (0.0.20) - declarative_policy (1.1.0) - deprecation_toolkit (2.2.3) + declarative_policy (2.0.1) + deprecation_toolkit (2.2.4) activesupport (>= 6.1) derailed_benchmarks (2.2.1) base64 @@ -507,7 +510,7 @@ GEM thor (>= 0.19, < 2) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devfile (0.4.4) + devfile (0.4.8) device_detector (1.1.3) devise (4.9.4) bcrypt (~> 3.0) @@ -584,7 +587,8 @@ GEM tzinfo ethon (0.16.0) ffi (>= 1.15.0) - excon (0.99.0) + excon (1.3.0) + logger execjs (2.8.1) expgen (0.1.1) parslet @@ -650,19 +654,19 @@ GEM fog-json ipaddress (~> 0.8) xml-simple (~> 1.1) - fog-aws (3.28.0) - base64 (~> 0.2.0) - fog-core (~> 2.1) + fog-aws (3.33.0) + base64 (>= 0.2, < 0.4) + fog-core (~> 2.6) fog-json (~> 1.1) fog-xml (~> 0.1) - fog-core (2.1.0) + fog-core (2.6.0) builder - excon (~> 0.58) - formatador (~> 0.2) + excon (~> 1.0) + formatador (>= 0.2, < 2.0) mime-types - fog-google (1.24.1) + fog-google (1.25.0) addressable (>= 2.7.0) - fog-core (< 2.5) + fog-core (~> 2.5) fog-json (~> 1.2) fog-xml (~> 0.1.0) google-apis-compute_v1 (~> 0.53) @@ -676,14 +680,14 @@ GEM fog-json (1.2.0) fog-core multi_json (~> 1.10) - fog-local (0.8.0) + fog-local (0.9.0) fog-core (>= 1.27, < 3.0) fog-xml (0.1.5) fog-core nokogiri (>= 1.5.11, < 2.0.0) formatador (0.2.5) forwardable (1.3.3) - fugit (1.11.1) + fugit (1.11.2) et-orbi (~> 1, >= 1.2.11) raabro (~> 1.4) fuzzyurl (0.9.0) @@ -712,14 +716,14 @@ GEM git (1.19.1) addressable (~> 2.8) rchardet (~> 1.8) - gitaly (18.2.1) + gitaly (18.4.0.pre.rc1) grpc (~> 1.0) gitlab (4.19.0) httparty (~> 0.20) terminal-table (>= 1.5.1) gitlab-chronic (0.10.6) numerizer (~> 0.2) - gitlab-cloud-connector (1.26.0) + gitlab-cloud-connector (1.32.0) activesupport (~> 7.0) jwt (~> 2.9) gitlab-crystalball (1.1.1) @@ -732,7 +736,7 @@ GEM gitlab-experiment (0.9.1) activesupport (>= 3.0) request_store (>= 1.0) - gitlab-fog-azure-rm (2.2.0) + gitlab-fog-azure-rm (2.3.0) faraday (~> 2.0) faraday-follow_redirects (~> 0.3.0) faraday-net_http_persistent (~> 2.0) @@ -743,14 +747,15 @@ GEM nokogiri (~> 1, >= 1.10.8) gitlab-glfm-markdown (0.0.33) rb_sys (~> 0.9.109) - gitlab-kas-grpc (18.2.1) + gitlab-kas-grpc (18.3.2) grpc (~> 1.0) - gitlab-labkit (0.39.0) + gitlab-labkit (0.40.0) actionpack (>= 5.0.0, < 8.1.0) activesupport (>= 5.0.0, < 8.1.0) google-protobuf (~> 3) grpc (>= 1.62) jaeger-client (~> 1.1.0) + json-schema (~> 5.1) opentracing (~> 0.4) pg_query (>= 6.1.0, < 7.0) prometheus-client-mmap (~> 1.2.9) @@ -769,7 +774,7 @@ GEM activesupport (>= 5.2.0) rake (~> 13.0) snowplow-tracker (~> 0.8.0) - gitlab-secret_detection (0.33.0) + gitlab-secret_detection (0.33.3) grpc (>= 1.63.0, < 2) grpc_reflection (~> 0.1) parallel (~> 1) @@ -792,12 +797,12 @@ GEM rubocop-rspec_rails (~> 2.30.0) gitlab_chronic_duration (0.12.0) numerizer (~> 0.2) - gitlab_omniauth-ldap (2.2.0) + gitlab_omniauth-ldap (2.3.0) net-ldap (~> 0.16) omniauth (>= 1.3, < 3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) rubyntlm (~> 0.5) - gitlab_quality-test_tooling (2.18.0) + gitlab_quality-test_tooling (2.20.0) activesupport (>= 7.0, < 7.3) amatch (~> 0.4.1) fog-google (~> 1.24, >= 1.24.1) @@ -812,12 +817,12 @@ GEM zeitwerk (>= 2, < 3) globalid (1.1.0) activesupport (>= 5.0) - gon (6.4.0) + gon (6.5.0) actionpack (>= 3.0.20) i18n (>= 0.7) multi_json request_store (>= 1.0) - google-apis-androidpublisher_v3 (0.84.0) + google-apis-androidpublisher_v3 (0.86.0) google-apis-core (>= 0.15.0, < 2.a) google-apis-bigquery_v2 (0.90.0) google-apis-core (>= 0.15.0, < 2.a) @@ -825,12 +830,12 @@ GEM google-apis-core (>= 0.9.1, < 2.a) google-apis-cloudresourcemanager_v1 (0.31.0) google-apis-core (>= 0.9.1, < 2.a) - google-apis-compute_v1 (0.127.0) + google-apis-compute_v1 (0.129.0) google-apis-core (>= 0.15.0, < 2.a) google-apis-container_v1 (0.100.0) google-apis-core (>= 0.15.0, < 2.a) - google-apis-container_v1beta1 (0.43.0) - google-apis-core (>= 0.9.1, < 2.a) + google-apis-container_v1beta1 (0.90.0) + google-apis-core (>= 0.15.0, < 2.a) google-apis-core (0.18.0) addressable (~> 2.5, >= 2.5.1) googleauth (~> 1.9) @@ -843,8 +848,8 @@ GEM google-apis-core (>= 0.11.0, < 2.a) google-apis-iam_v1 (0.73.0) google-apis-core (>= 0.15.0, < 2.a) - google-apis-iamcredentials_v1 (0.15.0) - google-apis-core (>= 0.9.0, < 2.a) + google-apis-iamcredentials_v1 (0.24.0) + google-apis-core (>= 0.15.0, < 2.a) google-apis-monitoring_v3 (0.54.0) google-apis-core (>= 0.11.0, < 2.a) google-apis-pubsub_v1 (0.45.0) @@ -853,8 +858,8 @@ GEM google-apis-core (>= 0.9.1, < 2.a) google-apis-sqladmin_v1beta4 (0.41.0) google-apis-core (>= 0.9.1, < 2.a) - google-apis-storage_v1 (0.29.0) - google-apis-core (>= 0.11.0, < 2.a) + google-apis-storage_v1 (0.56.0) + google-apis-core (>= 0.15.0, < 2.a) google-cloud-artifact_registry-v1 (0.11.0) gapic-common (>= 0.20.0, < 2.a) google-cloud-errors (~> 1.0) @@ -884,13 +889,14 @@ GEM google-cloud-location (0.6.0) gapic-common (>= 0.20.0, < 2.a) google-cloud-errors (~> 1.0) - google-cloud-storage (1.45.0) + google-cloud-storage (1.57.0) addressable (~> 2.8) digest-crc (~> 0.4) - google-apis-iamcredentials_v1 (~> 0.1) - google-apis-storage_v1 (~> 0.29.0) + google-apis-core (>= 0.18, < 2) + google-apis-iamcredentials_v1 (~> 0.18) + google-apis-storage_v1 (>= 0.42) google-cloud-core (~> 1.6) - googleauth (>= 0.16.2, < 2.a) + googleauth (~> 1.9) mini_mime (~> 1.0) google-cloud-storage_transfer (1.2.0) google-cloud-core (~> 1.6) @@ -1064,6 +1070,9 @@ GEM bindata faraday (~> 2.0) faraday-follow_redirects + json-schema (5.2.2) + addressable (~> 2.8) + bigdecimal (~> 3.1) json_schemer (2.3.0) bigdecimal hana (~> 1.3) @@ -1103,7 +1112,7 @@ GEM language_server-protocol (3.17.0.3) launchy (2.5.2) addressable (~> 2.8) - lefthook (1.12.2) + lefthook (1.12.3) letter_opener (1.10.0) launchy (>= 2.2, < 4) letter_opener_web (3.0.0) @@ -1162,7 +1171,7 @@ GEM net-imap net-pop net-smtp - marcel (1.0.2) + marcel (1.0.4) marginalia (1.11.1) actionpack (>= 5.2) activerecord (>= 5.2) @@ -1174,7 +1183,7 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2023.1003) mini_histogram (0.3.1) - mini_magick (4.12.0) + mini_magick (4.13.2) mini_mime (1.1.2) mini_portile2 (2.8.8) minitest (5.11.3) @@ -1187,7 +1196,7 @@ GEM chef-utils mize (0.6.1) msgpack (1.5.4) - multi_json (1.14.1) + multi_json (1.17.0) multi_xml (0.6.0) multipart-post (2.2.3) murmurhash3 (0.1.7) @@ -1456,7 +1465,7 @@ GEM pdf-core (0.10.0) peek (1.1.0) railties (>= 4.0.0) - pg (1.6.1) + pg (1.6.2) pg_query (6.1.0) google-protobuf (>= 3.25.3) plist (3.7.0) @@ -1541,20 +1550,20 @@ GEM rackup (1.0.1) rack (< 3) webrick - rails (7.1.5.1) - actioncable (= 7.1.5.1) - actionmailbox (= 7.1.5.1) - actionmailer (= 7.1.5.1) - actionpack (= 7.1.5.1) - actiontext (= 7.1.5.1) - actionview (= 7.1.5.1) - activejob (= 7.1.5.1) - activemodel (= 7.1.5.1) - activerecord (= 7.1.5.1) - activestorage (= 7.1.5.1) - activesupport (= 7.1.5.1) + rails (7.1.5.2) + actioncable (= 7.1.5.2) + actionmailbox (= 7.1.5.2) + actionmailer (= 7.1.5.2) + actionpack (= 7.1.5.2) + actiontext (= 7.1.5.2) + actionview (= 7.1.5.2) + activejob (= 7.1.5.2) + activemodel (= 7.1.5.2) + activerecord (= 7.1.5.2) + activestorage (= 7.1.5.2) + activesupport (= 7.1.5.2) bundler (>= 1.15.0) - railties (= 7.1.5.1) + railties (= 7.1.5.2) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -1569,9 +1578,9 @@ GEM rails-i18n (7.0.10) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (7.1.5.1) - actionpack (= 7.1.5.1) - activesupport (= 7.1.5.1) + railties (7.1.5.2) + actionpack (= 7.1.5.2) + activesupport (= 7.1.5.2) irb rackup (>= 1.0.0) rake (>= 12.2) @@ -1606,7 +1615,7 @@ GEM actionpack (>= 5) redis-rack (>= 2.1.0, < 4) redis-store (>= 1.1.0, < 2) - redis-client (0.25.1) + redis-client (0.25.3) connection_pool redis-cluster-client (0.13.5) redis-client (~> 0.24) @@ -1641,7 +1650,7 @@ GEM retriable (3.1.2) reverse_markdown (3.0.0) nokogiri - rexml (3.4.1) + rexml (3.4.2) rinku (2.0.0) rotp (6.3.0) rouge (4.6.0) @@ -1890,10 +1899,10 @@ GEM table_print (1.5.7) tanuki_emoji (0.13.0) i18n (~> 1.14) - telesign (2.2.4) + telesign (2.4.0) net-http-persistent (>= 3.0.0, < 5.0) - telesignenterprise (2.2.2) - telesign (~> 2.2.3) + telesignenterprise (2.6.0) + telesign (~> 2.4.0) temple (0.8.2) term-ansicolor (1.7.1) tins (~> 1.0) @@ -1920,7 +1929,7 @@ GEM bindata (~> 2.4) openssl (> 2.0) openssl-signature_algorithm (~> 1.0) - traces (0.15.2) + traces (0.18.1) trailblazer-option (0.1.2) train-core (3.10.8) addressable (~> 2.5) @@ -2067,7 +2076,7 @@ DEPENDENCIES asciidoctor-include-ext (~> 0.4.0) asciidoctor-kroki (~> 0.10.0) asciidoctor-plantuml (~> 0.0.16) - async (~> 2.24.0) + async (~> 2.28.0) atlassian-jwt (~> 0.2.1) attr_encrypted (~> 4.2) awesome_print @@ -2077,6 +2086,7 @@ DEPENDENCIES axe-core-rspec (~> 4.10.0) babosa (~> 2.0) base32 (~> 0.3.0) + base64 (~> 0.2.0) batch-loader (~> 2.0.5) bcrypt (~> 3.1, >= 3.1.14) benchmark-ips (~> 2.14.0) @@ -2091,7 +2101,7 @@ DEPENDENCIES carrierwave (~> 1.3) charlock_holmes (~> 0.7.9) circuitbox (= 2.0.0) - click_house-client (= 0.3.5) + click_house-client (= 0.5.1) commonmarker (~> 0.23.10) concurrent-ruby (~> 1.1) connection_pool (~> 2.5.3) @@ -2102,11 +2112,12 @@ DEPENDENCIES csv_builder! cvss-suite (~> 3.3.0) database_cleaner-active_record (~> 2.2.0) + debug (~> 1.11.0) deckar01-task_list (= 2.3.4) - declarative_policy (~> 1.1.0) + declarative_policy (~> 2.0.1) deprecation_toolkit (~> 2.2.3) derailed_benchmarks - devfile (~> 0.4.4) + devfile (~> 0.4.8) device_detector devise (~> 4.9.3) devise-pbkdf2-encryptable (~> 0.0.0)! @@ -2139,29 +2150,29 @@ DEPENDENCIES flipper-active_support_cache_store (~> 0.28.0) fog-aliyun (~> 0.4) fog-aws (~> 3.26) - fog-core (= 2.1.0) - fog-google (~> 1.24.1) + fog-core (~> 2.5) + fog-google (~> 1.25) fog-local (~> 0.8) fugit (~> 1.11.1) gdk-toogle (~> 0.9, >= 0.9.5) gettext (~> 3.5, >= 3.5.1) gettext_i18n_rails (~> 1.13.0) git (~> 1.8) - gitaly (~> 18.2.0) + gitaly (~> 18.4.0.pre.rc1) gitlab-active-context! gitlab-backup-cli! gitlab-chronic (~> 0.10.5) gitlab-cloud-connector (~> 1.26) gitlab-crystalball (~> 1.1.0) gitlab-dangerfiles (~> 4.10.0) - gitlab-duo-workflow-service-client (~> 0.2)! + gitlab-duo-workflow-service-client (~> 0.3)! gitlab-experiment (~> 0.9.1) - gitlab-fog-azure-rm (~> 2.2.0) + gitlab-fog-azure-rm (~> 2.3.0) gitlab-glfm-markdown (~> 0.0.33) gitlab-housekeeper! gitlab-http! - gitlab-kas-grpc (~> 18.2.0) - gitlab-labkit (~> 0.39.0) + gitlab-kas-grpc (~> 18.3.0) + gitlab-labkit (~> 0.40.0) gitlab-license (~> 2.6) gitlab-mail_room (~> 0.0.24) gitlab-markup (~> 2.0.0) @@ -2178,15 +2189,15 @@ DEPENDENCIES gitlab-topology-service-client (~> 0.1)! gitlab-utils! gitlab_chronic_duration (~> 0.12) - gitlab_omniauth-ldap (~> 2.2.0) - gitlab_quality-test_tooling (~> 2.18.0) - gon (~> 6.4.0) - google-apis-androidpublisher_v3 (~> 0.84.0) + gitlab_omniauth-ldap (~> 2.3.0) + gitlab_quality-test_tooling (~> 2.20.0) + gon (~> 6.5.0) + google-apis-androidpublisher_v3 (~> 0.86.0) google-apis-cloudbilling_v1 (~> 0.22.0) google-apis-cloudresourcemanager_v1 (~> 0.31.0) - google-apis-compute_v1 (~> 0.127.0) + google-apis-compute_v1 (~> 0.129.0) google-apis-container_v1 (~> 0.100.0) - google-apis-container_v1beta1 (~> 0.43.0) + google-apis-container_v1beta1 (~> 0.90.0) google-apis-core (~> 0.18.0, >= 0.18.0) google-apis-iam_v1 (~> 0.73.0) google-apis-serviceusage_v1 (~> 0.28.0) @@ -2195,7 +2206,7 @@ DEPENDENCIES google-cloud-artifact_registry-v1 (~> 0.11.0) google-cloud-bigquery (~> 1.0) google-cloud-compute-v1 (~> 2.6.0) - google-cloud-storage (~> 1.45.0) + google-cloud-storage (~> 1.57.0) google-protobuf (~> 3.25, >= 3.25.3) googleauth (~> 1.14) gpgme (~> 2.0.24) @@ -2221,7 +2232,6 @@ DEPENDENCIES httparty (~> 0.23.0) i18n_data (~> 0.13.1) icalendar (~> 2.10.1) - influxdb-client (~> 3.1) invisible_captcha (~> 2.3.0) io-event (~> 1.12) ipaddress (~> 0.8.3) @@ -2249,12 +2259,13 @@ DEPENDENCIES lru_redux mail (= 2.8.1) mail-smtp_pool (~> 0.1.0)! + marcel (~> 1.0.4) marginalia (~> 1.11.1) memory_profiler (~> 1.0) microsoft_graph_mailer (~> 0.1.0)! mini_magick (~> 4.12) minitest (~> 5.11.0) - multi_json (~> 1.14.1) + multi_json (~> 1.17.0) mutex_m (~> 0.3) net-http (= 0.6.0) net-ldap (~> 0.17.1) @@ -2331,7 +2342,7 @@ DEPENDENCIES rack-oauth2 (~> 2.2.1) rack-proxy (~> 0.7.7) rack-timeout (~> 0.7.0) - rails (~> 7.1.5.1) + rails (~> 7.1.5.2) rails-controller-testing rails-i18n (~> 7.0, >= 7.0.9) rainbow (~> 3.0) @@ -2396,7 +2407,7 @@ DEPENDENCIES state_machines-rspec (~> 0.6) sys-filesystem (~> 1.4.3) tanuki_emoji (~> 0.13) - telesignenterprise (~> 2.2) + telesignenterprise (~> 2.6) terser (= 1.0.2) test-prof (~> 1.4.0) test_file_finder (~> 0.3.1) diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix index b8fa83f8f511..f59cd14b5116 100644 --- a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix +++ b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix @@ -30,10 +30,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "03dai8z2dxb2cf29hp6md7bhysyipxvw2qnm2bj98yyrnaskfikn"; + sha256 = "0dsyppp79da5p5jh3wxry08vy401xrff4sgww47i2l93mdyldpbr"; type = "gem"; }; - version = "7.1.5.1"; + version = "7.1.5.2"; }; actionmailbox = { dependencies = [ @@ -55,10 +55,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "02inlpsmjz8rz159ljhzac1dvzq5k1pnmmx2pf4gmrj3zs4hbhn3"; + sha256 = "0kmcvibpi4ppk1j1dkqhglix73xhyr29k6l2ziy92azy0b0isaqr"; type = "gem"; }; - version = "7.1.5.1"; + version = "7.1.5.2"; }; actionmailer = { dependencies = [ @@ -80,10 +80,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ncplhcrxldj6jvbaw9g8ik4cznjlf3lyfzgrwy0jfxjh3cdc4xj"; + sha256 = "02w6kq5c2pjp1svfxxqqa46z6zgj2y7x6wybgpln9g5i3vn5yp3s"; type = "gem"; }; - version = "7.1.5.1"; + version = "7.1.5.2"; }; actionpack = { dependencies = [ @@ -105,10 +105,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "066p70mngqk8m7qp3wq2frbl1w8imdcrdxb06cxwq5izykcn7hib"; + sha256 = "1za4sv0ch8j7adfldglp8jalcc8s68h031sqldw0f9pbmb4fvgx7"; type = "gem"; }; - version = "7.1.5.1"; + version = "7.1.5.2"; }; actiontext = { dependencies = [ @@ -127,10 +127,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1v7psa946frm79x04vywnd0h069jgxy5xghm7y5sgijvmp7n3qmq"; + sha256 = "01q275ihq4gds2yvlbzdpqap95z5divwany0x5lcnqhpc7j7hmjh"; type = "gem"; }; - version = "7.1.5.1"; + version = "7.1.5.2"; }; actionview = { dependencies = [ @@ -149,10 +149,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1apnqjfwbvyhf7svlamal1pvy2x78fk42lqbnllqwy816lhrlmcc"; + sha256 = "1jd1biyrf3n45jilazfqli27jnlk60bpn82mi4i1wqxcgsn1djag"; type = "gem"; }; - version = "7.1.5.1"; + version = "7.1.5.2"; }; activejob = { dependencies = [ @@ -167,10 +167,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0rspwfvhxs5by6im90rrjp2sy1wzdpcgb9xm0qfljk3zhmn3fcvn"; + sha256 = "0kl0ppvvxhd4igaxpbn64yyam120vyf0h2bbzqs1xa6dqnjn5dmg"; type = "gem"; }; - version = "7.1.5.1"; + version = "7.1.5.2"; }; activemodel = { dependencies = [ "activesupport" ]; @@ -183,10 +183,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1wci45aas8g909zby9j91m87ff5j28qwl0i7izzbszsahmk78wkl"; + sha256 = "1df89b7pf66r5v6ixf2kn5mb3mzhpkggqqw544685vhlhrmabdjg"; type = "gem"; }; - version = "7.1.5.1"; + version = "7.1.5.2"; }; activerecord = { dependencies = [ @@ -203,10 +203,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1qzij5xmsqqxsc9v9kil68aif5bvly06vqf4pnjrnfzkkdhd22pl"; + sha256 = "0alxm4yk5zqnzfj8jj06cwfzgb3gvcvab8mzd0lgs9x75lmsfgcj"; type = "gem"; }; - version = "7.1.5.1"; + version = "7.1.5.2"; }; activerecord-gitlab = { dependencies = [ "activerecord" ]; @@ -234,10 +234,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0qzz8dxwj70zys1lmqk1x0sl4rb7ddw6v2bgmpm6dijqd03qnsxf"; + sha256 = "163wq77fx38vjdb4jhvfphahnrzdp2kq9ngg02g5y4zaghacp6pd"; type = "gem"; }; - version = "7.1.5.1"; + version = "7.1.5.2"; }; activesupport = { dependencies = [ @@ -263,10 +263,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1f6gqyl49hdabid5jkrfq0127gd396srsgpy7p5ni61v8wp4h34z"; + sha256 = "1lbfsgmbn87mim29v7h5w4v8zflhx6zxrbbp95hfmgxcr2wk204h"; type = "gem"; }; - version = "7.1.5.1"; + version = "7.1.5.2"; }; addressable = { dependencies = [ "public_suffix" ]; @@ -454,10 +454,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0xs3qdlm8fj6zksqp5daamc51azwgbrp3b6mbqcxl22qdnn137aq"; + sha256 = "0vhmmn7n92ilvkvbdbav85hyg8w047zm20vbfzk502g0j495sv4n"; type = "gem"; }; - version = "2.24.0"; + version = "2.28.0"; }; atlassian-jwt = { dependencies = [ "jwt" ]; @@ -543,10 +543,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "08d3khg5bpi73vmghphr5w4acds2vr8gcdpm93fsaj38wvb960s9"; + sha256 = "1vfqzm1l24sks97y1iyg6bmmnf99hinymc3dw4bzkq546rx36ldq"; type = "gem"; }; - version = "1.133.0"; + version = "1.134.0"; }; aws-sdk-core = { dependencies = [ @@ -1128,10 +1128,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0lf1lr3h9bfzyfrh5m8v5p900ld545y13vks1gyy163riyi8wfxx"; + sha256 = "0s9dgq9k6caappqr6y6vbzx3d8pmcb58cbp37am9slmfyvq2l0hh"; type = "gem"; }; - version = "0.3.5"; + version = "0.5.1"; }; coderay = { groups = [ @@ -1220,10 +1220,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0nrhsk7b3sjqbyl1cah6ibf1kvi3v93a7wf4637d355hp614mmyg"; + sha256 = "02p7l47gvchbvnbag6kb4x2hg8n28r25ybslyvrr2q214wir5qg9"; type = "gem"; }; - version = "2.5.3"; + version = "2.5.4"; }; console = { dependencies = [ @@ -1494,6 +1494,20 @@ src: { }; version = "1.0.2"; }; + debug = { + dependencies = [ + "irb" + "reline" + ]; + groups = [ "development" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1wmfy5n5v2rzpr5vz698sqfj1gl596bxrqw44sahq4x0rxjdn98l"; + type = "gem"; + }; + version = "1.11.0"; + }; debug_inspector = { groups = [ "default" @@ -1533,10 +1547,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1jri6fqpyrlnhl99mhqlqwpi6z8idb7g421rysxz40yyk8lwzx4s"; + sha256 = "1s76qc7fz4ww4nf545jyp4fd3j10cn8zhbxii7pxdnkyr1zsdias"; type = "gem"; }; - version = "1.1.0"; + version = "2.0.1"; }; deprecation_toolkit = { dependencies = [ "activesupport" ]; @@ -1547,10 +1561,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0k8j50avgs2pgv20wvrzr77g9yvhi5sa9yh93n72nyd4hhbd28cb"; + sha256 = "09i5rffqgn9idg7nk47zfhrf3lnwsjws1xlqxqkj7lncmrgdgnmi"; type = "gem"; }; - version = "2.2.3"; + version = "2.2.4"; }; derailed_benchmarks = { dependencies = [ @@ -1600,10 +1614,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1dcj3r8gh4y4cks1qk5qhj89ggk6z8kmk3hq9nlvnm9pnb7m9fbs"; + sha256 = "1nnd5jbasxvk9wjjy68yymd98ah8wjzkrpskvs74djl8rj8yzj6j"; type = "gem"; }; - version = "0.4.4"; + version = "0.4.8"; }; device_detector = { groups = [ "default" ]; @@ -2081,14 +2095,18 @@ src: { version = "0.16.0"; }; excon = { - groups = [ "default" ]; + dependencies = [ "logger" ]; + groups = [ + "default" + "test" + ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0j826kfvzn7nc5pv950n270r0sx1702k988ad11cdlav3dcxxw09"; + sha256 = "1gj6h2r9ylkmz9wjlf6p04d3hw99qfnf0wb081lzjx3alk13ngfq"; type = "gem"; }; - version = "0.99.0"; + version = "1.3.0"; }; execjs = { groups = [ "default" ]; @@ -2486,10 +2504,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1kb7jlynlf4ppjp0vyp02kyajpr86k8z64pakjz18f8jxc9pwbkx"; + sha256 = "18m71bpib6x9shbjhmzww28pas15abngah7vmrkfigfnw5ccsjyf"; type = "gem"; }; - version = "3.28.0"; + version = "3.33.0"; }; fog-core = { dependencies = [ @@ -2498,14 +2516,17 @@ src: { "formatador" "mime-types" ]; - groups = [ "default" ]; + groups = [ + "default" + "test" + ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1agd6xgzk0rxrsjdpn94v4hy89s0nm2cs4zg2p880w2dan9xgrak"; + sha256 = "1rjv4iqr64arxv07bh84zzbr1y081h21592b5zjdrk937al8mq1z"; type = "gem"; }; - version = "2.1.0"; + version = "2.6.0"; }; fog-google = { dependencies = [ @@ -2522,14 +2543,17 @@ src: { "google-apis-storage_v1" "google-cloud-env" ]; - groups = [ "default" ]; + groups = [ + "default" + "test" + ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1q2qhdkz7axp1f853d3jxx852gj5idrqhypxk8k3zm9fs72lxmnw"; + sha256 = "13z1ghq9ifd1n2yp1srf7r03hw7y5hl52frarbb8x4zmmfqa7bjq"; type = "gem"; }; - version = "1.24.1"; + version = "1.25.0"; }; fog-json = { dependencies = [ @@ -2551,10 +2575,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0yggsxd7c58p5i8zgvfw9rkqlg75l6hkbwnpgawd2sacwl4jsfr6"; + sha256 = "073ad9c07vnpx823a4x710cx3azbal8mgqhq21j2sfilafqzzd9b"; type = "gem"; }; - version = "0.8.0"; + version = "0.9.0"; }; fog-xml = { dependencies = [ @@ -2605,10 +2629,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0s4qhq3mjl0gak5wl20w9d5jhq069mk1393dkj76s8i2pvkqb578"; + sha256 = "1zp6zpc4ahpd4gdnz5s672n7x113p6h478qc9m8x8y0cfm7j6bjc"; type = "gem"; }; - version = "1.11.1"; + version = "1.11.2"; }; fuzzyurl = { groups = [ "default" ]; @@ -2738,10 +2762,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1cwvbk5ijg41rrghcljjqkf8dnp1cc4l5576460fqadwgmfi62bl"; + sha256 = "0677zbflbjvmxbf6riczscjl6g3pqdh5xb1f783d4lfhdi43rbg4"; type = "gem"; }; - version = "18.2.1"; + version = "18.4.0.pre.rc1"; }; gitlab = { dependencies = [ @@ -2832,10 +2856,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1k0b1wanf53lrymh3np0m5k12kc93w99rrzvw5lpv2zjwwmgij61"; + sha256 = "0h9kfc8ni6lc0jy5r8hvs1768130adq75pnn4vy7jfl7fk7683yp"; type = "gem"; }; - version = "1.26.0"; + version = "1.32.0"; }; gitlab-crystalball = { dependencies = [ @@ -2881,7 +2905,7 @@ src: { path = "${src}/vendor/gems/gitlab-duo-workflow-service-client"; type = "path"; }; - version = "0.2"; + version = "0.3"; }; gitlab-experiment = { dependencies = [ @@ -2912,10 +2936,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1acbwzi4dkixfmb2rggzf4pg65cyxhbggrs4642p8y7mf0hpraii"; + sha256 = "03xwn2477zhc4654c7s1ks72w9lbns79n2qhfca7m17349vivpw8"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; gitlab-glfm-markdown = { dependencies = [ "rb_sys" ]; @@ -2969,10 +2993,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1qj5n9dfslfra3xrrq12mdzrk1ln3hv154wik9y0jd4vmym1j5cp"; + sha256 = "1k0jbpfycg23pm8gddwzxj8b1wpvqisxc6dd33xxr2f7canr8bx8"; type = "gem"; }; - version = "18.2.1"; + version = "18.3.2"; }; gitlab-labkit = { dependencies = [ @@ -2981,6 +3005,7 @@ src: { "google-protobuf" "grpc" "jaeger-client" + "json-schema" "opentracing" "pg_query" "prometheus-client-mmap" @@ -2990,10 +3015,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "07jpj78nnjmgz9brxxzqbx7l9fajyfq74l4vjavqmnff18vgr0gf"; + sha256 = "0awcb5bb9y1y61yzzvj5gkm03w232njym7cdw0s2gpgwh37q6pyg"; type = "gem"; }; - version = "0.39.0"; + version = "0.40.0"; }; gitlab-license = { groups = [ "default" ]; @@ -3133,10 +3158,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "14ds4l7802ypxx56pid7xlhnlbk5ir9zc8adfm96yy9k2sgfmdnf"; + sha256 = "0h7wf8p369zqw51ikychqsii2kh9f920jwhr4b352p1sd1a59qf8"; type = "gem"; }; - version = "0.33.0"; + version = "0.33.3"; }; gitlab-security_report_schemas = { dependencies = [ @@ -3215,7 +3240,7 @@ src: { path = "${src}/gems/gitlab-utils"; type = "path"; }; - version = "0.1.0"; + version = "0.2.0"; }; gitlab_chronic_duration = { dependencies = [ "numerizer" ]; @@ -3239,10 +3264,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1343sax19jidp7nr4s8bxpkyqwy6zb9lfslg99jys8xinfn20kdv"; + sha256 = "1d53lfi4xk8v20xqgz3xqcdb7jg4cq3jcir03lp1ywf26zz3cw0n"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; gitlab_quality-test_tooling = { dependencies = [ @@ -3263,10 +3288,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0pbi6kifymdimcnbsgknlqb7hdcnz045sacxaf8pnkiqcxc0bav8"; + sha256 = "1xxi1grl13663cwmpqvyq75carn05nd8ns26aq34xjqmk0gc8j9c"; type = "gem"; }; - version = "2.18.0"; + version = "2.20.0"; }; globalid = { dependencies = [ "activesupport" ]; @@ -3294,10 +3319,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1w6ji15jrl4p6q0gxy5mmqspvzbmgkqj1d3xmbqr0a1rb7b1i9p3"; + sha256 = "1aw1bn51h4kjlxaskaiwi8x2n9g3cyxn0rjqnilxwszj474y69i2"; type = "gem"; }; - version = "6.4.0"; + version = "6.5.0"; }; google-apis-androidpublisher_v3 = { dependencies = [ "google-apis-core" ]; @@ -3305,10 +3330,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "06ppk1ghm9rxp9dqkgyjh8qs3g6lhvr2zkqmrxc9f0psrcxkxjvq"; + sha256 = "1bvyp1bnvlnrl90w15gnn8cg42balvahwpp1y60vj6kc6al759kk"; type = "gem"; }; - version = "0.84.0"; + version = "0.86.0"; }; google-apis-bigquery_v2 = { dependencies = [ "google-apis-core" ]; @@ -3355,10 +3380,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1f0a46djzbmr41ykz25ibjnn91dnk11vr71k01m2yiiz1pqw9j5p"; + sha256 = "1lzm0qxzs0hbf889p5rbx6954ldd4zn5j0dihvy4gz0r8mbd8rxp"; type = "gem"; }; - version = "0.127.0"; + version = "0.129.0"; }; google-apis-container_v1 = { dependencies = [ "google-apis-core" ]; @@ -3377,10 +3402,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1l0k0davbaaqx76jy9vb6vk6j0l9hl68jmkgn7m6r4nvi37qzi38"; + sha256 = "0jbb5zqv7krxy60iylrnwb9qz0brbgj2m66w5kdhq040ww0760lx"; type = "gem"; }; - version = "0.43.0"; + version = "0.90.0"; }; google-apis-core = { dependencies = [ @@ -3428,14 +3453,17 @@ src: { }; google-apis-iamcredentials_v1 = { dependencies = [ "google-apis-core" ]; - groups = [ "default" ]; + groups = [ + "default" + "test" + ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "06smnmn2s460xl9x9rh07a3fkqdrjjy6azmx8iywggqgv2k5d8p9"; + sha256 = "1133kisa29q36db74lb28id3n65zfqpjw99may4jgddpiz3xlx2p"; type = "gem"; }; - version = "0.15.0"; + version = "0.24.0"; }; google-apis-monitoring_v3 = { dependencies = [ "google-apis-core" ]; @@ -3483,14 +3511,17 @@ src: { }; google-apis-storage_v1 = { dependencies = [ "google-apis-core" ]; - groups = [ "default" ]; + groups = [ + "default" + "test" + ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1k432qgxf41c4m6d68rascm0gyj18r7ypmrnyzmxh7k7nh543awx"; + sha256 = "0aqq1n6ipy9m0j820csprkgpj8brrlxmp4dvdzk5s252n46xks5l"; type = "gem"; }; - version = "0.29.0"; + version = "0.56.0"; }; google-cloud-artifact_registry-v1 = { dependencies = [ @@ -3612,6 +3643,7 @@ src: { dependencies = [ "addressable" "digest-crc" + "google-apis-core" "google-apis-iamcredentials_v1" "google-apis-storage_v1" "google-cloud-core" @@ -3622,10 +3654,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0033bi8qwm0ksxsv5zhz4nzwsiaapq3xk79z8f8rx3v09vdap07j"; + sha256 = "0awv6z8ifaw2sdvr9z4yy70gcjbhvdn79j6hylccscykpwar6xib"; type = "gem"; }; - version = "1.45.0"; + version = "1.57.0"; }; google-cloud-storage_transfer = { dependencies = [ @@ -4518,6 +4550,20 @@ src: { }; version = "1.16.6"; }; + json-schema = { + dependencies = [ + "addressable" + "bigdecimal" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ma0k5889hzydba2ci8lqg87pxsh9zabz7jchm9cbacwsw7axgk0"; + type = "gem"; + }; + version = "5.2.2"; + }; json_schemer = { dependencies = [ "bigdecimal" @@ -4722,10 +4768,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0jqyzwgs02lyvf2v4f810scxjy1zn8w00bhc2kssv7i8h2fxm0rk"; + sha256 = "0pqam7p5f72ic1x16jmgvydjxgqd0lddq4pnkxjmwn174yk2k778"; type = "gem"; }; - version = "1.12.2"; + version = "1.12.3"; }; letter_opener = { dependencies = [ "launchy" ]; @@ -4987,7 +5033,7 @@ src: { groups = [ "default" ]; platforms = [ ]; source = { - path = "${src}/vendor/gems/mail-smtp_pool"; + path = "${src}/gems/mail-smtp_pool"; type = "path"; }; version = "0.1.0"; @@ -4995,15 +5041,16 @@ src: { marcel = { groups = [ "default" + "development" "test" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0kky3yiwagsk8gfbzn3mvl2fxlh3b39v6nawzm4wpjs6xxvvc4x0"; + sha256 = "190n2mk8m1l708kr88fh6mip9sdsh339d2s6sgrik3sbnvz4jmhd"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.4"; }; marginalia = { dependencies = [ @@ -5130,10 +5177,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0slh78f9z6n0l1i2km7m48yz7l4fjrk88sj1f4mh1wb39sl2yc37"; + sha256 = "1nfxjpmka12ihbwd87d5k2hh7d2pv3aq95x0l2lh8gca1s72bmki"; type = "gem"; }; - version = "4.12.0"; + version = "4.13.2"; }; mini_mime = { groups = [ @@ -5244,14 +5291,18 @@ src: { version = "1.5.4"; }; multi_json = { - groups = [ "default" ]; + groups = [ + "default" + "development" + "test" + ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0xy54mjf7xg41l8qrg1bqri75agdqmxap9z466fjismc1rn2jwfr"; + sha256 = "06sabsvnw0x1aqdcswc6bqrqz6705548bfd8z22jxgxfjrn1yn3n"; type = "gem"; }; - version = "1.14.1"; + version = "1.17.0"; }; multi_xml = { groups = [ "default" ]; @@ -6637,10 +6688,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0swf0a0r2xryx788q09w4zcwdq7v1pwq5fvkgr9m8abhbxgaf472"; + sha256 = "0xf8i58shwvwlka4ld12nxcgqv0d5r1yizsvw74w5jaw83yllqaq"; type = "gem"; }; - version = "1.6.1"; + version = "1.6.2"; }; pg_query = { dependencies = [ "google-protobuf" ]; @@ -7144,10 +7195,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0148c00v3hks98rymdiilhjm0i8qw5fla4gww0fb94k3ggns5bh5"; + sha256 = "0ikmj9p48n8mms39jq8w91y12cm7zmxc7a1r9i7vzfn509r0i4m2"; type = "gem"; }; - version = "7.1.5.1"; + version = "7.1.5.2"; }; rails-controller-testing = { dependencies = [ @@ -7235,10 +7286,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1yz28fq55drl4c2dwgap96xcjf6qns2ghc3c3gffzm6yw9i5bq8b"; + sha256 = "08fnm4bfkmjknnzmi1wkvyw9b2r4c5ammk0jzp4mgfgv1fgwh2mg"; type = "gem"; }; - version = "7.1.5.1"; + version = "7.1.5.2"; }; rainbow = { groups = [ @@ -7463,10 +7514,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1gb838wvrmsv2zf6g6injf1dvgxhh5km28n3xrrrqk0rjn7hy4s0"; + sha256 = "0l2fsgfzzrspgrg6x3s38hws5clgbn1aaxcmiyz5jz6xd3dpkxdz"; type = "gem"; }; - version = "0.25.1"; + version = "0.25.3"; }; redis-cluster-client = { dependencies = [ "redis-client" ]; @@ -7660,10 +7711,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1jmbf6lf7pcyacpb939xjjpn1f84c3nw83dy3p1lwjx0l2ljfif7"; + sha256 = "05y4lwzci16c2xgckmpxkzq4czgkyaiiqhvrabdgaym3aj2jd10k"; type = "gem"; }; - version = "3.4.1"; + version = "3.4.2"; }; rinku = { groups = [ "default" ]; @@ -9033,10 +9084,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0hjcaiy58zg7vpy5vsaaz6ss8w6nlkkvz1p758gdmd5wlxpfkinw"; + sha256 = "17xkgjlakaj1sipxk0d8nxvl6xis6n1a7zsv8w0wjzzv3h47d6h0"; type = "gem"; }; - version = "2.2.4"; + version = "2.4.0"; }; telesignenterprise = { dependencies = [ "telesign" ]; @@ -9044,10 +9095,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1cziz60q1pav635fln5xiag7vqvf992sk9xi1l5gxhm8ccra0izi"; + sha256 = "1wkxsv85zc7qalxj7gjv6py4chr093n9fx3plbqmfznjcd2sqbhp"; type = "gem"; }; - version = "2.2.2"; + version = "2.6.0"; }; temple = { groups = [ @@ -9277,10 +9328,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "109dh1xmsmvkg1pf3306svigh3m8kdmjqlznyk4bi2r4nws7hm6j"; + sha256 = "0kn4qn9wzypw5693kza96s52avlzw0ax7x5vq4s4cvm97zx9hd3y"; type = "gem"; }; - version = "0.15.2"; + version = "0.18.1"; }; trailblazer-option = { groups = [ "default" ]; diff --git a/pkgs/by-name/gi/gitlab/update.py b/pkgs/by-name/gi/gitlab/update.py index fa5ea1ae65d6..469d27d2f705 100755 --- a/pkgs/by-name/gi/gitlab/update.py +++ b/pkgs/by-name/gi/gitlab/update.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -I nixpkgs=../../../.. -i python3 -p bundix bundler nix-update nix python3 python3Packages.requests python3Packages.click python3Packages.click-log python3Packages.packaging prefetch-yarn-deps git +#! nix-shell -I nixpkgs=../../../.. -i python3 -p bundix bundler nix-update nix python3 python3Packages.requests python3Packages.click python3Packages.click-log python3Packages.packaging prefetch-yarn-deps git go import click import click_log @@ -44,7 +44,7 @@ class GitLabRepo: # sort, but ignore v, -ee and -gitlab for sorting comparisons versions.sort( key=lambda x: Version( - x.replace("v", "").replace("-ee", "").replace("-gitlab", "").replace("-ahmed-master-test", "") + x.replace("v", "").replace("-ee", "").replace("-gitlab", "") ), reverse=True, ) @@ -336,6 +336,29 @@ def update_gitlab_elasticsearch_indexer(): data = _get_data_json() gitlab_elasticsearch_indexer_version = data['passthru']['GITLAB_ELASTICSEARCH_INDEXER_VERSION'] _call_nix_update('gitlab-elasticsearch-indexer', gitlab_elasticsearch_indexer_version) + # Update the dependency gitlab-code-parser + src_workdir = subprocess.check_output( + [ + "nix-build", + "-A", + "gitlab-elasticsearch-indexer.src", + ], + cwd=NIXPKGS_PATH, + ).decode("utf-8").strip() + codeparser_module = json.loads( + subprocess.check_output( + [ + "go", + "list", + "-m", + "-json", + "gitlab.com/gitlab-org/rust/gitlab-code-parser/bindings/go" + ], + cwd=src_workdir + ).decode("utf-8").strip() + ) + codeparser_version = codeparser_module["Version"].replace("v", "") + _call_nix_update('gitlab-elasticsearch-indexer.codeParserBindings', codeparser_version) @cli.command("update-all") diff --git a/pkgs/by-name/go/golangci-lint/package.nix b/pkgs/by-name/go/golangci-lint/package.nix index 36e1f957f31b..6d7f1fb87be2 100644 --- a/pkgs/by-name/go/golangci-lint/package.nix +++ b/pkgs/by-name/go/golangci-lint/package.nix @@ -14,16 +14,16 @@ buildGo125Module (finalAttrs: { pname = "golangci-lint"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; tag = "v${finalAttrs.version}"; - hash = "sha256-JMFSYT9aiBdr/lOy+GYigbpMHETTQAomGZ7ehyr8U/M="; + hash = "sha256-7dHr7cd+yYofIb+yR2kKfj0k0onLH2W/YuxNor7zPeo="; }; - vendorHash = "sha256-o01naYSkPpsXSvFlphGqJR14j3IBmTGBHpsu7DUE1Xg="; + vendorHash = "sha256-QEYbFz7SJxLMblkNqaRLDn/PO+mtSPvNYiEUmZh0sLQ="; subPackages = [ "cmd/golangci-lint" ]; @@ -34,7 +34,7 @@ buildGo125Module (finalAttrs: { "-w" "-X main.version=${finalAttrs.version}" "-X main.commit=v${finalAttrs.version}" - "-X main.date=19700101-00:00:00" + "-X main.date=1970-01-01T00:00:00Z" ]; postInstall = diff --git a/pkgs/by-name/ja/jan/package.nix b/pkgs/by-name/ja/jan/package.nix index c3b1b2797695..d10693fc1729 100644 --- a/pkgs/by-name/ja/jan/package.nix +++ b/pkgs/by-name/ja/jan/package.nix @@ -6,10 +6,10 @@ let pname = "Jan"; - version = "0.6.9"; + version = "0.6.10"; src = fetchurl { url = "https://github.com/menloresearch/jan/releases/download/v${version}/jan_${version}_amd64.AppImage"; - hash = "sha256-633tZXjKWwXW7VZoHz8GpGX5GWsEoZM3FbfjUJdntOs="; + hash = "sha256-eag8c/Jp2ahV71kEuFoT2rmz0S9RPbiqy5YBO0Z+ICY="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/le/lefthook/package.nix b/pkgs/by-name/le/lefthook/package.nix index bff671b8cb7d..c10002352e91 100644 --- a/pkgs/by-name/le/lefthook/package.nix +++ b/pkgs/by-name/le/lefthook/package.nix @@ -8,7 +8,7 @@ let pname = "lefthook"; - version = "1.12.4"; + version = "1.13.0"; in buildGoModule { inherit pname version; @@ -17,7 +17,7 @@ buildGoModule { owner = "evilmartians"; repo = "lefthook"; rev = "v${version}"; - hash = "sha256-GP1pd+ZEJxArjWHtNM+wU/nCzQIvfqCIvRMcWc+iUiw="; + hash = "sha256-K7qTf5wTBhOZpYMfCs+G+EeAXClYw37H2L1tAfcVeAE="; }; vendorHash = "sha256-n+5tIEI/s32w8oWws6loFrtc8CSb2d368uqKZRkVuJs="; diff --git a/pkgs/by-name/li/linux-router/package.nix b/pkgs/by-name/li/linux-router/package.nix index ba90165b2404..1f8d51d5401c 100644 --- a/pkgs/by-name/li/linux-router/package.nix +++ b/pkgs/by-name/li/linux-router/package.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation rec { pname = "linux-router"; - version = "0.7.6"; + version = "0.8.1"; src = fetchFromGitHub { owner = "garywill"; repo = "linux-router"; tag = version; - hash = "sha256-iiIDWDPz8MBwsBcJAWVNeuGwaNJ7xh7gFfRqXTG4oGQ="; + hash = "sha256-tBrHuZKTf+7ABmE4FVYT9ny62CBa2A7va7OOFUsKJtM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/lu/luau-lsp/package.nix b/pkgs/by-name/lu/luau-lsp/package.nix index ac4326906653..5af6581ddc82 100644 --- a/pkgs/by-name/lu/luau-lsp/package.nix +++ b/pkgs/by-name/lu/luau-lsp/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "luau-lsp"; - version = "1.53.3"; + version = "1.53.5"; src = fetchFromGitHub { owner = "JohnnyMorganz"; repo = "luau-lsp"; tag = finalAttrs.version; - hash = "sha256-JO0RVrixjJWCQTVHIU/rcf78QyIb1rYGXP8+mnTpmvg="; + hash = "sha256-T0zwaBR2KYD5kcoo7mPomNVIixz/8J6ZMJSjfeVnPEs="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ma/maa-assistant-arknights/pin.json b/pkgs/by-name/ma/maa-assistant-arknights/pin.json index 55a02df863a5..2d95c6347a78 100644 --- a/pkgs/by-name/ma/maa-assistant-arknights/pin.json +++ b/pkgs/by-name/ma/maa-assistant-arknights/pin.json @@ -1,10 +1,10 @@ { "stable": { - "version": "5.24.1", - "hash": "sha256-yylPew/CKeBHrVw3mqLpGRb4osZhNBpZRCqOoEydXL0=" + "version": "5.24.2", + "hash": "sha256-wZRC/GnAodyzVh7+hKwwF3oobYmkWQb3sD1TL80YGgY=" }, "beta": { - "version": "5.24.1", - "hash": "sha256-yylPew/CKeBHrVw3mqLpGRb4osZhNBpZRCqOoEydXL0=" + "version": "5.24.2", + "hash": "sha256-wZRC/GnAodyzVh7+hKwwF3oobYmkWQb3sD1TL80YGgY=" } } diff --git a/pkgs/by-name/mi/miriway/package.nix b/pkgs/by-name/mi/miriway/package.nix index 486c8bd30eec..e69baf2f50a3 100644 --- a/pkgs/by-name/mi/miriway/package.nix +++ b/pkgs/by-name/mi/miriway/package.nix @@ -5,23 +5,25 @@ gitUpdater, nixosTests, bash, + boost, cmake, inotify-tools, pkg-config, mir, libxkbcommon, swaybg, + wayland, }: stdenv.mkDerivation (finalAttrs: { pname = "miriway"; - version = "25.02.1"; + version = "25.10"; src = fetchFromGitHub { owner = "Miriway"; repo = "Miriway"; tag = "v${finalAttrs.version}"; - hash = "sha256-+HHHF9dhVYMxugJZckAnQduuSBLAw5StbwRJF5Fz+rU="; + hash = "sha256-VAYnIMspGKSeqg+9YG6WrmoeaNNg0uLE3Ht4jJZSLLk="; }; postPatch = '' @@ -38,8 +40,10 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ bash + boost mir libxkbcommon + wayland # wayland-server.pc, for mirwayland.pc ]; postInstall = '' diff --git a/pkgs/by-name/mo/movit/package.nix b/pkgs/by-name/mo/movit/package.nix index 46541f61c5c6..cbddbec7456b 100644 --- a/pkgs/by-name/mo/movit/package.nix +++ b/pkgs/by-name/mo/movit/package.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "movit"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { url = "https://movit.sesse.net/${pname}-${version}.tar.gz"; - sha256 = "sha256-szBztwXwzLasSULPURUVFUB7QLtOmi3QIowcLLH7wRo="; + sha256 = "sha256-AKwfjkbC0+OMdcu3oa8KYVdRwVjGEctwBTCUtl7P6NU="; }; outputs = [ diff --git a/pkgs/by-name/ne/net-cpp/package.nix b/pkgs/by-name/ne/net-cpp/package.nix index 1fd254363026..49a7d8db8614 100644 --- a/pkgs/by-name/ne/net-cpp/package.nix +++ b/pkgs/by-name/ne/net-cpp/package.nix @@ -2,8 +2,8 @@ stdenv, lib, fetchFromGitLab, - fetchpatch, gitUpdater, + makeFontsConf, testers, # https://gitlab.com/ubports/development/core/lib-cpp/net-cpp/-/issues/5 boost186, @@ -19,6 +19,7 @@ properties-cpp, python3, validatePkgConfig, + writableTmpDirAsHomeHook, }: let @@ -30,13 +31,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "net-cpp"; - version = "3.1.1"; + version = "3.2.0"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lib-cpp/net-cpp"; rev = finalAttrs.version; - hash = "sha256-MSqdP3kGI9hDdxFv2a0yd5ZkFkf1lMurB+KDIZLR9jg="; + hash = "sha256-JfVSAwBWtHw7a0CtY5C1xuxThO3FbS4MgNuIO1CGuts="; }; outputs = [ @@ -45,26 +46,6 @@ stdenv.mkDerivation (finalAttrs: { "doc" ]; - patches = [ - # Be more lenient with how quickly HTTP test server must be up, for slower hardware / archs - (fetchpatch { - url = "https://salsa.debian.org/ubports-team/net-cpp/-/raw/941d9eceaa66a06eabb1eb79554548b47d4a60ab/debian/patches/1007_wait-for-flask.patch"; - hash = "sha256-nsGkZBuqahsg70PLUxn5EluDjmfZ0/wSnOYimfAI4ag="; - }) - - # Bump std version to 14 for gtest 1.13+ - (fetchpatch { - url = "https://salsa.debian.org/ubports-team/net-cpp/-/raw/f3a031eb7e4ce7df00781100f16de58a4709afcb/debian/patches/0001-Bump-std-version-to-14-needed-for-googletest-1.13.0.patch"; - hash = "sha256-3ykqCfZjtTx7zWQ5rkMhVp7D5fkpoCjl0CVFwwEd4U4="; - }) - - # Fix newer flask rejecting large chunks by default - (fetchpatch { - url = "https://salsa.debian.org/ubports-team/net-cpp/-/raw/f2050b5318cba3860fa1042e9b81e1b792b972c4/debian/patches/1008_set-MAX-CONTENT-LENGTH-for-flask-server-to-let-it-accept-big-chunks-of-data.patch"; - hash = "sha256-lfMRjpmysrhzdG6OOSpBGvYJCi1hrERI/SRf+rAakbA="; - }) - ]; - postPatch = lib.optionalString finalAttrs.finalPackage.doCheck '' # Use wrapped python. Removing just the /usr/bin doesn't seem to work? substituteInPlace tests/httpbin.h.in \ @@ -78,6 +59,7 @@ stdenv.mkDerivation (finalAttrs: { doxygen graphviz validatePkgConfig + writableTmpDirAsHomeHook # makes doc generation quieter ]; buildInputs = [ @@ -99,10 +81,11 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - # https://gitlab.com/ubports/development/core/lib-cpp/net-cpp/-/issues/4 - (lib.cmakeBool "ENABLE_WERROR" false) + (lib.cmakeBool "ENABLE_WERROR" true) ]; + env.FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; # Tests start HTTP server in separate process with fixed URL, parallelism breaks things @@ -113,13 +96,13 @@ stdenv.mkDerivation (finalAttrs: { updateScript = gitUpdater { }; }; - meta = with lib; { + meta = { description = "Simple yet beautiful networking API for C++11"; homepage = "https://gitlab.com/ubports/development/core/lib-cpp/net-cpp"; changelog = "https://gitlab.com/ubports/development/core/lib-cpp/net-cpp/-/blob/${finalAttrs.version}/ChangeLog"; - license = licenses.lgpl3Only; - teams = [ teams.lomiri ]; - platforms = platforms.linux; + license = lib.licenses.lgpl3Only; + teams = [ lib.teams.lomiri ]; + platforms = lib.platforms.linux; pkgConfigModules = [ "net-cpp" ]; diff --git a/pkgs/by-name/ni/nilfs-utils/package.nix b/pkgs/by-name/ni/nilfs-utils/package.nix index 067b2f6a305a..07ba97eb6fe7 100644 --- a/pkgs/by-name/ni/nilfs-utils/package.nix +++ b/pkgs/by-name/ni/nilfs-utils/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "nilfs-utils"; - version = "2.2.11"; + version = "2.2.12"; src = fetchFromGitHub { owner = "nilfs-dev"; repo = "nilfs-utils"; rev = "v${version}"; - sha256 = "sha256-qvs0PBkMYzGfIQ/Z2Wz0aHe2Y2Ia6fA4pMSk5Jhejf4="; + sha256 = "sha256-9IUuam5g24+eywEeNZET8TAvKJVevJBwHTHSwN9Tz58="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/by-name/np/np2kai/package.nix b/pkgs/by-name/np/np2kai/package.nix index ad771287fc13..b067bfb29ad9 100644 --- a/pkgs/by-name/np/np2kai/package.nix +++ b/pkgs/by-name/np/np2kai/package.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "np2kai"; - version = "0.86rev22-unstable-2024-12-22"; + version = "0.86rev22-unstable-2025-09-13"; src = fetchFromGitHub { owner = "AZO234"; repo = "NP2kai"; - rev = "da219658c24c610ba82d5a07ea9897e8e0eef670"; - hash = "sha256-b0KOfqUgVtFuZxw8js6JCnzMh6Wh+f7o/IHcD6TiG1s="; + rev = "02b08deb3833305251fb3ee6c5d59b0efb5b52ff"; + hash = "sha256-5aGlqYS05rUh+mD9TdCC9H+5JkOQCTn45UlEu7xcxLw="; }; # Don't require Git diff --git a/pkgs/by-name/op/opencollada/package.nix b/pkgs/by-name/op/opencollada/package.nix index 85a69f825868..b5d8cddae639 100644 --- a/pkgs/by-name/op/opencollada/package.nix +++ b/pkgs/by-name/op/opencollada/package.nix @@ -1,7 +1,8 @@ { cmake, + dos2unix, fetchFromGitHub, - fetchurl, + fetchpatch, lib, libxml2, pcre, @@ -20,13 +21,28 @@ stdenv.mkDerivation rec { sha256 = "1ym16fxx9qhf952vva71sdzgbm7ifis0h1n5fj1bfdj8zvvkbw5w"; }; - patches = [ - ./pcre.patch + # Fix freaky dos-style CLRF things + prePatch = '' + dos2unix CMakeLists.txt + ''; + patches = [ # fix build with gcc 13 - (fetchurl { + (fetchpatch { url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/opencollada/files/opencollada-1.6.68-gcc13.patch?id=b76590f9fb8615da3da9d783ad841c0e3881a27b"; - hash = "sha256-uimeLGHgXaFi61mmoaloJ5vo83c8EIQmtHEMngC2Nq4="; + hash = "sha256-oi/QhNPRnuSHfJJ071/3wnjLeg4zZUL6NwSGYvgkb/k="; + }) + + # fix pcre + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/opencollada/files/opencollada-1.6.63-pcre-fix.patch"; + hash = "sha256-igrwgmNwDKYwj6xWvWrryT5ARWJpztVmlQ0HCLQn5+Q="; + }) + + # fix build with cmake 4 + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/opencollada/files/opencollada-1.6.68-cmake4.patch?id=42f1e0614c4d056841fdc162c29a04ff0e910139"; + hash = "sha256-gbF6PPalJGgXGu4W7EptYeDq8418JdGH50LIqKqGKX0="; }) ]; @@ -43,6 +59,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config + dos2unix ]; propagatedBuildInputs = [ diff --git a/pkgs/by-name/op/opencollada/pcre.patch b/pkgs/by-name/op/opencollada/pcre.patch deleted file mode 100644 index 39408f5a61e3..000000000000 --- a/pkgs/by-name/op/opencollada/pcre.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h b/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h -index 22f2598b..269c50ca 100644 ---- a/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h -+++ b/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h -@@ -13,8 +13,7 @@ - - #include "COLLADABUPrerequisites.h" - --struct real_pcre; --typedef struct real_pcre pcre; -+#include "pcre.h" - - - namespace COLLADABU diff --git a/pkgs/by-name/pe/perses/package.nix b/pkgs/by-name/pe/perses/package.nix index 969f6fc6a2fd..0fb7c0fe0e4b 100644 --- a/pkgs/by-name/pe/perses/package.nix +++ b/pkgs/by-name/pe/perses/package.nix @@ -25,13 +25,13 @@ let in buildGoModule (finalAttrs: { pname = "perses"; - version = "0.51.1"; + version = "0.52.0"; src = fetchFromGitHub { owner = "perses"; repo = "perses"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZijrDYG/HFPBOLEFqMDzoWhRoo/GiHr0dpjhKBJRAH8="; + hash = "sha256-VjjTi+RltB4gZloAcaEtRsmFmG9CruYtDphYyAx1Tkc="; }; outputs = [ @@ -49,7 +49,7 @@ buildGoModule (finalAttrs: { inherit (finalAttrs) version src; pname = "${finalAttrs.pname}-ui"; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}"; - hash = "sha256-yBkdqOLAopEHcS4rbOUL3bLxy27l/gm60nICsL9zigk="; + hash = "sha256-TteC9/1ORUl41BvhW9rTUW6ZBmDv4ScG6OzsI6WYjiE="; }; npmRoot = "ui"; @@ -59,7 +59,7 @@ buildGoModule (finalAttrs: { preBuild = null; }; - vendorHash = "sha256-FfT3z48JaOiUTsVMmcbJdFJesO7cIMkYt/0gQ0jHh8I="; + vendorHash = "sha256-zb8LJIzCCX5bjKl6aDI/vjkaPbEQfiGKVJbpcR596WI="; ldflags = [ "-s" diff --git a/pkgs/by-name/pe/perses/plugins.nix b/pkgs/by-name/pe/perses/plugins.nix index 884dcce6970d..1758c02a222d 100644 --- a/pkgs/by-name/pe/perses/plugins.nix +++ b/pkgs/by-name/pe/perses/plugins.nix @@ -2,88 +2,108 @@ # Do not edit this file manually. { "BarChart" = { - version = "0.8.0"; - url = "https://github.com/perses/plugins/releases/download/barchart/v0.8.0/BarChart-0.8.0.tar.gz"; - hash = "sha256-YXTQyn/BN9pbhIlFZoNkiIPvmFopkJdu0LHTnBAPcWM="; + version = "0.9.0"; + url = "https://github.com/perses/plugins/releases/download/barchart/v0.9.0/BarChart-0.9.0.tar.gz"; + hash = "sha256-hh447/XUW9QNDz60VvfmDHhVF9VPwZTmjmu5nmc787Y="; }; "DatasourceVariable" = { - version = "0.2.0"; - url = "https://github.com/perses/plugins/releases/download/datasourcevariable/v0.2.0/DatasourceVariable-0.2.0.tar.gz"; - hash = "sha256-QqdikGca2ufzQ2CvXn9ThU+2ShM7twsoL6OweMs1ocw="; + version = "0.3.0"; + url = "https://github.com/perses/plugins/releases/download/datasourcevariable/v0.3.0/DatasourceVariable-0.3.0.tar.gz"; + hash = "sha256-JRvCYKYZ7eDw3smxxknmetGEQ0wKW/o+ju7a9ZV+SMw="; + }; + "FlameChart" = { + version = "0.3.0"; + url = "https://github.com/perses/plugins/releases/download/flamechart/v0.3.0/FlameChart-0.3.0.tar.gz"; + hash = "sha256-5iGeT87it7wBGKV+CHSlNohDBBbC6kNlu44NJH/+29c="; }; "GaugeChart" = { - version = "0.8.0"; - url = "https://github.com/perses/plugins/releases/download/gaugechart/v0.8.0/GaugeChart-0.8.0.tar.gz"; - hash = "sha256-vWqZZZBOq87tz01ZezdODvFOBFIU9mOfgUE5N01zcvw="; + version = "0.9.0"; + url = "https://github.com/perses/plugins/releases/download/gaugechart/v0.9.0/GaugeChart-0.9.0.tar.gz"; + hash = "sha256-7y9FnopFO0jWf1SViXEpekS16haQ7LsWf5mwszSB5So="; }; "HistogramChart" = { - version = "0.8.0"; - url = "https://github.com/perses/plugins/releases/download/histogramchart/v0.8.0/HistogramChart-0.8.0.tar.gz"; - hash = "sha256-BiBC4CgAn1JcS8dH9qv0nNYxx+Nte5ifvdrzO9yM+QA="; + version = "0.9.0"; + url = "https://github.com/perses/plugins/releases/download/histogramchart/v0.9.0/HistogramChart-0.9.0.tar.gz"; + hash = "sha256-qwSbLv1YJOL6QQmc3F65CsKupL5dPDnA76KvXSBvlJo="; + }; + "HeatMapChart" = { + version = "0.2.0"; + url = "https://github.com/perses/plugins/releases/download/heatmapchart/v0.2.0/HeatMapChart-0.2.0.tar.gz"; + hash = "sha256-6fg3Cy5xUUP5OW2WxyVVuhs5XX0t8j2Uf4qN8KLFGrE="; + }; + "Loki" = { + version = "0.1.1"; + url = "https://github.com/perses/plugins/releases/download/loki/v0.1.1/Loki-0.1.1.tar.gz"; + hash = "sha256-gyiD/7PqlZa9GukN7Ptdolq3NdJYvn1yQEMizA47/bc="; }; "Markdown" = { - version = "0.8.0"; - url = "https://github.com/perses/plugins/releases/download/markdown/v0.8.0/Markdown-0.8.0.tar.gz"; - hash = "sha256-L6bNqNp/agaV1N2Htdv072df5qUUkYexr/KKsDLOWW8="; + version = "0.9.0"; + url = "https://github.com/perses/plugins/releases/download/markdown/v0.9.0/Markdown-0.9.0.tar.gz"; + hash = "sha256-5Oywh0J7ROQ1JdBE3noxBuhcOqf5rdwFR4OkKAVQQuU="; }; "PieChart" = { - version = "0.8.0"; - url = "https://github.com/perses/plugins/releases/download/piechart/v0.8.0/PieChart-0.8.0.tar.gz"; - hash = "sha256-hp4IUDit0GgIqFKcVlf53FFBWDjbQPY0hYmsUTGKmkw="; + version = "0.9.0"; + url = "https://github.com/perses/plugins/releases/download/piechart/v0.9.0/PieChart-0.9.0.tar.gz"; + hash = "sha256-70L3QOdBv0Jy9R6b9eo1WYvqzZIzd0xDEKNeAOYU3L8="; }; "Prometheus" = { - version = "0.51.0-rc.3"; - url = "https://github.com/perses/plugins/releases/download/prometheus/v0.51.0-rc.3/Prometheus-0.51.0-rc.3.tar.gz"; - hash = "sha256-DqiYuZmWaxMzoKr0/IqciyxwOi8xf65lehwed8iCiJc="; + version = "0.53.3"; + url = "https://github.com/perses/plugins/releases/download/prometheus/v0.53.3/Prometheus-0.53.3.tar.gz"; + hash = "sha256-6cqoH+xeUj7ViwUzoEbmYnmTeJvkfHxHOTOBFNCEGZM="; + }; + "Pyroscope" = { + version = "0.3.1"; + url = "https://github.com/perses/plugins/releases/download/pyroscope/v0.3.1/Pyroscope-0.3.1.tar.gz"; + hash = "sha256-7LvYbZeDbiwp2/VlRew+jUN8xtyUk0xVr2auiXuqH14="; }; "ScatterChart" = { - version = "0.7.0"; - url = "https://github.com/perses/plugins/releases/download/scatterchart/v0.7.0/ScatterChart-0.7.0.tar.gz"; - hash = "sha256-OaX1q4Iy4x4IYVKL2aBYYQnNaHfjGiSrI+s3ZyzDfFI="; + version = "0.8.0"; + url = "https://github.com/perses/plugins/releases/download/scatterchart/v0.8.0/ScatterChart-0.8.0.tar.gz"; + hash = "sha256-3V2dZP7JgcG0ymg1hPC9YOBCksNay4IW7TSV95BLxZM="; }; "StatChart" = { - version = "0.8.0"; - url = "https://github.com/perses/plugins/releases/download/statchart/v0.8.0/StatChart-0.8.0.tar.gz"; - hash = "sha256-K6zCZ0C2Y7kTQYXYxGdBPn2pB9DzMYgn15rEwJYkt5k="; + version = "0.9.0"; + url = "https://github.com/perses/plugins/releases/download/statchart/v0.9.0/StatChart-0.9.0.tar.gz"; + hash = "sha256-w4k1Crg/wRvjlJ7DtnBWaOEGdC/Ii4YxZ8QyI6x76co="; }; "StaticListVariable" = { - version = "0.4.0"; - url = "https://github.com/perses/plugins/releases/download/staticlistvariable/v0.4.0/StaticListVariable-0.4.0.tar.gz"; - hash = "sha256-tuygC5ipfGe2KpsuHS+aaI+avCIQpfAUC+kubk+/ULs="; + version = "0.5.1"; + url = "https://github.com/perses/plugins/releases/download/staticlistvariable/v0.5.1/StaticListVariable-0.5.1.tar.gz"; + hash = "sha256-eZicvDKbzGBuxow+KawDBqHMqAtVVsm+vKW5Nn8pTXo="; }; "StatusHistoryChart" = { - version = "0.8.0"; - url = "https://github.com/perses/plugins/releases/download/statushistorychart/v0.8.0/StatusHistoryChart-0.8.0.tar.gz"; - hash = "sha256-61k3G+8bCsUErBCwvFxgnYCPLAqpCIcuF3GEZHacMB0="; + version = "0.9.0"; + url = "https://github.com/perses/plugins/releases/download/statushistorychart/v0.9.0/StatusHistoryChart-0.9.0.tar.gz"; + hash = "sha256-7RB+aVwut4HcoxzWRtKL57XzdyKeHm2cnw+AFxUvTz4="; }; "Table" = { - version = "0.7.1"; - url = "https://github.com/perses/plugins/releases/download/table/v0.7.1/Table-0.7.1.tar.gz"; - hash = "sha256-X/W2vSBddGHbEXzBW2MDxMwSMfVweSi5MtztXTURne8="; + version = "0.8.0"; + url = "https://github.com/perses/plugins/releases/download/table/v0.8.0/Table-0.8.0.tar.gz"; + hash = "sha256-kBJEVhCNuoI0UIhBnja/L0c84QEwxzhTKpsgHH8CJG8="; }; "Tempo" = { - version = "0.51.0-rc.3"; - url = "https://github.com/perses/plugins/releases/download/tempo/v0.51.0-rc.3/Tempo-0.51.0-rc.3.tar.gz"; - hash = "sha256-oy2jBdZzf86G8+6wFkFPKiOj2yyYpUD1nVSGwou9vxg="; + version = "0.53.1"; + url = "https://github.com/perses/plugins/releases/download/tempo/v0.53.1/Tempo-0.53.1.tar.gz"; + hash = "sha256-qRdL3NXi58U2LsbjFU00V/pEKsj9rS+oNigcrSfw2zA="; }; "TimeSeriesChart" = { - version = "0.9.1"; - url = "https://github.com/perses/plugins/releases/download/timeserieschart/v0.9.1/TimeSeriesChart-0.9.1.tar.gz"; - hash = "sha256-07Fuj8Zem5xHMmScD9FFZRDTNNB994SyskFv3rzwFG0="; + version = "0.10.1"; + url = "https://github.com/perses/plugins/releases/download/timeserieschart/v0.10.1/TimeSeriesChart-0.10.1.tar.gz"; + hash = "sha256-UqDtkT2ff3VZdJ0n5KytdCHNoJ0ahq5KT1XD5s2UkiE="; }; "TimeSeriesTable" = { - version = "0.8.0"; - url = "https://github.com/perses/plugins/releases/download/timeseriestable/v0.8.0/TimeSeriesTable-0.8.0.tar.gz"; - hash = "sha256-GPvoiWWaoG+EgtdqjB8IeHy4+QjXV9PkGVvlBeBZe2M="; + version = "0.9.0"; + url = "https://github.com/perses/plugins/releases/download/timeseriestable/v0.9.0/TimeSeriesTable-0.9.0.tar.gz"; + hash = "sha256-pZTXd7XYdo1XYeKNbnlwRZWY+Ff724SWJTVwbRfVTfE="; }; "TraceTable" = { - version = "0.7.0"; - url = "https://github.com/perses/plugins/releases/download/tracetable/v0.7.0/TraceTable-0.7.0.tar.gz"; - hash = "sha256-PeCR0Oe8V8dBQMjPtU6xo5hpZJIXXPyXPfOtAMp2CjU="; + version = "0.8.1"; + url = "https://github.com/perses/plugins/releases/download/tracetable/v0.8.1/TraceTable-0.8.1.tar.gz"; + hash = "sha256-V6k55+YlPr7BqBKiQMCP7nU7hZ69GRoRJ8tYTeQNZog="; }; "TracingGanttChart" = { - version = "0.7.0"; - url = "https://github.com/perses/plugins/releases/download/tracingganttchart/v0.7.0/TracingGanttChart-0.7.0.tar.gz"; - hash = "sha256-satiNlwzbHdgrHgfWs99lUCXt4tsKi/K2ON1/NNFyGU="; + version = "0.9.2"; + url = "https://github.com/perses/plugins/releases/download/tracingganttchart/v0.9.2/TracingGanttChart-0.9.2.tar.gz"; + hash = "sha256-QdcfoSk1khJMRIBozXMW/9cl2+94p4DD5xjx7UC9Cws="; }; } diff --git a/pkgs/by-name/pe/persistent-cache-cpp/package.nix b/pkgs/by-name/pe/persistent-cache-cpp/package.nix index c33362c85b85..0db45ec2837d 100644 --- a/pkgs/by-name/pe/persistent-cache-cpp/package.nix +++ b/pkgs/by-name/pe/persistent-cache-cpp/package.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitLab, - fetchpatch, gitUpdater, testers, boost, @@ -18,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "persistent-cache-cpp"; - version = "1.0.7"; + version = "1.0.9"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lib-cpp/persistent-cache-cpp"; rev = finalAttrs.version; - hash = "sha256-bOABrRSy5Mzeaqoc5ujcGXyBAaCJLv/488M7fkr0npE="; + hash = "sha256-1ETr4b0HEJIM6a4ObtKWtxn0y4gQy9fzBjE4QhMPGqU="; }; outputs = [ @@ -33,31 +32,7 @@ stdenv.mkDerivation (finalAttrs: { "doc" ]; - patches = [ - # PersistentStringCacheImpl.exceptions test fails on LLVM's libcxx, it depends on std::system_error producing a very specific exception text - # Expects "Unknown error 666", gets "unspecified generic_category error" - # Remove when https://gitlab.com/ubports/development/core/lib-cpp/persistent-cache-cpp/-/merge_requests/14 merged & in release - (fetchpatch { - name = "0001-persistent-cache-cpp-persistent_string_cache_impl_test-libcxx-fix.patch"; - url = "https://gitlab.com/ubports/development/core/lib-cpp/persistent-cache-cpp/-/commit/a696dbd3093b8333f9ee1f0cad846b2256c729c5.patch"; - hash = "sha256-SJxdXeM7W+WKEmiLTwnQYAM7YmPayEk6vPb46y4thv4="; - }) - - # Enable usage of BUILD_TESTING to opting out of tests - # Remove when https://gitlab.com/ubports/development/core/lib-cpp/persistent-cache-cpp/-/merge_requests/15 merged & in release - (fetchpatch { - name = "0002-persistent-cache-cpp-Enable-opting-out-of-tests.patch"; - url = "https://gitlab.com/ubports/development/core/lib-cpp/persistent-cache-cpp/-/commit/1fb06d28c16325e90046e93662c0f5fd16c29b4a.patch"; - hash = "sha256-2/6EYBh71S4dzqWEde+3dLOGp015fN6IifAj1bI1XAI="; - }) - ]; - postPatch = '' - # GTest needs C++17 - # Remove when https://gitlab.com/ubports/development/core/lib-cpp/persistent-cache-cpp/-/merge_requests/19 merged & in release - substituteInPlace CMakeLists.txt \ - --replace-fail 'std=c++14' 'std=c++17' - # Wrong concatenation substituteInPlace data/libpersistent-cache-cpp.pc.in \ --replace "\''${prefix}/@CMAKE_INSTALL_LIBDIR@" "\''${prefix}/lib" @@ -65,9 +40,6 @@ stdenv.mkDerivation (finalAttrs: { # Runs in parallel to other tests, limit to 1 thread substituteInPlace tests/headers/compile_headers.py \ --replace 'multiprocessing.cpu_count()' '1' - - sed '1i#include ' \ - -i tests/core/persistent_string_cache/speed_test.cpp '' + lib.optionalString finalAttrs.finalPackage.doCheck '' patchShebangs tests/{headers,whitespace}/*.py @@ -108,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { updateScript = gitUpdater { }; }; - meta = with lib; { + meta = { description = "Cache of key-value pairs with persistent storage for C++ 11"; longDescription = '' A persistent cache for arbitrary (possibly large amount of data, such as @@ -116,9 +88,9 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://gitlab.com/ubports/development/core/lib-cpp/persistent-cache-cpp"; changelog = "https://gitlab.com/ubports/development/core/lib-cpp/persistent-cache-cpp/-/blob/${finalAttrs.version}/ChangeLog"; - license = licenses.lgpl3Only; - teams = [ teams.lomiri ]; - platforms = platforms.unix; + license = lib.licenses.lgpl3Only; + teams = [ lib.teams.lomiri ]; + platforms = lib.platforms.unix; pkgConfigModules = [ "libpersistent-cache-cpp" ]; diff --git a/pkgs/by-name/re/redmine/Gemfile b/pkgs/by-name/re/redmine/Gemfile index a5dab098e25f..16c2f905e784 100644 --- a/pkgs/by-name/re/redmine/Gemfile +++ b/pkgs/by-name/re/redmine/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' ruby '>= 3.1.0', '< 3.4.0' -gem 'rails', '7.2.2.1' +gem 'rails', '7.2.2.2' gem 'rouge', '~> 4.5' gem 'mini_mime', '~> 1.1.0' gem "actionpack-xml_parser" diff --git a/pkgs/by-name/re/redmine/Gemfile.lock b/pkgs/by-name/re/redmine/Gemfile.lock index 2c44d71f273b..eafeab1ddc2f 100644 --- a/pkgs/by-name/re/redmine/Gemfile.lock +++ b/pkgs/by-name/re/redmine/Gemfile.lock @@ -1,29 +1,29 @@ GEM remote: https://rubygems.org/ specs: - actioncable (7.2.2.1) - actionpack (= 7.2.2.1) - activesupport (= 7.2.2.1) + actioncable (7.2.2.2) + actionpack (= 7.2.2.2) + activesupport (= 7.2.2.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.2.2.1) - actionpack (= 7.2.2.1) - activejob (= 7.2.2.1) - activerecord (= 7.2.2.1) - activestorage (= 7.2.2.1) - activesupport (= 7.2.2.1) + actionmailbox (7.2.2.2) + actionpack (= 7.2.2.2) + activejob (= 7.2.2.2) + activerecord (= 7.2.2.2) + activestorage (= 7.2.2.2) + activesupport (= 7.2.2.2) mail (>= 2.8.0) - actionmailer (7.2.2.1) - actionpack (= 7.2.2.1) - actionview (= 7.2.2.1) - activejob (= 7.2.2.1) - activesupport (= 7.2.2.1) + actionmailer (7.2.2.2) + actionpack (= 7.2.2.2) + actionview (= 7.2.2.2) + activejob (= 7.2.2.2) + activesupport (= 7.2.2.2) mail (>= 2.8.0) rails-dom-testing (~> 2.2) - actionpack (7.2.2.1) - actionview (= 7.2.2.1) - activesupport (= 7.2.2.1) + actionpack (7.2.2.2) + actionview (= 7.2.2.2) + activesupport (= 7.2.2.2) nokogiri (>= 1.8.5) racc rack (>= 2.2.4, < 3.2) @@ -35,35 +35,35 @@ GEM actionpack-xml_parser (2.0.1) actionpack (>= 5.0) railties (>= 5.0) - actiontext (7.2.2.1) - actionpack (= 7.2.2.1) - activerecord (= 7.2.2.1) - activestorage (= 7.2.2.1) - activesupport (= 7.2.2.1) + actiontext (7.2.2.2) + actionpack (= 7.2.2.2) + activerecord (= 7.2.2.2) + activestorage (= 7.2.2.2) + activesupport (= 7.2.2.2) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.2.2.1) - activesupport (= 7.2.2.1) + actionview (7.2.2.2) + activesupport (= 7.2.2.2) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (7.2.2.1) - activesupport (= 7.2.2.1) + activejob (7.2.2.2) + activesupport (= 7.2.2.2) globalid (>= 0.3.6) - activemodel (7.2.2.1) - activesupport (= 7.2.2.1) - activerecord (7.2.2.1) - activemodel (= 7.2.2.1) - activesupport (= 7.2.2.1) + activemodel (7.2.2.2) + activesupport (= 7.2.2.2) + activerecord (7.2.2.2) + activemodel (= 7.2.2.2) + activesupport (= 7.2.2.2) timeout (>= 0.4.0) - activestorage (7.2.2.1) - actionpack (= 7.2.2.1) - activejob (= 7.2.2.1) - activerecord (= 7.2.2.1) - activesupport (= 7.2.2.1) + activestorage (7.2.2.2) + actionpack (= 7.2.2.2) + activejob (= 7.2.2.2) + activerecord (= 7.2.2.2) + activesupport (= 7.2.2.2) marcel (~> 1.0) - activesupport (7.2.2.1) + activesupport (7.2.2.2) base64 benchmark (>= 0.3) bigdecimal @@ -80,7 +80,7 @@ GEM ast (2.4.3) base64 (0.3.0) benchmark (0.4.1) - bigdecimal (3.2.2) + bigdecimal (3.2.3) builder (3.3.0) bundle-audit (0.1.0) bundler-audit @@ -97,9 +97,9 @@ GEM regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) chunky_png (1.4.0) - commonmarker (0.23.11) + commonmarker (0.23.12) concurrent-ruby (1.3.5) - connection_pool (2.5.3) + connection_pool (2.5.4) crass (1.0.6) css_parser (1.21.1) addressable @@ -128,7 +128,7 @@ GEM pp (>= 0.6.0) rdoc (>= 4.0.0) reline (>= 0.4.2) - json (2.13.0) + json (2.14.1) language_server-protocol (3.17.0.5) listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) @@ -142,7 +142,7 @@ GEM net-imap net-pop net-smtp - marcel (1.0.4) + marcel (1.1.0) matrix (0.4.3) mini_magick (5.0.1) mini_mime (1.1.5) @@ -162,11 +162,11 @@ GEM net-smtp (0.4.0.1) net-protocol nio4r (2.7.4) - nokogiri (1.18.8) + nokogiri (1.18.10) mini_portile2 (~> 2.8.2) racc (~> 1.4) parallel (1.27.0) - parser (3.3.8.0) + parser (3.3.9.0) ast (~> 2.4.1) racc pg (1.5.9) @@ -182,7 +182,7 @@ GEM date stringio public_suffix (6.0.2) - puma (6.6.0) + puma (7.0.3) nio4r (~> 2.0) racc (1.8.1) rack (3.1.16) @@ -193,20 +193,20 @@ GEM rack (>= 1.3) rackup (2.2.1) rack (>= 3) - rails (7.2.2.1) - actioncable (= 7.2.2.1) - actionmailbox (= 7.2.2.1) - actionmailer (= 7.2.2.1) - actionpack (= 7.2.2.1) - actiontext (= 7.2.2.1) - actionview (= 7.2.2.1) - activejob (= 7.2.2.1) - activemodel (= 7.2.2.1) - activerecord (= 7.2.2.1) - activestorage (= 7.2.2.1) - activesupport (= 7.2.2.1) + rails (7.2.2.2) + actioncable (= 7.2.2.2) + actionmailbox (= 7.2.2.2) + actionmailer (= 7.2.2.2) + actionpack (= 7.2.2.2) + actiontext (= 7.2.2.2) + actionview (= 7.2.2.2) + activejob (= 7.2.2.2) + activemodel (= 7.2.2.2) + activerecord (= 7.2.2.2) + activestorage (= 7.2.2.2) + activesupport (= 7.2.2.2) bundler (>= 1.15.0) - railties (= 7.2.2.1) + railties (= 7.2.2.2) rails-dom-testing (2.3.0) activesupport (>= 5.0.0) minitest @@ -214,9 +214,9 @@ GEM rails-html-sanitizer (1.6.2) loofah (~> 2.21) nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) - railties (7.2.2.1) - actionpack (= 7.2.2.1) - activesupport (= 7.2.2.1) + railties (7.2.2.2) + actionpack (= 7.2.2.2) + activesupport (= 7.2.2.2) irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) @@ -234,10 +234,10 @@ GEM rdoc (6.14.2) erb psych (>= 4.0.0) - regexp_parser (2.10.0) - reline (0.6.1) + regexp_parser (2.11.3) + reline (0.6.2) io-console (~> 0.5) - rexml (3.4.1) + rexml (3.4.4) roadie (5.2.1) css_parser (~> 1.4) nokogiri (~> 1.15) @@ -245,7 +245,7 @@ GEM railties (>= 5.1, < 8.0) roadie (~> 5.0) rotp (6.3.0) - rouge (4.5.2) + rouge (4.6.0) rqrcode (3.1.0) chunky_png (~> 1.0) rqrcode_core (~> 2.0) @@ -277,11 +277,11 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.12.0) securerandom (0.4.1) - selenium-webdriver (4.34.0) + selenium-webdriver (4.35.0) base64 (~> 0.2) logger (~> 1.4) rexml (~> 3.2, >= 3.2.5) - rubyzip (>= 1.2.2, < 3.0) + rubyzip (>= 1.2.2, < 4.0) websocket (~> 1.0) simplecov (0.22.0) docile (~> 1.1) @@ -298,7 +298,7 @@ GEM nokogiri svg_optimizer thor - thor (1.3.2) + thor (1.4.0) timeout (0.4.3) tzinfo (2.0.6) concurrent-ruby (~> 1.0) @@ -310,9 +310,9 @@ GEM base64 websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - with_advisory_lock (5.3.0) - activerecord (>= 6.1) - zeitwerk (>= 2.6) + with_advisory_lock (7.0.1) + activerecord (>= 7.2) + zeitwerk (>= 2.7) xpath (3.2.0) nokogiri (~> 1.8) yard (0.9.37) @@ -349,7 +349,7 @@ DEPENDENCIES propshaft (~> 1.1.0) puma rack (>= 3.1.3) - rails (= 7.2.2.1) + rails (= 7.2.2.2) rails-dom-testing (>= 2.3.0) rbpdf (~> 1.21.4) roadie-rails (~> 3.2.0) @@ -372,7 +372,7 @@ DEPENDENCIES yard RUBY VERSION - ruby 3.3.8p144 + ruby 3.3.9p170 BUNDLED WITH 2.6.6 diff --git a/pkgs/by-name/re/redmine/gemset.nix b/pkgs/by-name/re/redmine/gemset.nix index 59400e25532a..ff03f21cf3e2 100644 --- a/pkgs/by-name/re/redmine/gemset.nix +++ b/pkgs/by-name/re/redmine/gemset.nix @@ -11,10 +11,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1d7z3fqanmzr6d99idvm2qj6lil2pxn5haxz7kb6f1x8fm88hfsv"; + sha256 = "09bl9jk4pljv857n98nwy8icfwxj6pf931zdr1ddnb8xkpf7m59x"; type = "gem"; }; - version = "7.2.2.1"; + version = "7.2.2.2"; }; actionmailbox = { dependencies = [ @@ -29,10 +29,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "098f12d19q64d0svzgz73w23mv2y3zmccryybp3hfi8gab14fsl9"; + sha256 = "1vw72j49ycgr3gj29mv6747zvgxgpf4zja5z6w4wlxx8hlv4ly3z"; type = "gem"; }; - version = "7.2.2.1"; + version = "7.2.2.2"; }; actionmailer = { dependencies = [ @@ -47,10 +47,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "07xjqxmwif57wxz28ch10c3c2261ydv1x56vsiidg2icqciyaamh"; + sha256 = "1rm6cch8r1zday0aasc52w3vc5gw64p1vx5vphzkrdzkjjq8lz6k"; type = "gem"; }; - version = "7.2.2.1"; + version = "7.2.2.2"; }; actionpack = { dependencies = [ @@ -69,10 +69,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0d7pq6fsf041fvskzmqm12xcgk5m9d5fa6kbs1lsbmfbgc51dchp"; + sha256 = "0vkar2bl3n5zz8jsa0rn937ixbpslfy1hqz80bfn101pzdpzklnc"; type = "gem"; }; - version = "7.2.2.1"; + version = "7.2.2.2"; }; actionpack-xml_parser = { dependencies = [ @@ -101,10 +101,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1mphlcvnfba3gd1sydcrr2i7brfwlcbxjmwjpybvcx363bjcwsgk"; + sha256 = "00dpw8ifngab7jfmd9h6lfr59c8c9fknp13invs7gw06y8y6504f"; type = "gem"; }; - version = "7.2.2.1"; + version = "7.2.2.2"; }; actionview = { dependencies = [ @@ -118,10 +118,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "19arngl1nshasvbh90gzc23z1vpid2xzg3043grbmcfqyc68iz39"; + sha256 = "01sv2s6drs8h34rag5q1bxrfilqk91zzi35wkkq5klgv2sbpxxjv"; type = "gem"; }; - version = "7.2.2.1"; + version = "7.2.2.2"; }; activejob = { dependencies = [ @@ -132,10 +132,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0nryqb19i3frxhanykf6lmrw0rb09863z114gi7sm55kff2mmygj"; + sha256 = "0mfbzar1h41w7a6i79v0y58xfpsbmis4zrpf67aj4h08c8w3h1p7"; type = "gem"; }; - version = "7.2.2.1"; + version = "7.2.2.2"; }; activemodel = { dependencies = [ "activesupport" ]; @@ -143,10 +143,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1bzxvccj8349slymls7navb5y14anglkkasphcd6gi72kqgqd643"; + sha256 = "1pc4ffzs2ay4jddhvmsy10z9kxgyrkvf1n35kxr2bmr8y0dbk638"; type = "gem"; }; - version = "7.2.2.1"; + version = "7.2.2.2"; }; activerecord = { dependencies = [ @@ -158,10 +158,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1fgscw775wj4l7f5pj274a984paz23zy0111giqkhl9dqdqiz8vr"; + sha256 = "0058rmkm9774jmx2pp45ppss33aqc22qm0ppv7zw7w8qj14y3cg6"; type = "gem"; }; - version = "7.2.2.1"; + version = "7.2.2.2"; }; activestorage = { dependencies = [ @@ -175,10 +175,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0psjqn03irbfk79x57ylaaaj83pqqcwy8b4mwrp6bmnljkzkbv5l"; + sha256 = "0rmf162xsdl1885vnwg3s6mliawj6rf8gxiv7pl64cdhj70x0a0b"; type = "gem"; }; - version = "7.2.2.1"; + version = "7.2.2.2"; }; activesupport = { dependencies = [ @@ -202,10 +202,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1xa7hr4gp2p86ly6n1j2skyx8pfg6yi621kmnh7zhxr9m7wcnaw4"; + sha256 = "1w5y2nm4v5q39ivh2a7lbw6zxz1q6lh6i3zvfbrz29wh7nxq8kn5"; type = "gem"; }; - version = "7.2.2.1"; + version = "7.2.2.2"; }; addressable = { dependencies = [ "public_suffix" ]; @@ -271,10 +271,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1p2szbr4jdvmwaaj2kxlbv1rp0m6ycbgfyp0kjkkkswmniv5y21r"; + sha256 = "06sfv80bmxfczkqi3pb3yc9zicqhf94adh5f8hpkn3bsqqd1vlgz"; type = "gem"; }; - version = "3.2.2"; + version = "3.2.3"; }; builder = { groups = [ "default" ]; @@ -346,10 +346,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1gyjwd7in1nlf8zai2fxazxi8cy6xjzswdcjway520blb39ka7cx"; + sha256 = "1k9wa8fnfz08lyn86vpqhdv4jffznlxcx6p6qr11rdf7qy4jybfs"; type = "gem"; }; - version = "0.23.11"; + version = "0.23.12"; }; concurrent-ruby = { groups = [ @@ -374,10 +374,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0nrhsk7b3sjqbyl1cah6ibf1kvi3v93a7wf4637d355hp614mmyg"; + sha256 = "02p7l47gvchbvnbag6kb4x2hg8n28r25ybslyvrr2q214wir5qg9"; type = "gem"; }; - version = "2.5.3"; + version = "2.5.4"; }; crass = { groups = [ "default" ]; @@ -627,10 +627,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1861nwzxrfn7g90zmq9mndblprcqlfs1s0lyqp37wqdmip7g3gd4"; + sha256 = "0hj6yxpi710g1pfyg0aysahqv6dzz8y3l949q1y6kw79a7br92dh"; type = "gem"; }; - version = "2.13.0"; + version = "2.14.1"; }; language_server-protocol = { groups = [ @@ -708,10 +708,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "190n2mk8m1l708kr88fh6mip9sdsh339d2s6sgrik3sbnvz4jmhd"; + sha256 = "1vhb1sbzlq42k2pzd9v0w5ws4kjx184y8h4d63296bn57jiwzkzx"; type = "gem"; }; - version = "1.0.4"; + version = "1.1.0"; }; matrix = { groups = [ @@ -883,10 +883,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0rb306hbky6cxfyc8vrwpvl40fdapjvhsk62h08gg9wwbn3n8x4c"; + sha256 = "1hcwwr2h8jnqqxmf8mfb52b0dchr7pm064ingflb78wa00qhgk6m"; type = "gem"; }; - version = "1.18.8"; + version = "1.18.10"; }; parallel = { groups = [ @@ -913,10 +913,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0i9w8msil4snx5w11ix9b0wf52vjc3r49khy3ddgl1xk890kcxi4"; + sha256 = "1wl7frfk68q6gsf6q6j32jl5m3yc0b9x8ycxz3hy79miaj9r5mll"; type = "gem"; }; - version = "3.3.8.0"; + version = "3.3.9.0"; }; pg = { groups = [ "default" ]; @@ -1010,10 +1010,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "11xd3207k5rl6bz0qxhcb3zcr941rhx7ig2f19gxxmdk7s3hcp7j"; + sha256 = "19cbhqf0yl74prdwybw44b7s8pp72ihr1knd2i8l9hl95k85y6qk"; type = "gem"; }; - version = "6.6.0"; + version = "7.0.3"; }; racc = { groups = [ @@ -1101,10 +1101,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0h5vr7wd15s4zlhrnrm97b1h5bjdlcd5lvh6x2sl6khgnh21dnxf"; + sha256 = "15yadsrxn8hf5clgrb7m8q1vdmfs5pwpa9bn1b9ya1b9brngi3zk"; type = "gem"; }; - version = "7.2.2.1"; + version = "7.2.2.2"; }; rails-dom-testing = { dependencies = [ @@ -1149,10 +1149,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "07zy8b88qxx493pc5sfkzvxqj3zcf363r1128n3hsvfx2vqipwg3"; + sha256 = "1q39j3n116wsa7nrn3xmabxcwazlv8779m2v9djcbqkvkg90cxa5"; type = "gem"; }; - version = "7.2.2.1"; + version = "7.2.2.2"; }; rainbow = { groups = [ @@ -1254,10 +1254,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0qccah61pjvzyyg6mrp27w27dlv6vxlbznzipxjcswl7x3fhsvyb"; + sha256 = "192mzi0wgwl024pwpbfa6c2a2xlvbh3mjd75a0sakdvkl60z64ya"; type = "gem"; }; - version = "2.10.0"; + version = "2.11.3"; }; reline = { dependencies = [ "io-console" ]; @@ -1269,10 +1269,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1yvm0svcdk6377ng6l00g39ldkjijbqg4whdg2zcsa8hrgbwkz0s"; + sha256 = "0ii8l0q5zkang3lxqlsamzfz5ja7jc8ln905isfdawl802k2db8x"; type = "gem"; }; - version = "0.6.1"; + version = "0.6.2"; }; rexml = { groups = [ @@ -1282,10 +1282,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1jmbf6lf7pcyacpb939xjjpn1f84c3nw83dy3p1lwjx0l2ljfif7"; + sha256 = "0hninnbvqd2pn40h863lbrn9p11gvdxp928izkag5ysx8b1s5q0r"; type = "gem"; }; - version = "3.4.1"; + version = "3.4.4"; }; roadie = { dependencies = [ @@ -1330,10 +1330,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "18v8if3jix029rr3j8iwisv73facw223353n0h7avl39ibxk6hh3"; + sha256 = "0ynxxmvzczn9a6wd87jyh209590nq6f6ls55dmwiky8fvwi8c68h"; type = "gem"; }; - version = "4.5.2"; + version = "4.6.0"; }; rqrcode = { dependencies = [ @@ -1500,10 +1500,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "07i7ifp8vpgsn9y9smvndnbx1bkcl9mmxjnq8yrf4vz6rccbfyzc"; + sha256 = "16rmdnc8c779gmphv7n4rcx8bc6yv24i555lzqx2drmrqk721jbg"; type = "gem"; }; - version = "4.34.0"; + version = "4.35.0"; }; simplecov = { dependencies = [ @@ -1609,10 +1609,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1nmymd86a0vb39pzj2cwv57avdrl6pl3lf5bsz58q594kqxjkw7f"; + sha256 = "0gcarlmpfbmqnjvwfz44gdjhcmm634di7plcx2zdgwdhrhifhqw7"; type = "gem"; }; - version = "1.3.2"; + version = "1.4.0"; }; timeout = { groups = [ "default" ]; @@ -1718,10 +1718,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0kmr064q52cr1v9026fgkif74hncnzaz4rbp384fjgw56128dcdx"; + sha256 = "12nyry5hxd00wjpxz4pfsnk95l4qkrf786vrwcsx7qi8ljls1f2q"; type = "gem"; }; - version = "5.3.0"; + version = "7.0.1"; }; xpath = { dependencies = [ "nokogiri" ]; diff --git a/pkgs/by-name/re/redmine/package.nix b/pkgs/by-name/re/redmine/package.nix index a2d683fc28ae..5677b4b1b1a4 100644 --- a/pkgs/by-name/re/redmine/package.nix +++ b/pkgs/by-name/re/redmine/package.nix @@ -9,7 +9,7 @@ }: let - version = "6.0.6"; + version = "6.0.7"; rubyEnv = bundlerEnv { name = "redmine-env-${version}"; @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://www.redmine.org/releases/redmine-${finalAttrs.version}.tar.gz"; - hash = "sha256-t6wtKIk4Brj0+9FIC3FL5UZhToMOICnUegvyajUrs/o="; + hash = "sha256-iCRWCgdnPce1nxygv5182FTGxMl9D+VVpdvrozK43+g="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/re/reviewdog/package.nix b/pkgs/by-name/re/reviewdog/package.nix index 2a90c7b6dfc5..8a04ed245d48 100644 --- a/pkgs/by-name/re/reviewdog/package.nix +++ b/pkgs/by-name/re/reviewdog/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "reviewdog"; - version = "0.20.3"; + version = "0.21.0"; src = fetchFromGitHub { owner = "reviewdog"; repo = "reviewdog"; rev = "v${version}"; - hash = "sha256-B0gu6vhbnhMx2CNQzQlIIwsycBup6bnmAk/1C6F/AWE="; + hash = "sha256-VYhn98tDyUS2HNd7sEJD/M8kln9/AMeGxm84SxSSOy8="; }; - vendorHash = "sha256-k7o2r9CQNDVGgCGoYZ02nK443eolN+UGdEp2ItEkURg="; + vendorHash = "sha256-V4hL4PHtpLV6SHg7sCbs5tHIEuosRMr7jynTFdD1eZ8="; doCheck = false; diff --git a/pkgs/by-name/si/simpleTpmPk11/package.nix b/pkgs/by-name/si/simpleTpmPk11/package.nix index e963955a255f..263df9fe399f 100644 --- a/pkgs/by-name/si/simpleTpmPk11/package.nix +++ b/pkgs/by-name/si/simpleTpmPk11/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "simple-tpm-pk11"; - version = "0.06"; + version = "0.07"; src = fetchFromGitHub { owner = "ThomasHabets"; repo = "simple-tpm-pk11"; rev = version; - sha256 = "0vpbaklr4r1a2am0pqcm6m41ph22mkcrq33y8ab5h8qkhkvhd6a6"; + sha256 = "sha256-wJ0U4ZNg60+XJTSAMs9gaMTWVePE5dfv5cZWDqwnSlY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sq/squawk/package.nix b/pkgs/by-name/sq/squawk/package.nix index 78f9c71cdbc2..dbe6b7f7de9d 100644 --- a/pkgs/by-name/sq/squawk/package.nix +++ b/pkgs/by-name/sq/squawk/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage rec { pname = "squawk"; - version = "2.24.0"; + version = "2.26.0"; src = fetchFromGitHub { owner = "sbdchd"; repo = "squawk"; tag = "v${version}"; - hash = "sha256-r5ypzFMmrk09lukGdKQK8BMX8xkA5Qiz1D6AunkUbmk="; + hash = "sha256-X1vr2WAWkv9puO5CCM6TrFg/5H5buemcplvIeYtk6Qo="; }; - cargoHash = "sha256-19dBVJPUka5ul+M5hFU+e85WjRq0So1iSaIw5STfq/Q="; + cargoHash = "sha256-eyQQ7bdbu/o5UQ7edjgs3ZLiya/q5c+jgLSWQfAs5ck="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/sy/syncstorage-rs/package.nix b/pkgs/by-name/sy/syncstorage-rs/package.nix index 2f3613ffd003..46f6ed461417 100644 --- a/pkgs/by-name/sy/syncstorage-rs/package.nix +++ b/pkgs/by-name/sy/syncstorage-rs/package.nix @@ -22,13 +22,13 @@ in rustPlatform.buildRustPackage rec { pname = "syncstorage-rs"; - version = "0.20.1"; + version = "0.21.0"; src = fetchFromGitHub { owner = "mozilla-services"; repo = "syncstorage-rs"; tag = version; - hash = "sha256-6KgPV2fi3CWEIM2w69kwn3R9w5b5E0mIlE8q8LCy5LE="; + hash = "sha256-B9eZmpNV7eOpnQZU7M6KSGgFjlCI7+Vh7rWsqKMNGm8="; }; nativeBuildInputs = [ @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec { --prefix PATH : ${lib.makeBinPath [ pyFxADeps ]} ''; - cargoHash = "sha256-yJhhqaEPsHcjSuf21ZfdLhruPvpeaDDaangxwQZUCdA="; + cargoHash = "sha256-3JW0vaTSYDF5tfjDa6nzhKA58QDODhtMEZNK3bah1VQ="; # almost all tests need a DB to test against doCheck = false; diff --git a/pkgs/by-name/ur/uriparser/package.nix b/pkgs/by-name/ur/uriparser/package.nix index c7303e4446bb..fcc368f0a788 100644 --- a/pkgs/by-name/ur/uriparser/package.nix +++ b/pkgs/by-name/ur/uriparser/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "uriparser"; - version = "0.9.8"; + version = "0.9.9"; src = fetchFromGitHub { owner = "uriparser"; repo = "uriparser"; tag = "uriparser-${finalAttrs.version}"; - hash = "sha256-U/AM8ULKGDfL3t+VUcn+t9sn4z/uc+pDjf2HHwHLI2M="; + hash = "sha256-fICEX/Hf6Shzwt1mY0SOwaYceXWf203yjUWXq874p7E="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ux/uxn/package.nix b/pkgs/by-name/ux/uxn/package.nix index 4438bbbe03e0..5d4a725e2ccb 100644 --- a/pkgs/by-name/ux/uxn/package.nix +++ b/pkgs/by-name/ux/uxn/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "uxn"; - version = "1.0-unstable-2025-08-09"; + version = "1.0-unstable-2025-09-07"; src = fetchFromSourcehut { owner = "~rabbits"; repo = "uxn"; - rev = "b56cb3501b741410188b00ffcac9010cfbe1783c"; - hash = "sha256-chw6+67JSlzelVhoQ7K1w7i61OnbmnEDyqDyaGAbflE="; + rev = "f2e858273890abcffe7451b0566669e610036f49"; + hash = "sha256-wFc8D16R9HR9riaC67SpaLxWyqiMfj7i/neL2JCnINI="; }; outputs = [ diff --git a/pkgs/by-name/we/web-ext/package.nix b/pkgs/by-name/we/web-ext/package.nix index c7dcf99954f1..ab7023b77e34 100644 --- a/pkgs/by-name/we/web-ext/package.nix +++ b/pkgs/by-name/we/web-ext/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "web-ext"; - version = "8.9.0"; + version = "8.10.0"; src = fetchFromGitHub { owner = "mozilla"; repo = "web-ext"; rev = version; - hash = "sha256-hy/Jt9P0ROXC+00kFbB1Qh9kOPjSvAREXCPI4kpsDMM="; + hash = "sha256-QAPRRsgsmMC0ZlGUf+dO1kL/ezW6Fq4tDlQVZOuJ7eI="; }; - npmDepsHash = "sha256-4Raak0Jqahc9l48SUctFKT0M1m27X8VcLyC3eJJCX1I="; + npmDepsHash = "sha256-gd56IoctqidlZbHsYXwiPDZB9WANFl4miqDVcVzpbqg="; npmBuildFlags = [ "--production" ]; diff --git a/pkgs/by-name/wh/whisparr/package.nix b/pkgs/by-name/wh/whisparr/package.nix index 50d934ded76e..2fcc319e5eb3 100644 --- a/pkgs/by-name/wh/whisparr/package.nix +++ b/pkgs/by-name/wh/whisparr/package.nix @@ -29,16 +29,16 @@ let ."${system}" or (throw "Unsupported system: ${system}"); hash = { - arm64-linux-hash = "sha256-rzxvj+jLtHzHnHY31YiJsf7hAhn2Lxzra/cfPl/ibV8="; - arm64-osx-hash = "sha256-7ITEK4Nu63BBX+WnuLN89RLtxbDn7QWQ3iFkgUEn+oc="; - x64-linux-hash = "sha256-191CTseBjOKhMX1O8vTnOOYh+x0x43r6jQyz1oU946o="; - x64-osx-hash = "sha256-DZgdcpE6kIdlL58AOlQI8V4fWytkA9QGrEW7QwIHzkM="; + arm64-linux-hash = "sha256-o2iZAgpKM/E9EL+jXpcJhQkyIfC3ytcW5erAuHsNNCo="; + arm64-osx-hash = "sha256-axa2VeieIdsjp09DG8vAlvYHX4PmqoLhiTe1OtAK8/k="; + x64-linux-hash = "sha256-bLmTovZrO3+8CrYM7h46k2TvGK0v7Mn3CXdkLgwCoD4="; + x64-osx-hash = "sha256-mExZSwmeSkssPRbRoXKN3htstPPyAju2Z7/cSZ8ZeU0="; } ."${arch}-${os}-hash"; in stdenv.mkDerivation rec { pname = "whisparr"; - version = "2.0.0.1253"; + version = "2.0.0.1278"; src = fetchurl { name = "${pname}-${arch}-${os}-${version}.tar.gz"; diff --git a/pkgs/by-name/wh/whistle/package.nix b/pkgs/by-name/wh/whistle/package.nix index 45ec34c2bb93..2796ee003565 100644 --- a/pkgs/by-name/wh/whistle/package.nix +++ b/pkgs/by-name/wh/whistle/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "whistle"; - version = "2.9.101"; + version = "2.9.102"; src = fetchFromGitHub { owner = "avwo"; repo = "whistle"; rev = "v${version}"; - hash = "sha256-Al/Rn8THQBqTx04H30PoqF4Ffm9538FiDbiPUSz0GQ4="; + hash = "sha256-SgMiCRv/MHT5FuNnuKDaMh9DbkfuBQSiPyptpZTzF+A="; }; - npmDepsHash = "sha256-UJRPeMredj/BX/ucIR1sWW+qd6awWXoEmn8Huw3g/7M="; + npmDepsHash = "sha256-pHvaRJeTIaoLBD4slSxAnR50Lt481CEGApGvzkl8Llc="; dontNpmBuild = true; diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 398818cbc06f..29dc13b403bc 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -99,7 +99,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "0.204.4"; + version = "0.204.5"; outputs = [ "out" @@ -112,7 +112,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-uK3Efx9MBvNM2fXSLq05SdLjtI+He11qgsw8r1mWUWo="; + hash = "sha256-P3mD4jaoQA4zWHjWtrvRBG25lgmudbkuFLP+Cy6xaDg="; }; patches = [ @@ -143,7 +143,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '$CARGO_ABOUT_VERSION' '${cargo-about.version}' ''; - cargoHash = "sha256-CyzitGBfZoKQKhCs09Q1skIGX+syMV7OPfQPNvX01ow="; + cargoHash = "sha256-Mlcpcp9/+ZoUdQUYpYX33uxNoAE4gAFh0twGFxi4tNw="; nativeBuildInputs = [ cmake diff --git a/pkgs/desktops/lomiri/services/biometryd/default.nix b/pkgs/desktops/lomiri/services/biometryd/default.nix index bb55e3ac1142..227d9530f14f 100644 --- a/pkgs/desktops/lomiri/services/biometryd/default.nix +++ b/pkgs/desktops/lomiri/services/biometryd/default.nix @@ -13,6 +13,7 @@ gtest, libapparmor, libelf, + nlohmann_json, pkg-config, process-cpp, properties-cpp, @@ -24,13 +25,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "biometryd"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/biometryd"; rev = finalAttrs.version; - hash = "sha256-derU7pKdNf6pwhskaW7gCLcU9ixBG3U0EI/qtANmmTs="; + hash = "sha256-OTK+JAm8MnlQGZwcKJPh+N1OfUOko24G+IU9GUBjOjI="; }; outputs = [ @@ -39,17 +40,12 @@ stdenv.mkDerivation (finalAttrs: { ]; postPatch = '' - # GTest needs C++17 - # Remove when https://gitlab.com/ubports/development/core/biometryd/-/merge_requests/39 merged & in release - substituteInPlace CMakeLists.txt \ - --replace-fail 'std=c++14' 'std=c++17' - # Substitute systemd's prefix in pkg-config call substituteInPlace data/CMakeLists.txt \ --replace-fail 'pkg_get_variable(SYSTEMD_SYSTEM_UNIT_DIR systemd systemdsystemunitdir)' 'pkg_get_variable(SYSTEMD_SYSTEM_UNIT_DIR systemd systemdsystemunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})' substituteInPlace src/biometry/qml/Biometryd/CMakeLists.txt \ - --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" + --replace-fail "\''${CMAKE_INSTALL_FULL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" # For our automatic pkg-config output patcher to work, prefix must be used here substituteInPlace data/biometryd.pc.in \ @@ -76,6 +72,7 @@ stdenv.mkDerivation (finalAttrs: { dbus-cpp libapparmor libelf + nlohmann_json process-cpp properties-cpp qtbase @@ -107,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: { updateScript = gitUpdater { }; }; - meta = with lib; { + meta = { description = "Mediates/multiplexes access to biometric devices"; longDescription = '' biometryd mediates and multiplexes access to biometric devices present @@ -115,11 +112,11 @@ stdenv.mkDerivation (finalAttrs: { them for identification and verification of users. ''; homepage = "https://gitlab.com/ubports/development/core/biometryd"; - changelog = "https://gitlab.com/ubports/development/core/biometryd/-/${finalAttrs.version}/ChangeLog"; - license = licenses.lgpl3Only; - teams = [ teams.lomiri ]; + changelog = "https://gitlab.com/ubports/development/core/biometryd/-/blob/${finalAttrs.version}/ChangeLog"; + license = lib.licenses.lgpl3Only; + teams = [ lib.teams.lomiri ]; mainProgram = "biometryd"; - platforms = platforms.linux; + platforms = lib.platforms.linux; pkgConfigModules = [ "biometryd" ]; diff --git a/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix b/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix index 2b8e5d556e81..34616ac586fc 100644 --- a/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix @@ -33,13 +33,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-indicator-network"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-indicator-network"; tag = finalAttrs.version; - hash = "sha256-R5W1MmT+H9i8NXrzOv2xaVu8TKPCRCAAswwM/tflkQ0="; + hash = "sha256-uLqPbbCBahUwj9ZG3Q7x+bXCl0yI6L7jBpg09DTrrpk="; }; outputs = [ @@ -49,14 +49,6 @@ stdenv.mkDerivation (finalAttrs: { ]; postPatch = '' - # GTest needs C++17 - # std::multimap in C++17 is not happy with this not being const - # Remove when https://gitlab.com/ubports/development/core/lomiri-indicator-network/-/merge_requests/134 merged & in release - substituteInPlace CMakeLists.txt \ - --replace-fail 'CMAKE_CXX_STANDARD 14' 'CMAKE_CXX_STANDARD 17' - substituteInPlace src/indicator/nmofono/wwan/wwan-link.h \ - --replace-fail 'bool operator()(int lhs, int rhs)' 'bool operator()(int lhs, int rhs) const' - # Override original prefixes substituteInPlace data/CMakeLists.txt \ --replace-fail 'pkg_get_variable(DBUS_SESSION_BUS_SERVICES_DIR dbus-1 session_bus_services_dir)' 'pkg_get_variable(DBUS_SESSION_BUS_SERVICES_DIR dbus-1 session_bus_services_dir DEFINE_VARIABLES datadir=''${CMAKE_INSTALL_FULL_SYSCONFDIR})' \ diff --git a/pkgs/desktops/lomiri/services/lomiri-polkit-agent/default.nix b/pkgs/desktops/lomiri/services/lomiri-polkit-agent/default.nix index 143ac620192a..fce7f3ec2836 100644 --- a/pkgs/desktops/lomiri/services/lomiri-polkit-agent/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-polkit-agent/default.nix @@ -18,22 +18,22 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-polkit-agent"; - version = "0.3"; + version = "0.3.1"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-polkit-agent"; tag = finalAttrs.version; - hash = "sha256-3x2gwKhRDXE6tuwM7pXIwsWg/8pQrKLJ1zds8Ljtk+I="; + hash = "sha256-6n/NIUstXODq1fGPF6ioXOWR39kTlzKWdAdW1LbnFy0="; }; strictDeps = true; postPatch = '' - # GTest needs C++17 - # Remove when https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/merge_requests/15 merged & in release + # CMake 4 compat + # Remove when https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/commit/cb81d853ce6dd3bb11030f5a23b6a13f926779a1 in release substituteInPlace CMakeLists.txt \ - --replace-fail 'std=c++14' 'std=c++17' + --replace-fail 'VERSION 3.5' 'VERSION 3.10' ''; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/dart/sources.nix b/pkgs/development/compilers/dart/sources.nix index d6ac23218dc6..a2ec3318e443 100644 --- a/pkgs/development/compilers/dart/sources.nix +++ b/pkgs/development/compilers/dart/sources.nix @@ -1,23 +1,23 @@ let - version = "3.9.2"; + version = "3.9.3"; in { fetchurl }: { versionUsed = version; "${version}-x86_64-darwin" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip"; - hash = "sha256-TGel6P9oew5ao8DAMS5kCxLl1eknjZG7Jc7A32YofXk="; + hash = "sha256-QnY9KG/zFj+5o/4wdR0lETHhRn3a6l340s/ybuNWxx0="; }; "${version}-aarch64-darwin" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip"; - hash = "sha256-AdBnLbgmZvcvlFLfOO4VFqcs2bwpgYvT6t34LkBVYVI="; + hash = "sha256-aMSMOV5kzd48z5aQgjjpQoJNWznz4slrXSdC8LRe8u8="; }; "${version}-aarch64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip"; - hash = "sha256-1i918/G/tEoi+9XPCltHx1hRbOyl3Me87IiJbiWD57o="; + hash = "sha256-iEfEhHv3eu2VjAYrzPjVlXle1ISHZxJoC69MbIMXw1Y="; }; "${version}-x86_64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip"; - hash = "sha256-7CLoEnFYLe+B0+EOKlVa5dPYHGlRRlo9Fs/EeTjp+So="; + hash = "sha256-0ZMR3rNRBKQaQNt642xJaxUDdFpcrtWkFdMitMJz8ds="; }; } diff --git a/pkgs/development/compilers/graalvm/community-edition/graalpy/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/graalpy/hashes.nix index 167d142eea66..e56b6ab55a3f 100644 --- a/pkgs/development/compilers/graalvm/community-edition/graalpy/hashes.nix +++ b/pkgs/development/compilers/graalvm/community-edition/graalpy/hashes.nix @@ -1,22 +1,22 @@ # Generated by update.sh script { - "version" = "24.2.2"; + "version" = "25.0.0"; "hashes" = { "aarch64-linux" = { - sha256 = "0h4bw6gdkn6b30w8sw5m4m0zk2a62yphdj6hgq634hsljh9vy7dr"; - url = "https://github.com/oracle/graalpython/releases/download/graal-24.2.2/graalpy-community-24.2.2-linux-aarch64.tar.gz"; + sha256 = "1fwvrzddwnj8y6b393qmlk2pkm6gbb9rqdwlb3dim8s8x8nljrbh"; + url = "https://github.com/oracle/graalpython/releases/download/graal-25.0.0/graalpy-community-25.0.0-linux-aarch64.tar.gz"; }; "x86_64-linux" = { - sha256 = "0pdcr4mk5qlm9m0hdmaxhi9xyjadr4mwwsygw5mnvhkngdkl4iiq"; - url = "https://github.com/oracle/graalpython/releases/download/graal-24.2.2/graalpy-community-24.2.2-linux-amd64.tar.gz"; + sha256 = "1mc8nxxrsccj9hdkyykjw07x6k9ri29idsmvjjk3qahbyhm5x3b2"; + url = "https://github.com/oracle/graalpython/releases/download/graal-25.0.0/graalpy-community-25.0.0-linux-amd64.tar.gz"; }; "x86_64-darwin" = { - sha256 = "1h56rv8mwlrgb1sivh6l0vkxfvw30qrkdny40mbp89szcw581f26"; - url = "https://github.com/oracle/graalpython/releases/download/graal-24.2.2/graalpy-community-24.2.2-macos-amd64.tar.gz"; + sha256 = "1v01nylz20kdz2zfaksxflj61liw09j8wksxipfcy5h03xjnx1hv"; + url = "https://github.com/oracle/graalpython/releases/download/graal-25.0.0/graalpy-community-25.0.0-macos-amd64.tar.gz"; }; "aarch64-darwin" = { - sha256 = "0s2ld58lfqx1qa16avi0mn96x582rq0w0f7hj6yh0pn4573fd062"; - url = "https://github.com/oracle/graalpython/releases/download/graal-24.2.2/graalpy-community-24.2.2-macos-aarch64.tar.gz"; + sha256 = "0n5va1kg2x595ggrm46vq64xb1llxan711hfhf0yi9awyxjfkhff"; + url = "https://github.com/oracle/graalpython/releases/download/graal-25.0.0/graalpy-community-25.0.0-macos-aarch64.tar.gz"; }; }; } diff --git a/pkgs/development/compilers/graalvm/community-edition/truffleruby/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/truffleruby/hashes.nix index 74b1ccff9683..0c690487fea1 100644 --- a/pkgs/development/compilers/graalvm/community-edition/truffleruby/hashes.nix +++ b/pkgs/development/compilers/graalvm/community-edition/truffleruby/hashes.nix @@ -1,22 +1,22 @@ # Generated by update.sh script { - "version" = "24.2.2"; + "version" = "25.0.0"; "hashes" = { "aarch64-linux" = { - sha256 = "0vvk60p96iskqj0f8jcyy49xd4hkhz0sdfr8c0l4c8nax1mflg0r"; - url = "https://github.com/oracle/truffleruby/releases/download/graal-24.2.2/truffleruby-community-24.2.2-linux-aarch64.tar.gz"; + sha256 = "0fhx6ban2f489zsvn3kmf60sik9gs6xhd3j97kgd6cb9lkkg7x32"; + url = "https://github.com/oracle/truffleruby/releases/download/graal-25.0.0/truffleruby-community-25.0.0-linux-aarch64.tar.gz"; }; "x86_64-linux" = { - sha256 = "0ddj2cqgzg3p6v9pbviawlrbv097rkjf47mk69pkga6apwpkk26w"; - url = "https://github.com/oracle/truffleruby/releases/download/graal-24.2.2/truffleruby-community-24.2.2-linux-amd64.tar.gz"; + sha256 = "1xamar6ff5r6cssa81bqnrv6qx269ng80yyhkp5ywl1n2q3d4jmb"; + url = "https://github.com/oracle/truffleruby/releases/download/graal-25.0.0/truffleruby-community-25.0.0-linux-amd64.tar.gz"; }; "x86_64-darwin" = { - sha256 = "0fgwgwpzvp3iw53d12a5aq0vnp189q65dkm4sqgmxmp64sra35md"; - url = "https://github.com/oracle/truffleruby/releases/download/graal-24.2.2/truffleruby-community-24.2.2-macos-amd64.tar.gz"; + sha256 = "14pap9wm264a8m83ycyq86n4szs6vsy34czfr44kxahdjqf4hg24"; + url = "https://github.com/oracle/truffleruby/releases/download/graal-25.0.0/truffleruby-community-25.0.0-macos-amd64.tar.gz"; }; "aarch64-darwin" = { - sha256 = "1l1gggvzfw97xqsdqj833brsv8rcjijw8w7dnrjl3zj5qza8qli5"; - url = "https://github.com/oracle/truffleruby/releases/download/graal-24.2.2/truffleruby-community-24.2.2-macos-aarch64.tar.gz"; + sha256 = "0zkrqqjaq7ri4bllgnr0rmfx3j6hy6m9m58xcp5i8f5as7qy1kwh"; + url = "https://github.com/oracle/truffleruby/releases/download/graal-25.0.0/truffleruby-community-25.0.0-macos-aarch64.tar.gz"; }; }; } diff --git a/pkgs/development/compilers/openjdk/11/source.json b/pkgs/development/compilers/openjdk/11/source.json index 854db3dcf00b..f6a4db45ee48 100644 --- a/pkgs/development/compilers/openjdk/11/source.json +++ b/pkgs/development/compilers/openjdk/11/source.json @@ -1,6 +1,6 @@ { - "hash": "sha256-2LZJBF8d6TsNFWBhnH7Z8i6ulavzKetPK2A9g0o79Ks=", + "hash": "sha256-yJljuO6jflh6kbe4ipflPiNDbKvKyA4grMAFu4UCM+Y=", "owner": "openjdk", "repo": "jdk11u", - "rev": "refs/tags/jdk-11.0.27+6" + "rev": "refs/tags/jdk-11.0.28+6" } diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 272ad08c71dc..dee529b4047e 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -154,7 +154,8 @@ in # FIXME: https://github.com/NixOS/nixpkgs/issues/431458 # fzf-lua throws `address already in use` on darwin # Previewer transient failure - doCheck = !stdenv.hostPlatform.isDarwin; + # UI tests fail either transiently or consistently in certain software/hardware configurations + doCheck = false; checkInputs = [ fd fzf diff --git a/pkgs/development/ocaml-modules/lambdapi/default.nix b/pkgs/development/ocaml-modules/lambdapi/default.nix index 9e6de8a37e8c..5dec72fd8101 100644 --- a/pkgs/development/ocaml-modules/lambdapi/default.nix +++ b/pkgs/development/ocaml-modules/lambdapi/default.nix @@ -4,7 +4,6 @@ buildDunePackage, alcotest, dedukti, - bindlib, camlp-streams, cmdliner, dream, @@ -20,13 +19,13 @@ buildDunePackage rec { pname = "lambdapi"; - version = "2.6.0"; + version = "3.0.0"; - minimalOCamlVersion = "4.12"; + minimalOCamlVersion = "4.14"; src = fetchurl { url = "https://github.com/Deducteam/lambdapi/releases/download/${version}/lambdapi-${version}.tbz"; - hash = "sha256-0B5fE9suq6bk/jMGZxSeAFnUiGxlH/nWtnLbLfyXZe0="; + hash = "sha256-EGau0mGP2OakAMUUfb9V6pd86NP+LlGKxnhcZ3WhuL4="; }; nativeBuildInputs = [ @@ -35,7 +34,6 @@ buildDunePackage rec { ]; buildInputs = [ lwt_ppx ]; propagatedBuildInputs = [ - bindlib camlp-streams cmdliner dream diff --git a/pkgs/development/ocaml-modules/pratter/default.nix b/pkgs/development/ocaml-modules/pratter/default.nix index 9c680b3ce742..375ab1d4ed31 100644 --- a/pkgs/development/ocaml-modules/pratter/default.nix +++ b/pkgs/development/ocaml-modules/pratter/default.nix @@ -2,28 +2,25 @@ lib, fetchFromGitLab, buildDunePackage, - camlp-streams, alcotest, qcheck, qcheck-alcotest, }: buildDunePackage rec { - version = "3.0.0"; + version = "5.0.1"; pname = "pratter"; - minimalOCamlVersion = "4.08"; + minimalOCamlVersion = "4.10"; src = fetchFromGitLab { domain = "forge.tedomum.net"; owner = "koizel"; repo = "pratter"; tag = version; - hash = "sha256-O9loVYPJ9xoYf221vBbclqNNq2AA3ImUFGHxtfK3Jwc="; + hash = "sha256-Ib7EplEvOuYcAS9cfzo5994SqCv2eiysLekYfH09IMw="; }; - propagatedBuildInputs = [ camlp-streams ]; - checkInputs = [ alcotest qcheck diff --git a/pkgs/development/python-modules/aio-pika/default.nix b/pkgs/development/python-modules/aio-pika/default.nix index 63858b74e239..17fbac0d4832 100644 --- a/pkgs/development/python-modules/aio-pika/default.nix +++ b/pkgs/development/python-modules/aio-pika/default.nix @@ -4,12 +4,10 @@ aiormq, buildPythonPackage, docker, - exceptiongroup, fetchFromGitHub, pamqp, poetry-core, pytestCheckHook, - pythonOlder, shortuuid, testcontainers, wrapt, @@ -18,23 +16,20 @@ buildPythonPackage rec { pname = "aio-pika"; - version = "9.5.5"; + version = "9.5.6"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "mosquito"; repo = "aio-pika"; tag = version; - hash = "sha256-Gs01y1VRVgk5i4JI+fqtRo6mOyzBzHM/2hJPVenc+3g="; + hash = "sha256-VpZgAAAt9d0NxSgTGnyBg5fu5GcT3Tg0qOieX7KqmyM="; }; build-system = [ poetry-core ]; dependencies = [ aiormq - exceptiongroup yarl ]; diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index 645b3b76c92f..22ea916e8758 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/pkgs/development/python-modules/apache-beam/default.nix @@ -17,6 +17,7 @@ yapf, # dependencies + beartype, crcmod, dill, fastavro, @@ -31,7 +32,6 @@ protobuf, pyarrow, pydot, - pymilvus, pymongo, python-dateutil, pytz, @@ -63,14 +63,14 @@ buildPythonPackage rec { pname = "apache-beam"; - version = "2.67.0"; + version = "2.68.0"; pyproject = true; src = fetchFromGitHub { owner = "apache"; repo = "beam"; tag = "v${version}"; - hash = "sha256-gHlbmPNtSKjYO4YPPtWnjul977APsHwe/2cq2UG4wuk="; + hash = "sha256-ENtvgu9qT1OPsDqFJQzKgIATE7F+S5I+AfoBT2iEL8M="; }; sourceRoot = "${src.name}/sdks/python"; @@ -121,6 +121,7 @@ buildPythonPackage rec { ]; dependencies = [ + beartype crcmod dill fastavro @@ -135,7 +136,6 @@ buildPythonPackage rec { protobuf pyarrow pydot - pymilvus pymongo python-dateutil pytz @@ -225,103 +225,6 @@ buildPythonPackage rec { "apache_beam/yaml/yaml_ml_test.py" "apache_beam/yaml/yaml_provider_unit_test.py" - # FIXME All those fails due to a single- AttributeError: 'MaybeReshuffle' object has no attribute 'side_inputs' - # Upstream issue https://github.com/apache/beam/issues/33854 - "apache_beam/coders/row_coder_test.py" - "apache_beam/examples/avro_nyc_trips_test.py" - "apache_beam/examples/complete/autocomplete_test.py" - "apache_beam/examples/complete/estimate_pi_test.py" - "apache_beam/examples/complete/game/game_stats_test.py" - "apache_beam/examples/complete/game/hourly_team_score_test.py" - "apache_beam/examples/complete/game/leader_board_test.py" - "apache_beam/examples/complete/game/user_score_test.py" - "apache_beam/examples/complete/tfidf_test.py" - "apache_beam/examples/complete/top_wikipedia_sessions_test.py" - "apache_beam/examples/cookbook/bigquery_side_input_test.py" - "apache_beam/examples/cookbook/bigquery_tornadoes_test.py" - "apache_beam/examples/cookbook/coders_test.py" - "apache_beam/examples/cookbook/combiners_test.py" - "apache_beam/examples/cookbook/custom_ptransform_test.py" - "apache_beam/examples/cookbook/filters_test.py" - "apache_beam/examples/matrix_power_test.py" - "apache_beam/examples/snippets/snippets_test.py" - "apache_beam/examples/snippets/transforms/aggregation/approximatequantiles_test.py" - "apache_beam/examples/snippets/transforms/aggregation/approximateunique_test.py" - "apache_beam/examples/snippets/transforms/aggregation/batchelements_test.py" - "apache_beam/examples/snippets/transforms/aggregation/cogroupbykey_test.py" - "apache_beam/examples/snippets/transforms/aggregation/combineglobally_test.py" - "apache_beam/examples/snippets/transforms/aggregation/combineperkey_test.py" - "apache_beam/examples/snippets/transforms/aggregation/combinevalues_test.py" - "apache_beam/examples/snippets/transforms/aggregation/count_test.py" - "apache_beam/examples/snippets/transforms/aggregation/distinct_test.py" - "apache_beam/examples/snippets/transforms/aggregation/groupbykey_test.py" - "apache_beam/examples/snippets/transforms/aggregation/groupintobatches_test.py" - "apache_beam/examples/snippets/transforms/aggregation/latest_test.py" - "apache_beam/examples/snippets/transforms/aggregation/max_test.py" - "apache_beam/examples/snippets/transforms/aggregation/mean_test.py" - "apache_beam/examples/snippets/transforms/aggregation/min_test.py" - "apache_beam/examples/snippets/transforms/aggregation/sample_test.py" - "apache_beam/examples/snippets/transforms/aggregation/sum_test.py" - "apache_beam/examples/snippets/transforms/aggregation/tolist_test.py" - "apache_beam/examples/snippets/transforms/aggregation/top_test.py" - "apache_beam/examples/snippets/transforms/elementwise/filter_test.py" - "apache_beam/examples/snippets/transforms/elementwise/flatmap_test.py" - "apache_beam/examples/snippets/transforms/elementwise/keys_test.py" - "apache_beam/examples/snippets/transforms/elementwise/kvswap_test.py" - "apache_beam/examples/snippets/transforms/elementwise/map_test.py" - "apache_beam/examples/snippets/transforms/elementwise/pardo_test.py" - "apache_beam/examples/snippets/transforms/elementwise/partition_test.py" - "apache_beam/examples/snippets/transforms/elementwise/regex_test.py" - "apache_beam/examples/snippets/transforms/elementwise/tostring_test.py" - "apache_beam/examples/snippets/transforms/elementwise/values_test.py" - "apache_beam/examples/snippets/transforms/elementwise/withtimestamps_test.py" - "apache_beam/examples/snippets/transforms/other/create_test.py" - "apache_beam/examples/snippets/transforms/other/flatten_test.py" - "apache_beam/examples/snippets/transforms/other/window_test.py" - "apache_beam/examples/snippets/util_test.py" - "apache_beam/io/avroio_test.py" - "apache_beam/io/concat_source_test.py" - "apache_beam/io/filebasedsink_test.py" - "apache_beam/io/filebasedsource_test.py" - "apache_beam/io/fileio_test.py" - "apache_beam/io/mongodbio_test.py" - "apache_beam/io/parquetio_test.py" - "apache_beam/io/sources_test.py" - "apache_beam/io/textio_test.py" - "apache_beam/io/tfrecordio_test.py" - "apache_beam/metrics/metric_test.py" - "apache_beam/ml/inference/base_test.py" - "apache_beam/ml/inference/sklearn_inference_test.py" - "apache_beam/ml/inference/utils_test.py" - "apache_beam/ml/rag/chunking/base_test.py" - "apache_beam/ml/rag/ingestion/base_test.py" - "apache_beam/pipeline_test.py" - "apache_beam/runners/direct/direct_runner_test.py" - "apache_beam/runners/direct/sdf_direct_runner_test.py" - "apache_beam/runners/interactive/interactive_beam_test.py" - "apache_beam/runners/interactive/interactive_runner_test.py" - "apache_beam/runners/interactive/non_interactive_runner_test.py" - "apache_beam/runners/interactive/recording_manager_test.py" - "apache_beam/runners/portability/fn_api_runner/translations_test.py" - "apache_beam/runners/portability/fn_api_runner/trigger_manager_test.py" - "apache_beam/runners/portability/stager_test.py" - "apache_beam/testing/synthetic_pipeline_test.py" - "apache_beam/testing/test_stream_test.py" - "apache_beam/testing/util_test.py" - "apache_beam/transforms/combiners_test.py" - "apache_beam/transforms/core_test.py" - "apache_beam/transforms/create_test.py" - "apache_beam/transforms/deduplicate_test.py" - "apache_beam/transforms/periodicsequence_test.py" - "apache_beam/transforms/ptransform_test.py" - "apache_beam/transforms/sideinputs_test.py" - "apache_beam/transforms/stats_test.py" - "apache_beam/transforms/transforms_keyword_only_args_test.py" - "apache_beam/transforms/trigger_test.py" - "apache_beam/transforms/userstate_test.py" - "apache_beam/transforms/util_test.py" - "apache_beam/transforms/write_ptransform_test.py" - # FIXME AttributeError: 'Namespace' object has no attribute 'test_pipeline_options' # Upstream issue https://github.com/apache/beam/issues/33853 "apache_beam/runners/portability/prism_runner_test.py" @@ -346,6 +249,39 @@ buildPythonPackage rec { ]; disabledTests = [ + # RuntimeError: This pipeline runs with the pipeline option --update_compatibility_version=2.67.0 or earlier. + # When running with this option on SDKs 2.68.0 or later, you must ensure dill==0.3.1.1 is installed. Error + "test_reshuffle_custom_window_preserves_metadata_1" + "test_reshuffle_default_window_preserves_metadata_1" + + # AttributeError: 'MaybeReshuffle' object has no attribute 'side_inputs' + # https://github.com/apache/beam/issues/33854 + "test_runner_overrides_default_pickler" + + # AssertionError: Lists differ + "test_default_resources" + "test_files_to_stage" + "test_main_session_not_staged_when_using_cloudpickle" + "test_no_main_session" + "test_populate_requirements_cache_with_local_files" + "test_requirements_cache_not_populated_when_cache_disabled" + "test_sdk_location_default" + "test_sdk_location_http" + "test_sdk_location_local_directory" + "test_sdk_location_local_source_file" + "test_sdk_location_local_wheel_file" + "test_sdk_location_remote_source_file" + "test_sdk_location_remote_wheel_file" + "test_with_extra_packages" + "test_with_jar_packages" + "test_with_main_session" + "test_with_pypi_requirements" + "test_with_requirements_file" + "test_with_requirements_file_and_cache" + + # ValueError: SplitAtFraction test completed vacuously: no non-trivial split fractions found + "test_dynamic_work_rebalancing" + # fixture 'self' not found "test_with_batched_input_exceeds_size_limit" "test_with_batched_input_splits_large_batch" @@ -383,7 +319,7 @@ buildPythonPackage rec { meta = { description = "Unified model for defining both batch and streaming data-parallel processing pipelines"; homepage = "https://beam.apache.org/"; - changelog = "https://github.com/apache/beam/blob/release-${src.tag}/CHANGES.md"; + changelog = "https://github.com/apache/beam/blob/${src.tag}/CHANGES.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ ndl ]; }; diff --git a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix index 391c90c48328..da8ca5c7dbd5 100644 --- a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix +++ b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "azure-synapse-artifacts"; - version = "0.20.0"; + version = "0.21.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_synapse_artifacts"; inherit version; - hash = "sha256-PtbBQvr2LTGRqUOzIiVH93MNTLwQNV0X1k+nfgQhZEo="; + hash = "sha256-1+N1Fs+FaeA8YE2SHjQH1xQM91I7Z7Z/dXyvmZ48juc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gto/default.nix b/pkgs/development/python-modules/gto/default.nix index 411804fe201c..0bb1848d491a 100644 --- a/pkgs/development/python-modules/gto/default.nix +++ b/pkgs/development/python-modules/gto/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "gto"; - version = "1.7.2"; + version = "1.8.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "gto"; tag = version; - hash = "sha256-8ht22RqiGWqDoBrZnX5p3KKOLVPRm1a54962qKlTK4Q="; + hash = "sha256-XgVV/WPs9QcxjVVsdvloo2+QWNViAJE404Nue7ZcBak="; }; build-system = [ @@ -78,6 +78,11 @@ buildPythonPackage rec { "remote_repo" "remote_git_repo" "test_action_doesnt_push_even_if_repo_has_remotes_set" + # ValueError: stderr not separately captured + "test_register" + "test_assign" + "test_stderr_gto_exception" + "test_stderr_exception" ]; pythonImportsCheck = [ "gto" ]; @@ -85,7 +90,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for Git Tag Operations"; homepage = "https://github.com/iterative/gto"; - changelog = "https://github.com/iterative/gto/releases/tag/${version}"; + changelog = "https://github.com/iterative/gto/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; mainProgram = "gto"; diff --git a/pkgs/development/python-modules/localstack-ext/default.nix b/pkgs/development/python-modules/localstack-ext/default.nix index 070c4ea0d9f5..2b55a08d46e9 100644 --- a/pkgs/development/python-modules/localstack-ext/default.nix +++ b/pkgs/development/python-modules/localstack-ext/default.nix @@ -22,13 +22,13 @@ buildPythonPackage rec { pname = "localstack-ext"; - version = "4.7.0"; + version = "4.8.0"; pyproject = true; src = fetchPypi { pname = "localstack_ext"; inherit version; - hash = "sha256-OLeCbAybP6SgHb2DNf8rXUrxt89mOiQfp2wxdh2A3F4="; + hash = "sha256-XW7ZjZ1Y/yIYcSxFEc5XeED5QYsE+k/AOLEymYpl7KY="; }; build-system = [ diff --git a/pkgs/development/python-modules/nessclient/default.nix b/pkgs/development/python-modules/nessclient/default.nix index 5e00564cfc45..58c3aa5bf0b8 100644 --- a/pkgs/development/python-modules/nessclient/default.nix +++ b/pkgs/development/python-modules/nessclient/default.nix @@ -9,11 +9,12 @@ pytest-asyncio, pytestCheckHook, setuptools, + setuptools-scm, }: buildPythonPackage rec { pname = "nessclient"; - version = "1.2.0"; + version = "1.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,15 +23,13 @@ buildPythonPackage rec { owner = "nickw444"; repo = "nessclient"; tag = version; - hash = "sha256-AKZwKEwICuwKyCjIFxx4Zb2r9EriC0+3evBsBE9Btak="; + hash = "sha256-E4gkrhQzA1TDmjM+NPWl1Fyoagn/pLm7BRjGSpw6LXY="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace-fail "version = '0.0.0-dev'" "version = '${version}'" - ''; - - build-system = [ setuptools ]; + build-system = [ + setuptools + setuptools-scm + ]; dependencies = [ justbackoff @@ -51,7 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python implementation/abstraction of the Ness D8x/D16x Serial Interface ASCII protocol"; homepage = "https://github.com/nickw444/nessclient"; - changelog = "https://github.com/nickw444/nessclient/releases/tag/${version}"; + changelog = "https://github.com/nickw444/nessclient/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; mainProgram = "ness-cli"; diff --git a/pkgs/development/python-modules/pyenchant/default.nix b/pkgs/development/python-modules/pyenchant/default.nix index 220880931c40..a5c440beb9eb 100644 --- a/pkgs/development/python-modules/pyenchant/default.nix +++ b/pkgs/development/python-modules/pyenchant/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pyenchant"; - version = "3.2.2"; + version = "3.3.0"; format = "setuptools"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1cf830c6614362a78aab78d50eaf7c6c93831369c52e1bb64ffae1df0341e637"; + sha256 = "sha256-glKIJGtd68lDb5GWdlCXTvDVY2RYUCYZ4yLEdvEoOJE="; }; propagatedBuildInputs = [ enchant2 ]; diff --git a/pkgs/development/python-modules/tree-sitter/default.nix b/pkgs/development/python-modules/tree-sitter/default.nix index 300366a8a4d0..15cf8b8bea00 100644 --- a/pkgs/development/python-modules/tree-sitter/default.nix +++ b/pkgs/development/python-modules/tree-sitter/default.nix @@ -1,18 +1,10 @@ { lib, - stdenv, buildPythonPackage, fetchPypi, # build-system setuptools, - - # tests - tree-sitter-python, - tree-sitter-rust, - tree-sitter-html, - tree-sitter-javascript, - tree-sitter-json, }: buildPythonPackage rec { @@ -25,33 +17,10 @@ buildPythonPackage rec { hash = "sha256-zXYa0OTR/IiksbgIO64G1PlzrPb18pu/E+qWCcHeycE="; }; - # see https://github.com/tree-sitter/py-tree-sitter/issues/330#issuecomment-2629403946 - patches = lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [ - ./segfault-patch.diff - ]; - build-system = [ setuptools ]; - nativeCheckInputs = [ - tree-sitter-python - tree-sitter-rust - tree-sitter-html - tree-sitter-javascript - tree-sitter-json - ]; - pythonImportsCheck = [ "tree_sitter" ]; - preCheck = '' - # https://github.com/NixOS/nixpkgs/issues/255262#issuecomment-1721265871 - rm -r tree_sitter - ''; - - disabledTests = [ - # test fails in nix sandbox - "test_dot_graphs" - ]; - meta = { description = "Python bindings to the Tree-sitter parsing library"; homepage = "https://github.com/tree-sitter/py-tree-sitter"; diff --git a/pkgs/development/python-modules/tree-sitter/segfault-patch.diff b/pkgs/development/python-modules/tree-sitter/segfault-patch.diff deleted file mode 100644 index 9d325ac532c0..000000000000 --- a/pkgs/development/python-modules/tree-sitter/segfault-patch.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- i/tree_sitter/core/lib/src/parser.c -+++ w/tree_sitter/core/lib/src/parser.c -@@ -2084,6 +2084,10 @@ void ts_parser_reset(TSParser *self) { - self->parse_state = (TSParseState) {0}; - } - -+// FIXME: see tree-sitter/py-tree-sitter#330 -+#if __GNUC__ >= 14 && defined(__aarch64__) && defined(__OPTIMIZE__) && !defined(__OPTIMIZE_SIZE__) -+__attribute__((optimize(2))) -+#endif - TSTree *ts_parser_parse( - TSParser *self, - const TSTree *old_tree, diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix index e574f0575dd2..37383153a2a7 100644 --- a/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/pkgs/development/tools/database/squirrel-sql/default.nix @@ -12,11 +12,11 @@ }: stdenv.mkDerivation rec { pname = "squirrel-sql"; - version = "4.8.0"; + version = "5.0.0"; src = fetchurl { url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip"; - sha256 = "sha256-uQuzh9CyGNJsbYvQiQAYmIyBgpIzXALg8dTFB1USkr0="; + sha256 = "sha256-HZYlW+HthutFP3xNUU2Wrd/Yet8oBF190gg52Wauqng="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index 66aeed199312..24dfc5a50081 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -25,13 +25,13 @@ in stdenv.mkDerivation rec { pname = "ibus-typing-booster"; - version = "2.27.73"; + version = "2.27.74"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - hash = "sha256-4P9QluxQkXxnAI4IVmBpPDfjTYVAb1p10XypzccFz4g="; + hash = "sha256-yAa/U1pL7KnJAuxaQkzbtOvdVhIgQiYCMlPnjHmoFEM="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-azure/default.nix b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-azure/default.nix index e6c91221972d..06ea9cf01606 100644 --- a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-azure/default.nix +++ b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-azure/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "steampipe-plugin-azure"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe-plugin-azure"; tag = "v${version}"; - hash = "sha256-Vtrec0g5UZGfeEGStRIr/ixgJViP/1XMOYyBmhmG2gM="; + hash = "sha256-w5q8nHdAGuGiL57ks5ctFkQjJdevT+nGySHy/nGei/c="; }; - vendorHash = "sha256-Z4HcEqFDjWNNoevbnacx9z3j/0kz3Lm23c/ko08kUhc="; + vendorHash = "sha256-3Wfqp9m4AvEqbRvjwUU1S7z+1O51XqJGPLsPke+GjCQ="; ldflags = [ "-s"