Merge remote-tracking branch 'origin/master' into staging-next

This commit is contained in:
K900
2025-04-13 07:09:59 +03:00
22 changed files with 109 additions and 126 deletions
+2
View File
@@ -63,6 +63,8 @@
- The `ephemeral` package was removed due to upstream archival in early 2022.
- The `vocal` package was removed due to upstream archival. The upstream developer suggests using `gnome-podcasts` or `kasts` instead.
- [testers.shellcheck](https://nixos.org/manual/nixpkgs/unstable/#tester-shellcheck) now warns when `name` is not provided.
The `name` argument will become mandatory in a future release.
+7 -10
View File
@@ -6,22 +6,19 @@
nix-update-script,
cosmic-comp,
}:
let
version = "1.1.0";
in
rustPlatform.buildRustPackage {
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-ext-ctl";
inherit version;
version = "1.4.0";
src = fetchFromGitHub {
owner = "cosmic-utils";
repo = "cosmic-ctl";
tag = "v${version}";
hash = "sha256-dcUzrJcwJpzbYPuqdHgm43NYbaowsFmFP4sS0cfzNAg=";
tag = "v${finalAttrs.version}";
hash = "sha256-4UbmzBKxJwpyzucPRguQV1078961goiQlhtDjOGz1kA=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-EReo2hkBaIO1YOBx4D9rQSXlx+3NK5VQtj59jfZZI/0=";
cargoHash = "sha256-53lpHzHQ6SoZzd+h6O0NvSJHsPgbW0/kqnDrM5D6SWQ=";
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
@@ -31,11 +28,11 @@ rustPlatform.buildRustPackage {
meta = {
description = "CLI for COSMIC Desktop configuration management";
changelog = "https://github.com/cosmic-utils/cosmic-ctl/releases/tag/v${version}";
changelog = "https://github.com/cosmic-utils/cosmic-ctl/releases/tag/v${finalAttrs.version}";
homepage = "https://github.com/cosmic-utils/cosmic-ctl";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ HeitorAugustoLN ];
mainProgram = "cosmic-ctl";
inherit (cosmic-comp.meta) platforms;
};
}
})
+2 -2
View File
@@ -9,13 +9,13 @@
gcc14Stdenv.mkDerivation (finalAttrs: {
pname = "hyprlang";
version = "0.6.0";
version = "0.6.1";
src = fetchFromGitHub {
owner = "hyprwm";
repo = "hyprlang";
rev = "v${finalAttrs.version}";
hash = "sha256-oj8V4kvzor5AOStzj4/B4W1ZIObAPxT9K4NfXx7dyKE=";
hash = "sha256-9HySx+EtsbbKlZDlY+naqqOV679VdxP6x6fP3wxDXJk=";
};
nativeBuildInputs = [
+58
View File
@@ -0,0 +1,58 @@
{
lib,
python3Packages,
fetchFromGitHub,
versionCheckHook,
nix-update-script,
}:
let
version = "1.2.1";
in
python3Packages.buildPythonApplication {
pname = "letsdns";
inherit version;
pyproject = true;
src = fetchFromGitHub {
owner = "LetsDNS";
repo = "letsdns";
tag = version;
hash = "sha256-TwGVm7sEOPvUqtvaAuIU/X5W3H4VAC8dskNunt8UO0I=";
};
build-system = [
python3Packages.setuptools
];
nativeCheckInputs = [
python3Packages.pytestCheckHook
versionCheckHook
];
dependencies = with python3Packages; [
cryptography
dnspython
requests
];
disabledTestPaths = [
# These tests require upstream certificates
"tests/test_action.py"
];
env = {
UNITTEST_CONF = "tests/citest.conf";
};
passthru.updateScript = nix-update-script { };
meta = {
description = "Manage DANE TLSA records in DNS servers";
homepage = "https://www.letsdns.de/";
downloadPage = "https://github.com/LetsDNS/letsdns";
changelog = "https://github.com/LetsDNS/letsdns/releases/tag/${version}";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ rseichter ];
mainProgram = "letsdns";
};
}
-98
View File
@@ -1,98 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
nix-update-script,
cmake,
ninja,
vala,
pkg-config,
pantheon,
gtk3,
glib,
glib-networking,
libxml2,
webkitgtk_4_0,
clutter-gtk,
clutter-gst,
libunity,
libnotify,
sqlite,
gst_all_1,
json-glib,
libgee,
wrapGAppsHook3,
}:
stdenv.mkDerivation rec {
pname = "vocal";
version = "2.4.2";
src = fetchFromGitHub {
owner = "needle-and-thread";
repo = pname;
rev = version;
sha256 = "1c4n89rdl9r13kmmh2qymmy9sa6shjwai7df48k2kfn0pnzq5mad";
};
nativeBuildInputs = [
cmake
libxml2
ninja
vala
pkg-config
wrapGAppsHook3
];
buildInputs = with gst_all_1; [
clutter-gst
clutter-gtk
glib
gst-plugins-base
gst-plugins-good
gstreamer
gtk3
json-glib
libgee
libnotify
libunity
pantheon.granite
sqlite
webkitgtk_4_0
glib-networking
];
patches = [
# granite 6.0.0 removed about dialogs
# see: https://github.com/needle-and-thread/vocal/issues/483
(fetchpatch {
name = "remove-about.patch";
url = "https://raw.githubusercontent.com/archlinux/svntogit-community/03543ffdb6cd52ce1a8293f3303225b3afac2431/trunk/remove-about.patch";
sha256 = "sha256-yGD7BYOTmqs4h+Odh/mB3fI1HM7GDO6F+QaHpRUD5p4=";
})
];
postPatch = ''
# Fix build with vala 0.56
# https://github.com/needle-and-thread/vocal/pull/503
substituteInPlace src/Vocal.vala \
--replace "public const OptionEntry[] app_options" "private const OptionEntry[] app_options"
'';
passthru = {
updateScript = nix-update-script { };
};
meta = with lib; {
description = "Podcast client for the modern free desktop";
longDescription = ''
Vocal is a powerful, fast, and intuitive application that helps users find new podcasts, manage their libraries, and enjoy the best that independent audio and video publishing has to offer. Vocal features full support for both episode downloading and streaming, native system integration, iTunes store search and top 100 charts (with international results support), iTunes link parsing, OPML importing and exporting, and so much more. Plus, it has great smart features like automatically keeping your library clean from old files, and the ability to set custom skip intervals.
'';
homepage = "https://github.com/needle-and-thread/vocal";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ ] ++ teams.pantheon.members;
platforms = platforms.linux;
mainProgram = "com.github.needleandthread.vocal";
};
}
@@ -15,7 +15,7 @@ mkYaziPlugin {
};
meta = {
description = "Yazi plugin that uses duckdb to preview data files.";
description = "Yazi plugin that uses duckdb to preview data files";
homepage = "https://github.com/wylie102/duckdb.yazi";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ khaneliman ];
@@ -15,7 +15,7 @@ mkYaziPlugin {
};
meta = {
description = "Glow preview plugin for yazi.";
description = "Glow preview plugin for yazi";
homepage = "https://github.com/Reledia/glow.yazi";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ khaneliman ];
@@ -15,7 +15,7 @@ mkYaziPlugin {
};
meta = {
description = "Lazygit plugin for yazi.";
description = "Lazygit plugin for yazi";
homepage = "https://github.com/Lil-Dank/lazygit.yazi";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ khaneliman ];
@@ -15,7 +15,7 @@ mkYaziPlugin {
};
meta = {
description = "Yazi plugin for previewing media files.";
description = "Yazi plugin for previewing media files";
homepage = "https://github.com/boydaihungst/mediainfo.yazi";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ khaneliman ];
@@ -15,7 +15,7 @@ mkYaziPlugin {
};
meta = {
description = "Miller, now in yazi.";
description = "Miller, now in yazi";
homepage = "https://github.com/Reledia/miller.yazi";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ khaneliman ];
@@ -15,7 +15,7 @@ mkYaziPlugin {
};
meta = {
description = "A Yazi plugin to preview archives.";
description = "Yazi plugin to preview archives";
homepage = "https://github.com/ndtoan96/ouch.yazi";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ khaneliman ];
@@ -15,7 +15,7 @@ mkYaziPlugin {
};
meta = {
description = "A yazi plugin that adds the functionality to save and load projects.";
description = "Yazi plugin that adds the functionality to save and load projects";
homepage = "https://github.com/MasouShizuka/projects.yazi";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ khaneliman ];
@@ -15,7 +15,7 @@ mkYaziPlugin {
};
meta = {
description = "Yazi plugin based about vim motions.";
description = "Yazi plugin based about vim motions";
homepage = "https://github.com/dedukun/relative-motions.yazi";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ khaneliman ];
@@ -15,7 +15,7 @@ mkYaziPlugin {
};
meta = {
description = "Undo/Recover trashed files/folders.";
description = "Undo/Recover trashed files/folders";
homepage = "https://github.com/boydaihungst/restore.yazi";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ khaneliman ];
@@ -15,7 +15,7 @@ mkYaziPlugin {
};
meta = {
description = "Preview file types using rich in Yazi.";
description = "Preview file types using rich in Yazi";
homepage = "https://github.com/AnirudhG07/rich-preview.yazi";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ khaneliman ];
@@ -15,7 +15,7 @@ mkYaziPlugin {
};
meta = {
description = "Starship prompt plugin for yazi.";
description = "Starship prompt plugin for yazi";
homepage = "https://github.com/Rolv-Apneseth/starship.yazi";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ khaneliman ];
@@ -15,7 +15,7 @@ mkYaziPlugin {
};
meta = {
description = "Call `sudo` in yazi.";
description = "Call `sudo` in yazi";
homepage = "https://github.com/TD-Sky/sudo.yazi";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ khaneliman ];
@@ -15,7 +15,7 @@ mkYaziPlugin {
};
meta = {
description = "A yazi plugin for browsing backwards and forwards in time via BTRFS / ZFS snapshots.";
description = "Yazi plugin for browsing backwards and forwards in time via BTRFS / ZFS snapshots";
homepage = "https://github.com/iynaix/time-travel.yazi";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ khaneliman ];
@@ -0,0 +1,23 @@
{
lib,
fetchFromGitHub,
mkYaziPlugin,
}:
mkYaziPlugin {
pname = "yatline-catppuccin.yazi";
version = "0-unstable-2025-03-05";
src = fetchFromGitHub {
owner = "imsi32";
repo = "yatline-catppuccin.yazi";
rev = "8cc4773ecab8ee8995485d53897e1c46991a7fea";
hash = "sha256-Wz53zjwFyflnxCIMjAv+nzcgDriJwVYBX81pFXJUzc4=";
};
meta = {
description = "Soothing pastel theme for Yatline";
homepage = "https://github.com/imsi32/yatline-catppuccin.yazi";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ khaneliman ];
};
}
@@ -15,7 +15,7 @@ mkYaziPlugin {
};
meta = {
description = "Yazi plugin for customizing both header-line and status-line.";
description = "Yazi plugin for customizing both header-line and status-line";
homepage = "https://github.com/imsi32/yatline.yazi";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ khaneliman ];
@@ -71,14 +71,14 @@
stdenv.mkDerivation rec {
pname = "home-assistant-chip-wheels";
version = "2024.11.4";
version = "2025.4.0";
src = fetchFromGitHub {
owner = "home-assistant-libs";
repo = "chip-wheels";
tag = version;
fetchSubmodules = false;
leaveDotGit = true;
hash = "sha256-hWdTm/Ojdvz0s9qIXbOs3yll7XfAdoTZrg4dgu7ISns=";
hash = "sha256-20dqVXHPgSxBveTxlbHEjTtp9NI1oVCVpBTDbjDI2QA=";
postFetch = ''
cd $out
# Download connectedhomeip.
+1
View File
@@ -1812,6 +1812,7 @@ mapAliases {
vistafonts-cht = vista-fonts-cht; # Added 2025-02-03
vkBasalt = vkbasalt; # Added 2022-11-22
vkdt-wayland = vkdt; # Added 2024-04-19
vocal = throw "'vocal' has been archived upstream. Consider using 'gnome-podcasts' or 'kasts' instead."; # Added 2025-04-12
void = throw "'void' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
volnoti = throw "'volnoti' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
vuze = throw "'vuze' was removed because it is unmaintained upstream and insecure (CVE-2018-13417). BiglyBT is a maintained fork."; # Added 2024-11-22