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-11-22 12:07:57 +00:00
committed by GitHub
parent 16d96845c5 5774a6e057
commit a235a4c8bc
9 changed files with 45 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/editors/android-studio/default.nix
+2 -2
View File
@@ -20,8 +20,8 @@ let
sha256Hash = "sha256-eqai5G60OH3vH06iK4tKK2gCHvqFBlNHxBGHQ5/SUJY=";
};
betaVersion = {
version = "2025.2.2.5"; # "Android Studio Otter 2 Feature Drop | 2025.2.2 RC 1"
sha256Hash = "sha256-Z6HV0kx/28cn5IdUxQCWI5mhc8IIG64+9SAOzjzwcuI=";
version = "2025.2.2.6"; # "Android Studio Otter 2 Feature Drop | 2025.2.2 RC 2"
sha256Hash = "sha256-ciu+To5Kcus8FPDz1D43AD+qOqfPHaW4JsEBr9fx2PE=";
};
latestVersion = {
version = "2025.2.3.1"; # "Android Studio Otter 3 Feature Drop | 2025.2.3 Canary 1"
pkgs/applications/networking/cluster/terraform-providers/providers.json
+5 -5
View File
@@ -372,11 +372,11 @@
"vendorHash": "sha256-GEdgHY2cIiXxeIYev7zbGd4c+IyZZfeZtSj9Z/gG6E4="
},
"exoscale_exoscale": {
"hash": "sha256-dOgWrQoVMLGpTYaa80f22BS14073Iio9JrCyJl36caY=",
"hash": "sha256-8FIZO+iRqYa7y5Li8GoGnFT069vx4q4KczCgEB4SKuk=",
"homepage": "https://registry.terraform.io/providers/exoscale/exoscale",
"owner": "exoscale",
"repo": "terraform-provider-exoscale",
"rev": "v0.67.0",
"rev": "v0.67.1",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -462,13 +462,13 @@
"vendorHash": "sha256-UmlhKa2SVgrhRc1EOO9sEkherIS77CP+hkAL3Y79h3U="
},
"grafana_grafana": {
"hash": "sha256-ou8S+18+vFmfPr1GuB2KjHzDCAQ0OT/a/KcrivnWo0g=",
"hash": "sha256-GfWspwBBff1Ds9RFFKFTGLDpuS7VSVwG/9iXrR9Q5e8=",
"homepage": "https://registry.terraform.io/providers/grafana/grafana",
"owner": "grafana",
"repo": "terraform-provider-grafana",
"rev": "v4.14.0",
"rev": "v4.17.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-jdf10eXhTj0FGkG9bCZQYclbuGWwS0HAZX+4oET7oTQ="
"vendorHash": "sha256-Fs6xaO8I56mXRUqc63tTB+yQQeSZo72rMlgwqTyqH6Q="
},
"gridscale_gridscale": {
"hash": "sha256-XdBGD94kMLcB3ycZABVT+skiPg7rYyR4ycfvnubj6JM=",
pkgs/by-name/de/dediprog-sf100/package.nix
+3 -2
View File
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "DediProgSW";
repo = "SF100Linux";
rev = "V${finalAttrs.dediprogVersion}";
tag = "V${finalAttrs.dediprogVersion}";
hash = finalAttrs.dediprogHash;
};
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
doInstallCheck = true;
udevRules = pkgs.writeText "dediprog.rules" ''
ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="dada", MODE="660", GROUP="plugdev"
ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="dada", MODE="660", GROUP="plugdev", TAG+="uaccess"
'';
installPhase = ''
@@ -51,5 +51,6 @@ stdenv.mkDerivation (finalAttrs: {
thillux
felixsinger
];
mainProgram = "dpcmd";
};
})
pkgs/by-name/el/electrs/package.nix
+5 -5
View File
@@ -2,26 +2,26 @@
lib,
rustPlatform,
fetchFromGitHub,
rocksdb_7_10,
rocksdb_9_10,
}:
let
rocksdb = rocksdb_7_10;
rocksdb = rocksdb_9_10;
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "electrs";
version = "0.10.10";
version = "0.11.0";
src = fetchFromGitHub {
owner = "romanz";
repo = "electrs";
rev = "v${finalAttrs.version}";
hash = "sha256-FSsTo2m88U7t6wMXaSuYhF5bCMRq11EBQsq6uiMdF7c=";
hash = "sha256-MDdxu+ITEEUs+DXKfRKlwStT94Bv8tYIqh2eQlqPgrQ=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-hVPtnMqaFH+1QJ52ZG9vZ3clsMTsEpvF5JjTKWoKSPE=";
hash = "sha256-D8edLG3Zr/Qsk42husi/Nw1wGjvMb71Enl8hbifvLbk=";
};
# needed for librocksdb-sys
pkgs/by-name/ne/neocmakelsp/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "neocmakelsp";
version = "0.8.26";
version = "0.9.0";
src = fetchFromGitHub {
owner = "Decodetalkers";
repo = "neocmakelsp";
rev = "v${version}";
hash = "sha256-fJmkCi2xG0cJUxolhuT4Kuf0kK5tFLHcM9eFE1BDeFQ=";
hash = "sha256-TFan3gJ5j2sCfM3p8a2bqPwqzn1hFN8ZyCAwAdHRZBU=";
};
cargoHash = "sha256-DEIQbnNDd1JQpeVLwvpQccZlIRb/e1JTQtYdi4UsJq8=";
cargoHash = "sha256-lqD6o+QXapd6JWMEYUWpAmZK4EWkIlqc5ZN/fMmySTs=";
nativeBuildInputs = [
installShellFiles
pkgs/servers/monitoring/prometheus/alertmanager.nix → pkgs/by-name/pr/prometheus-alertmanager/package.nix
+13 -7
View File
@@ -5,17 +5,17 @@
fetchFromGitHub,
installShellFiles,
nixosTests,
versionCheckHook,
}:
buildGoModule rec {
buildGoModule (finalAttrs: {
pname = "alertmanager";
version = "0.29.0";
rev = "v${version}";
src = fetchFromGitHub {
inherit rev;
owner = "prometheus";
repo = "alertmanager";
tag = "v${finalAttrs.version}";
hash = "sha256-2uP4JCbQEe7/en5sBq/k73kqK6YVmuLvfiUy1fqPitw=";
};
@@ -31,8 +31,8 @@ buildGoModule rec {
t = "github.com/prometheus/common/version";
in
[
"-X ${t}.Version=${version}"
"-X ${t}.Revision=${src.rev}"
"-X ${t}.Version=${finalAttrs.version}"
"-X ${t}.Revision=unknown"
"-X ${t}.Branch=unknown"
"-X ${t}.BuildUser=nix@nixpkgs"
"-X ${t}.BuildDate=unknown"
@@ -50,11 +50,17 @@ buildGoModule rec {
passthru.tests = { inherit (nixosTests.prometheus) alertmanager; };
nativeInstallCheckInputs = [
versionCheckHook
];
doInstallCheck = true;
meta = with lib; {
description = "Alert dispatcher for the Prometheus monitoring system";
homepage = "https://github.com/prometheus/alertmanager";
changelog = "https://github.com/prometheus/alertmanager/blob/v${version}/CHANGELOG.md";
changelog = "https://github.com/prometheus/alertmanager/blob/v${finalAttrs.version}/CHANGELOG.md";
license = licenses.asl20;
mainProgram = "alertmanager";
maintainers = with maintainers; [
benley
fpletz
@@ -62,4 +68,4 @@ buildGoModule rec {
Frostman
];
};
}
})
pkgs/by-name/pr/prometheus-node-exporter/package.nix
+12 -7
View File
@@ -3,17 +3,17 @@
buildGoModule,
fetchFromGitHub,
nixosTests,
versionCheckHook,
}:
buildGoModule rec {
buildGoModule (finalAttrs: {
pname = "node_exporter";
version = "1.10.2";
rev = "v${version}";
src = fetchFromGitHub {
inherit rev;
owner = "prometheus";
repo = "node_exporter";
tag = "${finalAttrs.version}";
hash = "sha256-UaybbRmcvifXNwTNXg7mIYN9JnonSxwG62KfvU5auIE=";
};
@@ -27,8 +27,8 @@ buildGoModule rec {
ldflags = [
"-s"
"-w"
"-X github.com/prometheus/common/version.Version=${version}"
"-X github.com/prometheus/common/version.Revision=${rev}"
"-X github.com/prometheus/common/version.Version=${finalAttrs.version}"
"-X github.com/prometheus/common/version.Revision=unknown"
"-X github.com/prometheus/common/version.Branch=unknown"
"-X github.com/prometheus/common/version.BuildUser=nix@nixpkgs"
"-X github.com/prometheus/common/version.BuildDate=unknown"
@@ -36,11 +36,16 @@ buildGoModule rec {
passthru.tests = { inherit (nixosTests.prometheus-exporters) node; };
nativeInstallCheckInputs = [
versionCheckHook
];
doInstallCheck = true;
meta = {
description = "Prometheus exporter for machine metrics";
mainProgram = "node_exporter";
homepage = "https://github.com/prometheus/node_exporter";
changelog = "https://github.com/prometheus/node_exporter/blob/v${version}/CHANGELOG.md";
changelog = "https://github.com/prometheus/node_exporter/blob/v${finalAttrs.version}/CHANGELOG.md";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
benley
@@ -49,4 +54,4 @@ buildGoModule rec {
Frostman
];
};
}
})
pkgs/by-name/sw/swayimg/package.nix
+2 -2
View File
@@ -32,13 +32,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "swayimg";
version = "4.5";
version = "4.6";
src = fetchFromGitHub {
owner = "artemsen";
repo = "swayimg";
tag = "v${finalAttrs.version}";
hash = "sha256-Dne9Oj8dd/Skrvr7aCKwwdjw5Ocz+1LUTNwdDGLvQYY=";
hash = "sha256-Q5TqY5UgSGZVVoARcz1ig0UkZBKgRoT9Ndvg/f1T38Q=";
};
strictDeps = true;
pkgs/top-level/all-packages.nix
-1
View File
@@ -9530,7 +9530,6 @@ with pkgs;
postgrest = haskellPackages.postgrest.bin;
prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { };
prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { };
prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { };
prometheus-artifactory-exporter =
callPackage ../servers/monitoring/prometheus/artifactory-exporter.nix