Merge staging-next into staging

This commit is contained in:
nixpkgs-ci[bot]
2025-04-10 06:05:44 +00:00
committed by GitHub
15 changed files with 151 additions and 142 deletions
@@ -787,7 +787,7 @@
}
},
"ungoogled-chromium": {
"version": "135.0.7049.52",
"version": "135.0.7049.84",
"deps": {
"depot_tools": {
"rev": "85ec2718b5a29990c7eb67778348c9f76a00f392",
@@ -798,16 +798,16 @@
"hash": "sha256-8NynNvLNCHxy8EYmsnPovKhXu9DcDcYBhg4A6d2QIfY="
},
"ungoogled-patches": {
"rev": "135.0.7049.52-1",
"hash": "sha256-i7fSJsbuXgzDvh/4RJwHvVEalS134SoRzvcJZbYsIIo="
"rev": "135.0.7049.84-1",
"hash": "sha256-Cncp+sLFWC8nuepXCbkeHZYgAw2cFIAIaQe9wgun/AA="
},
"npmHash": "sha256-wNrZaugdKJCyV1WchkKXzr/I1OW1AtjiC2p7qTZZOqU="
},
"DEPS": {
"src": {
"url": "https://chromium.googlesource.com/chromium/src.git",
"rev": "9ba7e609d28c509a8ce9265c2247065d8d251173",
"hash": "sha256-PjvfckdlaMq9HWefGxFppgBumlqh7xoCoxYFwk/r630=",
"rev": "6c019e56001911b3fd467e03bf68c435924d62f4",
"hash": "sha256-BFw1o2cIHBeBudeigH6YTOuLGsp/+pTOeE1lXBO3aio=",
"recompress": true
},
"src/third_party/clang-format/script": {
@@ -912,8 +912,8 @@
},
"src/third_party/dawn": {
"url": "https://dawn.googlesource.com/dawn.git",
"rev": "bdc68b25b620d7302a955e2c38c548ebfe74ef31",
"hash": "sha256-R9SQiKUjLkLmPJwuWpw7fcibrWxSlXWkDsCra7Ci0UQ="
"rev": "53dfda5e9d07d58b43cea66b8153c55dd751ff88",
"hash": "sha256-zXxJZz2C4eDJ8beHDXJe0UCNesDw5R0ogFcsdiF8VIc="
},
"src/third_party/dawn/third_party/glfw": {
"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -1402,8 +1402,8 @@
},
"src/third_party/skia": {
"url": "https://skia.googlesource.com/skia.git",
"rev": "b99f146a03d3c98049768fd91c2bbe6594b02b2c",
"hash": "sha256-tl1GDmcStkuKMmzzsYuRG6Nrk4xDqgYYBoa1VsQNOwY="
"rev": "6e445bdea696eb6b6a46681dfc1a63edaa517edb",
"hash": "sha256-mSup6nKsEPjJ/HBV7PwjBI4PP7/RdwFm/dnavKeRqzI="
},
"src/third_party/smhasher/src": {
"url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -1492,8 +1492,8 @@
},
"src/third_party/wasm_tts_engine/src": {
"url": "https://chromium.googlesource.com/chromium/wasm-tts-engine",
"rev": "6ab3e63276a2d66ba3e7db4f87c5b7cb00e22130",
"hash": "sha256-ZcnKKnHsN1UyztAXClc2EUwfeX3yuLtMM2Zjwpnh62U="
"rev": "53d2aba6f0cf7db57e17edfc3ff6471871b0c125",
"hash": "sha256-t5eeehwspRLaowEMPLa8/lV5AHamXQBfH/un0DHLVAM="
},
"src/third_party/wayland/src": {
"url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git",
@@ -1537,8 +1537,8 @@
},
"src/third_party/webrtc": {
"url": "https://webrtc.googlesource.com/src.git",
"rev": "04413d62f754a7b1a3a2d8c3df23bcde040112b2",
"hash": "sha256-sFoBgpPeMJQNSjNp8dDEUlB/7lJUpIXTpu0eRq94cGk="
"rev": "9e5db68b15087eccd8d2493b4e8539c1657e0f75",
"hash": "sha256-gXdBDo+fzp6hJB8qyhscV7ajwSfCUeYvSxhL10g56rU="
},
"src/third_party/wuffs/src": {
"url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
@@ -6,15 +6,15 @@
}:
buildGoModule rec {
pname = "double-entry-generator";
version = "2.7.1";
version = "2.8.0";
src = fetchFromGitHub {
owner = "deb-sig";
repo = "double-entry-generator";
hash = "sha256-2Y8Spj1LAVZsUgChDYDCZ63pTH+nqs2ff9xcmC+gr0c=";
hash = "sha256-DsNcQacbdBzOMK9mVuuK8yz9RXqykYLhXE5YSFYmipA=";
rev = "v${version}";
};
vendorHash = "sha256-Xedva9oGteOnv3rP4Wo3sOHIPyuy2TYwkZV2BAuxY4M=";
vendorHash = "sha256-/QMt8zPvHM9znUc0+iUC82bOUJoBmH+shJ9D7AHiQ1E=";
excludedPackages = [ "hack" ];
+3 -3
View File
@@ -11,13 +11,13 @@
buildNpmPackage rec {
pname = "ghostfolio";
version = "2.148.0";
version = "2.150.0";
src = fetchFromGitHub {
owner = "ghostfolio";
repo = "ghostfolio";
tag = version;
hash = "sha256-cQEqp884yHhVGM6xAXGpB56rxCMHD3R5E1qGXqaHSfQ=";
hash = "sha256-6XoOv1ynZomcWS156DybhfDlrThi3tepqNTtw/1M/zU=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@@ -27,7 +27,7 @@ buildNpmPackage rec {
'';
};
npmDepsHash = "sha256-gMTlZUmcKkD2udlJif8DxTDVhqpgjmWoTh3GmoW+eVo=";
npmDepsHash = "sha256-bLy+5hHyZDnSJ+IH3DPECScaRsXgPNr5ttuHfCpn5kU=";
nativeBuildInputs = [
prisma
@@ -17,13 +17,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lua-language-server";
version = "3.13.9";
version = "3.14.0";
src = fetchFromGitHub {
owner = "luals";
repo = "lua-language-server";
tag = finalAttrs.version;
hash = "sha256-zttTtMAeBsHBqgDm3CAvp54Tp2bfQUhk5/lKgKWUeJY=";
hash = "sha256-+pxDCjBcNYpSGZJpwJhL/PsARNhqdIXRHKj9DQvOyLE=";
fetchSubmodules = true;
};
+2 -2
View File
@@ -10,14 +10,14 @@
}:
python3Packages.buildPythonApplication rec {
pname = "pixelflasher";
version = "7.11.2.1";
version = "7.11.3.0";
format = "other";
src = fetchFromGitHub {
owner = "badabing2005";
repo = "PixelFlasher";
tag = "v${version}";
hash = "sha256-FW5Ve95Po0GoQCLhSVgBR20mVA1Hh9GUDeq2VbziVBQ=";
hash = "sha256-8ZtzOUoD2f25oYFQ+Q3uwG1w1o768361efh3K8L4ZGM=";
};
desktopItems = [
+3 -3
View File
@@ -35,20 +35,20 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "siyuan";
version = "3.1.26";
version = "3.1.27";
src = fetchFromGitHub {
owner = "siyuan-note";
repo = "siyuan";
rev = "v${finalAttrs.version}";
hash = "sha256-Hkvlodf2zBT/+ohmxLrinbBiluCmSsGRKnw4ZrdFcAg=";
hash = "sha256-QRj1MHGpSWD+X84CxAYCaVeXjreQHV4BI8KevQvdcqY=";
};
kernel = buildGo123Module {
name = "${finalAttrs.pname}-${finalAttrs.version}-kernel";
inherit (finalAttrs) src;
sourceRoot = "${finalAttrs.src.name}/kernel";
vendorHash = "sha256-NJPb5nJWDTiQ5H/RPDA0IHMaWvzlNNXUA2WkpG2lk8I=";
vendorHash = "sha256-oy2t5IBn9JJY5cm16Yak6e9dDl0KAEVtCE6SJ205vok=";
patches = [
(replaceVars ./set-pandoc-path.patch {
+74
View File
@@ -0,0 +1,74 @@
{
lib,
buildGoModule,
fetchzip,
testers,
wireguard-go,
}:
buildGoModule (
finalAttrs:
let
rev = "12269c2761734b15625017d8565745096325392f";
shortVer = "${finalAttrs.version} (${lib.substring 0 7 rev})";
in
{
pname = "wireguard-go";
version = "0-unstable-2023-12-11";
src = fetchzip {
url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${rev}.tar.xz";
hash = "sha256-br7/dwr/e4HvBGJXh+6lWqxBUezt5iZNy9BFqEA1bLk=";
};
postPatch = ''
# Skip formatting tests
rm -f format_test.go
# Inject version
printf 'package main\n\nconst Version = "${shortVer}"' > version.go
'';
vendorHash = "sha256-RqZ/3+Xus5N1raiUTUpiKVBs/lrJQcSwr1dJib2ytwc=";
subPackages = [ "." ];
ldflags = [ "-s" ];
# No tests besides the formatting one are in root.
# We can't override subPackages per-phase (and we don't
# want to needlessly build packages that have build
# constraints), so just use the upstream Makefile (that
# runs `go test ./...`) to actually run the tests.
checkPhase = ''
runHook preCheck
export GOFLAGS=''${GOFLAGS//-trimpath/}
make test
runHook postCheck
'';
# Tests require networking.
__darwinAllowLocalNetworking = finalAttrs.doCheck;
postInstall = ''
mv $out/bin/wireguard $out/bin/wireguard-go
'';
passthru.tests.version = testers.testVersion {
package = wireguard-go;
version = "v${shortVer}";
};
meta = with lib; {
description = "Userspace Go implementation of WireGuard";
homepage = "https://git.zx2c4.com/wireguard-go/about/";
license = licenses.mit;
maintainers = with maintainers; [
kirelagin
winter
zx2c4
];
mainProgram = "wireguard-go";
};
}
)
@@ -19,19 +19,19 @@
buildPythonPackage rec {
pname = "granian";
version = "2.2.2";
version = "2.2.3";
pyproject = true;
src = fetchFromGitHub {
owner = "emmett-framework";
repo = "granian";
tag = "v${version}";
hash = "sha256-LIJhhekulLQje6/8g9BIraH8aToPVWoTnWnmgtwLnHA=";
hash = "sha256-E0ooMXqR6PR6JVHEjiqsVaxsMs5ZIoR5YAmExF73ljI=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname version src;
hash = "sha256-GSPGDVn4WlTJY9CiToI6myuiLcV1j2+LYD9IusDtgUg=";
hash = "sha256-XXgg2HW4SNINeoG1zU/bqpplP6UdQOE2z68rvB4vA/0=";
};
nativeBuildInputs = with rustPlatform; [
+4 -8
View File
@@ -1,16 +1,12 @@
{ fetchFromGitHub, sourceData }:
# Using fetchFromGitHub from their mirror because it's a lot faster than their git server
# If you want you could fetchgit from "https://git.FreeBSD.org/src.git" instead.
# Using fetchFromGitHub from their mirror because we cannot use git during bootstrap
# If you want you could fetchurl from "https://cgit.FreeBSD.org/src" instead.
# The update script still pulls directly from git.freebsd.org
# Note that hashes with `forceFetchGit = true` may be different due to `export-ignore`
# directives in gitattributes files.
fetchFromGitHub {
owner = "freebsd";
repo = "freebsd-src";
inherit (sourceData) rev hash;
# The GitHub export excludes some files in the git source
# that were marked `export-ignore`.
# A normal git checkout will keep those files,
# matching the update script
forceFetchGit = true;
}
+28 -33
View File
@@ -11,12 +11,13 @@ import pandas
import re
import subprocess
import sys
import tarfile
import tempfile
import typing
import urllib.request
_QUERY_VERSION_PATTERN = re.compile('^([A-Z]+)="(.+)"$')
_RELEASE_PATCH_PATTERN = re.compile('^RELEASE-p([0-9]+)$')
_RELEASE_PATCH_PATTERN = re.compile("^RELEASE-p([0-9]+)$")
BASE_DIR = os.path.dirname(os.path.abspath(__file__))
MIN_VERSION = packaging.version.Version("13.0.0")
MAIN_BRANCH = "main"
@@ -32,7 +33,7 @@ BRANCH_PATTERN = re.compile(
def request_supported_refs() -> list[str]:
# Looks pretty shady but I think this should work with every version of the page in the last 20 years
r = re.compile("^h\d$", re.IGNORECASE)
r = re.compile(r"^h\d$", re.IGNORECASE)
soup = bs4.BeautifulSoup(
urllib.request.urlopen("https://www.freebsd.org/security"), features="lxml"
)
@@ -45,11 +46,11 @@ def request_supported_refs() -> list[str]:
return list(df["Branch"])
def query_version(repo: git.Repo) -> dict[str, typing.Any]:
def query_version(work_dir: str) -> dict[str, typing.Any]:
# This only works on FreeBSD 13 and later
text = (
subprocess.check_output(
["bash", os.path.join(repo.working_dir, "sys", "conf", "newvers.sh"), "-v"]
["bash", os.path.join(work_dir, "sys", "conf", "newvers.sh"), "-v"]
)
.decode("utf-8")
.strip()
@@ -86,18 +87,23 @@ def handle_commit(
print(f"{ref_name}: revision still {rev.hexsha}, skipping")
return old_versions[ref_name]
repo.git.checkout(rev)
print(f"{ref_name}: checked out {rev.hexsha}")
tar_content = io.BytesIO()
repo.archive(tar_content, rev, format="tar")
tar_content.seek(0)
full_hash = (
subprocess.check_output(["nix", "hash", "path", "--sri", repo.working_dir])
.decode("utf-8")
.strip()
)
print(f"{ref_name}: hash is {full_hash}")
with tempfile.TemporaryDirectory(dir="/tmp") as work_dir:
file = tarfile.TarFile(fileobj=tar_content)
file.extractall(path=work_dir, filter="data")
version = query_version(repo)
print(f"{ref_name}: version is {version['version']}")
full_hash = (
subprocess.check_output(["nix", "hash", "path", "--sri", work_dir])
.decode("utf-8")
.strip()
)
print(f"{ref_name}: hash is {full_hash}")
version = query_version(work_dir)
print(f"{ref_name}: version is {version['version']}")
return {
"rev": rev.hexsha,
@@ -115,30 +121,19 @@ def main() -> None:
print(f"Selected temporary directory {temp_dir.name}")
if len(sys.argv) >= 2:
orig_repo = git.Repo(sys.argv[1])
print(f"Fetching updates on {orig_repo.git_dir}")
orig_repo.remote("origin").fetch()
repo = git.Repo(sys.argv[1])
print(f"Fetching updates on {repo.git_dir}")
repo.remote("origin").fetch()
else:
print("Cloning source repo")
orig_repo = git.Repo.clone_from(
"https://git.FreeBSD.org/src.git", to_path=os.path.join(temp_dir.name, "orig")
repo = git.Repo.clone_from(
"https://git.FreeBSD.org/src.git", to_path=temp_dir.name
)
supported_refs = request_supported_refs()
print(f"Supported refs are: {' '.join(supported_refs)}")
print("Doing git crimes, do not run `git worktree prune` until after script finishes!")
workdir = os.path.join(temp_dir.name, "work")
git.cmd.Git(orig_repo.git_dir).worktree("add", "--orphan", workdir)
# Have to create object before removing .git otherwise it will complain
repo = git.Repo(workdir)
repo.git.set_persistent_git_options(git_dir=repo.git_dir)
# Remove so that nix hash doesn't see the file
os.remove(os.path.join(workdir, ".git"))
print(f"Working in directory {repo.working_dir} with git directory {repo.git_dir}")
print(f"git directory {repo.git_dir}")
try:
with open(os.path.join(BASE_DIR, "versions.json"), "r") as f:
@@ -191,10 +186,10 @@ def main() -> None:
)
versions[fullname] = result
with open(os.path.join(BASE_DIR, "versions.json"), "w") as out:
json.dump(versions, out, sort_keys=True, indent=2)
out.write("\n")
if __name__ == '__main__':
if __name__ == "__main__":
main()
+10 -10
View File
@@ -1,15 +1,15 @@
{
"main": {
"hash": "sha256-xsgY5Ex/B5ngOTa5OZRauSaSYvET5lWI7veJRrSq1oY=",
"hash": "sha256-f69U2FX+3GQimdUJunWApFseeKJhzjgNw4h26ZBPiT0=",
"ref": "main",
"refType": "branch",
"rev": "c5773d366ecc5271b9bd6e5506c00fb3520f19ae",
"rev": "9357c694e8dca627c25b15529e8435b2ab3dd48b",
"supported": false,
"version": {
"branch": "CURRENT",
"major": 15,
"minor": 0,
"reldate": "1500035",
"reldate": "1500036",
"release": "15.0-CURRENT",
"revision": "15.0",
"type": "FreeBSD",
@@ -161,7 +161,7 @@
}
},
"release/14.2.0": {
"hash": "sha256-qZkeuUZbuPOvXZBgP5x6Hii1YN7XdDJzwZeYacIR5BI=",
"hash": "sha256-q5/0pKRlmzZUN+VMwUImkve+NTT1+O68YlwgXp2/aQM=",
"ref": "release/14.2.0",
"refType": "tag",
"rev": "c8918d6c7412fce87922e9bd7e4f5c7d7ca96eb7",
@@ -308,7 +308,7 @@
"ref": "releng/14.1",
"refType": "branch",
"rev": "f389e68ca980b7e053a34d9eddde89b4c2a1ee6c",
"supported": true,
"supported": false,
"version": {
"branch": "RELEASE-p8",
"major": 14,
@@ -322,7 +322,7 @@
}
},
"releng/14.2": {
"hash": "sha256-XP8BFnXvziaC9wOJj8q31UZXFqCUE7WQ5FdJHEZWGbg=",
"hash": "sha256-iSeTif/cEkqhIQ5hSNF+Rx7dORU13Bc0Dk8Zv4TYWtA=",
"ref": "releng/14.2",
"refType": "branch",
"rev": "ac2cbb46b5f1efa7f7b5d4eb15631337329ec5b2",
@@ -340,10 +340,10 @@
}
},
"stable/13": {
"hash": "sha256-J9SJKeR6Den3Sep2o4r0cqIDd2V5gbY0Ow9eP69Ny0o=",
"hash": "sha256-rex3CUXyyNDz/TouNqlzZFo6DAwSOKXTdC5HaRQoKKc=",
"ref": "stable/13",
"refType": "branch",
"rev": "a8431b47adae8f8b731206dc38d82b2245ad245e",
"rev": "64f5a71c1cb79c09e50a37ddbe958224bb64add4",
"supported": true,
"version": {
"branch": "STABLE",
@@ -357,10 +357,10 @@
}
},
"stable/14": {
"hash": "sha256-tleB6J5Cg1SIN2LCfvV3Cfp4Lxx65UHmiILpin6UYGY=",
"hash": "sha256-s+pj8LttAnKNNohUsJNOJRFmLg6x06tlkJn3xQnFQiY=",
"ref": "stable/14",
"refType": "branch",
"rev": "6e510d8fbaf8d91da235fe28250cd48124edda9f",
"rev": "e6a470ffcbd708cf404472bb871c2cb76eaa7b39",
"supported": true,
"version": {
"branch": "STABLE",
+4 -4
View File
@@ -19,28 +19,28 @@ let
scalaVersion = "2.13";
sha256 = "sha256-e4Uuk4vAneEM2W7KN1UljH0l+4nb3XYwVxdgfhg14qo=";
jre = jdk17_headless;
nixosTest = nixosTests.kafka.kafka_4_0;
nixosTest = nixosTests.kafka.base.kafka_4_0;
};
"3_9" = {
kafkaVersion = "3.9.0";
scalaVersion = "2.13";
sha256 = "sha256-q8REAt3xA+OPGbDktE5l2pqDG6nlj9dyUEGxqhaO6NE=";
jre = jdk17_headless;
nixosTest = nixosTests.kafka.kafka_3_9;
nixosTest = nixosTests.kafka.base.kafka_3_9;
};
"3_8" = {
kafkaVersion = "3.8.1";
scalaVersion = "2.13";
sha256 = "sha256-IhdChtYMqmKyVQbEhpRLxuBNjLLS8VCD0v60gjl3i2I=";
jre = jdk17_headless;
nixosTest = nixosTests.kafka.kafka_3_8;
nixosTest = nixosTests.kafka.base.kafka_3_8;
};
"3_7" = {
kafkaVersion = "3.7.1";
scalaVersion = "2.13";
sha256 = "sha256-YqyuShQ92YPcfrSATVdEugxQsZm1CPWZ7wAQIOJVj8k=";
jre = jdk17_headless;
nixosTest = nixosTests.kafka.kafka_3_7;
nixosTest = nixosTests.kafka.base.kafka_3_7;
};
};
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "advanced-camera-card";
version = "7.5.1";
version = "7.6.1";
src = fetchzip {
url = "https://github.com/dermotduffy/advanced-camera-card/releases/download/v${version}/advanced-camera-card.zip";
hash = "sha256-H1DI9Tn9f2UJy6oJ1O4yYfi0Zof53thIOmho6Wy9fFA=";
hash = "sha256-CfS3KdoFiGBWrhJZw5BCCAolXn1n6nuO3OAJL5U2UBY=";
};
# TODO: build from source once yarn berry support lands in nixpkgs
@@ -1,54 +0,0 @@
{
lib,
buildGoModule,
fetchzip,
testers,
wireguard-go,
}:
buildGoModule rec {
pname = "wireguard-go";
version = "0.0.20230223";
src = fetchzip {
url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz";
sha256 = "sha256-ZVWbZwSpxQvxwySS3cfzdRReFtHWk6LT2AuIe10hyz0=";
};
postPatch = ''
# Skip formatting tests
rm -f format_test.go
'';
vendorHash = "sha256-i6ncA71R0hi1SzqCLphhtF3yRAHDmOdYJQ6pf3UDBg8=";
subPackages = [ "." ];
ldflags = [
"-s"
"-w"
];
postInstall = ''
mv $out/bin/wireguard $out/bin/wireguard-go
'';
passthru.tests.version = testers.testVersion {
package = wireguard-go;
version = "v${version}";
};
meta = with lib; {
description = "Userspace Go implementation of WireGuard";
homepage = "https://git.zx2c4.com/wireguard-go/about/";
license = licenses.mit;
maintainers = with maintainers; [
kirelagin
zx2c4
];
mainProgram = "wireguard-go";
# Doesn't build with Go toolchain >1.22, build error:
# 'link: golang.org/x/net/internal/socket: invalid reference to syscall.recvmsg'.
broken = true;
};
}
-2
View File
@@ -5668,8 +5668,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Foundation IOBluetooth;
};
wireguard-go = callPackage ../tools/networking/wireguard-go { };
wring = nodePackages.wring;
wyrd = callPackage ../tools/misc/wyrd {