Merge release-26.05 into staging-nixos-26.05

This commit is contained in:
nixpkgs-ci[bot]
2026-07-12 00:36:54 +00:00
committed by GitHub
52 changed files with 1295 additions and 356 deletions

View File

@@ -59,7 +59,7 @@ jobs:
merged-as-untrusted-at: ${{ inputs.mergedSha }}
target-as-trusted-at: ${{ inputs.targetSha }}
- uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6
- uses: cachix/install-nix-action@a49548c11d9846ad46ecc0115273879b045f001c # v31.10.7
with:
# Sandbox is disabled on MacOS by default.
extra_nix_config: sandbox = true

View File

@@ -92,8 +92,8 @@ jobs:
if: inputs.baseBranch && inputs.headBranch
permissions:
pull-requests: write
runs-on: ubuntu-slim
timeout-minutes: 3
runs-on: ubuntu-24.04-arm
timeout-minutes: 8
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
@@ -147,7 +147,7 @@ jobs:
merged-as-untrusted-at: ${{ inputs.mergedSha }}
target-as-trusted-at: ${{ inputs.targetSha }}
- uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6
- uses: cachix/install-nix-action@a49548c11d9846ad46ecc0115273879b045f001c # v31.10.7
- uses: cachix/cachix-action@5f2d7c5294214f71b873db4b969586b980625e71 # v17
continue-on-error: true

View File

@@ -139,7 +139,7 @@ jobs:
core.info(`Found pinned.json commit: ${ciPinBumpCommit}`)
- name: Install Nix
uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6
uses: cachix/install-nix-action@a49548c11d9846ad46ecc0115273879b045f001c # v31.10.7
- name: Load supported versions
id: versions
@@ -187,7 +187,7 @@ jobs:
target-as-trusted-at: ${{ inputs.targetSha }}
- name: Install Nix
uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6
uses: cachix/install-nix-action@a49548c11d9846ad46ecc0115273879b045f001c # v31.10.7
- uses: cachix/cachix-action@5f2d7c5294214f71b873db4b969586b980625e71 # v17
continue-on-error: true
@@ -277,7 +277,7 @@ jobs:
merge-multiple: true
- name: Install Nix
uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6
uses: cachix/install-nix-action@a49548c11d9846ad46ecc0115273879b045f001c # v31.10.7
- name: Combine all output paths and eval stats
run: |
@@ -486,7 +486,7 @@ jobs:
merged-as-untrusted-at: ${{ inputs.mergedSha }}
- name: Install Nix
uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6
uses: cachix/install-nix-action@a49548c11d9846ad46ecc0115273879b045f001c # v31.10.7
- name: Ensure flake outputs on all systems still evaluate
run: nix flake check --all-systems --no-build './nixpkgs/untrusted?shallow=1'

View File

@@ -35,7 +35,7 @@ jobs:
with:
merged-as-untrusted-at: ${{ inputs.mergedSha }}
- uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6
- uses: cachix/install-nix-action@a49548c11d9846ad46ecc0115273879b045f001c # v31.10.7
# TODO: Figure out how to best enable caching for the treefmt job. Cachix won't work well,
# because the cache would be invalidated on every commit - treefmt checks every file.
@@ -70,7 +70,7 @@ jobs:
with:
merged-as-untrusted-at: ${{ inputs.mergedSha }}
- uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6
- uses: cachix/install-nix-action@a49548c11d9846ad46ecc0115273879b045f001c # v31.10.7
- uses: cachix/cachix-action@5f2d7c5294214f71b873db4b969586b980625e71 # v17
continue-on-error: true
@@ -100,7 +100,7 @@ jobs:
merged-as-untrusted-at: ${{ inputs.mergedSha }}
target-as-trusted-at: ${{ inputs.targetSha }}
- uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6
- uses: cachix/install-nix-action@a49548c11d9846ad46ecc0115273879b045f001c # v31.10.7
- uses: cachix/cachix-action@5f2d7c5294214f71b873db4b969586b980625e71 # v17
continue-on-error: true
@@ -131,8 +131,8 @@ jobs:
# Luckily there's no need to lint commit messages in the Merge Queue, because
# changes to the target branch can't change commit messages on the base branch.
if: ${{ github.event.pull_request.number }}
runs-on: ubuntu-slim
timeout-minutes: 5
runs-on: ubuntu-24.04-arm
timeout-minutes: 8
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:

View File

@@ -298,7 +298,7 @@ in
''
mkdir -p $out
if [ -d $package/share/man ]; then
find -L $package/share/man -type f | xargs ${pkgs.python3.pythonOnBuildForHost.interpreter} ${patchedGenerator}/create_manpage_completions.py --directory $out >/dev/null
find -L $package/share/man -type f -print0 | xargs -0 ${pkgs.python3.pythonOnBuildForHost.interpreter} ${patchedGenerator}/create_manpage_completions.py --directory $out >/dev/null
fi
'';
packages =

View File

@@ -6,6 +6,14 @@
}:
let
attrsToExports = lib.concatMapAttrsStringSep "\n" (
exportPoint: clientsAndOptions:
exportPoint
+ lib.concatMapAttrsStringSep "" (
client: options: " ${client}(${lib.concatStringsSep "," options})"
) clientsAndOptions
);
cfg = config.services.nfs.server;
exports = pkgs.writeText "exports" cfg.exports;
@@ -48,12 +56,26 @@ in
};
exports = lib.mkOption {
type = lib.types.lines;
type = with lib.types; coercedTo (attrsOf (attrsOf (listOf str))) attrsToExports lines;
default = "";
description = ''
Contents of the /etc/exports file. See
{manpage}`exports(5)` for the format.
'';
example = {
"/usr" = {
"*.local.domain" = [ "ro" ];
"@trusted" = [ "rw" ];
};
"/home/joe" = {
"pc001" = [
"rw"
"all_squash"
"anonuid=150"
"anongid=100"
];
};
};
};
hostName = lib.mkOption {

View File

@@ -5,7 +5,7 @@ self-hostable cloud platform. The server setup can be automated using
[services.nextcloud](#opt-services.nextcloud.enable). A
desktop client is packaged at `pkgs.nextcloud-client`.
The current default by NixOS is `nextcloud33` which is also the latest
The current default by NixOS is `nextcloud34` which is also the latest
major version available.
## Basic usage {#module-services-nextcloud-basic-usage}

View File

@@ -149,5 +149,6 @@ listToAttrs (
concatMap genTests [
32
33
34
]
)

View File

@@ -83,9 +83,16 @@ import ../make-test-python.nix (
services.nfs.server.enable = true;
services.nfs.server.createMountPoints = true;
services.nfs.server.exports = ''
/data *(rw,no_root_squash,fsid=0,sec=krb5p)
'';
services.nfs.server.exports = {
"/data" = {
"*" = [
"rw"
"no_root_squash"
"fsid=0"
"sec=krb5p"
];
};
};
};
};

View File

@@ -37,9 +37,16 @@ import ../make-test-python.nix (
{ ... }:
{
services.nfs.server.enable = true;
services.nfs.server.exports = ''
/data 192.168.1.0/255.255.255.0(rw,no_root_squash,no_subtree_check,fsid=0)
'';
services.nfs.server.exports = {
"/data" = {
"192.168.1.0/255.255.255.0" = [
"rw"
"no_root_squash"
"no_subtree_check"
"fsid=0"
];
};
};
services.nfs.server.createMountPoints = true;
networking.firewall.enable = false; # FIXME: figure out what ports need to be allowed
};

View File

@@ -17,6 +17,11 @@
secretKeyFile = pkgs.writeText "secretKeyFile" "test123";
};
# NOTE: on aarch64-linux github actions runer due to lack of kvm, we need to delay pdfding start and give it more time to finish
systemd.services.pdfding.wantedBy = lib.mkIf pkgs.stdenv.hostPlatform.isAarch64 (lib.mkForce [ ]);
systemd.services.pdfding.serviceConfig.TimeoutStartSec =
lib.mkIf pkgs.stdenv.hostPlatform.isAarch64 "900";
environment.systemPackages = with pkgs; [
sqlite
];
@@ -60,6 +65,7 @@
# create admin
machine.wait_for_unit("multi-user.target")
machine.succeed("systemctl start pdfding.service")
machine.wait_for_open_port(${toString port})
machine.succeed("DJANGO_SUPERUSER_PASSWORD=admin pdfding-manage createsuperuser --no-input --username admin --email admin@localhost")

View File

@@ -22,6 +22,14 @@
installTestHelpers = true;
};
# NOTE: on aarch64-linux github actions runer due to lack of kvm, we need to delay pdfding start and give it more time to finish
systemd.services.pdfding.wantedBy = lib.mkIf pkgs.stdenv.hostPlatform.isAarch64 (lib.mkForce [ ]);
systemd.services.pdfding.serviceConfig.TimeoutStartSec =
lib.mkIf pkgs.stdenv.hostPlatform.isAarch64 "900";
systemd.services.pdfding-background.wantedBy = lib.mkIf pkgs.stdenv.hostPlatform.isAarch64 (
lib.mkForce [ ]
);
environment.systemPackages = [
config.services.postgresql.finalPackage
];
@@ -46,6 +54,8 @@
# create admin
machine.wait_for_unit("multi-user.target")
machine.succeed("systemctl start pdfding.service")
machine.succeed("systemctl start pdfding-background.service")
machine.wait_for_open_port(${toString port})
machine.succeed("DJANGO_SUPERUSER_PASSWORD=admin pdfding-manage createsuperuser --no-input --username admin --email admin@localhost")

View File

@@ -31,12 +31,20 @@ in
backup.schedule = "*/1 * * * *";
backup.endpoint = "[::]:3900";
extraEnvironment.BACKUP_BUCKET_NAME = "pdfding-bucket";
extraEnvironment.BACKUP_REGION = "garage";
extraEnvironment.BACKUP_REGION = "us-east-1";
envFiles = [ pdfding-s3-keys ];
installTestHelpers = true;
};
# NOTE: on aarch64-linux github actions runer due to lack of kvm, we need to delay pdfding start and give it more time to finish
systemd.services.pdfding.wantedBy = lib.mkIf pkgs.stdenv.hostPlatform.isAarch64 (lib.mkForce [ ]);
systemd.services.pdfding.serviceConfig.TimeoutStartSec =
lib.mkIf pkgs.stdenv.hostPlatform.isAarch64 "900";
systemd.services.pdfding-background.wantedBy = lib.mkIf pkgs.stdenv.hostPlatform.isAarch64 (
lib.mkForce [ ]
);
# Setup a local garage service for the backup feature
# taken from garage nixosTest
services.garage = {
@@ -48,7 +56,7 @@ in
rpc_secret = "5c1915fa04d0b6739675c61bf5907eb0fe3d9c69850c83820f51b4d25d13868c";
s3_api = {
s3_region = "garage";
s3_region = "us-east-1";
api_bind_addr = "[::]:3900";
root_domain = ".s3.garage";
};
@@ -113,6 +121,8 @@ in
# create admin
machine.wait_for_unit("multi-user.target")
machine.succeed("systemctl start pdfding.service")
machine.succeed("systemctl start pdfding-background.service")
machine.wait_for_open_port(${toString port})
machine.succeed("DJANGO_SUPERUSER_PASSWORD=admin pdfding-manage createsuperuser --no-input --username admin --email admin@localhost")
@@ -140,7 +150,7 @@ in
-F "description=" \
-F "collection=1" \
-F "use_file_name=on" \
-F "name=test-upload" \
-F "name=dummy" \
-F "file=@{test_pdf};type=application/pdf" \
-F "csrfmiddlewaretoken=$csrf_token" \
-H "Referer: {endpoint}/pdf/add" \

View File

@@ -107,6 +107,7 @@ stdenv.mkDerivation {
sourceRoot = ".";
dontUnpack = true;
dontStrip = true;
installPhase = ''
runHook preInstall

View File

@@ -26,6 +26,7 @@ let
triplet = lib.getAttr arch {
"x86_64" = "x86_64-unknown-linux-gnu";
"aarch64" = "aarch64-unknown-linux-gnu";
"riscv64" = "riscv64-unknown-linux-gnu";
};
clang = symlinkJoin {
@@ -98,6 +99,10 @@ stdenv.mkDerivation (finalAttrs: {
# On darwin during linking:
# clang++: error: argument unused during compilation: '-stdlib=libc++'
"treat_warnings_as_errors=false"
]
++ lib.optionals stdenv.hostPlatform.isRiscV64 [
# Force clang on riscv64 because default gcc toolchain is unavailable.
"is_clang=true"
];
patches = [

View File

@@ -6,10 +6,10 @@
}:
let
pname = "archon-lite";
version = "9.3.85";
version = "9.3.172";
src = fetchurl {
url = "https://github.com/RPGLogs/Uploaders-archon-lite/releases/download/v${version}/archon-lite-v${version}.AppImage";
hash = "sha256-ooNvgbtV6HKgzRLgHZul92NLnEB8oX6fHL6iwfHajVA=";
hash = "sha256-Jl1/40jtdG9acb2SSef4G91hs/b1UdOp6gPnoGPnQ60=";
};
extracted = appimageTools.extractType2 { inherit pname version src; };

View File

@@ -7,19 +7,19 @@
buildDotnetModule {
pname = "depotdownloader";
version = "2.7.4-unstable-2024-12-01";
version = "3.4.0-unstable-2026-05-14";
src = fetchFromGitHub {
owner = "Iluhadesu";
repo = "DepotDownloader";
rev = "a9f58e5513b72bd00b623a83e1460b3c5db49248";
hash = "sha256-+QfwKQJzyXqUvTn8kKP7lYHvbtRtdJ7jc/W7E87tV7w=";
rev = "0ab6676c51f27d3b9e63278e3c18484d4d2bf063";
hash = "sha256-qC9EakT1tu8NNwbmj7HmYgcIoEUlMRRHNGnKggVNDgk=";
};
projectFile = "DepotDownloader.sln";
nugetDeps = ./deps.json;
dotnet-sdk = dotnetCorePackages.sdk_8_0;
dotnet-runtime = dotnetCorePackages.runtime_8_0;
dotnet-sdk = dotnetCorePackages.sdk_9_0;
dotnet-runtime = dotnetCorePackages.runtime_9_0;
meta = {
description = "Fork of DepotDownloader to be used by BSManager";

View File

@@ -11,8 +11,8 @@
},
{
"pname": "Microsoft.Windows.CsWin32",
"version": "0.3.106",
"hash": "sha256-S1uQa684taPb6uh69784ebVpXoirMoX+pxBRA+Rrzlg="
"version": "0.3.275",
"hash": "sha256-sqIFj1dNatchuS9R7sk0Os6vSoSXFjm20qppvnnw78c="
},
{
"pname": "Microsoft.Windows.SDK.Win32Docs",
@@ -21,38 +21,38 @@
},
{
"pname": "Microsoft.Windows.SDK.Win32Metadata",
"version": "60.0.34-preview",
"hash": "sha256-KdRe73sXipzMvm2BLmwwBZGh+l9isZDC9l8WFyUR1zM="
"version": "63.0.31-preview",
"hash": "sha256-MMvQoyVT15IU93EKZ46rhP/hyx3wV452vuFnf8OTd60="
},
{
"pname": "Microsoft.Windows.SDK.Win32Metadata",
"version": "70.0.11-preview",
"hash": "sha256-JRcTFlzV+sDfgUKPtn0oOn25SdNivmhbS8+0HcAozu8="
},
{
"pname": "Microsoft.Windows.WDK.Win32Metadata",
"version": "0.11.4-experimental",
"hash": "sha256-b3oKUKbr+3Udfl7RWzUY9BR/XWNsN+VmEkBxk6KiFo0="
"version": "0.13.25-experimental",
"hash": "sha256-eQeaRJ2PYhBSvK8TA55BHRwbd67EqJzwTZZRjQphlhc="
},
{
"pname": "protobuf-net",
"version": "3.2.30",
"hash": "sha256-keRy5OWT+/tlZt3D7x+9PEdjTvEJcZdYsf/i1ZBtciE="
"version": "3.2.56",
"hash": "sha256-KjwRHyGwflQDjVaudT+NjRnfGhHb4CpCfn9hHVixI+E="
},
{
"pname": "protobuf-net.Core",
"version": "3.2.30",
"hash": "sha256-GMpJNecoBfrV2VgpYOhcZnKZaLFDObNLcX2LBTThrwY="
"version": "3.2.56",
"hash": "sha256-NVvLreCvvvnS/s0syL5/L3mRpXeswP7E71C6WP9f2Dc="
},
{
"pname": "SteamKit2",
"version": "3.0.0-beta.4",
"hash": "sha256-7cXlpCuUD8ZuTMtqsT5MdklkZb+XIGBdoI28anjUXtg="
},
{
"pname": "System.Collections.Immutable",
"version": "7.0.0",
"hash": "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk="
"version": "3.3.1",
"hash": "sha256-f6kc15RKNxCSIlynlVHU8fBqQ7N8nG1xV3DNbBlRmvo="
},
{
"pname": "System.IO.Hashing",
"version": "8.0.0",
"hash": "sha256-szOGt0TNBo6dEdC3gf6H+e9YW3Nw0woa6UnCGGGK5cE="
"version": "9.0.8",
"hash": "sha256-Jj1XwumBjBa5LJqSVTN2naQJ0FM4wwPvZS8NxGd5Hnw="
},
{
"pname": "System.Security.AccessControl",
@@ -63,5 +63,10 @@
"pname": "System.Security.Principal.Windows",
"version": "5.0.0",
"hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="
},
{
"pname": "ZstdSharp.Port",
"version": "0.8.6",
"hash": "sha256-rc3YWP80fykqujDsD72SXOA1tBDoy2KrvVETOC8eTx8="
}
]

View File

@@ -8,13 +8,13 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "chhoto-url";
version = "7.4.1";
version = "7.4.10";
src = fetchFromGitHub {
owner = "SinTan1729";
repo = "chhoto-url";
tag = finalAttrs.version;
hash = "sha256-1kPXsN5gOfY8JyaV6J5X2cEH00Xm06nsU5GNuVDxBJo=";
hash = "sha256-iZQFH+WoGu91DJT7X8FTs1qktf/SSrh6F9U4/OQWZiI=";
fetchLFS = true;
};
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
--replace-fail 'rust-version = "1.96"' 'rust-version = "1.95"'
'';
cargoHash = "sha256-H3HrHu1y8wIc0j3cCIPOUnFe1jzpx1vCSfZvushIf70=";
cargoHash = "sha256-1q5WWNnqDILgDbd9Wztvm0pYDDtaufqOxixwHb4VifY=";
postInstall = ''
mkdir -p $out/share/chhoto-url

View File

@@ -1,13 +1,19 @@
{
lib,
stdenvNoCC,
nodejs,
pnpm_9,
nodejs-slim,
pnpm_11,
fetchPnpmDeps,
pnpmConfigHook,
pnpmBuildHook,
fetchFromGitHub,
nix-update-script,
runCommand,
emmet-language-server,
}:
let
pnpm = pnpm_11;
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "emmet-language-server";
version = "2.8.0";
@@ -21,26 +27,18 @@ stdenvNoCC.mkDerivation (finalAttrs: {
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
pnpm = pnpm_9;
fetcherVersion = 3;
hash = "sha256-livnY/iwd7gqy6SKFBMF2MSIs7LVFec4BFqMBVasGWE=";
inherit pnpm;
fetcherVersion = 4;
hash = "sha256-FbwciSGn/W8xQhTU2rHdYIX01wUAqcgY67za8n5AMcM=";
};
nativeBuildInputs = [
nodejs
nodejs-slim
pnpmConfigHook
pnpm_9
pnpmBuildHook
pnpm
];
buildPhase = ''
runHook preBuild
# TODO: use deploy after resolved https://github.com/pnpm/pnpm/issues/5315
pnpm build
runHook postBuild
'';
# remove unnecessary and non-deterministic files
preInstall = ''
CI=true pnpm --ignore-scripts --prod prune
@@ -64,7 +62,24 @@ stdenvNoCC.mkDerivation (finalAttrs: {
runHook postInstall
'';
passthru.updateScript = nix-update-script { };
passthru = {
updateScript = nix-update-script { };
tests.smoke = runCommand "emmet-language-server-smoke-test" { } ''
INIT_REQUEST='{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"processId":null,"rootUri":"file:///tmp","workspaceFolders":[{"uri":"file:///tmp","name":"test"}],"capabilities":{}}}'
CONTENT_LENGTH=''${#INIT_REQUEST}
RESPONSE=$(
{
printf "Content-Length: %d\r\n\r\n%s" "$CONTENT_LENGTH" "$INIT_REQUEST"
sleep 1
} | timeout 3 ${lib.getExe emmet-language-server} --stdio 2>&1 | head -c 1000
) || true
echo "$RESPONSE" | grep -q '"capabilities"'
touch $out
'';
};
meta = {
description = "Language server for emmet.io";

View File

@@ -14,6 +14,7 @@
copyDesktopItems,
makeDesktopItem,
nix-update-script,
webVersion ? false,
}:
let
pname = "feishin";
@@ -33,7 +34,10 @@ buildNpmPackage {
inherit src;
__structuredAttrs = true;
npmConfigHook = pnpmConfigHook;
npmBuildScript = if webVersion then "build:web" else "build";
npmDeps = null;
pnpmDeps = fetchPnpmDeps {
@@ -52,8 +56,8 @@ buildNpmPackage {
nativeBuildInputs = [
pnpm_10
]
++ lib.optionals (stdenv.hostPlatform.isLinux) [ copyDesktopItems ]
++ lib.optionals stdenv.hostPlatform.isDarwin [
++ lib.optionals (stdenv.hostPlatform.isLinux && !webVersion) [ copyDesktopItems ]
++ lib.optionals (stdenv.hostPlatform.isDarwin && !webVersion) [
darwin.autoSignDarwinBinariesHook
actool
];
@@ -73,7 +77,7 @@ buildNpmPackage {
ln -s ${dart-sass}/bin/dart-sass "$dir"/sass
'';
postBuild = ''
postBuild = lib.optionalString (!webVersion) ''
cp -r ${electron.dist} electron-dist
chmod -R u+w electron-dist
@@ -88,14 +92,18 @@ buildNpmPackage {
installPhase = ''
runHook preInstall
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
+ lib.optionalString webVersion ''
mkdir -p $out
cp -r out/web/* $out
''
+ lib.optionalString (stdenv.hostPlatform.isDarwin && !webVersion) ''
mkdir -p $out/{Applications,bin}
cp -r dist/**/Feishin.app $out/Applications/
makeWrapper $out/Applications/Feishin.app/Contents/MacOS/Feishin $out/bin/feishin \
--prefix PATH : "${lib.makeBinPath [ mpv-unwrapped ]}" \
--set DISABLE_AUTO_UPDATES 1
''
+ lib.optionalString stdenv.hostPlatform.isLinux ''
+ lib.optionalString (stdenv.hostPlatform.isLinux && !webVersion) ''
mkdir -p $out/share/feishin
pushd dist/*-unpacked/
@@ -126,7 +134,7 @@ buildNpmPackage {
runHook postInstall
'';
desktopItems = [
desktopItems = lib.optionals (!webVersion) [
(makeDesktopItem {
name = "feishin";
desktopName = "Feishin";
@@ -152,11 +160,11 @@ buildNpmPackage {
sourceProvenance = with lib.sourceTypes; [ fromSource ];
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.unix;
mainProgram = "feishin";
maintainers = with lib.maintainers; [
BatteredBunny
onny
jlbribeiro
];
};
}
// lib.optionalAttrs (!webVersion) { mainProgram = "feishin"; };
}

View File

@@ -43,7 +43,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "firewalld";
version = "2.4.2";
version = "2.4.3";
__structuredAttrs = true;
strictDeps = true;
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "firewalld";
repo = "firewalld";
tag = "v${finalAttrs.version}";
hash = "sha256-RUDDUvpGfWEKI+VtC4SBMLKsAHkStV1qAYpHLQbN5HM=";
hash = "sha256-S7E0szAZ2MEttL4PdBkoOcDGFVCVrwsTKr9xe+DPPgM=";
};
patches = [
@@ -132,6 +132,9 @@ stdenv.mkDerivation (finalAttrs: {
''
+ lib.optionalString (!withGui) ''
rm $out/bin/firewall-{applet,config}
rm $out/etc/xdg/autostart/firewall-applet.desktop
rm $out/share/applications/firewall-config.desktop
rm $out/share/metainfo/org.firewalld.firewall-config.metainfo.xml
'';
dontWrapGApps = true;

View File

@@ -1,72 +1,103 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
aws-eventstream (1.3.2)
aws-partitions (1.1064.0)
aws-sdk-cloudwatchlogs (1.109.0)
aws-sdk-core (~> 3, >= 3.216.0)
addressable (2.9.0)
public_suffix (>= 2.0.2, < 8.0)
async (2.42.0)
console (~> 1.29)
fiber-annotation
io-event (~> 1.11)
metrics (~> 0.12)
traces (~> 0.18)
async-http (0.95.1)
async (>= 2.10.2)
async-pool (~> 0.11)
io-endpoint (~> 0.14)
io-stream (~> 0.6)
metrics (~> 0.12)
protocol-http (~> 0.62)
protocol-http1 (~> 0.39)
protocol-http2 (~> 0.26)
protocol-url (~> 0.2)
traces (~> 0.10)
async-pool (0.11.2)
async (>= 2.0)
aws-eventstream (1.4.0)
aws-partitions (1.1267.0)
aws-sdk-cloudwatchlogs (1.159.0)
aws-sdk-core (~> 3, >= 3.254.0)
aws-sigv4 (~> 1.5)
aws-sdk-core (3.220.1)
aws-sdk-core (3.254.0)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.992.0)
aws-sigv4 (~> 1.9)
base64
bigdecimal
jmespath (~> 1, >= 1.6.1)
aws-sdk-firehose (1.89.0)
aws-sdk-core (~> 3, >= 3.216.0)
logger
aws-sdk-firehose (1.112.0)
aws-sdk-core (~> 3, >= 3.254.0)
aws-sigv4 (~> 1.5)
aws-sdk-kinesis (1.74.0)
aws-sdk-core (~> 3, >= 3.216.0)
aws-sdk-kinesis (1.103.0)
aws-sdk-core (~> 3, >= 3.254.0)
aws-sigv4 (~> 1.5)
aws-sdk-kms (1.99.0)
aws-sdk-core (~> 3, >= 3.216.0)
aws-sdk-kms (1.130.0)
aws-sdk-core (~> 3, >= 3.254.0)
aws-sigv4 (~> 1.5)
aws-sdk-s3 (1.182.0)
aws-sdk-core (~> 3, >= 3.216.0)
aws-sdk-s3 (1.227.0)
aws-sdk-core (~> 3, >= 3.254.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.5)
aws-sdk-sqs (1.93.0)
aws-sdk-core (~> 3, >= 3.216.0)
aws-sdk-sqs (1.117.0)
aws-sdk-core (~> 3, >= 3.254.0)
aws-sigv4 (~> 1.5)
aws-sigv4 (1.11.0)
aws-sigv4 (1.12.1)
aws-eventstream (~> 1, >= 1.0.2)
base64 (0.2.0)
base64 (0.3.0)
bigdecimal (4.1.2)
bson (4.15.0)
concurrent-ruby (1.3.5)
cool.io (1.9.0)
csv (3.3.2)
concurrent-ruby (1.3.7)
console (1.36.0)
fiber-annotation
fiber-local (~> 1.1)
json
cool.io (1.9.4)
csv (3.3.5)
digest-crc (0.7.0)
rake (>= 12.0.0, < 14.0.0)
drb (2.2.1)
elastic-transport (8.4.0)
drb (2.2.3)
elastic-transport (8.5.3)
faraday (< 3)
multi_json
elasticsearch (8.17.1)
elasticsearch (9.4.3)
elastic-transport (~> 8.3)
elasticsearch-api (= 8.17.1)
elasticsearch-api (8.17.1)
elasticsearch-api (= 9.4.3)
elasticsearch-api (9.4.3)
base64
multi_json
excon (1.2.5)
excon (1.5.0)
logger
faraday (2.12.2)
faraday (2.14.3)
faraday-net_http (>= 2.0, < 3.5)
json
logger
faraday-excon (2.3.0)
faraday-excon (2.4.0)
excon (>= 1.0.0)
faraday (>= 2.11.0, < 3)
faraday-net_http (3.4.0)
net-http (>= 0.5.0)
faraday-net_http (3.4.4)
net-http (~> 0.5)
fiber-annotation (0.2.0)
fiber-local (1.1.0)
fiber-storage
fiber-storage (1.0.1)
fluent-config-regexp-type (1.0.0)
fluentd (> 1.0.0, < 2)
fluent-plugin-cloudwatch-logs (0.14.3)
fluent-plugin-cloudwatch-logs (0.15.0)
aws-sdk-cloudwatchlogs (~> 1.0)
fluentd (>= 1.8.0)
fluent-plugin-concat (2.5.0)
fluent-plugin-concat (2.6.2)
fluentd (>= 0.14.0, < 2)
fluent-plugin-elasticsearch (5.4.3)
fluent-plugin-elasticsearch (6.0.0)
elasticsearch
excon
faraday (>= 2.0.0)
@@ -76,12 +107,13 @@ GEM
fluentd (>= 0.10.58, < 2)
ltsv
ruby-kafka (>= 1.5.0, < 2)
fluent-plugin-kinesis (3.5.0)
fluent-plugin-kinesis (3.7.0)
aws-sdk-firehose (~> 1, != 1.9, != 1.5, != 1.15)
aws-sdk-kinesis (~> 1, != 1.5, != 1.4, != 1.14)
fluentd (>= 0.14.22, < 2)
google-protobuf (~> 3)
fluent-plugin-mongo (1.6.0)
google-protobuf (~> 4)
fluent-plugin-mongo (1.6.3)
bigdecimal (~> 4.0)
fluentd (>= 0.14.22, < 2)
mongo (>= 2.15.0, < 2.19.0)
fluent-plugin-record-reformer (0.9.1)
@@ -89,14 +121,15 @@ GEM
fluent-plugin-rewrite-tag-filter (2.4.0)
fluent-config-regexp-type
fluentd (>= 0.14.2, < 2)
fluent-plugin-s3 (1.8.3)
fluent-plugin-s3 (1.8.5)
aws-sdk-s3 (~> 1.60)
aws-sdk-sqs (~> 1.23)
fluentd (>= 0.14.22, < 2)
fluent-plugin-webhdfs (1.6.0)
fluentd (>= 0.14.22)
webhdfs (>= 0.11.0)
fluentd (1.18.0)
fluentd (1.19.3)
async-http (~> 0.86)
base64 (~> 0.2)
bundler
cool.io (>= 1.4.5, < 2.0.0)
@@ -105,31 +138,46 @@ GEM
http_parser.rb (>= 0.5.1, < 0.9.0)
logger (~> 1.6)
msgpack (>= 1.3.1, < 2.0.0)
net-http (~> 0.8)
ostruct (~> 0.6)
serverengine (>= 2.3.2, < 3.0.0)
sigdump (~> 0.2.5)
strptime (>= 0.2.4, < 1.0.0)
tzinfo (>= 1.0, < 3.0)
tzinfo-data (~> 1.0)
uri (~> 1.0)
webrick (~> 1.4)
yajl-ruby (~> 1.0)
google-protobuf (3.25.6)
google-protobuf (3.25.6-aarch64-linux)
google-protobuf (3.25.6-arm64-darwin)
google-protobuf (3.25.6-x86-linux)
google-protobuf (3.25.6-x86_64-darwin)
http_parser.rb (0.8.0)
zstd-ruby (~> 1.5)
google-protobuf (4.35.1)
bigdecimal
rake (~> 13.3)
http_parser.rb (0.8.1)
io-endpoint (0.17.2)
io-event (1.19.1)
io-stream (0.13.1)
jmespath (1.6.2)
json (2.10.1)
logger (1.6.6)
json (2.20.0)
logger (1.7.0)
ltsv (0.1.2)
metrics (0.15.0)
mongo (2.18.3)
bson (>= 4.14.1, < 5.0.0)
msgpack (1.8.0)
multi_json (1.15.0)
net-http (0.6.0)
uri
public_suffix (6.0.1)
rake (13.2.1)
msgpack (1.8.3)
multi_json (1.21.1)
net-http (0.9.1)
uri (>= 0.11.1)
ostruct (0.6.3)
protocol-hpack (1.5.1)
protocol-http (0.62.2)
protocol-http1 (0.39.0)
protocol-http (~> 0.62)
protocol-http2 (0.26.0)
protocol-hpack (~> 1.4)
protocol-http (~> 0.62)
protocol-url (0.4.0)
public_suffix (7.0.5)
rake (13.4.2)
ruby-kafka (1.5.0)
digest-crc
serverengine (2.4.0)
@@ -138,22 +186,20 @@ GEM
sigdump (~> 0.2.2)
sigdump (0.2.5)
strptime (0.2.5)
traces (0.18.2)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
tzinfo-data (1.2025.1)
tzinfo-data (1.2026.3)
tzinfo (>= 1.0.0)
uri (1.0.3)
uri (1.1.1)
webhdfs (0.11.0)
addressable
webrick (1.9.1)
webrick (1.9.2)
yajl-ruby (1.4.3)
zstd-ruby (1.5.7.1)
PLATFORMS
aarch64-linux
arm64-darwin
ruby
x86-linux
x86_64-darwin
DEPENDENCIES
fluent-plugin-cloudwatch-logs
@@ -169,4 +215,4 @@ DEPENDENCIES
fluentd
BUNDLED WITH
2.6.2
2.7.2

View File

@@ -5,30 +5,80 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6";
sha256 = "1by7h2lwziiblizpd5yx87jsq8ppdhzvwf08ga34wzqgcv1nmpvz";
type = "gem";
};
version = "2.8.7";
version = "2.9.0";
};
async = {
dependencies = [
"console"
"fiber-annotation"
"io-event"
"metrics"
"traces"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1ik5p6pgx01mrg2c5pj6rmjwr2s5sbvip84zcysxb5cc7clphq2k";
type = "gem";
};
version = "2.42.0";
};
async-http = {
dependencies = [
"async"
"async-pool"
"io-endpoint"
"io-stream"
"metrics"
"protocol-http"
"protocol-http1"
"protocol-http2"
"protocol-url"
"traces"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0v3q2kn9j5vfag7b4zv2vc1i4jkrqjz1pc109df6vh04q9cd8g8c";
type = "gem";
};
version = "0.95.1";
};
async-pool = {
dependencies = [ "async" ];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1vg3lwb3yhq0rad3dm00vp35vrahkbxgl4kx3d2rqkdh09xs2hqa";
type = "gem";
};
version = "0.11.2";
};
aws-eventstream = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1mvjjn8vh1c3nhibmjj9qcwxagj6m9yy961wblfqdmvhr9aklb3y";
sha256 = "0fqqdqg15rgwgz3mn4pj91agd20csk9gbrhi103d20328dfghsqi";
type = "gem";
};
version = "1.3.2";
version = "1.4.0";
};
aws-partitions = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0jdajznsdc0niv68xqp9sv29l9piyn32grq1y367l14hbm17mnf2";
sha256 = "07i2n8f7cpbcckj6zqlivhw05khsrg77bijj2jdb00y3z2zcd90m";
type = "gem";
};
version = "1.1064.0";
version = "1.1267.0";
};
aws-sdk-cloudwatchlogs = {
dependencies = [
@@ -39,10 +89,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1izd0al8i8wmi0cx18w4y8nriw623c21rb7c8vwpgk4mzd2kqxhw";
sha256 = "1ja3j4a3mvgcdrcpzisip40h5f4mix0724p14w8c1phxd794xz5r";
type = "gem";
};
version = "1.109.0";
version = "1.159.0";
};
aws-sdk-core = {
dependencies = [
@@ -50,16 +100,18 @@
"aws-partitions"
"aws-sigv4"
"base64"
"bigdecimal"
"jmespath"
"logger"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0cjdqmy5hjbgzc0iac1i143va76qgp7jc7hg1aviy1n8cgywq44y";
sha256 = "1zhj444iybzs1ikw1p4arv3zayw9xkk1ifnsb6g3r2j6p0h34gpf";
type = "gem";
};
version = "3.220.1";
version = "3.254.0";
};
aws-sdk-firehose = {
dependencies = [
@@ -70,10 +122,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1sryh7fjg525ddwlbd37mi3ygjcc6qn9r0md64d6ssrvk2ah0v1i";
sha256 = "0sxr068m9fxw04m79ainsr3fniq7pxdwcp9syxbxxyq65bgq300g";
type = "gem";
};
version = "1.89.0";
version = "1.112.0";
};
aws-sdk-kinesis = {
dependencies = [
@@ -84,10 +136,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1qfwsc373a674y8xcy8g1ykc84d21vbz0dqpbh1f1k2mny2cxz7s";
sha256 = "0g7m6ii4m03h6prd21z42yll259qlk08agfydkcikrixq1nlf3rz";
type = "gem";
};
version = "1.74.0";
version = "1.103.0";
};
aws-sdk-kms = {
dependencies = [
@@ -98,10 +150,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1a3mh89kfh6flqxw48wfv9wfwkj2zxazw096mqm56wnnzz1jyads";
sha256 = "0jfpgjyhq3f7w67p3361f1racrc1m502zan934m7mdrir9i3ds52";
type = "gem";
};
version = "1.99.0";
version = "1.130.0";
};
aws-sdk-s3 = {
dependencies = [
@@ -113,10 +165,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "03a55dbihv6xvgfwhx0f35rwc7q3rr0555vfpxlwpdjw75wkbz6h";
sha256 = "0fd9xq7xyadlldgd9l9iry3fi38wwr1iaag9ax4xpirpkazj6asm";
type = "gem";
};
version = "1.182.0";
version = "1.227.0";
};
aws-sdk-sqs = {
dependencies = [
@@ -127,10 +179,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "16b5jdnmk93l86nnqpij4zac7srx8c2yvx07xxbazmkawcnrd27g";
sha256 = "0wj489w3v5canns7c5lnp38hjf954gxfvlva76vwrw9618cvzznd";
type = "gem";
};
version = "1.93.0";
version = "1.117.0";
};
aws-sigv4 = {
dependencies = [ "aws-eventstream" ];
@@ -138,20 +190,30 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1nx1il781qg58nwjkkdn9fw741cjjnixfsh389234qm8j5lpka2h";
sha256 = "003ch8qzh3mppsxch83ns0jra8d222ahxs96p9cdrl0grfazywv9";
type = "gem";
};
version = "1.11.0";
version = "1.12.1";
};
base64 = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g";
sha256 = "0yx9yn47a8lkfcjmigk79fykxvr80r4m1i35q82sxzynpbm7lcr7";
type = "gem";
};
version = "0.2.0";
version = "0.3.0";
};
bigdecimal = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1g9zi8c4i7g8zz0c3hxrw6mblrjvgn7akys60clb9si7c1k1gljk";
type = "gem";
};
version = "4.1.2";
};
bson = {
groups = [ "default" ];
@@ -168,30 +230,45 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1";
sha256 = "1c2i64xsd35vijnb50rxb70g508s0x674xi0qpyyb8jy7bncl4j4";
type = "gem";
};
version = "1.3.5";
version = "1.3.7";
};
console = {
dependencies = [
"fiber-annotation"
"fiber-local"
"json"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "01vg83f2q7n0q5dsq2sfjmm6mrizhyzkmw21i4ysg06g0slrwna5";
type = "gem";
};
version = "1.36.0";
};
"cool.io" = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0cl3ri6zsnpm3hixmlkrmyjir1w7m9szjfizwvccn05qb40a4apa";
sha256 = "0lzay9zxgf7j2avpl19334si092f3xyfd819wq75nmbrdwp4l0m5";
type = "gem";
};
version = "1.9.0";
version = "1.9.4";
};
csv = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0kmx36jjh2sahd989vcvw74lrlv07dqc3rnxchc5sj2ywqsw3w3g";
sha256 = "0gz7r2kazwwwyrwi95hbnhy54kwkfac5swh2gy5p5vw36fn38lbf";
type = "gem";
};
version = "3.3.2";
version = "3.3.5";
};
digest-crc = {
dependencies = [ "rake" ];
@@ -209,10 +286,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79";
sha256 = "0wrkl7yiix268s2md1h6wh91311w95ikd8fy8m5gx589npyxc00b";
type = "gem";
};
version = "2.2.1";
version = "2.2.3";
};
elastic-transport = {
dependencies = [
@@ -223,10 +300,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0xz5q3zlbkwdb9zipallvqxdw6gnz8ljyz4w7b3pv1lar43f9sdm";
sha256 = "1i2qzvf40hvp1s0m44kvpzi9zsinsy7w8fsrj62saa07n6pkdw1v";
type = "gem";
};
version = "8.4.0";
version = "8.5.3";
};
elasticsearch = {
dependencies = [
@@ -237,21 +314,24 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1nbwd1f5s060hiqcs2bmwzvsli3l3vcyyd3khxcxzzxvysqq0zb9";
sha256 = "0hpvj11mbn74z8ph17qjs1n7jkpjv5csr1x1nhrnk9zi04xnwjnw";
type = "gem";
};
version = "8.17.1";
version = "9.4.3";
};
elasticsearch-api = {
dependencies = [ "multi_json" ];
dependencies = [
"base64"
"multi_json"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1iwl70xid303nyhfv5342yj5kk37rjbgdzkjdi83fnvyhisi5166";
sha256 = "14n9mypalmi9f1gv9xkdirjxhihv3wiks2vsgdnl7q19wyfq2626";
type = "gem";
};
version = "8.17.1";
version = "9.4.3";
};
excon = {
dependencies = [ "logger" ];
@@ -259,10 +339,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "17asr18vawi08g3wbif0wdi8bnyj01d125saydl9j1f03fv0n16a";
sha256 = "0l3dpg45i74ap1d7c4wyrdlc67l9vj4kgzv2l2r8mg1304fss0y5";
type = "gem";
};
version = "1.2.5";
version = "1.5.0";
};
faraday = {
dependencies = [
@@ -274,10 +354,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1mls9g490k63rdmjc9shqshqzznfn1y21wawkxrwp2vvbk13jwqm";
sha256 = "0y7j6yzv07zggic6g0p2v1ivnvkzsbqjnfdl4215qqb6cxz290hq";
type = "gem";
};
version = "2.12.2";
version = "2.14.3";
};
faraday-excon = {
dependencies = [
@@ -288,10 +368,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0xdmwnkkms7bnx0bpkdk52qcazjqa3skb7jmjr21cjr8mdsp3z65";
sha256 = "1xn867jjsy4dj0sxrrwd58l3kpdjs1in4p1jcbmni126hcszy1ra";
type = "gem";
};
version = "2.3.0";
version = "2.4.0";
};
faraday-net_http = {
dependencies = [ "net-http" ];
@@ -299,10 +379,41 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0jp5ci6g40d6i50bsywp35l97nc2fpi9a592r2cibwicdb6y9wd1";
sha256 = "125m3qri52vwh5v9dhq0dkqxf8629cxrf99yyc01pva72wasyy0f";
type = "gem";
};
version = "3.4.0";
version = "3.4.4";
};
fiber-annotation = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "00vcmynyvhny8n4p799rrhcx0m033hivy0s1gn30ix8rs7qsvgvs";
type = "gem";
};
version = "0.2.0";
};
fiber-local = {
dependencies = [ "fiber-storage" ];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "01lz929qf3xa90vra1ai1kh059kf2c8xarfy6xbv1f8g457zk1f8";
type = "gem";
};
version = "1.1.0";
};
fiber-storage = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1qa0j9qjwav9xb0n3isx0rbh0942xrfback392n6vs8bidnmp3pl";
type = "gem";
};
version = "1.0.1";
};
fluent-config-regexp-type = {
dependencies = [ "fluentd" ];
@@ -324,10 +435,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "139d7qv4my818mhjp0104ns9dlndlvrb6dgxa2rkv6jlzlamjpjb";
sha256 = "0d4vr7mkha72f65pnisqp26gppas0zhz4xvpyqk0ka9mkwyj2m2m";
type = "gem";
};
version = "0.14.3";
version = "0.15.0";
};
fluent-plugin-concat = {
dependencies = [ "fluentd" ];
@@ -335,10 +446,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1b9z6hrjcsvccfimmgczzcbhvf2zwyqzvsdc29i2biqhk1mcwn3k";
sha256 = "18vsv1lh41hk12ji11zsf2ipqzw0l6isxw748yhrlzfz55lh2j99";
type = "gem";
};
version = "2.5.0";
version = "2.6.2";
};
fluent-plugin-elasticsearch = {
dependencies = [
@@ -352,10 +463,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "19psa92z4zsmbwz8n4rizkwws58qlgb30325rhmqpnsp9h8b0cbb";
sha256 = "0lnz56kaxqp28dckn5f7xb6mywf5dr0v56lvskx5jr67z97wsich";
type = "gem";
};
version = "5.4.3";
version = "6.0.0";
};
fluent-plugin-kafka = {
dependencies = [
@@ -383,13 +494,14 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "12wx84a9h1xjldxa3yxxsmkyn620m2knw47dmfnr9rvgw2s4dlrz";
sha256 = "0jq7ci8h243g23dhx9vbqz1sb2kipz7v7y318wvj4lnq2xgpmmj5";
type = "gem";
};
version = "3.5.0";
version = "3.7.0";
};
fluent-plugin-mongo = {
dependencies = [
"bigdecimal"
"fluentd"
"mongo"
];
@@ -397,10 +509,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1m3fa6fwpzxw08lnczsif5c7v33yryyvgb1lbp7a7qjhipvb6jfm";
sha256 = "09h70j007gb7ia66fm67b9842vbdfp18h1bf8mgjxvhz4ylx4p26";
type = "gem";
};
version = "1.6.0";
version = "1.6.3";
};
fluent-plugin-record-reformer = {
dependencies = [ "fluentd" ];
@@ -437,10 +549,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0c7l7y51j5fz99086ghj99rjv16frj5kl4wcclvfws1jc5c38mj9";
sha256 = "1r6vqs2zlsck2v6pd89g9s2mxk064y0pls0s3awbq4186a8kpn9r";
type = "gem";
};
version = "1.8.3";
version = "1.8.5";
};
fluent-plugin-webhdfs = {
dependencies = [
@@ -458,6 +570,7 @@
};
fluentd = {
dependencies = [
"async-http"
"base64"
"cool.io"
"csv"
@@ -465,42 +578,80 @@
"http_parser.rb"
"logger"
"msgpack"
"net-http"
"ostruct"
"serverengine"
"sigdump"
"strptime"
"tzinfo"
"tzinfo-data"
"uri"
"webrick"
"yajl-ruby"
"zstd-ruby"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "100fd0ihgpqddkdqmbvlp51v09rnr4xb25l5lq776ai21hc4gj8d";
sha256 = "1n2f3lfc99ry640i1j2xar2fp9yn6fhrbzdw0ilpdicrclnmb3y2";
type = "gem";
};
version = "1.18.0";
version = "1.19.3";
};
google-protobuf = {
dependencies = [
"bigdecimal"
"rake"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0g0h7rwiivx93jddfws5pdkcpnhma3694k2jfv2i1k80qkrqnrmv";
sha256 = "09ipzsijxkrgwnyic0l4yhnazw46ca7ll0adza6za66r649lg9m3";
type = "gem";
};
version = "3.25.6";
version = "4.35.1";
};
"http_parser.rb" = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1gj4fmls0mf52dlr928gaq0c0cb0m3aqa9kaa6l0ikl2zbqk42as";
sha256 = "0yh924g697spcv4hfigyxgidhyy6a7b9007rnac57airbcadzs4s";
type = "gem";
};
version = "0.8.0";
version = "0.8.1";
};
io-endpoint = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0f1kzf4d5qgqgfjh52a8pf3pii5dmav6ib0zq4wmicqnq5kggsiz";
type = "gem";
};
version = "0.17.2";
};
io-event = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1rkfxcydk07qa9zs2ll7fj9zhl374v6vb0m9m7dbz74832isj6l5";
type = "gem";
};
version = "1.19.1";
};
io-stream = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1pi0vr60l3ld4mlfrhgbiyvxkribi82258mlh1s7dg8gzd6pq3ap";
type = "gem";
};
version = "0.13.1";
};
jmespath = {
groups = [ "default" ];
@@ -517,20 +668,20 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1p4l5ycdxfsr8b51gnvlvhq6s21vmx9z4x617003zbqv3bcqmj6x";
sha256 = "0ay31y1yl208xrpcsw6b0k4q309magq7q5prmdbb0lm9ampbqqlk";
type = "gem";
};
version = "2.10.1";
version = "2.20.0";
};
logger = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "05s008w9vy7is3njblmavrbdzyrwwc1fsziffdr58w9pwqj8sqfx";
sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr";
type = "gem";
};
version = "1.6.6";
version = "1.7.0";
};
ltsv = {
groups = [ "default" ];
@@ -542,6 +693,16 @@
};
version = "0.1.2";
};
metrics = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0wlh0g4xmfqa41dsh4m3514q3jcvy6jx97mwn6ayj62ir6xdbpk1";
type = "gem";
};
version = "0.15.0";
};
mongo = {
dependencies = [ "bson" ];
groups = [ "default" ];
@@ -558,20 +719,20 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0cnpnbn2yivj9gxkh8mjklbgnpx6nf7b8j2hky01dl0040hy0k76";
sha256 = "18g6ps30z6m365bly7sfialavnsf6m6qamdxsr84w96k51j4mnlb";
type = "gem";
};
version = "1.8.0";
version = "1.8.3";
};
multi_json = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z";
sha256 = "1040lr5y2phn7avdyam6zw6ikprlmk77biw3yhclsfwfh0qnl4p6";
type = "gem";
};
version = "1.15.0";
version = "1.21.1";
};
net-http = {
dependencies = [ "uri" ];
@@ -579,30 +740,95 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1ysrwaabhf0sn24jrp0nnp51cdv0jf688mh5i6fsz63q2c6b48cn";
sha256 = "15k96fj6qwbaiv6g52l538ass95ds1qwgynqdridz29yqrkhpfi5";
type = "gem";
};
version = "0.6.0";
version = "0.9.1";
};
ostruct = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "04nrir9wdpc4izqwqbysxyly8y7hsfr4fsv69rw91lfi9d5fv8lm";
type = "gem";
};
version = "0.6.3";
};
protocol-hpack = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "14ddqg5mcs9ysd1hdzkm5pwil0660vrxcxsn576s3387p0wa5v3g";
type = "gem";
};
version = "1.5.1";
};
protocol-http = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0fvpza7nnbyd3nfxkn5gych6diwns386g2ib9s6azh99c3sz5hg1";
type = "gem";
};
version = "0.62.2";
};
protocol-http1 = {
dependencies = [ "protocol-http" ];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1syqgaklsn9rf11xmll2s3ms7jvpd5zjng9jdb3r8pbgv963z6z4";
type = "gem";
};
version = "0.39.0";
};
protocol-http2 = {
dependencies = [
"protocol-hpack"
"protocol-http"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "11kl6768hpzgvvvlpyvmr74v0jqf2vslcwngs3643cl2h3brrj5s";
type = "gem";
};
version = "0.26.0";
};
protocol-url = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1qd9vsn9sif58swfqsyj429aynqyv6hpgbzxqrd83baidcxw1m34";
type = "gem";
};
version = "0.4.0";
};
public_suffix = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31";
sha256 = "08znfv30pxmdkjyihvbjqbvv874dj3nybmmyscl958dy3f7v12qs";
type = "gem";
};
version = "6.0.1";
version = "7.0.5";
};
rake = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6";
sha256 = "009p524zl0p0kfa65nii8wdmaigkmawv9pbvlcffky7islmmp0nb";
type = "gem";
};
version = "13.2.1";
version = "13.4.2";
};
ruby-kafka = {
dependencies = [ "digest-crc" ];
@@ -650,6 +876,16 @@
};
version = "0.2.5";
};
traces = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "05722prvh34n96irnxa762wz0yj2nyrz70ab2zby3b6snjf69wc0";
type = "gem";
};
version = "0.18.2";
};
tzinfo = {
dependencies = [ "concurrent-ruby" ];
groups = [ "default" ];
@@ -667,20 +903,20 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "02yz3x0qxnnwbf7k18yck5pggbnyy43rq0d5w2r6rwlk3981m31d";
sha256 = "1ygpikd3hdqsi16gqh33r5al1b9xdwrv2wl3rw210g7iar9vr3s7";
type = "gem";
};
version = "1.2025.1";
version = "1.2026.3";
};
uri = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "04bhfvc25b07jaiaf62yrach7khhr5jlr5bx6nygg8pf11329wp9";
sha256 = "1ijpbj7mdrq7rhpq2kb51yykhrs2s54wfs6sm9z3icgz4y6sb7rp";
type = "gem";
};
version = "1.0.3";
version = "1.1.1";
};
webhdfs = {
dependencies = [ "addressable" ];
@@ -698,10 +934,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "12d9n8hll67j737ym2zw4v23cn4vxyfkb6vyv1rzpwv6y6a3qbdl";
sha256 = "0ca1hr2rxrfw7s613rp4r4bxb454i3ylzniv9b9gxpklqigs3d5y";
type = "gem";
};
version = "1.9.1";
version = "1.9.2";
};
yajl-ruby = {
groups = [ "default" ];
@@ -713,4 +949,14 @@
};
version = "1.4.3";
};
zstd-ruby = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "08gxd4hm9qpiyf9bvwwxba75g70j8vascj44y89xccps7bwgplfy";
type = "gem";
};
version = "1.5.7.1";
};
}

View File

@@ -12,13 +12,13 @@
buildNpmPackage (finalAttrs: {
pname = "ghostfolio";
version = "3.18.0";
version = "3.22.0";
src = fetchFromGitHub {
owner = "ghostfolio";
repo = "ghostfolio";
tag = finalAttrs.version;
hash = "sha256-BSH7NQV2iTmfGE6dHQEeObQQ5CkKZxsgHAbrjElHHHE=";
hash = "sha256-zKXq6juvxaPJ7h/2HDzh7lREFj0ni5HsAyhEbZ09K3M=";
# 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;
@@ -28,7 +28,7 @@ buildNpmPackage (finalAttrs: {
'';
};
npmDepsHash = "sha256-0Si+3zHyGoMbgEpNWdZVp+obNE0oqM8ghYDZvloJU5g=";
npmDepsHash = "sha256-r/LaDTd4TvoPll2w0It0cVOBniMnlZf1jg5mL9wII7I=";
postPatch = ''
substituteInPlace replace.build.mjs \

View File

@@ -20,11 +20,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gpaste";
version = "45.3";
version = "45.5";
src = fetchurl {
url = "https://www.imagination-land.org/files/gpaste/GPaste-${finalAttrs.version}.tar.xz";
hash = "sha256-UU8pw7bqEwg2Vh7S6GTx8swI/2IhlwjQgkGNZCzoMwc=";
hash = "sha256-seoPqmec9F4/zwmLjpAOUBBIVvLbFRMVPZ3jcloRrZE=";
};
patches = [
@@ -36,10 +36,6 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
substituteInPlace src/libgpaste/gpaste/gpaste-settings.c \
--subst-var-by gschemasCompiled ${glib.makeSchemaPath (placeholder "out") "${finalAttrs.pname}-${finalAttrs.version}"}
substituteInPlace src/gnome-shell/metadata.json.in --replace-fail \
'"shell-version": [ "45", "46", "47", "48" ],' \
'"shell-version": [ "45", "46", "47", "48", "49" ],'
'';
nativeBuildInputs = [
@@ -90,5 +86,6 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.bsd2;
platforms = lib.platforms.linux;
teams = [ lib.teams.gnome ];
maintainers = with lib.maintainers; [ fabiob ];
};
})

View File

@@ -12,13 +12,13 @@
buildDotnetModule (finalAttrs: {
pname = "jackett";
version = "0.24.2151";
version = "0.24.2200";
src = fetchFromGitHub {
owner = "jackett";
repo = "jackett";
tag = "v${finalAttrs.version}";
hash = "sha256-V4oBku723EWLTBBjFVkAJTBdhXYTs3Vx98YDinTr5Kc=";
hash = "sha256-hmgv17zju1BnT6eapTUhY+3Do/lr2+Cu/ejlU0/vF/I=";
};
projectFile = "src/Jackett.Server/Jackett.Server.csproj";

View File

@@ -36,7 +36,7 @@ let
pname = "librewolf-bin-unwrapped";
version = "152.0.4-1";
version = "152.0.5-1";
in
stdenv.mkDerivation {
@@ -46,8 +46,8 @@ stdenv.mkDerivation {
url = "https://codeberg.org/api/packages/librewolf/generic/librewolf/${version}/librewolf-${version}-${arch}-package.tar.xz";
hash =
{
x86_64-linux = "sha256-4vmsv93ENtteE18uGJF2ZEhaRA3nGJg//WYYdBREIig=";
aarch64-linux = "sha256-Q1vT/9qOs2AiMRsLcofF7F2Y+5QJJloI/QSVZwA9gC8=";
x86_64-linux = "sha256-9Y0n3UHRK9WgKhKFIMB3CLmh1Gp5aHoIiKxlKNKe5gc=";
aarch64-linux = "sha256-x9vUXaEtjnY6+mOLbLiXmBr5c7ZmEYRTJK9fDIpfgVs=";
}
.${stdenv.hostPlatform.system} or throwSystem;
};

View File

@@ -129,6 +129,10 @@ stdenv.mkDerivation (finalAttrs: {
# https://github.com/libuv/libuv/issues/1871
"shutdown_close_pipe"
]
++ lib.optionals stdenv.hostPlatform.isRiscV64 [
# Aborts (SIGABRT, exit 134)
"poll_nested_epoll"
]
++ lib.optionals stdenv.hostPlatform.isFreeBSD [
# ENETUNREACH when performed in jailed build env
"tcp_connect"

View File

@@ -47,14 +47,14 @@ in
# as bootloader for various platforms and corresponding binary and helper files.
stdenv.mkDerivation (finalAttrs: {
pname = "limine";
version = "12.4.0";
version = "12.4.1";
# We don't use the Git source but the release tarball, as the source has a
# `./bootstrap` script performing network access to download resources.
# Packaging that in Nix is very cumbersome.
src = fetchurl {
url = "https://github.com/Limine-Bootloader/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
hash = "sha256-fDTQuY+WYhyJl5AqP4ZoJ1T7WXgCca35pXHAv/8CjlA=";
hash = "sha256-LcpQkn1WTYCiRvLEmk31ii1KN62jHINb0oAoiF9t5V8=";
};
enableParallelBuilding = true;

View File

@@ -1,6 +1,6 @@
{
version = "1.30.3";
hash = "sha256-6Vt1GpGWHfaYaORBFa/cB+AxYQxAdkGtGTsrvL08dsA=";
npmDepsHash = "sha256-vXAXuvKqLWbwCjSLNS8mLDA9AmaGSRsB67iKQMi+/No=";
vendorHash = "sha256-A/kef2PgrA0Jpb/o+f1nUeiwSibOgsnyYLOzJ/HB1Fo=";
version = "1.30.4";
hash = "sha256-qpwwCugg18cC4xbwmLKNM3c63z8k1FOoZlzpgvXp5BU=";
npmDepsHash = "sha256-urjsUXcEwMaaaSs0WdH+8/q3h7mr+/lKvXi9x21VYpU=";
vendorHash = "sha256-/0ddo1IwGeLyOQRqgqNmju3qOzwYQTwz4MDf2TBkUDU=";
}

View File

@@ -14,19 +14,19 @@
python3Packages.buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.155.0";
version = "1.156.0";
pyproject = true;
src = fetchFromGitHub {
owner = "element-hq";
repo = "synapse";
rev = "v${version}";
hash = "sha256-ka92mJvm/7PaENPkQRWuw8c8BdzMvIuTsc3xSEmEms8=";
hash = "sha256-x3EVmNPqcxtvt6ZaPsDCCcr7Z0LIO257s2gO3HCNmKA=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname version src;
hash = "sha256-+Z2GyHlVothtcTKHjbr+iKQG8wi5tgtoZr8+FHYJEFk=";
hash = "sha256-N/JWRFz9OKcxigjp86AVVZGK63MdZmEzwHhBgBuWZcY=";
};
build-system =

View File

@@ -13,13 +13,13 @@ let
in
buildNpmPackage (finalAttrs: {
pname = "nezha-theme-user";
version = "2.3.1";
version = "2.4.0";
src = fetchFromGitHub {
owner = "hamster1963";
repo = "nezha-dash-v2";
tag = "v${finalAttrs.version}";
hash = "sha256-/2G0KhlXIvVM8db4nATJHiwPsvKXh8SNE+9DpllfSTs=";
hash = "sha256-ikrRkYrJnTRaBk3u6Ju0csRW9K3Udydh/JFTi/GxVOs=";
};
postPatch = ''
@@ -37,7 +37,7 @@ buildNpmPackage (finalAttrs: {
inherit (finalAttrs) pname version src;
inherit pnpm;
fetcherVersion = 4;
hash = "sha256-k/05ccqV72kC9E9MX+os8R0wmgIhnDYIwRNmIbedL1I=";
hash = "sha256-5lzMFY+PYHSQTWSewfLaspgeRq5PwWnU0ZzHYPzSMwE=";
};
npmConfigHook = pnpmConfigHook;

View File

@@ -11,12 +11,12 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "nh-unwrapped";
version = "4.4.0";
version = "4.4.1";
src = fetchFromGitHub {
owner = "nix-community";
repo = "nh";
tag = "v${finalAttrs.version}";
hash = "sha256-ebAi5ODaNRfhKISPPchWoI6FZNO2v+lEyvua7e5OOZo=";
hash = "sha256-4B/32NPGtc07kuT/zTeIrQjxCdiLRN8tmQHahwq/R7g=";
};
strictDeps = true;
@@ -100,7 +100,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
rm $out/bin/xtask
'';
cargoHash = "sha256-dRSueVz0BeWwYpMBO1KUUeRoa/CdCWsKPRw0Zeulfe8=";
cargoHash = "sha256-pGtYqdAszaHpQ8eoh15S8hB6kO6iqB7O1p+fZUbwxuU=";
passthru.updateScript = nix-update-script { };

View File

@@ -11,13 +11,13 @@
buildGoModule (finalAttrs: {
pname = "openlinkhub";
version = "0.8.8";
version = "0.8.9";
src = fetchFromGitHub {
owner = "jurkovic-nikola";
repo = "OpenLinkHub";
tag = finalAttrs.version;
hash = "sha256-uYuhmvdHNVs19egakwDOvIJ2IEAeZEAV6qgMYEl+Ie4=";
hash = "sha256-g8ZdiBaEelS+LhnOA23mMR+irN1wKD6Rp66sCnSD2tU=";
};
proxyVendor = true;

View File

@@ -4,9 +4,7 @@
fetchzip,
npmHooks,
tailwindcss_4,
nodejs,
pdfding,
}:
let
@@ -33,14 +31,12 @@ stdenv.mkDerivation (finalAttrs: {
npmDeps = fetchNpmDeps {
inherit (finalAttrs) src;
name = "pdfding-${finalAttrs.version}-npm-deps";
hash = "sha256-fxhDP/kyDfL1uiZCUNr2Cd6vDnyb9V+gTSNPyjSIm18=";
hash = "sha256-TDX2xoHj07aUeuLPt/TlgkdRdTiv3fNbriChzEB4EXk=";
};
nativeBuildInputs = [
nodejs
npmHooks.npmConfigHook
# it is in package.json and thus node_modules but no cli executable
tailwindcss_4
];
strictDeps = true;
@@ -53,7 +49,12 @@ stdenv.mkDerivation (finalAttrs: {
cp -r --no-preserve=mode pdfding/static $out/pdfding/static
cp -r --no-preserve=mode ${finalAttrs.passthru.pdfjs} $out/pdfding/static/pdfjs
tailwindcss -i $out/pdfding/static/css/input.css -o $out/pdfding/static/css/tailwind.css --minify
# NOTE: Directly using tailwindcss package from nixpkgs gave a `Trace/BPT trap: 5` error on darwin
# Trace/BPT trap: 5 tailwindcss -i $out/pdfding/static/css/input.css -o $out/pdfding/static/css/tailwind.css --minify
# It didn't occur when building the package in an interactive ssh session but on nixpkgs-review-gha it failed consistently
# https://github.com/NixOS/nixpkgs/pull/540436#issuecomment-4942029413
node node_modules/@tailwindcss/cli/dist/index.mjs -i pdfding/static/css/input.css -o $out/pdfding/static/css/tailwind.css --minify
rm $out/pdfding/static/css/input.css
for i in build/pdf.mjs build/pdf.sandbox.mjs build/pdf.worker.mjs web/viewer.mjs;

View File

@@ -12,12 +12,12 @@ let
in
python.pkgs.buildPythonPackage (finalAttrs: {
pname = "pdfding";
version = "1.9.0";
version = "1.10.0";
src = fetchFromGitHub {
owner = "mrmn2";
repo = "PdfDing";
tag = "v${finalAttrs.version}";
hash = "sha256-r3hO92iriQ/0KDl+D/0j5RoneTTCDmt8m4e7ugzyOPs=";
hash = "sha256-C1osj8V9+z3ahl4+zUtyI22GMtSgNLzfdGttL7gPDvY=";
};
pyproject = true;
@@ -132,13 +132,11 @@ python.pkgs.buildPythonPackage (finalAttrs: {
'';
pythonRelaxDeps = [
"django"
"django-allauth"
"gunicorn"
"huey"
"nh3"
"psycopg2-binary"
"pypdf"
"pypdfium2"
];

View File

@@ -78,11 +78,11 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "postfix";
version = "3.11.3";
version = "3.11.5";
src = fetchurl {
url = "http://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${finalAttrs.version}.tar.gz";
hash = "sha256-vRHcxGPXBF5A8sEcwAIWSJxztYzECz0GxUJlsIihc+E=";
hash = "sha256-Smqz0Ok5CYn6IB/GxEYEX8cCxOFueiR8OuJhyem+5hA=";
};
nativeBuildInputs = [

View File

@@ -22,13 +22,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "shaka-packager";
version = "3.7.2";
version = "3.8.0";
src = fetchFromGitHub {
owner = "shaka-project";
repo = "shaka-packager";
tag = "v${finalAttrs.version}";
hash = "sha256-E493sleVbsuytneK51lxuQnaEzvAEJwAXYmsxcaOXSs=";
hash = "sha256-GdBNysDHDWy1Zgtf+gfKtyvqCiPFJeA3K1mErK/GoRk=";
};
nativeBuildInputs = [

View File

@@ -7,13 +7,13 @@
}:
buildGoModule {
pname = "terraform-config-inspect";
version = "0-unstable-2026-02-24";
version = "0-unstable-2026-07-09";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "terraform-config-inspect";
rev = "813a9753022088a8e29290e3ba8806131a3329c2";
hash = "sha256-kjX7tSU5p5kssqIDnxuLyfmUul8UH83Aeq7ftN0HJCM=";
rev = "2fb54c236733ee65ee877105d595c124c993c64d";
hash = "sha256-f8DyPP0XhOlgVdp0yjjFVyjaO2+ypfMfEEv6lwA8u3M=";
};
vendorHash = "sha256-iYrSk9JqxvhYSJuSv/nhZep41gRr644ZzGFWXMGQgyc=";

View File

@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "tui-journal";
version = "0.16.1";
version = "0.17.0";
src = fetchFromGitHub {
owner = "AmmarAbouZor";
repo = "tui-journal";
tag = "v${finalAttrs.version}";
hash = "sha256-crrh7lV5ZMKaxsrFmhXsUgBMbN5nmbf8wQ6croTqUKI=";
hash = "sha256-ahjCfSodq4foBV3aBbU0FsSUrEo3wgvFYSBr/OClmpc=";
};
cargoHash = "sha256-PmQDLGOXvI0OJ+gMsYa/XLc0WgSH6++23X/b1+iU3JQ=";
cargoHash = "sha256-hbRSQ9iVmp0oKEK53y4IuU34WNgq+pRefNxFbP1DPVQ=";
nativeBuildInputs = [
pkg-config
@@ -34,9 +34,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
nativeInstallCheckInputs = [ versionCheckHook ];
meta = {
changelog = "https://github.com/AmmarAbouZor/tui-journal/blob/${finalAttrs.src.rev}/CHANGELOG.md";
description = "Your journal app if you live in a terminal";
homepage = "https://github.com/AmmarAbouZor/tui-journal";
changelog = "https://github.com/AmmarAbouZor/tui-journal/blob/${finalAttrs.src.rev}/CHANGELOG.ron";
license = lib.licenses.mit;
mainProgram = "tjournal";
maintainers = with lib.maintainers; [ phanirithvij ];

View File

@@ -2,6 +2,7 @@
lib,
stdenv,
fetchurl,
fetchpatch,
gettext,
pkg-config,
@@ -32,6 +33,29 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-GSJcx1awoIj8gRSNxqQKDI8ymvf9hIPxx7L+UPTgih8=";
};
patches = [
(fetchpatch {
name = "fix-cve-2026-58471";
url = "https://gitlab.com/gnuwget/wget/-/commit/c2640fe5171c59f87c58dc9fcb195b2d18b010ee.patch";
hash = "sha256-ZnCLK9ILpHMqpmI39sBl3Q3NRNc/H8jukvBrECqJ6OI=";
})
(fetchpatch {
name = "fix-cve-2026-58470";
url = "https://gitlab.com/gnuwget/wget/-/commit/43d3ba9336bc94937e6fae2365c6ffd30c34ffcf.patch";
hash = "sha256-aR5lW8t6ME2Os/NPXjFaUbNr3QuiUSQKsa2Zk292mrk=";
})
(fetchpatch {
name = "fix-cve-2026-58469";
url = "https://gitlab.com/gnuwget/wget/-/commit/37a40fcb450153f69537c7cbc2a7a4fb0b6f7826.patch";
hash = "sha256-lkHQufl8XFZ1Ig8EoRUw3JuCgDPQod9PKAIsTBWzvm4=";
})
(fetchpatch {
name = "fix-cve-2026-58472";
url = "https://gitlab.com/gnuwget/wget/-/commit/dd692d9cea5335b181d877ae917fe6e75587a812.patch";
hash = "sha256-FAlglKTZili9Y4ivSRLOEaOgektFmq4u6yyH+8WzQao=";
})
];
preConfigure = ''
patchShebangs doc
'';

View File

@@ -9,19 +9,19 @@
buildPythonPackage rec {
pname = "restrictedpython";
version = "8.1";
version = "8.4";
pyproject = true;
src = fetchFromGitHub {
owner = "zopefoundation";
repo = "RestrictedPython";
tag = version;
hash = "sha256-UcmH1I2p+XmQm4Y5M+Ms/LMSchor6GD6V9dxippa4HI=";
hash = "sha256-Ck5YDtjYs7rZk+MC+eKrQVCQX1EYlxC6m4kD5+QjfjE=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail "setuptools >= 78.1.1,< 81" setuptools
--replace-fail "setuptools >= 78.1.1,< 82" setuptools
'';
build-system = [ setuptools ];

View File

@@ -9,10 +9,28 @@ let
"8" = {
version = "8.15.9";
hash = "sha256-2qJ6C1QbxjUyP/lsLe2ZVGf/n+bWn/ZwIVWKqa2dzDY=";
knownVulnerabilities = [
"CVE-2026-48995"
"CVE-2026-50014"
"CVE-2026-50015"
"CVE-2026-50016"
"CVE-2026-50017"
"CVE-2026-50573"
"CVE-2026-55699"
];
};
"9" = {
version = "9.15.9";
hash = "sha256-z4anrXZEBjldQoam0J1zBxFyCsxtk+nc6ax6xNxKKKc=";
knownVulnerabilities = [
"CVE-2026-48995"
"CVE-2026-50014"
"CVE-2026-50015"
"CVE-2026-50016"
"CVE-2026-50017"
"CVE-2026-50573"
"CVE-2026-55699"
];
};
# 10.29.3 made a breaking change: https://github.com/pnpm/pnpm/issues/10601.
# Pnpm packages that depend on electron builder must be upgraded to 26.8.2 or newer
@@ -35,8 +53,8 @@ let
hash = "sha256-WOFDJYhx31FYm2UcBiBdq+xIdmpdu6PCWZm2m1C+WY4=";
};
"11" = {
version = "11.9.0";
hash = "sha256-K1Z6pmAmI4B4rC4KM77D/r1g6WKYeqxpdFbzGAgZsoc=";
version = "11.10.0";
hash = "sha256-YgtmBepPYvxWptCphzP0eQcdAyHgPkhrUix+mnRhdDE=";
};
};

View File

@@ -529,6 +529,7 @@ let
"test-fetch"
"test-http2-allow-http1-upgrade-ws"
"test-http-proxy-fetch"
"test-https-proxy-fetch"
"test-http-set-global-proxy-from-env-fetch"
"test-http-set-global-proxy-from-env-fetch-default"
"test-http-set-global-proxy-from-env-fetch-empty"

View File

@@ -5,6 +5,7 @@
nixosTests,
nextcloud32Packages,
nextcloud33Packages,
nextcloud34Packages,
}:
let
@@ -20,18 +21,14 @@ let
pname = "nextcloud";
inherit version;
__structuredAttrs = true;
strictDeps = true;
src = fetchurl {
url = "https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2";
inherit hash;
};
passthru = {
tests = lib.filterAttrs (
key: _: (lib.hasSuffix (lib.versions.major version) key)
) nixosTests.nextcloud;
inherit packages;
};
installPhase = ''
runHook preInstall
mkdir -p $out/
@@ -39,6 +36,13 @@ let
runHook postInstall
'';
passthru = {
tests = lib.filterAttrs (
key: _: (lib.hasSuffix (lib.versions.major version) key)
) nixosTests.nextcloud;
inherit packages;
};
meta = {
changelog = "https://nextcloud.com/changelog/#${lib.replaceStrings [ "." ] [ "-" ] version}";
description = "Sharing solution for files, calendars, contacts and more";
@@ -64,6 +68,12 @@ in
packages = nextcloud33Packages;
};
nextcloud34 = generic {
version = "34.0.1";
hash = "sha256-BOnDL8P+Ofa2qKGJFe9a/SgKVrSn90Thj1+i7/+8SmM=";
packages = nextcloud34Packages;
};
# tip: get the sha with:
# curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256'
}

View File

@@ -40,9 +40,9 @@
]
},
"contacts": {
"hash": "sha256-+13qOi3veMZ+QUN8G78a073u8MDgMfaR3HBu6eiEWYQ=",
"url": "https://github.com/nextcloud-releases/contacts/releases/download/v8.3.14/contacts-v8.3.14.tar.gz",
"version": "8.3.14",
"hash": "sha256-rFKmEZtyQgFjGBN44H167hGQP+n72uhUEiXlD7OguTI=",
"url": "https://github.com/nextcloud-releases/contacts/releases/download/v8.3.15/contacts-v8.3.15.tar.gz",
"version": "8.3.15",
"description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **Were not reinventing the wheel!** Based on the great and open SabreDAV library.",
"homepage": "https://github.com/nextcloud/contacts#readme",
"licenses": [
@@ -50,9 +50,9 @@
]
},
"cookbook": {
"hash": "sha256-Xn2yvgVL7XPIN8awCaH5mznRMW9Jcr0s2E19D13Hm8I=",
"url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.7/cookbook-0.11.7.tar.gz",
"version": "0.11.7",
"hash": "sha256-eOB04pPqR5rthxK+yrpxuxgZes9chxjRKhy2yd+kIME=",
"url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.8/cookbook-0.11.8.tar.gz",
"version": "0.11.8",
"description": "A library for all your recipes. It uses JSON files following the schema.org recipe format. To add a recipe to the collection, you can paste in the URL of the recipe, and the provided web page will be parsed and downloaded to whichever folder you specify in the app settings.",
"homepage": "https://github.com/nextcloud/cookbook/",
"licenses": [
@@ -150,9 +150,9 @@
]
},
"groupfolders": {
"hash": "sha256-/29wB6jwECzMsRvp5dXNuKodoMmYjD2gO9xiQX3Bg18=",
"url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v20.1.15/groupfolders-v20.1.15.tar.gz",
"version": "20.1.15",
"hash": "sha256-rOa82k/IwJdAweCzkZKLLqiOtP63eRdq98zxlnttFzc=",
"url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v20.1.16/groupfolders-v20.1.16.tar.gz",
"version": "20.1.16",
"description": "Team Folders (formerly \"Group Folders\") allows administrators to create and manage shared\nfolders for selected teams within Nextcloud.\n\nAdmins can grant one or more teams access to a folder, configure permissions (such as read,\nwrite, and sharing rights), and assign storage quotas from the Team Folders section (under\nadmin settings). The app also supports advanced permissions and integration with Nextclouds\ntrash and versioning systems.\n\nAs of Hub 10 / Nextcloud 31, admins must be members of a team to assign that team to a Team\nFolder.",
"homepage": "https://github.com/nextcloud/groupfolders",
"licenses": [
@@ -160,9 +160,9 @@
]
},
"guests": {
"hash": "sha256-w1uPtTZEQFJlhfobGflHf17GEYF3oBPwhieumWfYaDk=",
"url": "https://github.com/nextcloud-releases/guests/releases/download/v4.7.5/guests-v4.7.5.tar.gz",
"version": "4.7.5",
"hash": "sha256-MK3P6fMKYWgKkYTPy9oQFTea/B2iJoZANVVT/HFEnKI=",
"url": "https://github.com/nextcloud-releases/guests/releases/download/v4.8.0/guests-v4.8.0.tar.gz",
"version": "4.8.0",
"description": "👥 Allows for better collaboration with external users by allowing users to create guests account.\n\nGuests accounts can be created from the share menu by entering either the recipients email or name and choosing \"create guest account\", once the share is created the guest user will receive an email notification about the mail with a link to set their password.\n\nGuests users can only access files shared to them and cannot create any files outside of shares, additionally, the apps accessible to guest accounts are whitelisted.",
"homepage": "https://github.com/nextcloud/guests/",
"licenses": [
@@ -210,9 +210,9 @@
]
},
"mail": {
"hash": "sha256-GkLTk3Q1mSUGhU6lsNHmHGkwW6u4XoDCOj405vi8xuY=",
"url": "https://github.com/nextcloud-releases/mail/releases/download/v5.10.3/mail-v5.10.3.tar.gz",
"version": "5.10.3",
"hash": "sha256-c0pMd+A2Fbxa/20BAkg3lPeVRIdu0XRTbAGJxb/9NT0=",
"url": "https://github.com/nextcloud-releases/mail/releases/download/v5.10.7/mail-v5.10.7.tar.gz",
"version": "5.10.7",
"description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 Were not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
"homepage": "https://github.com/nextcloud/mail#readme",
"licenses": [
@@ -270,9 +270,9 @@
]
},
"oidc": {
"hash": "sha256-CTnFegGasnG+2MPK6c0H01OjrEKSM0WALwns9nJySaA=",
"url": "https://github.com/H2CK/oidc/releases/download/1.17.0/oidc-1.17.0.tar.gz",
"version": "1.17.0",
"hash": "sha256-5CJjNvbZHuadT+7IHMNJSp8r47kZqzQwMey7ccpe/4Y=",
"url": "https://github.com/H2CK/oidc/releases/download/2.0.3/oidc-2.0.3.tar.gz",
"version": "2.0.3",
"description": "Nextcloud as OpenID Connect Identity Provider\n\nWith this app you can use Nextcloud as OpenID Connect Identity Provider. If other services\nare configured correctly, you are able to access those services with your Nextcloud login.\n\nFull documentation can be found at:\n\n- [User Documentation](https://github.com/H2CK/oidc/wiki#user-documentation)\n- [Developer Documentation](https://github.com/H2CK/oidc/wiki#developer-documentation)",
"homepage": "https://github.com/H2CK/oidc",
"licenses": [
@@ -390,9 +390,9 @@
]
},
"spreed": {
"hash": "sha256-uBvz8qpJ/PDseSDLp4aWAmTlDIOtoGWAXRouYdqU3Yc=",
"url": "https://github.com/nextcloud-releases/spreed/releases/download/v22.0.14/spreed-v22.0.14.tar.gz",
"version": "22.0.14",
"hash": "sha256-Px8WFUNSRRWMcR/keUhoss7sjOUfXB9IAKdFKPzuSqs=",
"url": "https://github.com/nextcloud-releases/spreed/releases/download/v22.0.15/spreed-v22.0.15.tar.gz",
"version": "22.0.15",
"description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.",
"homepage": "https://github.com/nextcloud/spreed",
"licenses": [
@@ -410,9 +410,9 @@
]
},
"tasks": {
"hash": "sha256-nJFU65dthPRWd/SClKM/suZdYU3ic3QsIcXiPzUkQ6c=",
"url": "https://github.com/nextcloud/tasks/releases/download/v0.18.0/tasks.tar.gz",
"version": "0.18.0",
"hash": "sha256-DJiNUFMcm/okbmwx8/lTaa3eFim6cNFRlJFatW4kaHs=",
"url": "https://github.com/nextcloud/tasks/releases/download/v0.18.1/tasks.tar.gz",
"version": "0.18.1",
"description": "Once enabled, a new Tasks menu will appear in your Nextcloud apps menu. From there you can add and delete tasks, edit their title, description, start and due dates and mark them as important. Tasks can be shared between users. Tasks can be synchronized using CalDav (each task list is linked to an Nextcloud calendar, to sync it to your local client: Thunderbird, Evolution, KDE Kontact, iCal … - just add the calendar as a remote calendar in your client). You can download your tasks as ICS files using the download button for each calendar.",
"homepage": "https://github.com/nextcloud/tasks/",
"licenses": [
@@ -430,9 +430,9 @@
]
},
"twofactor_admin": {
"hash": "sha256-dx8bEsC/rSAKN9rwP2hf3d8G3f3J1RzCrSqU6BbcvRY=",
"url": "https://github.com/nextcloud-releases/twofactor_admin/releases/download/v4.11.1/twofactor_admin-v4.11.1.tar.gz",
"version": "4.11.1",
"hash": "sha256-IkHzIqRBhG6zr+8y5ifrRfsKl9TyMDx7G1JGogbQrDM=",
"url": "https://github.com/nextcloud-releases/twofactor_admin/releases/download/v4.12.0/twofactor_admin-v4.12.0.tar.gz",
"version": "4.12.0",
"description": "This two-factor auth (2FA) provider for Nextcloud allows admins to generate a one-time\n\t\tcode for users to log into a 2FA protected account. This is helpful in situations where\n\t\tusers have lost access to their other 2FA methods or mandatory 2FA without any previously\n\t\tenabled 2FA provider.",
"homepage": "",
"licenses": [
@@ -480,9 +480,9 @@
]
},
"user_saml": {
"hash": "sha256-rEeaUUYhsTVLZDo11Xh/wGI3k97Tq5J0Jn18QY1M1Xs=",
"url": "https://github.com/nextcloud-releases/user_saml/releases/download/v8.1.2/user_saml-v8.1.2.tar.gz",
"version": "8.1.2",
"hash": "sha256-LDiWtEaVJbNECJkcn80L4behkUyUsRlDFDd2lk2g+pE=",
"url": "https://github.com/nextcloud-releases/user_saml/releases/download/v8.1.4/user_saml-v8.1.4.tar.gz",
"version": "8.1.4",
"description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\t* Authentik\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.",
"homepage": "https://github.com/nextcloud/user_saml",
"licenses": [

View File

@@ -40,9 +40,9 @@
]
},
"contacts": {
"hash": "sha256-L0ro4VoU1GDMcs1m7qGns+S8y5+n1Q0oQ5EO1ojdLr0=",
"url": "https://github.com/nextcloud-releases/contacts/releases/download/v8.7.2/contacts-v8.7.2.tar.gz",
"version": "8.7.2",
"hash": "sha256-Lgw+wF40FlZTlbw5IXG/eUW8Chaw5Cm1i9f2R8YyPRU=",
"url": "https://github.com/nextcloud-releases/contacts/releases/download/v8.7.3/contacts-v8.7.3.tar.gz",
"version": "8.7.3",
"description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **Were not reinventing the wheel!** Based on the great and open SabreDAV library.",
"homepage": "https://github.com/nextcloud/contacts#readme",
"licenses": [
@@ -50,9 +50,9 @@
]
},
"cookbook": {
"hash": "sha256-Xn2yvgVL7XPIN8awCaH5mznRMW9Jcr0s2E19D13Hm8I=",
"url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.7/cookbook-0.11.7.tar.gz",
"version": "0.11.7",
"hash": "sha256-eOB04pPqR5rthxK+yrpxuxgZes9chxjRKhy2yd+kIME=",
"url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.8/cookbook-0.11.8.tar.gz",
"version": "0.11.8",
"description": "A library for all your recipes. It uses JSON files following the schema.org recipe format. To add a recipe to the collection, you can paste in the URL of the recipe, and the provided web page will be parsed and downloaded to whichever folder you specify in the app settings.",
"homepage": "https://github.com/nextcloud/cookbook/",
"licenses": [
@@ -150,9 +150,9 @@
]
},
"groupfolders": {
"hash": "sha256-2jy9p4pu2OXdi8JENFCBcPSDHnGIQkpzuyKkjxALAE4=",
"url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v21.0.8/groupfolders-v21.0.8.tar.gz",
"version": "21.0.8",
"hash": "sha256-2LlfB3hCX2RvIxG6W0LY4vz9833C/TX8rI0/Ab3jiiE=",
"url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v21.0.9/groupfolders-v21.0.9.tar.gz",
"version": "21.0.9",
"description": "Team Folders (formerly \"Group Folders\") allows administrators to create and manage shared\nfolders for selected teams within Nextcloud.\n\nAdmins can grant one or more teams access to a folder, configure permissions (such as read,\nwrite, and sharing rights), and assign storage quotas from the Team Folders section (under\nadmin settings). The app also supports advanced permissions and integration with Nextclouds\ntrash and versioning systems.\n\nAs of Hub 10 / Nextcloud 31, admins must be members of a team to assign that team to a Team\nFolder.",
"homepage": "https://github.com/nextcloud/groupfolders",
"licenses": [
@@ -160,9 +160,9 @@
]
},
"guests": {
"hash": "sha256-w1uPtTZEQFJlhfobGflHf17GEYF3oBPwhieumWfYaDk=",
"url": "https://github.com/nextcloud-releases/guests/releases/download/v4.7.5/guests-v4.7.5.tar.gz",
"version": "4.7.5",
"hash": "sha256-MK3P6fMKYWgKkYTPy9oQFTea/B2iJoZANVVT/HFEnKI=",
"url": "https://github.com/nextcloud-releases/guests/releases/download/v4.8.0/guests-v4.8.0.tar.gz",
"version": "4.8.0",
"description": "👥 Allows for better collaboration with external users by allowing users to create guests account.\n\nGuests accounts can be created from the share menu by entering either the recipients email or name and choosing \"create guest account\", once the share is created the guest user will receive an email notification about the mail with a link to set their password.\n\nGuests users can only access files shared to them and cannot create any files outside of shares, additionally, the apps accessible to guest accounts are whitelisted.",
"homepage": "https://github.com/nextcloud/guests/",
"licenses": [
@@ -210,9 +210,9 @@
]
},
"mail": {
"hash": "sha256-GkLTk3Q1mSUGhU6lsNHmHGkwW6u4XoDCOj405vi8xuY=",
"url": "https://github.com/nextcloud-releases/mail/releases/download/v5.10.3/mail-v5.10.3.tar.gz",
"version": "5.10.3",
"hash": "sha256-c0pMd+A2Fbxa/20BAkg3lPeVRIdu0XRTbAGJxb/9NT0=",
"url": "https://github.com/nextcloud-releases/mail/releases/download/v5.10.7/mail-v5.10.7.tar.gz",
"version": "5.10.7",
"description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 Were not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
"homepage": "https://github.com/nextcloud/mail#readme",
"licenses": [
@@ -270,9 +270,9 @@
]
},
"oidc": {
"hash": "sha256-CTnFegGasnG+2MPK6c0H01OjrEKSM0WALwns9nJySaA=",
"url": "https://github.com/H2CK/oidc/releases/download/1.17.0/oidc-1.17.0.tar.gz",
"version": "1.17.0",
"hash": "sha256-5CJjNvbZHuadT+7IHMNJSp8r47kZqzQwMey7ccpe/4Y=",
"url": "https://github.com/H2CK/oidc/releases/download/2.0.3/oidc-2.0.3.tar.gz",
"version": "2.0.3",
"description": "Nextcloud as OpenID Connect Identity Provider\n\nWith this app you can use Nextcloud as OpenID Connect Identity Provider. If other services\nare configured correctly, you are able to access those services with your Nextcloud login.\n\nFull documentation can be found at:\n\n- [User Documentation](https://github.com/H2CK/oidc/wiki#user-documentation)\n- [Developer Documentation](https://github.com/H2CK/oidc/wiki#developer-documentation)",
"homepage": "https://github.com/H2CK/oidc",
"licenses": [
@@ -390,9 +390,9 @@
]
},
"spreed": {
"hash": "sha256-1oIezD9c7DPPGlFXfKrt/+3ohQpcD+JiKKArRXiDRYM=",
"url": "https://github.com/nextcloud-releases/spreed/releases/download/v23.0.7/spreed-v23.0.7.tar.gz",
"version": "23.0.7",
"hash": "sha256-/katcYNLcsdnjHA+4ES+kdvhzuPNdDSv5Ann7X0+5xI=",
"url": "https://github.com/nextcloud-releases/spreed/releases/download/v23.0.8/spreed-v23.0.8.tar.gz",
"version": "23.0.8",
"description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.",
"homepage": "https://github.com/nextcloud/spreed",
"licenses": [
@@ -410,9 +410,9 @@
]
},
"tasks": {
"hash": "sha256-nJFU65dthPRWd/SClKM/suZdYU3ic3QsIcXiPzUkQ6c=",
"url": "https://github.com/nextcloud/tasks/releases/download/v0.18.0/tasks.tar.gz",
"version": "0.18.0",
"hash": "sha256-DJiNUFMcm/okbmwx8/lTaa3eFim6cNFRlJFatW4kaHs=",
"url": "https://github.com/nextcloud/tasks/releases/download/v0.18.1/tasks.tar.gz",
"version": "0.18.1",
"description": "Once enabled, a new Tasks menu will appear in your Nextcloud apps menu. From there you can add and delete tasks, edit their title, description, start and due dates and mark them as important. Tasks can be shared between users. Tasks can be synchronized using CalDav (each task list is linked to an Nextcloud calendar, to sync it to your local client: Thunderbird, Evolution, KDE Kontact, iCal … - just add the calendar as a remote calendar in your client). You can download your tasks as ICS files using the download button for each calendar.",
"homepage": "https://github.com/nextcloud/tasks/",
"licenses": [
@@ -430,9 +430,9 @@
]
},
"twofactor_admin": {
"hash": "sha256-dx8bEsC/rSAKN9rwP2hf3d8G3f3J1RzCrSqU6BbcvRY=",
"url": "https://github.com/nextcloud-releases/twofactor_admin/releases/download/v4.11.1/twofactor_admin-v4.11.1.tar.gz",
"version": "4.11.1",
"hash": "sha256-IkHzIqRBhG6zr+8y5ifrRfsKl9TyMDx7G1JGogbQrDM=",
"url": "https://github.com/nextcloud-releases/twofactor_admin/releases/download/v4.12.0/twofactor_admin-v4.12.0.tar.gz",
"version": "4.12.0",
"description": "This two-factor auth (2FA) provider for Nextcloud allows admins to generate a one-time\n\t\tcode for users to log into a 2FA protected account. This is helpful in situations where\n\t\tusers have lost access to their other 2FA methods or mandatory 2FA without any previously\n\t\tenabled 2FA provider.",
"homepage": "",
"licenses": [
@@ -480,9 +480,9 @@
]
},
"user_saml": {
"hash": "sha256-rEeaUUYhsTVLZDo11Xh/wGI3k97Tq5J0Jn18QY1M1Xs=",
"url": "https://github.com/nextcloud-releases/user_saml/releases/download/v8.1.2/user_saml-v8.1.2.tar.gz",
"version": "8.1.2",
"hash": "sha256-LDiWtEaVJbNECJkcn80L4behkUyUsRlDFDd2lk2g+pE=",
"url": "https://github.com/nextcloud-releases/user_saml/releases/download/v8.1.4/user_saml-v8.1.4.tar.gz",
"version": "8.1.4",
"description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\t* Authentik\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.",
"homepage": "https://github.com/nextcloud/user_saml",
"licenses": [

File diff suppressed because one or more lines are too long

View File

@@ -18,10 +18,11 @@ let
srcHash = "sha256-KyUfrKHnRO3lMin0seSNFRnRRTPo12NbbvbkSpxSMQE=";
};
"33" = {
version = "8.0.1";
appHash = "sha256-B+O78qjBQbmMnFAvH/5a+YBive+rkBG9AKTX7G3qNR0=";
srcHash = "sha256-t/DiGJzSey9YpV5GkepKSGjr5gXc9KWDBtSY5UPRlEU=";
version = "8.1.0";
appHash = "sha256-SQ1gPdfICFqNBJM0dJOfKIJ/E1tBBcBQOjRdb/mKb04=";
srcHash = "sha256-T0oz5d4kPX/Pm06vKGTrltUFd1pKccsz5IDjv/Vmuz0=";
};
"34" = latestVersionForNc."33";
};
currentVersionInfo =
latestVersionForNc.${ncVersion}

View File

@@ -27,6 +27,11 @@ let
appHash = "sha256-x3LXZKDWmzCYLTaNqSvgu4Gvrn6w2c/jifNCx1oaw1U=";
modelHash = "sha256-Yx/NJwtD4ltETpkzlcadZsFKqEmMneoZaXiHVSB1WoE=";
};
"34" = {
version = "12.0.0";
appHash = "sha256-1TpfDRMmJ7d5MPp0iTr/RpZHAG7LDsXof9u35O3+5Mg=";
modelHash = "sha256-+ec7kRPyWPVTk2wgRKMOP5mdmSnpv9mZmiRicEDKD6A=";
};
};
currentVersionInfo =
latestVersionForNc.${ncVersion}
@@ -74,7 +79,9 @@ stdenv.mkDerivation rec {
substituteInPlace recognize/lib/**/*.php \
--replace-quiet "\$this->settingsService->getSetting('node_binary')" "'${lib.getExe nodejs}'" \
--replace-quiet "\$this->config->getAppValueString('node_binary', '""')" "'${lib.getExe nodejs}'" \
--replace-quiet "\$this->config->getAppValueString('node_binary')" "'${lib.getExe nodejs}'"
--replace-quiet "\$this->config->getAppValueString('node_binary')" "'${lib.getExe nodejs}'" \
--replace-quiet "\$this->config->getAppValueString('node_binary', ''', lazy: true)" "'${lib.getExe nodejs}'" \
--replace-quiet "\$this->config->getAppValueString('node_binary', lazy: true)" "'${lib.getExe nodejs}'"
test "$(grep "get[a-zA-Z]*('node_binary'" recognize/lib/**/*.php | wc -l)" -eq 0
# Skip trying to install it... (less warnings in the log)

View File

@@ -2765,10 +2765,12 @@ with pkgs;
inherit (callPackages ../servers/nextcloud { })
nextcloud32
nextcloud33
nextcloud34
;
nextcloud32Packages = callPackage ../servers/nextcloud/packages { ncVersion = "32"; };
nextcloud33Packages = callPackage ../servers/nextcloud/packages { ncVersion = "33"; };
nextcloud34Packages = callPackage ../servers/nextcloud/packages { ncVersion = "34"; };
nextcloud-notify_push = callPackage ../servers/nextcloud/notify_push.nix { };
@@ -11692,4 +11694,6 @@ with pkgs;
gpac-unstable = callPackage ../by-name/gp/gpac/package.nix {
releaseChannel = "unstable";
};
feishin-web = feishin.override { webVersion = true; };
}