Skip to content

Commit 83a5e12

Browse files
committed
Merge remote-tracking branch 'origin/master' into staging-next
2 parents bd8d4dc + ae29fc7 commit 83a5e12

File tree

22 files changed

+109
-126
lines changed

22 files changed

+109
-126
lines changed

doc/release-notes/rl-2505.section.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@
6363

6464
- The `ephemeral` package was removed due to upstream archival in early 2022.
6565

66+
- The `vocal` package was removed due to upstream archival. The upstream developer suggests using `gnome-podcasts` or `kasts` instead.
67+
6668
- [testers.shellcheck](https://nixos.org/manual/nixpkgs/unstable/#tester-shellcheck) now warns when `name` is not provided.
6769
The `name` argument will become mandatory in a future release.
6870

pkgs/by-name/co/cosmic-ext-ctl/package.nix

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,19 @@
66
nix-update-script,
77
cosmic-comp,
88
}:
9-
let
10-
version = "1.1.0";
11-
in
12-
rustPlatform.buildRustPackage {
9+
rustPlatform.buildRustPackage (finalAttrs: {
1310
pname = "cosmic-ext-ctl";
14-
inherit version;
11+
version = "1.4.0";
1512

1613
src = fetchFromGitHub {
1714
owner = "cosmic-utils";
1815
repo = "cosmic-ctl";
19-
tag = "v${version}";
20-
hash = "sha256-dcUzrJcwJpzbYPuqdHgm43NYbaowsFmFP4sS0cfzNAg=";
16+
tag = "v${finalAttrs.version}";
17+
hash = "sha256-4UbmzBKxJwpyzucPRguQV1078961goiQlhtDjOGz1kA=";
2118
};
2219

2320
useFetchCargoVendor = true;
24-
cargoHash = "sha256-EReo2hkBaIO1YOBx4D9rQSXlx+3NK5VQtj59jfZZI/0=";
21+
cargoHash = "sha256-53lpHzHQ6SoZzd+h6O0NvSJHsPgbW0/kqnDrM5D6SWQ=";
2522

2623
doInstallCheck = true;
2724
nativeInstallCheckInputs = [ versionCheckHook ];
@@ -31,11 +28,11 @@ rustPlatform.buildRustPackage {
3128

3229
meta = {
3330
description = "CLI for COSMIC Desktop configuration management";
34-
changelog = "https://github.com/cosmic-utils/cosmic-ctl/releases/tag/v${version}";
31+
changelog = "https://github.com/cosmic-utils/cosmic-ctl/releases/tag/v${finalAttrs.version}";
3532
homepage = "https://github.com/cosmic-utils/cosmic-ctl";
3633
license = lib.licenses.gpl3Only;
3734
maintainers = with lib.maintainers; [ HeitorAugustoLN ];
3835
mainProgram = "cosmic-ctl";
3936
inherit (cosmic-comp.meta) platforms;
4037
};
41-
}
38+
})

pkgs/by-name/hy/hyprlang/package.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99

1010
gcc14Stdenv.mkDerivation (finalAttrs: {
1111
pname = "hyprlang";
12-
version = "0.6.0";
12+
version = "0.6.1";
1313

1414
src = fetchFromGitHub {
1515
owner = "hyprwm";
1616
repo = "hyprlang";
1717
rev = "v${finalAttrs.version}";
18-
hash = "sha256-oj8V4kvzor5AOStzj4/B4W1ZIObAPxT9K4NfXx7dyKE=";
18+
hash = "sha256-9HySx+EtsbbKlZDlY+naqqOV679VdxP6x6fP3wxDXJk=";
1919
};
2020

2121
nativeBuildInputs = [
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
{
2+
lib,
3+
python3Packages,
4+
fetchFromGitHub,
5+
versionCheckHook,
6+
nix-update-script,
7+
}:
8+
let
9+
version = "1.2.1";
10+
in
11+
python3Packages.buildPythonApplication {
12+
pname = "letsdns";
13+
inherit version;
14+
pyproject = true;
15+
16+
src = fetchFromGitHub {
17+
owner = "LetsDNS";
18+
repo = "letsdns";
19+
tag = version;
20+
hash = "sha256-TwGVm7sEOPvUqtvaAuIU/X5W3H4VAC8dskNunt8UO0I=";
21+
};
22+
23+
build-system = [
24+
python3Packages.setuptools
25+
];
26+
27+
nativeCheckInputs = [
28+
python3Packages.pytestCheckHook
29+
versionCheckHook
30+
];
31+
32+
dependencies = with python3Packages; [
33+
cryptography
34+
dnspython
35+
requests
36+
];
37+
38+
disabledTestPaths = [
39+
# These tests require upstream certificates
40+
"tests/test_action.py"
41+
];
42+
43+
env = {
44+
UNITTEST_CONF = "tests/citest.conf";
45+
};
46+
47+
passthru.updateScript = nix-update-script { };
48+
49+
meta = {
50+
description = "Manage DANE TLSA records in DNS servers";
51+
homepage = "https://www.letsdns.de/";
52+
downloadPage = "https://github.com/LetsDNS/letsdns";
53+
changelog = "https://github.com/LetsDNS/letsdns/releases/tag/${version}";
54+
license = lib.licenses.gpl3Only;
55+
maintainers = with lib.maintainers; [ rseichter ];
56+
mainProgram = "letsdns";
57+
};
58+
}

pkgs/by-name/vo/vocal/package.nix

Lines changed: 0 additions & 98 deletions
This file was deleted.

pkgs/by-name/ya/yazi/plugins/duckdb/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ mkYaziPlugin {
1515
};
1616

1717
meta = {
18-
description = "Yazi plugin that uses duckdb to preview data files.";
18+
description = "Yazi plugin that uses duckdb to preview data files";
1919
homepage = "https://github.com/wylie102/duckdb.yazi";
2020
license = lib.licenses.mit;
2121
maintainers = with lib.maintainers; [ khaneliman ];

pkgs/by-name/ya/yazi/plugins/glow/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ mkYaziPlugin {
1515
};
1616

1717
meta = {
18-
description = "Glow preview plugin for yazi.";
18+
description = "Glow preview plugin for yazi";
1919
homepage = "https://github.com/Reledia/glow.yazi";
2020
license = lib.licenses.mit;
2121
maintainers = with lib.maintainers; [ khaneliman ];

pkgs/by-name/ya/yazi/plugins/lazygit/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ mkYaziPlugin {
1515
};
1616

1717
meta = {
18-
description = "Lazygit plugin for yazi.";
18+
description = "Lazygit plugin for yazi";
1919
homepage = "https://github.com/Lil-Dank/lazygit.yazi";
2020
license = lib.licenses.mit;
2121
maintainers = with lib.maintainers; [ khaneliman ];

pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ mkYaziPlugin {
1515
};
1616

1717
meta = {
18-
description = "Yazi plugin for previewing media files.";
18+
description = "Yazi plugin for previewing media files";
1919
homepage = "https://github.com/boydaihungst/mediainfo.yazi";
2020
license = lib.licenses.mit;
2121
maintainers = with lib.maintainers; [ khaneliman ];

pkgs/by-name/ya/yazi/plugins/miller/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ mkYaziPlugin {
1515
};
1616

1717
meta = {
18-
description = "Miller, now in yazi.";
18+
description = "Miller, now in yazi";
1919
homepage = "https://github.com/Reledia/miller.yazi";
2020
license = lib.licenses.mit;
2121
maintainers = with lib.maintainers; [ khaneliman ];

0 commit comments

Comments
 (0)