nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 21:10:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-07-14 12:07:13 +00:00
committed by GitHub
parent ee2bbdbcae e43a656b16
commit 6126e64ff6
8 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/by-name/nw/nwg-panel/package.nix
View File

@@ -23,14 +23,14 @@
python3Packages.buildPythonApplication rec {
pname = "nwg-panel";
version = "0.10.8";
version = "0.10.10";
format = "setuptools";
src = fetchFromGitHub {
owner = "nwg-piotr";
repo = "nwg-panel";
tag = "v${version}";
hash = "sha256-DU9G11lR0nENE29yAsix946mmexLFK3eoqjZcyKYOH8=";
hash = "sha256-fZjjfblXFyB4npcv5xKXGqnqNCAdmvJTErI+0PcuaPk=";
};
# No tests

4
pkgs/by-name/pc/pcsx2-bin/package.nix
View File

@@ -7,11 +7,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "pcsx2-bin";
version = "2.3.180";
version = "2.4.0";
src = fetchurl {
url = "https://github.com/PCSX2/pcsx2/releases/download/v${finalAttrs.version}/pcsx2-v${finalAttrs.version}-macos-Qt.tar.xz";
hash = "sha256-FsYVTqQ9Se6SoSbHGUw8eLd6Y9ywaedlBy9fu/FYr7g=";
hash = "sha256-nExKu5WwBVxUA8P3DZ7SVln5zORXcR3lM/gWjFxgAV8=";
};
nativeBuildInputs = [ makeWrapper ];

2
pkgs/by-name/pc/pcsx2-bin/update.sh
View File

@@ -6,7 +6,7 @@ set -euo pipefail
cd "$(dirname "$0")" || exit 1
# Grab latest version, ignoring "latest" and "preview" tags
LATEST_VER="$(curl --fail -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/PCSX2/pcsx2/releases" | jq -r '.[0].tag_name' | sed 's/^v//')"
LATEST_VER="$(curl --fail -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/PCSX2/pcsx2/releases/latest" | jq -r '.tag_name' | sed 's/^v//')"
CURRENT_VER="$(grep -oP 'version = "\K[^"]+' package.nix)"
if [[ "$LATEST_VER" == "$CURRENT_VER" ]]; then

4
pkgs/by-name/sn/snapcraft/package.nix
View File

@@ -14,7 +14,7 @@
python312Packages.buildPythonApplication rec {
pname = "snapcraft";
version = "8.10.0";
version = "8.10.1";
pyproject = true;
@@ -22,7 +22,7 @@ python312Packages.buildPythonApplication rec {
owner = "canonical";
repo = "snapcraft";
tag = version;
hash = "sha256-k48OgHg0Pm3WfjPex27UvMZBOq9708vGJy/rZvCZdbg=";
hash = "sha256-WGCbqtuCOF5X8yOVrgLKWyDcqjpb8sbTPRZzVesnAIY=";
};
patches = [

13
pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix Normal file
View File

@@ -0,0 +1,13 @@
{ grafanaPlugin, lib }:
grafanaPlugin {
pname = "grafana-exploretraces-app";
version = "1.1.1";
zipHash = "sha256-vzLZvBxFF9TQBWvuAUrfWROIerOqPPjs/OKUyX1dBac=";
meta = with lib; {
description = "Opinionated traces app.";
license = licenses.agpl3Only;
teams = [ lib.teams.fslabs ];
platforms = platforms.unix;
};
}

13
pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix Normal file
View File

@@ -0,0 +1,13 @@
{ grafanaPlugin, lib }:
grafanaPlugin {
pname = "grafana-pyroscope-app";
version = "1.5.0";
zipHash = "sha256-C3TbXJa17ciEmvnKgw/5i6bq/5bzDe2iJebNaFFMxXQ=";
meta = with lib; {
description = "Profiles Drilldown is a native Grafana application designed to integrate seamlessly with Pyroscope, the open-source continuous profiling platform, providing a smooth, query-less experience for browsing and analyzing profiling data.";
license = licenses.agpl3Only;
teams = [ lib.teams.fslabs ];
platforms = platforms.unix;
};
}

2
pkgs/servers/monitoring/grafana/plugins/plugins.nix
View File

@@ -12,6 +12,7 @@
grafana-clickhouse-datasource = callPackage ./grafana-clickhouse-datasource { };
grafana-clock-panel = callPackage ./grafana-clock-panel { };
grafana-discourse-datasource = callPackage ./grafana-discourse-datasource { };
grafana-exploretraces-app = callPackage ./grafana-exploretraces-app { };
grafana-github-datasource = callPackage ./grafana-github-datasource { };
grafana-googlesheets-datasource = callPackage ./grafana-googlesheets-datasource { };
grafana-lokiexplore-app = callPackage ./grafana-lokiexplore-app { };
@@ -21,6 +22,7 @@
grafana-opensearch-datasource = callPackage ./grafana-opensearch-datasource { };
grafana-piechart-panel = callPackage ./grafana-piechart-panel { };
grafana-polystat-panel = callPackage ./grafana-polystat-panel { };
grafana-pyroscope-app = callPackage ./grafana-pyroscope-app { };
grafana-worldmap-panel = callPackage ./grafana-worldmap-panel { };
marcusolsson-calendar-panel = callPackage ./marcusolsson-calendar-panel { };
marcusolsson-csv-datasource = callPackage ./marcusolsson-csv-datasource { };

2
pkgs/top-level/all-packages.nix
View File

@@ -10242,7 +10242,7 @@ with pkgs;
freshrss-extensions = recurseIntoAttrs (callPackage ../servers/web-apps/freshrss/extensions { });
grafana = callPackage ../servers/monitoring/grafana { };
grafanaPlugins = callPackages ../servers/monitoring/grafana/plugins { };
grafanaPlugins = recurseIntoAttrs (callPackages ../servers/monitoring/grafana/plugins { });
hasura-cli = callPackage ../servers/hasura/cli.nix { };