nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-23 09:00:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next-26.05 into staging-26.05

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2026-07-23 00:34:55 +00:00
committed by GitHub
parent 17ac6263c3 5e2dd4b1f5
commit f0975397a6
39 changed files with 1953 additions and 814 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/bot.yml vendored
View File

@@ -41,10 +41,6 @@ jobs:
run:
runs-on: ubuntu-slim
if: github.event_name != 'schedule' || github.repository_owner == 'NixOS'
env:
# TODO: Remove after 2026-03-04, when Node 24 becomes the default.
# https://github.blog/changelog/2025-09-19-deprecation-of-node-20-on-github-actions-runners/
FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: "true"
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:

2
ci/github-script/lint-commits.js
View File

@@ -74,8 +74,10 @@ async function checkCommitMessages({ commits, core }) {
'fix',
'perf',
'refactor',
'services',
'style',
'test',
'update',
]
/**

7
maintainers/maintainer-list.nix
View File

@@ -30467,6 +30467,13 @@
{ fingerprint = "D2A8 A906 ACA7 B6D6 575E 9A2F 3A49 5054 6EA6 9E5C"; }
];
};
yoquec = {
email = "alvaro.viejo@yoquec.com";
github = "yoquec";
githubId = 59575696;
name = "Alvaro Viejo";
matrix = "@yoquec.com:matrix.org";
};
yorickvp = {
email = "yorickvanpelt@gmail.com";
matrix = "@yorickvp:matrix.org";

68
nixos/modules/services/web-apps/flarum.nix
View File

@@ -10,16 +10,23 @@ with lib;
let
cfg = config.services.flarum;
# Only placeholders reach the world-readable Nix store; the install
# script substitutes the real secrets at runtime.
flarumInstallConfig = pkgs.writeText "config.json" (
builtins.toJSON {
debug = false;
offline = false;
baseUrl = cfg.baseUrl;
databaseConfiguration = cfg.database;
databaseConfiguration =
cfg.database
// optionalAttrs (cfg.databasePasswordFile != null) {
password = "@databasePassword@";
};
adminUser = {
username = cfg.adminUser;
password = cfg.initialAdminPassword;
password =
if cfg.initialAdminPasswordFile != null then "@adminPassword@" else cfg.initialAdminPassword;
email = cfg.adminEmail;
};
settings = {
@@ -69,7 +76,26 @@ in
initialAdminPassword = mkOption {
type = types.str;
default = "flarum";
description = "Initial password for the adminUser";
description = ''
Initial password for the adminUser.
WARNING: This is stored world-readable in the Nix store.
Use {option}`initialAdminPasswordFile` instead.
'';
};
initialAdminPasswordFile = mkOption {
type = types.nullOr types.path;
default = null;
example = "/run/secrets/flarum-admin-password";
description = ''
File containing the initial password for adminUser.
Must be readable by the flarum user.
Takes precedence over {option}`initialAdminPassword`.
The password must not contain `"` or `\` characters, as it is
substituted into a JSON installation config verbatim.
'';
};
user = mkOption {
@@ -98,7 +124,12 @@ in
bool
int
]);
description = "MySQL database parameters";
description = ''
MySQL database parameters.
WARNING: A `password` set here is stored world-readable in the
Nix store. Use {option}`databasePasswordFile` instead.
'';
default = {
# the database driver; i.e. MySQL; MariaDB...
driver = "mysql";
@@ -118,6 +149,20 @@ in
};
};
databasePasswordFile = mkOption {
type = types.nullOr types.path;
default = null;
example = "/run/secrets/flarum-db-password";
description = ''
File containing the database password.
Must be readable by the flarum user.
Takes precedence over `database.password`.
The password must not contain `"` or `\` characters, as it is
substituted into a JSON installation config verbatim.
'';
};
createDatabaseLocally = mkOption {
type = types.bool;
default = false;
@@ -210,6 +255,8 @@ in
Type = "oneshot";
User = cfg.user;
Group = cfg.group;
# The secret-filled install config is staged in /tmp
PrivateTmp = true;
};
path = [ config.services.phpfpm.phpPackage ];
script = ''
@@ -222,7 +269,18 @@ in
''
+ optionalString (cfg.createDatabaseLocally && cfg.database.driver == "mysql") ''
if [ ! -f config.php ]; then
php flarum install --file=${flarumInstallConfig}
install -m 0600 ${flarumInstallConfig} /tmp/flarum-install.json
${optionalString (cfg.initialAdminPasswordFile != null) ''
${pkgs.replace-secret}/bin/replace-secret '@adminPassword@' \
${escapeShellArg cfg.initialAdminPasswordFile} /tmp/flarum-install.json
''}
${optionalString (cfg.databasePasswordFile != null) ''
${pkgs.replace-secret}/bin/replace-secret '@databasePassword@' \
${escapeShellArg cfg.databasePasswordFile} /tmp/flarum-install.json
''}
php flarum install --file=/tmp/flarum-install.json
# config.php contains the database password; stateDir is world-readable
chmod 600 config.php
fi
''
+ ''

27
nixos/tests/flarum.nix
View File

@@ -10,7 +10,7 @@
};
nodes.machine =
{ ... }:
{ pkgs, ... }:
{
# Flarum installs and migrates the database on first boot and runs a
# MariaDB server alongside PHP-FPM and nginx, so give the VM some headroom.
@@ -28,8 +28,11 @@
adminUser = "admin";
adminEmail = "admin@example.com";
# Flarum rejects admin passwords shorter than 8 characters.
initialAdminPassword = "flarum-admin-password";
# The trailing newline matches how secret managers typically write files.
initialAdminPasswordFile = "${pkgs.writeText "admin-pass" "flarum-admin-password\n"}";
# MariaDB authenticates via unix socket and never checks this password;
# setting it still exercises the substitution path.
databasePasswordFile = "${pkgs.writeText "db-pass" "flarum-db-password\n"}";
};
};
@@ -48,5 +51,23 @@
# The admin API endpoint should respond, confirming the app booted cleanly.
machine.succeed("curl -sf http://localhost/api -o /dev/null")
# Only the placeholders may appear in the install config in the Nix store.
machine.succeed("grep -q '@adminPassword@' /nix/store/*-config.json")
machine.succeed("grep -q '@databasePassword@' /nix/store/*-config.json")
machine.fail("grep -qe 'flarum-admin-password' -e 'flarum-db-password' /nix/store/*-config.json")
# A successful login proves the admin password was substituted intact.
machine.succeed(
"curl -sf http://localhost/api/token "
+ "-H 'Content-Type: application/json' "
+ "-d '{\"identification\": \"admin\", \"password\": \"flarum-admin-password\"}' "
+ "| grep -F token"
)
# The database password must arrive intact in config.php, which must
# not be world-readable.
machine.succeed("grep -q 'flarum-db-password' /var/lib/flarum/config.php")
machine.succeed("[ $(stat -c %a /var/lib/flarum/config.php) = 600 ]")
'';
}

28
pkgs/applications/networking/browsers/chromium/info.json
View File

@@ -1,10 +1,10 @@
{
"chromium": {
"version": "150.0.7871.128",
"version": "150.0.7871.181",
"chromedriver": {
"version": "150.0.7871.129",
"hash_darwin": "sha256-jeDZ/6nFKOc9XyAA1marZ/KVaxsQPznTP1/UhXoDapY=",
"hash_darwin_aarch64": "sha256-CtfrqG/AeXCg7Sl6LoidM+OhYvBWkRJoAxv3g68wqUw="
"version": "150.0.7871.182",
"hash_darwin": "sha256-qzg0j6WEVXeD2mfbOWRo9w80xo7wTs7V7GLqCCNkm8Y=",
"hash_darwin_aarch64": "sha256-JddVyl8sX2ab0M5qWoHslf1r+u8tkzkCZePR4M+eNMA="
},
"deps": {
"depot_tools": {
@@ -21,8 +21,8 @@
"DEPS": {
"src": {
"url": "https://chromium.googlesource.com/chromium/src.git",
"rev": "81891e5ca708047763816c778216799ef14c66cb",
"hash": "sha256-lGHZZ2xIih+TaH145CZwEwyXsM1ZQWwqXsIQjWQ/jvk=",
"rev": "24b04c927b23c39cf9c5227cc8dc6f64a744c8e9",
"hash": "sha256-F52wmxyNPEV26v8YgAz+MRhyEGyV7YUX+/wj95H4Lf0=",
"recompress": true
},
"src/third_party/clang-format/script": {
@@ -92,8 +92,8 @@
},
"src/third_party/angle": {
"url": "https://chromium.googlesource.com/angle/angle.git",
"rev": "13e691adf3d4d3ebee2f7239731a07d3b9704956",
"hash": "sha256-fbjREn3D+quRRADGwR7V65BZt5b+1DgnsG4ZMhwGq6o="
"rev": "edae461ad2122a3a2be0b5d3d067472aa0e3329c",
"hash": "sha256-V4D7jAPJy4llbfJ6WmgCaqaH3TgkWIg5UtRAUaB9dE4="
},
"src/third_party/angle/third_party/glmark2/src": {
"url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -137,8 +137,8 @@
},
"src/third_party/dawn": {
"url": "https://dawn.googlesource.com/dawn.git",
"rev": "01249a97332468dbdd6cf5edb8dd7bae77875de5",
"hash": "sha256-tzomo+GTec2zixxk61gtlma/sjcBImgbLMwA+mIp1LM="
"rev": "d089fc91e7e4881362463faf8efe9ae435e34660",
"hash": "sha256-ZcfSMBvdAdEJQv+qfwAe8EFHPAfPtuKLTIR5lDRKP3Q="
},
"src/third_party/dawn/third_party/glfw3/src": {
"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -657,8 +657,8 @@
},
"src/third_party/skia": {
"url": "https://skia.googlesource.com/skia.git",
"rev": "bee4c917220040e147f14964635ff92ce6c5a3f6",
"hash": "sha256-SWmoX+sNaw4KnlTBPt63uBSYfQavJejB3+Vlw/gtWX8="
"rev": "587c5b0f5a7b0260826a0c19094c2d952195066e",
"hash": "sha256-COvdvWVfafVhccLIj2dJzu62Rbyi3oDgORtjIGolCRo="
},
"src/third_party/smhasher/src": {
"url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -827,8 +827,8 @@
},
"src/v8": {
"url": "https://chromium.googlesource.com/v8/v8.git",
"rev": "2b2f69158528fdd9d86b778cfcc2d0a1c4f8c59f",
"hash": "sha256-bqzCZSpKdXgKv3O1I7ck1PEXCa/2jBT7hpBEKW0LgTA="
"rev": "49df3678d1b6a1511167b15a6b7499d3ab37a638",
"hash": "sha256-T9FWX3zuP1V7wvxeHgv2MEfRiwbJC0ElI3eazSYq3fs="
},
"src/agents/shared": {
"url": "https://chromium.googlesource.com/chromium/agents.git",

9
pkgs/by-name/an/anytype/package.nix
View File

@@ -143,6 +143,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
substituteInPlace scripts/generate-protos.sh \
--replace-fail "/usr/bin/env" "${coreutils}/bin/env"
substituteInPlace package.json \
--replace-fail \
'"build:nmh": "go build -o dist/nativeMessagingHost ./go/nativeMessagingHost.go"' \
'"build:nmh": "go build -trimpath -ldflags=-buildid= -o dist/nativeMessagingHost ./go/nativeMessagingHost.go"'
cp -r ${anytype-heart}/lib dist/
cp -r ${anytype-heart}/bin/anytypeHelper dist/
@@ -168,7 +173,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
# remove unnecessary files
preInstall = ''
chmod u+w -R dist node_modules
find -type f \( -name "*.ts" -o -name "*.map" \) -exec rm -rf {} +
find dist node_modules -type f \( -name '*.ts' -o -name '*.map' \) -delete
rm -f node_modules/keytar/build/{Makefile,binding.Makefile,config.gypi,keytar.target.mk}
rm -rf node_modules/keytar/build/Release/{.deps,obj.target}
'';
installPhase = ''

14
pkgs/by-name/ao/aonsoku/package.nix
View File

@@ -3,7 +3,7 @@
stdenv,
fetchFromGitHub,
nodejs,
pnpm_9,
pnpm_11,
fetchPnpmDeps,
pnpmConfigHook,
makeWrapper,
@@ -15,13 +15,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "aonsoku";
version = "0.14.0";
version = "0.15.0";
src = fetchFromGitHub {
owner = "victoralvesf";
repo = "aonsoku";
tag = "v${finalAttrs.version}";
hash = "sha256-Rbte0qYcZQ70E6ib8rj0YsNP5SMNO8eC3MEvWcT7N08=";
hash = "sha256-zHYr50FBV7sSdNz6j07SdlMbVaXKj1SnJHmtjmsnBdY=";
};
patches = [
@@ -31,14 +31,14 @@ stdenv.mkDerivation (finalAttrs: {
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
pnpm = pnpm_9;
fetcherVersion = 3;
hash = "sha256-oBwqYOx2KEtF0qdMKEIgdArZ4xs/AyeOqFoU4nHl3xY=";
pnpm = pnpm_11;
fetcherVersion = 4;
hash = "sha256-YV3ZpXBSX9EEDUfWmk1aNbwGQI+5zNQ3eoXvNg7k0yQ=";
};
nativeBuildInputs = [
nodejs
pnpm_9
pnpm_11
pnpmConfigHook
makeWrapper
electron

6
pkgs/by-name/dc/dcmtk/package.nix
View File

@@ -26,6 +26,12 @@ stdenv.mkDerivation (finalAttrs: {
# The following patches are taken from the Debian package
# See https://salsa.debian.org/med-team/dcmtk
patches = [
# Backport of upstream commit edbb085e for 3.6.9; remove when updating past 3.7.0.
(fetchurl {
name = "CVE-2026-5663.patch";
url = "https://salsa.debian.org/med-team/dcmtk/-/raw/debian/3.6.9-5%2Bdeb13u1/debian/patches/0016-CVE-2026-5663.patch";
hash = "sha256-o8k+ns+O2qECL2i4upSRIpDD8rXDhmjkwjp4kC/rv8Y=";
})
(fetchurl {
url = "https://salsa.debian.org/med-team/dcmtk/-/raw/debian/3.6.9-4/debian/patches/01_dcmtk_3.6.0-1.patch";
hash = "sha256-kDEZvPqcF8+PYID24srMoPSBPltmnGiJ67LHsLVcPYM=";

6
pkgs/by-name/dn/dn42-registry-wizard/package.nix
View File

@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "dn42-registry-wizard";
version = "0.4.20";
version = "0.4.21";
src = fetchFromGitHub {
owner = "Kioubit";
repo = "dn42_registry_wizard";
tag = "v${finalAttrs.version}";
hash = "sha256-WFU1K0Ib1ETSib2WJkwus3zHYJXoVOtFDqv4/QNiP7E=";
hash = "sha256-PvB+rlIaedjCVA/8sDW754vvomVASIDhkUQlimZGiRg=";
};
cargoHash = "sha256-o8MF6uqk8f0Zc2fjBqLGElh56TKjLRRtNxrll5nY+bM=";
cargoHash = "sha256-tSxxsRQCbbP6iRT8sNfA/JVLm72PsSSCsC80hD5ZVxw=";
postInstall = ''
mv $out/bin/{registry_wizard,dn42-registry-wizard}

10
pkgs/by-name/dr/draupnir/package.nix
View File

@@ -13,6 +13,7 @@
cctools,
nixosTests,
nix-update-script,
fetchpatch2,
}:
let
nodeSources = srcOnly nodejs_24;
@@ -36,7 +37,14 @@ buildNpmPackage (finalAttrs: {
]
++ lib.optional stdenv.hostPlatform.isDarwin cctools.libtool;
npmDepsHash = "sha256-DvQM9Kr9Hc7/1OEZadZ1GvpAjfRmbdIcA6UDuFBQ+vo=";
patches = [
(fetchpatch2 {
url = "https://github.com/the-draupnir-project/Draupnir/commit/4e63164046153c656050c6d0a325c79f1492153a.patch?full_index=1";
hash = "sha256-dVG0BAE8pATfGdcHvTV8jTC+OQP0gMB7v396MtJlG4o=";
})
];
npmDepsHash = "sha256-7WAfSFfPQJ9d/U9hk5wypasSoU2JwkoCq/nKAnzFf1o=";
preBuild = ''
# install proper version and branch info

1
pkgs/by-name/fr/freecad/package.nix
View File

@@ -50,6 +50,7 @@ let
scipy
shiboken6
vtk
networkx # for sheetmetal plugin
];
freecad-utils = callPackage ./freecad-utils.nix { inherit (python3Packages) python; };

15
pkgs/by-name/gd/gdal/package.nix
View File

@@ -80,8 +80,8 @@
xz,
zlib,
zstd,
buildPackages,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "gdal" + lib.optionalString useMinimalFeatures "-minimal";
version = "3.12.4";
@@ -124,6 +124,16 @@ stdenv.mkDerivation (finalAttrs: {
url = "https://github.com/OSGeo/gdal/commit/50eea7456d83c9586f112ef96b43249372839dea.patch";
hash = "sha256-m1FsBC37h2uuaEeYezPZJFsDR6Ix/FDIZnuZZiSAYcw=";
})
# Fix tests with libtiff 4.7.2
# FAILED gcore/tiff_read.py::test_tiff_read_stripbytecounts_count_not_same_as_stripoffsets_count -
# AssertionError: assert '170' is None
(fetchpatch {
name = "0006-Internal-libtiff-resync-with-4.7.2rc3-and-adjust-tes.patch";
url = "https://github.com/OSGeo/gdal/commit/06ffb0333fe557cde262aa1e81466dda42684c53.patch";
hash = "sha256-teZ9cv8JQ2ua4tEWl3I8D9DYo8srGIBYIc2NfkgNMe4=";
includes = [ "autotest/gcore/tiff_read.py" ];
})
];
nativeBuildInputs = [
@@ -166,6 +176,9 @@ stdenv.mkDerivation (finalAttrs: {
# This is not strictly needed as the Java bindings wouldn't build anyway if
# ant/jdk were not available.
"-DBUILD_JAVA_BINDINGS=OFF"
]
++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
"-DCMAKE_CROSSCOMPILING_EMULATOR=${stdenv.hostPlatform.emulator buildPackages}"
];
buildInputs =

6
pkgs/by-name/ge/gelly/package.nix
View File

@@ -19,16 +19,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "gelly";
version = "1.9.2";
version = "1.9.4";
src = fetchFromGitHub {
owner = "Fingel";
repo = "gelly";
tag = "v${finalAttrs.version}";
hash = "sha256-WcnPNsFvQ/CqvAYxWeoAWZiJ62bOgLe8fGNeyh2B+8s=";
hash = "sha256-GYMLV4hffaIbqUp1b5ERo2QQqiKRlHe9oXfq+wNH/hM=";
};
cargoHash = "sha256-0ZKW2xxjTn84mWBrK6zhw/uiOnd5sD+URu2O0a1TZW8=";
cargoHash = "sha256-CsmcXlkOec/KJ59Ng7MyGsfjWQ80YyV6MztRFULmvDA=";
nativeBuildInputs = [
pkg-config

10
pkgs/by-name/go/google-chrome/package.nix
View File

@@ -179,11 +179,11 @@ let
linux = stdenvNoCC.mkDerivation (finalAttrs: {
inherit pname meta passthru;
version = "150.0.7871.128";
version = "150.0.7871.181";
src = fetchurl {
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
hash = "sha256-g+1ZyFh467j6U5FevnBmyvxY0cBMHJVElIbm+dmaHvs=";
hash = "sha256-/sUJBfexI1pECXeoM0duAWKHT1ynnlBs30C3GvZNkvQ=";
};
# With strictDeps on, some shebangs were not being patched correctly
@@ -289,11 +289,11 @@ let
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
inherit pname meta passthru;
version = "150.0.7871.129";
version = "150.0.7871.182";
src = fetchurl {
url = "http://dl.google.com/release2/chrome/ggb3e3myl2poiiaqd2bbvqlrqa_150.0.7871.129/GoogleChrome-150.0.7871.129.dmg";
hash = "sha256-ym9rF6yrGMSibQDM4gKlAbOsIHnV1tPxyNq9KNLnR0I=";
url = "http://dl.google.com/release2/chrome/mb6usb7722qbv5pqtlgpq72utm_150.0.7871.182/GoogleChrome-150.0.7871.182.dmg";
hash = "sha256-eNrCQqKqd+6cuvGDbQ0VM5JpolHusOZou2elsAh0TD4=";
};
dontPatch = true;

721
pkgs/by-name/ja/jadx/deps.json generated
View File

File diff suppressed because it is too large Load Diff

285
pkgs/by-name/ja/jadx/nix-build.patch
View File

@@ -1,79 +1,143 @@
diff --git a/build.gradle.kts b/build.gradle.kts
index df96f46c..f1f422f2 100644
index 0f4d3f09..a44eec6f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -126,42 +126,11 @@ fun isNonStable(version: String): Boolean {
destinationDirectory.set(layout.buildDirectory)
@@ -129,19 +129,6 @@ fun loadEnv(file: File): Map<String, String> {
return envMap
}
-val distWin by tasks.registering(Zip::class) {
- group = "jadx"
- description = "Build Windows bundle"
-
- from(distWinConfiguration)
-
- destinationDirectory.set(layout.buildDirectory.dir("distWin"))
- archiveFileName.set("jadx-gui-$jadxVersion-win.zip")
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-}
-
-val distWinWithJre by tasks.registering(Zip::class) {
- description = "Build Windows with JRE bundle"
-
- from(distWinWithJreConfiguration)
-
- destinationDirectory.set(layout.buildDirectory.dir("distWinWithJre"))
- archiveFileName.set("jadx-gui-$jadxVersion-with-jre-win.zip")
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-}
-
val dist by tasks.registering {
group = "jadx"
description = "Build jadx distribution zip bundles"
dependsOn(pack)
-
- val os = DefaultNativePlatform.getCurrentOperatingSystem()
- if (os.isWindows) {
- if (project.hasProperty("bundleJRE")) {
- println("Build win bundle with JRE")
- dependsOn(distWinWithJre)
- } else {
- dependsOn(distWin)
- }
-val distWinConfiguration =
- configurations.create("distWinConfiguration") {
- isCanBeConsumed = false
- }
}
-val distWinWithJreConfiguration =
- configurations.create("distWinWithJreConfiguration") {
- isCanBeConsumed = false
- }
-dependencies {
- distWinConfiguration(project(":jadx-gui", "distWinConfiguration"))
- distWinWithJreConfiguration(project(":jadx-gui", "distWinWithJreConfiguration"))
-}
-
val copyArtifacts =
tasks.register<Copy>("copyArtifacts") {
val jarCliPattern = "jadx-cli-(.*)-all.jar".toPattern()
@@ -186,45 +173,12 @@ fun loadEnv(file: File): Map<String, String> {
}
}
val cleanBuildDir by tasks.registering(Delete::class) {
-val distWin =
- tasks.register<Zip>("distWin") {
- group = "jadx"
- description = "Build Windows bundle"
-
- from(distWinConfiguration)
-
- destinationDirectory.set(layout.buildDirectory.dir("distWin"))
- archiveFileName.set("jadx-gui-$jadxVersion-win.zip")
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
- }
-
-val distWinWithJre =
- tasks.register<Zip>("distWinWithJre") {
- description = "Build Windows with JRE bundle"
-
- from(distWinWithJreConfiguration)
-
- destinationDirectory.set(layout.buildDirectory.dir("distWinWithJre"))
- archiveFileName.set("jadx-gui-$jadxVersion-with-jre-win.zip")
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
- }
-
val dist =
tasks.register("dist") {
group = "jadx"
description = "Build jadx distribution zip bundles"
dependsOn(pack)
-
- val os = DefaultNativePlatform.getCurrentOperatingSystem()
- if (os.isWindows) {
- if (project.hasProperty("bundleJRE")) {
- println("Build win bundle with JRE")
- dependsOn(distWinWithJre)
- } else {
- dependsOn(distWin)
- }
- }
}
val cleanBuildDir =
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index ed67e57a..99aa9eb4 100644
index 15f610b4..99aa9eb4 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -4,8 +4,6 @@
@@ -4,10 +4,6 @@
dependencies {
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.10")
-
- implementation("org.openrewrite:plugin:6.19.1")
- implementation("net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:4.2.0")
- implementation("net.ltgt.nullaway:net.ltgt.nullaway.gradle.plugin:2.3.0")
}
repositories {
diff --git a/buildSrc/src/main/kotlin/jadx-java.gradle.kts b/buildSrc/src/main/kotlin/jadx-java.gradle.kts
index 0f60d301..5e577155 100644
index 256dadde..7e044113 100644
--- a/buildSrc/src/main/kotlin/jadx-java.gradle.kts
+++ b/buildSrc/src/main/kotlin/jadx-java.gradle.kts
@@ -3,8 +3,6 @@
@@ -1,15 +1,8 @@
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
-import net.ltgt.gradle.errorprone.CheckSeverity
-import net.ltgt.gradle.errorprone.errorprone
-import net.ltgt.gradle.nullaway.nullaway
plugins {
java
checkstyle
-
- id("jadx-rewrite")
- id("net.ltgt.errorprone")
- id("net.ltgt.nullaway")
}
val jadxVersion: String by rootProject.extra
val jadxVersion = rootProject.extra["jadxVersion"] as String
@@ -30,9 +23,6 @@
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
testCompileOnly("org.jetbrains:annotations:26.1.0")
-
- errorprone("com.google.errorprone:error_prone_core:2.50.0")
- errorprone("com.uber.nullaway:nullaway:0.13.7")
}
repositories {
@@ -77,21 +67,4 @@
if (checkEnabled) {
options.compilerArgs.add("-XDaddTypeAnnotationsToSymbol=true")
}
- options.errorprone {
- isEnabled = checkEnabled
- allErrorsAsWarnings = jadxBuildChecksMode == "warn"
- excludedPaths = ".*/test/.*"
- nullaway {
- if (jadxBuildChecksMode == "error") {
- error()
- }
- annotatedPackages.add("jadx")
- }
- // TODO: fix and enable all checks
- disable("MixedMutabilityReturnType")
- disable("EqualsGetClass")
- disable("OperatorPrecedence")
- disable("UnusedVariable")
- disable("ImmutableEnumChecker")
- }
}
diff --git a/buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts b/buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts
deleted file mode 100644
index ceca3fe5..00000000
index c6f3e979..00000000
--- a/buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts
+++ /dev/null
@@ -1,35 +0,0 @@
@@ -86,10 +150,10 @@ index ceca3fe5..00000000
-}
-
-dependencies {
- rewrite("org.openrewrite.recipe:rewrite-testing-frameworks:3.24.0")
- rewrite("org.openrewrite.recipe:rewrite-logging-frameworks:3.20.0")
- rewrite("org.openrewrite.recipe:rewrite-migrate-java:3.24.0")
- rewrite("org.openrewrite.recipe:rewrite-static-analysis:2.24.0")
- rewrite("org.openrewrite.recipe:rewrite-testing-frameworks:3.41.0")
- rewrite("org.openrewrite.recipe:rewrite-logging-frameworks:3.29.2")
- rewrite("org.openrewrite.recipe:rewrite-migrate-java:3.39.0")
- rewrite("org.openrewrite.recipe:rewrite-static-analysis:2.38.0")
-}
-
-tasks {
@@ -113,7 +177,7 @@ index ceca3fe5..00000000
- }
-}
diff --git a/jadx-gui/build.gradle.kts b/jadx-gui/build.gradle.kts
index 2677881f..4cec0884 100644
index fec42601..c4e20570 100644
--- a/jadx-gui/build.gradle.kts
+++ b/jadx-gui/build.gradle.kts
@@ -3,7 +3,6 @@
@@ -124,7 +188,7 @@ index 2677881f..4cec0884 100644
id("org.beryx.runtime") version "2.0.1"
}
@@ -129,36 +128,6 @@
@@ -142,42 +141,6 @@
}
}
@@ -145,79 +209,92 @@ index 2677881f..4cec0884 100644
- supportUrl.set("https://github.com/skylot/jadx")
-
- bundledJrePath.set(if (project.hasProperty("bundleJRE")) "%EXEDIR%/jre" else "%JAVA_HOME%")
- classpath.set(tasks.getByName("shadowJar").outputs.files.map { "%EXEDIR%/lib/${it.name}" }.sorted().toList())
- classpath.set(
- tasks
- .getByName("shadowJar")
- .outputs.files
- .map { "%EXEDIR%/lib/${it.name}" }
- .sorted()
- .toList(),
- )
- println("Launch4J classpath: ${classpath.get()}")
-
- chdir.set("") // don't change current dir
- libraryDir.set("") // don't add any libs
-}
-
-fun escapeJVMOptions(): List<String> {
- return application.applicationDefaultJvmArgs
-fun escapeJVMOptions(): List<String> =
- application.applicationDefaultJvmArgs
- .toList()
- .map { if (it.startsWith("-D")) "\"$it\"" else it }
-}
-
runtime {
addOptions("--strip-debug", "--compress", "zip-9", "--no-header-files", "--no-man-pages")
addOptions("--strip-debug", "--no-header-files", "--no-man-pages")
addModules(
@@ -179,48 +148,6 @@ fun escapeJVMOptions(): List<String> {
@@ -198,66 +161,6 @@ fun escapeJVMOptions(): List<String> =
}
}
-val copyDistWin by tasks.registering(Copy::class) {
- description = "Copy files for Windows bundle"
-val copyDistWin =
- tasks.register<Copy>("copyDistWin") {
- description = "Copy files for Windows bundle"
-
- val libTask = tasks.getByName("shadowJar")
- dependsOn(libTask)
- from(libTask.outputs) {
- include("*.jar")
- into("lib")
- val libTask = tasks.getByName("shadowJar")
- dependsOn(libTask)
- from(libTask.outputs) {
- include("*.jar")
- into("lib")
- }
- val exeTask = tasks.getByName("createExe")
- dependsOn(exeTask)
- from(exeTask.outputs) {
- include("*.exe")
- }
- into(layout.buildDirectory.dir("jadx-gui-win"))
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
- }
- val exeTask = tasks.getByName("createExe")
- dependsOn(exeTask)
- from(exeTask.outputs) {
- include("*.exe")
- }
- into(layout.buildDirectory.dir("jadx-gui-win"))
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-}
-
-val copyDistWinWithJre by tasks.registering(Copy::class) {
- description = "Copy files for Windows with JRE bundle"
-val copyDistWinWithJre =
- tasks.register<Copy>("copyDistWinWithJre") {
- description = "Copy files for Windows with JRE bundle"
-
- val jreTask = tasks.runtime.get()
- dependsOn(jreTask)
- from(jreTask.jreDir) {
- include("**/*")
- into("jre")
- val jreTask = tasks.runtime.get()
- dependsOn(jreTask)
- from(jreTask.jreDir) {
- include("**/*")
- into("jre")
- }
- val libTask = tasks.getByName("shadowJar")
- dependsOn(libTask)
- from(libTask.outputs) {
- include("*.jar")
- into("lib")
- }
- val exeTask = tasks.getByName("createExe")
- dependsOn(exeTask)
- from(exeTask.outputs) {
- include("*.exe")
- }
- into(layout.buildDirectory.dir("jadx-gui-with-jre-win"))
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
- }
- val libTask = tasks.getByName("shadowJar")
- dependsOn(libTask)
- from(libTask.outputs) {
- include("*.jar")
- into("lib")
- }
- val exeTask = tasks.getByName("createExe")
- dependsOn(exeTask)
- from(exeTask.outputs) {
- include("*.exe")
- }
- into(layout.buildDirectory.dir("jadx-gui-with-jre-win"))
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-}
-
/**
* Register and expose distribution artifacts to use in top level packaging tasks
*/
@@ -230,10 +157,6 @@ fun escapeJVMOptions(): List<String> {
val distWinWithJreConfiguration by configurations.creating {
isCanBeResolved = false
}
-/**
- * Register and expose distribution artifacts to use in top level packaging tasks
- */
-val distWinConfiguration =
- configurations.create("distWinConfiguration") {
- isCanBeResolved = false
- }
-val distWinWithJreConfiguration =
- configurations.create("distWinWithJreConfiguration") {
- isCanBeResolved = false
- }
-artifacts {
- add(distWinConfiguration.name, copyDistWin)
- add(distWinWithJreConfiguration.name, copyDistWinWithJre)
-}
val syncNLSLines by tasks.registering(JavaExec::class) {
group = "jadx-dev"
-
val syncNLSLines =
tasks.register<JavaExec>("syncNLSLines") {
group = "jadx-dev"

4
pkgs/by-name/ja/jadx/package.nix
View File

@@ -17,13 +17,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "jadx";
version = "1.5.5";
version = "1.5.6";
src = fetchFromGitHub {
owner = "skylot";
repo = "jadx";
rev = "v${finalAttrs.version}";
hash = "sha256-WONsXDNhlDuqKsS2Olz3ndZIbi6mdi9JBKaHPpcdTQQ=";
hash = "sha256-qwGFMj18xJOrBudthAIeKc/PT0uUzjmTgBYovF4A/94=";
};
patches = [

13
pkgs/by-name/li/libsolv/package.nix
View File

@@ -2,7 +2,6 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
cmake,
ninja,
pkg-config,
@@ -19,24 +18,16 @@
}:
stdenv.mkDerivation (finalAttrs: {
version = "0.7.37";
version = "0.7.39";
pname = "libsolv";
src = fetchFromGitHub {
owner = "openSUSE";
repo = "libsolv";
rev = finalAttrs.version;
hash = "sha256-hiumMnTJ3eP+acH2V0eNTM71Fw//IWQPechCA0+kH1s=";
hash = "sha256-nl1g1BKauSXV54xjO/1jDQMbr1WfycupR0CPqkgkzrA=";
};
patches = [
(fetchpatch {
name = "CVE-2026-9149";
url = "https://github.com/openSUSE/libsolv/commit/210386037c892a720972ad35a3d8f7073b4d763b.patch";
hash = "sha256-ju3xn78UGMR5usq1e1ovFTWnKW1TPDA77sNGx8yc8Z8=";
})
];
cmakeFlags = [
"-DENABLE_COMPLEX_DEPS=true"
(lib.cmakeBool "ENABLE_CONDA" withConda)

6
pkgs/by-name/ma/matrix-tuwunel/package.nix
View File

@@ -88,16 +88,16 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "matrix-tuwunel";
version = "1.8.1";
version = "1.8.2";
src = fetchFromGitHub {
owner = "matrix-construct";
repo = "tuwunel";
tag = "v${finalAttrs.version}";
hash = "sha256-3qMVu+IQMzI4Jtfb8mJsuDAcd7Jb7XSU07RlvnH7vfc=";
hash = "sha256-mfdX5HmuXf6s7zyT9AJUoz4v5v9Km+VX8z6KvRGq8F8=";
};
cargoHash = "sha256-VzmaQAsNORH8VxYSUgKeQSIgcCPnI9cAzu3K9ks7ODA=";
cargoHash = "sha256-jIgL/4i17H216goZ8DiFvIJTCKyjEHGiky3MTO5sQoY=";
nativeBuildInputs = [
pkg-config

4
pkgs/by-name/mi/microsoft-edge/package.nix
View File

@@ -164,11 +164,11 @@ let
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "microsoft-edge";
version = "150.0.4078.65";
version = "150.0.4078.83";
src = fetchurl {
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
hash = "sha256-mt8fx6gJE5PGFiMLeceJ5rmLmwmQXaxx7VY8yPIQqyE=";
hash = "sha256-uTn6/f4Q9eifaJr5/U6i7KmJAtJKxHeaUsdV+omcqlQ=";
};
# With strictDeps on, some shebangs were not being patched correctly

4
pkgs/by-name/mo/monero-cli/package.nix
View File

@@ -38,13 +38,13 @@ let
in
stdenv.mkDerivation rec {
pname = "monero-cli";
version = "0.18.5.0";
version = "0.18.5.1";
src = fetchFromGitHub {
owner = "monero-project";
repo = "monero";
rev = "v${version}";
hash = "sha256-clw+7mZenWp58iA7fuEp4BPFH3KUwL53cC4IChIVh7w=";
hash = "sha256-RxuhR+GH4Y5kSzNxsqJklRWMbq1K82K3A2V+6JqYR98=";
};
patches = [

4
pkgs/by-name/mo/monero-gui/package.nix
View File

@@ -27,13 +27,13 @@
stdenv.mkDerivation rec {
pname = "monero-gui";
version = "0.18.5.0";
version = "0.18.5.2";
src = fetchFromGitHub {
owner = "monero-project";
repo = "monero-gui";
rev = "v${version}";
hash = "sha256-uBZMBQ6Co1+H8DsyeL1vbjtVlKyIkJopKxHxr24BZv0=";
hash = "sha256-2FlenQtrsoHmRTfU+KhWtg3eVPzz9ktQ3dnOlWhOPC8=";
};
nativeBuildInputs = [

4
pkgs/by-name/ms/msedgedriver/package.nix
View File

@@ -11,11 +11,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "msedgedriver";
version = "150.0.4078.65";
version = "150.0.4078.83";
src = fetchzip {
url = "https://msedgedriver.microsoft.com/${finalAttrs.version}/edgedriver_linux64.zip";
hash = "sha256-TwGjt8Hw4rvwW2OwkIcqRzKLXu1dRL7/9n+Zq3VmKag=";
hash = "sha256-hmzL3ucHgKxPT1/WwqfWUWndSMUEf7n0Z0Wh9Rgm/MU=";
stripRoot = false;
};

6
pkgs/by-name/ne/nezha/package.nix
View File

@@ -49,13 +49,13 @@ let
in
buildGoModule (finalAttrs: {
pname = "nezha";
version = "2.2.9";
version = "2.3.0";
src = fetchFromGitHub {
owner = "nezhahq";
repo = "nezha";
tag = "v${finalAttrs.version}";
hash = "sha256-5Mg44BTSL8J/i6fchb/8T9MOugZ0fetgsmiiEOwpLNs=";
hash = "sha256-wlGDNsh67pAuPPgae56bXrtDsgwuviLxiaZ6CrOi3go=";
};
proxyVendor = true;
@@ -95,7 +95,7 @@ buildGoModule (finalAttrs: {
GOROOT=''${GOROOT-$(go env GOROOT)} swag init --pd -d cmd/dashboard -g main.go -o cmd/dashboard/docs
'';
vendorHash = "sha256-rYzkaJqk5r31Uagn1FRFDeICUeK392o1fyP6IBk9zgk=";
vendorHash = "sha256-U2rZVluYM+XcI8e9TBXAlb9sKz4IL+FMEj1CTDcH6qM=";
ldflags = [
"-s"

10
pkgs/by-name/ol/olivetin/3k.nix
View File

@@ -16,18 +16,18 @@
buildGoModule (finalAttrs: {
pname = "olivetin";
version = "3000.17.0";
version = "3000.17.3";
src = fetchFromGitHub {
owner = "OliveTin";
repo = "OliveTin";
tag = finalAttrs.version;
hash = "sha256-oLBXDd1grSFEbCvB4bK2XeVOZONSYro/6rvMJkG8eU0=";
hash = "sha256-fC+J1ejRDQDe3LfCNuZrt52mvXUxw8eMScCk1wsuQCo=";
};
modRoot = "service";
vendorHash = "sha256-lZ3KBoM+cDyYPX16wuZT3UQvB/SrRD6W2ic+GznG7hU=";
vendorHash = "sha256-33tP6bZgwOTAXBgxfdbq1Dn73uVJE5dYR1drlxBe7eo=";
subPackages = [ "." ];
@@ -75,14 +75,14 @@ buildGoModule (finalAttrs: {
'';
outputHashMode = "recursive";
outputHash = "sha256-X602MebKdmdxZ9OEtQ150u+/Z1O9FEvcxRtOhMorqyw=";
outputHash = "sha256-+Afw5Q+3u24+eDk6yxN3WiyKmLtodaq9uk/mAKAz/G4=";
};
webui = buildNpmPackage {
pname = "olivetin-webui";
inherit (finalAttrs) version src;
npmDepsHash = "sha256-fr5RTPNXNd8sD/LphnDsekIbB333LgEHCb/NUEqSBIE=";
npmDepsHash = "sha256-c76uc+t/hRZKRGeOnqbjAK7KbaWncBkovtjMm7pgGUs=";
sourceRoot = "${finalAttrs.src.name}/frontend";

6
pkgs/by-name/op/openbao/package.nix
View File

@@ -14,16 +14,16 @@
buildGoModule (finalAttrs: {
pname = "openbao";
version = "2.6.0";
version = "2.6.1";
src = fetchFromGitHub {
owner = "openbao";
repo = "openbao";
tag = "v${finalAttrs.version}";
hash = "sha256-FJ+34HeRT025EFwFXY8ewfnJbQirqFb3j+kPNxpGOA4=";
hash = "sha256-2wl06I6/yF/V5P9MFCCzpEiX4G+YTtXWRjvh+wDyB1U=";
};
vendorHash = "sha256-O0xx61S0KEk5QB/NsV+kBlErvVuKBfI/81o29rDye1w=";
vendorHash = "sha256-2MMWs30e7GB0pcPmmDvw6RTBzKYXNwothAuQMZAFHoE=";
proxyVendor = true;

8
pkgs/by-name/pi/pipeweaver/package.nix
View File

@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage (
sourceRoot = "${finalAttrs.src.name}/web";
npmDepsHash = "sha256-ZX/3H/VdRdWC2j+mPA/0rZflDhslqTN1mqA9vvQRQG0=";
npmDepsHash = "sha256-kInUUBeau7alBB9GcIyrBf6PwYSEj4NTMoO1/lguRQU=";
installPhase = ''
runHook preInstall
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (
in
{
pname = "pipeweaver";
version = "0.1.6";
version = "0.1.9";
__structuredAttrs = true;
@@ -37,10 +37,10 @@ rustPlatform.buildRustPackage (
owner = "pipeweaver";
repo = "pipeweaver";
tag = "v${finalAttrs.version}";
hash = "sha256-wf3gxCLT5vOz+5+CpfmkX0stKoAOpQ6KIoW6xBNV1xk=";
hash = "sha256-aGZ5VfHv5DHPsGhFGXhQBl3DNt6J+h5daMu38LJshI4=";
};
cargoHash = "sha256-Jv0fF6keg2NcUnCJhCId7rwPVZK1/Q9+otQNjp54RCI=";
cargoHash = "sha256-XC/jK70FZs8jF0A85MpoxcMmxF/FmExD/qfF4KL9Y0M=";
nativeBuildInputs = [
pkg-config

4
pkgs/by-name/ra/randomx/package.nix
View File

@@ -7,7 +7,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "randomX";
version = "1.2.1";
version = "1.2.2";
nativeBuildInputs = [ cmake ];
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "tevador";
repo = "randomX";
rev = "v${finalAttrs.version}";
sha256 = "sha256-dfImzwbEfJQcaPZCoWypHiI6dishVRdqS/r+n3tfjvM=";
sha256 = "sha256-15hRPPEo48SL09gYpGtdpXqsVlOTQuMRn4AoXQJWEMI=";
};
meta = {

1136
pkgs/by-name/sm/smithy-language-server/deps.json generated Normal file
View File

File diff suppressed because it is too large Load Diff

74
pkgs/by-name/sm/smithy-language-server/package.nix Normal file
View File

@@ -0,0 +1,74 @@
{
lib,
stdenvNoCC,
fetchFromGitHub,
makeWrapper,
jre,
gradle,
runCommand,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "smithy-language-server";
version = "0.9.0";
strictDeps = true;
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "smithy-lang";
repo = "smithy-language-server";
tag = finalAttrs.version;
hash = "sha256-BnnZKADY9HiSy8mlwuh+e7g6Zz422l/rx1NTSRgexIU=";
};
nativeBuildInputs = [
gradle
makeWrapper
];
gradleBuildTask = "installDist";
# NOTE: in 0.9.0, test ProjectLoaderTest.loadsProjectWithMavenDep() is failing.
# Once the test is fixed, checking should be re-enabled.
# doCheck = true;
mitmCache = gradle.fetchDeps {
inherit (finalAttrs) pname;
data = ./deps.json;
};
__darwinAllowLocalNetworking = true;
installPhase = ''
runHook preInstall
mkdir -p $out/{bin,share/smithy-language-server}
cp -r build/install/smithy-language-server/lib $out/share/smithy-language-server/
makeWrapper ${lib.getExe jre} $out/bin/smithy-language-server \
--set CLASSPATH "$out/share/smithy-language-server/lib/*" \
--add-flags "software.amazon.smithy.lsp.Main"
runHook postInstall
'';
passthru.tests = {
help = runCommand "${finalAttrs.pname}-help-test" { } ''
${lib.getExe finalAttrs.finalPackage} --help &> $out
grep "Run the Smithy Language Server" $out
'';
};
meta = {
mainProgram = "smithy-language-server";
description = "Language server implementation for the Smithy IDL";
homepage = "https://github.com/smithy-lang/smithy-language-server";
sourceProvenance = with lib.sourceTypes; [
fromSource
binaryBytecode # deps
];
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ yoquec ];
inherit (jre.meta) platforms;
};
})

6
pkgs/by-name/st/stremio-linux-shell/package.nix
View File

@@ -26,7 +26,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "stremio-linux-shell";
version = "1.1.2";
version = "1.1.3";
strictDeps = true;
__structuredAttrs = true;
@@ -35,10 +35,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
owner = "Stremio";
repo = "stremio-linux-shell";
tag = "v${finalAttrs.version}";
hash = "sha256-jo+9KDX/a46jPTmYhiFNgp5fDKhoAsML/+m7u3ituEQ=";
hash = "sha256-8WJB4t4Fq5WEV1nxKRpnfFwUSiXExsyXRZkvnfsq11k=";
};
cargoHash = "sha256-hZ9neZD+aB7bth4UTsWJXIKGSbo/c3wZRtfOIp7LvwY=";
cargoHash = "sha256-zg0ExdzoujcRT1SLKACxekYXH52L8dufOvMM085jcNw=";
patches = [
./out-path.patch

12
pkgs/by-name/zo/zoom-us/package.nix
View File

@@ -54,25 +54,25 @@ let
# Zoom versions are released at different times per platform and often with different versions.
# We write them on three lines like this (rather than using {}) so that the updater script can
# find where to edit them.
versions.aarch64-darwin = "7.0.0.77593";
versions.x86_64-darwin = "7.0.0.77593";
versions.aarch64-darwin = "7.0.5.81138";
versions.x86_64-darwin = "7.0.5.81138";
# This is the fallback version so that evaluation can produce a meaningful result.
versions.x86_64-linux = "7.0.0.1666";
versions.x86_64-linux = "7.0.5.3034";
srcs = {
aarch64-darwin = fetchurl {
url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";
name = "zoomusInstallerFull.pkg";
hash = "sha256-YSUaM8YAJHigm4M9W34/bD164M8f/hbhtcmHyUwFN20=";
hash = "sha256-uFnwBVZn5iUTIHNYG2WqiULA8siGWJaqY0BcRCoU6gg=";
};
x86_64-darwin = fetchurl {
url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
hash = "sha256-jIKBCrnvF101WJm8Tcpi2R5jRsqRXH7NQVGkSTnAeMA=";
hash = "sha256-ZeTgrqkpYumSGlbv/O8/GKALns4bNaFJR3CgV4Mswb4=";
};
x86_64-linux = fetchurl {
url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
hash = "sha256-aPQ44znQfxcjGnUpON5RRj3+SG+IDaBa/s0khwj/AIo=";
hash = "sha256-eHJIkY1qRC7z3+k6AMog2wlby8Wgupy48A5O7UKRiVU=";
};
};

6
pkgs/desktops/gnome/extensions/pop-shell/default.nix
View File

@@ -10,13 +10,13 @@
stdenv.mkDerivation {
pname = "gnome-shell-extension-pop-shell";
version = "1.2.0-unstable-2025-10-01";
version = "1.2.0-unstable-2026-03-31";
src = fetchFromGitHub {
owner = "pop-os";
repo = "shell";
rev = "3cb093b8e6a36c48dd5e84533dc874ea74cd8a9e";
hash = "sha256-FNNc3RY+x6y4bRU9BCUcQdzkG6iM8kKeRGkziQrTUM0=";
rev = "7898b65c20735057faf0797f8ed056704ca55f0d";
hash = "sha256-MmHoOxymo0QSRbRcSbFiv82+QWAwIwXwg/wyGQGVYiI=";
};
nativeBuildInputs = [

78
pkgs/servers/nextcloud/packages/32.json
View File

File diff suppressed because one or more lines are too long

78
pkgs/servers/nextcloud/packages/33.json
View File

File diff suppressed because one or more lines are too long

78
pkgs/servers/nextcloud/packages/34.json
View File

File diff suppressed because one or more lines are too long

1
pkgs/servers/nextcloud/packages/nextcloud-apps.json
View File

@@ -9,6 +9,7 @@
, "cospend": "agpl3Plus"
, "dav_push": "agpl3Plus"
, "deck": "agpl3Plus"
, "drawio": "agpl3Plus"
, "end_to_end_encryption": "agpl3Plus"
, "files_automatedtagging" : "agpl3Plus"
, "files_linkeditor": "agpl3Plus"

6
pkgs/top-level/perl-packages.nix
View File

@@ -39340,10 +39340,10 @@ with self;
YAMLSyck = buildPerlPackage {
pname = "YAML-Syck";
version = "1.45";
version = "1.47";
src = fetchurl {
url = "mirror://cpan/authors/id/T/TO/TODDR/YAML-Syck-1.45.tar.gz";
hash = "sha256-8t4a+08MVsNubVJgqgvSyPGOTYUAnc9YQiBOoqf7w98=";
url = "mirror://cpan/authors/id/T/TO/TODDR/YAML-Syck-1.47.tar.gz";
hash = "sha256-ZyGWyhwCHjxo9LX3tK7DBa1HG7v0SMU8fkADTW67fh0=";
};
env.NIX_CFLAGS_COMPILE = "-std=gnu11";
meta = {