From 0b93854119a56415d6e7d57e4b7f74289e2da8a2 Mon Sep 17 00:00:00 2001 From: Marie Ramlow Date: Fri, 27 Jun 2025 18:58:09 +0200 Subject: [PATCH 1/6] grafanaPlugins: recurse into package set --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03fb17ebc456..974581af9609 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10268,7 +10268,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 { }; From 5815bb720e8f6b292f4362a55b1f00bfd4110c2b Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Sat, 14 Jun 2025 10:25:51 +0100 Subject: [PATCH 2/6] pcsx2-bin: 2.3.180 -> 2.4.0 --- pkgs/by-name/pc/pcsx2-bin/package.nix | 4 ++-- pkgs/by-name/pc/pcsx2-bin/update.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pc/pcsx2-bin/package.nix b/pkgs/by-name/pc/pcsx2-bin/package.nix index b9c8c0f3880c..7310b25301d5 100644 --- a/pkgs/by-name/pc/pcsx2-bin/package.nix +++ b/pkgs/by-name/pc/pcsx2-bin/package.nix @@ -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 ]; diff --git a/pkgs/by-name/pc/pcsx2-bin/update.sh b/pkgs/by-name/pc/pcsx2-bin/update.sh index 8748a75a3bbc..943d2693d201 100755 --- a/pkgs/by-name/pc/pcsx2-bin/update.sh +++ b/pkgs/by-name/pc/pcsx2-bin/update.sh @@ -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 From ddf59fde7cd1dd1d79b937dc73c6822be9f4fa17 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Jul 2025 17:50:21 +0000 Subject: [PATCH 3/6] snapcraft: 8.10.0 -> 8.10.1 --- pkgs/by-name/sn/snapcraft/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sn/snapcraft/package.nix b/pkgs/by-name/sn/snapcraft/package.nix index aeb6ca1b3206..8173976d6e18 100644 --- a/pkgs/by-name/sn/snapcraft/package.nix +++ b/pkgs/by-name/sn/snapcraft/package.nix @@ -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 = [ From f32354ec135e2b0365d37c153b1eaae45f779922 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Mon, 14 Jul 2025 11:19:16 +0200 Subject: [PATCH 4/6] grafanaPlugins.grafana-pyroscope-app: init at 1.5.0 https://github.com/grafana/profiles-drilldown --- .../plugins/grafana-pyroscope-app/default.nix | 13 +++++++++++++ pkgs/servers/monitoring/grafana/plugins/plugins.nix | 1 + 2 files changed, 14 insertions(+) create mode 100644 pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix new file mode 100644 index 000000000000..d7d915552a45 --- /dev/null +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix @@ -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; + }; +} diff --git a/pkgs/servers/monitoring/grafana/plugins/plugins.nix b/pkgs/servers/monitoring/grafana/plugins/plugins.nix index 3b20f29f2be9..a44c72d13808 100644 --- a/pkgs/servers/monitoring/grafana/plugins/plugins.nix +++ b/pkgs/servers/monitoring/grafana/plugins/plugins.nix @@ -21,6 +21,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 { }; From 093c773271e3ddd54af77ad4d5f8cc1e8a77b9a6 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Mon, 14 Jul 2025 11:20:21 +0200 Subject: [PATCH 5/6] grafanaPlugins.grafana-exploretraces-app: init at 1.1.1 https://github.com/grafana/traces-drilldown --- .../plugins/grafana-exploretraces-app/default.nix | 13 +++++++++++++ pkgs/servers/monitoring/grafana/plugins/plugins.nix | 1 + 2 files changed, 14 insertions(+) create mode 100644 pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix new file mode 100644 index 000000000000..3e57035a9946 --- /dev/null +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix @@ -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; + }; +} diff --git a/pkgs/servers/monitoring/grafana/plugins/plugins.nix b/pkgs/servers/monitoring/grafana/plugins/plugins.nix index 3b20f29f2be9..97f83fcb35d6 100644 --- a/pkgs/servers/monitoring/grafana/plugins/plugins.nix +++ b/pkgs/servers/monitoring/grafana/plugins/plugins.nix @@ -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 { }; From 4aeb573618f0a782426f137981d6a06261f3db31 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Jul 2025 10:39:57 +0000 Subject: [PATCH 6/6] nwg-panel: 0.10.8 -> 0.10.10 --- pkgs/by-name/nw/nwg-panel/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nw/nwg-panel/package.nix b/pkgs/by-name/nw/nwg-panel/package.nix index 13f7f529a92f..ae21c462c22d 100644 --- a/pkgs/by-name/nw/nwg-panel/package.nix +++ b/pkgs/by-name/nw/nwg-panel/package.nix @@ -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