Merge master into staging-next

This commit is contained in:
github-actions[bot]
2023-05-26 12:01:27 +00:00
committed by GitHub
82 changed files with 2428 additions and 1253 deletions
+2
View File
@@ -27,6 +27,8 @@ import ./make-test-python.nix (
};
};
testScript = ''
import os
start_all()
# Create a fake cache with Nginx service the static files
+4 -23
View File
@@ -1,8 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, pcre
, pcre2
, uthash
, lua5_4
, makeWrapper
@@ -11,29 +10,15 @@
stdenv.mkDerivation rec {
pname = "mle";
version = "1.5.0";
version = "1.7.2";
src = fetchFromGitHub {
owner = "adsr";
repo = "mle";
rev = "v${version}";
sha256 = "1nhd00lsx9v12zdmps92magz76c2d8zzln3lxvzl4ng73gbvq3n0";
sha256 = "0rkk7mh6w5y1lrbdv7wmxdgl5cqzpzw0p26adazkqlfdyb6wbj9k";
};
# Bug fixes found after v1.5.0 release
patches = [
(fetchpatch {
name = "skip_locale_dep_test.patch";
url = "https://github.com/adsr/mle/commit/e4dc4314b02a324701d9ae9873461d34cce041e5.patch";
sha256 = "sha256-j3Z/n+2LqB9vEkWzvRVSOrF6yE+hk6f0dvEsTQ74erw=";
})
(fetchpatch {
name = "fix_input_trail.patch";
url = "https://github.com/adsr/mle/commit/bc05ec0eee4143d824010c6688fce526550ed508.patch";
sha256 = "sha256-dM63EBDQfHLAqGZk3C5NtNAv23nCTxXVW8XpLkAeEyQ=";
})
];
# Fix location of Lua 5.4 header and library
postPatch = ''
substituteInPlace Makefile --replace "-llua5.4" "-llua";
@@ -41,13 +26,9 @@ stdenv.mkDerivation rec {
patchShebangs tests/*
'';
# Use select(2) instead of poll(2) (poll is returning POLLINVAL on macOS)
# Enable compiler optimization
CFLAGS = "-DTB_OPT_SELECT -O2";
nativeBuildInputs = [ makeWrapper installShellFiles ];
buildInputs = [ pcre uthash lua5_4 ];
buildInputs = [ pcre2 uthash lua5_4 ];
doCheck = true;
@@ -757,8 +757,8 @@ let
mktplcRef = {
name = "vscode-markdownlint";
publisher = "DavidAnson";
version = "0.49.0";
sha256 = "sha256-Mh/OoRK410aXEr3sK2CYFDsXGSqFT+JOWi9jHOdK01Y=";
version = "0.50.0";
sha256 = "sha256-F+lryIhSudDz68t1eGrfqI8EuoUUOWU5LfWj0IRCQyY=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/DavidAnson.vscode-markdownlint/changelog";
@@ -1069,8 +1069,8 @@ let
mktplcRef = {
name = "elixir-ls";
publisher = "JakeBecker";
version = "0.13.0";
sha256 = "sha256-1uaLFTMvkcYrYAt9qDdISJneKxHo9qsris70iowGW2s=";
version = "0.14.7";
sha256 = "sha256-RkwgQqasBKMA+0293QhbZhgyGSqhJSic5DuIpBB+OEA=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog";
@@ -104,6 +104,11 @@ let
# Override the previously determined VSCODE_PATH with the one we know to be correct
sed -i "/ELECTRON=/iVSCODE_PATH='$out/lib/vscode'" "$out/bin/${executableName}"
grep -q "VSCODE_PATH='$out/lib/vscode'" "$out/bin/${executableName}" # check if sed succeeded
# Remove native encryption code, as it derives the key from the executable path which does not work for us.
# The credentials should be stored in a secure keychain already, so the benefit of this is questionable
# in the first place.
rm -rf $out/lib/vscode/resources/app/node_modules/vscode-encrypt
'') + ''
runHook postInstall
'';
+3 -3
View File
@@ -17,16 +17,16 @@
buildGoModule rec {
pname = "clipqr";
version = "1.0.0";
version = "1.0.1";
src = fetchFromGitLab {
owner = "imatt-foss";
repo = "clipqr";
rev = "v${version}";
sha256 = "sha256-E90nTJtx4GOacu8M7oQBznnSQVDIZatibgKMZEpTUaQ=";
hash = "sha256-RIzOkJx1eSik+3N6rSh+3LY2VZmbzNYyV5wpLQHFU2A=";
};
vendorSha256 = "5kAOSyVbvot4TX/XfRNe1/zZk6fa7pS1Dvn9nz11u3U=";
vendorHash = null;
ldflags = [ "-s" "-w" ];
+2 -2
View File
@@ -10,7 +10,7 @@
, fmt
, hidrd
, inih
, microsoft_gsl
, microsoft-gsl
, spdlog
, systemd
}:
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
fmt
hidrd
inih
microsoft_gsl
microsoft-gsl
spdlog
systemd
];
+1 -1
View File
@@ -37,7 +37,7 @@ python3.pkgs.buildPythonApplication rec {
icalendar
lxml
pkginfo
pkgs.vdirsyncer
vdirsyncer
python-dateutil
pytz
pyxdg
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "klipper-estimator";
version = "3.3.0";
version = "3.4.0";
src = fetchFromGitHub {
owner = "Annex-Engineering";
repo = "klipper_estimator";
rev = "v${version}";
hash = "sha256-bWKR7+eX7tcc9KywKIg6CY+3qALPqOSSiSSlK44iTDQ=";
hash = "sha256-h3mXdkUIc8OycvBbS5LhxsoIsO/GTXf3XkxbSpwfPHw=";
};
cargoHash = "sha256-cPdFRBU8B4C2el9N069QooiJdpopns8RJEyavemYdUc=";
cargoHash = "sha256-e9IMkrvlkiVxwRToKGLzzBW4JZNsaOpucoHQiusehdY=";
buildInputs =
[ openssl ]
@@ -7,20 +7,20 @@
buildGoModule rec {
pname = "arkade";
version = "0.9.16";
version = "0.9.17";
src = fetchFromGitHub {
owner = "alexellis";
repo = "arkade";
rev = version;
sha256 = "sha256-HbwajFTCjiNtAMawI7uBZhIBGyVHUQQjsOrtuxuYmeM=";
sha256 = "sha256-SwiRw/JtY1BnosHrSMy7VkhH71sX+mq0vI5UlLwSL1I=";
};
CGO_ENABLED = 0;
nativeBuildInputs = [ installShellFiles ];
vendorHash = "sha256-/NJ5Y0uN9gAeYvuPWFSFuL83vOS9S8WJeCSZUkOLFMU=";
vendorHash = "sha256-ftImsWmHicwL6xyV1WYcWIeJuJ76/GbeJ6dIvDiW2xc=";
# Exclude pkg/get: tests downloading of binaries which fail when sandbox=true
subPackages = [
@@ -37,8 +37,8 @@ buildGoModule rec {
ldflags = [
"-s" "-w"
"-X github.com/alexellis/arkade/cmd.GitCommit=ref/tags/${version}"
"-X github.com/alexellis/arkade/cmd.Version=${version}"
"-X github.com/alexellis/arkade/pkg.GitCommit=ref/tags/${version}"
"-X github.com/alexellis/arkade/pkg.Version=${version}"
];
postInstall = ''
@@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
buildGoModule rec {
pname = "pv-migrate";
@@ -23,11 +23,22 @@ buildGoModule rec {
"-X main.date=1970-01-01-00:00:01"
];
nativeBuildInputs = [
installShellFiles
];
postInstall = ''
installShellCompletion --cmd pv-migrate \
--bash <($out/bin/pv-migrate completion bash) \
--fish <($out/bin/pv-migrate completion fish) \
--zsh <($out/bin/pv-migrate completion zsh)
'';
meta = with lib; {
description = "CLI tool to easily migrate Kubernetes persistent volumes ";
homepage = "https://github.com/utkuozdemir/pv-migrate";
changelog = "https://github.com/utkuozdemir/pv-migrate/releases/tag/${version}";
license = licenses.afl20;
maintainers = [ maintainers.ivankovnatsky ];
maintainers = with lib.maintainers; [ ivankovnatsky qjoly ];
};
}
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "terragrunt";
version = "0.45.13";
version = "0.45.16";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-cdf7Bon7cELXAgxnSUyhmSSNxigqEoMCpiWK08kU89s=";
hash = "sha256-q12MXqYf4yXC1ifXCuHE75Eb553TWbohDB2GusRpNIM=";
};
vendorHash = "sha256-5Umoqi2D6iUk2Ut7YB/nmkOyA6Rx2qFhy/ZbfqoX5qA=";
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "zarf";
version = "0.26.4";
version = "0.27.0";
src = fetchFromGitHub {
owner = "defenseunicorns";
repo = "zarf";
rev = "v${version}";
hash = "sha256-uY29LfjflV25/mE6BplV6I+scoD1f0lJ4rnWfTF7Vd0=";
hash = "sha256-AHS9V0vPTA1ltBo6TynZfWjg5eCY1tB7wn4z8WG2EtQ=";
};
vendorHash = "sha256-27OeyGvUHGvkaPNVvr8UH0SRUQdCx4uM2JziOsjo9bE=";
vendorHash = "sha256-6hd1OEmEQ6bYdYa1UCSXfNDFM1aAiBF6tvPmAMulRyc=";
proxyVendor = true;
preBuild = ''
@@ -2,13 +2,13 @@
(if stdenv.isDarwin then darwin.apple_sdk_11_0.clang14Stdenv else stdenv).mkDerivation rec {
pname = "signalbackup-tools";
version = "20230518";
version = "20230523";
src = fetchFromGitHub {
owner = "bepaald";
repo = pname;
rev = version;
hash = "sha256-wtCCQtYYYR+aFpNLS/pABEyYrTEW0W0Fh4kDClJn0dg=";
hash = "sha256-u0UztFdEevFVNRtRvyaeDX4vMyrGuzTMd3/nzRUqjV0=";
};
postPatch = ''
@@ -29,7 +29,7 @@
, jemalloc
, rnnoise
, abseil-cpp
, microsoft_gsl
, microsoft-gsl
, wayland
, libicns
, Cocoa
@@ -140,7 +140,7 @@ stdenv.mkDerivation rec {
tl-expected
rnnoise
tg_owt
microsoft_gsl
microsoft-gsl
] ++ lib.optionals stdenv.isLinux [
kwayland
alsa-lib
@@ -199,7 +199,7 @@ stdenv.mkDerivation rec {
preFixup = ''
binName=${if stdenv.isLinux then "kotatogram-desktop" else "Kotatogram"}
remove-references-to -t ${stdenv.cc.cc} $out/bin/$binName
remove-references-to -t ${microsoft_gsl} $out/bin/$binName
remove-references-to -t ${microsoft-gsl} $out/bin/$binName
remove-references-to -t ${tg_owt.dev} $out/bin/$binName
'';
@@ -52,7 +52,7 @@
, libsysprof-capture
, libpsl
, brotli
, microsoft_gsl
, microsoft-gsl
, rlottie
, stdenv
}:
@@ -161,7 +161,7 @@ stdenv.mkDerivation rec {
libsysprof-capture
libpsl
brotli
microsoft_gsl
microsoft-gsl
rlottie
];
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "seaweedfs";
version = "3.50";
version = "3.51";
src = fetchFromGitHub {
owner = "seaweedfs";
repo = "seaweedfs";
rev = "9204ee2d2dfd421753dad9fcc80c2b5ce3ea5326";
hash = "sha256-ahCe2tutRhhbGQyytgR+0i+Tdh/2mU6L8e7G9DNIII4=";
rev = version;
hash = "sha256-+5eni4i3LoPE0+Qzw4f6I//y5MzGxgj3NrT7YtYs/Fw=";
};
vendorHash = "sha256-JkKJ0WFtaKSoBukE0XhN6dhE9+5Ny1kSIoh0GpALAKk=";
vendorHash = "sha256-LeWI5wbq06sBhAf5gqK8Zr8nmB9W1tDUUqF1HeZa1SM=";
subPackages = [ "weed" ];
@@ -2,6 +2,7 @@
, stdenv
, fetchFromGitHub
, buildPythonApplication
, fetchpatch
, pyside6
, twisted
, certifi
@@ -23,6 +24,14 @@ buildPythonApplication rec {
sha256 = "sha256-Te81yOv3D6M6aMfC5XrM6/I6BlMdlY1yRk1RRJa9Mxg=";
};
patches = [
(fetchpatch {
name = "fix-typeerror.patch";
url = "https://github.com/Syncplay/syncplay/commit/b62b038cdf58c54205987dfc52ebf228505ad03b.patch";
hash = "sha256-pSP33Qn1I+nJBW8T1E1tSJKRh5OnZMRsbU+jr5z4u7c=";
})
];
buildInputs = lib.optionals enableGUI [ (if stdenv.isLinux then qt6.qtwayland else qt6.qtbase) ];
propagatedBuildInputs = [ twisted certifi ]
++ twisted.optional-dependencies.tls
+4 -5
View File
@@ -24,11 +24,11 @@
, libbladeRF
, mbelib
, ninja
, ocl-icd
, opencv3
, pkg-config
, qtcharts
, qtdeclarative
, qtgamepad
, qtgraphicaleffects
, qtlocation
, qtmultimedia
@@ -50,13 +50,13 @@
stdenv.mkDerivation rec {
pname = "sdrangel";
version = "7.13.0";
version = "7.14.1";
src = fetchFromGitHub {
owner = "f4exb";
repo = "sdrangel";
rev = "v${version}";
hash = "sha256-xG41FNlMfqH5MaGVFFENP0UFEkZYiWhtpNSPh2s4Irk=";
hash = "sha256-AsKjsoIyGjGpRGA+pYQsO4x2C5Rb7xaG+Q0cS3xANcM=";
};
nativeBuildInputs = [ cmake ninja pkg-config wrapQtAppsHook ];
@@ -86,6 +86,7 @@ stdenv.mkDerivation rec {
opencv3
qtcharts
qtdeclarative
qtgamepad
qtgraphicaleffects
qtlocation
qtmultimedia
@@ -112,8 +113,6 @@ stdenv.mkDerivation rec {
"-Wno-dev"
];
LD_LIBRARY_PATH = "${ocl-icd}/lib";
meta = with lib; {
description = "Software defined radio (SDR) software";
longDescription = ''
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "blast";
version = "2.13.0";
version = "2.14.0";
src = fetchurl {
url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-src.tar.gz";
sha256 = "sha256-iVU3FNEz2vKMR3+D0zN5Szxi5BSECMByobRiDl7E/rI=";
sha256 = "sha256-v0d/Gww7gvC3pwlL8AOpqD4347BxbB33mQYMT+qxdQA=";
};
sourceRoot = "ncbi-blast-${version}+-src/c++";
@@ -1,34 +1,29 @@
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, gettext, libtool, automake, autoconf, cairo, gtk2-x11, autoreconfHook }:
{ lib, stdenv, fetchFromGitHub, pkg-config, gettext, libtool, automake, autoconf, cairo, gtk2-x11, autoreconfHook }:
stdenv.mkDerivation rec {
pname = "gerbv";
version = "2.7.0";
version = "2.9.6";
src = fetchurl {
url = "mirror://sourceforge/gerbv/${pname}-${version}.tar.gz";
sha256 = "sha256-xe6AjEIwzmvjrRCrY8VHCYOG1DAicE3iXduTeOYgU7Q=";
src = fetchFromGitHub {
owner = "gerbv";
repo = pname;
rev = "v${version}";
hash = "sha256-HNhrnXOBlzfO/roWzTsg0RcJPb0c7RuJepankB5zNts=";
};
patches = [
# Pull patch pending upstream inclusion for -fno-common toolchains:
# https://sourceforge.net/p/gerbv/patches/84/
(fetchpatch {
name = "fnoc-mmon.patch";
url = "https://sourceforge.net/p/gerbv/patches/84/attachment/0001-gerbv-fix-build-on-gcc-10-fno-common.patch";
sha256 = "1avfbkqhxl7wxn1z19y30ilkwvdgpdkzhzawrs5y3damxmqq8ggk";
})
];
postPatch = ''
sed -i '/AC_INIT/s/m4_esyscmd.*/${version}])/' configure.ac
'';
nativeBuildInputs = [ autoreconfHook pkg-config automake autoconf ];
buildInputs = [ gettext libtool cairo gtk2-x11 ];
configureFlags = ["--disable-update-desktop-database"];
env.NIX_CFLAGS_COMPILE = "-Wno-format-security";
meta = with lib; {
description = "A Gerber (RS-274X) viewer";
homepage = "http://gerbv.geda-project.org/";
homepage = "https://gerbv.github.io/";
changelog = "https://github.com/gerbv/gerbv/releases/tag/v${version}";
maintainers = with maintainers; [ mog ];
platforms = platforms.unix;
license = licenses.gpl2;
@@ -11,7 +11,7 @@
, boost
, catch2
, fmt
, microsoft_gsl
, microsoft-gsl
, range-v3
, yaml-cpp
, ncurses
@@ -62,7 +62,7 @@ mkDerivation rec {
boost
catch2
fmt
microsoft_gsl
microsoft-gsl
range-v3
yaml-cpp
] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.libs.utmp ];
@@ -1,14 +1,14 @@
{
"version": "15.11.5",
"repo_hash": "sha256-t0MpfRyKfdO/Z90SogurKOCKv9xunyQasftNZ2o1GAE=",
"version": "15.11.6",
"repo_hash": "sha256-qpYVYzxtMgWLXhMn+0TvDqRJOnerfc9OEU1Gs6Ys/Bc=",
"yarn_hash": "02ipm7agjy3c75df76c00k3qq5gpw3d876f6x91xnwizswsv9agb",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v15.11.5-ee",
"rev": "v15.11.6-ee",
"passthru": {
"GITALY_SERVER_VERSION": "15.11.5",
"GITLAB_PAGES_VERSION": "15.11.5",
"GITALY_SERVER_VERSION": "15.11.6",
"GITLAB_PAGES_VERSION": "15.11.6",
"GITLAB_SHELL_VERSION": "14.18.0",
"GITLAB_WORKHORSE_VERSION": "15.11.5"
"GITLAB_WORKHORSE_VERSION": "15.11.6"
}
}
@@ -11,7 +11,7 @@ let
gemdir = ./.;
};
version = "15.11.5";
version = "15.11.6";
package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@@ -22,7 +22,7 @@ let
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "sha256-ITyA9QqaCq6w9UToTWzyq77Sfg+dqaWrL45d5yqmzm4=";
sha256 = "sha256-n56Jqgu64+pN4bcH/Sh8/+4StpTEY529a4yVozqtK5Y=";
};
vendorSha256 = "sha256-gJelagGPogeCdJtRpj4RaYlqzZRhtU0EIhmj1aK4ZOk=";
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gitlab-pages";
version = "15.11.5";
version = "15.11.6";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-pages";
rev = "v${version}";
sha256 = "sha256-4B6n/HQ1R5QYHjVDf18WKH0ZkNip8k0OASoTXuci+/Y=";
sha256 = "sha256-Dl/NCsZCi5S9BKjtQzRg3mj8lzvIa4FMCqprLKXKlHw=";
};
vendorHash = "sha256-s3HHoz9URACuVVhePQQFviTqlQU7vCLOjTJPBlus1Vo=";
@@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "15.11.5";
version = "15.11.6";
src = fetchFromGitLab {
owner = data.owner;
@@ -250,21 +250,19 @@ def update_gitlab_pages():
def get_container_registry_version() -> str:
"""Returns the version attribute of gitlab-container-registry"""
return str(
subprocess.check_output(
[
"nix",
"--experimental-features",
"nix-command",
"eval",
"-f",
".",
"--raw",
"gitlab-container-registry.version",
],
cwd=NIXPKGS_PATH,
)
)
return subprocess.check_output(
[
"nix",
"--experimental-features",
"nix-command",
"eval",
"-f",
".",
"--raw",
"gitlab-container-registry.version",
],
cwd=NIXPKGS_PATH,
).decode("utf-8")
@cli.command("update-gitlab-shell")
@@ -287,16 +285,25 @@ def update_gitlab_workhorse():
@cli.command("update-gitlab-container-registry")
@click.option("--rev", default="latest", help="The rev to use (vX.Y.Z-ee), or 'latest'")
def update_gitlab_container_registry(rev: str):
@click.option(
"--commit", is_flag=True, default=False, help="Commit the changes for you"
)
def update_gitlab_container_registry(rev: str, commit: bool):
"""Update gitlab-container-registry"""
logger.info("Updading gitlab-container-registry")
repo = GitLabRepo(repo="container-registry")
old_container_registry_version = get_container_registry_version()
if rev == "latest":
rev = next(filter(lambda x: not ("rc" in x or x.endswith("pre")), repo.tags))
version = repo.rev2version(rev)
_call_nix_update("gitlab-container-registry", version)
if commit:
new_container_registry_version = get_container_registry_version()
commit_container_registry(
old_container_registry_version, new_container_registry_version
)
@cli.command("update-all")
+2 -2
View File
@@ -15,12 +15,12 @@
ocamlPackages.buildDunePackage rec {
pname = "ligo";
version = "0.65.0";
version = "0.66.0";
src = fetchFromGitLab {
owner = "ligolang";
repo = "ligo";
rev = version;
sha256 = "sha256-vBvgagXK9lOXRI+iBwkPKmUvncZjrqHpKI3UAqOzHvc=";
sha256 = "sha256-BFeNnpMT+WKqTvjVg+H2qHl5EUMcbe7xmJohbpD99gY=";
fetchSubmodules = true;
};
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, libbsd, microsoft_gsl }:
{ lib, stdenv, fetchurl, pkg-config, libbsd, microsoft-gsl }:
stdenv.mkDerivation rec {
pname = "iqueue";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
doCheck = true;
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libbsd microsoft_gsl ];
buildInputs = [ libbsd microsoft-gsl ];
env.NIX_CFLAGS_COMPILE = toString [
# Needed with GCC 12
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "log4cpp";
version = "1.1.3";
version = "1.1.4";
src = fetchurl {
url = "mirror://sourceforge/log4cpp/${pname}-${version}.tar.gz";
sha256 = "07gmr3jyaf2239n9sp6h7hwdz1pv7b7aka8n06gmr2fnlmaymfrc";
sha256 = "sha256-aWETZZ5CZUBiUnSoslEFLMBDBtjuXEKgx2OfOcqQydY=";
};
enableParallelBuilding = true;
+1 -1
View File
@@ -1 +1 @@
WGET_ARGS=( https://download.qt.io/official_releases/qt/6.5/6.5.0/submodules/ -A '*.tar.xz' )
WGET_ARGS=( https://download.qt.io/official_releases/qt/6.5/6.5.1/submodules/ -A '*.tar.xz' )
@@ -1,14 +1,16 @@
{ qtModule
, fetchurl
, fetchFromGitHub
, qtbase
}:
qtModule rec {
pname = "qtmqtt";
version = "6.5.0";
src = fetchurl {
url = "https://github.com/qt/qtmqtt/archive/refs/tags/v${version}.tar.gz";
sha256 = "qv3GYApd4QKk/Oubx48VhG/Dbl/rvq5ua0UinPlDDNY=";
version = "6.5.1";
src = fetchFromGitHub {
owner = "qt";
repo = "qtmqtt";
rev = "v${version}";
hash = "sha256-tXCLb4ZWgdPSfnlGKsKNW9kJ57cm8+d8y416O42NZvk=";
};
qtInputs = [ qtbase ];
}
+153 -153
View File
@@ -1,310 +1,310 @@
# DO NOT EDIT! This file is generated automatically.
# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-6
# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-6/
{ fetchurl, mirror }:
{
qt3d = {
version = "6.5.0";
version = "6.5.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.0/submodules/qt3d-everywhere-src-6.5.0.tar.xz";
sha256 = "05h84cdsicdg71sx4v9s8vx98i2xh2n7n02wxkxivwj468151ci0";
name = "qt3d-everywhere-src-6.5.0.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qt3d-everywhere-src-6.5.1.tar.xz";
sha256 = "16v875hv58f1cnb76c8pd63v44fncfdrv29b008bamxs23lf2m3y";
name = "qt3d-everywhere-src-6.5.1.tar.xz";
};
};
qt5compat = {
version = "6.5.0";
version = "6.5.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.0/submodules/qt5compat-everywhere-src-6.5.0.tar.xz";
sha256 = "0q8jq9ccb0as7qhxqgs1q84i7qxz3xx6wbqsn0qy3hiz34xgbqm9";
name = "qt5compat-everywhere-src-6.5.0.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qt5compat-everywhere-src-6.5.1.tar.xz";
sha256 = "10zvah04mnyg5apkwq015kxs03y467naicxy8ljfzazgbwljp6df";
name = "qt5compat-everywhere-src-6.5.1.tar.xz";
};
};
qtactiveqt = {
version = "6.5.0";
version = "6.5.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.0/submodules/qtactiveqt-everywhere-src-6.5.0.tar.xz";
sha256 = "0fwwz2ag4s03kicmgkpvgg3n6glx2ld21b24xqi3ib5av75smc15";
name = "qtactiveqt-everywhere-src-6.5.0.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtactiveqt-everywhere-src-6.5.1.tar.xz";
sha256 = "0yii7ihvzncwqhrb1635my5arr6lymr2d3wnwpcn42b7l6krsk6d";
name = "qtactiveqt-everywhere-src-6.5.1.tar.xz";
};
};
qtbase = {
version = "6.5.0";
version = "6.5.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.0/submodules/qtbase-everywhere-src-6.5.0.tar.xz";
sha256 = "1vzmxak112llvnx9rdgss99i9bc88rzsaxn59wdyqr5y9xxsmqgx";
name = "qtbase-everywhere-src-6.5.0.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtbase-everywhere-src-6.5.1.tar.xz";
sha256 = "1vdzxrcfhn6ym7p8jzr3xxx1r4r435fx461lwfgii8838cgzlmnv";
name = "qtbase-everywhere-src-6.5.1.tar.xz";
};
};
qtcharts = {
version = "6.5.0";
version = "6.5.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.0/submodules/qtcharts-everywhere-src-6.5.0.tar.xz";
sha256 = "1a165qz40yc50wdzk9sz0va6nc92y280x3k6yw8y0vgmlx81vkgw";
name = "qtcharts-everywhere-src-6.5.0.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtcharts-everywhere-src-6.5.1.tar.xz";
sha256 = "0xfgj970ip0fn2gxrsilg1gvq4w2849vs6gysn0qhnz7qw7m0nxi";
name = "qtcharts-everywhere-src-6.5.1.tar.xz";
};
};
qtconnectivity = {
version = "6.5.0";
version = "6.5.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.0/submodules/qtconnectivity-everywhere-src-6.5.0.tar.xz";
sha256 = "01lgd6bv23zgj0c788h4ii192mf8cvcm2d5jfwd3d1mrp99ncqz7";
name = "qtconnectivity-everywhere-src-6.5.0.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtconnectivity-everywhere-src-6.5.1.tar.xz";
sha256 = "0yl2i4qdmvdzspnr0jpf031gd2cndkx4hppy5sdjppy4g2dlrmrg";
name = "qtconnectivity-everywhere-src-6.5.1.tar.xz";
};
};
qtdatavis3d = {
version = "6.5.0";
version = "6.5.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.0/submodules/qtdatavis3d-everywhere-src-6.5.0.tar.xz";
sha256 = "0sw1m61md30n06whl7s1d8ylr24pxjqs4q66a617vbp72xvw32nl";
name = "qtdatavis3d-everywhere-src-6.5.0.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtdatavis3d-everywhere-src-6.5.1.tar.xz";
sha256 = "0cx3bmbwg0y99495zp1gafs4bfn75dbf6r6dfgy1ii9i66y2lcsj";
name = "qtdatavis3d-everywhere-src-6.5.1.tar.xz";
};
};
qtdeclarative = {
version = "6.5.0";
version = "6.5.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.0/submodules/qtdeclarative-everywhere-src-6.5.0.tar.xz";
sha256 = "15wcb2zq4sl1aw8yc1np9bp2p0df4r9in3zks3d9255wiv6k3mpp";
name = "qtdeclarative-everywhere-src-6.5.0.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtdeclarative-everywhere-src-6.5.1.tar.xz";
sha256 = "0yff5nbcspl3w3231wvgvac38q0lskxx1l2wm1lx2raac7wlh490";
name = "qtdeclarative-everywhere-src-6.5.1.tar.xz";
};
};
qtdoc = {
version = "6.5.0";
version = "6.5.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.0/submodules/qtdoc-everywhere-src-6.5.0.tar.xz";
sha256 = "1fblc7yr2gxmwi325lv3pwfkbbdrk2i4564y4fwdahl58xncwqi6";
name = "qtdoc-everywhere-src-6.5.0.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtdoc-everywhere-src-6.5.1.tar.xz";
sha256 = "0c9ckm7rcp3vi7qipzqyqpar2f5l426s8vgdz71q1ccx432a0kj1";
name = "qtdoc-everywhere-src-6.5.1.tar.xz";
};
};
qtgrpc = {
version = "6.5.0";
version = "6.5.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.0/submodules/qtgrpc-everywhere-src-6.5.0.tar.xz";
sha256 = "1wrgrr58lyg3g8dc5a3qbl7p0ym6k6g9zkly0kwz6pbbihv4p7sq";
name = "qtgrpc-everywhere-src-6.5.0.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtgrpc-everywhere-src-6.5.1.tar.xz";
sha256 = "1r27m7c1ab1gk2hzi4d9mpvk1kc5zypx6d6q9wa7kv26d4d2vgls";
name = "qtgrpc-everywhere-src-6.5.1.tar.xz";
};
};
qthttpserver = {
version = "6.5.0";
version = "6.5.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.0/submodules/qthttpserver-everywhere-src-6.5.0.tar.xz";
sha256 = "0mnmaz333prww2b5vxjix4zlm1pgi2snavpqbg4swprvh93pc3b7";
name = "qthttpserver-everywhere-src-6.5.0.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qthttpserver-everywhere-src-6.5.1.tar.xz";
sha256 = "0z7wrvfln7mr7n1i1pijx36c6wi66dm91mdir5f8gqk15i84zpj7";
name = "qthttpserver-everywhere-src-6.5.1.tar.xz";
};
};
qtimageformats = {
version = "6.5.0";
version = "6.5.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.0/submodules/qtimageformats-everywhere-src-6.5.0.tar.xz";
sha256 = "0y3g0i11nfrg1h1d7jnnckky6hnfrx7z6cysq0r03rn77b6i1y7r";
name = "qtimageformats-everywhere-src-6.5.0.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtimageformats-everywhere-src-6.5.1.tar.xz";
sha256 = "1daxijk9mb2gb65pxjdqw4r5vjs3vi20d4lixq6mh0xdk717yzw9";
name = "qtimageformats-everywhere-src-6.5.1.tar.xz";
};
};
qtlanguageserver = {
version = "6.5.0";
version = "6.5.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.0/submodules/qtlanguageserver-everywhere-src-6.5.0.tar.xz";
sha256 = "078siwgsb1ypiim869jdkkmp32g715kkc76fj6764id3yg9d7j4d";
name = "qtlanguageserver-everywhere-src-6.5.0.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtlanguageserver-everywhere-src-6.5.1.tar.xz";
sha256 = "1j9bhd4k30ana08nppqqll6v5nxr9dzxqxsh12i2cihjr9mcr9lr";
name = "qtlanguageserver-everywhere-src-6.5.1.tar.xz";
};
};
qtlocation = {
version = "6.5.0";
version = "6.5.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.0/submodules/qtlocation-everywhere-src-6.5.0.tar.xz";
sha256 = "036351d5yb35fma1wpvh6zcrbcsfg97ks6hy67vlbbsq958aggqf";
name = "qtlocation-everywhere-src-6.5.0.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtlocation-everywhere-src-6.5.1.tar.xz";
sha256 = "1x0j6r0gll469aq75viyyyw1gfl180rcyq0h83z35664jzx1i2mn";
name = "qtlocation-everywhere-src-6.5.1.tar.xz";
};
};
qtlottie = {
version = "6.5.0";
version = "6.5.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.0/submodules/qtlottie-everywhere-src-6.5.0.tar.xz";
sha256 = "0ip2nx169pvrxrpw1viivh20sq96c29z7njvk18nqsi8p7gfq9c4";
name = "qtlottie-everywhere-src-6.5.0.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtlottie-everywhere-src-6.5.1.tar.xz";
sha256 = "10bbq952iv3f2v42nqirld0qy363g03zdq6hlh1lfcbmgc8gif0h";
name = "qtlottie-everywhere-src-6.5.1.tar.xz";
};
};
qtmultimedia = {
version = "6.5.0";
version = "6.5.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.0/submodules/qtmultimedia-everywhere-src-6.5.0.tar.xz";
sha256 = "0im1visfb2r88pcrx7sb80znl17cij9l1qwr93n1ml5x7b3x104l";
name = "qtmultimedia-everywhere-src-6.5.0.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtmultimedia-everywhere-src-6.5.1.tar.xz";
sha256 = "1k71chjdh66yv13li38ig507wpsr7cn87nqkvcfxmkf8w5hca7qb";
name = "qtmultimedia-everywhere-src-6.5.1.tar.xz";
};
};
qtnetworkauth = {
version = "6.5.0";
version = "6.5.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.0/submodules/qtnetworkauth-everywhere-src-6.5.0.tar.xz";
sha256 = "0gj14j50d50fl0rjwilss4nakvxwldbg3iz5kdnbwvhkn8m55k6v";
name = "qtnetworkauth-everywhere-src-6.5.0.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtnetworkauth-everywhere-src-6.5.1.tar.xz";
sha256 = "18viv41qazcbix9l21g5vz1r6zp6mxnbl2c2j3ip1yln7rmbac57";
name = "qtnetworkauth-everywhere-src-6.5.1.tar.xz";
};
};
qtpositioning = {
version = "6.5.0";
version = "6.5.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.0/submodules/qtpositioning-everywhere-src-6.5.0.tar.xz";
sha256 = "11n86llfixrgqw7yqxr1fcspq0khmyiwiwmibacbmlnrpwg159qd";
name = "qtpositioning-everywhere-src-6.5.0.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtpositioning-everywhere-src-6.5.1.tar.xz";
sha256 = "08m41rx1yd28dr53pfrdfvgkmnszqyax88jhqczcb048w50gjg05";
name = "qtpositioning-everywhere-src-6.5.1.tar.xz";
};
};
qtquick3d = {
version = "6.5.0";
version = "6.5.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.0/submodules/qtquick3d-everywhere-src-6.5.0.tar.xz";
sha256 = "19bj6xzw63rwbzlj7lb0hbni37syfyiyzwjdxj6crdcqr8lh8ncv";
name = "qtquick3d-everywhere-src-6.5.0.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtquick3d-everywhere-src-6.5.1.tar.xz";
sha256 = "07ncn3gl3yvdq8ly3rn7693lzq0slghmw9ljq119s4bbsnk2ddji";
name = "qtquick3d-everywhere-src-6.5.1.tar.xz";
};
};
qtquick3dphysics = {
version = "6.5.0";
version = "6.5.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.0/submodules/qtquick3dphysics-everywhere-src-6.5.0.tar.xz";
sha256 = "04f0k2z3sqpbkjn74ral0q5s2hkkzijnr5ay9f91c6lg4ciaki81";
name = "qtquick3dphysics-everywhere-src-6.5.0.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtquick3dphysics-everywhere-src-6.5.1.tar.xz";
sha256 = "1j0kfqdwx8x7bagw8qjkywsd2fzih2yp36vza2hil56m35s8ibcl";
name = "qtquick3dphysics-everywhere-src-6.5.1.tar.xz";
};
};
qtquickeffectmaker = {
version = "6.5.0";
version = "6.5.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.0/submodules/qtquickeffectmaker-everywhere-src-6.5.0.tar.xz";
sha256 = "1mwwn8psmq0lbv1ggc4g42ns93ygg6yqd555aq7qkxyhr9rcccjb";
name = "qtquickeffectmaker-everywhere-src-6.5.0.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtquickeffectmaker-everywhere-src-6.5.1.tar.xz";
sha256 = "18lhvf9mlprmg0jba9biciscns12zvwr5jj81kkvv0mv8h3yrg2i";
name = "qtquickeffectmaker-everywhere-src-6.5.1.tar.xz";
};
};
qtquicktimeline = {
version = "6.5.0";
version = "6.5.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.0/submodules/qtquicktimeline-everywhere-src-6.5.0.tar.xz";
sha256 = "1gygaxb9p6d23q5nxmhjlmazzx4i3vkhvjsi9v6l7d32js93x2sp";
name = "qtquicktimeline-everywhere-src-6.5.0.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtquicktimeline-everywhere-src-6.5.1.tar.xz";
sha256 = "0lfm997p5x5nn4zlz2p1djd3757b0m00347xkfy9n6y5fsidny8h";
name = "qtquicktimeline-everywhere-src-6.5.1.tar.xz";
};
};
qtremoteobjects = {
version = "6.5.0";
version = "6.5.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.0/submodules/qtremoteobjects-everywhere-src-6.5.0.tar.xz";
sha256 = "1bn24l46ia0nvvcbzs5h3wg5nlk94m35fqrv1lcl8km8mzkvch7z";
name = "qtremoteobjects-everywhere-src-6.5.0.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtremoteobjects-everywhere-src-6.5.1.tar.xz";
sha256 = "16v2qzn5lf5bxrdff4fr624x5n262qvhinrk0vfmcdvrb2plgkvq";
name = "qtremoteobjects-everywhere-src-6.5.1.tar.xz";
};
};
qtscxml = {
version = "6.5.0";
version = "6.5.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.0/submodules/qtscxml-everywhere-src-6.5.0.tar.xz";
sha256 = "0vkn2p4w21z9a6q27hf4yda85hjs4s01wdxy47b7cjngp0y888gi";
name = "qtscxml-everywhere-src-6.5.0.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtscxml-everywhere-src-6.5.1.tar.xz";
sha256 = "0xr4005b640r1h7nbfmgjban9mihxgm4sfqizw30xhsjpg4a6ghw";
name = "qtscxml-everywhere-src-6.5.1.tar.xz";
};
};
qtsensors = {
version = "6.5.0";
version = "6.5.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.0/submodules/qtsensors-everywhere-src-6.5.0.tar.xz";
sha256 = "19ifwxbsa0k2p7z4wa1q4g4shi668w9wprhxkcp2sz4iyki39r2y";
name = "qtsensors-everywhere-src-6.5.0.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtsensors-everywhere-src-6.5.1.tar.xz";
sha256 = "19dbci4487anpkm85n1yly1mm5zx1f5dgx08v5ar5462f61wlnn9";
name = "qtsensors-everywhere-src-6.5.1.tar.xz";
};
};
qtserialbus = {
version = "6.5.0";
version = "6.5.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.0/submodules/qtserialbus-everywhere-src-6.5.0.tar.xz";
sha256 = "15s82ic6w5jw8c1xnwwmskchynvcazmfq4ai7kfrz764ca9kfj4p";
name = "qtserialbus-everywhere-src-6.5.0.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtserialbus-everywhere-src-6.5.1.tar.xz";
sha256 = "0zqmbqnaf8ln6kdf5nc9k4q618d7jd4dmc2gsmgcf2mz55w9dzyv";
name = "qtserialbus-everywhere-src-6.5.1.tar.xz";
};
};
qtserialport = {
version = "6.5.0";
version = "6.5.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.0/submodules/qtserialport-everywhere-src-6.5.0.tar.xz";
sha256 = "1zsd9aas8p7zgfjx2fji0mfn6fzy6822g0h52lxdyjlajzssj2cj";
name = "qtserialport-everywhere-src-6.5.0.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtserialport-everywhere-src-6.5.1.tar.xz";
sha256 = "19ijnjy5bqv7g74q2ax4pvmggphpccckszxilj0vkqnl8q34smf3";
name = "qtserialport-everywhere-src-6.5.1.tar.xz";
};
};
qtshadertools = {
version = "6.5.0";
version = "6.5.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.0/submodules/qtshadertools-everywhere-src-6.5.0.tar.xz";
sha256 = "0xapkzvz79wspc1a9l6yvp7m2vsfmrvapdsymkvz2w9hgw1qsqc6";
name = "qtshadertools-everywhere-src-6.5.0.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtshadertools-everywhere-src-6.5.1.tar.xz";
sha256 = "0ljhysyiwxawws0481hyk1xbycc21jg6gq5fsn8yyi2rhdhng075";
name = "qtshadertools-everywhere-src-6.5.1.tar.xz";
};
};
qtspeech = {
version = "6.5.0";
version = "6.5.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.0/submodules/qtspeech-everywhere-src-6.5.0.tar.xz";
sha256 = "16ixx1b8r5v5m04jpjylixpl4xw1qh5g0dp4phj40vg5z8vjg08x";
name = "qtspeech-everywhere-src-6.5.0.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtspeech-everywhere-src-6.5.1.tar.xz";
sha256 = "1djp6ijjvl94zajbvgz80xnzd2fpkq8fnnpxnq9jg5jny6jhn4k7";
name = "qtspeech-everywhere-src-6.5.1.tar.xz";
};
};
qtsvg = {
version = "6.5.0";
version = "6.5.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.0/submodules/qtsvg-everywhere-src-6.5.0.tar.xz";
sha256 = "0kvs0sb32r4izskh17l771z9lfmmk6951q5lrf5y4ladyihpxjk4";
name = "qtsvg-everywhere-src-6.5.0.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtsvg-everywhere-src-6.5.1.tar.xz";
sha256 = "1vq8jvz13hp9nj9r77f0nx7nq3pciy4sk1j6d2dzbw243m4jk3fm";
name = "qtsvg-everywhere-src-6.5.1.tar.xz";
};
};
qttools = {
version = "6.5.0";
version = "6.5.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.0/submodules/qttools-everywhere-src-6.5.0.tar.xz";
sha256 = "1i39cdl0mmf0wxmkmq16jx1mnj8s7p7bhsa2jnz8hjd4n2b3vhs9";
name = "qttools-everywhere-src-6.5.0.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qttools-everywhere-src-6.5.1.tar.xz";
sha256 = "0a93xg65z19bldwhc77x87khjwkx3hs01z1gjdznza5jhjgdyi2p";
name = "qttools-everywhere-src-6.5.1.tar.xz";
};
};
qttranslations = {
version = "6.5.0";
version = "6.5.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.0/submodules/qttranslations-everywhere-src-6.5.0.tar.xz";
sha256 = "0gbs0shf9hm0xrj3n3zkfdpdymks2wa11nna7ijiixckhgyx11gw";
name = "qttranslations-everywhere-src-6.5.0.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qttranslations-everywhere-src-6.5.1.tar.xz";
sha256 = "16ylh1hf7r4g8s0h6wgkngwy1p75qnq6byz1q14wwzk3q8s2qzjj";
name = "qttranslations-everywhere-src-6.5.1.tar.xz";
};
};
qtvirtualkeyboard = {
version = "6.5.0";
version = "6.5.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.0/submodules/qtvirtualkeyboard-everywhere-src-6.5.0.tar.xz";
sha256 = "19qg59yhln7hbny6nfaz9wx4cm8ng3j23y3snpsfj5q84iwdwibv";
name = "qtvirtualkeyboard-everywhere-src-6.5.0.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtvirtualkeyboard-everywhere-src-6.5.1.tar.xz";
sha256 = "1h9whvpdy37vazl095qqvsl8d2b298v2i25fsvr04x9ns3b47cl9";
name = "qtvirtualkeyboard-everywhere-src-6.5.1.tar.xz";
};
};
qtwayland = {
version = "6.5.0";
version = "6.5.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.0/submodules/qtwayland-everywhere-src-6.5.0.tar.xz";
sha256 = "18sr2yijlm4yh13kq8v7l1knp6b01blflcs75hf1qpzwfyi7zifc";
name = "qtwayland-everywhere-src-6.5.0.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtwayland-everywhere-src-6.5.1.tar.xz";
sha256 = "0kcp1adgszcrwv89f2m3rp2ldbrbnb7prkr8065w5j9ik2hiw7vw";
name = "qtwayland-everywhere-src-6.5.1.tar.xz";
};
};
qtwebchannel = {
version = "6.5.0";
version = "6.5.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.0/submodules/qtwebchannel-everywhere-src-6.5.0.tar.xz";
sha256 = "1gzi03nqgaai0jjhy61gasdydkd0xpvrnq671671ns7kdmj3smfr";
name = "qtwebchannel-everywhere-src-6.5.0.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtwebchannel-everywhere-src-6.5.1.tar.xz";
sha256 = "0jpc231gmgy540x9im8ld1fjmxqjaw1c40r6d2g5gxrpwxkl6drb";
name = "qtwebchannel-everywhere-src-6.5.1.tar.xz";
};
};
qtwebengine = {
version = "6.5.0";
version = "6.5.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.0/submodules/qtwebengine-everywhere-src-6.5.0.tar.xz";
sha256 = "01vg60g25aabki4xlszfn3aq62yjbm2qdh0yy6gpwc0vlwsdl41a";
name = "qtwebengine-everywhere-src-6.5.0.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtwebengine-everywhere-src-6.5.1.tar.xz";
sha256 = "0clcxkybgn5ny22rbdckxczqsf5gc3f55q7r02l5q7q6biqbs61g";
name = "qtwebengine-everywhere-src-6.5.1.tar.xz";
};
};
qtwebsockets = {
version = "6.5.0";
version = "6.5.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.0/submodules/qtwebsockets-everywhere-src-6.5.0.tar.xz";
sha256 = "0233c75by9n48hvm9wc8zmsry8ba0ckykdna1h9dld5vavb7n25w";
name = "qtwebsockets-everywhere-src-6.5.0.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtwebsockets-everywhere-src-6.5.1.tar.xz";
sha256 = "06fsc42x571af78rlx8ah7i9nqc9qnzqvd1mmrx12xd6a2r6d3vb";
name = "qtwebsockets-everywhere-src-6.5.1.tar.xz";
};
};
qtwebview = {
version = "6.5.0";
version = "6.5.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.5/6.5.0/submodules/qtwebview-everywhere-src-6.5.0.tar.xz";
sha256 = "087hs60bzpgqs08z2prfbg9544mpii0xn4xkslp24zbaq43l5aq5";
name = "qtwebview-everywhere-src-6.5.0.tar.xz";
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtwebview-everywhere-src-6.5.1.tar.xz";
sha256 = "0r1six7k9nz1n64c8ff1j24x2dfrr931aiwygpsf36bim27bdbvb";
name = "qtwebview-everywhere-src-6.5.1.tar.xz";
};
};
}
@@ -73,7 +73,7 @@
buildPythonPackage rec {
pname = "langchain";
version = "0.0.179";
version = "0.0.180";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -82,7 +82,7 @@ buildPythonPackage rec {
owner = "hwchase17";
repo = "langchain";
rev = "refs/tags/v${version}";
hash = "sha256-9MotnDsDXwdwVGuD3sO+FFWluPCHHXkQRH0B1zskLZg=";
hash = "sha256-5ZA5CXS9+NCyOXGbjgGk+iNCF/B2Wm4xRpR6t5uJ+yg=";
};
postPatch = ''
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "sqlite-utils";
version = "3.31";
version = "3.32.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-VJifPQntEh+d+Xgx0EFziuSHcdPKhQCJRvG8GIQQmoo=";
hash = "sha256-bCj+Mvzr1lihaR3t+k0RFJmtMCzAE5xaWJOlkNRhhIo=";
};
postPatch = ''
@@ -251,7 +251,7 @@ buildPythonPackage rec {
] ++ lib.optionals stdenv.isLinux [
# Same as above
"tests/pytest_tests/unit_tests/test_artifacts/test_storage.py"
] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
] ++ lib.optionals stdenv.isDarwin [
# Same as above
"tests/pytest_tests/unit_tests/test_lib/test_filesystem.py"
];
+11 -9
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "apko";
version = "0.4.0";
version = "0.8.0";
src = fetchFromGitHub {
owner = "chainguard-dev";
repo = pname;
rev = "v${version}";
sha256 = "sha256-gmBcN1lxzkkRpiUUWv87ji/G4Uy3DA8a6+6Qs+p/2mg=";
hash = "sha256-02W9YOnV/zXopH3C9UNKu5gepNVS2gzoGa10uaKYu94=";
# 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;
@@ -24,7 +24,7 @@ buildGoModule rec {
find "$out" -name .git -print0 | xargs -0 rm -rf
'';
};
vendorSha256 = "sha256-3gRECgKvGqkgBzB3SSxm6/LxZG8RxhjoC6Q7DZj/Has=";
vendorHash = "sha256-h1uAAL3FBskx6Qv9E5WY+UPeXK49WW/hFoNN4QyKevU=";
nativeBuildInputs = [ installShellFiles ];
@@ -41,11 +41,11 @@ buildGoModule rec {
ldflags+=" -X sigs.k8s.io/release-utils/version.buildDate=$(cat SOURCE_DATE_EPOCH)"
'';
preCheck = ''
# requires network access to fetch alpine linux keyring
substituteInPlace pkg/apk/apk_unit_test.go \
--replace "TestInitKeyring" "SkipInitKeyring"
'';
checkFlags = [
# networking required to fetch alpine-keys
# pulled out into a separate library next release
"-skip=TestInitDB"
];
postInstall = ''
installShellCompletion --cmd apko \
@@ -57,8 +57,10 @@ buildGoModule rec {
doInstallCheck = true;
installCheckPhase = ''
runHook preInstallCheck
$out/bin/apko --help
$out/bin/apko version 2>&1 | grep "v${version}"
runHook postInstallCheck
'';
@@ -67,6 +69,6 @@ buildGoModule rec {
changelog = "https://github.com/chainguard-dev/apko/blob/main/NEWS.md";
description = "Build OCI images using APK directly without Dockerfile";
license = licenses.asl20;
maintainers = with maintainers; [ jk ];
maintainers = with maintainers; [ jk developer-guy ];
};
}
+3 -3
View File
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "bearer";
version = "1.7.0";
version = "1.8.0";
src = fetchFromGitHub {
owner = "bearer";
repo = "bearer";
rev = "refs/tags/v${version}";
hash = "sha256-ecLJvV2gUY6uUeCUsVtDSVOQnZnsThGtguWWzb4vsoE=";
hash = "sha256-RwLYBz51zfJltsHOqRi7GJLP2ncPiqRqo229wv5jvdc=";
};
vendorHash = "sha256-EHj7tpQoiwu9pocFg5chNpuekxM3bHE2+V2srD4bInQ=";
vendorHash = "sha256-FRB01Tfz87MZp4V0HPeiEgYV8KEPcbzkeUM0uIBh6DU=";
subPackages = [
"cmd/bearer"
+2 -2
View File
@@ -1,13 +1,13 @@
{ detekt, lib, stdenv, fetchurl, makeWrapper, jre_headless, testers }:
stdenv.mkDerivation rec {
pname = "detekt";
version = "1.22.0";
version = "1.23.0";
jarfilename = "${pname}-${version}-executable.jar";
src = fetchurl {
url = "https://github.com/detekt/detekt/releases/download/v${version}/detekt-cli-${version}-all.jar";
sha256 = "sha256-NCOMBcAtk7cOlP3H8Bz/hfR/305j/DfaoFrwc504b/4=";
sha256 = "sha256-XmmcyfwWZAE9PQa6TP2HZsn7iADwMUBdxMad8jYWH9o=";
};
dontUnpack = true;
+2 -2
View File
@@ -18,13 +18,13 @@ let
in
buildGoModule rec {
pname = "faas-cli";
version = "0.16.3";
version = "0.16.4";
src = fetchFromGitHub {
owner = "openfaas";
repo = "faas-cli";
rev = version;
sha256 = "sha256-EfDPJdLqsqrNwkJYceZolvyEbQPaT0W0GxvnRBsfZpg=";
sha256 = "sha256-NKKkHn49nbnSirCHUEetn5qJN9r3Sp5aOJ+fWGi45xw=";
};
vendorHash = null;
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "circleci-cli";
version = "0.1.26343";
version = "0.1.26837";
src = fetchFromGitHub {
owner = "CircleCI-Public";
repo = pname;
rev = "v${version}";
sha256 = "sha256-mEvrcZbQ8vcRHL1CWlxzBJFqXLTJi51DER9BKLxnJ+4=";
sha256 = "sha256-psl3I8kvBE+akVuz5bj9xFzKTUX7Lj2kBVzNN5fpltM=";
};
vendorHash = "sha256-LzDofZI54cWP4FQfINq3tQbSi4c9/N1v0YH/aSzttNo=";
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "uncrustify";
version = "0.76.0";
version = "0.77.1";
src = fetchFromGitHub {
owner = "uncrustify";
repo = "uncrustify";
rev = "uncrustify-${version}";
sha256 = "sha256-th3lp4WqqruHx2/ym3I041y2wLbYM1b+V6yXNOWuUvM=";
sha256 = "sha256-9U6PTeU/LVFL9XzP9XSFjDx18CR3athThEz+h2+5qZ8=";
};
nativeBuildInputs = [ cmake python3 ];
File diff suppressed because it is too large Load Diff
+4 -4
View File
@@ -1,6 +1,6 @@
{
"version": "1.8.0",
"integrity": "sha512-9pHLqfYMWwP1L2t83TK5k6ho1faz+jFD9zXxnTtgnyu0c/uC39nx+tJT9AsxNZpY+GlhshDu1YcJm45f8l3gIw==",
"filename": "mongosh-1.8.0.tgz",
"deps": "sha256-ewl5q6ZxlQN030AmObP42E5KpUisrdYHOsg8whUIUZA="
"version": "1.9.1",
"integrity": "sha512-hO4jVRv2NBcoOVDJp38J6LoRDKM39dwjMfFYHVuBUyMZnfALg1eMgiq18kPigMvFtA7Zym74FdV8cFBI9DhMAQ==",
"filename": "mongosh-1.9.1.tgz",
"deps": "sha256-nUSP9zMq3ARzccEwENu4HUf/vwqIrEppfozT21MF/rI="
}
+1 -1
View File
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
#! nix-shell -i bash -p nodejs libarchive prefetch-npm-deps moreutils
#! nix-shell -i bash -p nodejs libarchive prefetch-npm-deps moreutils jq
# shellcheck shell=bash
set -exuo pipefail
+12 -3
View File
@@ -8,28 +8,37 @@
buildGoModule rec {
pname = "nc4nix";
version = "unstable-2022-12-07";
version = "unstable-2023-05-25";
src = fetchFromGitHub {
owner = "helsinki-systems";
repo = "nc4nix";
rev = "c556a596b1d40ff69b71adab257ec5ae51ba4df1";
sha256 = "sha256-EIPCMiVTf0ryXRMRGhepORaOlimt3/funvUdORRbVa8=";
rev = "14cab9b2f8628ae6668c1d01519f558069f7f675";
sha256 = "sha256-iy9jJMRu0SkfrDufO6WAObqdiusvwhyv+GGHVrD3CV4=";
};
patches = [
# Switch hash calculation method
# https://github.com/helsinki-systems/nc4nix/pull/3
(fetchpatch {
url = "https://github.com/helsinki-systems/nc4nix/commit/88c182fbdddef148e086fa86438dcd72208efd75.patch";
sha256 = "sha256-zAF0+t9wHrKhhyD0+/d58BiaavLHfxO8X5J6vNlEWx0=";
name = "switch_hash_calculation_method.patch";
})
# Add package selection command line argument
# https://github.com/helsinki-systems/nc4nix/pull/2
(fetchpatch {
url = "https://github.com/helsinki-systems/nc4nix/pull/2/commits/449eec89538df4e92106d06046831202eb84a1db.patch";
sha256 = "sha256-qAAbR1G748+2vwwfAhpe8luVEIKNGifqXqTV9QqaUFc=";
name = "add_package_selection_command_line_arg.patch";
})
# Only consider (new) stable releases of NC apps
# https://github.com/helsinki-systems/nc4nix/issues/4
(fetchpatch {
url = "https://github.com/helsinki-systems/nc4nix/pull/5/commits/076a188bf30203ddea0217d83f2e3b16f3b9392b.patch";
sha256 = "sha256-N7X9j0tWD8ZAWjXXCXGITl/EBbrIbKbHJHyskT1rVTs=";
name = "only_consider_stable_releases.patch";
})
];
vendorSha256 = "sha256-uhINWxFny/OY7M2vV3ehFzP90J6Z8cn5IZHWOuEg91M=";
+10
View File
@@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchurl
, fetchpatch
, cmake
, pkg-config
, ninja
@@ -35,6 +36,15 @@ stdenv.mkDerivation rec {
sha256 = "sha256-QWGwfc7A/I8xUpx9thC3FzFBKNoAei76haqbwzCXoWM=";
};
patches = [
# fix build with Qt 6.5.1
# FIXME: remove for next release
(fetchpatch {
url = "https://github.com/qt-creator/qt-creator/commit/9817df63fb9eae342d5bf6f28f526aa09b17e8de.diff";
hash = "sha256-HIQuKroWUhJBWhVG3fyoBIFvezktCyQAuaZz/lvg7uk=";
})
];
nativeBuildInputs = [
cmake
pkg-config
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "yq-go";
version = "4.33.3";
version = "4.34.1";
src = fetchFromGitHub {
owner = "mikefarah";
repo = "yq";
rev = "v${version}";
hash = "sha256-hsADk1h9bxqgvIddU0JTIv/uSJnukoJb39i0tngnImE=";
hash = "sha256-rkf3yoTB7umGHvbVb7eg21a4AJTyYOuWf4jHs274SGc=";
};
vendorHash = "sha256-EW2coQdrFfs6xYeJb+6gab8+CVT3O8x4cSRuj1o+3ok=";
vendorHash = "sha256-726kRRxFj7tqVguPDiHuPpHRN2+FDsqBtIJ4J8I/0Oc=";
nativeBuildInputs = [ installShellFiles ];
+3 -22
View File
@@ -4,7 +4,6 @@
, fetchFromGitHub
, rustPlatform
, installShellFiles
, tinycc
, libiconv
, darwin
, librusty_v8 ? callPackage ./librusty_v8.nix { }
@@ -12,15 +11,15 @@
rustPlatform.buildRustPackage rec {
pname = "deno";
version = "1.33.3";
version = "1.34.0";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
hash = "sha256-E1Usmj4f3jvzllKIrItzOIe4kf0DRQWwobVGuN291Ys=";
hash = "sha256-B9YzJsnbohzQQQj2Ec1szh/aY2zoYFOoEXTShwOzMlE=";
};
cargoHash = "sha256-8L9UrFQTpwG2Gw4V72NvqdqQicG0HPRdmNJPhkWqj4s=";
cargoHash = "sha256-rwN7pEb6bDLb7YrcfuWC9Y0m7b+50AeLKMKx7WLKYT8=";
postPatch = ''
# upstream uses lld on aarch64-darwin for faster builds
@@ -40,24 +39,6 @@ rustPlatform.buildRustPackage rec {
# To avoid this we pre-download the file and export it via RUSTY_V8_ARCHIVE
RUSTY_V8_ARCHIVE = librusty_v8;
# The deno_ffi package currently needs libtcc.a on linux and macos and will try to compile it at build time
# To avoid this we point it to our copy (dir)
# In the future tinycc will be replaced with asm
libtcc = tinycc.overrideAttrs (oa: {
makeFlags = [ "libtcc.a" ];
# tests want tcc binary
doCheck = false;
outputs = [ "out" ];
installPhase = ''
mkdir -p $out/lib/
mv libtcc.a $out/lib/
'';
# building the whole of tcc on darwin is broken in nixpkgs
# but just building libtcc.a works fine so mark this as unbroken
meta.broken = false;
});
TCC_PATH = "${libtcc}/lib";
# Tests have some inconsistencies between runs with output integration tests
# Skipping until resolved
doCheck = false;
+5 -5
View File
@@ -11,11 +11,11 @@ let
};
in
fetch_librusty_v8 {
version = "0.71.1";
version = "0.72.0";
shas = {
x86_64-linux = "sha256-QCqCJdNaOLXggIGQhLOV/NvbMebfA3g1iyiBtkPDS9A=";
aarch64-linux = "sha256-r9/1086GQolGfc3iqIxZzTmoC7G/1vK4QG4Qvm0zUOo=";
x86_64-darwin = "sha256-kMpB9F2sTxjqnplOznvv20fa7AhdnEeIb3yb4qa72e0=";
aarch64-darwin = "sha256-jWjPJa3bWynoMUmccASggvu25NaHpn/AsTnC/JMyr8o=";
x86_64-linux = "sha256-APF8pCLLJ2m2XdvsecEQu5HBuNZx+WO/qRGdwogZi10=";
aarch64-linux = "sha256-clhSbml1qnPGEU6KfhVouIHqWTWjZeN6xLw+AIhHuKI=";
x86_64-darwin = "sha256-2pEpeDJucUIOY0pOpbaUAKW4is7A1Axz+ZDhDSiIEa8=";
aarch64-darwin = "sha256-BL9u5nS0okQyLzLWJh70vyqBoSGW6bJaYzxeCNHGBwg=";
};
}
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "flyctl";
version = "0.1.8";
version = "0.1.18";
src = fetchFromGitHub {
owner = "superfly";
repo = "flyctl";
rev = "v${version}";
hash = "sha256-2OqJK+oGGZ4YiCJErFIh7laq4iLPZ8uA/SIYOVPxYuw=";
hash = "sha256-ZRLkqymNeSIHfMYqT6T4YzkOuHCrUWRiJHFN1bWbzmk=";
};
vendorHash = "sha256-YMj4iRSXfQYCheGHQeJMd5PFDRlXGIVme0Y2heJMm3Y=";
vendorHash = "sha256-UCP73yAeT3JO7fhpshTpbhmB2wLGc26GiLY/DkBAgTg=";
subPackages = [ "." ];
+18 -9
View File
@@ -1,21 +1,31 @@
{ lib, stdenv, fetchurl, zlib }:
{ lib
, stdenv
, fetchurl
, fetchpatch
, zlib
}:
stdenv.mkDerivation rec {
pname = "gnushogi";
version = "1.4.2";
buildInputs = [ zlib ];
src = fetchurl {
url = "mirror://gnu/gnushogi/${pname}-${version}.tar.gz";
sha256 = "0a9bsl2nbnb138lq0h14jfc5xvz7hpb2bcsj4mjn6g1hcsl4ik0y";
hash = "sha256-HsxIqGYwPGNlJVKzJdaF5+9emJMkQIApGmHZZQXVKyk=";
};
env.LDFLAGS = lib.optionalString (!stdenv.isDarwin) "-Wl,-z,muldefs";
patches = [
(fetchpatch {
url = "https://sources.debian.org/data/main/g/gnushogi/1.4.2-7/debian/patches/01-make-dont-ignore";
hash = "sha256-Aw0zfH+wkj+rQQzKIn6bSilP76YIO27FwJ8n1UzG6ow=";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/g/gnushogi/1.4.2-7/debian/patches/globals";
hash = "sha256-wZJBPMYSz4n1kOyLmR9QOp70650R9xXQUWD5hvaMRok=";
})
];
# Makefile ignores errors, so the build may silently succeed erroneously
postBuild = ''
test -e gnushogi/gnushogi || { echo "ERROR: no binary produced"; exit 1; }
'';
buildInputs = [ zlib ];
meta = with lib; {
description = "GNU implementation of Shogi, also known as Japanese Chess";
@@ -23,6 +33,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl3;
maintainers = [ maintainers.ciil ];
platforms = platforms.unix;
broken = stdenv.isDarwin; # darwin does not support -z muldefs
};
}
+4 -4
View File
@@ -10,13 +10,13 @@
buildGoModule rec {
pname = "fastly";
version = "10.0.1";
version = "10.1.0";
src = fetchFromGitHub {
owner = "fastly";
repo = "cli";
rev = "refs/tags/v${version}";
hash = "sha256-khGg6TcbyJMn+hiBANhHA6IU6aODTA94AV7yCaELqrs=";
hash = "sha256-gMSKk5igNy8W7Qb1xtKgfpzftiPVZaAv/oKIdinTMGA=";
# The git commit is part of the `fastly version` original output;
# leave that output the same in nixpkgs. Use the `.git` directory
# to retrieve the commit SHA, and remove the directory afterwards,
@@ -52,8 +52,8 @@ buildGoModule rec {
];
preBuild = let
cliConfigToml = fetchurl {
url = "https://web.archive.org/web/20230412222811/https://developer.fastly.com/api/internal/cli-config";
hash = "sha256-NACjeBGOvBL6kUBZtSx4ChZgn7V69f4K2yyDCwTZsbU=";
url = "https://web.archive.org/web/20230523192914/https://developer.fastly.com/api/internal/cli-config";
hash = "sha256-zgZ3m69dRvuc1S7hHeLxzrM/Z/u0PKUn0XbyQOYO3es=";
};
in ''
cp ${cliConfigToml} ./pkg/config/config.toml
+2 -2
View File
@@ -7,7 +7,7 @@
, boost
, fetchFromGitHub
, pkg-config
, microsoft_gsl
, microsoft-gsl
}:
stdenv.mkDerivation rec {
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
ninja
pkg-config
meson
microsoft_gsl
microsoft-gsl
];
buildInputs = [
+2 -2
View File
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.15.112";
version = "5.15.113";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0lfnd8mpb3nzvd0gk0jbls3zx7y5kskc4kgccjgkc34flgdyps5h";
sha256 = "1jmrnd0ri75gl0k80g93zqyg00lbf1gqai3dga383ms92799hkja";
};
} // (args.argsOverride or { }))
+2 -2
View File
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "6.1.29";
version = "6.1.30";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
sha256 = "1yzwp0496j63c6lhvsni1ynr8b2cpn552pli3nd3fdk0pp4nqwqy";
sha256 = "04w8c2j3gfxmn3gc270cmqsxcyp8nm7mi5l268jwpg4yrb259whv";
};
} // (args.argsOverride or { }))
+2 -2
View File
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "6.3.3";
version = "6.3.4";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
sha256 = "1ra4kr9bp1s9d7amvz6ik1q3chwps5lysn37b28770pfdim22xc9";
sha256 = "1s385fvhpzzlh97gv1dj82p52w0fdsjga7hbs03ycfkbxll7aqnq";
};
} // (args.argsOverride or { }))
@@ -1,8 +1,8 @@
{ stdenv, lib, fetchsvn, linux
, scripts ? fetchsvn {
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
rev = "19204";
sha256 = "1cxg2bslskjby11mxqv71w701217i1s9yj73ih3hjzxs6hkv9r0v";
rev = "19299";
sha256 = "1sqygvk81p0wfssjswz4hg2mqx9ak8a515rdzwf1a7n728sway7l";
}
, ...
}:
@@ -6,7 +6,7 @@
, ... } @ args:
let
version = "5.10.176-rt86"; # updated by ./update-rt.sh
version = "5.10.179-rt87"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@@ -17,14 +17,14 @@ in buildLinux (args // {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
sha256 = "14zpdrrrpgxx44nxjn0rifrchnmsvvpkzpm1n82kw5q4p9h2q1yf";
sha256 = "0abylcqbzpxxh45kmvd9i2cig64aajz87j5c8vm3w1ab2mf49g8v";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "0pjf9fdhfh562mp18q8zwk4mbwj736yhmvakj0vr41ax9r3frj0l";
sha256 = "045pjxlrv05vpiavgnaq971ziirxa1hzkzs1fv11npp4q45lqzp3";
};
}; in [ rt-patch ] ++ kernelPatches;
@@ -2,13 +2,15 @@
, config
, buildPlatform
, hostPlatform
, fetchurl
, checkMeta
}:
lib.makeScope
# Prevent using top-level attrs to protect against introducing dependency on
# non-bootstrap packages by mistake. Any top-level inputs must be explicitly
# declared here.
(extra: lib.callPackageWith ({ inherit lib config buildPlatform hostPlatform; } // extra))
(extra: lib.callPackageWith ({ inherit lib config buildPlatform hostPlatform fetchurl checkMeta; } // extra))
(self: with self; {
bash_2_05 = callPackage ./bash/2.nix { tinycc = tinycc-mes; };
@@ -61,7 +63,7 @@ lib.makeScope
tinycc-bootstrappable = lib.recurseIntoAttrs (callPackage ./tinycc/bootstrappable.nix { });
tinycc-mes = lib.recurseIntoAttrs (callPackage ./tinycc/mes.nix { });
inherit (callPackage ./utils.nix { }) fetchurl derivationWithMeta writeTextFile writeText;
inherit (callPackage ./utils.nix { }) derivationWithMeta writeTextFile writeText;
test = kaem.runCommand "minimal-bootstrap-test" {} ''
echo ${bash_2_05.tests.get-version}
@@ -1,6 +1,5 @@
{ lib
, fetchurl
, writeText
, callPackage
, kaem
, m2libc
@@ -3,16 +3,9 @@
, callPackage
, kaem
, mescc-tools-extra
, checkMeta
}:
let
checkMeta = callPackage ../../../stdenv/generic/check-meta.nix { };
in
rec {
fetchurl = import ../../../build-support/fetchurl/boot.nix {
inherit (buildPlatform) system;
};
derivationWithMeta = attrs:
let
passthru = attrs.passthru or {};
+3 -3
View File
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "martin";
version = "0.8.2";
version = "0.8.3";
src = fetchFromGitHub {
owner = "maplibre";
repo = "martin";
rev = "v${version}";
hash = "sha256-8Kdvwu8KLEMEYoRgkcgYYyX60am+P6jEF7e2W2/lICk=";
hash = "sha256-ne1GdXKC/KBuwAmDmatdnbgCSIR4KldwJTTp/tshf6A=";
};
cargoHash = "sha256-XCKLi9m/MZXeBpzLFaxPtEsKQYw1wJlWQdspaRFR6Ug=";
cargoHash = "sha256-uZcVmZH81fu9wSE9juIVPpeNEfEW8007+GVaOdfquYc=";
nativeBuildInputs = [ pkg-config ];
+2 -2
View File
@@ -9,13 +9,13 @@
buildDotnetModule rec {
pname = "jackett";
version = "0.21.17";
version = "0.21.34";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
hash = "sha512-gluKr43vWSPrkescl0+PW+Iz83mJ5/sQQXL8Ga1DcXkDa8dUHNpvEyPYhok/4yZh5QPXFSB84EXj2DMr9GGMGg==";
hash = "sha512-h+40x/D0qWTa3pRnieE+UQr78iPntR/rn0+HivSv1ZZkSdOZbq4M3CAeDbBEh8xCuaNiR1DOQLONl2zOE1ZASQ==";
};
projectFile = "src/Jackett.Server/Jackett.Server.csproj";
+3 -3
View File
@@ -39,13 +39,13 @@ let
in stdenv.mkDerivation rec {
pname = "openvscode-server";
version = "1.78.1";
version = "1.78.2";
src = fetchFromGitHub {
owner = "gitpod-io";
repo = "openvscode-server";
rev = "openvscode-server-v${version}";
sha256 = "sha256-5sizNPVr2iA5wCfU7dig08ErPGmSeab8UcCbOfaXI2Q=";
sha256 = "sha256-+Q/j3h7ZvNDxrjEk01QUOrVwcwGW4OBBpmfjEtHQj2o=";
};
yarnCache = stdenv.mkDerivation {
@@ -68,7 +68,7 @@ in stdenv.mkDerivation rec {
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "sha256-sq5dc39qjrVBXAZU7TeZYYs3BcZlD+2nKSVPaTu/DLg=";
outputHash = "sha256-XOFBXYP3c4vbvl0/uXsmo8FdO/2PudzJhm9L+9VArdI=";
};
nativeBuildInputs = [
+1
View File
@@ -163,5 +163,6 @@ in stdenv.mkDerivation rec {
maintainers = with maintainers; [ offline RaghavSood ];
license = licenses.isc;
platforms = [ "x86_64-linux" ];
knownVulnerabilities = [ "CVE-2022-29077" ];
};
}
@@ -5,6 +5,7 @@
, nixosTests
, cargo-pgx_0_7_1
, nix-update-script
, stdenv
}:
(buildPgxExtension.override {cargo-pgx = cargo-pgx_0_7_1;})rec {
@@ -41,6 +42,6 @@
license = licenses.asl20;
# as it needs to be used with timescaledb, simply use the condition from there
broken = versionOlder postgresql.version "12";
broken = versionOlder postgresql.version "12" || stdenv.isDarwin;
};
}
+3 -3
View File
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "tailscale";
version = "1.40.1";
version = "1.42.0";
src = fetchFromGitHub {
owner = "tailscale";
repo = "tailscale";
rev = "v${version}";
hash = "sha256-OCKWr62peDrh6zQVAS2iPPzgB1uZb1Fev23szvNNPkE=";
hash = "sha256-J7seajRoUOG/nm5iYuiv3lcS5vTT1XxZTxiSmf/TjGI=";
};
vendorHash = "sha256-lirn07XE3JOS6oiwZBMwxzywkbXHowOJUMWWLrZtccY=";
vendorHash = "sha256-7L+dvS++UNfMVcPUCbK/xuBPwtrzW4RpZTtcl7VCwQs=";
nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];
+2 -2
View File
@@ -18,14 +18,14 @@ let
in
with py.pkgs; buildPythonApplication rec {
pname = "awscli2";
version = "2.11.20"; # N.B: if you change this, check if overrides are still up-to-date
version = "2.11.22"; # N.B: if you change this, check if overrides are still up-to-date
format = "pyproject";
src = fetchFromGitHub {
owner = "aws";
repo = "aws-cli";
rev = version;
hash = "sha256-svd4NI39T4k2xKP43FB5llGyHJ7OKE7LxN7rOjL9L2w=";
hash = "sha256-NIoH7vKsAj3Ia2yD7UDTdN6kXdDlHhmU66Uxjqr2deE=";
};
postPatch = ''
+3 -3
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "stripe-cli";
version = "1.14.6";
version = "1.14.7";
src = fetchFromGitHub {
owner = "stripe";
repo = pname;
rev = "v${version}";
hash = "sha256-BtZQCI1mD/k3ox1HLWcK7RdPZBbejJ+0fMLo5nub8yQ=";
hash = "sha256-cyN23Ry60veMBXX97oYGxUmyaktM0tdWxAapD8RN+RQ=";
};
vendorHash = "sha256-DYA6cu2KzEBZ4wsT7wjcdY1endQQOZlj2aOwu6iGLew=";
@@ -29,7 +29,7 @@ buildGoModule rec {
rm pkg/cmd/resources_test.go
rm pkg/cmd/root_test.go
# TODO: no clue why it's broken (1.14.6), remove for now.
# TODO: no clue why it's broken (1.14.7), remove for now.
rm pkg/login/client_login_test.go
rm pkg/git/editor_test.go
rm pkg/rpcservice/sample_create_test.go
-37
View File
@@ -1,37 +0,0 @@
{ bzip2, fetchFromGitHub, gzip, gnutar, lib, stdenv, unzip, xz }:
stdenv.mkDerivation rec {
pname = "xtrt";
version = "unstable-2021-02-17";
src = fetchFromGitHub {
owner = "figsoda";
repo = pname;
rev = "61884fb7c48c7e1e2194afd82b85f415a6dc7c20";
sha256 = "073l4q6mx5if791p5a6w8m8bz2aypmjmycaijq4spql8bh6h12vf";
};
postPatch = ''
substituteInPlace xtrt \
--replace "bzip2 " "${bzip2}/bin/bzip2 " \
--replace "gzip " "${gzip}/bin/gzip " \
--replace "tar " "${gnutar}/bin/tar " \
--replace "unzip " "${unzip}/bin/unzip " \
--replace "xz " "${xz}/bin/xz "
'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp xtrt $out/bin
runHook postInstall
'';
meta = with lib; {
description = "Tiny script to extract archives by their extensions";
homepage = "https://github.com/figsoda/xtrt";
license = licenses.unlicense;
maintainers = with maintainers; [ figsoda ];
mainProgram = "xtrt";
};
}
+2 -2
View File
@@ -14,7 +14,7 @@
, vips
, nlohmann_json
, libsixel
, microsoft_gsl
, microsoft-gsl
, opencv
, xorg
, withOpencv ? stdenv.isLinux
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
vips
nlohmann_json
libsixel
microsoft_gsl
microsoft-gsl
] ++ lib.optionals withOpencv [
opencv
] ++ lib.optionals withX11 [
+3 -3
View File
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "interactsh";
version = "1.1.3";
version = "1.1.4";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-hoh7Nug0XLu/8SPb+YY/TeaRqBIaq3dUAC+8iJ1wvpI=";
hash = "sha256-yqvIbL5qiVSxI+G1RaZWzM8m8wlBnsTKavreIPkzvMU=";
};
vendorHash = "sha256-B7DE2OEP0VikLfS6btILpdJ6rqwuoD2w7SqNnWD4Bdk=";
vendorHash = "sha256-NYaRuVf9cOME9znIEmYxWNcUce8Kiuym/4ycjDtsuaQ=";
modRoot = ".";
subPackages = [
+2 -12
View File
@@ -9,29 +9,19 @@
, gerbv
, librsvg
, bash
, fetchpatch
}:
stdenv.mkDerivation rec {
pname = "pcb2gcode";
version = "2.4.0";
version = "2.5.0";
src = fetchFromGitHub {
owner = "pcb2gcode";
repo = "pcb2gcode";
rev = "v${version}";
sha256 = "sha256-3VQlYtSi6yWWNuxTlBzvBtkM5hAss47xat+sEW+P79E=";
hash = "sha256-c5YabBqZn6ilIkF3lifTsYyLZMsZN21jDj1hNu0PRAc=";
};
patches = [
# the patch below is part of upstream mainline, we can remove this
# when they make their next release
(fetchpatch {
url = "https://github.com/pcb2gcode/pcb2gcode/commit/01cd18a6d859ab1aac6c532c99be9109f083448d.patch";
sha256 = "sha256-5hl8KsDxSWMzXS3oRG0fBfHFq0IpZ//sU8lfY9Yp8L0=";
})
];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ boost glibmm gtkmm2 gerbv librsvg ];
+2 -2
View File
@@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, makeWrapper, jre, graphviz }:
stdenv.mkDerivation rec {
version = "1.2023.7";
version = "1.2023.8";
pname = "plantuml";
src = fetchurl {
url = "https://github.com/plantuml/plantuml/releases/download/v${version}/plantuml-pdf-${version}.jar";
sha256 = "sha256-EWM3wL2TTr1r8Gb9m4PK+KnRD6YtMDGHWrXAzSkGbd0=";
sha256 = "sha256-Di0YqVFfvPtwog33RIxhzcb8QSChIPrkXvMl5jrYS6c=";
};
nativeBuildInputs = [ makeWrapper ];
+3 -3
View File
@@ -1,16 +1,16 @@
{ lib, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "tagref";
version = "1.8.1";
version = "1.8.2";
src = fetchFromGitHub {
owner = "stepchowfun";
repo = pname;
rev = "v${version}";
sha256 = "sha256-fEFMzBLQl93QmaviJXOZkiJ3cqYKNOiz3a+CZL7nyRI=";
sha256 = "sha256-igzlSkoVffn0X/eJrNi9u0aLc17KREuUtIwxGvsF6hc=";
};
cargoHash = "sha256-dvSP1djkjvdm04lsdxZsxS+0R0PI+jo8blg3zOQcBrU=";
cargoHash = "sha256-FNgMM+fOEbkCqRPgJmGiuoUJP9NRBxjSTwFIPyaT5d0=";
meta = with lib; {
description = "Tagref helps you refer to other locations in your codebase.";
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kapp";
version = "0.55.1";
version = "0.56.0";
src = fetchFromGitHub {
owner = "vmware-tanzu";
repo = "carvel-kapp";
rev = "v${version}";
sha256 = "sha256-g65hW/qyuwwZDfX0dDbgjlRCikBT3PpWP53MzkUlNqY=";
sha256 = "sha256-j3iAz0Mn9gtvGqdYEUqJ4njDg2GsWdOn6KV3z28ok2w=";
};
vendorHash = null;
+3 -3
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "plan9port";
version = "2022-09-12";
version = "2023-03-31";
src = fetchFromGitHub {
owner = "9fans";
repo = pname;
rev = "ffbdd1aa20c8a20a8e9dcd3cec644b6dfa3c6acb";
hash = "sha256-Lq5B4VYUetkHwhFX2EaLr33wR1aLIiVn8OBobxjFt7I=";
rev = "cc4571fec67407652b03d6603ada6580de2194dc";
hash = "sha256-PZWjf0DJCNs5mjxtXgK4/BcstaOqG2WBKRo+Bh/9U7w=";
};
postPatch = ''
+2 -2
View File
@@ -3,13 +3,13 @@
}:
stdenv.mkDerivation rec {
pname = "bento4";
version = "1.6.0-639";
version = "1.6.0-640";
src = fetchFromGitHub {
owner = "axiomatic-systems";
repo = "Bento4";
rev = "v${version}";
sha256 = "sha256-Rfmyjsgn/dcIplRtPFb5AfBxWOKmP6w8IHykgVxVNsQ=";
hash = "sha256-VhlFfNYw3xpAIyWqDyhgXIv3JtpFJH0BL97dFX8diRY=";
};
patches = [
+3 -1
View File
@@ -264,7 +264,7 @@ mapAliases ({
couchdb2 = throw "couchdb2 was removed from nixpkgs, use couchdb3 instead"; # Added 2021-03-03
coreclr = throw "coreclr has been removed from nixpkgs, use dotnet-sdk instead"; # added 2022-06-12
corgi = throw "corgi has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-02
cpp-gsl = throw "'cpp-gsl' has been renamed to/replaced by 'microsoft_gsl'"; # Converted to throw 2022-02-22
cpp-gsl = throw "'cpp-gsl' has been renamed to/replaced by 'microsoft-gsl'"; # Converted to throw 2022-02-22
cpp_ethereum = throw "cpp_ethereum has been removed; abandoned upstream"; # Added 2020-11-30
cpuminer-multi = throw "cpuminer-multi has been removed: deleted by upstream"; # Added 2022-01-07
crafty = throw "crafty has been removed: deleted by upstream"; # Added 2022-01-07
@@ -1036,6 +1036,7 @@ mapAliases ({
mess = mame; # Added 2019-10-30
metal = throw "metal has been removed due to lack of maintainers";
metricbeat6 = throw "metricbeat6 has been removed because it reached end of life"; # Added 2022-10-04
microsoft_gsl = microsoft-gsl; # Added 2023-05-26
mididings = throw "mididings has been removed from nixpkgs as it doesn't support recent python3 versions and its upstream stopped maintaining it"; # Added 2022-01-12
midoriWrapper = throw "'midoriWrapper' has been renamed to/replaced by 'midori'"; # Converted to throw 2022-02-22
mime-types = mailcap; # Added 2022-01-21
@@ -1805,6 +1806,7 @@ mapAliases ({
"from nixpkgs. Users are urged to switch to 'xone'."
); # Added 2022-08-02
xpraGtk3 = throw "'xpraGtk3' has been renamed to/replaced by 'xpra'"; # Converted to throw 2022-02-22
xtrt = throw "xtrt has been removed due to being abandoned"; # Added 2023-05-25
xv = xxv; # Added 2020-02-22
xvidcap = throw "'xvidcap' has been removed because of a broken dependency"; # Added 2022-11-08
xvfb_run = xvfb-run; # Added 2021-05-07
+6 -3
View File
@@ -1781,8 +1781,6 @@ with pkgs;
xrootd = callPackage ../tools/networking/xrootd { };
xtrt = callPackage ../tools/archivers/xtrt { };
yabridge = callPackage ../tools/audio/yabridge {
wine = wineWowPackages.staging;
};
@@ -22994,7 +22992,7 @@ with pkgs;
mhddfs = callPackage ../tools/filesystems/mhddfs { };
microsoft_gsl = callPackage ../development/libraries/microsoft_gsl { };
microsoft-gsl = callPackage ../development/libraries/microsoft-gsl { };
microsoft-edge = callPackage (import ../applications/networking/browsers/microsoft-edge).stable { };
microsoft-edge-beta = callPackage (import ../applications/networking/browsers/microsoft-edge).beta { };
@@ -27214,6 +27212,10 @@ with pkgs;
minimal-bootstrap = recurseIntoAttrs (import ../os-specific/linux/minimal-bootstrap {
inherit (stdenv) buildPlatform hostPlatform;
inherit lib config;
fetchurl = import ../build-support/fetchurl/boot.nix {
inherit (stdenv.buildPlatform) system;
};
checkMeta = callPackage ../stdenv/generic/check-meta.nix { };
});
mingetty = callPackage ../os-specific/linux/mingetty { };
@@ -27685,6 +27687,7 @@ with pkgs;
withTimesyncd = false;
withTpm2Tss = false;
withUserDb = false;
withUkify = false;
};
systemdStage1 = systemdMinimal.override {
pname = "systemd-stage-1";
-3
View File
@@ -170,7 +170,6 @@ in {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.make-maple-state-reusable-after-mas_empty_area
kernelPatches.fix-em-ice-bonding
];
};
@@ -179,7 +178,6 @@ in {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.make-maple-state-reusable-after-mas_empty_area
kernelPatches.fix-em-ice-bonding
kernelPatches.export-rt-sched-migrate
];
@@ -198,7 +196,6 @@ in {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.make-maple-state-reusable-after-mas_empty_area
kernelPatches.fix-em-ice-bonding
];
};