gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-nixos

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-12-16 06:09:11 +00:00
committed by GitHub
parent 7de43bc53a e331e0e1c9
commit ab1713fa16
15 changed files with 42 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/github-teams.json
+3 -3
View File
@@ -55,7 +55,7 @@
},
"beam": {
"description": "Maintain BEAM-related packages and modules.",
"id": 4502493,
"id": 15530553,
"maintainers": {
"happysalada": 5317234
},
@@ -139,7 +139,7 @@
},
"crystal-lang": {
"description": "The Crystal Lang eco-system",
"id": 3806663,
"id": 15530580,
"maintainers": {
"peterhoeg": 722550
},
@@ -726,9 +726,9 @@
"description": "Maintain Nixpkgs' in-tree Continuous Integration, including GitHub Actions",
"id": 13362067,
"maintainers": {
"philiptaron": 43863,
"MattSturgeon": 5046562,
"Mic92": 96200,
"philiptaron": 43863,
"zowoq": 59103226
},
"members": {},
nixos/tests/jenkins.nix
+9 -8
View File
@@ -93,6 +93,7 @@
configWithoutJobs = "${nodes.master.system.build.toplevel}/specialisation/noJenkinsJobs";
jenkinsPort = nodes.master.services.jenkins.port;
jenkinsUrl = "http://localhost:${toString jenkinsPort}";
jenkinsHome = nodes.master.services.jenkins.home;
in
''
start_all()
@@ -112,12 +113,12 @@
with subtest("jobs are declarative"):
# Check that jobs are created on disk.
master.wait_until_succeeds("test -f /var/lib/jenkins/jobs/job-1/config.xml")
master.wait_until_succeeds("test -f /var/lib/jenkins/jobs/folder-1/config.xml")
master.wait_until_succeeds("test -f /var/lib/jenkins/jobs/folder-1/jobs/job-2/config.xml")
master.wait_until_succeeds("test -f ${jenkinsHome}/jobs/job-1/config.xml")
master.wait_until_succeeds("test -f ${jenkinsHome}/jobs/folder-1/config.xml")
master.wait_until_succeeds("test -f ${jenkinsHome}/jobs/folder-1/jobs/job-2/config.xml")
# Verify that jenkins also sees the jobs.
out = master.succeed("${pkgs.jenkins}/bin/jenkins-cli -s ${jenkinsUrl} -auth admin:$(cat /var/lib/jenkins/secrets/initialAdminPassword) list-jobs")
out = master.succeed("${pkgs.jenkins}/bin/jenkins-cli -s ${jenkinsUrl} -auth admin:$(cat ${jenkinsHome}/secrets/initialAdminPassword) list-jobs")
jobs = [x.strip() for x in out.splitlines()]
# Seeing jobs inside folders requires the Folders plugin
# (https://plugins.jenkins.io/cloudbees-folder/), which we don't have
@@ -129,12 +130,12 @@
)
# Check that jobs are removed from disk.
master.wait_until_fails("test -f /var/lib/jenkins/jobs/job-1/config.xml")
master.wait_until_fails("test -f /var/lib/jenkins/jobs/folder-1/config.xml")
master.wait_until_fails("test -f /var/lib/jenkins/jobs/folder-1/jobs/job-2/config.xml")
master.wait_until_fails("test -f ${jenkinsHome}/jobs/job-1/config.xml")
master.wait_until_fails("test -f ${jenkinsHome}/jobs/folder-1/config.xml")
master.wait_until_fails("test -f ${jenkinsHome}/jobs/folder-1/jobs/job-2/config.xml")
# Verify that jenkins also sees the jobs as removed.
out = master.succeed("${pkgs.jenkins}/bin/jenkins-cli -s ${jenkinsUrl} -auth admin:$(cat /var/lib/jenkins/secrets/initialAdminPassword) list-jobs")
out = master.succeed("${pkgs.jenkins}/bin/jenkins-cli -s ${jenkinsUrl} -auth admin:$(cat ${jenkinsHome}/secrets/initialAdminPassword) list-jobs")
jobs = [x.strip() for x in out.splitlines()]
assert jobs == [], f"jobs != []: {jobs}"
'';
pkgs/applications/networking/cluster/terraform-providers/providers.json
+6 -6
View File
@@ -516,11 +516,11 @@
"vendorHash": null
},
"hashicorp_azurerm": {
"hash": "sha256-/q33S2+m7C/ZYSnTqb3NDVdPPufSWTNs/3JlcGc9JCs=",
"hash": "sha256-C/uh67joPBOaPZ/9q4KdxSIb8KF4tU0j6j2Uw6n5XvU=",
"homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
"owner": "hashicorp",
"repo": "terraform-provider-azurerm",
"rev": "v4.55.0",
"rev": "v4.56.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -1237,11 +1237,11 @@
"vendorHash": "sha256-cX5K221Jnq701Nb+2bC1LmXVL7YvkZ8dkc2wYjDNOSw="
},
"splunk-terraform_signalfx": {
"hash": "sha256-4szC65B96XkinJlGq2tTJBwnIYvjILnbSQtiA5Ujl64=",
"hash": "sha256-Wixg+biff6OER/nXYa+WGXG7svs4T3E/qwPlV5xJEao=",
"homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx",
"owner": "splunk-terraform",
"repo": "terraform-provider-signalfx",
"rev": "v9.23.0",
"rev": "v9.23.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-HWAUI0mowVP8FPw44xYaFOTh6jjkfXa7fuPk2zoSZJ8="
},
@@ -1273,11 +1273,11 @@
"vendorHash": "sha256-IR6KjFW5GbsOIm3EEFyx3ctwhbifZlcNaZeGhbeK/Wo="
},
"sysdiglabs_sysdig": {
"hash": "sha256-a31DMe+fzCvANueh5Pslg4UpJnRDnhc9sjES2Vj9SJ4=",
"hash": "sha256-04LRhKCh1AmhhKaDT8+Un9hziJ5l7qrCCKAyBEacEOI=",
"homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig",
"owner": "sysdiglabs",
"repo": "terraform-provider-sysdig",
"rev": "v3.2.0",
"rev": "v3.3.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-rWiafaFE1RolO9JUN1WoW4EWJjR7kpfeVEOTLf21j50="
},
pkgs/by-name/ch/chglog/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "chglog";
version = "0.7.3";
version = "0.7.4";
src = fetchFromGitHub {
owner = "goreleaser";
repo = "chglog";
tag = "v${version}";
hash = "sha256-PULQNe7V18NMxmIgvId1cFU1DuSbNeDk4cB1aMx3OHc=";
hash = "sha256-gDTZFUaaAnv/eJ9ZoygUNvfJE8PJc5vcGhd+Qown0SY=";
};
vendorHash = "sha256-kw6vOxqBvHfD5ooJsufX2xpUCFKWzThKzpBBNKL60Ko=";
vendorHash = "sha256-1IZJ/Mq1Oskm7UU0IYfGtOHBFwIzpTLn68OSD0K8hyM=";
ldflags = [
"-s"
pkgs/by-name/co/coppwr/package.nix
+2 -4
View File
@@ -41,8 +41,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
];
preBuild = ''
mkdir -p $out/share/{applications,icons/hicolor/scalable/apps,metainfo}
install -m 444 \
-D $src/assets/io.github.dimtpap.coppwr.desktop \
-t $out/share/applications
@@ -51,12 +49,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
-t $out/share/metainfo
install -m 444 \
-D $src/assets/icon/scalable.svg \
-t $out/share/icons/hicolor/scalable/apps/io.github.dimtpap.coppwr.svg
$out/share/icons/hicolor/scalable/apps/io.github.dimtpap.coppwr.svg
for size in 32 48 64 128 256 512; do
mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
install -m 444 \
-D $src/assets/icon/"$size".png \
-t $out/share/icons/hicolor/"$size"x"$size"/apps/io.github.dimtpap.coppwr.png
$out/share/icons/hicolor/"$size"x"$size"/apps/io.github.dimtpap.coppwr.png
done
'';
pkgs/by-name/if/ifstate/package.nix
+2
View File
@@ -33,7 +33,9 @@ let
(
[
mkdocs-material
mike
mkdocs-glightbox
mkdocs-macros-plugin
mkdocs-minify-plugin
]
++ mkdocs-material.optional-dependencies.imaging
pkgs/by-name/ov/ovn/package.nix
+2 -2
View File
@@ -26,13 +26,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "ovn";
version = "25.09.1";
version = "25.09.2";
src = fetchFromGitHub {
owner = "ovn-org";
repo = "ovn";
tag = "v${finalAttrs.version}";
hash = "sha256-utNMWYMjm511+mkHC/Fe6wJ11vk1HAi0dHlk9JwBYl0=";
hash = "sha256-JcOc9rNtpGhr+dn+dXltA+WTJZa3bEgqyS4zjlVM+Uc=";
fetchSubmodules = true;
};
pkgs/by-name/ti/tilt/assets.nix
+1 -1
View File
@@ -68,7 +68,7 @@ stdenvNoCC.mkDerivation {
dontInstall = true;
outputHashAlgo = "sha256";
outputHash = "sha256-UdNvUSz86E1W1gVPQrxt5g3Z3JIX/tq8rI5E8+h20PI=";
outputHash = "sha256-rhZFEqAzkJ9YxefLGCUHoEduIjv/Nb8M996yuHJIqcI=";
outputHashMode = "recursive";
};
pkgs/by-name/ti/tilt/package.nix
+2 -2
View File
@@ -9,13 +9,13 @@ let
running in development environment and try to serve assets from the
source tree, which is not there once build completes.
*/
version = "0.35.2";
version = "0.36.0";
src = fetchFromGitHub {
owner = "tilt-dev";
repo = "tilt";
tag = "v${version}";
hash = "sha256-QHW2lX92Yj43BwhAfHDLPXTeyrnRjaWs64GpXMzEzAk=";
hash = "sha256-M0QZvm+a5sJ6+2xkH3n2yG3SW416VP1fuK6DkFOsQKY=";
};
};
pkgs/by-name/vi/victoriametrics/package.nix
+2 -2
View File
@@ -13,13 +13,13 @@
buildGoModule (finalAttrs: {
pname = "VictoriaMetrics";
version = "1.131.0";
version = "1.132.0";
src = fetchFromGitHub {
owner = "VictoriaMetrics";
repo = "VictoriaMetrics";
tag = "v${finalAttrs.version}";
hash = "sha256-pfOspKTDEMIRdsRJQ/IVViNKL/hojceHyAUuOKKHJO8=";
hash = "sha256-s/RgWc8mJDsU9BL/HPCIGc/cy0Jsg5jxUPuDUcPLymI=";
};
vendorHash = null;
pkgs/by-name/vi/visual-paradigm-ce/package.nix
+2 -2
View File
@@ -9,7 +9,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "visual-paradigm-ce";
version = "17.3.20251201";
version = "17.3.20251221";
src =
let
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
url = "https://eu10-dl.visual-paradigm.com/visual-paradigm/vpce${majorMinor}/${suffix}/Visual_Paradigm_CE_${
builtins.replaceStrings [ "." ] [ "_" ] majorMinor
}_${suffix}_Linux64_InstallFree.tar.gz";
hash = "sha256-qHatD+W2SP9bLrOoIDXDNGdNKYoL52XdC6mVdelMFdc=";
hash = "sha256-N2REwBXhKBqyVPb9YfWCBSJfqFXDorsXvnHX+5gQrS4=";
};
nativeBuildInputs = [
pkgs/development/ocaml-modules/conduit/async.nix
+2
View File
@@ -1,6 +1,7 @@
{
buildDunePackage,
async,
async_ssl ? null,
ppx_sexp_conv,
ppx_here,
uri,
@@ -25,6 +26,7 @@ buildDunePackage {
propagatedBuildInputs = [
async
async_ssl
conduit
uri
ipaddr
pkgs/development/python-modules/pytibber/default.nix
+2 -2
View File
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "pytibber";
version = "0.33.1";
version = "0.34.0";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "pyTibber";
tag = version;
hash = "sha256-UzPS7EukcnBWfsAANgpmOmWWI9Nv8eKocceVrmlISJg=";
hash = "sha256-xL/6obdpAH2+OsuapUnqqfDLrSoDRuDut0+7Ex7SgZU=";
};
build-system = [ setuptools ];
pkgs/os-specific/linux/kernel/zen-kernels.nix
+2 -2
View File
@@ -16,9 +16,9 @@ let
variants = {
# ./update-zen.py zen
zen = {
version = "6.18"; # zen
version = "6.18.1"; # zen
suffix = "zen1"; # zen
sha256 = "04bi1xmlllxhmqy9h6y0gnw82bhkh42rzzwc72rn8rknbb7qq8bj"; # zen
sha256 = "1y3xp1zf6d1vxqb6crnpp1wn6j4xfcpjd11k05h85ggsq3ry10z5"; # zen
isLqx = false;
};
# ./update-zen.py lqx
pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix
+2 -2
View File
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "advanced-camera-card";
version = "7.20.0";
version = "7.25.3";
src = fetchzip {
url = "https://github.com/dermotduffy/advanced-camera-card/releases/download/v${version}/advanced-camera-card.zip";
hash = "sha256-X92IztnaGh7rLIzYiFSGagVi8o1xM/FFuu9YmNRUhSg=";
hash = "sha256-uJsqnJAAQNqVryAJ495c6Cvv+1tHLwZyWSzRcf5pfns=";
};
# TODO: build from source once yarn berry support lands in nixpkgs