Merge staging-next into staging

authored by nixpkgs-ci[bot] and committed by GitHub d98f85d4 08006669

+151 -142
+13 -13
pkgs/applications/networking/browsers/chromium/info.json
··· 787 } 788 }, 789 "ungoogled-chromium": { 790 - "version": "135.0.7049.52", 791 "deps": { 792 "depot_tools": { 793 "rev": "85ec2718b5a29990c7eb67778348c9f76a00f392", ··· 798 "hash": "sha256-8NynNvLNCHxy8EYmsnPovKhXu9DcDcYBhg4A6d2QIfY=" 799 }, 800 "ungoogled-patches": { 801 - "rev": "135.0.7049.52-1", 802 - "hash": "sha256-i7fSJsbuXgzDvh/4RJwHvVEalS134SoRzvcJZbYsIIo=" 803 }, 804 "npmHash": "sha256-wNrZaugdKJCyV1WchkKXzr/I1OW1AtjiC2p7qTZZOqU=" 805 }, 806 "DEPS": { 807 "src": { 808 "url": "https://chromium.googlesource.com/chromium/src.git", 809 - "rev": "9ba7e609d28c509a8ce9265c2247065d8d251173", 810 - "hash": "sha256-PjvfckdlaMq9HWefGxFppgBumlqh7xoCoxYFwk/r630=", 811 "recompress": true 812 }, 813 "src/third_party/clang-format/script": { ··· 912 }, 913 "src/third_party/dawn": { 914 "url": "https://dawn.googlesource.com/dawn.git", 915 - "rev": "bdc68b25b620d7302a955e2c38c548ebfe74ef31", 916 - "hash": "sha256-R9SQiKUjLkLmPJwuWpw7fcibrWxSlXWkDsCra7Ci0UQ=" 917 }, 918 "src/third_party/dawn/third_party/glfw": { 919 "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", ··· 1402 }, 1403 "src/third_party/skia": { 1404 "url": "https://skia.googlesource.com/skia.git", 1405 - "rev": "b99f146a03d3c98049768fd91c2bbe6594b02b2c", 1406 - "hash": "sha256-tl1GDmcStkuKMmzzsYuRG6Nrk4xDqgYYBoa1VsQNOwY=" 1407 }, 1408 "src/third_party/smhasher/src": { 1409 "url": "https://chromium.googlesource.com/external/smhasher.git", ··· 1492 }, 1493 "src/third_party/wasm_tts_engine/src": { 1494 "url": "https://chromium.googlesource.com/chromium/wasm-tts-engine", 1495 - "rev": "6ab3e63276a2d66ba3e7db4f87c5b7cb00e22130", 1496 - "hash": "sha256-ZcnKKnHsN1UyztAXClc2EUwfeX3yuLtMM2Zjwpnh62U=" 1497 }, 1498 "src/third_party/wayland/src": { 1499 "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git", ··· 1537 }, 1538 "src/third_party/webrtc": { 1539 "url": "https://webrtc.googlesource.com/src.git", 1540 - "rev": "04413d62f754a7b1a3a2d8c3df23bcde040112b2", 1541 - "hash": "sha256-sFoBgpPeMJQNSjNp8dDEUlB/7lJUpIXTpu0eRq94cGk=" 1542 }, 1543 "src/third_party/wuffs/src": { 1544 "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
··· 787 } 788 }, 789 "ungoogled-chromium": { 790 + "version": "135.0.7049.84", 791 "deps": { 792 "depot_tools": { 793 "rev": "85ec2718b5a29990c7eb67778348c9f76a00f392", ··· 798 "hash": "sha256-8NynNvLNCHxy8EYmsnPovKhXu9DcDcYBhg4A6d2QIfY=" 799 }, 800 "ungoogled-patches": { 801 + "rev": "135.0.7049.84-1", 802 + "hash": "sha256-Cncp+sLFWC8nuepXCbkeHZYgAw2cFIAIaQe9wgun/AA=" 803 }, 804 "npmHash": "sha256-wNrZaugdKJCyV1WchkKXzr/I1OW1AtjiC2p7qTZZOqU=" 805 }, 806 "DEPS": { 807 "src": { 808 "url": "https://chromium.googlesource.com/chromium/src.git", 809 + "rev": "6c019e56001911b3fd467e03bf68c435924d62f4", 810 + "hash": "sha256-BFw1o2cIHBeBudeigH6YTOuLGsp/+pTOeE1lXBO3aio=", 811 "recompress": true 812 }, 813 "src/third_party/clang-format/script": { ··· 912 }, 913 "src/third_party/dawn": { 914 "url": "https://dawn.googlesource.com/dawn.git", 915 + "rev": "53dfda5e9d07d58b43cea66b8153c55dd751ff88", 916 + "hash": "sha256-zXxJZz2C4eDJ8beHDXJe0UCNesDw5R0ogFcsdiF8VIc=" 917 }, 918 "src/third_party/dawn/third_party/glfw": { 919 "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", ··· 1402 }, 1403 "src/third_party/skia": { 1404 "url": "https://skia.googlesource.com/skia.git", 1405 + "rev": "6e445bdea696eb6b6a46681dfc1a63edaa517edb", 1406 + "hash": "sha256-mSup6nKsEPjJ/HBV7PwjBI4PP7/RdwFm/dnavKeRqzI=" 1407 }, 1408 "src/third_party/smhasher/src": { 1409 "url": "https://chromium.googlesource.com/external/smhasher.git", ··· 1492 }, 1493 "src/third_party/wasm_tts_engine/src": { 1494 "url": "https://chromium.googlesource.com/chromium/wasm-tts-engine", 1495 + "rev": "53d2aba6f0cf7db57e17edfc3ff6471871b0c125", 1496 + "hash": "sha256-t5eeehwspRLaowEMPLa8/lV5AHamXQBfH/un0DHLVAM=" 1497 }, 1498 "src/third_party/wayland/src": { 1499 "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git", ··· 1537 }, 1538 "src/third_party/webrtc": { 1539 "url": "https://webrtc.googlesource.com/src.git", 1540 + "rev": "9e5db68b15087eccd8d2493b4e8539c1657e0f75", 1541 + "hash": "sha256-gXdBDo+fzp6hJB8qyhscV7ajwSfCUeYvSxhL10g56rU=" 1542 }, 1543 "src/third_party/wuffs/src": { 1544 "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
+3 -3
pkgs/by-name/do/double-entry-generator/package.nix
··· 6 }: 7 buildGoModule rec { 8 pname = "double-entry-generator"; 9 - version = "2.7.1"; 10 src = fetchFromGitHub { 11 owner = "deb-sig"; 12 repo = "double-entry-generator"; 13 - hash = "sha256-2Y8Spj1LAVZsUgChDYDCZ63pTH+nqs2ff9xcmC+gr0c="; 14 rev = "v${version}"; 15 }; 16 17 - vendorHash = "sha256-Xedva9oGteOnv3rP4Wo3sOHIPyuy2TYwkZV2BAuxY4M="; 18 19 excludedPackages = [ "hack" ]; 20
··· 6 }: 7 buildGoModule rec { 8 pname = "double-entry-generator"; 9 + version = "2.8.0"; 10 src = fetchFromGitHub { 11 owner = "deb-sig"; 12 repo = "double-entry-generator"; 13 + hash = "sha256-DsNcQacbdBzOMK9mVuuK8yz9RXqykYLhXE5YSFYmipA="; 14 rev = "v${version}"; 15 }; 16 17 + vendorHash = "sha256-/QMt8zPvHM9znUc0+iUC82bOUJoBmH+shJ9D7AHiQ1E="; 18 19 excludedPackages = [ "hack" ]; 20
+3 -3
pkgs/by-name/gh/ghostfolio/package.nix
··· 11 12 buildNpmPackage rec { 13 pname = "ghostfolio"; 14 - version = "2.148.0"; 15 16 src = fetchFromGitHub { 17 owner = "ghostfolio"; 18 repo = "ghostfolio"; 19 tag = version; 20 - hash = "sha256-cQEqp884yHhVGM6xAXGpB56rxCMHD3R5E1qGXqaHSfQ="; 21 # populate values that require us to use git. By doing this in postFetch we 22 # can delete .git afterwards and maintain better reproducibility of the src. 23 leaveDotGit = true; ··· 27 ''; 28 }; 29 30 - npmDepsHash = "sha256-gMTlZUmcKkD2udlJif8DxTDVhqpgjmWoTh3GmoW+eVo="; 31 32 nativeBuildInputs = [ 33 prisma
··· 11 12 buildNpmPackage rec { 13 pname = "ghostfolio"; 14 + version = "2.150.0"; 15 16 src = fetchFromGitHub { 17 owner = "ghostfolio"; 18 repo = "ghostfolio"; 19 tag = version; 20 + hash = "sha256-6XoOv1ynZomcWS156DybhfDlrThi3tepqNTtw/1M/zU="; 21 # populate values that require us to use git. By doing this in postFetch we 22 # can delete .git afterwards and maintain better reproducibility of the src. 23 leaveDotGit = true; ··· 27 ''; 28 }; 29 30 + npmDepsHash = "sha256-bLy+5hHyZDnSJ+IH3DPECScaRsXgPNr5ttuHfCpn5kU="; 31 32 nativeBuildInputs = [ 33 prisma
+2 -2
pkgs/by-name/lu/lua-language-server/package.nix
··· 17 18 stdenv.mkDerivation (finalAttrs: { 19 pname = "lua-language-server"; 20 - version = "3.13.9"; 21 22 src = fetchFromGitHub { 23 owner = "luals"; 24 repo = "lua-language-server"; 25 tag = finalAttrs.version; 26 - hash = "sha256-zttTtMAeBsHBqgDm3CAvp54Tp2bfQUhk5/lKgKWUeJY="; 27 fetchSubmodules = true; 28 }; 29
··· 17 18 stdenv.mkDerivation (finalAttrs: { 19 pname = "lua-language-server"; 20 + version = "3.14.0"; 21 22 src = fetchFromGitHub { 23 owner = "luals"; 24 repo = "lua-language-server"; 25 tag = finalAttrs.version; 26 + hash = "sha256-+pxDCjBcNYpSGZJpwJhL/PsARNhqdIXRHKj9DQvOyLE="; 27 fetchSubmodules = true; 28 }; 29
+2 -2
pkgs/by-name/pi/pixelflasher/package.nix
··· 10 }: 11 python3Packages.buildPythonApplication rec { 12 pname = "pixelflasher"; 13 - version = "7.11.2.1"; 14 format = "other"; 15 16 src = fetchFromGitHub { 17 owner = "badabing2005"; 18 repo = "PixelFlasher"; 19 tag = "v${version}"; 20 - hash = "sha256-FW5Ve95Po0GoQCLhSVgBR20mVA1Hh9GUDeq2VbziVBQ="; 21 }; 22 23 desktopItems = [
··· 10 }: 11 python3Packages.buildPythonApplication rec { 12 pname = "pixelflasher"; 13 + version = "7.11.3.0"; 14 format = "other"; 15 16 src = fetchFromGitHub { 17 owner = "badabing2005"; 18 repo = "PixelFlasher"; 19 tag = "v${version}"; 20 + hash = "sha256-8ZtzOUoD2f25oYFQ+Q3uwG1w1o768361efh3K8L4ZGM="; 21 }; 22 23 desktopItems = [
+3 -3
pkgs/by-name/si/siyuan/package.nix
··· 35 in 36 stdenv.mkDerivation (finalAttrs: { 37 pname = "siyuan"; 38 - version = "3.1.26"; 39 40 src = fetchFromGitHub { 41 owner = "siyuan-note"; 42 repo = "siyuan"; 43 rev = "v${finalAttrs.version}"; 44 - hash = "sha256-Hkvlodf2zBT/+ohmxLrinbBiluCmSsGRKnw4ZrdFcAg="; 45 }; 46 47 kernel = buildGo123Module { 48 name = "${finalAttrs.pname}-${finalAttrs.version}-kernel"; 49 inherit (finalAttrs) src; 50 sourceRoot = "${finalAttrs.src.name}/kernel"; 51 - vendorHash = "sha256-NJPb5nJWDTiQ5H/RPDA0IHMaWvzlNNXUA2WkpG2lk8I="; 52 53 patches = [ 54 (replaceVars ./set-pandoc-path.patch {
··· 35 in 36 stdenv.mkDerivation (finalAttrs: { 37 pname = "siyuan"; 38 + version = "3.1.27"; 39 40 src = fetchFromGitHub { 41 owner = "siyuan-note"; 42 repo = "siyuan"; 43 rev = "v${finalAttrs.version}"; 44 + hash = "sha256-QRj1MHGpSWD+X84CxAYCaVeXjreQHV4BI8KevQvdcqY="; 45 }; 46 47 kernel = buildGo123Module { 48 name = "${finalAttrs.pname}-${finalAttrs.version}-kernel"; 49 inherit (finalAttrs) src; 50 sourceRoot = "${finalAttrs.src.name}/kernel"; 51 + vendorHash = "sha256-oy2t5IBn9JJY5cm16Yak6e9dDl0KAEVtCE6SJ205vok="; 52 53 patches = [ 54 (replaceVars ./set-pandoc-path.patch {
+74
pkgs/by-name/wi/wireguard-go/package.nix
···
··· 1 + { 2 + lib, 3 + buildGoModule, 4 + fetchzip, 5 + testers, 6 + wireguard-go, 7 + }: 8 + 9 + buildGoModule ( 10 + finalAttrs: 11 + let 12 + rev = "12269c2761734b15625017d8565745096325392f"; 13 + shortVer = "${finalAttrs.version} (${lib.substring 0 7 rev})"; 14 + in 15 + { 16 + pname = "wireguard-go"; 17 + version = "0-unstable-2023-12-11"; 18 + 19 + src = fetchzip { 20 + url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${rev}.tar.xz"; 21 + hash = "sha256-br7/dwr/e4HvBGJXh+6lWqxBUezt5iZNy9BFqEA1bLk="; 22 + }; 23 + 24 + postPatch = '' 25 + # Skip formatting tests 26 + rm -f format_test.go 27 + 28 + # Inject version 29 + printf 'package main\n\nconst Version = "${shortVer}"' > version.go 30 + ''; 31 + 32 + vendorHash = "sha256-RqZ/3+Xus5N1raiUTUpiKVBs/lrJQcSwr1dJib2ytwc="; 33 + 34 + subPackages = [ "." ]; 35 + 36 + ldflags = [ "-s" ]; 37 + 38 + # No tests besides the formatting one are in root. 39 + # We can't override subPackages per-phase (and we don't 40 + # want to needlessly build packages that have build 41 + # constraints), so just use the upstream Makefile (that 42 + # runs `go test ./...`) to actually run the tests. 43 + checkPhase = '' 44 + runHook preCheck 45 + export GOFLAGS=''${GOFLAGS//-trimpath/} 46 + make test 47 + runHook postCheck 48 + ''; 49 + 50 + # Tests require networking. 51 + __darwinAllowLocalNetworking = finalAttrs.doCheck; 52 + 53 + postInstall = '' 54 + mv $out/bin/wireguard $out/bin/wireguard-go 55 + ''; 56 + 57 + passthru.tests.version = testers.testVersion { 58 + package = wireguard-go; 59 + version = "v${shortVer}"; 60 + }; 61 + 62 + meta = with lib; { 63 + description = "Userspace Go implementation of WireGuard"; 64 + homepage = "https://git.zx2c4.com/wireguard-go/about/"; 65 + license = licenses.mit; 66 + maintainers = with maintainers; [ 67 + kirelagin 68 + winter 69 + zx2c4 70 + ]; 71 + mainProgram = "wireguard-go"; 72 + }; 73 + } 74 + )
+3 -3
pkgs/development/python-modules/granian/default.nix
··· 19 20 buildPythonPackage rec { 21 pname = "granian"; 22 - version = "2.2.2"; 23 pyproject = true; 24 25 src = fetchFromGitHub { 26 owner = "emmett-framework"; 27 repo = "granian"; 28 tag = "v${version}"; 29 - hash = "sha256-LIJhhekulLQje6/8g9BIraH8aToPVWoTnWnmgtwLnHA="; 30 }; 31 32 cargoDeps = rustPlatform.fetchCargoVendor { 33 inherit pname version src; 34 - hash = "sha256-GSPGDVn4WlTJY9CiToI6myuiLcV1j2+LYD9IusDtgUg="; 35 }; 36 37 nativeBuildInputs = with rustPlatform; [
··· 19 20 buildPythonPackage rec { 21 pname = "granian"; 22 + version = "2.2.3"; 23 pyproject = true; 24 25 src = fetchFromGitHub { 26 owner = "emmett-framework"; 27 repo = "granian"; 28 tag = "v${version}"; 29 + hash = "sha256-E0ooMXqR6PR6JVHEjiqsVaxsMs5ZIoR5YAmExF73ljI="; 30 }; 31 32 cargoDeps = rustPlatform.fetchCargoVendor { 33 inherit pname version src; 34 + hash = "sha256-XXgg2HW4SNINeoG1zU/bqpplP6UdQOE2z68rvB4vA/0="; 35 }; 36 37 nativeBuildInputs = with rustPlatform; [
+4 -8
pkgs/os-specific/bsd/freebsd/pkgs/source.nix
··· 1 { fetchFromGitHub, sourceData }: 2 3 - # Using fetchFromGitHub from their mirror because it's a lot faster than their git server 4 - # If you want you could fetchgit from "https://git.FreeBSD.org/src.git" instead. 5 # The update script still pulls directly from git.freebsd.org 6 fetchFromGitHub { 7 owner = "freebsd"; 8 repo = "freebsd-src"; 9 inherit (sourceData) rev hash; 10 - 11 - # The GitHub export excludes some files in the git source 12 - # that were marked `export-ignore`. 13 - # A normal git checkout will keep those files, 14 - # matching the update script 15 - forceFetchGit = true; 16 }
··· 1 { fetchFromGitHub, sourceData }: 2 3 + # Using fetchFromGitHub from their mirror because we cannot use git during bootstrap 4 + # If you want you could fetchurl from "https://cgit.FreeBSD.org/src" instead. 5 # The update script still pulls directly from git.freebsd.org 6 + # Note that hashes with `forceFetchGit = true` may be different due to `export-ignore` 7 + # directives in gitattributes files. 8 fetchFromGitHub { 9 owner = "freebsd"; 10 repo = "freebsd-src"; 11 inherit (sourceData) rev hash; 12 }
+28 -33
pkgs/os-specific/bsd/freebsd/update.py
··· 11 import re 12 import subprocess 13 import sys 14 import tempfile 15 import typing 16 import urllib.request 17 18 _QUERY_VERSION_PATTERN = re.compile('^([A-Z]+)="(.+)"$') 19 - _RELEASE_PATCH_PATTERN = re.compile('^RELEASE-p([0-9]+)$') 20 BASE_DIR = os.path.dirname(os.path.abspath(__file__)) 21 MIN_VERSION = packaging.version.Version("13.0.0") 22 MAIN_BRANCH = "main" ··· 32 33 def request_supported_refs() -> list[str]: 34 # Looks pretty shady but I think this should work with every version of the page in the last 20 years 35 - r = re.compile("^h\d$", re.IGNORECASE) 36 soup = bs4.BeautifulSoup( 37 urllib.request.urlopen("https://www.freebsd.org/security"), features="lxml" 38 ) ··· 45 return list(df["Branch"]) 46 47 48 - def query_version(repo: git.Repo) -> dict[str, typing.Any]: 49 # This only works on FreeBSD 13 and later 50 text = ( 51 subprocess.check_output( 52 - ["bash", os.path.join(repo.working_dir, "sys", "conf", "newvers.sh"), "-v"] 53 ) 54 .decode("utf-8") 55 .strip() ··· 86 print(f"{ref_name}: revision still {rev.hexsha}, skipping") 87 return old_versions[ref_name] 88 89 - repo.git.checkout(rev) 90 - print(f"{ref_name}: checked out {rev.hexsha}") 91 92 - full_hash = ( 93 - subprocess.check_output(["nix", "hash", "path", "--sri", repo.working_dir]) 94 - .decode("utf-8") 95 - .strip() 96 - ) 97 - print(f"{ref_name}: hash is {full_hash}") 98 99 - version = query_version(repo) 100 - print(f"{ref_name}: version is {version['version']}") 101 102 return { 103 "rev": rev.hexsha, ··· 115 print(f"Selected temporary directory {temp_dir.name}") 116 117 if len(sys.argv) >= 2: 118 - orig_repo = git.Repo(sys.argv[1]) 119 - print(f"Fetching updates on {orig_repo.git_dir}") 120 - orig_repo.remote("origin").fetch() 121 else: 122 print("Cloning source repo") 123 - orig_repo = git.Repo.clone_from( 124 - "https://git.FreeBSD.org/src.git", to_path=os.path.join(temp_dir.name, "orig") 125 ) 126 127 supported_refs = request_supported_refs() 128 print(f"Supported refs are: {' '.join(supported_refs)}") 129 130 - print("Doing git crimes, do not run `git worktree prune` until after script finishes!") 131 - workdir = os.path.join(temp_dir.name, "work") 132 - git.cmd.Git(orig_repo.git_dir).worktree("add", "--orphan", workdir) 133 - 134 - # Have to create object before removing .git otherwise it will complain 135 - repo = git.Repo(workdir) 136 - repo.git.set_persistent_git_options(git_dir=repo.git_dir) 137 - # Remove so that nix hash doesn't see the file 138 - os.remove(os.path.join(workdir, ".git")) 139 - 140 - print(f"Working in directory {repo.working_dir} with git directory {repo.git_dir}") 141 - 142 143 try: 144 with open(os.path.join(BASE_DIR, "versions.json"), "r") as f: ··· 191 ) 192 versions[fullname] = result 193 194 - 195 with open(os.path.join(BASE_DIR, "versions.json"), "w") as out: 196 json.dump(versions, out, sort_keys=True, indent=2) 197 out.write("\n") 198 199 - if __name__ == '__main__': 200 main()
··· 11 import re 12 import subprocess 13 import sys 14 + import tarfile 15 import tempfile 16 import typing 17 import urllib.request 18 19 _QUERY_VERSION_PATTERN = re.compile('^([A-Z]+)="(.+)"$') 20 + _RELEASE_PATCH_PATTERN = re.compile("^RELEASE-p([0-9]+)$") 21 BASE_DIR = os.path.dirname(os.path.abspath(__file__)) 22 MIN_VERSION = packaging.version.Version("13.0.0") 23 MAIN_BRANCH = "main" ··· 33 34 def request_supported_refs() -> list[str]: 35 # Looks pretty shady but I think this should work with every version of the page in the last 20 years 36 + r = re.compile(r"^h\d$", re.IGNORECASE) 37 soup = bs4.BeautifulSoup( 38 urllib.request.urlopen("https://www.freebsd.org/security"), features="lxml" 39 ) ··· 46 return list(df["Branch"]) 47 48 49 + def query_version(work_dir: str) -> dict[str, typing.Any]: 50 # This only works on FreeBSD 13 and later 51 text = ( 52 subprocess.check_output( 53 + ["bash", os.path.join(work_dir, "sys", "conf", "newvers.sh"), "-v"] 54 ) 55 .decode("utf-8") 56 .strip() ··· 87 print(f"{ref_name}: revision still {rev.hexsha}, skipping") 88 return old_versions[ref_name] 89 90 + tar_content = io.BytesIO() 91 + repo.archive(tar_content, rev, format="tar") 92 + tar_content.seek(0) 93 + 94 + with tempfile.TemporaryDirectory(dir="/tmp") as work_dir: 95 + file = tarfile.TarFile(fileobj=tar_content) 96 + file.extractall(path=work_dir, filter="data") 97 98 + full_hash = ( 99 + subprocess.check_output(["nix", "hash", "path", "--sri", work_dir]) 100 + .decode("utf-8") 101 + .strip() 102 + ) 103 + print(f"{ref_name}: hash is {full_hash}") 104 105 + version = query_version(work_dir) 106 + print(f"{ref_name}: version is {version['version']}") 107 108 return { 109 "rev": rev.hexsha, ··· 121 print(f"Selected temporary directory {temp_dir.name}") 122 123 if len(sys.argv) >= 2: 124 + repo = git.Repo(sys.argv[1]) 125 + print(f"Fetching updates on {repo.git_dir}") 126 + repo.remote("origin").fetch() 127 else: 128 print("Cloning source repo") 129 + repo = git.Repo.clone_from( 130 + "https://git.FreeBSD.org/src.git", to_path=temp_dir.name 131 ) 132 133 supported_refs = request_supported_refs() 134 print(f"Supported refs are: {' '.join(supported_refs)}") 135 136 + print(f"git directory {repo.git_dir}") 137 138 try: 139 with open(os.path.join(BASE_DIR, "versions.json"), "r") as f: ··· 186 ) 187 versions[fullname] = result 188 189 with open(os.path.join(BASE_DIR, "versions.json"), "w") as out: 190 json.dump(versions, out, sort_keys=True, indent=2) 191 out.write("\n") 192 193 + 194 + if __name__ == "__main__": 195 main()
+10 -10
pkgs/os-specific/bsd/freebsd/versions.json
··· 1 { 2 "main": { 3 - "hash": "sha256-xsgY5Ex/B5ngOTa5OZRauSaSYvET5lWI7veJRrSq1oY=", 4 "ref": "main", 5 "refType": "branch", 6 - "rev": "c5773d366ecc5271b9bd6e5506c00fb3520f19ae", 7 "supported": false, 8 "version": { 9 "branch": "CURRENT", 10 "major": 15, 11 "minor": 0, 12 - "reldate": "1500035", 13 "release": "15.0-CURRENT", 14 "revision": "15.0", 15 "type": "FreeBSD", ··· 161 } 162 }, 163 "release/14.2.0": { 164 - "hash": "sha256-qZkeuUZbuPOvXZBgP5x6Hii1YN7XdDJzwZeYacIR5BI=", 165 "ref": "release/14.2.0", 166 "refType": "tag", 167 "rev": "c8918d6c7412fce87922e9bd7e4f5c7d7ca96eb7", ··· 308 "ref": "releng/14.1", 309 "refType": "branch", 310 "rev": "f389e68ca980b7e053a34d9eddde89b4c2a1ee6c", 311 - "supported": true, 312 "version": { 313 "branch": "RELEASE-p8", 314 "major": 14, ··· 322 } 323 }, 324 "releng/14.2": { 325 - "hash": "sha256-XP8BFnXvziaC9wOJj8q31UZXFqCUE7WQ5FdJHEZWGbg=", 326 "ref": "releng/14.2", 327 "refType": "branch", 328 "rev": "ac2cbb46b5f1efa7f7b5d4eb15631337329ec5b2", ··· 340 } 341 }, 342 "stable/13": { 343 - "hash": "sha256-J9SJKeR6Den3Sep2o4r0cqIDd2V5gbY0Ow9eP69Ny0o=", 344 "ref": "stable/13", 345 "refType": "branch", 346 - "rev": "a8431b47adae8f8b731206dc38d82b2245ad245e", 347 "supported": true, 348 "version": { 349 "branch": "STABLE", ··· 357 } 358 }, 359 "stable/14": { 360 - "hash": "sha256-tleB6J5Cg1SIN2LCfvV3Cfp4Lxx65UHmiILpin6UYGY=", 361 "ref": "stable/14", 362 "refType": "branch", 363 - "rev": "6e510d8fbaf8d91da235fe28250cd48124edda9f", 364 "supported": true, 365 "version": { 366 "branch": "STABLE",
··· 1 { 2 "main": { 3 + "hash": "sha256-f69U2FX+3GQimdUJunWApFseeKJhzjgNw4h26ZBPiT0=", 4 "ref": "main", 5 "refType": "branch", 6 + "rev": "9357c694e8dca627c25b15529e8435b2ab3dd48b", 7 "supported": false, 8 "version": { 9 "branch": "CURRENT", 10 "major": 15, 11 "minor": 0, 12 + "reldate": "1500036", 13 "release": "15.0-CURRENT", 14 "revision": "15.0", 15 "type": "FreeBSD", ··· 161 } 162 }, 163 "release/14.2.0": { 164 + "hash": "sha256-q5/0pKRlmzZUN+VMwUImkve+NTT1+O68YlwgXp2/aQM=", 165 "ref": "release/14.2.0", 166 "refType": "tag", 167 "rev": "c8918d6c7412fce87922e9bd7e4f5c7d7ca96eb7", ··· 308 "ref": "releng/14.1", 309 "refType": "branch", 310 "rev": "f389e68ca980b7e053a34d9eddde89b4c2a1ee6c", 311 + "supported": false, 312 "version": { 313 "branch": "RELEASE-p8", 314 "major": 14, ··· 322 } 323 }, 324 "releng/14.2": { 325 + "hash": "sha256-iSeTif/cEkqhIQ5hSNF+Rx7dORU13Bc0Dk8Zv4TYWtA=", 326 "ref": "releng/14.2", 327 "refType": "branch", 328 "rev": "ac2cbb46b5f1efa7f7b5d4eb15631337329ec5b2", ··· 340 } 341 }, 342 "stable/13": { 343 + "hash": "sha256-rex3CUXyyNDz/TouNqlzZFo6DAwSOKXTdC5HaRQoKKc=", 344 "ref": "stable/13", 345 "refType": "branch", 346 + "rev": "64f5a71c1cb79c09e50a37ddbe958224bb64add4", 347 "supported": true, 348 "version": { 349 "branch": "STABLE", ··· 357 } 358 }, 359 "stable/14": { 360 + "hash": "sha256-s+pj8LttAnKNNohUsJNOJRFmLg6x06tlkJn3xQnFQiY=", 361 "ref": "stable/14", 362 "refType": "branch", 363 + "rev": "e6a470ffcbd708cf404472bb871c2cb76eaa7b39", 364 "supported": true, 365 "version": { 366 "branch": "STABLE",
+4 -4
pkgs/servers/apache-kafka/default.nix
··· 19 scalaVersion = "2.13"; 20 sha256 = "sha256-e4Uuk4vAneEM2W7KN1UljH0l+4nb3XYwVxdgfhg14qo="; 21 jre = jdk17_headless; 22 - nixosTest = nixosTests.kafka.kafka_4_0; 23 }; 24 "3_9" = { 25 kafkaVersion = "3.9.0"; 26 scalaVersion = "2.13"; 27 sha256 = "sha256-q8REAt3xA+OPGbDktE5l2pqDG6nlj9dyUEGxqhaO6NE="; 28 jre = jdk17_headless; 29 - nixosTest = nixosTests.kafka.kafka_3_9; 30 }; 31 "3_8" = { 32 kafkaVersion = "3.8.1"; 33 scalaVersion = "2.13"; 34 sha256 = "sha256-IhdChtYMqmKyVQbEhpRLxuBNjLLS8VCD0v60gjl3i2I="; 35 jre = jdk17_headless; 36 - nixosTest = nixosTests.kafka.kafka_3_8; 37 }; 38 "3_7" = { 39 kafkaVersion = "3.7.1"; 40 scalaVersion = "2.13"; 41 sha256 = "sha256-YqyuShQ92YPcfrSATVdEugxQsZm1CPWZ7wAQIOJVj8k="; 42 jre = jdk17_headless; 43 - nixosTest = nixosTests.kafka.kafka_3_7; 44 }; 45 }; 46
··· 19 scalaVersion = "2.13"; 20 sha256 = "sha256-e4Uuk4vAneEM2W7KN1UljH0l+4nb3XYwVxdgfhg14qo="; 21 jre = jdk17_headless; 22 + nixosTest = nixosTests.kafka.base.kafka_4_0; 23 }; 24 "3_9" = { 25 kafkaVersion = "3.9.0"; 26 scalaVersion = "2.13"; 27 sha256 = "sha256-q8REAt3xA+OPGbDktE5l2pqDG6nlj9dyUEGxqhaO6NE="; 28 jre = jdk17_headless; 29 + nixosTest = nixosTests.kafka.base.kafka_3_9; 30 }; 31 "3_8" = { 32 kafkaVersion = "3.8.1"; 33 scalaVersion = "2.13"; 34 sha256 = "sha256-IhdChtYMqmKyVQbEhpRLxuBNjLLS8VCD0v60gjl3i2I="; 35 jre = jdk17_headless; 36 + nixosTest = nixosTests.kafka.base.kafka_3_8; 37 }; 38 "3_7" = { 39 kafkaVersion = "3.7.1"; 40 scalaVersion = "2.13"; 41 sha256 = "sha256-YqyuShQ92YPcfrSATVdEugxQsZm1CPWZ7wAQIOJVj8k="; 42 jre = jdk17_headless; 43 + nixosTest = nixosTests.kafka.base.kafka_3_7; 44 }; 45 }; 46
+2 -2
pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix
··· 6 7 stdenv.mkDerivation rec { 8 pname = "advanced-camera-card"; 9 - version = "7.5.1"; 10 11 src = fetchzip { 12 url = "https://github.com/dermotduffy/advanced-camera-card/releases/download/v${version}/advanced-camera-card.zip"; 13 - hash = "sha256-H1DI9Tn9f2UJy6oJ1O4yYfi0Zof53thIOmho6Wy9fFA="; 14 }; 15 16 # TODO: build from source once yarn berry support lands in nixpkgs
··· 6 7 stdenv.mkDerivation rec { 8 pname = "advanced-camera-card"; 9 + version = "7.6.1"; 10 11 src = fetchzip { 12 url = "https://github.com/dermotduffy/advanced-camera-card/releases/download/v${version}/advanced-camera-card.zip"; 13 + hash = "sha256-CfS3KdoFiGBWrhJZw5BCCAolXn1n6nuO3OAJL5U2UBY="; 14 }; 15 16 # TODO: build from source once yarn berry support lands in nixpkgs
-54
pkgs/tools/networking/wireguard-go/default.nix
··· 1 - { 2 - lib, 3 - buildGoModule, 4 - fetchzip, 5 - testers, 6 - wireguard-go, 7 - }: 8 - 9 - buildGoModule rec { 10 - pname = "wireguard-go"; 11 - version = "0.0.20230223"; 12 - 13 - src = fetchzip { 14 - url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz"; 15 - sha256 = "sha256-ZVWbZwSpxQvxwySS3cfzdRReFtHWk6LT2AuIe10hyz0="; 16 - }; 17 - 18 - postPatch = '' 19 - # Skip formatting tests 20 - rm -f format_test.go 21 - ''; 22 - 23 - vendorHash = "sha256-i6ncA71R0hi1SzqCLphhtF3yRAHDmOdYJQ6pf3UDBg8="; 24 - 25 - subPackages = [ "." ]; 26 - 27 - ldflags = [ 28 - "-s" 29 - "-w" 30 - ]; 31 - 32 - postInstall = '' 33 - mv $out/bin/wireguard $out/bin/wireguard-go 34 - ''; 35 - 36 - passthru.tests.version = testers.testVersion { 37 - package = wireguard-go; 38 - version = "v${version}"; 39 - }; 40 - 41 - meta = with lib; { 42 - description = "Userspace Go implementation of WireGuard"; 43 - homepage = "https://git.zx2c4.com/wireguard-go/about/"; 44 - license = licenses.mit; 45 - maintainers = with maintainers; [ 46 - kirelagin 47 - zx2c4 48 - ]; 49 - mainProgram = "wireguard-go"; 50 - # Doesn't build with Go toolchain >1.22, build error: 51 - # 'link: golang.org/x/net/internal/socket: invalid reference to syscall.recvmsg'. 52 - broken = true; 53 - }; 54 - }
···
-2
pkgs/top-level/all-packages.nix
··· 5668 inherit (darwin.apple_sdk.frameworks) Foundation IOBluetooth; 5669 }; 5670 5671 - wireguard-go = callPackage ../tools/networking/wireguard-go { }; 5672 - 5673 wring = nodePackages.wring; 5674 5675 wyrd = callPackage ../tools/misc/wyrd {
··· 5668 inherit (darwin.apple_sdk.frameworks) Foundation IOBluetooth; 5669 }; 5670 5671 wring = nodePackages.wring; 5672 5673 wyrd = callPackage ../tools/misc/wyrd {