Merge master into staging-nixos

This commit is contained in:
nixpkgs-ci[bot] 2026-03-04 12:12:47 +00:00 committed by GitHub
commit ebdfe30391
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
143 changed files with 2449 additions and 7643 deletions

View file

@ -116,6 +116,8 @@
- `forgejo` has been updated to major version 14. For more information, see the [release blog post](https://forgejo.org/2026-01-release-v14-0/) and [full release notes](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/release-notes-published/14.0.0.md)
- `pulsar` has finally migrated from electron v12 to v30, backup `~/.pulsar` before upgrading. See [Pulsar on Electron 30: what it means for you](https://blog.pulsar-edit.dev/posts/20251202-savetheclocktower-pulsar-on-electron-30/).
- `bartender` has been updated to major version 6. This removes support for MacOS Sonoma (and adds support for Tahoe). For more information, see [the release notes](https://www.macbartender.com/Bartender6/release_notes/) or [the Bartender 6 support page](https://www.macbartender.com/Bartender6/support/).
- `lima` has been updated from `1.x` to `2.x`. This major update includes several breaking changes, such as `/tmp/lima` no longer being mounted by default.

View file

@ -11530,12 +11530,6 @@
github = "ivalery111";
githubId = 37245535;
};
ivan = {
email = "ivan@ludios.org";
github = "ivan";
githubId = 4458;
name = "Ivan Kozik";
};
ivan-babrou = {
email = "nixpkgs@ivan.computer";
name = "Ivan Babrou";
@ -26317,12 +26311,6 @@
name = "Trent Baldwin";
keys = [ { fingerprint = "930C 3A61 F911 1296 7DA5 56D1 665A 9E2A FCDD 68AA"; } ];
};
tbenst = {
email = "nix@tylerbenster.com";
github = "tbenst";
githubId = 863327;
name = "Tyler Benster";
};
tbidne = {
email = "tbidne@protonmail.com";
github = "tbidne";

View file

@ -38,6 +38,7 @@ let
) (lib.attrValues config.networking.vswitches)
)
++ lib.concatLists (lib.attrValues (lib.mapAttrs (n: v: v.interfaces) config.networking.bonds))
++ lib.attrNames config.networking.wireguard.interfaces
++ config.networking.dhcpcd.denyInterfaces;
arrayAppendOrNull =

View file

@ -1,3 +1,5 @@
import sys
import dataclasses
from urllib import request
from urllib.error import HTTPError
@ -43,13 +45,17 @@ class VersionFetcher:
self, ide: Ide, ignore_no_url_error=False
) -> VersionInfo | None:
if ide.update_info is None:
print(f"[!] no update info for {ide.name} in `updateInfo.json` - skipping!")
print(
f"[!] no update info for {ide.name} in `updateInfo.json` - skipping!",
file=sys.stderr,
)
return None
channel_name = ide.update_info["channel"]
channel = self.channels.get(channel_name)
if channel is None:
print(
f"[!] failed to find IDE channel {channel_name} - skipping! check {ide.name}'s `channel`!"
f"[!] failed to find IDE channel {channel_name} - skipping! check {ide.name}'s `channel`!",
file=sys.stderr,
)
return None
try:
@ -73,7 +79,8 @@ class VersionFetcher:
)
if not download_url and not ignore_no_url_error:
print(
f"[!] no valid URL found for '{ide.name}' for '{system}'! make sure `updater/updateInfo.json` contains an entry and is correct."
f"[!] no valid URL found for '{ide.name}' for '{system}'! make sure `updater/updateInfo.json` contains an entry and is correct.",
file=sys.stderr,
)
download_urls[system] = None
else:
@ -84,7 +91,10 @@ class VersionFetcher:
urls=download_urls,
)
except Exception as e:
print(f"[!] exception while trying to fetch version: {e} - skipping!")
print(
f"[!] exception while trying to fetch version: {e} - skipping!",
file=sys.stderr,
)
return None
@classmethod

View file

@ -1,10 +1,12 @@
import sys
from jetbrains_nix_updater.config import UpdaterConfig
from jetbrains_nix_updater.fetcher import VersionInfo
from jetbrains_nix_updater.ides import Ide
from jetbrains_nix_updater.util import replace_blocks, convert_hash_to_sri
def run_bin_update(ide: Ide, info: VersionInfo, config: UpdaterConfig):
def run_bin_update(ide: Ide, info: VersionInfo, config: UpdaterConfig) -> bool:
urls_nix = ""
for system, url in info.urls.items():
urls_nix += f"""
@ -33,5 +35,7 @@ def run_bin_update(ide: Ide, info: VersionInfo, config: UpdaterConfig):
),
],
)
return True
except Exception as e:
print(f"[!] Writing update info to file failed: {e}")
print(f"[!] Writing update info to file failed: {e}", file=sys.stderr)
return False

View file

@ -1,7 +1,10 @@
import sys
import json
import re
from pathlib import Path
from xmltodict import parse
from subprocess import CalledProcessError
from jetbrains_nix_updater.config import UpdaterConfig
from jetbrains_nix_updater.fetcher import VersionInfo
@ -149,10 +152,22 @@ def maven_out_path(jb_root: Path, name: str) -> Path:
return jb_root / "source" / f"{name}_maven_artefacts.json"
def run_src_update(ide: Ide, info: VersionInfo, config: UpdaterConfig):
def run_src_update(ide: Ide, info: VersionInfo, config: UpdaterConfig) -> bool:
variant = ide.name.removesuffix("-oss")
intellij_hash, intellij_outpath = prefetch_intellij_community(variant, info.version)
android_hash = prefetch_android(variant, info.version)
try:
intellij_hash, intellij_outpath = prefetch_intellij_community(
variant, info.version
)
android_hash = prefetch_android(variant, info.version)
except CalledProcessError:
print(
f"[!] Unable to fetch sources for version {info.version}. "
f"This probably means, that JetBrains has not published a source release yet for this version. "
f"Check: https://github.com/JetBrains/intellij-community/releases and https://github.com/JetBrains/android/tags",
file=sys.stderr,
)
print(f"[!] Skipping update of {ide.name}.", file=sys.stderr)
return False
jps_hash = generate_jps_hash(config, intellij_outpath)
restarter_hash = generate_restarter_hash(config, intellij_outpath)
repositories = jar_repositories(intellij_outpath)
@ -192,8 +207,8 @@ def run_src_update(ide: Ide, info: VersionInfo, config: UpdaterConfig):
],
)
except Exception as e:
print(f"[!] Writing update info to file failed: {e}")
return
print(f"[!] Writing update info to file failed: {e}", file=sys.stderr)
return False
if not config.no_maven_deps:
print("[*] Collecting maven hashes")
@ -201,3 +216,4 @@ def run_src_update(ide: Ide, info: VersionInfo, config: UpdaterConfig):
with open(maven_out_path(config.jetbrains_root, variant), "w") as f:
json.dump(maven_hashes, f, indent=4)
f.write("\n")
return True

View file

@ -1,5 +1,7 @@
#!/usr/bin/env nix-shell
#!nix-shell -i python3 -p python3 python3.pkgs.packaging python3.pkgs.xmltodict python3.pkgs.requests nurl
import sys
import argparse
import json
@ -54,12 +56,13 @@ def main():
)
print(f"[.] found IDEs to update: {', '.join(ide.name for ide in ides_to_run_for)}")
success = True
for ide in ides_to_run_for:
if ide.is_source and config.no_src:
print(f"[!] skipping {ide.name}, due to --no-src")
print(f"[!] skipping {ide.name}, due to --no-src", file=sys.stderr)
continue
if not ide.is_source and config.no_bin:
print(f"[!] skipping {ide.name}, due to --no-bin")
print(f"[!] skipping {ide.name}, due to --no-bin", file=sys.stderr)
continue
print(f"[@] updating IDE {ide.name}")
@ -67,15 +70,18 @@ def main():
info = version_fetcher.latest_version_info(
ide, ignore_no_url_error=ide.is_source
)
if info is not None:
if info is None:
success = False
else:
if config.old_version == info.version:
print("[o] Version is the same, no update required")
return
if ide.is_source:
run_src_update(ide, info, config)
success &= run_src_update(ide, info, config)
else:
run_bin_update(ide, info, config)
success &= run_bin_update(ide, info, config)
exit(0 if success else 1)
if __name__ == "__main__":

View file

@ -13,7 +13,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
name = "harper";
publisher = "elijah-potter";
version = harper.version;
hash = "sha256-3pIxfUZzUQ73AKlmcThjcuPA4kG8HBBRU0HOjn1x62g=";
hash = "sha256-nK97C9ZYSI6dh4w1ntDP0mbmv6ez3pyAfv/4D30I2sA=";
};
nativeBuildInputs = [

View file

@ -100,6 +100,6 @@ buildVscodeMarketplaceExtension {
meta = {
description = "Use any remote machine with a SSH server as your development environment";
license = lib.licenses.unfree;
maintainers = [ lib.maintainers.tbenst ];
maintainers = [ ];
};
}

View file

@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "fbneo";
version = "0-unstable-2026-02-18";
version = "0-unstable-2026-03-03";
src = fetchFromGitHub {
owner = "libretro";
repo = "fbneo";
rev = "8046cc52643861f9af98b563477de6243b4fdd9b";
hash = "sha256-hG0jAc4bMD334rPmUuj17OriGYynffZDhdhbHoDZYh4=";
rev = "7706b59fecf5a8ef81190d8d7e0abe3b08ce6d22";
hash = "sha256-D2PB2vaq1HpHAE0/c5I9YxwFPS8QQ4hSRuKu5xzJR/k=";
};
makefile = "Makefile";

View file

@ -9,13 +9,13 @@
}:
mkLibretroCore {
core = "mame";
version = "0-unstable-2026-01-31";
version = "0-unstable-2026-02-27";
src = fetchFromGitHub {
owner = "libretro";
repo = "mame";
rev = "6cdc40fc53ba5574073d4009b531fda07156ff49";
hash = "sha256-4XmQsVuieIEcLTP1CJfNrJjXD2ENkh4MPLkTVjrx8dE=";
rev = "74731455f45c08d4f303c6d07c4f1cbf791d52b6";
hash = "sha256-f0f0ajliLM2ZJjOpA7sk3pgA7LZ2JTEIl7+w/3TpFK0=";
fetchSubmodules = true;
};

View file

@ -89,8 +89,7 @@ stdenv.mkDerivation rec {
homepage = "https://rsync.samba.org/";
license = lib.licenses.gpl3Plus;
mainProgram = "rsync";
maintainers = with lib.maintainers; [
ivan
maintainers = [
];
platforms = lib.platforms.unix;
identifiers.cpeParts = {

View file

@ -8,18 +8,18 @@
}:
buildGoModule (finalAttrs: {
pname = "asdf-vm";
version = "0.18.0";
version = "0.18.1";
src = fetchFromGitHub {
owner = "asdf-vm";
repo = "asdf";
tag = "v${finalAttrs.version}";
hash = "sha256-BBd+MiRISjMz2m29nNIakG79Oy1k7bZI/Q24QQNp5CY=";
hash = "sha256-nc9fsahzOKlGtg1oA/0hnBUEkQ0BPeDWyPpl3KoDjqA=";
};
vendorHash = "sha256-gzlHXIzDYo4leP+37HgNrz5faIlrCLYA7AVSvZ6Uicc=";
vendorHash = "sha256-ru0/VvtoUMw9beycgh+TOO/FN2kqszynT4I4iDuS1Lo=";
nativeBuildInputs = [
makeWrapper

View file

@ -33,7 +33,7 @@
}:
stdenv.mkDerivation (finalAttrs: {
version = "3.07";
version = "3.09";
pname = "asymptote";
outputs = [
@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://sourceforge/asymptote/${finalAttrs.version}/asymptote-${finalAttrs.version}.src.tgz";
hash = "sha256-4CqcGw/e3VWJ1UCPCOsTMp3meTQlpMt0UpBRDcmPgy0=";
hash = "sha256-unM6mfyq8MCajo8wtG/ksr4E6mQNK/A03gGIa9Fxeuc=";
};
# override with TeX Live containers to avoid building sty, docs from source

View file

@ -27,7 +27,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
homepage = "https://github.com/BLAKE3-team/BLAKE3/";
maintainers = with lib.maintainers; [
fpletz
ivan
];
license = with lib.licenses; [
cc0

View file

@ -2,12 +2,4 @@
python3,
}:
let
python = python3.override {
self = python3;
packageOverrides = self: super: {
pyrate-limiter = super.pyrate-limiter_2;
};
};
in
python.pkgs.toPythonApplication python.pkgs.beets-minimal
python3.pkgs.toPythonApplication python3.pkgs.beets-minimal

View file

@ -2,12 +2,4 @@
python3,
}:
let
python = python3.override {
self = python3;
packageOverrides = self: super: {
pyrate-limiter = super.pyrate-limiter_2;
};
};
in
python.pkgs.toPythonApplication python.pkgs.beets
python3.pkgs.toPythonApplication python3.pkgs.beets

View file

@ -44,6 +44,6 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.gpl2;
platforms = lib.platforms.all;
homepage = "https://www.openmicroscopy.org/bio-formats/";
maintainers = [ lib.maintainers.tbenst ];
maintainers = [ ];
};
})

View file

@ -8,13 +8,13 @@
}:
buildGoModule (finalAttrs: {
pname = "bsky-cli";
version = "0.0.74";
version = "0.0.76";
src = fetchFromGitHub {
owner = "mattn";
repo = "bsky";
tag = "v${finalAttrs.version}";
hash = "sha256-pLgPQYL4+BErqRe09Pj94gLt/OoxEt9r4n+gZtZSS4Y=";
hash = "sha256-R8cKWVNk5gXj+wd0d1ZYSkxuXToXB2UZJsF7sCYGMqw=";
};
vendorHash = "sha256-f9LZHJ5yXWUUh6HdF2JPEBucWuVud3YX5l2MkHs6UXc=";

View file

@ -8,14 +8,15 @@
}:
python3Packages.buildPythonApplication rec {
pname = "calibre-web";
version = "0.6.25";
version = "0.6.26-unstable-2026-03-01";
pyproject = true;
src = fetchFromGitHub {
owner = "janeczku";
repo = "calibre-web";
tag = version;
hash = "sha256-tmSp6ABQ4KnNdUHYZPnXGfhhyhM6aczEUPd57APZnLA=";
# remember changing this back (and changelog below) to tag after new release come out
rev = "6157f5027c979aa05f8d97a09f1388ceb3085ac5";
hash = "sha256-1ljMsf8Puvq4ELUSi8Vl3T7EHcd7MO3zGgT4j5PYsT0=";
};
patches = [
@ -148,7 +149,9 @@ python3Packages.buildPythonApplication rec {
meta = {
description = "Web app for browsing, reading and downloading eBooks stored in a Calibre database";
homepage = "https://github.com/janeczku/calibre-web";
changelog = "https://github.com/janeczku/calibre-web/releases/tag/${src.tag}";
# revert back to tag based changelog
# changelog = "https://github.com/janeczku/calibre-web/releases/tag/${src.tag}";
changelog = "https://github.com/janeczku/calibre-web/compare/0.6.26...${src.rev}";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ pborzenkov ];
mainProgram = "calibre-web";

View file

@ -32,7 +32,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
mit
];
maintainers = with lib.maintainers; [
ivan
matthiasbeyer
];
};

View file

@ -38,7 +38,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
license = lib.licenses.cc0;
maintainers = with lib.maintainers; [
xrelkd
ivan
matthiasbeyer
];
};

View file

@ -1,33 +1,37 @@
{
lib,
fetchFromGitHub,
fetchpatch,
python3Packages,
withTeXLive ? true,
texliveSmall,
}:
python3Packages.buildPythonApplication (finalAttrs: {
pname = "cgt-calc";
version = "1.14.0";
# Includes updates to use pyrate-limiter v4 that are not released yet
# unfortunately.
version = "1.14.0-unstable-2026-02-23";
pyproject = true;
src = fetchFromGitHub {
owner = "KapJI";
repo = "capital-gains-calculator";
rev = "v${finalAttrs.version}";
rev = "3326514c8e99904eeeda676948c4404da6fe1adc";
hash = "sha256-6iOlDNlpfCrbRCxEJsRYw6zqOehv/buVN+iU6J6CtIk=";
};
patches = [
# https://github.com/KapJI/capital-gains-calculator/pull/715
(fetchpatch {
url = "https://github.com/KapJI/capital-gains-calculator/commit/ec7155c1256b876d5906a3885656489e9fdd798c.patch";
hash = "sha256-pfGHSKuDRF0T1hP7kpRC285limd1voqLXcXCP7mAD3s=";
})
];
pythonRelaxDeps = [
# The built wheel holds an upper bound requirement for the version of these
# dependenceis, while pyproject.toml doesn't. Upstream's `uv.lock` even
# uses yfinance 1.2.0 . See:
# https://github.com/KapJI/capital-gains-calculator/pull/744
"defusedxml"
"yfinance"
];
pythonRemoveDeps = [
# Upstream's uv.lock doesn't reference this dependency, and lists
# pyrate-limiter instead. The built wheel from some reason requests it
# never the less.
"requests-ratelimiter"
];
build-system = with python3Packages; [

View file

@ -2,22 +2,24 @@
lib,
stdenvNoCC,
fetchurl,
installFonts,
}:
stdenvNoCC.mkDerivation rec {
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "cm-unicode";
version = "0.7.0";
src = fetchurl {
url = "mirror://sourceforge/cm-unicode/cm-unicode/${version}/${pname}-${version}-otf.tar.xz";
url = "mirror://sourceforge/cm-unicode/cm-unicode/${finalAttrs.version}/cm-unicode-${finalAttrs.version}-otf.tar.xz";
hash = "sha256-VIp+vk1IYbEHW15wMrfGVOPqg1zBZDpgFx+jlypOHCg=";
};
installPhase = ''
nativeBuildInputs = [ installFonts ];
InstallPhase = ''
runHook preInstall
install -m444 -Dt $out/share/fonts/opentype *.otf
install -m444 -Dt $out/share/doc/${pname}-${version} README FontLog.txt
install -m444 -Dt $out/share/doc/$cm-unicode-${finalAttrs.version} README FontLog.txt
runHook postInstall
'';
@ -32,4 +34,4 @@ stdenvNoCC.mkDerivation rec {
license = lib.licenses.ofl;
platforms = lib.platforms.all;
};
}
})

View file

@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
biomedical images, CMTK comprises a set of command line tools and a
back-end general-purpose library for processing and I/O
'';
maintainers = with lib.maintainers; [ tbenst ];
maintainers = [ ];
platforms = lib.platforms.all;
license = lib.licenses.gpl3Plus;
homepage = "https://www.nitrc.org/projects/cmtk/";

View file

@ -27,13 +27,13 @@
stdenv.mkDerivation {
pname = "curv";
version = "0.5-unstable-2026-01-23";
version = "0.5-unstable-2026-01-30";
src = fetchFromCodeberg {
owner = "doug-moen";
repo = "curv";
rev = "17d03b534c69976ed60936beb8b7cc38e8c12c13";
hash = "sha256-qQLcRCha01b6ClUSPO2jMBDJsN28EhqzakTLu1medAQ=";
rev = "6a157d444e1d50628af6bb36b6c29bd4681451d5";
hash = "sha256-y9cfJYhgQrrerU6r7DYHABkw4LQGqcaagVEbSK7AkOg=";
fetchSubmodules = true;
};

View file

@ -14,7 +14,7 @@
ocamlPackages.buildDunePackage rec {
pname = "docfd";
version = "12.3.1";
version = "12.3.2";
minimalOCamlVersion = "5.1";
@ -22,7 +22,7 @@ ocamlPackages.buildDunePackage rec {
owner = "darrenldl";
repo = "docfd";
rev = version;
hash = "sha256-PiA3nN/NTz+4yLYgr2uN7SGcGJhO2VZ3QHF3jlDeUbc=";
hash = "sha256-d7c72jXadwBtUqarfdGnEDo9yFwCAeEX0GGVqCe70Ak=";
};
# Compatibility with nottui ≥ 0.4

View file

@ -8,16 +8,16 @@
buildGoModule (finalAttrs: {
pname = "eksctl";
version = "0.223.0";
version = "0.224.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = "eksctl";
rev = finalAttrs.version;
hash = "sha256-AGtKkfEeLwL0mSdObL8fS2wOHgFr/lKahImvj5Ox7qo=";
hash = "sha256-VjrR5jm4tpUz5mrW4dyTqkzPvJ0Z+zTuwSofddN3aD0=";
};
vendorHash = "sha256-qU2Cb9ob9/jMFMS8eanxjxpQSjfV71t8gLa4HfSu0Ok=";
vendorHash = "sha256-y23zOfe8Y+ysFP/zRS6T6+BwafdLUv0mSlpp50U8WUc=";
doCheck = false;

View file

@ -18,14 +18,14 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "faugus-launcher";
version = "1.15.2";
version = "1.15.10";
pyproject = false;
src = fetchFromGitHub {
owner = "Faugus";
repo = "faugus-launcher";
tag = finalAttrs.version;
hash = "sha256-sfLgwy52yrOWpl+T2BElxDWBkma+wh0keUz9oVtL6LA=";
hash = "sha256-lt9pdGtWCZoiH6/dNtfEtt84qT0xcqumP19IxcyMoEw=";
};
nativeBuildInputs = [

View file

@ -29,7 +29,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "freefilesync";
version = "14.7";
version = "14.8";
src = fetchurl {
url = "https://freefilesync.org/download/FreeFileSync_${finalAttrs.version}_Source.zip";
@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
rm -f "$out"
tryDownload "$url" "$out"
'';
hash = "sha256-WMSaKA3OA63V6Vis83vXa+y0ZRE0YxgXiB8YAyTSTc8=";
hash = "sha256-vIvM6j4gDQcsRjgczQqxbV4XvDQECCLvuTflkebMFU8=";
};
sourceRoot = ".";

View file

@ -3,28 +3,28 @@ index a40eea3..23ec896 100644
--- a/FreeFileSync/Source/ui/gui_generated.cpp
+++ b/FreeFileSync/Source/ui/gui_generated.cpp
@@ -5553,8 +5553,6 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS
wxBoxSizer* bSizer183;
bSizer183 = new wxBoxSizer( wxHORIZONTAL );
wxBoxSizer* bSizer183;
bSizer183 = new wxBoxSizer( wxHORIZONTAL );
- m_bitmapAnimalSmall = new wxStaticBitmap( m_panelDonate, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
- bSizer183->Add( m_bitmapAnimalSmall, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
- m_bitmapAnimalSmall = new wxStaticBitmap( m_panelDonate, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
- bSizer183->Add( m_bitmapAnimalSmall, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
wxPanel* m_panel39;
m_panel39 = new wxPanel( m_panelDonate, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
wxPanel* m_panel39;
m_panel39 = new wxPanel( m_panelDonate, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
@@ -5567,13 +5565,11 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS
m_staticTextDonate->Wrap( -1 );
m_staticTextDonate->SetForegroundColour( wxColour( 0, 0, 0 ) );
m_staticTextDonate->Wrap( -1 );
m_staticTextDonate->SetForegroundColour( wxColour( 0, 0, 0 ) );
- bSizer184->Add( m_staticTextDonate, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxALIGN_CENTER_VERTICAL, 10 );
- bSizer184->Add( m_staticTextDonate, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxALIGN_CENTER_VERTICAL, 10 );
m_panel39->SetSizer( bSizer184 );
m_panel39->Layout();
bSizer184->Fit( m_panel39 );
- bSizer183->Add( m_panel39, 1, wxTOP|wxBOTTOM|wxRIGHT|wxEXPAND, 5 );
m_panel39->SetSizer( bSizer184 );
m_panel39->Layout();
bSizer184->Fit( m_panel39 );
- bSizer183->Add( m_panel39, 1, wxTOP|wxBOTTOM|wxRIGHT|wxEXPAND, 5 );
m_panelDonate->SetSizer( bSizer183 );
m_panelDonate->SetSizer( bSizer183 );
diff --git a/FreeFileSync/Source/ui/small_dlgs.cpp b/FreeFileSync/Source/ui/small_dlgs.cpp
index 933fe81..734201f 100644
--- a/FreeFileSync/Source/ui/small_dlgs.cpp

View file

@ -8,11 +8,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "gerrit";
version = "3.13.3";
version = "3.13.4";
src = fetchurl {
url = "https://gerrit-releases.storage.googleapis.com/gerrit-${finalAttrs.version}.war";
hash = "sha256-kWS7bNE3WARqBGVesZIAvMAqjaJEvnAfwf9qihZ7nlI=";
hash = "sha256-2CswgkpKe8XRx24497dTagfy+kWiLluac+q9l+UlA4k=";
};
buildCommand = ''

View file

@ -11,13 +11,13 @@
buildNpmPackage rec {
pname = "ghostfolio";
version = "2.242.0";
version = "2.246.0";
src = fetchFromGitHub {
owner = "ghostfolio";
repo = "ghostfolio";
tag = version;
hash = "sha256-xjY03/3sFUmwlRiNcBPoAK620VS7sgruz41BESMa5Vg=";
hash = "sha256-i3ZTxGNGHmDgQ9XFTYrXDOPhqfkBCD2O/9PdXxSF9hc=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@ -27,7 +27,7 @@ buildNpmPackage rec {
'';
};
npmDepsHash = "sha256-ey34WKyCT269Sgf1Kti9ZBeZSvNBcpkM4F/X2ibJktQ=";
npmDepsHash = "sha256-4nLNRIBvYZuwWFqp7nfrEvvLkTzii8KAbdzRdwj9Ahg=";
nativeBuildInputs = [
prisma_6

View file

@ -1,11 +1,11 @@
diff --git a/Makefile b/Makefile
index e75c22e80b..f702da6f80 100644
index e571d0f2bf..3bbb081a55 100644
--- a/Makefile
+++ b/Makefile
@@ -757,12 +757,8 @@
@@ -714,12 +714,8 @@
# otherwise try to rebuild all targets depending on it whenever we build
# something else. We thus depend on the Makefile instead.
${DEPENDENCY_DIR}/git-%/Makefile: ${DEPENDENCY_DIR}/git-%.version
# something else. We thus depend on the meson.build file instead.
${DEPENDENCY_DIR}/git-%/meson.build: ${DEPENDENCY_DIR}/git-%.version
- ${Q}${GIT} -c init.defaultBranch=master init ${GIT_QUIET} "${@D}"
- ${Q}${GIT} -C "${@D}" config remote.origin.url ${GIT_REPO_URL}
- ${Q}${GIT} -C "${@D}" config remote.origin.tagOpt --no-tags
@ -14,6 +14,6 @@ index e75c22e80b..f702da6f80 100644
- ${Q}${GIT} -C "${@D}" checkout ${GIT_QUIET} --detach FETCH_HEAD
+ cp -r ${GIT_REPO_PATH} "${@D}"
+ chmod -R oga+rw "${@D}"
ifeq ($(OVERRIDE_GIT_VERSION),)
${Q}rm -f "${@D}"/version
else
@ # We're doing a shallow clone without any tags, so Git's default way to figure out the version via git-describe(1)
@ # will fail. We thus have to help Git a bit: if we're asked to build from a commit directly we extract the
@ # current version of Git from "GIT-VERSION-GEN" and append the first 8 characters of the commit ID to it.

View file

@ -1,5 +1,5 @@
{
"version": "2.52-a37bb2ae",
"rev": "a37bb2ae6c6659cf7cefd0412759fca5202a823d",
"hash": "sha256-A1FOzmVe2e73pie0WYJPwsKOb5BGNrusGy0wXa9ruvI="
"version": "2.52-aea8cc3a",
"rev": "aea8cc3a10c325a22a75e2d4f582db959d3854ae",
"hash": "sha256-YT5yPnuP4Rv7Q88lzFiPN29K5iGRys1FfHzw4jVmWVg="
}

View file

@ -7,6 +7,8 @@
pcre2,
zlib,
git,
meson,
ninja,
pkg-config,
openssl,
}:
@ -44,6 +46,8 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
git # clones our repo from the store
meson
ninja
pkg-config
];
# git inputs
@ -54,6 +58,10 @@ stdenv.mkDerivation (finalAttrs: {
curl
];
# Meson and ninja are required to build git, but gitaly doesn't use them
dontUseMesonConfigure = true;
dontUseNinjaBuild = true;
# required to support pthread_cancel()
NIX_LDFLAGS =
lib.optionalString (stdenv.cc.isGNU && stdenv.hostPlatform.libc == "glibc") "-lgcc_s"

View file

@ -7,7 +7,7 @@
}:
let
version = "18.8.5";
version = "18.9.1";
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-XbKEw21WRkh/kUeoS9Z+/SpEtqjflad2P5vi6U2wSbM=";
hash = "sha256-H5zAd5/sHrRuEp1v/gMDY/9DyCMWmzpb3Ws6aTfX2k8=";
};
vendorHash = "sha256-CSjsxwumKUbp/tSewE8iAp4c3DH6V6fNY4OCgzjvHP0=";
vendorHash = "sha256-lK0fNBhDGFOZ+sCm1VuvN4CpAb0nAkUl4yL/30tZKBY=";
ldflags = [
"-X ${gitaly_package}/internal/version.version=${version}"

View file

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "gitlab-code-parser";
version = "0.21.1";
version = "0.22.0";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "rust/gitlab-code-parser";
tag = "v${finalAttrs.version}";
hash = "sha256-aA1zwauomznayHVGRdoQYaaba8Mq39LzjSwrvVivN2E=";
hash = "sha256-H2C/OgTdIDuCX2tkDb/kJclrLBaSjkqbRtCNf/OYE4Q=";
};
cargoHash = "sha256-oiYV+o30NrLkewfEU0z8OzkaHFWExa2gbExewHBDxSo=";
cargoHash = "sha256-xOiUO/qGliZwHeGVmr/v318tlO5RvDBoF5cz8BYwXZY=";
nativeBuildInputs = [
pkg-config

View file

@ -11,17 +11,17 @@ let
in
buildGoModule (finalAttrs: {
pname = "gitlab-elasticsearch-indexer";
version = "5.12.2";
version = "5.13.3";
# nixpkgs-update: no auto update
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-elasticsearch-indexer";
rev = "v${finalAttrs.version}";
hash = "sha256-dfDZIVDtCtph4zMS+3qT7dMlbUXZCIfr8rIBemHFMQ0=";
hash = "sha256-0FLAqjbafYsmr21OwNJceikC5Qdr5BIAuHnl1x8oiXs=";
};
vendorHash = "sha256-LwBc/eQ2AQan8SsH+kugAeUv4O31WOx3Qnd1tB580wY=";
vendorHash = "sha256-2RlRCkqxupOvmyBe/zQC3Lyp9x0KHnTa6UnxldK1YZQ=";
buildInputs = [ icu ];
nativeBuildInputs = [ pkg-config ];

View file

@ -6,14 +6,14 @@
buildGoModule (finalAttrs: {
pname = "gitlab-pages";
version = "18.8.5";
version = "18.9.1";
# nixpkgs-update: no auto update
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-pages";
rev = "v${finalAttrs.version}";
hash = "sha256-g2vjiwzsB2rysaAkULCStdvfOpfagCpdhdJmeCAoMxg=";
hash = "sha256-DYifmE0vuJFTCCJiEDcOHOKJA3suEAJ89Ecy/fkcwf4=";
};
vendorHash = "sha256-AZIv/CU01OAbn5faE4EkSuDCakYzDjRprB5ox5tIlck=";

View file

@ -8,14 +8,14 @@
buildGoModule (finalAttrs: {
pname = "gitlab-shell";
version = "14.45.5";
version = "14.45.6";
# nixpkgs-update: no auto update
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-shell";
rev = "v${finalAttrs.version}";
hash = "sha256-D3keb81A7gyZbmJmCZJpyYFC1+JijwwbMngurAPTSKs=";
hash = "sha256-Z7Vw7d70+RAG60aXuYRFMFZHpX/eU0+2FUPoAsWe8dI=";
};
buildInputs = [
@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
./remove-hardcoded-locations.patch
];
vendorHash = "sha256-e8AXSryVZeVG+0cG7M3QAVCLSTdJEXLH8ZkLvCtWatU=";
vendorHash = "sha256-pfKRPZl6xw93rNBDUNJihQQ+3ZnoOOUVJpHZw68pztQ=";
subPackages = [
"cmd/gitlab-shell"

View file

@ -1,17 +1,17 @@
diff --git a/internal/config/config.go b/internal/config/config.go
index 36f8625..72ede08 100644
index 99a370c5df..68bf5cdf5b 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -12,7 +12,7 @@ import (
@@ -20,7 +20,7 @@
)
const (
- configFile = "config.yml"
+ configFile = "shell-config.yml"
defaultSecretFileName = ".gitlab_shell_secret"
defaultSecretFileName = ".gitlab_shell_secret" //nolint:gosec // Not actual credentials, just field name
)
@@ -91,7 +91,7 @@ func (c *Config) GetHttpClient() *client.HttpClient {
@@ -187,7 +187,7 @@
// NewFromDirExternal returns a new config from a given root dir. It also applies defaults appropriate for
// gitlab-shell running in an external SSH server.
func NewFromDirExternal(dir string) (*Config, error) {
@ -21,23 +21,23 @@ index 36f8625..72ede08 100644
return nil, err
}
diff --git a/internal/keyline/key_line.go b/internal/keyline/key_line.go
index c6f2422..fb0426b 100644
index 6758561e42..f1aaecaf14 100644
--- a/internal/keyline/key_line.go
+++ b/internal/keyline/key_line.go
@@ -37,7 +37,7 @@ func NewPrincipalKeyLine(keyId, principal string, config *config.Config) (*KeyLi
}
@@ -46,7 +46,7 @@
// ToString converts a KeyLine to a string representation
func (k *KeyLine) ToString() string {
- command := fmt.Sprintf("%s %s-%s", path.Join(k.Config.RootDir, executable.BinDir, executable.GitlabShell), k.Prefix, k.ID)
+ command := fmt.Sprintf("%s %s-%s", path.Join("/run/current-system/sw/bin", executable.GitlabShell), k.Prefix, k.ID)
return fmt.Sprintf(`command="%s",%s %s`, command, SshOptions, k.Value)
return fmt.Sprintf(`command="%s",%s %s`, command, SSHOptions, k.Value)
}
diff --git a/support/gitlab_config.rb b/support/gitlab_config.rb
index 52ac5ee..d96baa3 100644
index 52ac5eecdb..d96baa3d1b 100644
--- a/support/gitlab_config.rb
+++ b/support/gitlab_config.rb
@@ -7,7 +7,7 @@ class GitlabConfig
@@ -7,7 +7,7 @@
attr_reader :config
def initialize

View file

@ -1,17 +1,17 @@
{
"version": "18.8.5",
"repo_hash": "sha256-oBCtpkpN14B6zJzj9x42JV1Rq77qlPfbQuJ/TcWF8MU=",
"yarn_hash": "sha256-s4+NpzynaR5ab1DlXRMmtOeFZCwpexMoWjwX00hnx5o=",
"frontend_islands_yarn_hash": "sha256-DiGj3eJMLnlWBTePwGmEvmY9d1Li3p/Y6h3GtZnsvhg=",
"version": "18.9.1",
"repo_hash": "sha256-Yq8G1gRA+p3Na3smPsMARj4w+cR2kvKjjffEwrR42vY=",
"yarn_hash": "sha256-uXyUJS4+YIRB3pPezVbj5u1fytOo+/bNR18Kq6FAKSQ=",
"frontend_islands_yarn_hash": "sha256-OkCoiyL9FFJcWcNUbeRSBGGSauYIm7l+yxNfA0CsNEQ=",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v18.8.5-ee",
"rev": "v18.9.1-ee",
"passthru": {
"GITALY_SERVER_VERSION": "18.8.5",
"GITLAB_KAS_VERSION": "18.8.5",
"GITLAB_PAGES_VERSION": "18.8.5",
"GITLAB_SHELL_VERSION": "14.45.5",
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.12.2",
"GITLAB_WORKHORSE_VERSION": "18.8.5"
"GITALY_SERVER_VERSION": "18.9.1",
"GITLAB_KAS_VERSION": "18.9.1",
"GITLAB_PAGES_VERSION": "18.9.1",
"GITLAB_SHELL_VERSION": "14.45.6",
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.13.3",
"GITLAB_WORKHORSE_VERSION": "18.9.1"
}
}

File diff suppressed because it is too large Load diff

View file

@ -10,7 +10,7 @@ in
buildGoModule (finalAttrs: {
pname = "gitlab-workhorse";
version = "18.8.5";
version = "18.9.1";
# nixpkgs-update: no auto update
src = fetchFromGitLab {
@ -22,7 +22,7 @@ buildGoModule (finalAttrs: {
sourceRoot = "${finalAttrs.src.name}/workhorse";
vendorHash = "sha256-MfEVR8kfNvP1wAmd6PjVIcfiNojHyMmDvWjdDlnd/P0=";
vendorHash = "sha256-F2iK+DcCYz2KDsFSGQzfHqOYKA8W/SMwlKQR+MS3Ahs=";
buildInputs = [ git ];
ldflags = [ "-X main.Version=${finalAttrs.version}" ];
doCheck = false;

View file

@ -83,7 +83,7 @@ let
cp Cargo.lock $out
'';
};
hash = "sha256-x97e5fg11IU63VZd1n3CHduVC7GQagI8MFiFwR+p0wk=";
hash = "sha256-ikizLu1B+stdk+HDGjrACOpgptg0jfbHcoqfrJtUpEY=";
};
dontBuild = false;
@ -123,7 +123,7 @@ let
cp Cargo.* $out
'';
};
hash = "sha256-XGeFht5QRYb4Cu3n9nt4euUeNXHh1kJ6pQ5LJjnVhzc=";
hash = "sha256-XnNIcEoAs/cSIsd3BdEtTAPNbiyfdVmlO7tSIL/9d3w=";
};
dontBuild = false;
@ -156,6 +156,53 @@ let
'';
};
prometheus-client-mmap = attrs: {
dontBuild = false;
postPatch =
let
getconf = if stdenv.hostPlatform.isGnu then stdenv.cc.libc else getconf;
in
''
substituteInPlace lib/prometheus/client/page_size.rb --replace "getconf" "${lib.getBin getconf}/bin/getconf"
'';
cargoDeps = rustPlatform.fetchCargoVendor {
src = stdenv.mkDerivation {
inherit (buildRubyGem { inherit (attrs) gemName version source; })
name
src
unpackPhase
nativeBuildInputs
;
dontBuilt = true;
installPhase = ''
cp -R ext/fast_mmaped_file_rs $out
rm $out/Cargo.lock
cp Cargo.lock $out
'';
};
hash = "sha256-7jqaf5RIsc9gq98WBCe3Dd3Fv2X+4echdXU1FSK/xnE=";
};
nativeBuildInputs = [
cargo
rustc
rustPlatform.cargoSetupHook
rustPlatform.bindgenHook
];
disallowedReferences = [
rustc.unwrapped
];
preInstall = ''
export CARGO_HOME="$PWD/../.cargo/"
'';
postInstall = ''
find $out -type f -name .rustc_info.json -delete
'';
};
static_holmes = attrs: {
nativeBuildInputs = [
icu
@ -195,8 +242,7 @@ let
};
frontendIslandsYarnOfflineCache = fetchYarnDeps {
# Revert to this when GitLab fixes their frontend_islands yarn.lock
# yarnLock = src + "/ee/frontend_islands/yarn.lock";
yarnLock = ./ee-frontend-islands-yarn.lock;
yarnLock = src + "/ee/frontend_islands/yarn.lock";
hash = data.frontend_islands_yarn_hash;
};
@ -221,13 +267,6 @@ let
./Remove-unsupported-database-names.patch
];
# Remove once GitLab fixed their frontend_islands yarn.lock
postPatch = ''
rm ee/frontend_islands/yarn.lock
cp ${./ee-frontend-islands-yarn.lock} ee/frontend_islands/yarn.lock
chmod 777 ee/frontend_islands/yarn.lock
'';
env = {
# One of the patches uses this variable - if it's unset, execution
# of rake tasks fails.

View file

@ -30,6 +30,12 @@ gem 'rails', '~> 7.2.3', feature_category: :shared # rubocop:todo Gemfile/Missin
gem 'zeitwerk', '= 2.6.18', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'action_dispatch-draw_all',
path: 'gems/action_dispatch-draw_all',
require: 'action_dispatch/draw_all',
feature_category: :tooling
# Need by Rails
gem 'drb', '~> 2.2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
@ -80,7 +86,7 @@ gem 'marginalia', '~> 1.11.1', feature_category: :database
gem 'declarative_policy', '~> 2.0.1', feature_category: :permissions
# For source code paths mapping
gem 'coverband', '6.1.5', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'coverband', '6.1.7', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
# Authentication libraries
gem 'devise', '~> 4.9.3', feature_category: :system_access
@ -125,7 +131,7 @@ gem 'akismet', '~> 3.0', feature_category: :insider_threat
gem 'invisible_captcha', '~> 2.3.0', feature_category: :insider_threat
# Two-factor authentication
gem 'devise-two-factor', '~> 4.1.1', feature_category: :system_access
gem 'devise-two-factor', '~> 5.1.0', feature_category: :system_access
gem 'rqrcode', '~> 2.2', feature_category: :system_access
gem 'webauthn', '~> 3.0', feature_category: :system_access
@ -156,7 +162,7 @@ gem 'net-ldap', '~> 0.20.0', feature_category: :system_access
gem 'grape', '~> 2.0.0', feature_category: :api
gem 'grape-entity', '~> 1.0.1', feature_category: :api
gem 'grape-swagger', '~> 2.1.2', group: [:development, :test], feature_category: :api
gem 'grape-swagger-entity', '~> 0.5.5', group: [:development, :test], feature_category: :api
gem 'grape-swagger-entity', '~> 0.7.0', group: [:development, :test], feature_category: :api
gem 'grape-path-helpers', '~> 2.0.1', feature_category: :api
gem 'gitlab-grape-openapi', path: 'gems/gitlab-grape-openapi', feature_category: :api
gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
@ -200,7 +206,7 @@ gem 'prawn-svg', feature_category: :vulnerability_management
# for backups
gem 'fog-aws', '~> 3.26', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'fog-core', '~> 2.5', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'fog-google', '~> 1.25', require: 'fog/google', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'fog-google', '~> 1.29.0', require: 'fog/google', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'fog-local', '~> 0.8', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
# NOTE:
# the fog-aliyun gem since v0.4 pulls in aliyun-sdk transitively, which monkey-patches
@ -227,7 +233,7 @@ gem 'google-apis-cloudresourcemanager_v1', '~> 0.44.0', feature_category: :share
gem 'google-apis-iam_v1', '~> 0.79.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'google-apis-serviceusage_v1', '~> 0.28.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'google-apis-androidpublisher_v3', '~> 0.86.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'google-apis-androidpublisher_v3', '~> 0.92.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'googleauth', '~> 1.14', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'google-cloud-artifact_registry-v1', '~> 0.11.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
@ -267,7 +273,7 @@ gem 'asciidoctor-kroki', '~> 0.10.0', require: false, feature_category: :markdow
gem 'rouge', '~> 4.7.0', feature_category: :markdown
gem 'truncato', '~> 0.7.13', feature_category: :team_planning
gem 'nokogiri', '~> 1.18', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'gitlab-glfm-markdown', '~> 0.0.39', feature_category: :markdown
gem 'gitlab-glfm-markdown', '~> 0.0.41', feature_category: :markdown
gem 'tanuki_emoji', '~> 0.13', feature_category: :markdown
gem 'unicode-emoji', '~> 4.0', feature_category: :markdown
@ -303,7 +309,7 @@ gem 'gitlab-sidekiq-fetcher',
gem 'fugit', '~> 1.11.1', feature_category: :continuous_integration
# HTTP requests
gem 'httparty', '~> 0.23.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'httparty', '~> 0.24.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
# Colored output to console
gem 'rainbow', '~> 3.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
@ -354,7 +360,7 @@ gem 'sanitize', '~> 6.0.2', feature_category: :shared # rubocop:todo Gemfile/Mis
gem 'babosa', '~> 2.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
# Sanitizes SVG input
gem 'loofah', '~> 2.24.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'loofah', '~> 2.25.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
# Used to provide license templates
gem 'licensee', '~> 9.16', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
@ -377,7 +383,7 @@ gem 'rack-proxy', '~> 0.7.7', feature_category: :shared # rubocop:todo Gemfile/M
gem 'cssbundling-rails', '1.4.3', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'terser', '1.0.2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'click_house-client', '0.8.6', feature_category: :database
gem 'click_house-client', '0.8.7', feature_category: :database
gem 'addressable', '~> 2.8', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'gon', '~> 6.5.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'request_store', '~> 1.7.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
@ -394,13 +400,13 @@ gem 'sentry-sidekiq', '~> 5.23.0', feature_category: :observability
# PostgreSQL query parsing
#
gem 'pg_query', '~> 6.1.0', feature_category: :database
gem 'pg_query', '~> 6.2.0', feature_category: :database
gem 'gitlab-schema-validation', path: 'gems/gitlab-schema-validation', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'gitlab-http', path: 'gems/gitlab-http', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'premailer-rails', '~> 1.12.0', feature_category: :notifications
gem 'gitlab-labkit', '~> 1.0.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'gitlab-labkit', '~> 1.3.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'thrift', '~> 0.22.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
# I18n
@ -423,7 +429,7 @@ gem 'snowplow-tracker', '~> 0.8.0', feature_category: :product_analytics
# Metrics
gem 'webrick', '~> 1.9.0', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'prometheus-client-mmap', '~> 1.2.9', require: 'prometheus/client', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'prometheus-client-mmap', '~> 1.5.0', require: 'prometheus/client', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
# Event-driven reactor for Ruby
# Required manually in config/initializers/require_async_gem
@ -501,7 +507,7 @@ end
group :development, :test do
gem 'deprecation_toolkit', '~> 2.2.3', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'bullet', '~> 8.0.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'parser', '= 3.3.10.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'parser', '= 3.3.10.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'pry-byebug', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'pry-rails', '~> 0.3.9', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'pry-shell', '~> 0.6.4', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
@ -552,7 +558,7 @@ group :development, :test, :coverage do
gem 'simplecov', '~> 0.22', require: false, feature_category: :tooling
gem 'simplecov-lcov', '~> 0.8.0', require: false, feature_category: :tooling
gem 'simplecov-cobertura', '~> 3.1.0', require: false, feature_category: :tooling
gem 'undercover', '~> 0.7.0', require: false, feature_category: :tooling
gem 'undercover', '~> 0.8.0', require: false, feature_category: :tooling
end
# Gems required in omnibus-gitlab pipeline
@ -586,7 +592,7 @@ group :test do
gem 'shoulda-matchers', '~> 6.4.0', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'email_spec', '~> 2.3.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'webmock', '~> 3.25.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'webmock', '~> 3.26.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'rails-controller-testing', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'concurrent-ruby', '~> 1.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'test-prof', '~> 1.5.0', feature_category: :tooling
@ -598,14 +604,14 @@ group :test do
# Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
gem 'derailed_benchmarks', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'gitlab_quality-test_tooling', '~> 3.3.0', require: false, feature_category: :tooling
gem 'gitlab_quality-test_tooling', '~> 3.7.1', require: false, feature_category: :tooling
end
gem 'octokit', '~> 9.0', feature_category: :importers
# Needed by octokit: https://github.com/octokit/octokit.rb/pull/1688
gem 'faraday-multipart', '~> 1.0', feature_category: :importers
gem 'gitlab-mail_room', '~> 0.0.24', require: 'mail_room', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'gitlab-mail_room', '~> 0.1.0', require: 'mail_room', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'email_reply_trimmer', '~> 0.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'html2text', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
@ -634,7 +640,7 @@ gem 'ssh_data', '~> 2.0', feature_category: :shared # rubocop:todo Gemfile/Missi
gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat
# Gitaly GRPC protocol definitions
gem 'gitaly', '~> 18.7.0.pre.rc1', feature_category: :gitaly
gem 'gitaly', '~> 18.8.0', feature_category: :gitaly
# KAS GRPC protocol definitions
gem 'gitlab-kas-grpc', '~> 18.5.0-rc4', feature_category: :deployment_management
@ -646,9 +652,9 @@ gem 'google-protobuf', '>= 3.25', '< 5.0', feature_category: :shared # rubocop:t
gem 'toml-rb', '~> 4.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
# Feature toggles
gem 'flipper', '~> 0.28.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'flipper-active_record', '~> 0.28.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'flipper-active_support_cache_store', '~> 0.28.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'flipper', '~> 1.3.6', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'flipper-active_record', '~> 1.3.6', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'flipper-active_support_cache_store', '~> 1.3.6', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'unleash', '~> 3.2.2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'gitlab-experiment', '~> 1.2.0', feature_category: :acquisition
@ -751,4 +757,4 @@ gem "gitlab-cloud-connector", "~> 1.44", require: 'gitlab/cloud_connector', feat
gem "gvltools", "~> 0.4.0", feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
gem 'gitlab_query_language', '~> 0.20.11', feature_category: :integrations
gem 'gitlab_query_language', '~> 0.20.12', feature_category: :integrations

View file

@ -1,3 +1,9 @@
PATH
remote: gems/action_dispatch-draw_all
specs:
action_dispatch-draw_all (0.1.0)
actionpack (>= 7)
PATH
remote: gems/activerecord-gitlab
specs:
@ -146,7 +152,7 @@ PATH
specs:
devise-pbkdf2-encryptable (0.0.0)
devise (~> 4.0)
devise-two-factor (~> 4.1.1)
devise-two-factor (~> 5.1.0)
PATH
remote: vendor/gems/diff_match_patch
@ -309,7 +315,7 @@ GEM
tins (~> 1.0)
amazing_print (1.8.1)
android_key_attestation (0.3.0)
apollo_upload_server (2.1.6)
apollo_upload_server (2.1.7)
actionpack (>= 6.1.6)
graphql (>= 1.8)
app_store_connect (0.38.0)
@ -377,7 +383,7 @@ GEM
base32 (0.3.4)
base64 (0.2.0)
batch-loader (2.0.5)
bcrypt (3.1.20)
bcrypt (3.1.21)
benchmark (0.4.1)
benchmark-ips (2.14.0)
benchmark-malloc (0.2.0)
@ -435,7 +441,7 @@ GEM
cork
nap
open4 (~> 1.3)
click_house-client (0.8.6)
click_house-client (0.8.7)
activerecord (>= 7.0, < 9.0)
activesupport (>= 7.0, < 9.0)
addressable (~> 2.8)
@ -459,7 +465,7 @@ GEM
countries (4.0.1)
i18n_data (~> 0.13.0)
sixarm_ruby_unaccent (~> 1.1)
coverband (6.1.5)
coverband (6.1.7)
base64
redis (>= 3.0)
crack (0.4.3)
@ -497,7 +503,7 @@ GEM
database_cleaner-core (2.0.1)
date (3.4.1)
deb_version (1.0.2)
debug (1.11.0)
debug (1.11.1)
irb (~> 1.10)
reline (>= 0.3.8)
debug_inspector (1.1.0)
@ -533,9 +539,8 @@ GEM
railties (>= 4.1.0)
responders
warden (~> 1.2.3)
devise-two-factor (4.1.1)
devise-two-factor (5.1.0)
activesupport (~> 7.0)
attr_encrypted (>= 1.3, < 5, != 2)
devise (~> 4.0)
railties (~> 7.0)
rotp (~> 6.0)
@ -615,7 +620,7 @@ GEM
html-pipeline (~> 2.9)
factory_bot (6.5.0)
activesupport (>= 5.0.0)
factory_bot_rails (6.5.0)
factory_bot_rails (6.5.1)
factory_bot (~> 6.5)
railties (>= 6.1.0)
faraday (2.13.4)
@ -657,14 +662,14 @@ GEM
fiber-storage
fiber-storage (0.1.2)
find_a_port (1.0.1)
flipper (0.28.3)
flipper (1.3.6)
concurrent-ruby (< 2)
flipper-active_record (0.28.3)
activerecord (>= 4.2, < 8)
flipper (~> 0.28.3)
flipper-active_support_cache_store (0.28.3)
activesupport (>= 4.2, < 8)
flipper (~> 0.28.3)
flipper-active_record (1.3.6)
activerecord (>= 4.2, < 9)
flipper (~> 1.3.6)
flipper-active_support_cache_store (1.3.6)
activesupport (>= 4.2, < 9)
flipper (~> 1.3.6)
fog-aliyun (0.4.0)
addressable (~> 2.8.0)
aliyun-sdk (~> 0.8.0)
@ -682,7 +687,7 @@ GEM
excon (~> 1.0)
formatador (>= 0.2, < 2.0)
mime-types
fog-google (1.26.0)
fog-google (1.29.3)
addressable (>= 2.7.0)
fog-core (~> 2.5)
fog-json (~> 1.2)
@ -736,7 +741,7 @@ GEM
git (1.19.1)
addressable (~> 2.8)
rchardet (~> 1.8)
gitaly (18.7.0)
gitaly (18.8.1)
grpc (~> 1.0)
gitlab (4.19.0)
httparty (~> 0.20)
@ -765,23 +770,24 @@ GEM
mime-types
net-http-persistent (~> 4.0)
nokogiri (~> 1, >= 1.10.8)
gitlab-glfm-markdown (0.0.39)
rb_sys (~> 0.9.109)
gitlab-glfm-markdown (0.0.41)
rb_sys (~> 0.9.124)
gitlab-kas-grpc (18.5.0.pre.rc4)
grpc (~> 1.0)
gitlab-labkit (1.0.1)
gitlab-labkit (1.3.4)
actionpack (>= 5.0.0, < 8.1.0)
activesupport (>= 5.0.0, < 8.1.0)
google-protobuf (>= 3.25, < 5.0)
grpc (>= 1.75)
jaeger-client (~> 1.1.0)
json-schema (~> 5.1)
json_schemer (>= 2.3.0, < 3.0)
openssl (~> 3.3.2)
opentracing (~> 0.4)
pg_query (>= 6.1.0, < 7.0)
prometheus-client-mmap (~> 1.2.9)
prometheus-client-mmap (>= 1.2, < 2.0)
redis (> 3.0.0, < 6.0.0)
gitlab-license (2.6.0)
gitlab-mail_room (0.0.27)
gitlab-mail_room (0.1.0)
jwt (>= 2.0)
net-imap (>= 0.2.1)
oauth2 (>= 1.4.4, < 3)
@ -822,20 +828,19 @@ GEM
omniauth (>= 1.3, < 3)
pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
rubyntlm (~> 0.5)
gitlab_quality-test_tooling (3.3.0)
gitlab_quality-test_tooling (3.7.1)
activesupport (>= 7.0)
amatch (~> 0.4.1)
fog-google (~> 1.24, >= 1.24.1)
gitlab (>= 4.19, < 7.0)
http (~> 5.0)
influxdb-client (~> 3.1)
nokogiri (~> 1.10)
parallel (>= 1, < 2)
rainbow (>= 3, < 4)
rspec-parameterized (>= 1.0, < 3.0)
table_print (= 1.5.7)
zeitwerk (>= 2, < 3)
gitlab_query_language (0.20.11)
gitlab_query_language (0.20.12)
rb_sys (~> 0.9.91)
globalid (1.1.0)
activesupport (>= 5.0)
@ -844,7 +849,7 @@ GEM
i18n (>= 0.7)
multi_json
request_store (>= 1.0)
google-apis-androidpublisher_v3 (0.86.0)
google-apis-androidpublisher_v3 (0.92.0)
google-apis-core (>= 0.15.0, < 2.a)
google-apis-bigquery_v2 (0.90.0)
google-apis-core (>= 0.15.0, < 2.a)
@ -927,7 +932,7 @@ GEM
gapic-common (>= 0.20.0, < 2.a)
google-cloud-errors (~> 1.0)
google-logging-utils (0.1.0)
google-protobuf (4.33.2)
google-protobuf (4.33.5)
bigdecimal
rake (>= 13)
googleapis-common-protos (1.7.0)
@ -964,7 +969,7 @@ GEM
grape-swagger (2.1.2)
grape (>= 1.7, < 3.0)
rack-test (~> 2)
grape-swagger-entity (0.5.5)
grape-swagger-entity (0.7.1)
grape-entity (~> 1)
grape-swagger (~> 2)
grape_logging (1.8.4)
@ -1015,7 +1020,7 @@ GEM
haml (5.2.2)
temple (>= 0.8.0)
tilt
haml_lint (0.66.0)
haml_lint (0.69.0)
haml (>= 5.0)
parallel (~> 1.10)
rainbow
@ -1048,7 +1053,7 @@ GEM
http-cookie (1.0.5)
domain_name (~> 0.5)
http-form_data (2.3.0)
httparty (0.23.1)
httparty (0.24.2)
csv
mini_mime (>= 1.0.0)
multi_xml (>= 0.5.2)
@ -1063,8 +1068,6 @@ GEM
ice_nine (0.11.2)
imagen (0.2.0)
parser (>= 2.5, != 2.5.1.1)
influxdb-client (3.2.0)
csv
invisible_captcha (2.3.0)
rails (>= 5.2)
io-console (0.8.0)
@ -1096,9 +1099,6 @@ 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)
@ -1138,7 +1138,7 @@ GEM
language_server-protocol (3.17.0.5)
launchy (2.5.2)
addressable (~> 2.8)
lefthook (1.13.0)
lefthook (1.13.6)
letter_opener (1.10.0)
launchy (>= 2.2, < 4)
letter_opener_web (3.0.0)
@ -1175,7 +1175,7 @@ GEM
activesupport (>= 4)
railties (>= 4)
request_store (~> 1.0)
loofah (2.24.1)
loofah (2.25.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
lookbook (2.3.13)
@ -1258,7 +1258,7 @@ GEM
nio4r (2.7.0)
nkf (0.2.0)
no_proxy_fix (0.1.2)
nokogiri (1.18.10)
nokogiri (1.19.0)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
notiffany (0.1.3)
@ -1487,7 +1487,7 @@ GEM
activerecord (>= 6.1)
request_store (~> 1.4)
parallel (1.27.0)
parser (3.3.10.0)
parser (3.3.10.1)
ast (~> 2.4.1)
racc
parslet (1.8.2)
@ -1496,8 +1496,8 @@ GEM
pdf-core (0.10.0)
peek (1.1.0)
railties (>= 4.0.0)
pg (1.6.2)
pg_query (6.1.0)
pg (1.6.3)
pg_query (6.2.2)
google-protobuf (>= 3.25.3)
plist (3.7.0)
png_quantizator (0.2.1)
@ -1529,11 +1529,11 @@ GEM
coderay
parser
unparser
prometheus-client-mmap (1.2.10)
prometheus-client-mmap (1.5.0)
base64
bigdecimal
logger
rb_sys (~> 0.9.109)
rb_sys (~> 0.9.124)
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
@ -1621,22 +1621,22 @@ GEM
zeitwerk (~> 2.6)
rainbow (3.1.1)
rake (13.0.6)
rake-compiler-dock (1.9.1)
rake-compiler-dock (1.11.0)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rb_sys (0.9.110)
rake-compiler-dock (= 1.9.1)
rb_sys (0.9.124)
rake-compiler-dock (= 1.11.0)
rbs (3.9.5)
logger
rbtrace (0.5.2)
rbtrace (0.5.3)
ffi (>= 1.0.6)
msgpack (>= 0.4.3)
optimist (>= 3.0.0)
rchardet (1.8.0)
rdoc (6.13.0)
psych (>= 4.0.0)
re2 (2.21.0)
re2 (2.23.0)
mini_portile2 (~> 2.8.9)
recaptcha (5.12.3)
json
@ -1648,7 +1648,7 @@ GEM
actionpack (>= 5)
redis-rack (>= 2.1.0, < 4)
redis-store (>= 1.1.0, < 2)
redis-client (0.26.1)
redis-client (0.26.4)
connection_pool
redis-cluster-client (0.13.5)
redis-client (~> 0.24)
@ -1804,11 +1804,11 @@ GEM
seed-fu (2.3.9)
activerecord (>= 3.1)
activesupport (>= 3.1)
selenium-webdriver (4.32.0)
selenium-webdriver (4.40.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)
semver_dialects (3.7.0)
deb_version (~> 1.0.1)
@ -1937,7 +1937,7 @@ GEM
unicode-display_width (>= 1.1.1, < 3)
terser (1.0.2)
execjs (>= 0.3.0, < 3)
test-prof (1.5.0)
test-prof (1.5.2)
test_file_finder (0.3.1)
faraday (>= 1.0, < 3.0, != 2.0.0)
text (1.3.1)
@ -1996,7 +1996,7 @@ GEM
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
uber (0.1.0)
undercover (0.7.4)
undercover (0.8.3)
base64
bigdecimal
imagen (>= 0.2.0)
@ -2064,7 +2064,7 @@ GEM
activesupport
faraday (~> 2.0)
faraday-follow_redirects
webmock (3.25.1)
webmock (3.26.1)
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
@ -2097,6 +2097,7 @@ DEPENDENCIES
CFPropertyList (~> 3.0.0)
RedCloth (~> 4.3.3)
acme-client (~> 2.0.19)
action_dispatch-draw_all!
activerecord-gitlab!
addressable (~> 2.8)
akismet (~> 3.0)
@ -2131,12 +2132,12 @@ DEPENDENCIES
carrierwave (~> 1.3)
charlock_holmes (~> 0.7.9)
circuitbox (= 2.0.0)
click_house-client (= 0.8.6)
click_house-client (= 0.8.7)
commonmarker (~> 0.23.10)
concurrent-ruby (~> 1.1)
connection_pool (~> 2.5.3)
countries (~> 4.0.0)
coverband (= 6.1.5)
coverband (= 6.1.7)
creole (~> 0.5.0)
cssbundling-rails (= 1.4.3)
csv_builder!
@ -2150,7 +2151,7 @@ DEPENDENCIES
device_detector
devise (~> 4.9.3)
devise-pbkdf2-encryptable (~> 0.0.0)!
devise-two-factor (~> 4.1.1)
devise-two-factor (~> 5.1.0)
diff_match_patch (~> 0.1.0)!
diffy (~> 3.4)
doorkeeper (~> 5.8, >= 5.8.1)
@ -2174,20 +2175,20 @@ DEPENDENCIES
fast_blank (~> 1.0.1)
ffaker (~> 2.24)
ffi (~> 1.17.3)
flipper (~> 0.28.0)
flipper-active_record (~> 0.28.0)
flipper-active_support_cache_store (~> 0.28.0)
flipper (~> 1.3.6)
flipper-active_record (~> 1.3.6)
flipper-active_support_cache_store (~> 1.3.6)
fog-aliyun (~> 0.4)
fog-aws (~> 3.26)
fog-core (~> 2.5)
fog-google (~> 1.25)
fog-google (~> 1.29.0)
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.7.0.pre.rc1)
gitaly (~> 18.8.0)
gitlab-active-context!
gitlab-backup-cli!
gitlab-chronic (~> 0.10.5)
@ -2197,14 +2198,14 @@ DEPENDENCIES
gitlab-duo-workflow-service-client (~> 0.6)!
gitlab-experiment (~> 1.2.0)
gitlab-fog-azure-rm (~> 2.4.0)
gitlab-glfm-markdown (~> 0.0.39)
gitlab-glfm-markdown (~> 0.0.41)
gitlab-grape-openapi!
gitlab-housekeeper!
gitlab-http!
gitlab-kas-grpc (~> 18.5.0.pre.rc4)
gitlab-labkit (~> 1.0.0)
gitlab-labkit (~> 1.3.0)
gitlab-license (~> 2.6)
gitlab-mail_room (~> 0.0.24)
gitlab-mail_room (~> 0.1.0)
gitlab-markup (~> 2.0.0)
gitlab-net-dns (~> 0.15.0)
gitlab-rspec!
@ -2220,10 +2221,10 @@ DEPENDENCIES
gitlab-utils!
gitlab_chronic_duration (~> 0.12)
gitlab_omniauth-ldap (~> 2.3.0)
gitlab_quality-test_tooling (~> 3.3.0)
gitlab_query_language (~> 0.20.11)
gitlab_quality-test_tooling (~> 3.7.1)
gitlab_query_language (~> 0.20.12)
gon (~> 6.5.0)
google-apis-androidpublisher_v3 (~> 0.86.0)
google-apis-androidpublisher_v3 (~> 0.92.0)
google-apis-cloudbilling_v1 (~> 0.22.0)
google-apis-cloudresourcemanager_v1 (~> 0.44.0)
google-apis-compute_v1 (~> 0.129.0)
@ -2245,7 +2246,7 @@ DEPENDENCIES
grape-entity (~> 1.0.1)
grape-path-helpers (~> 2.0.1)
grape-swagger (~> 2.1.2)
grape-swagger-entity (~> 0.5.5)
grape-swagger-entity (~> 0.7.0)
grape_logging (~> 1.8, >= 1.8.4)
graphlyte (~> 1.0.0)
graphql (= 2.5.11)
@ -2261,7 +2262,7 @@ DEPENDENCIES
health_check (~> 3.0)
html-pipeline (~> 2.14.3)
html2text
httparty (~> 0.23.0)
httparty (~> 0.24.0)
i18n_data (~> 0.13.1)
icalendar (~> 2.10.1)
invisible_captcha (~> 2.3.0)
@ -2286,7 +2287,7 @@ DEPENDENCIES
lockbox (~> 1.4.0)
logger (~> 1.7.0)
lograge (~> 0.5)
loofah (~> 2.24.0)
loofah (~> 2.25.0)
lookbook (~> 2.3)
lru_redux
mail (= 2.9.0)
@ -2353,16 +2354,16 @@ DEPENDENCIES
pact (~> 1.64)
paper_trail (~> 16.0)
parallel (~> 1.19)
parser (= 3.3.10.0)
parser (= 3.3.10.1)
parslet (~> 1.8)
peek (~> 1.1)
pg (~> 1.6.1)
pg_query (~> 6.1.0)
pg_query (~> 6.2.0)
png_quantizator (~> 0.2.1)
prawn
prawn-svg
premailer-rails (~> 1.12.0)
prometheus-client-mmap (~> 1.2.9)
prometheus-client-mmap (~> 1.5.0)
pry-byebug
pry-rails (~> 0.3.9)
pry-shell (~> 0.6.4)
@ -2448,7 +2449,7 @@ DEPENDENCIES
truncato (~> 0.7.13)
tty-prompt (~> 0.23)
typhoeus (~> 1.4.0)
undercover (~> 0.7.0)
undercover (~> 0.8.0)
unicode-emoji (~> 4.0)
unleash (~> 3.2.2)
uri (~> 1.1.1)
@ -2461,7 +2462,7 @@ DEPENDENCIES
vmstat (~> 2.3.0)
warning (~> 1.5.0)
webauthn (~> 3.0)
webmock (~> 3.25.0)
webmock (~> 3.26.0)
webrick (~> 1.9.0)
wikicloth (= 0.8.1)
yajl-ruby (~> 1.4.3)
@ -2469,4 +2470,4 @@ DEPENDENCIES
zeitwerk (= 2.6.18)
BUNDLED WITH
2.7.2
2.7.1

View file

@ -14,6 +14,16 @@ src: {
};
version = "2.0.30";
};
action_dispatch-draw_all = {
dependencies = [ "actionpack" ];
groups = [ "default" ];
platforms = [ ];
source = {
path = "${src}/gems/action_dispatch-draw_all";
type = "path";
};
version = "0.1.0";
};
actioncable = {
dependencies = [
"actionpack"
@ -364,10 +374,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1cnddcnrb0gwhi0w2hrmh53fkpdxxy2v80rfp2q1hrcf4mr41v6w";
sha256 = "0y7z16h2bhmm56f154apm7j62m6b6b7f78w93ilnrfz2x714v5w7";
type = "gem";
};
version = "2.1.6";
version = "2.1.7";
};
app_store_connect = {
dependencies = [
@ -728,10 +738,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "16a0g2q40biv93i1hch3gw8rbmhp77qnnifj1k0a6m7dng3zh444";
sha256 = "1krd99p9828n07rcjjms56jaqv7v6s9pn7y6bppcfhhaflyn2r2r";
type = "gem";
};
version = "3.1.20";
version = "3.1.21";
};
benchmark = {
groups = [
@ -1144,10 +1154,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0n598bfralfx7isgf22f6k28zy5ijrywdzgxk4brp30q5ad31rgm";
sha256 = "0q0r3k6wznyx7n7iq5l9yi93wpcv36b5ppip33pgj663jm791hnj";
type = "gem";
};
version = "0.8.6";
version = "0.8.7";
};
coderay = {
groups = [
@ -1307,10 +1317,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "09c21zxv7lsq5ih5rp214y38hcjm3pg5n3as1mqc2w0gn3lkn5s5";
sha256 = "1kl48dkfy01jcpq7cbk455q655kv3sxr9jdcv4i728zglqijaw4l";
type = "gem";
};
version = "6.1.5";
version = "6.1.7";
};
crack = {
dependencies = [ "safe_yaml" ];
@ -1533,10 +1543,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1wmfy5n5v2rzpr5vz698sqfj1gl596bxrqw44sahq4x0rxjdn98l";
sha256 = "1djjx5332d1hdh9s782dyr0f9d4fr9rllzdcz2k0f8lz2730l2rf";
type = "gem";
};
version = "1.11.0";
version = "1.11.1";
};
debug_inspector = {
groups = [
@ -1681,7 +1691,6 @@ src: {
devise-two-factor = {
dependencies = [
"activesupport"
"attr_encrypted"
"devise"
"railties"
"rotp"
@ -1690,10 +1699,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "15cbgb0hyq78myc6aaszzdrd9qll9n3qdhykmrx22qiyac3mnpy9";
sha256 = "1q8syjnvlynvldfqf5p9cff81m6v3dzhnv1djcizczrfas6sgrza";
type = "gem";
};
version = "4.1.1";
version = "5.1.0";
};
diff-lcs = {
groups = [
@ -2207,10 +2216,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "18n06y5ww7d08w296b6fpzx05yywp5r8p88j0k37r994aiin2ysa";
sha256 = "0s3dpi8x754bwv4mlasdal8ffiahi4b4ajpccnkaipp4x98lik6k";
type = "gem";
};
version = "6.5.0";
version = "6.5.1";
};
faraday = {
dependencies = [
@ -2465,10 +2474,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0sgqc90fs9bmphaaphr7366ngy9wj2g4513dfdc36r1ljij4lp7x";
sha256 = "1v8hn61xxpxcnxgnvd5iqbccqj3sfsb17a1iabjxi1884pq843ar";
type = "gem";
};
version = "0.28.3";
version = "1.3.6";
};
flipper-active_record = {
dependencies = [
@ -2479,10 +2488,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "080rmmhz9kf4m3z845gqwm4f4cdr4pihhmsprxsjn1m8blk1raf6";
sha256 = "1giadfq4n3xqlz5g6mrpd5121kfjvqli9gbzsjmkfih2whj245qc";
type = "gem";
};
version = "0.28.3";
version = "1.3.6";
};
flipper-active_support_cache_store = {
dependencies = [
@ -2493,10 +2502,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1zfrzfbbr7kc2g5bdvlvf0yd43vpjsfkmcyl07q0c0ljg42y46hi";
sha256 = "0dqhrm8724fb49w4js3jz2blc9z5nibbhbvp9fwkj7vz3qijsg60";
type = "gem";
};
version = "0.28.3";
version = "1.3.6";
};
fog-aliyun = {
dependencies = [
@ -2575,10 +2584,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1bf6sxq6wym9hg4y1ln4bjmgi7fwmaalim70hhdadj4862nxwbr3";
sha256 = "0kxn1z8l0s06aiyc9f9fya0d75fw5n4r8igai1hal31hvh8sf677";
type = "gem";
};
version = "1.26.0";
version = "1.29.3";
};
fog-json = {
dependencies = [
@ -2789,10 +2798,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0kkbkaqjbpriw8380hhcs0fgad14ny1j070g764sqblg0wdhspwi";
sha256 = "0v780l0cpp9fq427h9pckngmfva5bhcrr0y1057kprxk4qnmai99";
type = "gem";
};
version = "18.7.0";
version = "18.8.1";
};
gitlab = {
dependencies = [
@ -2977,10 +2986,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1ix0dwbg9f9x0hzxd2h339099vinqp145dqr4l62kgiy40vx5mx7";
sha256 = "09011zwziq5yik4f2lvl61dp75ivvax6vmxsd0y92q5798ch7spp";
type = "gem";
};
version = "0.0.39";
version = "0.0.41";
};
gitlab-grape-openapi = {
dependencies = [
@ -3047,7 +3056,8 @@ src: {
"google-protobuf"
"grpc"
"jaeger-client"
"json-schema"
"json_schemer"
"openssl"
"opentracing"
"pg_query"
"prometheus-client-mmap"
@ -3057,10 +3067,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1cpc2cq1dwzp19plk9nms2qblk82w2j1xlmz4b38v2csx8lladbg";
sha256 = "1clv7ni4a2wmlq1fshjjvrn9jak4crx8ckshnkhy6jyxfrk697b5";
type = "gem";
};
version = "1.0.1";
version = "1.3.4";
};
gitlab-license = {
groups = [ "default" ];
@ -3084,10 +3094,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "05i3jvgjv3rqyiwyfjpk0mp419f5jl5gn2m0grsgak09jaw7vh05";
sha256 = "0wknb3amlwcrq85z478lk3rl59ylx7zkm1vznp69zic0x5381y3v";
type = "gem";
};
version = "0.0.27";
version = "0.1.0";
};
gitlab-markup = {
groups = [ "default" ];
@ -3319,7 +3329,6 @@ src: {
"fog-google"
"gitlab"
"http"
"influxdb-client"
"nokogiri"
"parallel"
"rainbow"
@ -3335,10 +3344,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "05fmy56vcya6z6kpbw0vpyilc7aw4k2y1slcifb44wdalwkrbf7x";
sha256 = "09amb7yq4pwwg33f8xvs00qzhqv7hc67pc98g36w92cd0b9bdwc4";
type = "gem";
};
version = "3.3.0";
version = "3.7.1";
};
gitlab_query_language = {
dependencies = [ "rb_sys" ];
@ -3346,10 +3355,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "06al6my37q7mxjdjvzk4qlyj1lklrwny8zrz6400m5013wrgm00y";
sha256 = "18z3cq5bsab972c72ax3x0a8m8g8iz6ypr0glhwpc0b4fzv56d53";
type = "gem";
};
version = "0.20.11";
version = "0.20.12";
};
globalid = {
dependencies = [ "activesupport" ];
@ -3388,10 +3397,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1bvyp1bnvlnrl90w15gnn8cg42balvahwpp1y60vj6kc6al759kk";
sha256 = "0dchwxw12pdnil4qbsjyl6wj70xa7h6d37lwzmqgz544c2ldw077";
type = "gem";
};
version = "0.86.0";
version = "0.92.0";
};
google-apis-bigquery_v2 = {
dependencies = [ "google-apis-core" ];
@ -3772,10 +3781,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0583agdf2jvnq78scf8008bddrmbybn27ylyydg6bza2qvb510bl";
sha256 = "180dc99dgq6gsi65q8sxcdqxjkz09fifq8v97yn266qh9ivznr0v";
type = "gem";
};
version = "4.33.2";
version = "4.33.5";
};
googleapis-common-protos = {
dependencies = [
@ -3924,10 +3933,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1rpcsyzagcmd6pjixvms7mq0nc0aky53aw9mb9vmc6jbjqlfp852";
sha256 = "0zdkd4vranfylcsd6c0i133jg77zwfj2f2lzkmdw256x3j0l8888";
type = "gem";
};
version = "0.5.5";
version = "0.7.1";
};
grape_logging = {
dependencies = [
@ -4144,10 +4153,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1v64nbbckmfgi7b5c5j609mpcdyhbf7gav3n99xjy5fpyca7hpab";
sha256 = "16bxvnisrg15sdhc93l34ggrmxrjb92xa34f7a7bbr8zd68gyslb";
type = "gem";
};
version = "0.66.0";
version = "0.69.0";
};
hamlit = {
dependencies = [
@ -4340,10 +4349,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0mbbjr774zxb2wcpbwc93l0i481bxk7ga5hpap76w3q1y9idvh9s";
sha256 = "0f4wv9zvv2j57ck19xrladm5s5sn45g3xlqg78qa8jhcm9a6mjlg";
type = "gem";
};
version = "0.23.1";
version = "0.24.2";
};
httpclient = {
groups = [ "default" ];
@ -4434,22 +4443,6 @@ src: {
};
version = "0.2.0";
};
influxdb-client = {
dependencies = [ "csv" ];
groups = [
"default"
"development"
"monorepo"
"test"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1wp1p29hg5xb1izrl5xr6azp8x0l9kx9nvdg66glrxj20p48w7nw";
type = "gem";
};
version = "3.2.0";
};
invisible_captcha = {
dependencies = [ "rails" ];
groups = [ "default" ];
@ -4628,20 +4621,6 @@ 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"
@ -4846,10 +4825,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0wl9bskb500gw0l2f1bm8rnv3xa2564lw6294pw6qnldz5zm2mx2";
sha256 = "1sc4yx32ppnbippb0d58ddkdjkvbm60p3ql5m8g2d4yy3sk5sql7";
type = "gem";
};
version = "1.13.0";
version = "1.13.6";
};
letter_opener = {
dependencies = [ "launchy" ];
@ -5032,10 +5011,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0dx316q03x6rpdbl610rdaj2vfd5s8fanixk21j4gv3h5f230nk5";
sha256 = "1rk0n13c9nmk8di2x5gqk5r04vf8bkp7ff6z0b44wsmc7fndfpnz";
type = "gem";
};
version = "2.24.1";
version = "2.25.0";
};
lookbook = {
dependencies = [
@ -5683,10 +5662,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1hcwwr2h8jnqqxmf8mfb52b0dchr7pm064ingflb78wa00qhgk6m";
sha256 = "15anyh2ir3kdji93kw770xxwm5rspn9rzx9b9zh1h9gnclcd4173";
type = "gem";
};
version = "1.18.10";
version = "1.19.0";
};
notiffany = {
dependencies = [
@ -6714,10 +6693,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1mmb59323ldv6vxfmy98azgsla9k3di3fasvpb28hnn5bkx8fdff";
sha256 = "1256ws3w3gnfqj7r3yz2i9y1y7k38fhjphxpybkyb4fds8jsgxh6";
type = "gem";
};
version = "3.3.10.0";
version = "3.3.10.1";
};
parslet = {
groups = [
@ -6774,10 +6753,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0xf8i58shwvwlka4ld12nxcgqv0d5r1yizsvw74w5jaw83yllqaq";
sha256 = "16caca7lcz5pwl82snarqrayjj9j7abmxqw92267blhk7rbd120k";
type = "gem";
};
version = "1.6.2";
version = "1.6.3";
};
pg_query = {
dependencies = [ "google-protobuf" ];
@ -6785,10 +6764,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "07j86a2mf90dhjlm6ns7p59ij91axg860k63hxc2rw89w8lm404b";
sha256 = "0vwvfxz4gp5xqrv4jwyqigfkpldjqp6mbzvskapwiyncc10ijv1i";
type = "gem";
};
version = "6.1.0";
version = "6.2.2";
};
plist = {
groups = [ "default" ];
@ -6964,10 +6943,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0i0l7v26vq8k6wvsfk9fzpswilbg4214d9p9xc87kmswl1kwxm26";
sha256 = "05q1mwfrqq23k33d20f5s69gsdh4fpkgj0jymr20zbhrdj6vj7in";
type = "gem";
};
version = "1.2.10";
version = "1.5.0";
};
pry = {
dependencies = [
@ -7413,10 +7392,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0lsdrlj1f5xcgg2phycfv1hvlsggiq6wqfff513i375skai20dz7";
sha256 = "1hpq52ab86s70yv5hk56f0z14izhh59af95nlv73bsrksln1zdga";
type = "gem";
};
version = "1.9.1";
version = "1.11.0";
};
rb-fsevent = {
groups = [
@ -7453,10 +7432,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0za20fy8x9yc13jzz3kzcdc58qswzdvxmbwxnjab7xmm94gzv4w9";
sha256 = "1rvshyirm32lzf2sggcrhvz5hi828s3rznmkchvzgshjgdapcd2i";
type = "gem";
};
version = "0.9.110";
version = "0.9.124";
};
rbs = {
dependencies = [ "logger" ];
@ -7482,10 +7461,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "158qydqnrn1r0gm806j0bn439y0dyzdpscwi1sm3ldl1mcid5mx2";
sha256 = "0gwjrdawjv630xhzwld9b0vrh391sph255vxshpv36jx60pjjcn4";
type = "gem";
};
version = "0.5.2";
version = "0.5.3";
};
rchardet = {
groups = [
@ -7521,10 +7500,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1q86axcrrl9sh7wgnc70mb8kcyg2qjb67a2wm2qhfh9jqx12k4xg";
sha256 = "0vr5xw2jbfbnqk1jc1dv1rgprpacnalrz0pii3nnvhijk1qbfiam";
type = "gem";
};
version = "2.21.0";
version = "2.23.0";
};
recaptcha = {
dependencies = [ "json" ];
@ -7602,10 +7581,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0wx0v68lh924x544mkpydcrkkbr7i386xvkpyxgsf5j55j3d4f8y";
sha256 = "083i9ig39bc249mv24nsb2jlfwcdgmp9kbpy5ph569nsypphpmrs";
type = "gem";
};
version = "0.26.1";
version = "0.26.4";
};
redis-cluster-client = {
dependencies = [ "redis-client" ];
@ -8511,10 +8490,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1zlamvlgszczfx2f2v1b34q0lka15cqj46krwb4ymgl6nlkxznr0";
sha256 = "0nsys7ghl99zn2n4zjw3bi697qqnm6pmmi7aaafln79whnlpmvqn";
type = "gem";
};
version = "4.32.0";
version = "4.40.0";
};
semver_dialects = {
dependencies = [
@ -9239,10 +9218,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1s7asi66mhpraw3p8a5aciwzi2iwwsiwj0a97b7x5z8ncbi7nj6s";
sha256 = "0xl51w3g37isibhs2l3s6a6f5ygg31bkx3n41rvv6i9pgpxkjn0q";
type = "gem";
};
version = "1.5.0";
version = "1.5.2";
};
test_file_finder = {
dependencies = [ "faraday" ];
@ -9647,10 +9626,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0wb06pbc6vz5p4p0nm36drqlpl16mqiymv6381f9lz599pb1isjn";
sha256 = "1wvldnkcry3q1mkssy87mi6kqmf8igb5pdj2xcki10p3kywf0am7";
type = "gem";
};
version = "0.7.4";
version = "0.8.3";
};
unf = {
dependencies = [ "unf_ext" ];
@ -10001,10 +9980,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "08v374yrqqhjj3xjzmvwnv3yz21r22kn071yr0i67gmwaf9mv7db";
sha256 = "1mqw7ca931zmqgad0fq4gw7z3gwb0pwx9cmd1b12ga4hgjsnysag";
type = "gem";
};
version = "3.25.1";
version = "3.26.1";
};
webrick = {
groups = [

View file

@ -15,17 +15,17 @@ let
in
buildGoModule (finalAttrs: {
pname = "go-ethereum";
version = "1.17.0";
version = "1.17.1";
src = fetchFromGitHub {
owner = "ethereum";
repo = "go-ethereum";
rev = "v${finalAttrs.version}";
hash = "sha256-xTx2gcpDY4xuZOuUEmtV6m5NNO6YQ01tGzLr5rh9F/g=";
hash = "sha256-Fg+xitRROkLVXIpCoQ78eY/RFRcj7pBPI4kTSLLl+pw=";
};
proxyVendor = true;
vendorHash = "sha256-egsqYaItRtKe97P3SDb6+7sbuvyGdNGIwCR6V2lgGOc=";
vendorHash = "sha256-S/CkTWx4fUI54JVCW9ixhNADdBuMD2i7NI5U8aDy66k=";
doCheck = false;

View file

@ -75,6 +75,9 @@ stdenv.mkDerivation (finalAttrs: {
"aarch64-darwin"
];
mainProgram = "godsvg";
maintainers = [ lib.maintainers.mochienya ];
maintainers = with lib.maintainers; [
mochienya
CodeF53
];
};
})

View file

@ -41,13 +41,13 @@
_experimental-update-script-combinators,
}:
let
version = "16";
version = "17";
src = fetchFromGitLab {
domain = "gitlab.futo.org";
owner = "videostreaming";
repo = "Grayjay.Desktop";
tag = version;
hash = "sha256-2PCa9nP98htK9p5N6QPPZT6aYqaoAEBmag9JGnoujso=";
hash = "sha256-/oeoLXKewjYkCO7naZNOzauWm1OYDKnsxXY9EkI7fTM=";
fetchSubmodules = true;
fetchLFS = true;
};

View file

@ -8,18 +8,18 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "harper";
version = "1.8.0";
version = "1.9.0";
src = fetchFromGitHub {
owner = "Automattic";
repo = "harper";
rev = "v${finalAttrs.version}";
hash = "sha256-6QjYRWYFpsqxkpIMY7kcJ2z4jiiKXpG4sXT8Xwuzk78=";
hash = "sha256-cmuusPSIRUPbpakSpLHjvDoBvp8ERkGimxsGpZnhC5o=";
};
buildAndTestSubdir = "harper-ls";
cargoHash = "sha256-bUsD09JoTAz6LcfjWZh0ekdDfyZ0uDOKuOOHkxZ80jU=";
cargoHash = "sha256-stp/FYJBBG7wFUwAS/I8KWk4E9VqWAYnnp7IR0YavPM=";
passthru.updateScript = nix-update-script { };

View file

@ -1,63 +0,0 @@
{
lib,
cargo,
desktop-file-utils,
fetchFromGitLab,
glib,
gtk4,
libadwaita,
meson,
ninja,
pipewire,
pkg-config,
rustPlatform,
rustc,
stdenv,
wrapGAppsHook4,
}:
stdenv.mkDerivation rec {
pname = "helvum";
version = "0.5.1";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "pipewire";
repo = "helvum";
rev = version;
hash = "sha256-9vlzLPpyZ9qtCEbCDvYhWDcV+8T63ukdos1l2U6fD+E=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname version src;
hash = "sha256-rwhhbEaUg7IiszmJUFh4vQV7cYyyh3tqr1z4QgmwIDY=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
rustPlatform.cargoSetupHook
cargo
rustc
rustPlatform.bindgenHook
wrapGAppsHook4
];
buildInputs = [
desktop-file-utils
glib
gtk4
libadwaita
pipewire
];
meta = {
description = "GTK patchbay for pipewire";
homepage = "https://gitlab.freedesktop.org/pipewire/helvum";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ fufexan ];
platforms = lib.platforms.linux;
mainProgram = "helvum";
};
}

View file

@ -1,7 +1,7 @@
{
"branch": "main",
"commit_hash": "0002f148c9a4fe421a9d33c0faa5528cdc411e62",
"commit_message": "version: bump to 0.54.0",
"date": "2026-02-27",
"tag": "v0.54.0"
"branch": "v0.54.1-b",
"commit_hash": "4b07770b9ef1cceb2e6f56d33538aaffb9186b9c",
"commit_message": "[gha] Nix: update inputs",
"date": "2026-03-03",
"tag": "v0.54.1"
}

View file

@ -6,8 +6,6 @@
pkg-config,
makeWrapper,
cmake,
meson,
ninja,
aquamarine,
binutils,
cairo,
@ -82,14 +80,14 @@ let
in
customStdenv.mkDerivation (finalAttrs: {
pname = "hyprland" + optionalString debug "-debug";
version = "0.54.0";
version = "0.54.1";
src = fetchFromGitHub {
owner = "hyprwm";
repo = "hyprland";
fetchSubmodules = true;
tag = "v${finalAttrs.version}";
hash = "sha256-wfiduannx1mWvsGAfuMk8ipOU3AAFuJYPNV4D++dhPY=";
hash = "sha256-dBp+WAfAGkqavjM77Ki7/wi/Bn23Bg7uHPI06OeHk4c=";
};
postPatch = ''

View file

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "kdlfmt";
version = "0.1.5";
version = "0.1.6";
src = fetchFromGitHub {
owner = "hougesen";
repo = "kdlfmt";
tag = "v${finalAttrs.version}";
hash = "sha256-IiR7luc474uL0B2lCGEl6taTM2VXRQCjo88TuWOh7ic=";
hash = "sha256-W4a+pPdQv6/XOS3ps1CBCLuspcSAn7FJuvkA5hesvww=";
};
cargoHash = "sha256-ZlBsEPvATh9i3+davxTkJQeH2eeSJzoyweAhZhNkBgk=";
cargoHash = "sha256-VXg7CVsTuAvXrQNAtzlcJvd24BtS/bQYTGselh4Dzyk=";
nativeBuildInputs = [ installShellFiles ];

View file

@ -1,36 +1,36 @@
{
lib,
fetchCrate,
rustPlatform,
pkg-config,
installShellFiles,
openssl,
dbus,
fetchCrate,
installShellFiles,
lib,
nix-update-script,
openssl,
pkg-config,
rustPlatform,
sqlite,
stdenv,
testers,
leetcode-cli,
versionCheckHook,
}:
rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage (finalAttrs: {
pname = "leetcode-cli";
version = "0.5.0";
src = fetchCrate {
inherit pname version;
inherit (finalAttrs) pname version;
hash = "sha256-EafEz5MhY9f56N1LCPaW+ktYrV01r9vHCbublDnfAKg=";
};
cargoHash = "sha256-8bHpNckEsJ4VWlmEaDTeMW+Txi9SQh30lK5CKKperC8=";
nativeBuildInputs = [
pkg-config
installShellFiles
pkg-config
];
buildInputs = [
openssl
dbus
openssl
sqlite
];
@ -41,11 +41,10 @@ rustPlatform.buildRustPackage rec {
--zsh <($out/bin/leetcode completions zsh)
'';
passthru.tests = testers.testVersion {
package = leetcode-cli;
command = "leetcode -V";
version = "leetcode ${version}";
};
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
passthru.updateScript = nix-update-script { };
meta = {
description = "Leetcode CLI utility";
@ -54,4 +53,4 @@ rustPlatform.buildRustPackage rec {
maintainers = with lib.maintainers; [ congee ];
mainProgram = "leetcode";
};
}
})

View file

@ -27,6 +27,6 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://gitlab.dkrz.de/k202009/libaec";
description = "Adaptive Entropy Coding library";
license = lib.licenses.bsd2;
maintainers = with lib.maintainers; [ tbenst ];
maintainers = [ ];
};
})

View file

@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "liboprf";
version = "0.9.3";
version = "0.9.4";
src = fetchFromGitHub {
owner = "stef";
repo = "liboprf";
tag = "v${finalAttrs.version}";
hash = "sha256-BH7sLkj7vGtz2kSSuV2+BrwlQJ26s4UTlNL/owJhzCk=";
hash = "sha256-CQF7feBL83iN2I6GfWjJ2Xe6fLm7D2yEUb6KgioXWkw=";
};
sourceRoot = "${finalAttrs.src.name}/src";

View file

@ -1,7 +1,7 @@
From 58c07f1d59ef683faf8b747e40bd75401306acf4 Mon Sep 17 00:00:00 2001
From: Euan Kemp <euank@euank.com>
Date: Mon, 24 Jun 2024 15:59:48 +0200
Subject: [PATCH] meson: patch in an install prefix for building on nix
From 35b73ea944dea02983e0b891b760528adfa84839 Mon Sep 17 00:00:00 2001
From: Stefan Kober <stefan.kober@cyberus-technology.de>
Date: Tue, 3 Mar 2026 16:37:24 +0100
Subject: [PATCH 1/2] meson: patch in an install prefix for building on nix
Used in the nixpkgs version of libvirt so that we can install things in
the nix store, but read them from the root filesystem.
@ -10,28 +10,28 @@ the nix store, but read them from the root filesystem.
meson_options.txt | 2 ++
src/ch/meson.build | 6 ++---
src/interface/meson.build | 2 +-
src/libxl/meson.build | 18 +++++++-------
src/locking/meson.build | 8 +++----
src/libxl/meson.build | 18 ++++++-------
src/locking/meson.build | 8 +++---
src/lxc/meson.build | 10 ++++----
src/meson.build | 18 +++++++-------
src/meson.build | 18 ++++++-------
src/network/meson.build | 14 +++++------
src/node_device/meson.build | 2 +-
src/nwfilter/meson.build | 6 ++---
src/nwfilter/xml/meson.build | 2 +-
src/qemu/meson.build | 40 +++++++++++++++----------------
src/qemu/meson.build | 42 +++++++++++++++----------------
src/remote/meson.build | 10 ++++----
src/secret/meson.build | 4 ++--
src/security/apparmor/meson.build | 8 +++----
src/secret/meson.build | 6 ++---
src/security/apparmor/meson.build | 6 ++---
src/storage/meson.build | 6 ++---
tools/meson.build | 2 +-
tools/ssh-proxy/meson.build | 2 +-
19 files changed, 90 insertions(+), 79 deletions(-)
19 files changed, 91 insertions(+), 80 deletions(-)
diff --git a/meson.build b/meson.build
index e98ab0d5ac..376f241c07 100644
index 4478efd613..defba3869d 100644
--- a/meson.build
+++ b/meson.build
@@ -47,6 +47,8 @@ if host_machine.system() == 'windows'
@@ -69,6 +69,8 @@ if host_machine.system() == 'windows'
conf.set('WINVER', '0x0600') # Win Vista / Server 2008
endif
@ -40,7 +40,7 @@ index e98ab0d5ac..376f241c07 100644
# set various paths
@@ -65,6 +67,13 @@ else
@@ -87,6 +89,13 @@ else
sysconfdir = prefix / get_option('sysconfdir')
endif
@ -55,7 +55,7 @@ index e98ab0d5ac..376f241c07 100644
# sysconfdir as this makes a lot of things break in testing situations
if prefix == '/usr'
diff --git a/meson_options.txt b/meson_options.txt
index cdc8687795..c2b6da140c 100644
index 32009ce710..17641414c0 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,5 @@
@ -65,10 +65,10 @@ index cdc8687795..c2b6da140c 100644
option('packager', type: 'string', value: '', description: 'Extra packager name')
option('packager_version', type: 'string', value: '', description: 'Extra packager version')
diff --git a/src/ch/meson.build b/src/ch/meson.build
index 633966aac7..c0ce823345 100644
index 5ab3798cf8..39be032cc6 100644
--- a/src/ch/meson.build
+++ b/src/ch/meson.build
@@ -74,8 +74,8 @@ if conf.has('WITH_CH')
@@ -84,8 +84,8 @@ if conf.has('WITH_CH')
}
virt_install_dirs += [
@ -121,10 +121,10 @@ index e75a8f2fdb..d1800b4ea5 100644
]
endif
diff --git a/src/locking/meson.build b/src/locking/meson.build
index c3dfcf2961..cdc1442775 100644
index f8d12c481f..f622fc9201 100644
--- a/src/locking/meson.build
+++ b/src/locking/meson.build
@@ -249,14 +249,14 @@ if conf.has('WITH_LIBVIRTD')
@@ -247,14 +247,14 @@ if conf.has('WITH_LIBVIRTD')
}
virt_install_dirs += [
@ -164,10 +164,10 @@ index bf9afabc0f..6e9547000a 100644
]
endif
diff --git a/src/meson.build b/src/meson.build
index dd2682ec19..b330d1159e 100644
index cab52ce7a3..308462a2da 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -220,7 +220,7 @@ openrc_init_files = []
@@ -222,7 +222,7 @@ openrc_init_files = []
# virt_install_dirs:
# list of directories to create during installation
@ -176,7 +176,7 @@ index dd2682ec19..b330d1159e 100644
# driver_source_files:
# driver source files to check
@@ -697,7 +697,7 @@ endforeach
@@ -699,7 +699,7 @@ endforeach
virt_conf_files += 'libvirt.conf'
@ -185,7 +185,7 @@ index dd2682ec19..b330d1159e 100644
install_data(virt_aug_files, install_dir: virt_aug_dir)
# augeas_test_data:
@@ -760,7 +760,7 @@ foreach data : virt_daemon_confs
@@ -762,7 +762,7 @@ foreach data : virt_daemon_confs
output: '@0@.conf'.format(data['name']),
configuration: daemon_conf,
install: true,
@ -194,7 +194,7 @@ index dd2682ec19..b330d1159e 100644
)
if data.get('with_ip', false)
@@ -910,7 +910,7 @@ if conf.has('WITH_LIBVIRTD')
@@ -911,7 +911,7 @@ if conf.has('WITH_LIBVIRTD')
install_data(
init_file,
@ -203,7 +203,7 @@ index dd2682ec19..b330d1159e 100644
install_mode: 'rwxr-xr-x',
rename: [ init['name'] ],
)
@@ -918,7 +918,7 @@ if conf.has('WITH_LIBVIRTD')
@@ -919,7 +919,7 @@ if conf.has('WITH_LIBVIRTD')
if init.has_key('confd')
install_data(
init['confd'],
@ -212,7 +212,7 @@ index dd2682ec19..b330d1159e 100644
rename: [ init['name'] ],
)
endif
@@ -945,10 +945,10 @@ endif
@@ -946,10 +946,10 @@ endif
# Install empty directories
virt_install_dirs += [
@ -226,12 +226,12 @@ index dd2682ec19..b330d1159e 100644
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'boot',
]
meson.add_install_script(
if conf.has('WITH_LIBVIRTD')
diff --git a/src/network/meson.build b/src/network/meson.build
index 07cd5cda55..699309bb66 100644
index 7a98974852..3a285d4084 100644
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -115,11 +115,11 @@ if conf.has('WITH_NETWORK')
@@ -120,11 +120,11 @@ if conf.has('WITH_NETWORK')
}
virt_install_dirs += [
@ -248,7 +248,7 @@ index 07cd5cda55..699309bb66 100644
]
configure_file(
@@ -127,12 +127,12 @@ if conf.has('WITH_NETWORK')
@@ -132,12 +132,12 @@ if conf.has('WITH_NETWORK')
output: '@BASENAME@',
configuration: configmake_conf,
install: true,
@ -276,10 +276,10 @@ index d66c02a0e2..f883b65431 100644
]
endif
diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build
index de3d202267..346c435ee7 100644
index 9e8a4797c5..e0782a8fad 100644
--- a/src/nwfilter/meson.build
+++ b/src/nwfilter/meson.build
@@ -65,9 +65,9 @@ if conf.has('WITH_NWFILTER')
@@ -66,9 +66,9 @@ if conf.has('WITH_NWFILTER')
}
virt_install_dirs += [
@ -303,11 +303,11 @@ index 0d96c54ebe..66c92a1016 100644
-install_data(nwfilter_xml_files, install_dir: sysconfdir / 'libvirt' / 'nwfilter')
+install_data(nwfilter_xml_files, install_dir: install_prefix + sysconfdir / 'libvirt' / 'nwfilter')
diff --git a/src/qemu/meson.build b/src/qemu/meson.build
index 907893d431..99b62c8955 100644
index b4fb62f14f..421aa94561 100644
--- a/src/qemu/meson.build
+++ b/src/qemu/meson.build
@@ -218,25 +218,25 @@ if conf.has('WITH_QEMU')
endif
@@ -211,26 +211,26 @@ if conf.has('WITH_QEMU')
}
virt_install_dirs += [
- confdir / 'qemu',
@ -322,6 +322,7 @@ index 907893d431..99b62c8955 100644
- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'ram',
- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'save',
- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'snapshot',
- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'varstore',
- localstatedir / 'lib' / 'libvirt' / 'swtpm',
- localstatedir / 'log' / 'libvirt' / 'qemu',
- localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu',
@ -342,6 +343,7 @@ index 907893d431..99b62c8955 100644
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'ram',
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'save',
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'snapshot',
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'varstore',
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'swtpm',
+ install_prefix + localstatedir / 'log' / 'libvirt' / 'qemu',
+ install_prefix + localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu',
@ -353,7 +355,7 @@ index 907893d431..99b62c8955 100644
]
endif
diff --git a/src/remote/meson.build b/src/remote/meson.build
index 831acaaa01..0ba34d3bad 100644
index e503263266..e0c660d8c9 100644
--- a/src/remote/meson.build
+++ b/src/remote/meson.build
@@ -261,9 +261,9 @@ if conf.has('WITH_REMOTE')
@ -378,7 +380,7 @@ index 831acaaa01..0ba34d3bad 100644
rename: [ name ],
)
endforeach
@@ -328,7 +328,7 @@ endif
@@ -338,7 +338,7 @@ endif
if conf.has('WITH_SASL')
install_data(
'libvirtd.sasl',
@ -388,17 +390,19 @@ index 831acaaa01..0ba34d3bad 100644
)
endif
diff --git a/src/secret/meson.build b/src/secret/meson.build
index 3b859ea7b4..ccddb3e805 100644
index cfcc861f4f..85b67a6e89 100644
--- a/src/secret/meson.build
+++ b/src/secret/meson.build
@@ -48,7 +48,7 @@ if conf.has('WITH_SECRETS')
@@ -79,8 +79,8 @@ if conf.has('WITH_SECRETS')
}
virt_install_dirs += [
- confdir / 'secrets',
- runstatedir / 'libvirt' / 'secrets',
- localstatedir / 'lib' / 'libvirt' / 'secrets',
+ install_prefix + confdir / 'secrets',
+ install_prefix + runstatedir / 'libvirt' / 'secrets',
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'secrets',
]
endif
diff --git a/src/security/apparmor/meson.build b/src/security/apparmor/meson.build
@ -413,25 +417,25 @@ index 09d9fac02c..ee0c74ceec 100644
+ install_dir: install_prefix + apparmor_dir,
)
endforeach
install_data(
[ 'libvirt-qemu', 'libvirt-lxc' ],
- install_dir: apparmor_dir / 'abstractions',
+ install_dir: install_prefix + apparmor_dir / 'abstractions',
)
install_data(
[ 'TEMPLATE.qemu', 'TEMPLATE.lxc' ],
- install_dir: apparmor_dir / 'libvirt',
+ install_dir: install_prefix + apparmor_dir / 'libvirt',
)
diff --git a/src/storage/meson.build b/src/storage/meson.build
index 404d6a6941..fb4e67a0a8 100644
index f6f28757ef..2bf815fd03 100644
--- a/src/storage/meson.build
+++ b/src/storage/meson.build
@@ -126,9 +126,9 @@ if conf.has('WITH_STORAGE')
@@ -124,9 +124,9 @@ if conf.has('WITH_STORAGE')
}
virt_install_dirs += [
- confdir / 'storage',
- confdir / 'storage' / 'autostart',
@ -441,27 +445,20 @@ index 404d6a6941..fb4e67a0a8 100644
+ install_prefix + runstatedir / 'libvirt' / 'storage',
]
endif
diff --git a/tools/meson.build b/tools/meson.build
index a099148d3c..d0d6510f17 100644
index a099148d3c..bb39ad8ca8 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -123,12 +123,12 @@ if conf.has('WITH_LOGIN_SHELL')
@@ -123,7 +123,7 @@ if conf.has('WITH_LOGIN_SHELL')
install_rpath: libvirt_rpath,
)
- install_data('virt-login-shell.conf', install_dir: sysconfdir / 'libvirt')
+ install_data('virt-login-shell.conf', install_dir: install_prefix + sysconfdir / 'libvirt')
# Install the sysuser config for the setgid binary
install_data(
'libvirt-login-shell.sysusers.conf',
- install_dir: sysusersdir,
+ install_dir: install_prefix + sysusersdir,
rename: [ 'libvirt-login-shell.conf' ],
)
endif
diff --git a/tools/ssh-proxy/meson.build b/tools/ssh-proxy/meson.build
index e9f312fa25..95d5d8fe0b 100644
--- a/tools/ssh-proxy/meson.build
@ -475,5 +472,5 @@ index e9f312fa25..95d5d8fe0b 100644
)
endif
--
2.45.1
2.53.0

View file

@ -1,14 +1,14 @@
From dc5e3df2fd29a547ef0f9545e190a0ce3a73c95c Mon Sep 17 00:00:00 2001
From: Tako Marks <me@github.tako.mx>
Date: Tue, 6 Sep 2022 20:19:26 +0200
Subject: [PATCH] substitute zfs and zpool commands
From 2a869d35e26d66893ee7714d808559e478973c14 Mon Sep 17 00:00:00 2001
From: Stefan Kober <stefan.kober@cyberus-technology.de>
Date: Tue, 3 Mar 2026 16:37:42 +0100
Subject: [PATCH 2/2] substitute zfs and zpool commands
---
src/storage/storage_backend_zfs.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/storage/storage_backend_zfs.c b/src/storage/storage_backend_zfs.c
index 2a5d74357d..460b3025c4 100644
index 33434d0cac..5c98817342 100644
--- a/src/storage/storage_backend_zfs.c
+++ b/src/storage/storage_backend_zfs.c
@@ -33,8 +33,8 @@
@ -23,5 +23,5 @@ index 2a5d74357d..460b3025c4 100644
/*
* Some common flags of zfs and zpool commands we use:
--
2.36.2
2.53.0

View file

@ -117,14 +117,14 @@ assert enableZfs -> isLinux;
stdenv.mkDerivation rec {
pname = "libvirt";
# if you update, also bump <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> and SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix>
version = "11.7.0";
version = "12.1.0";
src = fetchFromGitLab {
owner = "libvirt";
repo = "libvirt";
tag = "v${version}";
fetchSubmodules = true;
hash = "sha256-BLPuqKvKW3wk4ij8ag4V4odgzZXGfn7692gkeJ03xZw=";
hash = "sha256-gscVarCRdj7auFHedIFVAYT1de49QOWyhdm3NVWQ5zY=";
};
patches = [

View file

@ -6,15 +6,16 @@
xar,
undmg,
libtapi,
isFuse3 ? false,
}:
stdenv.mkDerivation rec {
pname = "macfuse-stubs";
version = "4.8.0";
version = "5.1.3";
src = fetchurl {
url = "https://github.com/osxfuse/osxfuse/releases/download/macfuse-${version}/macfuse-${version}.dmg";
hash = "sha256-ucTzO2qdN4QkowMVvC3+4pjEVjbwMsB0xFk+bvQxwtQ=";
hash = "sha256-5fgP+MPfgm6Zf7eGs1EloMamcvS7oncLDe9rpjyk74E=";
};
nativeBuildInputs = [
@ -37,7 +38,7 @@ stdenv.mkDerivation rec {
for f in *.dylib; do
tapi stubify --filetype=tbd-v2 "$f" -o "''${f%%.dylib}.tbd"
done
sed -i "s|^prefix=.*|prefix=$out|" pkgconfig/fuse.pc
sed -i "s|^prefix=.*|prefix=$out|" pkgconfig/fuse{,3}.pc
popd
'';
@ -45,9 +46,16 @@ stdenv.mkDerivation rec {
# different license
installPhase = ''
mkdir -p $out/include $out/lib/pkgconfig
cp usr/local/lib/*.tbd $out/lib
cp usr/local/lib/pkgconfig/*.pc $out/lib/pkgconfig
cp -R usr/local/include/* $out/include
''
+ lib.optionalString isFuse3 ''
cp usr/local/lib/libfuse3*.tbd $out/lib
cp usr/local/lib/pkgconfig/fuse3.pc $out/lib/pkgconfig
cp -R usr/local/include/fuse3 $out/include
''
+ lib.optionalString (!isFuse3) ''
cp usr/local/lib/libfuse{,.2}.tbd $out/lib
cp usr/local/lib/pkgconfig/fuse.pc $out/lib/pkgconfig
cp -R usr/local/include/fuse{,.h} $out/include
'';
meta = {

View file

@ -12,8 +12,11 @@ let
repo = "MBROLA-voices";
rev = "fe05a0ccef6a941207fd6aaad0b31294a1f93a51";
hash = "sha256-QBUggnde5iNeCESzxE0btVVTDOxc3Kdk483mdGUXHvA=";
inherit pname version meta;
};
pname = "mbrola-voices";
version = "0-unstable-2020-03-30";
meta = {
description = "Speech synthesizer based on the concatenation of diphones (voice files)";
homepage = "https://github.com/numediart/MBROLA-voices";
@ -22,12 +25,9 @@ let
in
if (languages == [ ]) then
src // { inherit meta; }
src
else
stdenv.mkDerivation {
pname = "mbrola-voices";
version = "0-unstable-2020-03-30";
inherit src;
postPatch = ''
@ -46,5 +46,5 @@ else
runHook postInstall
'';
inherit meta;
inherit pname version meta;
}

View file

@ -98,8 +98,8 @@ ps.buildPythonApplication (finalAttrs: {
'';
postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
mkdir -p $out/share/pixmaps
ln -s $out/${python3.sitePackages}/normcap/resources/icons/normcap.png $out/share/pixmaps/
mkdir -p $out/share/icons/hicolor/256x256/apps
ln -s $out/${python3.sitePackages}/normcap/resources/icons/normcap.png $out/share/icons/hicolor/256x256/apps
'';
nativeCheckInputs =

View file

@ -9,13 +9,13 @@
}:
let
pname = "open-webui";
version = "0.8.7";
version = "0.8.8";
src = fetchFromGitHub {
owner = "open-webui";
repo = "open-webui";
tag = "v${version}";
hash = "sha256-uuezPd2Lo1LYxfgxK2VxWL03Si1q2MIVKXSzvUouor8=";
hash = "sha256-3n/Zp+uEmaFuBTgRtXYM6BGpmum9/SLJ0j90DH9inbo=";
};
frontend = buildNpmPackage rec {
@ -32,7 +32,7 @@ let
url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2";
};
npmDepsHash = "sha256-4jtxbd4RCEh5ga+e1I/HSB6Osp1Y4sDWnvmhRP3mfzc=";
npmDepsHash = "sha256-beG7ktfSPGn6g3bVYi2loaS9PIwRNzIF3W77ltk1C04=";
# See https://github.com/open-webui/open-webui/issues/15880
npmFlags = [

View file

@ -112,7 +112,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
strictDeps = true;
postInstall = ''
install -Dm644 $src/pcsx2-qt/resources/icons/AppIcon64.png $out/share/pixmaps/PCSX2.png
install -Dm644 $src/pcsx2-qt/resources/icons/AppIcon64.png $out/share/icons/hicolor/64x64/apps/PCSX2.png
install -Dm644 $src/.github/workflows/scripts/linux/pcsx2-qt.desktop $out/share/applications/PCSX2.desktop
zip -jq $out/share/PCSX2/resources/patches.zip ${pcsx2_patches}/patches/*

View file

@ -28,13 +28,13 @@ let
in
buildGoModule (finalAttrs: {
pname = "perses";
version = "0.52.0";
version = "0.53.0";
src = fetchFromGitHub {
owner = "perses";
repo = "perses";
tag = "v${finalAttrs.version}";
hash = "sha256-VjjTi+RltB4gZloAcaEtRsmFmG9CruYtDphYyAx1Tkc=";
hash = "sha256-lr4+0MEKXOdPTsD28hu55o8SAspKbr2791dQAXhdxtA=";
};
outputs = [
@ -53,7 +53,7 @@ buildGoModule (finalAttrs: {
inherit (finalAttrs) version src;
pname = "${finalAttrs.pname}-ui";
sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}";
hash = "sha256-TteC9/1ORUl41BvhW9rTUW6ZBmDv4ScG6OzsI6WYjiE=";
hash = "sha256-ObQvOZ2IvU/6lfozPweVu46nohKXT0YzZeTyd0VK7GM=";
};
npmRoot = "ui";
@ -63,7 +63,7 @@ buildGoModule (finalAttrs: {
preBuild = null;
};
vendorHash = "sha256-zb8LJIzCCX5bjKl6aDI/vjkaPbEQfiGKVJbpcR596WI=";
vendorHash = "sha256-KV0zXXzMBgsMZ543+fLXeGvYtugq5PtYJXSQgqrtbMI=";
ldflags = [
"-s"

View file

@ -2,108 +2,123 @@
# Do not edit this file manually.
{
"BarChart" = {
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=";
version = "0.11.0";
url = "https://github.com/perses/plugins/releases/download/barchart/v0.11.0/BarChart-0.11.0.tar.gz";
hash = "sha256-ppx0NLiyDV+IqvVXqwinIKuOfieUPmZFPxmjFiKGEnw=";
};
"ClickHouse" = {
version = "0.5.0";
url = "https://github.com/perses/plugins/releases/download/clickhouse/v0.5.0/ClickHouse-0.5.0.tar.gz";
hash = "sha256-cMVRAZL7stuSlk1yIuy5KIo7TbVovTy6501Geb3Ujdk=";
};
"DatasourceVariable" = {
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=";
version = "0.5.0";
url = "https://github.com/perses/plugins/releases/download/datasourcevariable/v0.5.0/DatasourceVariable-0.5.0.tar.gz";
hash = "sha256-Eek0TvPXoYDciuBhJ7i69V/kDY2ksEYdHD6VG0J/sjY=";
};
"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=";
version = "0.5.0";
url = "https://github.com/perses/plugins/releases/download/flamechart/v0.5.0/FlameChart-0.5.0.tar.gz";
hash = "sha256-hvYYBhFHxIx4D/gbj3KvxL/2tloyG+Dxvk/3fBqGfkE=";
};
"GaugeChart" = {
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=";
version = "0.12.0";
url = "https://github.com/perses/plugins/releases/download/gaugechart/v0.12.0/GaugeChart-0.12.0.tar.gz";
hash = "sha256-n0BE3B9L1b4l1B+AlN6GJtBu2NN7WovkAcrY9OMSM3Q=";
};
"HistogramChart" = {
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=";
version = "0.11.0";
url = "https://github.com/perses/plugins/releases/download/histogramchart/v0.11.0/HistogramChart-0.11.0.tar.gz";
hash = "sha256-1V8jK5dwNyCqV5M/FEg4vy7acGi5i9oy8rb1drhWMxY=";
};
"HeatMapChart" = {
version = "0.4.0";
url = "https://github.com/perses/plugins/releases/download/heatmapchart/v0.4.0/HeatMapChart-0.4.0.tar.gz";
hash = "sha256-fV4HNpOYLa20Q1eSqOQgpSM5/sSGcq1llkM3Mc8OlNg=";
};
"LogsTable" = {
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=";
url = "https://github.com/perses/plugins/releases/download/logstable/v0.2.0/LogsTable-0.2.0.tar.gz";
hash = "sha256-XBa9NJna2F8EDP2zbZVltYwtb1S/og/aRYlNVIBvi00=";
};
"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=";
version = "0.5.0";
url = "https://github.com/perses/plugins/releases/download/loki/v0.5.0/Loki-0.5.0.tar.gz";
hash = "sha256-REGbrfNSfvLJjb2MIqhRC8Ks2nIDW1ojSdShq6X99NA=";
};
"Markdown" = {
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=";
version = "0.11.0";
url = "https://github.com/perses/plugins/releases/download/markdown/v0.11.0/Markdown-0.11.0.tar.gz";
hash = "sha256-RRwPBfFTR4Ne8hUm6xfYGoIt7Lm3/KOdkYbpR7SEb/8=";
};
"PieChart" = {
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=";
version = "0.13.0";
url = "https://github.com/perses/plugins/releases/download/piechart/v0.13.0/PieChart-0.13.0.tar.gz";
hash = "sha256-zoZaC9LEPeC/XEJ63bdmp3IXC+qO/1RKj5kBvJhwXFY=";
};
"Prometheus" = {
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=";
version = "0.57.0";
url = "https://github.com/perses/plugins/releases/download/prometheus/v0.57.0/Prometheus-0.57.0.tar.gz";
hash = "sha256-ZekIhw/1w1utArGWT5P2SXjjMDTssduDip3O4IXdA2g=";
};
"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=";
version = "0.5.0";
url = "https://github.com/perses/plugins/releases/download/pyroscope/v0.5.0/Pyroscope-0.5.0.tar.gz";
hash = "sha256-ZFh6lpI493+UPTjT5cdrGhSUq0l6x28Jyc0sSO/JqJk=";
};
"ScatterChart" = {
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=";
version = "0.10.0";
url = "https://github.com/perses/plugins/releases/download/scatterchart/v0.10.0/ScatterChart-0.10.0.tar.gz";
hash = "sha256-pkeTDz5yDIy/pID5+VtASRfAX/jGsEReehCHD9svckM=";
};
"StatChart" = {
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=";
version = "0.12.0";
url = "https://github.com/perses/plugins/releases/download/statchart/v0.12.0/StatChart-0.12.0.tar.gz";
hash = "sha256-wVmi2wuE4JgQSKv/cwdXLOIaqFU1VjwatdmRyzvYGxY=";
};
"StaticListVariable" = {
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=";
version = "0.8.0";
url = "https://github.com/perses/plugins/releases/download/staticlistvariable/v0.8.0/StaticListVariable-0.8.0.tar.gz";
hash = "sha256-DpU919lPJlMXae9XLq1/FL5uOUzu+I2B5H0SvyxxGNY=";
};
"StatusHistoryChart" = {
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=";
version = "0.12.0";
url = "https://github.com/perses/plugins/releases/download/statushistorychart/v0.12.0/StatusHistoryChart-0.12.0.tar.gz";
hash = "sha256-U966A9swak+3DKK2WayWZTY9wqJ5tZfP4049vNf90d0=";
};
"Table" = {
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=";
version = "0.11.0";
url = "https://github.com/perses/plugins/releases/download/table/v0.11.0/Table-0.11.0.tar.gz";
hash = "sha256-5YujehfKuLFiiqRr0I1YcSln1eYN5a/rv1dGHiEIHZg=";
};
"Tempo" = {
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=";
version = "0.57.0";
url = "https://github.com/perses/plugins/releases/download/tempo/v0.57.0/Tempo-0.57.0.tar.gz";
hash = "sha256-u2ZqmtxgGdsO2JzdaSBZ4llme1dnX9L3M3rPN4BmF90=";
};
"TimeSeriesChart" = {
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=";
version = "0.12.0";
url = "https://github.com/perses/plugins/releases/download/timeserieschart/v0.12.0/TimeSeriesChart-0.12.0.tar.gz";
hash = "sha256-VwiwQRs0S5uLutVQ+2NeouUoZcGKFLu9O2p+hdfH9co=";
};
"TimeSeriesTable" = {
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=";
version = "0.11.0";
url = "https://github.com/perses/plugins/releases/download/timeseriestable/v0.11.0/TimeSeriesTable-0.11.0.tar.gz";
hash = "sha256-7tBQpgATLQUup63qmkagZ3/MKPI1lSQD8mHI5OCZgTE=";
};
"TraceTable" = {
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=";
version = "0.10.0";
url = "https://github.com/perses/plugins/releases/download/tracetable/v0.10.0/TraceTable-0.10.0.tar.gz";
hash = "sha256-R2TVLKh1L+wKXX4qo/DiF+zlKIUMugmclBZ9D4j3tdc=";
};
"TracingGanttChart" = {
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=";
version = "0.12.0";
url = "https://github.com/perses/plugins/releases/download/tracingganttchart/v0.12.0/TracingGanttChart-0.12.0.tar.gz";
hash = "sha256-BE61Am6ZQeUpi4T9VLiurO4y0q4auJ/HZESxeZ03abA=";
};
"VictoriaLogs" = {
version = "0.3.0";
url = "https://github.com/perses/plugins/releases/download/victorialogs/v0.3.0/VictoriaLogs-0.3.0.tar.gz";
hash = "sha256-Jzaihrolx17qZwfc1pDZYYJ2c46PNjfogwkKZM0sinY=";
};
}

View file

@ -7,13 +7,13 @@
}:
buildGoModule (finalAttrs: {
pname = "prometheus-chrony-exporter";
version = "0.12.3";
version = "0.13.3";
src = fetchFromGitHub {
owner = "superq";
repo = "chrony_exporter";
tag = "v${finalAttrs.version}";
hash = "sha256-TQTAflscPUWfI92eYQIpkseBi2tpqLZ0xO+KphTTqZE=";
hash = "sha256-nfOiGWi+buOmJGaCZpbcbQzXeCnm8q+QW53DavgoBDI=";
leaveDotGit = true;
postFetch = ''
cd "$out"
@ -36,7 +36,7 @@ buildGoModule (finalAttrs: {
"-X github.com/prometheus/common/version.BuildUser=nix@nixpkgs"
];
vendorHash = "sha256-/iZo0HkRoLsumiM+q+8Hui6H+SYPTh7i6naTih4Cq8U=";
vendorHash = "sha256-nOu4t4Dchw+TXqfIY0B50zalo2ZhPWkoOeQ5MgbljMU=";
passthru.updateScript = nix-update-script { };

View file

@ -39,7 +39,6 @@ buildGoModule rec {
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
benley
ivan
];
};
}

View file

@ -1,6 +1,10 @@
{
lib,
stdenv,
writeShellScript,
nix-update,
curl,
jq,
git,
git-lfs,
fetchurl,
@ -43,17 +47,6 @@
}:
let
pname = "pulsar";
version = "1.130.1";
sourcesPath =
{
x86_64-linux.tarname = "Linux.${pname}-${version}.tar.gz";
x86_64-linux.hash = "sha256-/s2sjGGDVOJ8cpIlgku+vt7DQI58IvM7jzMo61Vnq+E=";
aarch64-linux.tarname = "ARM.Linux.${pname}-${version}-arm64.tar.gz";
aarch64-linux.hash = "sha256-Psvx3oefvUtV5+gIt7xpB+k63c0073WejCFwVacV2+E=";
}
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
newLibpath = lib.makeLibraryPath [
alsa-lib
@ -91,16 +84,37 @@ let
hunspellCopyCommands = lib.concatMapStringsSep "\n" (
lang: "cp -r ${lang}/* ${hunspellTargetDirs};"
) hunspellDirs;
in
stdenv.mkDerivation {
inherit pname version;
stdenv.mkDerivation (finalAttrs: {
pname = "pulsar";
version = "1.131.1";
src =
with sourcesPath;
fetchurl {
url = "https://github.com/pulsar-edit/pulsar/releases/download/v${version}/${tarname}";
inherit hash;
finalAttrs.passthru.srcs.${stdenv.hostPlatform.system}
or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
passthru.srcs = {
x86_64-linux = fetchurl {
url = "https://github.com/pulsar-edit/pulsar/releases/download/v${finalAttrs.version}/Linux.pulsar-${finalAttrs.version}.tar.gz";
hash = "sha256-Is+KAnPuHUrj87KFTjB/v/LMDflq4LbX3VP8Cv7/CNQ=";
};
aarch64-linux = fetchurl {
url = "https://github.com/pulsar-edit/pulsar/releases/download/v${finalAttrs.version}/ARM.Linux.pulsar-${finalAttrs.version}-arm64.tar.gz";
hash = "sha256-P2ZBV9Al6xw347yUs3BOWnwJGWegRh52oygLFgjoBcw=";
};
};
# strip leading `.` from $0.
# for .pulsar.sh-wrapped to correctly set ATOM_BASE_NAME
# (`--argv0` shenanigans in makeWrapper does not work)
postPatch = ''
substituteInPlace resources/pulsar.sh \
--replace-fail \
'ATOM_BASE_NAME=''${ATOM_BASE_NAME%.*}' \
'ATOM_BASE_NAME=''${ATOM_BASE_NAME%.*}; ATOM_BASE_NAME=''${ATOM_BASE_NAME#.}'
'';
nativeBuildInputs = [
wrapGAppsHook3
@ -181,12 +195,17 @@ stdenv.mkDerivation {
unlink $dugite/git/libexec/git-core/git-lfs
ln -s ${git-lfs}/bin/git-lfs $dugite/git/libexec/git-core/git-lfs
''
+ lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") ''
# We have to patch a prebuilt binary in the asar archive
+ lib.optionalString stdenv.hostPlatform.isLinux ''
# We have to patch prebuilt binaries in the asar archive
# But asar complains because the node_gyp unpacked dependency uses a prebuilt Python3 itself
(
shopt -s globstar
rm $opt/resources/app.asar.unpacked/node_modules/tree-sitter-bash/build/node_gyp_bins/python3
ln -s ${python3.interpreter} $opt/resources/app.asar.unpacked/node_modules/tree-sitter-bash/build/node_gyp_bins/python3
for python3_binary in $opt/resources/app.asar.unpacked/node_modules/**/build/node_gyp_bins/python3; do
rm -v "$python3_binary"
ln -sv ${python3.interpreter} "$python3_binary"
done
)
''
+ ''
# Patch the bundled node executables
@ -208,7 +227,7 @@ stdenv.mkDerivation {
--suffix "PATH" : "${lib.makeBinPath [ coreutils ]}" \
--set "PULSAR_PATH" "$opt"
ln -s $opt/resources/pulsar.sh $out/bin/pulsar
ln -s $opt/resources/app/ppm/bin/apm $out/bin/ppm
ln -s $opt/resources/app/ppm/bin/ppm $out/bin/ppm
# Copy the icons
mkdir -p $out/share/icons/hicolor/scalable/apps $out/share/icons/hicolor/1024x1024/apps
@ -238,7 +257,16 @@ stdenv.mkDerivation {
})
];
passthru.updateScript = ./update.mjs;
passthru.updateScript = writeShellScript "update-pulsar" ''
set -euo pipefail
PATH="${lib.getBin curl}:$PATH"
PATH="${lib.getBin jq}:$PATH"
PATH="${lib.getBin coreutils}:$PATH"
PATH="${lib.getBin nix-update}:$PATH"
version="$(curl https://api.github.com/repos/pulsar-edit/pulsar/releases/latest | jq ".tag_name" -r | tr -d 'v')"
nix-update pkgsCross.gnu64.pulsar --version "$version"
nix-update pkgsCross.aarch64-multiplatform.pulsar --version skip
'';
meta = {
description = "Community-led Hyper-Hackable Text Editor";
@ -247,7 +275,7 @@ stdenv.mkDerivation {
Designed to be deeply customizable, but still approachable using the default configuration.
'';
homepage = "https://github.com/pulsar-edit/pulsar";
changelog = "https://github.com/pulsar-edit/pulsar/blob/v${version}/CHANGELOG.md";
changelog = "https://github.com/pulsar-edit/pulsar/blob/v${finalAttrs.version}/CHANGELOG.md";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = lib.licenses.mit;
platforms = lib.platforms.linux;
@ -255,15 +283,8 @@ stdenv.mkDerivation {
bryango
pbsds
];
knownVulnerabilities = [
# electron 12.2.3, efforts are in place to bump it
"CVE-2023-5217"
"CVE-2022-21718"
"CVE-2022-29247"
"CVE-2022-29257"
"CVE-2022-36077"
"CVE-2023-29198"
"CVE-2023-39956"
];
# https://www.electronjs.org/docs/latest/tutorial/electron-timelines
# a bump is expected (pulsar v1.131.0 bumped electron 12.2.3 -> 30.0.9 in february 2026)
knownVulnerabilities = [ "Electron version 30 is EOL" ];
};
}
})

View file

@ -1,106 +0,0 @@
#!/usr/bin/env nix-shell
/*
#!nix-shell -i node -p nodejs
*/
import { promises as fs } from 'node:fs';
const constants = {
githubUrl: "https://api.github.com/repos/pulsar-edit/pulsar/releases",
sha256FileURL: (newVersion) => `https://github.com/pulsar-edit/pulsar/releases/download/v${newVersion}/SHA256SUMS.txt`,
x86_64FileName: (newVersion) => `Linux.pulsar-${newVersion}.tar.gz`,
aarch64FileName: (newVersion) => `ARM.Linux.pulsar-${newVersion}-arm64.tar.gz`,
targetFile: new URL("package.nix", import.meta.url).pathname,
};
async function utf16ToUtf8(blob) {
// Sometime, upstream saves the SHA256SUMS.txt file in UTF-16, which absolutely breaks node's string handling
// So we need to convert this blob to UTF-8
// We need to skip the first 2 bytes, which are the BOM
const arrayBuffer = await blob.slice(2).arrayBuffer();
const buffer = Buffer.from(arrayBuffer);
const utf8String = buffer.toString('utf16le');
return utf8String;
}
async function getLatestVersion() {
const requestResult = await fetch(constants.githubUrl);
if (!requestResult.ok) {
console.error("Failed to fetch releases");
console.error(requestResult);
process.exit(1);
};
let jsonResult = await requestResult.json();
jsonResult = jsonResult.filter((release) => !release.prerelease && !release.draft);
if (jsonResult.length == 0) {
console.error("No releases found");
process.exit(1);
}
return jsonResult[0].tag_name.replace(/^v/, '');
}
async function getSha256Sum(hashFileContent, targetFile) {
// The upstream file has a fomat like this:
// 0000000000000000000000000000000000000000000000000000000000000000 targetFile
let sha256 = hashFileContent.
split('\n').
map(line => line.replace("\r", "")). // Side-effect of the UTF-16 conversion, if the file was created from Windows
filter((line) => line.endsWith(targetFile))[0].
split(' ')[0];
return "sha256-" + Buffer.from(sha256, 'hex').toString('base64');
}
async function getSha256Sums(newVersion) {
// Upstream provides a file with the hashes of the files, but it's not in the SRI format, and it refers to the compressed tarball
// So let's just use nix-prefetch-url to get the hashes of the decompressed tarball, and `nix hash to-sri` to convert them to SRI format
const hashFileUrl = constants.sha256FileURL(newVersion);
const hashFileContent = await fetch(hashFileUrl).then((response) => response.blob());
const headerbuffer = await hashFileContent.slice(0, 2).arrayBuffer()
const header = Buffer.from(headerbuffer).toString('hex');
// We must detect if it's UTF-16 or UTF-8. If it's UTF-16, we must convert it to UTF-8, otherwise just use it as-is
const hashFileContentString = header == 'fffe' ?
await utf16ToUtf8(hashFileContent) :
await hashFileContent.text();
let x86_64;
let aarch64;
console.log("Getting new hashes");
let promises = [
getSha256Sum(hashFileContentString, constants.x86_64FileName(newVersion)).then((hash) => { x86_64 = hash; }),
getSha256Sum(hashFileContentString, constants.aarch64FileName(newVersion)).then((hash) => { aarch64 = hash; }),
];
await Promise.all(promises);
return { x86_64, aarch64 };
}
async function updateFile(newVersion, sha256Sums, currentFile) {
// There is some assumptions in how the file is formatted, but nothing egregious
let newFile = currentFile.replace(/version = "(.*)";/, `version = "${newVersion}";`);
newFile = newFile.replace(/x86_64-linux\.hash = "(.*)";/, `x86_64-linux.hash = "${sha256Sums.x86_64}";`);
newFile = newFile.replace(/aarch64-linux\.hash = "(.*)";/, `aarch64-linux.hash = "${sha256Sums.aarch64}";`);
await fs.writeFile(constants.targetFile, newFile);
};
let currentFile = await fs.readFile(constants.targetFile, 'utf8');
let currentVersion = currentFile.match(/version = "(.*)";/)[1];
const newVersion = await getLatestVersion();
if (currentVersion === newVersion) {
console.error("Already up to date");
process.exit(0);
}
console.log("New version: " + newVersion);
const sha256Sums = await getSha256Sums(newVersion);
console.log(sha256Sums)
if (!sha256Sums.x86_64 || !sha256Sums.aarch64) {
console.error("Failed to find sha256 sums for the 2 files");
process.exit(1);
}
updateFile(newVersion, sha256Sums, currentFile);

View file

@ -77,6 +77,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
mainProgram = "pympress";
license = lib.licenses.gpl2Plus;
homepage = "https://cimbali.github.io/pympress/";
maintainers = with lib.maintainers; [ tbenst ];
maintainers = [ ];
};
})

View file

@ -13,14 +13,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "qxmpp";
version = "1.13.0";
version = "1.14.3";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "libraries";
repo = "qxmpp";
tag = "v${finalAttrs.version}";
hash = "sha256-2gZiQmjxvgBp0DqP7apUnbHeVRk0hd5XoCPLgh3zAho=";
hash = "sha256-vrTPlrT+sLg4coQ0EdYLCS36LlkruJqQPhxK0dYlLL4=";
};
nativeBuildInputs = [

View file

@ -18,11 +18,11 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "Reposilite";
version = "3.5.26";
version = "3.5.27";
src = fetchurl {
url = "https://maven.reposilite.com/releases/com/reposilite/reposilite/${finalAttrs.version}/reposilite-${finalAttrs.version}-all.jar";
hash = "sha256-JSvp4Ka/98AkeExrSA2WCNoqMQAmpCllIRNyHzhkzqM=";
hash = "sha256-qD4fepl0CFnulSt4hHxuZWpsAmhL6o5HSPxWptICqlE=";
};
dontUnpack = true;

View file

@ -1,7 +1,7 @@
{
"checksum": "sha256-MSQMx4bD59cTnKb6u5tV2twFkOwSNPs5i5boknuXzbU=",
"groovy": "sha256-3/YRKsAsPhghxacLGQp/GvNJ6RHqGhmVwx3iPn5epgw=",
"migration": "sha256-HxWKemXxeuhNgfFtj8ztKu8hZVhN8suI2KnS94Qg8G0=",
"prometheus": "sha256-Y+d+HudqEgLR5a5u9kq66w6Y0sYhjBDIYBsBUAYl06w=",
"swagger": "sha256-a3yoOWxIhXb/pHlstPTBE1DnLBjchKxbIU1G/5kB6Mc="
"checksum": "sha256-ewBcvnBcnd9awZKxEA+J9h0xZXaryvd1ZqF8+OeiYRk=",
"groovy": "sha256-JHNb6KVC5Zu7ZnlSXM13w1mK7pHJqfPgqAWSMvq4UiU=",
"migration": "sha256-KJ3jIPCO+a7N5B4kWx4pLfhE1gARdnsCxwd7zPFqHUA=",
"prometheus": "sha256-JWoS3CTasZjbU+7ND/lAXXZgkLjIm3ZQ05coHhGPVFU=",
"swagger": "sha256-YUHd/wuFDbpAqin8L07kKKrRHyHSn67NPY5fdUUxMy8="
}

View file

@ -8,18 +8,34 @@
python3.pkgs.buildPythonApplication (finalAttrs: {
pname = "retool";
version = "2.4.5";
version = "2.4.8";
pyproject = true;
src = fetchFromGitHub {
owner = "unexpectedpanda";
repo = "retool";
tag = "v${finalAttrs.version}";
hash = "sha256-q1v/VPcKIMGcAtnELKUpVgRGPyMmL8zJr5RdOClCwoc=";
hash = "sha256-SSSHYwQtDtCONvM5Ze3G5JJ4TW5aCziS3EbxhliXx+g=";
};
pythonRelaxDeps = true;
postPatch = ''
# Upstream uses hatch-pyinstaller for a separate frozen-app target, but nixpkgs
# only builds the wheel. Keeping it in build-system.requires makes the wheel build
# fail unless the optional plugin is packaged too.
substituteInPlace pyproject.toml \
--replace-fail '"hatch-pyinstaller",' ""
# Retool derives its config/download directory from sys.argv[0], which points
# into the immutable Nix store. Redirect its mutable state to RETOOL_HOME or
# the current working directory instead.
substituteInPlace modules/config/config.py \
--replace-fail \
"self.retool_location: pathlib.Path = pathlib.Path(sys.argv[0]).resolve().parent" \
"self.retool_location: pathlib.Path = pathlib.Path(os.environ.get('RETOOL_HOME', pathlib.Path.cwd())).expanduser()"
'';
build-system = with python3.pkgs; [ hatchling ];
nativeBuildInputs = [ qt6.wrapQtAppsHook ];

View file

@ -11,16 +11,16 @@
buildGoModule (finalAttrs: {
pname = "seaweedfs";
version = "4.09";
version = "4.12";
src = fetchFromGitHub {
owner = "seaweedfs";
repo = "seaweedfs";
tag = finalAttrs.version;
hash = "sha256-8J1eMQYATKCVwH3MCz/Hp76iRi5w+C8NsZ3eKivtYe0=";
hash = "sha256-AiNtGepaNZ/1cGWp3SFQ7l4+mjpag9MNZb2IXKar9Qo=";
};
vendorHash = "sha256-a8rDXJfqZwUw4yH02xj2M0+kNLa/tnFJZxZwfWzTq4c=";
vendorHash = "sha256-P2wbXslmHF2dwNoXemuOscKUHrPrypRR+Ehv89tlVUM=";
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libredirect.hook ];

View file

@ -71,7 +71,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
changelog = "https://github.com/AsamK/signal-cli/blob/v${finalAttrs.version}/CHANGELOG.md";
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ ivan ];
maintainers = [ ];
platforms = lib.platforms.all;
};
})

View file

@ -7,13 +7,13 @@
python3.pkgs.buildPythonApplication (finalAttrs: {
pname = "signal-export";
version = "3.8.1";
version = "3.8.2";
pyproject = true;
src = fetchPypi {
inherit (finalAttrs) version;
pname = "signal_export";
hash = "sha256-o+Z4vSqu2avQyzf93o5s2hKmCK2I8aoF4JGlLzM/9xI=";
hash = "sha256-SSXr+VADFRaCKMbSezjyt0TxUB/JZnwzkPx6eKqAClM=";
};
build-system = with python3.pkgs; [

View file

@ -12,16 +12,16 @@ let
in
php.buildComposerProject2 (finalAttrs: {
pname = "snipe-it";
version = "8.3.7";
version = "8.4.0";
src = fetchFromGitHub {
owner = "grokability";
repo = "snipe-it";
tag = "v${finalAttrs.version}";
hash = "sha256-NqQqpgSrYimZximHdAZw1ul2wQloZvEiMpQ9R6Uko3k=";
hash = "sha256-W4tqJOuC1Wrg/QA9MKVw+CLbmbTq03fBWRvUo8QT4+0=";
};
vendorHash = "sha256-rhBgVwhom9zizC3u/edhZMnsBYVtXNg8FdZLM8nXgl8=";
vendorHash = "sha256-hz9FhWwqk32XJsyPCDewQPM744btLiqZN9u9Fg6r6Ow=";
postInstall = ''
snipe_it_out="$out/share/php/snipe-it"

View file

@ -56,6 +56,6 @@ stdenv.mkDerivation (finalAttrs: {
'';
platforms = lib.platforms.unix;
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ ivan ];
maintainers = [ ];
};
})

View file

@ -1,6 +1,6 @@
{
version,
sha256,
hash,
platforms,
patches ? [ ],
}:
@ -23,7 +23,7 @@
}:
let
fuse = if stdenv.hostPlatform.isDarwin then macfuse-stubs else fuse3;
fuse = if stdenv.hostPlatform.isDarwin then macfuse-stubs.override { isFuse3 = true; } else fuse3;
in
stdenv.mkDerivation (finalAttrs: {
pname = "sshfs-fuse";
@ -32,8 +32,8 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "libfuse";
repo = "sshfs";
rev = "sshfs-${finalAttrs.version}";
inherit sha256;
tag = "sshfs-${finalAttrs.version}";
inherit hash;
};
inherit patches;

View file

@ -1,14 +0,0 @@
diff --git a/sshfs.c b/sshfs.c
index 97eaf06..d442577 100644
--- a/sshfs.c
+++ b/sshfs.c
@@ -14,9 +14,6 @@
#if !defined(__CYGWIN__)
#include <fuse_lowlevel.h>
#endif
-#ifdef __APPLE__
-# include <fuse_darwin.h>
-#endif
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>

View file

@ -1,6 +1,5 @@
{
lib,
stdenv,
callPackage,
fetchpatch,
}:
@ -8,28 +7,8 @@
let
mkSSHFS = args: callPackage (import ./common.nix args) { };
in
if stdenv.hostPlatform.isDarwin then
mkSSHFS {
version = "2.10"; # macFUSE isn't yet compatible with libfuse 3.x
sha256 = "1dmw4kx6vyawcywiv8drrajnam0m29mxfswcp4209qafzx3mjlp1";
patches = [
# remove reference to fuse_darwin.h which doens't exist on recent macFUSE
./fix-fuse-darwin-h.patch
# From https://github.com/libfuse/sshfs/pull/185:
# > With this patch, setting I/O size to a reasonable large value, will
# > result in much improved performance, e.g.: -o iosize=1048576
(fetchpatch {
name = "fix-configurable-blksize.patch";
url = "https://github.com/libfuse/sshfs/commit/667cf34622e2e873db776791df275c7a582d6295.patch";
sha256 = "0d65lawd2g2aisk1rw2vl65dgxywf4vqgv765n9zj9zysyya8a54";
})
];
platforms = lib.platforms.darwin;
}
else
mkSSHFS {
version = "3.7.3";
sha256 = "0s2hilqixjmv4y8n67zaq374sgnbscp95lgz5ignp69g3p1vmhwz";
platforms = lib.platforms.linux;
}
mkSSHFS {
version = "3.7.5";
hash = "sha256-6SFjYYWx+p9tZQ670nbjbPtH/QvCAGCB0YwkaQbKIqA=";
platforms = lib.platforms.darwin ++ lib.platforms.linux;
}

File diff suppressed because it is too large Load diff

View file

@ -2,23 +2,45 @@
lib,
stdenv,
fetchFromGitHub,
fetchNpmDeps,
rustPlatform,
cargo,
cargo-tauri,
gradle_8,
makeWrapper,
makeBinaryWrapper,
nodejs,
npmHooks,
pkg-config,
wrapGAppsHook3,
glib-networking,
jre,
libsoup_3,
openssl,
webkitgtk_4_1,
nix-update-script,
isDesktopVariant, # set in all-packages.nix
buildWithFrontend ? !isDesktopVariant,
}:
# you may only toggle this when building the server
assert isDesktopVariant -> !buildWithFrontend;
let
gradle = gradle_8;
in
stdenv.mkDerivation (finalAttrs: {
pname = "stirling-pdf";
version = "1.5.0";
pname = "stirling-pdf" + lib.optionalString isDesktopVariant "-desktop";
version = "2.4.5";
src = fetchFromGitHub {
owner = "Stirling-Tools";
repo = "Stirling-PDF";
tag = "v${finalAttrs.version}";
hash = "sha256-IgzBWIYK3ps0WxBMkJK/vEyvgpEv3NurbNhaTwz25Bc=";
hash = "sha256-Fk6tuuoTI5ziZ6GjbrRdlvNdToEPb3f155T1OL47XQs=";
};
patches = [
@ -26,6 +48,29 @@ stdenv.mkDerivation (finalAttrs: {
./remove-props-file-timestamp.patch
];
npmRoot = "frontend";
npmDeps = fetchNpmDeps {
name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
inherit (finalAttrs) src patches;
postPatch = "cd ${finalAttrs.npmRoot}";
hash = "sha256-cVVxbkXD5sz6YmHOwbXj1GYRa2s9PmRFtuNsz2tLRhI=";
};
cargoRoot = "frontend/src-tauri";
buildAndTestSubdir = finalAttrs.cargoRoot;
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs)
pname
version
src
patches
cargoRoot
;
hash = "sha256-lO2IdJUAnhpSnF4vTEn4EdnyrxIXyEUvpNl0VWd2fFs=";
};
mitmCache = gradle.fetchDeps {
inherit (finalAttrs) pname;
data = ./deps.json;
@ -33,23 +78,60 @@ stdenv.mkDerivation (finalAttrs: {
__darwinAllowLocalNetworking = true;
# we'll trigger it manually in postBuild
dontTauriBuild = true;
env.PUPPETEER_SKIP_DOWNLOAD = "1";
# disable spotless because it tries to fetch files not in deps.json
# and also because it slows down the build process
gradleFlags = [
"-x"
"spotlessApply"
"-DDISABLE_ADDITIONAL_FEATURES=true"
];
]
++ lib.optionals buildWithFrontend [ "-PbuildWithFrontend=true" ];
doCheck = true;
nativeBuildInputs = [
gradle
gradle.jdk # one of the tests also require that the `java` command is available on the command line
makeWrapper
makeBinaryWrapper
]
++ lib.optionals (buildWithFrontend || isDesktopVariant) [
nodejs
npmHooks.npmConfigHook
]
++ lib.optionals isDesktopVariant [
cargo
cargo-tauri.hook
rustPlatform.cargoSetupHook
]
++ lib.optionals (isDesktopVariant && stdenv.hostPlatform.isLinux) [
pkg-config
wrapGAppsHook3
];
installPhase = ''
buildInputs = lib.optionals (isDesktopVariant && stdenv.hostPlatform.isLinux) [
glib-networking
libsoup_3
openssl
webkitgtk_4_1
];
postBuild = lib.optionalString isDesktopVariant ''
install -Dm644 ./app/core/build/libs/stirling-pdf-*.jar -t ./frontend/src-tauri/libs
mkdir -p ./frontend/src-tauri/runtime/
ln -s ${jre} ./frontend/src-tauri/runtime/jre
# Unset these, since tauriBuildHook would recursively call them
unset preBuild postBuild
tauriBuildHook
'';
# we use the installPhase from cargo-tauri-hook when we're building the desktop variant
installPhase = lib.optionalString (!isDesktopVariant) ''
runHook preInstall
install -Dm644 ./app/core/build/libs/stirling-pdf-*.jar $out/share/stirling-pdf/Stirling-PDF.jar
@ -59,19 +141,34 @@ stdenv.mkDerivation (finalAttrs: {
runHook postInstall
'';
passthru.updateScript = ./update.sh;
# tauri installs the jre without preserving symlinks
# so we just symlink it again into the install location
# on darwin, we also create a wrapper for the binary inside the app bundle
postInstall = lib.optionalString isDesktopVariant ''
res_dir="$out/lib/Stirling-PDF/"
${lib.optionalString stdenv.hostPlatform.isDarwin ''
res_dir="$out/Applications/Stirling-PDF.app/Contents/Resources"
makeWrapper "$out/Applications/Stirling-PDF.app/Contents/MacOS/stirling-pdf" "$out/bin/stirling-pdf"
''}
rm -r "$res_dir/runtime/jre"
ln -s ${jre} "$res_dir/runtime/jre"
'';
passthru.updateScript = nix-update-script { };
meta = {
changelog = "https://github.com/Stirling-Tools/Stirling-PDF/releases/tag/v${finalAttrs.version}";
description = "Locally hosted web application that allows you to perform various operations on PDF files";
description =
"Powerful, open-source PDF editing platform "
+ (if isDesktopVariant then "runnable as a desktop app" else "hostable as a web app");
homepage = "https://github.com/Stirling-Tools/Stirling-PDF";
license = lib.licenses.mit;
mainProgram = "Stirling-PDF";
mainProgram = if isDesktopVariant then "stirling-pdf" else "Stirling-PDF";
maintainers = with lib.maintainers; [ tomasajt ];
platforms = jre.meta.platforms;
platforms = lib.platforms.linux ++ lib.platforms.darwin;
sourceProvenance = with lib.sourceTypes; [
fromSource
binaryBytecode # deps
binaryBytecode # java deps
];
};
})

View file

@ -1,6 +0,0 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p nix-update
nix-update stirling-pdf
$(nix-build -A stirling-pdf.mitmCache.updateScript)

View file

@ -27,14 +27,14 @@
}:
stdenv.mkDerivation (finalAttrs: {
version = "2.0.7";
version = "2.0.8";
pname = "syncthingtray";
src = fetchFromGitHub {
owner = "Martchus";
repo = "syncthingtray";
rev = "v${finalAttrs.version}";
hash = "sha256-aY2uKYmTC/eDv/ioenI5JrS6/kaod5ntxgGHvoszNFU=";
hash = "sha256-iaLHl6XvmcsP/iO+sit1yWT8UZxA+euL7cusP/NCaK4=";
};
buildInputs = [

View file

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "treemd";
version = "0.5.6";
version = "0.5.8";
src = fetchFromGitHub {
owner = "Epistates";
repo = "treemd";
tag = "v${finalAttrs.version}";
hash = "sha256-dFX/qroKgLGwfyaXdeBQrAgG0oe60Ke/PJhLKwoK8bQ=";
hash = "sha256-mvA4YAnPZfJAFjMnAeZXO+uBX+ryI8erIET4DzDEXeE=";
};
cargoHash = "sha256-Sym+hwFlJA0epV1ihqSs8SfuEFsu/5clQiDkiRkpne0=";
cargoHash = "sha256-uU6+GGeL809rOoLSB0lnz41axc9W79/JaQdjfVLX8DA=";
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];

View file

@ -48,7 +48,7 @@ appimageTools.wrapType2 rec {
'';
homepage = "https://klaussinani.github.io/tusk/";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ tbenst ];
maintainers = [ ];
platforms = [ "x86_64-linux" ];
mainProgram = "tusk";
};

View file

@ -105,7 +105,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
andersk
ivan
];
mainProgram = "vnu";
platforms = lib.platforms.all;

View file

@ -87,7 +87,6 @@ buildGo126Module (finalAttrs: {
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
yorickvp
ivan
leona
shawn8901
ryan4yin

View file

@ -7,16 +7,16 @@
buildNpmPackage rec {
pname = "vuetorrent";
version = "2.31.3";
version = "2.32.0";
src = fetchFromGitHub {
owner = "VueTorrent";
repo = "VueTorrent";
tag = "v${version}";
hash = "sha256-v/50xZzRt+Tsc4tAXXoNIRi9g7aCsr+1UOSzhMa3gJM=";
hash = "sha256-2s3CLL3/pDSrBq+lCedVnnSjBWm5QrPo+i7emszmdBM=";
};
npmDepsHash = "sha256-rPsSIxkKt3KTWPCccy0GKFocBzTike8tpY8oKEfTG4w=";
npmDepsHash = "sha256-CKpv8L4v3GZ/8lyeBwSi7jnnVdMfqdPTLyjBk4KVmIM=";
installPhase = ''
runHook preInstall

View file

@ -17,20 +17,24 @@
wayland,
wayland-protocols,
wayland-scanner,
wlroots_0_17,
wlroots_0_19,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "waybox";
version = "0.2.2";
version = "0.2.2-unstable-2026-01-03"; # To remove dependency on wlroots_0_17, switch to stable in next release
src = fetchFromGitHub {
owner = "wizbright";
repo = "waybox";
rev = finalAttrs.version;
hash = "sha256-hAXS9laDfigWR2pfNmdPiOeez3NpTIuKHnpeQyYa9IQ=";
rev = "044ce8f7c05720a319984eb569ee713923637940";
hash = "sha256-xrjOZzexQSPTKsQstMa0/UYX5A70N5zkO3NIBDnEy68=";
};
depsBuildBuild = [
pkg-config
];
nativeBuildInputs = [
cmake
meson
@ -50,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
udev
wayland
wayland-protocols
wlroots_0_17
wlroots_0_19
];
strictDeps = true;

View file

@ -1,6 +1,6 @@
{
lib,
flutter335,
flutter341,
python3Packages,
fetchFromGitHub,
pcre2,
@ -14,15 +14,15 @@
nix-update-script,
}:
flutter335.buildFlutterApplication rec {
flutter341.buildFlutterApplication rec {
pname = "yubioath-flutter";
version = "7.3.1";
version = "7.3.2";
src = fetchFromGitHub {
owner = "Yubico";
repo = "yubioath-flutter";
tag = version;
hash = "sha256-jfWLj5pN1NGfnmYQ0lYeKwlc0v7pCdvAjmmWX5GP7aM=";
hash = "sha256-UN3wWM3wa4c+qv5czn1z0bWlJPc4nUIPgF0HHi+9Muc=";
};
pubspecLock = lib.importJSON ./pubspec.lock.json;
@ -104,7 +104,10 @@ flutter335.buildFlutterApplication rec {
mainProgram = "yubioath-flutter";
homepage = "https://github.com/Yubico/yubioath-flutter";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ lukegb ];
maintainers = with lib.maintainers; [
lukegb
ryand56
];
platforms = [
"x86_64-linux"
"aarch64-linux"

View file

@ -4,31 +4,31 @@
"dependency": "transitive",
"description": {
"name": "_fe_analyzer_shared",
"sha256": "f0bb5d1648339c8308cc0b9838d8456b3cfe5c91f9dc1a735b4d003269e5da9a",
"sha256": "c209688d9f5a5f26b2fb47a188131a6fb9e876ae9e47af3737c0b4f58a93470d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "88.0.0"
"version": "91.0.0"
},
"analyzer": {
"dependency": "direct dev",
"description": {
"name": "analyzer",
"sha256": "0b7b9c329d2879f8f05d6c05b32ee9ec025f39b077864bdb5ac9a7b63418a98f",
"sha256": "a40a0cee526a7e1f387c6847bd8a5ccbf510a75952ef8a28338e989558072cb0",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "8.1.1"
"version": "8.4.0"
},
"analyzer_plugin": {
"dependency": "direct dev",
"description": {
"name": "analyzer_plugin",
"sha256": "dd574a0ab77de88b7d9c12bc4b626109a5ca9078216a79041a5c24c3a1bd103c",
"sha256": "08cfefa90b4f4dd3b447bda831cecf644029f9f8e22820f6ee310213ebe2dd53",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.13.7"
"version": "0.13.10"
},
"archive": {
"dependency": "direct main",
@ -84,11 +84,11 @@
"dependency": "transitive",
"description": {
"name": "build",
"sha256": "5b887c55a0f734b433b3b2d89f9cd1f99eb636b17e268a5b4259258bc916504b",
"sha256": "275bf6bb2a00a9852c28d4e0b410da1d833a734d57d39d44f94bfc895a484ec3",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.0.0"
"version": "4.0.4"
},
"build_config": {
"dependency": "transitive",
@ -104,21 +104,21 @@
"dependency": "transitive",
"description": {
"name": "build_daemon",
"sha256": "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa",
"sha256": "bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.0.4"
"version": "4.1.1"
},
"build_runner": {
"dependency": "direct dev",
"description": {
"name": "build_runner",
"sha256": "804c47c936df75e1911c19a4fb8c46fa8ff2b3099b9f2b2aa4726af3774f734b",
"sha256": "ac78098de97893812b7aff1154f29008fa2464cad9e8e7044d39bc905dad4fbc",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.8.0"
"version": "2.11.0"
},
"built_collection": {
"dependency": "transitive",
@ -134,31 +134,21 @@
"dependency": "transitive",
"description": {
"name": "built_value",
"sha256": "a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d",
"sha256": "7931c90b84bc573fef103548e354258ae4c9d28d140e41961df6843c5d60d4d8",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "8.12.0"
},
"chalkdart": {
"dependency": "transitive",
"description": {
"name": "chalkdart",
"sha256": "7ffc6bd39c81453fb9ba8dbce042a9c960219b75ea1c07196a7fa41c2fab9e86",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.0.5"
"version": "8.12.3"
},
"characters": {
"dependency": "transitive",
"description": {
"name": "characters",
"sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803",
"sha256": "faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.4.0"
"version": "1.4.1"
},
"checked_yaml": {
"dependency": "transitive",
@ -180,6 +170,16 @@
"source": "hosted",
"version": "0.1.0"
},
"cli_config": {
"dependency": "transitive",
"description": {
"name": "cli_config",
"sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.2.0"
},
"cli_util": {
"dependency": "transitive",
"description": {
@ -200,15 +200,25 @@
"source": "hosted",
"version": "1.1.2"
},
"code_assets": {
"dependency": "transitive",
"description": {
"name": "code_assets",
"sha256": "83ccdaa064c980b5596c35dd64a8d3ecc68620174ab9b90b6343b753aa721687",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.0.0"
},
"code_builder": {
"dependency": "transitive",
"description": {
"name": "code_builder",
"sha256": "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243",
"sha256": "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.11.0"
"version": "4.11.1"
},
"collection": {
"dependency": "direct main",
@ -230,25 +240,35 @@
"source": "hosted",
"version": "3.1.2"
},
"coverage": {
"dependency": "transitive",
"description": {
"name": "coverage",
"sha256": "5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.15.0"
},
"cross_file": {
"dependency": "transitive",
"description": {
"name": "cross_file",
"sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670",
"sha256": "28bb3ae56f117b5aec029d702a90f57d285cd975c3c5c281eaca38dbc47c5937",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.3.4+2"
"version": "0.3.5+2"
},
"crypto": {
"dependency": "direct main",
"description": {
"name": "crypto",
"sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855",
"sha256": "c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.0.6"
"version": "3.0.7"
},
"custom_lint": {
"dependency": "direct dev",
@ -284,41 +304,41 @@
"dependency": "transitive",
"description": {
"name": "custom_lint_visitor",
"sha256": "446d68322747ec1c36797090de776aa72228818d3d80685a91ff524d163fee6d",
"sha256": "91f2a81e9f0abb4b9f3bb529f78b6227ce6050300d1ae5b1e2c69c66c7a566d8",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.0.0+8.1.1"
"version": "1.0.0+8.4.0"
},
"dart_style": {
"dependency": "transitive",
"description": {
"name": "dart_style",
"sha256": "c87dfe3d56f183ffe9106a18aebc6db431fc7c98c31a54b952a77f3d54a85697",
"sha256": "a9c30492da18ff84efe2422ba2d319a89942d93e58eb0b73d32abe822ef54b7b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.1.2"
"version": "3.1.3"
},
"dbus": {
"dependency": "transitive",
"description": {
"name": "dbus",
"sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c",
"sha256": "d0c98dcd4f5169878b6cf8f6e0a52403a9dff371a3e2f019697accbf6f44a270",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.7.11"
"version": "0.7.12"
},
"desktop_drop": {
"dependency": "direct main",
"description": {
"name": "desktop_drop",
"sha256": "927511f590ce01ee90d0d80f79bc71b9c919d8522d01e495e89a00c6f4a4fb5b",
"sha256": "e70b46b2d61f1af7a81a40d1f79b43c28a879e30a4ef31e87e9c27bea4d784e8",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.6.1"
"version": "0.7.0"
},
"dispose_scope": {
"dependency": "transitive",
@ -334,11 +354,11 @@
"dependency": "transitive",
"description": {
"name": "equatable",
"sha256": "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7",
"sha256": "3e0141505477fd8ad55d6eb4e7776d3fe8430be8e497ccb1521370c3f21a3e2b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.7"
"version": "2.0.8"
},
"fake_async": {
"dependency": "transitive",
@ -354,11 +374,11 @@
"dependency": "transitive",
"description": {
"name": "ffi",
"sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418",
"sha256": "d07d37192dbf97461359c1518788f203b0c9102cfd2c35a716b823741219542c",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.4"
"version": "2.1.5"
},
"file": {
"dependency": "transitive",
@ -374,11 +394,11 @@
"dependency": "direct main",
"description": {
"name": "file_picker",
"sha256": "f2d9f173c2c14635cc0e9b14c143c49ef30b4934e8d1d274d6206fcb0086a06f",
"sha256": "57d9a1dd5063f85fa3107fb42d1faffda52fdc948cefd5fe5ea85267a5fc7343",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "10.3.3"
"version": "10.3.10"
},
"fixnum": {
"dependency": "transitive",
@ -422,21 +442,21 @@
"dependency": "transitive",
"description": {
"name": "flutter_plugin_android_lifecycle",
"sha256": "b0694b7fb1689b0e6cc193b3f1fcac6423c4f93c74fb20b806c6b6f196db0c31",
"sha256": "ee8068e0e1cd16c4a82714119918efdeed33b3ba7772c54b5d094ab53f9b7fd1",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.30"
"version": "2.0.33"
},
"flutter_riverpod": {
"dependency": "direct main",
"description": {
"name": "flutter_riverpod",
"sha256": "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1",
"sha256": "e2026c72738a925a60db30258ff1f29974e40716749f3c9850aabf34ffc1a14c",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.6.1"
"version": "3.2.1"
},
"flutter_test": {
"dependency": "direct dev",
@ -506,6 +526,16 @@
"source": "hosted",
"version": "2.3.2"
},
"hooks": {
"dependency": "transitive",
"description": {
"name": "hooks",
"sha256": "7a08a0d684cb3b8fb604b78455d5d352f502b68079f7b80b831c62220ab0a4f6",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.0.1"
},
"hotreloader": {
"dependency": "transitive",
"description": {
@ -520,11 +550,11 @@
"dependency": "transitive",
"description": {
"name": "http",
"sha256": "bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007",
"sha256": "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.5.0"
"version": "1.6.0"
},
"http_multi_server": {
"dependency": "transitive",
@ -586,11 +616,11 @@
"dependency": "direct dev",
"description": {
"name": "json_serializable",
"sha256": "33a040668b31b320aafa4822b7b1e177e163fc3c1e835c6750319d4ab23aa6fe",
"sha256": "c5b2ee75210a0f263c6c7b9eeea80553dbae96ea1bf57f02484e806a3ffdffa3",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.11.1"
"version": "6.11.2"
},
"leak_tracker": {
"dependency": "transitive",
@ -635,11 +665,11 @@
"dependency": "transitive",
"description": {
"name": "lints",
"sha256": "a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0",
"sha256": "12f842a479589fea194fe5c5a3095abc7be0c1f2ddfa9a0e76aed1dbd26a87df",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.0.0"
"version": "6.1.0"
},
"local_notifier": {
"dependency": "direct main",
@ -665,31 +695,31 @@
"dependency": "transitive",
"description": {
"name": "matcher",
"sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
"sha256": "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.12.17"
"version": "0.12.18"
},
"material_color_utilities": {
"dependency": "transitive",
"description": {
"name": "material_color_utilities",
"sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec",
"sha256": "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.11.1"
"version": "0.13.0"
},
"material_symbols_icons": {
"dependency": "direct main",
"description": {
"name": "material_symbols_icons",
"sha256": "9e2042673fda5dda0b77e262220b3c34cac5806a3833da85522e41bb27fbf6c0",
"sha256": "c62b15f2b3de98d72cbff0148812f5ef5159f05e61fc9f9a089ec2bb234df082",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.2873.0"
"version": "4.2906.0"
},
"menu_base": {
"dependency": "transitive",
@ -705,11 +735,11 @@
"dependency": "direct dev",
"description": {
"name": "meta",
"sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c",
"sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.16.0"
"version": "1.17.0"
},
"mime": {
"dependency": "transitive",
@ -721,6 +751,36 @@
"source": "hosted",
"version": "2.0.0"
},
"native_toolchain_c": {
"dependency": "transitive",
"description": {
"name": "native_toolchain_c",
"sha256": "89e83885ba09da5fdf2cdacc8002a712ca238c28b7f717910b34bcd27b0d03ac",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.17.4"
},
"node_preamble": {
"dependency": "transitive",
"description": {
"name": "node_preamble",
"sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.2"
},
"objective_c": {
"dependency": "transitive",
"description": {
"name": "objective_c",
"sha256": "983c7fa1501f6dcc0cb7af4e42072e9993cb28d73604d25ebf4dab08165d997e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "9.2.5"
},
"package_config": {
"dependency": "transitive",
"description": {
@ -765,21 +825,21 @@
"dependency": "transitive",
"description": {
"name": "path_provider_android",
"sha256": "993381400e94d18469750e5b9dcb8206f15bc09f9da86b9e44a9b0092a0066db",
"sha256": "f2c65e21139ce2c3dad46922be8272bb5963516045659e71bb16e151c93b580e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.2.18"
"version": "2.2.22"
},
"path_provider_foundation": {
"dependency": "transitive",
"description": {
"name": "path_provider_foundation",
"sha256": "16eef174aacb07e09c351502740fa6254c165757638eba1e9116b0a781201bbd",
"sha256": "2a376b7d6392d80cd3705782d2caa734ca4727776db0b6ec36ef3f1855197699",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.4.2"
"version": "2.6.0"
},
"path_provider_linux": {
"dependency": "transitive",
@ -815,21 +875,21 @@
"dependency": "direct dev",
"description": {
"name": "patrol_finders",
"sha256": "4a658d7d560de523f92deb3fa3326c78747ca0bf7e7f4b8788c012463138b628",
"sha256": "2b46426a89498414ee5c24d2fbf34ba1796cc9dff4e49ce4322544bace03be6b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.9.0"
"version": "3.0.0"
},
"patrol_log": {
"dependency": "transitive",
"description": {
"name": "patrol_log",
"sha256": "9fed4143980df1e3bbcfa00d0b443c7d68f04f9132317b7698bbc37f8a5a58c5",
"sha256": "017fe7ea3ab662e78673a8acbbb7c96b71f38def59b70d44d0169887620e9fbf",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.5.0"
"version": "0.6.0"
},
"petitparser": {
"dependency": "transitive",
@ -865,11 +925,11 @@
"dependency": "transitive",
"description": {
"name": "pool",
"sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a",
"sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.5.1"
"version": "1.5.2"
},
"posix": {
"dependency": "transitive",
@ -924,11 +984,11 @@
"dependency": "transitive",
"description": {
"name": "riverpod",
"sha256": "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959",
"sha256": "8c22216be8ad3ef2b44af3a329693558c98eca7b8bd4ef495c92db0bba279f83",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.6.1"
"version": "3.2.1"
},
"rxdart": {
"dependency": "transitive",
@ -994,31 +1054,31 @@
"dependency": "direct main",
"description": {
"name": "shared_preferences",
"sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5",
"sha256": "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.5.3"
"version": "2.5.4"
},
"shared_preferences_android": {
"dependency": "transitive",
"description": {
"name": "shared_preferences_android",
"sha256": "a2608114b1ffdcbc9c120eb71a0e207c71da56202852d4aab8a5e30a82269e74",
"sha256": "cbc40be9be1c5af4dab4d6e0de4d5d3729e6f3d65b89d21e1815d57705644a6f",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.4.12"
"version": "2.4.20"
},
"shared_preferences_foundation": {
"dependency": "transitive",
"description": {
"name": "shared_preferences_foundation",
"sha256": "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03",
"sha256": "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.5.4"
"version": "2.5.6"
},
"shared_preferences_linux": {
"dependency": "transitive",
@ -1070,6 +1130,26 @@
"source": "hosted",
"version": "1.4.2"
},
"shelf_packages_handler": {
"dependency": "transitive",
"description": {
"name": "shelf_packages_handler",
"sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.0.2"
},
"shelf_static": {
"dependency": "transitive",
"description": {
"name": "shelf_static",
"sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.3"
},
"shelf_web_socket": {
"dependency": "transitive",
"description": {
@ -1100,11 +1180,11 @@
"dependency": "transitive",
"description": {
"name": "source_gen",
"sha256": "ccf30b0c9fbcd79d8b6f5bfac23199fb354938436f62475e14aea0f29ee0f800",
"sha256": "1d562a3c1f713904ebbed50d2760217fd8a51ca170ac4b05b0db490699dbac17",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.0.1"
"version": "4.2.0"
},
"source_helper": {
"dependency": "transitive",
@ -1116,25 +1196,35 @@
"source": "hosted",
"version": "1.3.8"
},
"source_map_stack_trace": {
"dependency": "transitive",
"description": {
"name": "source_map_stack_trace",
"sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.2"
},
"source_maps": {
"dependency": "transitive",
"description": {
"name": "source_maps",
"sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.10.13"
},
"source_span": {
"dependency": "transitive",
"description": {
"name": "source_span",
"sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c",
"sha256": "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.10.1"
},
"sprintf": {
"dependency": "transitive",
"description": {
"name": "sprintf",
"sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "7.0.0"
"version": "1.10.2"
},
"stack_trace": {
"dependency": "transitive",
@ -1206,25 +1296,45 @@
"source": "hosted",
"version": "1.2.2"
},
"test": {
"dependency": "transitive",
"description": {
"name": "test",
"sha256": "54c516bbb7cee2754d327ad4fca637f78abfc3cbcc5ace83b3eda117e42cd71a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.29.0"
},
"test_api": {
"dependency": "transitive",
"description": {
"name": "test_api",
"sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00",
"sha256": "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.7.6"
"version": "0.7.9"
},
"test_core": {
"dependency": "transitive",
"description": {
"name": "test_core",
"sha256": "394f07d21f0f2255ec9e3989f21e54d3c7dc0e6e9dbce160e5a9c1a6be0e2943",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.6.15"
},
"tray_manager": {
"dependency": "direct main",
"description": {
"name": "tray_manager",
"sha256": "537e539f48cd82d8ee2240d4330158c7b44c7e043e8e18b5811f2f8f6b7df25a",
"sha256": "c5fd83b0ae4d80be6eaedfad87aaefab8787b333b8ebd064b0e442a81006035b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.5.1"
"version": "0.5.2"
},
"typed_data": {
"dependency": "transitive",
@ -1260,41 +1370,41 @@
"dependency": "transitive",
"description": {
"name": "url_launcher_android",
"sha256": "07cffecb7d68cbc6437cd803d5f11a86fe06736735c3dfe46ff73bcb0f958eed",
"sha256": "767344bf3063897b5cf0db830e94f904528e6dd50a6dfaf839f0abf509009611",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.3.21"
"version": "6.3.28"
},
"url_launcher_ios": {
"dependency": "transitive",
"description": {
"name": "url_launcher_ios",
"sha256": "d80b3f567a617cb923546034cc94bfe44eb15f989fe670b37f26abdb9d939cb7",
"sha256": "cfde38aa257dae62ffe79c87fab20165dfdf6988c1d31b58ebf59b9106062aad",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.3.4"
"version": "6.3.6"
},
"url_launcher_linux": {
"dependency": "transitive",
"description": {
"name": "url_launcher_linux",
"sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935",
"sha256": "d5e14138b3bc193a0f63c10a53c94b91d399df0512b1f29b94a043db7482384a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.2.1"
"version": "3.2.2"
},
"url_launcher_macos": {
"dependency": "transitive",
"description": {
"name": "url_launcher_macos",
"sha256": "c043a77d6600ac9c38300567f33ef12b0ef4f4783a2c1f00231d2b1941fea13f",
"sha256": "368adf46f71ad3c21b8f06614adb38346f193f3a59ba8fe9a2fd74133070ba18",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.2.3"
"version": "3.2.5"
},
"url_launcher_platform_interface": {
"dependency": "transitive",
@ -1310,31 +1420,31 @@
"dependency": "transitive",
"description": {
"name": "url_launcher_web",
"sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2",
"sha256": "d0412fcf4c6b31ecfdb7762359b7206ffba3bbffd396c6d9f9c4616ece476c1f",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.4.1"
"version": "2.4.2"
},
"url_launcher_windows": {
"dependency": "transitive",
"description": {
"name": "url_launcher_windows",
"sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77",
"sha256": "712c70ab1b99744ff066053cbe3e80c73332b38d46e5e945c98689b2e66fc15f",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.1.4"
"version": "3.1.5"
},
"uuid": {
"dependency": "transitive",
"description": {
"name": "uuid",
"sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff",
"sha256": "a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.5.1"
"version": "4.5.2"
},
"vector_graphics": {
"dependency": "direct main",
@ -1360,11 +1470,11 @@
"dependency": "direct main",
"description": {
"name": "vector_graphics_compiler",
"sha256": "d354a7ec6931e6047785f4db12a1f61ec3d43b207fc0790f863818543f8ff0dc",
"sha256": "201e876b5d52753626af64b6359cd13ac6011b80728731428fd34bc840f71c9b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.19"
"version": "1.1.20"
},
"vector_math": {
"dependency": "transitive",
@ -1390,11 +1500,11 @@
"dependency": "transitive",
"description": {
"name": "watcher",
"sha256": "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c",
"sha256": "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.3"
"version": "1.2.1"
},
"web": {
"dependency": "transitive",
@ -1436,15 +1546,25 @@
"source": "hosted",
"version": "3.1.0"
},
"webkit_inspection_protocol": {
"dependency": "transitive",
"description": {
"name": "webkit_inspection_protocol",
"sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.2.1"
},
"win32": {
"dependency": "transitive",
"description": {
"name": "win32",
"sha256": "66814138c3562338d05613a6e368ed8cfb237ad6d64a9e9334be3f309acfca03",
"sha256": "d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "5.14.0"
"version": "5.15.0"
},
"window_manager": {
"dependency": "direct main",
@ -1489,7 +1609,7 @@
}
},
"sdks": {
"dart": ">=3.9.0 <4.0.0",
"flutter": ">=3.35.0"
"dart": ">=3.10.3 <4.0.0",
"flutter": ">=3.38.4"
}
}

View file

@ -107,7 +107,7 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "zed-editor";
version = "0.225.12";
version = "0.225.13";
outputs = [
"out"
@ -120,7 +120,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
owner = "zed-industries";
repo = "zed";
tag = "v${finalAttrs.version}";
hash = "sha256-rVJ+NNsnhoXr6y2j2VFrXQVrgbXQY/a6l2Khs36SvDU=";
hash = "sha256-ozuycL8dnBtgyYYjsz9C+CDtZQzbXWWZVOkxbOs7hho=";
};
postPatch = ''
@ -140,7 +140,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
rm -r $out/git/*/candle-book/
'';
cargoHash = "sha256-i6BZPAKCgomWA/c923/tB9uWtXGr5VXIqmGCYtUUBLM=";
cargoHash = "sha256-G5U0APQNNEe2qpshqX4QpQGbqIAHllatbbsaVAhDoG0=";
nativeBuildInputs = [
cmake

Some files were not shown because too many files have changed in this diff Show more