Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
@@ -113,7 +113,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
doCheck = with stdenv.hostPlatform; !isStatic && isLinux;
|
||||
doCheck = with stdenv.hostPlatform; !isStatic && isLinux && !isLoongArch64;
|
||||
checkTarget = "unit";
|
||||
checkInputs = [
|
||||
cmocka
|
||||
|
||||
@@ -34,18 +34,20 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
meta = {
|
||||
description = "Wallpapers for the COSMIC Desktop Environment";
|
||||
homepage = "https://system76.com/cosmic";
|
||||
license = with lib.licenses; [
|
||||
# A_stormy_stellar_nursery_esa_379309.jpg: https://www.esa.int/ESA_Multimedia/Images/2017/06/A_stormy_stellar_nursery
|
||||
# webb-inspired-wallpaper-system76.jpg
|
||||
cc-by-40
|
||||
license =
|
||||
with lib.licenses;
|
||||
AND [
|
||||
# A_stormy_stellar_nursery_esa_379309.jpg: https://www.esa.int/ESA_Multimedia/Images/2017/06/A_stormy_stellar_nursery
|
||||
# webb-inspired-wallpaper-system76.jpg
|
||||
cc-by-40
|
||||
|
||||
# otherworldly_earth_nasa_ISS064-E-29444.jpg: https://earthobservatory.nasa.gov/image-use-policy
|
||||
# phytoplankton_bloom_nasa_oli2_20240121.jpg: https://earthobservatory.nasa.gov/image-use-policy
|
||||
# orion_nebula_nasa_heic0601a.jpg: https://hubblesite.org/copyright
|
||||
# tarantula_nebula_nasa_PIA23646.jpg: https://webbtelescope.org/copyright
|
||||
# round_moons_nasa.jpg: https://www.planetary.org/space-images/the-solar-systems-round-moons
|
||||
publicDomain
|
||||
];
|
||||
# otherworldly_earth_nasa_ISS064-E-29444.jpg: https://earthobservatory.nasa.gov/image-use-policy
|
||||
# phytoplankton_bloom_nasa_oli2_20240121.jpg: https://earthobservatory.nasa.gov/image-use-policy
|
||||
# orion_nebula_nasa_heic0601a.jpg: https://hubblesite.org/copyright
|
||||
# tarantula_nebula_nasa_PIA23646.jpg: https://webbtelescope.org/copyright
|
||||
# round_moons_nasa.jpg: https://www.planetary.org/space-images/the-solar-systems-round-moons
|
||||
publicDomain
|
||||
];
|
||||
teams = [ lib.teams.cosmic ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
|
||||
@@ -7,18 +7,18 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dolt";
|
||||
version = "2.2.2";
|
||||
version = "2.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dolthub";
|
||||
repo = "dolt";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-vy5Bw8hALFlsQAYFoTnk0AX87ebiDDu0nGqVbaZ3P5E=";
|
||||
hash = "sha256-KCefzDqFMXpqtPPVOyD41hdM9j7p1kftO1cNaGzDT0w=";
|
||||
};
|
||||
|
||||
modRoot = "./go";
|
||||
subPackages = [ "cmd/dolt" ];
|
||||
vendorHash = "sha256-DO3lR4sjxFOSiO2YIri8PqH3cpNuxD45FWX7Ushov3s=";
|
||||
vendorHash = "sha256-CEqdHw9cFLcoewQyd4Y1yXdkSAdaQ/cRyVTxa5qCyMM=";
|
||||
proxyVendor = true;
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "fzf";
|
||||
version = "0.74.1";
|
||||
version = "0.74.2";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -19,10 +19,10 @@ buildGoModule (finalAttrs: {
|
||||
owner = "junegunn";
|
||||
repo = "fzf";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Dmd/Vpw/W/pz9Hhkwb22zPQyHGLbs3cDjDHVM8ymkrc=";
|
||||
hash = "sha256-b/dQOebD8pbg+oX2Q9n4hNqdKgW/xLp4HhoGKp6BaTM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-MLuoKPEAqrpCbUphYOCpHdo8MdW5kvueeDU/3loK33Q=";
|
||||
vendorHash = "sha256-NojjUf/3c4q4B96eQ/qcI+GdRvHakHUyMRaQ6/IZpEw=";
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
|
||||
@@ -1,26 +1,26 @@
|
||||
# Generated by ./update.sh - do not update manually!
|
||||
# Last updated: 2026-07-30
|
||||
# Last updated: 2026-08-01
|
||||
{ fetchurl }:
|
||||
{
|
||||
aarch64-darwin = {
|
||||
version = "6.9.98-2026-07-20";
|
||||
version = "6.9.99-2026-07-30";
|
||||
src = fetchurl {
|
||||
url = "https://qqdl.gtimg.cn/qqfile/QQNT/9.9.32/release/7ee184e7/QQ_6.9.98_260710_01.dmg";
|
||||
hash = "sha256-pDkK46kO5KxcGcDaQptKkgkH4XYEVUrUhxHvIXT1be4=";
|
||||
url = "https://qqdl.gtimg.cn/qqfile/QQNT/9.9.33/release/57c59cd0/QQ_6.9.99_260730_01.dmg";
|
||||
hash = "sha256-9ukIv0kmCpRtfiLoQxyjO5ZhRmYDJZ4j0YpZhCPV/mg=";
|
||||
};
|
||||
};
|
||||
aarch64-linux = {
|
||||
version = "3.2.31-2026-07-20";
|
||||
version = "3.2.32-2026-07-30";
|
||||
src = fetchurl {
|
||||
url = "https://qqdl.gtimg.cn/qqfile/QQNT/9.9.32/release/c390e792/QQ_3.2.31_260710_arm64_01.deb";
|
||||
hash = "sha256-rGBDcfXEhqz2y/g91mfmIu4fSH0Mi9QlYn3m1o/jSXQ=";
|
||||
url = "https://qqdl.gtimg.cn/qqfile/QQNT/9.9.33/release/c97651b2/QQ_3.2.32_260730_arm64_01.deb";
|
||||
hash = "sha256-7MAuJ7CuVaunIfBnHUSpGcJmQ0VmdKGFei0M3oBuDX4=";
|
||||
};
|
||||
};
|
||||
x86_64-linux = {
|
||||
version = "3.2.31-2026-07-20";
|
||||
version = "3.2.32-2026-07-30";
|
||||
src = fetchurl {
|
||||
url = "https://qqdl.gtimg.cn/qqfile/QQNT/9.9.32/release/c390e792/QQ_3.2.31_260710_amd64_01.deb";
|
||||
hash = "sha256-AvZ3/rHOAe0pOjx3YeXdhb15k29X3KpM21MXiuMOPW0=";
|
||||
url = "https://qqdl.gtimg.cn/qqfile/QQNT/9.9.33/release/c97651b2/QQ_3.2.32_260730_amd64_01.deb";
|
||||
hash = "sha256-ga4rhULvUxH8cuz1PJpSOSPINFacew2lLgv0Nguctfk=";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sshp";
|
||||
version = "1.1.4";
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bahamas10";
|
||||
repo = "sshp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-4DrNGQQ1ETKuLiB3N+3KnRxx4BEhrCOgskpowbF/KWc=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"man"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -D sshp "$out/bin/sshp"
|
||||
installManPage man/sshp.1
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Parallel SSH Executor";
|
||||
mainProgram = "sshp";
|
||||
longDescription = ''
|
||||
sshp manages multiple ssh processes and handles coalescing the output to the terminal.
|
||||
By default, sshp will read a file of newline-separated hostnames or IPs and fork ssh
|
||||
subprocesses for them, redirecting the stdout and stderr streams of the child
|
||||
line-by-line to stdout of sshp itself.
|
||||
'';
|
||||
homepage = "https://github.com/bahamas10/sshp";
|
||||
license = lib.licenses.mit;
|
||||
platforms = with lib.platforms; linux ++ darwin ++ freebsd;
|
||||
maintainers = with lib.maintainers; [ theCapypara ];
|
||||
};
|
||||
})
|
||||
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
||||
strictDeps = true;
|
||||
|
||||
preConfigure = ''
|
||||
if [ $doCheck -eq 1 ]; then
|
||||
if [ -n "$doCheck" ]; then
|
||||
sed -i '/gtest/d' third_party/CMakeLists.txt
|
||||
rmdir test/spec/testsuite
|
||||
ln -s ${testsuite} test/spec/testsuite
|
||||
@@ -62,6 +62,14 @@ stdenv.mkDerivation rec {
|
||||
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib python3 ../check.py $tests
|
||||
'';
|
||||
|
||||
# bin/binaryen-unittests is absent on cross builds which don't have doCheck,
|
||||
# so delete it on non-cross builds too (thus removing gtest from the closure).
|
||||
postInstall = ''
|
||||
if [ -n "$doCheck" ]; then
|
||||
rm "$out/bin/binaryen-unittests"
|
||||
fi
|
||||
'';
|
||||
|
||||
tests = [
|
||||
"version"
|
||||
"wasm-opt"
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "JeffSteinbok";
|
||||
domain = "dreo";
|
||||
version = "1.10.6";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit owner;
|
||||
repo = "hass-dreo";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-vfp5b5g9Rin0zN/eGhFNdxc77ulVKA8QnQNV70BvIy8=";
|
||||
hash = "sha256-oVAjt5OEknQnZnS1mn31QXqD/drXCt0hGsNt9PhrdFs=";
|
||||
};
|
||||
|
||||
dependencies = [ websockets ];
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "lichtteil";
|
||||
domain = "local_luftdaten";
|
||||
version = "2.4.0";
|
||||
version = "2.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lichtteil";
|
||||
repo = "local_luftdaten";
|
||||
tag = version;
|
||||
hash = "sha256-K8sQ/xm9aoJ6EBF9H9Y87m7a0OZN4y6T3DFZcSpPYOI=";
|
||||
hash = "sha256-VVMTZjxcfq/nAh4FhlDlkmLV45M9y5fkWa5s68Qd8oI=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
+3
-3
@@ -6,16 +6,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "material-you-utilities";
|
||||
version = "2.1.20";
|
||||
version = "2.1.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nerwyn";
|
||||
repo = "material-you-utilities";
|
||||
tag = version;
|
||||
hash = "sha256-viSavtA0eTiPdCgt00whBLvIL5RZSsC1zpJ0tQmGBRg=";
|
||||
hash = "sha256-jA27OFyEmxJ8wfOuw54omp87o+ckBvQmznv1cvCM/3o=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-c/ZM2sMG3M4/cTdClu6I3Pnx2GJ/1jFgJVmCKrbiIsI=";
|
||||
npmDepsHash = "sha256-gLFuF9AsL0QHGFzZFUrIgL5ueFDn3UTcRL8jdw9xQps=";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
Reference in New Issue
Block a user