mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
Merge release-26.05 into staging-next-26.05
This commit is contained in:
nixpkgs-ci[bot]
GitHub
commit
dbdeb4a062
93 changed files with 893 additions and 841 deletions
|
|
@ -309,8 +309,7 @@
|
|||
"members": {
|
||||
"AndersonTorres": 5954806,
|
||||
"adisbladis": 63286,
|
||||
"panchoh": 471059,
|
||||
"ttuegel": 563054
|
||||
"panchoh": 471059
|
||||
},
|
||||
"name": "emacs"
|
||||
},
|
||||
|
|
@ -407,12 +406,13 @@
|
|||
"gnome": {
|
||||
"description": "Maintain GNOME desktop environment and platform.",
|
||||
"id": 3806133,
|
||||
"maintainers": {},
|
||||
"maintainers": {
|
||||
"jtojnar": 705123
|
||||
},
|
||||
"members": {
|
||||
"bobby285271": 20080233,
|
||||
"dasj19": 7589338,
|
||||
"hedning": 71978,
|
||||
"jtojnar": 705123
|
||||
"hedning": 71978
|
||||
},
|
||||
"name": "GNOME"
|
||||
},
|
||||
|
|
@ -702,6 +702,7 @@
|
|||
"Mic92": 96200,
|
||||
"Radvendii": 1239929,
|
||||
"edolstra": 1148549,
|
||||
"lisanna-dettwyler": 72424138,
|
||||
"lovesegfault": 7243783,
|
||||
"xokdvium": 145775305
|
||||
},
|
||||
|
|
@ -819,14 +820,13 @@
|
|||
"description": "Maintain the Qt framework, KDE application suite, Plasma desktop environment and related projects",
|
||||
"id": 4341481,
|
||||
"maintainers": {
|
||||
"ttuegel": 563054
|
||||
"K900": 386765,
|
||||
"NickCao": 15247171,
|
||||
"SuperSandro2000": 7258858
|
||||
},
|
||||
"members": {
|
||||
"FRidh": 2129135,
|
||||
"K900": 386765,
|
||||
"LunNova": 782440,
|
||||
"NickCao": 15247171,
|
||||
"SuperSandro2000": 7258858,
|
||||
"bkchr": 5718007,
|
||||
"ilya-fedin": 17829319,
|
||||
"mjm": 1181,
|
||||
|
|
@ -896,8 +896,7 @@
|
|||
"id": 7304571,
|
||||
"maintainers": {
|
||||
"Mic92": 96200,
|
||||
"winterqt": 78392041,
|
||||
"zowoq": 59103226
|
||||
"winterqt": 78392041
|
||||
},
|
||||
"members": {},
|
||||
"name": "rust"
|
||||
|
|
|
|||
|
|
@ -49,6 +49,7 @@ lpeglabel,,,,1.6.0,,
|
|||
lrexlib-gnu,,,,,,
|
||||
lrexlib-oniguruma,,,,,,junestepp
|
||||
lrexlib-pcre,,,,,,
|
||||
lrexlib-pcre2,,,,,,wishstudio
|
||||
lrexlib-posix,,,,,,
|
||||
lsp-progress.nvim,,,,,5.1,gepbird
|
||||
lsqlite3,,,,,,
|
||||
|
|
|
|||
|
|
|
@ -30,7 +30,6 @@ let
|
|||
mapAttrsToList
|
||||
mergeAttrsList
|
||||
mkEnableOption
|
||||
mkDefault
|
||||
mkIf
|
||||
mkMerge
|
||||
mkOption
|
||||
|
|
|
|||
|
|
@ -91,9 +91,9 @@ let
|
|||
# files required to exist also won't be present, so missingok is forced.
|
||||
user=$(${pkgs.buildPackages.coreutils}/bin/id -un)
|
||||
group=$(${pkgs.buildPackages.coreutils}/bin/id -gn)
|
||||
sed -e "s/\bsu\s.*/su $user $group/" \
|
||||
-e "s/\b\(create\s\+[0-9]*\s*\|createolddir\s\+[0-9]*\s\+\).*/\1$user $group/" \
|
||||
-e "1imissingok" -e "s/\bnomissingok\b//" \
|
||||
sed -E -e "s/\bsu\s.*/su $user $group/" \
|
||||
-e "s/\b((create|createolddir)\b(\s+[0-9]+)?).*/\1 $user $group/" \
|
||||
-e "1imissingok" -e "s/\bnomissingok\b//" \
|
||||
$out > logrotate.conf
|
||||
# Since this makes for very verbose builds only show real error.
|
||||
# There is no way to control log level, but logrotate hardcodes
|
||||
|
|
|
|||
|
|
@ -66,8 +66,10 @@ in
|
|||
checkConf = {
|
||||
su = "root utmp";
|
||||
createolddir = "0750 root utmp";
|
||||
"createolddir " = "0750";
|
||||
create = "root utmp";
|
||||
"create " = "0750 root utmp";
|
||||
"create " = "0750";
|
||||
};
|
||||
# multiple paths should be aggregated
|
||||
multipath = {
|
||||
|
|
|
|||
|
|
@ -13,18 +13,18 @@
|
|||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
let
|
||||
version = "0.8.0";
|
||||
version = "0.8.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dmtrKovalenko";
|
||||
repo = "fff.nvim";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-JbV2dTQhTyZgDZYvFoR1mz9CeM2IPv59Qmp2iiJC8a0=";
|
||||
hash = "sha256-w88NovzYVTiUVZmgvvmRvRq1didlbxMJYtKj1A3VB/Y=";
|
||||
};
|
||||
fff-nvim-lib = rustPlatform.buildRustPackage {
|
||||
pname = "fff-nvim-lib";
|
||||
inherit version src;
|
||||
|
||||
cargoHash = "sha256-L/Ens/wzw/jKaa1T3A2pLIBKs09saPEk/0bRhgRezPQ=";
|
||||
cargoHash = "sha256-2LGrohseOYdroUFY3cHy57HzgfS34CBuIbN1AFuYTUg=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"-p"
|
||||
|
|
@ -65,9 +65,12 @@ let
|
|||
openssl
|
||||
];
|
||||
|
||||
# This test requires curl and GitHub access
|
||||
checkFlags = [
|
||||
# This test requires curl and GitHub access
|
||||
"--skip=update_check::tests::test_update_check_end_to_end"
|
||||
|
||||
# This test depends on catching a race window and is not deterministic
|
||||
"--skip=drop_during_post_scan_does_not_crash"
|
||||
];
|
||||
|
||||
env = {
|
||||
|
|
|
|||
|
|
@ -228,7 +228,7 @@ let
|
|||
terminal = false;
|
||||
}
|
||||
// (
|
||||
if libName == "thunderbird" then
|
||||
if lib.strings.hasPrefix "thunderbird" libName then
|
||||
{
|
||||
genericName = "Email Client";
|
||||
comment = "Read and write e-mails or RSS feeds, or manage tasks on calendars.";
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
lib,
|
||||
fetchFromGitea,
|
||||
fetchFromCodeberg,
|
||||
rustPlatform,
|
||||
pkg-config,
|
||||
lz4,
|
||||
|
|
@ -17,8 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
pname = "awww";
|
||||
version = "0.12.1";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
src = fetchFromCodeberg {
|
||||
owner = "LGFae";
|
||||
repo = "awww";
|
||||
tag = "v${finalAttrs.version}";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
lib,
|
||||
python3Packages,
|
||||
fetchFromGitea,
|
||||
fetchFromCodeberg,
|
||||
makeWrapper,
|
||||
libjpeg,
|
||||
exiftool,
|
||||
|
|
@ -11,8 +11,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
|||
pname = "cropgui";
|
||||
version = "0.9";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
src = fetchFromCodeberg {
|
||||
owner = "jepler";
|
||||
repo = "cropgui";
|
||||
tag = "v${finalAttrs.version}";
|
||||
|
|
|
|||
47
pkgs/by-name/ds/dssd/package.nix
Normal file
47
pkgs/by-name/ds/dssd/package.nix
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
dbus,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "dssd";
|
||||
version = "0.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ylxdzsw";
|
||||
repo = "dssd";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-gAV4gwrfvYfc2f1tDY/cNOFMrQzrzHSmEFsKg7ke/6c=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-yX2/2TW3FNbqwzR6+5yP26E2Eps0bTJgJJrDIQG2KQU=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace dssd.service org.freedesktop.secrets.service \
|
||||
--replace-fail /usr/bin/dssd $out/bin/dssd
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ dbus ];
|
||||
|
||||
postInstall = ''
|
||||
install dssd.service -Dt $out/lib/systemd/user/
|
||||
install org.freedesktop.secrets.service -Dt $out/share/dbus-1/system-services/
|
||||
'';
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
meta = {
|
||||
description = "Dead Simple Secret Daemon";
|
||||
homepage = "https://github.com/ylxdzsw/dssd";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "dssd";
|
||||
maintainers = with lib.maintainers; [ phanirithvij ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
|
@ -6,10 +6,10 @@
|
|||
|
||||
let
|
||||
pname = "fflogs";
|
||||
version = "9.3.17";
|
||||
version = "9.3.61";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage";
|
||||
hash = "sha256-EYo65CerGE14kQadNIaVyANvyBig/yW1PfulAAE6dxo=";
|
||||
hash = "sha256-QBiZR8wjhMsLguzBaM21mADlR1hKHdBuK66DcSzyVtQ=";
|
||||
};
|
||||
extracted = appimageTools.extractType2 { inherit pname version src; };
|
||||
in
|
||||
|
|
|
|||
|
|
@ -8,10 +8,10 @@ Subject: [PATCH] Install fwupdplugin to out
|
|||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 1a56d3308..c7bf2c9aa 100644
|
||||
index 0d756bc0e748ba1c7be64bb9357f28fe8c5342e6..0cfca8e45b7ed6cc63be470ac0df916639ef52c4 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -734,7 +734,7 @@ if build_standalone
|
||||
@@ -719,7 +719,7 @@ if build_standalone
|
||||
if host_machine.system() == 'windows'
|
||||
libdir_pkg = bindir
|
||||
else
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ Subject: [PATCH] Add output for installed tests
|
|||
4 files changed, 10 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/data/tests/meson.build b/data/tests/meson.build
|
||||
index e15cab2fa..bad033dbf 100644
|
||||
index 377ba2ccaa5e13a87443cbe65406eb5a9a3af79b..2dfb5f251383464c38e2f3202c9dfb1107ac7798 100644
|
||||
--- a/data/tests/meson.build
|
||||
+++ b/data/tests/meson.build
|
||||
@@ -139,7 +139,7 @@ configure_file(
|
||||
|
|
@ -22,12 +22,12 @@ index e15cab2fa..bad033dbf 100644
|
|||
+ install_dir: join_paths(get_option('installed_test_prefix'), 'etc', 'fwupd', 'remotes.d'),
|
||||
)
|
||||
|
||||
if umockdev_integration_tests.allowed()
|
||||
if umockdev.found()
|
||||
diff --git a/meson.build b/meson.build
|
||||
index c7bf2c9aa..bf77bf6d6 100644
|
||||
index 0cfca8e45b7ed6cc63be470ac0df916639ef52c4..1561d1837a73425d9dda510d0ba25d16f92ed7f7 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -241,8 +241,8 @@ else
|
||||
@@ -243,8 +243,8 @@ else
|
||||
includedir = join_paths(prefix, get_option('includedir'))
|
||||
sysconfdir = join_paths(prefix, get_option('sysconfdir'))
|
||||
localstatedir = join_paths(prefix, get_option('localstatedir'))
|
||||
|
|
@ -38,7 +38,7 @@ index c7bf2c9aa..bf77bf6d6 100644
|
|||
daemon_dir = join_paths(libexecdir, 'fwupd')
|
||||
endif
|
||||
mandir = join_paths(prefix, get_option('mandir'))
|
||||
@@ -722,6 +722,7 @@ gnome = import('gnome')
|
||||
@@ -707,6 +707,7 @@ gnome = import('gnome')
|
||||
i18n = import('i18n')
|
||||
|
||||
conf.set_quoted('FWUPD_PREFIX', prefix)
|
||||
|
|
@ -47,10 +47,10 @@ index c7bf2c9aa..bf77bf6d6 100644
|
|||
conf.set_quoted('FWUPD_LIBDIR', libdir)
|
||||
conf.set_quoted('FWUPD_LIBEXECDIR', libexecdir)
|
||||
diff --git a/meson_options.txt b/meson_options.txt
|
||||
index eb57391eb..420997355 100644
|
||||
index 6fe15e8beb8a85acdaca15f212bd3a917990ced2..b89ba371cee9dccf8457414f316ca697ef33216a 100644
|
||||
--- a/meson_options.txt
|
||||
+++ b/meson_options.txt
|
||||
@@ -198,6 +198,11 @@ option(
|
||||
@@ -193,6 +193,11 @@ option(
|
||||
value: 'fwupd-refresh',
|
||||
description: 'User account to use for fwupd-refresh.service (empty for DynamicUser)',
|
||||
)
|
||||
|
|
@ -63,7 +63,7 @@ index eb57391eb..420997355 100644
|
|||
'tests',
|
||||
type: 'boolean',
|
||||
diff --git a/src/tests/host-emulate/meson.build b/src/tests/host-emulate/meson.build
|
||||
index c36da65cd..f0b70d4d6 100644
|
||||
index c36da65cd67e6081a758ed2ab7327276fb82d804..f0b70d4d68de6f534f1c1ecd37e51619ad1d85e7 100644
|
||||
--- a/src/tests/host-emulate/meson.build
|
||||
+++ b/src/tests/host-emulate/meson.build
|
||||
@@ -9,7 +9,7 @@ if build_standalone
|
||||
|
|
|
|||
|
|
@ -7,15 +7,15 @@ Subject: [PATCH] Add option for installation sysconfdir
|
|||
data/bios-settings.d/meson.build | 2 +-
|
||||
data/meson.build | 2 +-
|
||||
data/pki/meson.build | 4 ++--
|
||||
data/remotes.d/meson.build | 8 ++++----
|
||||
data/remotes.d/meson.build | 10 +++++-----
|
||||
docs/meson.build | 16 ++++++++--------
|
||||
meson.build | 6 ++++++
|
||||
meson_options.txt | 6 ++++++
|
||||
plugins/uefi-capsule/meson.build | 4 ++--
|
||||
8 files changed, 30 insertions(+), 18 deletions(-)
|
||||
8 files changed, 31 insertions(+), 19 deletions(-)
|
||||
|
||||
diff --git a/data/bios-settings.d/meson.build b/data/bios-settings.d/meson.build
|
||||
index 2a2a07016..99df55afb 100644
|
||||
index 2a2a0701612e54a838d4d72f2bb00a793a31e0a3..99df55afb7636b090e2f57a5033bec6fe0017c15 100644
|
||||
--- a/data/bios-settings.d/meson.build
|
||||
+++ b/data/bios-settings.d/meson.build
|
||||
@@ -2,6 +2,6 @@ if build_standalone and host_machine.system() == 'linux'
|
||||
|
|
@ -27,7 +27,7 @@ index 2a2a07016..99df55afb 100644
|
|||
)
|
||||
endif
|
||||
diff --git a/data/meson.build b/data/meson.build
|
||||
index 70d08c55e..5a5d8bf46 100644
|
||||
index 74a9104c333330ce2aacaa7cac45c87d6c5c8e53..3d9cc87b443078888c6e72075095d644a9258dab 100644
|
||||
--- a/data/meson.build
|
||||
+++ b/data/meson.build
|
||||
@@ -29,7 +29,7 @@ if build_standalone
|
||||
|
|
@ -38,27 +38,26 @@ index 70d08c55e..5a5d8bf46 100644
|
|||
+ install_dir: join_paths(sysconfdir_install, 'fwupd'),
|
||||
install_mode: 'rw-r-----',
|
||||
)
|
||||
plugin_quirks += files('cfi.quirk', 'ds20.quirk', 'power.quirk', 'vendors.quirk')
|
||||
plugin_quirks += files(
|
||||
diff --git a/data/pki/meson.build b/data/pki/meson.build
|
||||
index b87068405..21f59753a 100644
|
||||
index 7574aebc60617d8d8456c210bb19fcaf25263e74..05e6642454123e715e2f80501cf1919f96905fde 100644
|
||||
--- a/data/pki/meson.build
|
||||
+++ b/data/pki/meson.build
|
||||
@@ -8,11 +8,11 @@ if supported_pkcs7
|
||||
install_data(
|
||||
['LVFS-CA.pem', 'LVFS-CA-2025PQ.pem'],
|
||||
install_tag: 'runtime',
|
||||
- install_dir: join_paths(sysconfdir, 'pki', 'fwupd'),
|
||||
+ install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd'),
|
||||
)
|
||||
install_data(
|
||||
['LVFS-CA.pem', 'LVFS-CA-2025PQ.pem'],
|
||||
install_tag: 'runtime',
|
||||
- install_dir: join_paths(sysconfdir, 'pki', 'fwupd-metadata'),
|
||||
+ install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd-metadata'),
|
||||
)
|
||||
endif
|
||||
@@ -1,10 +1,10 @@
|
||||
install_data(
|
||||
['LVFS-CA.pem', 'LVFS-CA-2025PQ.pem'],
|
||||
install_tag: 'runtime',
|
||||
- install_dir: join_paths(sysconfdir, 'pki', 'fwupd'),
|
||||
+ install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd'),
|
||||
)
|
||||
install_data(
|
||||
['LVFS-CA.pem', 'LVFS-CA-2025PQ.pem'],
|
||||
install_tag: 'runtime',
|
||||
- install_dir: join_paths(sysconfdir, 'pki', 'fwupd-metadata'),
|
||||
+ install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd-metadata'),
|
||||
)
|
||||
diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build
|
||||
index b8d24c267..0dd4ad32a 100644
|
||||
index c0b4862ce6e13861da967cc2b8442849f63f0520..8bd00e9dbefd0ff386ad61f08ec861e7ad005090 100644
|
||||
--- a/data/remotes.d/meson.build
|
||||
+++ b/data/remotes.d/meson.build
|
||||
@@ -12,7 +12,7 @@ if build_standalone and get_option('lvfs') != 'false'
|
||||
|
|
@ -75,11 +74,20 @@ index b8d24c267..0dd4ad32a 100644
|
|||
install: true,
|
||||
install_tag: 'runtime',
|
||||
- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
|
||||
+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
|
||||
)
|
||||
configure_file(
|
||||
input: 'lvfs-embargo.conf',
|
||||
@@ -28,7 +28,7 @@ if build_standalone and get_option('lvfs') != 'false'
|
||||
configuration: con3,
|
||||
install: true,
|
||||
install_tag: 'runtime',
|
||||
- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
|
||||
+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
|
||||
)
|
||||
i18n.merge_file(
|
||||
input: 'lvfs.metainfo.xml',
|
||||
@@ -59,7 +59,7 @@ configure_file(
|
||||
@@ -67,7 +67,7 @@ configure_file(
|
||||
configuration: con2,
|
||||
install: get_option('vendor_metadata'),
|
||||
install_tag: 'runtime',
|
||||
|
|
@ -88,7 +96,7 @@ index b8d24c267..0dd4ad32a 100644
|
|||
)
|
||||
configure_file(
|
||||
input: 'vendor-directory.conf',
|
||||
@@ -67,5 +67,5 @@ configure_file(
|
||||
@@ -75,5 +75,5 @@ configure_file(
|
||||
configuration: con2,
|
||||
install: true,
|
||||
install_tag: 'runtime',
|
||||
|
|
@ -96,7 +104,7 @@ index b8d24c267..0dd4ad32a 100644
|
|||
+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
|
||||
)
|
||||
diff --git a/docs/meson.build b/docs/meson.build
|
||||
index b4d48b086..8a1f8fc8c 100644
|
||||
index b4d48b086baf03a2f713ab9c7cb17e60b2a9d12b..8a1f8fc8ca9fc21f278575233348ca918635c161 100644
|
||||
--- a/docs/meson.build
|
||||
+++ b/docs/meson.build
|
||||
@@ -196,7 +196,7 @@ if build_docs
|
||||
|
|
@ -161,10 +169,10 @@ index b4d48b086..8a1f8fc8c 100644
|
|||
)
|
||||
endif
|
||||
diff --git a/meson.build b/meson.build
|
||||
index bf77bf6d6..f1f51e841 100644
|
||||
index 1561d1837a73425d9dda510d0ba25d16f92ed7f7..917770b38abb86056d6c42fa9c99dedf27ebe999 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -248,6 +248,12 @@ endif
|
||||
@@ -250,6 +250,12 @@ endif
|
||||
mandir = join_paths(prefix, get_option('mandir'))
|
||||
localedir = join_paths(prefix, get_option('localedir'))
|
||||
|
||||
|
|
@ -178,7 +186,7 @@ index bf77bf6d6..f1f51e841 100644
|
|||
gio = dependency(
|
||||
'gio-2.0',
|
||||
diff --git a/meson_options.txt b/meson_options.txt
|
||||
index 420997355..67b3058d5 100644
|
||||
index b89ba371cee9dccf8457414f316ca697ef33216a..0dc66c4ec1ecb1547a21c4ec673ac1032462d91e 100644
|
||||
--- a/meson_options.txt
|
||||
+++ b/meson_options.txt
|
||||
@@ -14,6 +14,12 @@ option(
|
||||
|
|
@ -195,7 +203,7 @@ index 420997355..67b3058d5 100644
|
|||
'build',
|
||||
type: 'combo',
|
||||
diff --git a/plugins/uefi-capsule/meson.build b/plugins/uefi-capsule/meson.build
|
||||
index f104f36d7..30356ea53 100644
|
||||
index c2eb3b4300437d0d6b87d934441e69c306ba99a8..5c90240170c11ad3c75840ab6913018b6f7de85f 100644
|
||||
--- a/plugins/uefi-capsule/meson.build
|
||||
+++ b/plugins/uefi-capsule/meson.build
|
||||
@@ -23,7 +23,7 @@ if host_machine.system() == 'linux'
|
||||
|
|
|
|||
|
|
@ -8,10 +8,10 @@ Subject: [PATCH] Get the efi app from fwupd-efi
|
|||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index f1f51e841..aaefe55d9 100644
|
||||
index 917770b38abb86056d6c42fa9c99dedf27ebe999..f52f3ec12dd9def0a68ea1645f7d508acbb731b9 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -646,7 +646,7 @@ endif
|
||||
@@ -651,7 +651,7 @@ endif
|
||||
|
||||
# EFI
|
||||
if build_standalone
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchpatch,
|
||||
|
||||
# runPythonCommand
|
||||
runCommand,
|
||||
|
|
@ -37,7 +36,6 @@
|
|||
fwupd-efi,
|
||||
gnutls,
|
||||
gusb,
|
||||
libcbor,
|
||||
libdrm,
|
||||
libgudev,
|
||||
libjcat,
|
||||
|
|
@ -55,7 +53,6 @@
|
|||
tpm2-tss,
|
||||
valgrind,
|
||||
xz, # for liblzma
|
||||
flashrom,
|
||||
|
||||
# mesonFlags
|
||||
hwdata,
|
||||
|
|
@ -76,16 +73,12 @@
|
|||
nixosTests,
|
||||
nix-update-script,
|
||||
|
||||
enableFlashrom ? false,
|
||||
enablePassim ? false,
|
||||
}:
|
||||
|
||||
let
|
||||
isx86 = stdenv.hostPlatform.isx86;
|
||||
|
||||
# Experimental
|
||||
haveFlashrom = isx86 && enableFlashrom;
|
||||
|
||||
runPythonCommand =
|
||||
name: buildCommandPython:
|
||||
|
||||
|
|
@ -129,7 +122,7 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fwupd";
|
||||
version = "2.1.1";
|
||||
version = "2.1.4";
|
||||
|
||||
# libfwupd goes to lib
|
||||
# daemon, plug-ins and libfwupdplugin go to out
|
||||
|
|
@ -147,7 +140,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
owner = "fwupd";
|
||||
repo = "fwupd";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-pb5BBA+3KTeZZ8WyNDaY9EKNTxp4MT/3G/MEgQ+Nysk=";
|
||||
hash = "sha256-bKBEZR7Wzi9nZYH+KAzh1q+sh2t2Gl3puQmeogNdIsE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -168,18 +161,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
# EFI capsule is located in fwupd-efi now.
|
||||
./0004-Get-the-efi-app-from-fwupd-efi.patch
|
||||
|
||||
# FIXME: remove patches that fix CI on aarch64 after next release
|
||||
(fetchpatch {
|
||||
url = "https://github.com/fwupd/fwupd/commit/b3d721360faa4de7dd6960d8f9f8f13aa310715f.patch";
|
||||
sha256 = "sha256-x37QCK7XBzUUjUj1m3jaNe1qvaqtszB9DGFyF8gC3Ig=";
|
||||
name = "fix-mtdram-test-for-missing-kernel-module.patch";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/fwupd/fwupd/commit/9ad8b76dc6c5af005a2c712ae3a6f352b51e9eea.patch";
|
||||
sha256 = "sha256-h9zLTHeJbfDoamdfICKc0ohQ51yJC4I/CK0SQ4H6rRk=";
|
||||
name = "fix-test_get_devices-on-non-x86-architectures.patch";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -207,7 +188,9 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
ensureNewerSourcesForZipFilesHook # required for firmware zipping
|
||||
gettext
|
||||
gi-docgen
|
||||
gnutls.bin
|
||||
gobject-introspection
|
||||
libjcat.bin
|
||||
libxml2
|
||||
meson
|
||||
ninja
|
||||
|
|
@ -230,7 +213,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
fwupd-efi
|
||||
gnutls
|
||||
gusb
|
||||
libcbor
|
||||
libdrm
|
||||
libgudev
|
||||
libjcat
|
||||
|
|
@ -247,13 +229,9 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
tpm2-tss
|
||||
valgrind
|
||||
xz # for liblzma
|
||||
]
|
||||
++ lib.optionals haveFlashrom [
|
||||
flashrom
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
(lib.mesonEnable "docs" true)
|
||||
# We are building the official releases.
|
||||
(lib.mesonEnable "supported_build" true)
|
||||
(lib.mesonOption "systemd_root_prefix" "${placeholder "out"}")
|
||||
|
|
@ -262,7 +240,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
"--sysconfdir=/etc"
|
||||
(lib.mesonOption "sysconfdir_install" "${placeholder "out"}/etc")
|
||||
(lib.mesonOption "efi_os_dir" "nixos")
|
||||
(lib.mesonEnable "plugin_modem_manager" true)
|
||||
# HSI is auto-disabled on non-x86 upstream; auto_features=enabled overrides
|
||||
# that, breaking the fwupdtool installed test which expects rc=1 on non-x86.
|
||||
(lib.mesonEnable "hsi" isx86)
|
||||
|
|
@ -276,9 +253,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
]
|
||||
++ lib.optionals (!enablePassim) [
|
||||
(lib.mesonEnable "passim" false)
|
||||
]
|
||||
++ lib.optionals (!haveFlashrom) [
|
||||
(lib.mesonEnable "plugin_flashrom" false)
|
||||
];
|
||||
|
||||
# TODO: wrapGAppsHook3 wraps efi capsule even though it is not ELF
|
||||
|
|
@ -356,6 +330,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
updateScript = nix-update-script { };
|
||||
filesInstalledToEtc = [
|
||||
"fwupd/fwupd.conf"
|
||||
"fwupd/remotes.d/lvfs-embargo.conf"
|
||||
"fwupd/remotes.d/lvfs-testing.conf"
|
||||
"fwupd/remotes.d/lvfs.conf"
|
||||
"fwupd/remotes.d/vendor.conf"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitea,
|
||||
fetchFromCodeberg,
|
||||
appstream,
|
||||
cmake,
|
||||
desktop-file-utils,
|
||||
|
|
@ -27,8 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
pname = "gamepad-mirror";
|
||||
version = "0.3-unstable-2025-10-18";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
src = fetchFromCodeberg {
|
||||
owner = "vendillah";
|
||||
repo = "GamepadMirror";
|
||||
rev = "aa86d55f21b4d206eab61d0bf7cd9ccafc8aa607";
|
||||
|
|
|
|||
44
pkgs/by-name/gi/git-pages/package.nix
Normal file
44
pkgs/by-name/gi/git-pages/package.nix
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromCodeberg,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "git-pages";
|
||||
version = "0.9.0";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "git-pages";
|
||||
repo = "git-pages";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-yuOiA8TmLV5RQ7rmhH0Ac/6gN1t6wgyUkvMOJqEMV4U=";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorHash = "sha256-NNIkzgRki2rtCVUnnhT44rEBcMZYiJPmsXySpxiHYR0=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-X main.versionOverride=${finalAttrs.src.tag}"
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "-version";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Scalable static site server for Git forges (like GitHub Pages or Netlify";
|
||||
homepage = "https://codeberg.org/git-pages/git-pages";
|
||||
changelog = "https://codeberg.org/git-pages/git-pages/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.bsd0;
|
||||
maintainers = with lib.maintainers; [ drupol ];
|
||||
mainProgram = "git-pages";
|
||||
};
|
||||
})
|
||||
|
|
@ -1,13 +1,12 @@
|
|||
{
|
||||
mkDerivation,
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
qtbase,
|
||||
qtscript,
|
||||
qt5,
|
||||
cmake,
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "grantlee";
|
||||
version = "5.3.1";
|
||||
grantleePluginPrefix = "lib/grantlee/${lib.versions.majorMinor version}";
|
||||
|
|
@ -20,10 +19,13 @@ mkDerivation rec {
|
|||
};
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtscript
|
||||
qt5.qtbase
|
||||
qt5.qtscript
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
qt5.wrapQtAppsHook
|
||||
];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
patches = [
|
||||
./grantlee-nix-profiles.patch
|
||||
|
|
@ -63,6 +65,6 @@ mkDerivation rec {
|
|||
homepage = "https://github.com/steveire/grantlee";
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
license = lib.licenses.lgpl21;
|
||||
inherit (qtbase.meta) platforms;
|
||||
inherit (qt5.qtbase.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitea,
|
||||
fetchFromCodeberg,
|
||||
python3,
|
||||
sqlite,
|
||||
}:
|
||||
|
|
@ -10,8 +10,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
pname = "hittekaart";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
src = fetchFromCodeberg {
|
||||
owner = "dunj3";
|
||||
repo = "hittekaart";
|
||||
tag = "v${finalAttrs.version}";
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@
|
|||
libxcrypt,
|
||||
mimalloc,
|
||||
openssl,
|
||||
perl,
|
||||
python3,
|
||||
qt6Packages,
|
||||
woff2,
|
||||
|
|
@ -58,6 +59,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
postPatch = ''
|
||||
sed -i '/iconutil/d' UI/CMakeLists.txt
|
||||
|
||||
perl -0pi -e \
|
||||
's/find_package\(ICU 78\.[0-9]+ EXACT REQUIRED COMPONENTS data i18n uc\)/find_package(ICU ${icu78.version} EXACT REQUIRED COMPONENTS data i18n uc)/ or die "ICU dependency not found\n"' \
|
||||
Meta/CMake/check_for_dependencies.cmake
|
||||
|
||||
# Don't set absolute paths in RPATH
|
||||
substituteInPlace Meta/CMake/lagom_install_options.cmake \
|
||||
--replace-fail "\''${CMAKE_INSTALL_BINDIR}" "bin" \
|
||||
|
|
@ -86,6 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
cargo
|
||||
cmake
|
||||
ninja
|
||||
perl
|
||||
pkg-config
|
||||
python3
|
||||
rustPlatform.cargoSetupHook
|
||||
|
|
@ -179,6 +185,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
maintainers = with lib.maintainers; [
|
||||
fgaz
|
||||
jk
|
||||
schembriaiden
|
||||
];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@
|
|||
pkg-config,
|
||||
boost,
|
||||
cairo,
|
||||
fuse,
|
||||
glib,
|
||||
libarchive,
|
||||
librsvg,
|
||||
|
|
@ -80,7 +79,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
buildInputs = [
|
||||
boost
|
||||
fuse
|
||||
libarchive
|
||||
squashfuse
|
||||
xdg-utils-cxx
|
||||
|
|
|
|||
|
|
@ -5,10 +5,8 @@
|
|||
fetchpatch,
|
||||
cmake,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
marisa,
|
||||
qttools,
|
||||
qtlocation,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
|
@ -37,12 +35,12 @@ stdenv.mkDerivation {
|
|||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
marisa
|
||||
qttools
|
||||
qtlocation
|
||||
libsForQt5.qttools
|
||||
libsForQt5.qtlocation
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
zlib,
|
||||
fetchFromGitHub,
|
||||
python3Packages,
|
||||
wrapQtAppsHook,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
|
|
@ -19,7 +19,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
|||
hash = "sha256-jOhbN6lMx04q60S0VOABmSNE/x9Er9exFYvWJe2INlE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapQtAppsHook ];
|
||||
nativeBuildInputs = [ libsForQt5.wrapQtAppsHook ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
python3Packages.pyqt5
|
||||
|
|
@ -2,11 +2,9 @@
|
|||
stdenv,
|
||||
fetchurl,
|
||||
sane-backends,
|
||||
qtbase,
|
||||
qtsvg,
|
||||
autoPatchelfHook,
|
||||
lib,
|
||||
wrapQtAppsHook,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -20,12 +18,12 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtsvg
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtsvg
|
||||
sane-backends
|
||||
stdenv.cc.cc
|
||||
];
|
||||
|
|
@ -89,16 +89,16 @@ let
|
|||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "matrix-tuwunel";
|
||||
version = "1.6.1";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matrix-construct";
|
||||
repo = "tuwunel";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-GIYG2fKiUSOx2aAumCZLrc4vuWj1UWJf8nXyuDdj1oI=";
|
||||
hash = "sha256-bB42SEa/gkFlkjb4L12Uh7xI4+3NmJgfbUPU01NXaEQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-V8byPrtgUQPri36pNtgOEtTlblxMAm90cSf8fgmx4tA=";
|
||||
cargoHash = "sha256-czCKzV/DCMJK0sN/jP5Jo98Zdii9DIAGAVnFnK0YtmY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
sox,
|
||||
flac,
|
||||
lame,
|
||||
wrapQtAppsHook,
|
||||
ffmpeg,
|
||||
vorbis-tools,
|
||||
pulseaudio,
|
||||
|
|
@ -15,7 +14,7 @@
|
|||
opus-tools,
|
||||
gst_all_1,
|
||||
enableSonos ? true,
|
||||
qtwayland,
|
||||
libsForQt5,
|
||||
}:
|
||||
let
|
||||
packages = [
|
||||
|
|
@ -44,7 +43,7 @@ python3Packages.buildPythonApplication {
|
|||
hash = "sha256-UMzOIxgeTpAFQZtYirOYPoVcKgiKdGx2zwVyWmo32w4=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optional stdenv.hostPlatform.isLinux qtwayland;
|
||||
buildInputs = lib.optional stdenv.hostPlatform.isLinux libsForQt5.qtwayland;
|
||||
propagatedBuildInputs =
|
||||
with python3Packages;
|
||||
(
|
||||
|
|
@ -66,7 +65,7 @@ python3Packages.buildPythonApplication {
|
|||
--replace 'platform.system() == "Linux"' 'True'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ wrapQtAppsHook ];
|
||||
nativeBuildInputs = [ libsForQt5.wrapQtAppsHook ];
|
||||
|
||||
# Relies on an old version (0.7.7) of PyChromecast unavailable in Nixpkgs.
|
||||
# Is also I/O bound and impure, testing an actual device, so we disable.
|
||||
|
|
@ -4,8 +4,7 @@
|
|||
fetchurl,
|
||||
cmake,
|
||||
pkg-config,
|
||||
qttools,
|
||||
wrapQtAppsHook,
|
||||
libsForQt5,
|
||||
hicolor-icon-theme,
|
||||
openbabel,
|
||||
desktop-file-utils,
|
||||
|
|
@ -45,8 +44,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
qttools
|
||||
wrapQtAppsHook
|
||||
libsForQt5.qttools
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
hicolor-icon-theme
|
||||
|
|
@ -4,11 +4,7 @@
|
|||
fetchFromGitHub,
|
||||
libusb1,
|
||||
pkg-config,
|
||||
qmake,
|
||||
qttools,
|
||||
wrapQtAppsHook,
|
||||
qtbase,
|
||||
qtwebsockets,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -29,14 +25,14 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
qmake
|
||||
qttools
|
||||
wrapQtAppsHook
|
||||
libsForQt5.qmake
|
||||
libsForQt5.qttools
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
libusb1
|
||||
qtbase
|
||||
qtwebsockets
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtwebsockets
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
|
|
@ -2,10 +2,8 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
qmake,
|
||||
qtsvg,
|
||||
makeWrapper,
|
||||
wrapQtAppsHook,
|
||||
libsForQt5,
|
||||
xdg-utils,
|
||||
}:
|
||||
|
||||
|
|
@ -21,11 +19,11 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
libsForQt5.qmake
|
||||
makeWrapper
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
buildInputs = [ qtsvg ];
|
||||
buildInputs = [ libsForQt5.qtsvg ];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "n64recomp";
|
||||
version = "0-unstable-2026-05-17";
|
||||
version = "0-unstable-2026-05-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "N64Recomp";
|
||||
repo = "N64Recomp";
|
||||
rev = "70a894aad8d3491ca0fccee1f94dae8190845686";
|
||||
hash = "sha256-4y1Cb2lmVZi+IoIBY9AZuWa+XPoBejdd1rL/uTjM07E=";
|
||||
rev = "ffb39cdad1da5de07eaaa48bd1db4a89a7986771";
|
||||
hash = "sha256-/MmRvLWxh/uaFXp0eiNdrnMKrrYQvjxmw/+/o5lXyFU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -48,13 +48,13 @@ let
|
|||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "nezha";
|
||||
version = "2.0.11";
|
||||
version = "2.0.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nezhahq";
|
||||
repo = "nezha";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-XZPyzIiqf2UG1gE6uHiYSVPCP6G/lrKK+Y3vRgkPk20=";
|
||||
hash = "sha256-dSFwU1p2lAI8CaNoQgdX/pkumIumZpdLgnn1XCkoeKU=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
|
|
@ -94,7 +94,7 @@ buildGoModule (finalAttrs: {
|
|||
GOROOT=''${GOROOT-$(go env GOROOT)} swag init --pd -d cmd/dashboard -g main.go -o cmd/dashboard/docs
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-x347CkS4nw8hFUhmuewvrqNDE2a2lT3KmIQ1hc98NJE=";
|
||||
vendorHash = "sha256-y7XvvpLrmoaU1gLtaN38T9rsS3Rpi313XAKaVcia6Q4=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "nix-update";
|
||||
version = "1.15.0";
|
||||
version = "1.15.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Mic92";
|
||||
repo = "nix-update";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-M62YdrdAqK81MF0FL0bx6iKTDCaqOtPx3civlSg46uk=";
|
||||
hash = "sha256-z7xXzpwsXY1x/xKeM7l2mN8dHFTp8qfgs/5xVsKjHr8=";
|
||||
};
|
||||
|
||||
build-system = [ python3Packages.setuptools ];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
lib,
|
||||
fetchFromGitea,
|
||||
fetchFromCodeberg,
|
||||
rustPlatform,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
|
|
@ -10,8 +10,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
pname = "nu-lint";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
src = fetchFromCodeberg {
|
||||
owner = "wvhulle";
|
||||
repo = "nu-lint";
|
||||
tag = "v${finalAttrs.version}";
|
||||
|
|
|
|||
|
|
@ -4,8 +4,7 @@
|
|||
fetchzip,
|
||||
autoreconfHook,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
qtbase,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
|
@ -20,16 +19,16 @@ stdenv.mkDerivation {
|
|||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
libsForQt5.qtbase
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"MOC=${qtbase.dev}/bin/moc"
|
||||
"UIC=${qtbase.dev}/bin/uic"
|
||||
"MOC=${libsForQt5.qtbase.dev}/bin/moc"
|
||||
"UIC=${libsForQt5.qtbase.dev}/bin/uic"
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
|
@ -4,9 +4,7 @@
|
|||
fetchFromGitHub,
|
||||
makeWrapper,
|
||||
cmake,
|
||||
wrapQtAppsHook,
|
||||
qtbase,
|
||||
qttools,
|
||||
libsForQt5,
|
||||
fftw,
|
||||
libusb1,
|
||||
libglvnd,
|
||||
|
|
@ -26,14 +24,14 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [
|
||||
cmake
|
||||
makeWrapper
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
fftw
|
||||
libusb1
|
||||
libglvnd
|
||||
qtbase
|
||||
qttools
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qttools
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -51,6 +49,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/OpenHantek/OpenHantek6022";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ baracoder ];
|
||||
platforms = qtbase.meta.platforms;
|
||||
platforms = libsForQt5.qtbase.meta.platforms;
|
||||
};
|
||||
}
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
qtbase,
|
||||
libsForQt5,
|
||||
zlib,
|
||||
freetype,
|
||||
libjpeg,
|
||||
|
|
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
libsForQt5.qtbase
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
47
pkgs/by-name/po/polkit-stdin-agent/package.nix
Normal file
47
pkgs/by-name/po/polkit-stdin-agent/package.nix
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitea,
|
||||
nix-update-script,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "polkit-stdin-agent";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "r-vdp";
|
||||
repo = "polkit-stdin-agent";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Nl/+IBbUEsxSKSWLXwUB3mV4iAG0z9mv+Bl6CSeFzR4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Eb/7ejVmtG5FNSh66gZO3337KCPNi+xtYVC5qyFKJzg=";
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Non-interactive polkit authentication agent that answers PAM prompts from a file descriptor";
|
||||
longDescription = ''
|
||||
Registers a per-process polkit authentication agent for a wrapped
|
||||
command and answers the PAM conversation from a file descriptor
|
||||
instead of /dev/tty, giving run0 / systemd-run the same
|
||||
"password on stdin" ergonomics as `sudo --stdin`.
|
||||
|
||||
Used by `nixos-rebuild --elevate=run0 --ask-elevate-password` to
|
||||
authenticate on a target host over SSH without allocating a TTY.
|
||||
'';
|
||||
homepage = "https://codeberg.org/r-vdp/polkit-stdin-agent";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ rvdp ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "polkit-stdin-agent";
|
||||
};
|
||||
})
|
||||
|
|
@ -15,8 +15,7 @@
|
|||
udevCheckHook,
|
||||
nix-update-script,
|
||||
withGui ? true,
|
||||
wrapQtAppsHook,
|
||||
qtbase,
|
||||
libsForQt5,
|
||||
withPython ? true,
|
||||
python3,
|
||||
withBlueshark ? false,
|
||||
|
|
@ -57,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
gcc-arm-embedded
|
||||
udevCheckHook
|
||||
]
|
||||
++ lib.optional withGui wrapQtAppsHook;
|
||||
++ lib.optional withGui libsForQt5.wrapQtAppsHook;
|
||||
buildInputs = [
|
||||
readline
|
||||
bzip2
|
||||
|
|
@ -68,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
whereami
|
||||
lua
|
||||
]
|
||||
++ lib.optional withGui qtbase
|
||||
++ lib.optional withGui libsForQt5.qtbase
|
||||
++ lib.optional withPython python3
|
||||
++ lib.optional withBlueshark bluez5;
|
||||
|
||||
|
|
@ -4,8 +4,7 @@
|
|||
fetchFromGitHub,
|
||||
testers,
|
||||
doxygen,
|
||||
qmake,
|
||||
qtbase,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
|
|
@ -49,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
nativeBuildInputs = [
|
||||
doxygen
|
||||
qmake
|
||||
libsForQt5.qmake
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
|
@ -57,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||
|
||||
preCheck = ''
|
||||
export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix}
|
||||
export QT_PLUGIN_PATH=${lib.getBin libsForQt5.qtbase}/${libsForQt5.qtbase.qtPluginPrefix}
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
# at this point in the build, install_name for dylibs hasn't been patched yet so we need to set the library path.
|
||||
|
|
@ -5,10 +5,7 @@
|
|||
installShellFiles,
|
||||
pkg-config,
|
||||
cmake,
|
||||
qtbase,
|
||||
qtsvg,
|
||||
wrapQtAppsHook,
|
||||
qttools,
|
||||
libsForQt5,
|
||||
pugixml,
|
||||
}:
|
||||
let
|
||||
|
|
@ -53,13 +50,13 @@ stdenv.mkDerivation rec {
|
|||
installShellFiles
|
||||
pkg-config
|
||||
cmake
|
||||
wrapQtAppsHook
|
||||
qttools
|
||||
libsForQt5.wrapQtAppsHook
|
||||
libsForQt5.qttools
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtsvg
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtsvg
|
||||
pugixml
|
||||
];
|
||||
|
||||
|
|
@ -88,7 +85,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://qelectrotech.org/";
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = with lib.maintainers; [ yvesf ];
|
||||
platforms = qtbase.meta.platforms;
|
||||
platforms = libsForQt5.qtbase.meta.platforms;
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,15 +2,10 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
qmake,
|
||||
pkg-config,
|
||||
udevCheckHook,
|
||||
wrapQtAppsHook,
|
||||
udev,
|
||||
qtmultimedia,
|
||||
qtscript,
|
||||
qtserialport,
|
||||
qtwebsockets,
|
||||
libsForQt5,
|
||||
alsa-lib,
|
||||
ola,
|
||||
libftdi1,
|
||||
|
|
@ -31,17 +26,17 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
libsForQt5.qmake
|
||||
pkg-config
|
||||
udevCheckHook
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
udev
|
||||
qtmultimedia
|
||||
qtscript
|
||||
qtserialport
|
||||
qtwebsockets
|
||||
libsForQt5.qtmultimedia
|
||||
libsForQt5.qtscript
|
||||
libsForQt5.qtserialport
|
||||
libsForQt5.qtwebsockets
|
||||
alsa-lib
|
||||
ola
|
||||
libftdi1
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
qmake,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation {
|
|||
hash = "sha256-EYBX2SJa8o4R/zEjSFbmFxhLI726WY21XmCkWIqPeFc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
nativeBuildInputs = [ libsForQt5.qmake ];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
|
|
@ -3,11 +3,9 @@
|
|||
stdenv,
|
||||
fetchFromGitHub,
|
||||
boost,
|
||||
qtbase,
|
||||
xz,
|
||||
qmake,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -27,15 +25,15 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
libsForQt5.qtbase
|
||||
xz
|
||||
boost
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
libsForQt5.qmake
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
installFlags = [ "INSTALL_ROOT=$(out)" ];
|
||||
|
|
@ -2,10 +2,7 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
qmake,
|
||||
wrapQtAppsHook,
|
||||
qtbase,
|
||||
qtcharts,
|
||||
libsForQt5,
|
||||
libxrandr,
|
||||
libdrm,
|
||||
}:
|
||||
|
|
@ -16,12 +13,12 @@ stdenv.mkDerivation rec {
|
|||
version = "20200824";
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
wrapQtAppsHook
|
||||
libsForQt5.qmake
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtcharts
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtcharts
|
||||
libxrandr
|
||||
libdrm
|
||||
];
|
||||
|
|
@ -8,22 +8,29 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rgx";
|
||||
version = "0.12.1";
|
||||
version = "0.12.3";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brevity1swos";
|
||||
repo = "rgx";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-05WEJ3gefPjBHuMXWhr135VtYnbteZapiAtNKwm4wxU=";
|
||||
hash = "sha256-01JnU+vDkEIYrEhl9KUGZx2+p2Xw76qjI9mpGsaTPLA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-CSGuf2jOjyLBfD0Fv3G01FioiyiXX8Bx/IiCkIBWbsQ=";
|
||||
cargoHash = "sha256-ZjfLh+vYlKP0JLxLvnkB9Qr3aQ/Oki/KvQmjCF7G1Mg=";
|
||||
|
||||
buildInputs = [ pcre2 ];
|
||||
|
||||
buildFeatures = [ "pcre2-engine" ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"^v(\\d+\\.\\d+\\.\\d+)$"
|
||||
];
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/brevity1swos/rgx";
|
||||
|
|
@ -33,7 +40,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
asl20 # or
|
||||
mit
|
||||
];
|
||||
maintainers = with lib.maintainers; [ Cameo007 ];
|
||||
maintainers = with lib.maintainers; [
|
||||
Cameo007
|
||||
kybe236
|
||||
];
|
||||
mainProgram = "rgx";
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "satisfactorymodmanager";
|
||||
version = "3.0.6";
|
||||
version = "3.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "satisfactorymodding";
|
||||
repo = "SatisfactoryModManager";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-VgLlMlCPLT8lu2tn+lrkqVCp2eoYhtyNnrWGGqesMd0=";
|
||||
hash = "sha256-DayFHFNKmYgH+LfXbQ/7h57Rw0iqtu3/snbyDd/EfkI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "sdl_gamecontrollerdb";
|
||||
version = "0-unstable-2026-05-12";
|
||||
version = "0-unstable-2026-05-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mdqinc";
|
||||
repo = "SDL_GameControllerDB";
|
||||
rev = "7988b5e84c31616200ee2ffd2347386c6b3165a8";
|
||||
hash = "sha256-Jwa+YJcEy+6Ye0ILttv5iAmJ9t0mIk8e5XXEuA1nFjE=";
|
||||
rev = "cbdb3678270cf5bf14a127934fd7ab332ecd3cbc";
|
||||
hash = "sha256-bjsss+ifkCqJKzirqbBS5PtD80fG9JPY6yPiHsf9DO8=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitea,
|
||||
fetchFromCodeberg,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
|
|
@ -20,8 +20,7 @@ buildGoModule (finalAttrs: {
|
|||
pname = "searchix";
|
||||
version = "0.4.7";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
src = fetchFromCodeberg {
|
||||
owner = "alinnow";
|
||||
repo = "searchix";
|
||||
tag = "v${finalAttrs.version}";
|
||||
|
|
|
|||
|
|
@ -69,13 +69,13 @@ in
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "servo";
|
||||
version = "0.1.0";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "servo";
|
||||
repo = "servo";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-DnjtKizYwadBYDqafFDuE/DRIjCqnK/L95zV0Fv0Xhc=";
|
||||
hash = "sha256-zZitnAiexoroKx3TMu3sB0KDvIsBcT7Krwa6lJqY4yw=";
|
||||
# Breaks reproducibility depending on whether the picked commit
|
||||
# has other ref-names or not, which may change over time, i.e. with
|
||||
# "ref-names: HEAD -> main" as long this commit is the branch HEAD
|
||||
|
|
@ -85,7 +85,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
'';
|
||||
};
|
||||
|
||||
cargoHash = "sha256-TJXWscTnsXxaWTfn7BugVMPamXOsyHXQhJskX04X7Zw=";
|
||||
cargoHash = "sha256-hZBI3Vte/FvN7qJy2VGF0LVQIFSWa931BFFbaUfN814=";
|
||||
|
||||
# set `HOME` to a temp dir for write access
|
||||
# Fix invalid option errors during linking (https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328)
|
||||
|
|
@ -171,6 +171,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
meta = {
|
||||
# undefined libmozjs_sys symbols during linking
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
changelog = "https://github.com/servo/servo/releases/tag/${finalAttrs.src.tag}";
|
||||
description = "Embeddable, independent, memory-safe, modular, parallel web rendering engine";
|
||||
homepage = "https://servo.org";
|
||||
license = lib.licenses.mpl20;
|
||||
|
|
|
|||
|
|
@ -4,8 +4,7 @@
|
|||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
qtbase,
|
||||
wrapQtAppsHook,
|
||||
libsForQt5,
|
||||
libGL,
|
||||
libGLU,
|
||||
}:
|
||||
|
|
@ -44,12 +43,12 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
buildInputs = [
|
||||
libGL
|
||||
libGLU
|
||||
qtbase
|
||||
libsForQt5.qtbase
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
|
@ -5,9 +5,7 @@
|
|||
autoreconfHook,
|
||||
writeShellScriptBin,
|
||||
cmake,
|
||||
wrapQtAppsHook,
|
||||
pkg-config,
|
||||
qmake,
|
||||
curl,
|
||||
grantlee,
|
||||
hidapi,
|
||||
|
|
@ -18,12 +16,7 @@
|
|||
libxslt,
|
||||
libzip,
|
||||
zlib,
|
||||
qtbase,
|
||||
qtconnectivity,
|
||||
qtlocation,
|
||||
qtsvg,
|
||||
qttools,
|
||||
qtpositioning,
|
||||
libsForQt5,
|
||||
libxcomposite,
|
||||
bluez,
|
||||
writeScript,
|
||||
|
|
@ -84,17 +77,17 @@ let
|
|||
hash = "sha256-PfSLFQeCeVNcCVDCZehxyNLQGT6gff5jNxMW8lAaP8c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
nativeBuildInputs = [ libsForQt5.qmake ];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtlocation
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtlocation
|
||||
libxcomposite
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
pluginsSubdir = "lib/qt-${qtbase.qtCompatVersion}/plugins";
|
||||
pluginsSubdir = "lib/qt-${libsForQt5.qtbase.qtCompatVersion}/plugins";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out $(dirname ${pluginsSubdir}/geoservices)
|
||||
|
|
@ -138,16 +131,16 @@ stdenv.mkDerivation {
|
|||
libxml2
|
||||
libxslt
|
||||
libzip
|
||||
qtbase
|
||||
qtconnectivity
|
||||
qtsvg
|
||||
qttools
|
||||
qtpositioning
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtconnectivity
|
||||
libsForQt5.qtsvg
|
||||
libsForQt5.qttools
|
||||
libsForQt5.qtpositioning
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
|
|
@ -33,7 +33,6 @@
|
|||
libopus,
|
||||
ffmpeg_7,
|
||||
soundtouch,
|
||||
pcre,
|
||||
portaudio,
|
||||
linuxHeaders,
|
||||
at-spi2-core,
|
||||
|
|
@ -150,7 +149,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
libvorbis
|
||||
lilv
|
||||
lv2
|
||||
pcre
|
||||
portaudio
|
||||
serd
|
||||
sord
|
||||
|
|
|
|||
|
|
@ -1,28 +1,22 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
env,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
qbs,
|
||||
wrapQtAppsHook,
|
||||
qtbase,
|
||||
qtdeclarative,
|
||||
qttools,
|
||||
qtwayland,
|
||||
qtsvg,
|
||||
libsForQt5,
|
||||
zlib,
|
||||
zstd,
|
||||
libGL,
|
||||
}:
|
||||
|
||||
let
|
||||
qtEnv = env "tiled-qt-env" [
|
||||
qtbase
|
||||
qtdeclarative
|
||||
qtsvg
|
||||
qttools
|
||||
qtwayland
|
||||
qtEnv = libsForQt5.env "tiled-qt-env" [
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtdeclarative
|
||||
libsForQt5.qtsvg
|
||||
libsForQt5.qttools
|
||||
libsForQt5.qtwayland
|
||||
];
|
||||
in
|
||||
|
||||
|
|
@ -40,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
qbs
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
qtEnv
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
buildGo126Module,
|
||||
cairo,
|
||||
copyDesktopItems,
|
||||
fetchFromGitea,
|
||||
fetchFromCodeberg,
|
||||
gdk-pixbuf,
|
||||
glib,
|
||||
glib-networking,
|
||||
|
|
@ -41,8 +41,7 @@ in
|
|||
buildGo126Module (finalAttrs: {
|
||||
pname = "tonearm";
|
||||
version = "1.4.0";
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
src = fetchFromCodeberg {
|
||||
owner = "dergs";
|
||||
repo = "Tonearm";
|
||||
tag = "v${finalAttrs.version}";
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "uptime-kuma";
|
||||
version = "2.3.2";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "louislam";
|
||||
repo = "uptime-kuma";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-TJCpmUT/E7Il9h7UM1rs2s8l2Vey+X3PZToFLTgxFdA=";
|
||||
hash = "sha256-iqkf9/UAQOnSA+nncK/fmjbqZpIQeUmigI/78m5qKrM=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-FnUjHi0l/WDBX0T65bomElcEG+mRc81n/s22npeHnlM=";
|
||||
npmDepsHash = "sha256-chvykBfnARLto+Il9gumm6UTRSTPPBjg5pj4yGFiOcg=";
|
||||
|
||||
patches = [
|
||||
# Fixes the permissions of the database being not set correctly
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "VictoriaMetrics";
|
||||
version = "1.143.0";
|
||||
version = "1.144.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VictoriaMetrics";
|
||||
repo = "VictoriaMetrics";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-K5NsQQ+r1XoOCfeYzZP3+2wdDpGNqWZLpe1hGqx11jA=";
|
||||
hash = "sha256-K8RCFHVL+E8w0webp6Bg3dma7I32iGXx9gCKnFp4d0g=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -4,14 +4,11 @@
|
|||
fetchpatch,
|
||||
lib,
|
||||
cmake,
|
||||
qtbase,
|
||||
qttools,
|
||||
qtcharts,
|
||||
libGLU,
|
||||
libGL,
|
||||
glm,
|
||||
glew,
|
||||
wrapQtAppsHook,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
|
|
@ -36,12 +33,12 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
qttools
|
||||
wrapQtAppsHook
|
||||
libsForQt5.qttools
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtcharts
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtcharts
|
||||
libGLU
|
||||
libGL
|
||||
glm
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "wayle";
|
||||
version = "0.3.0";
|
||||
version = "0.4.1";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
|
@ -30,10 +30,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
owner = "wayle-rs";
|
||||
repo = "wayle";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-4hnbv31BWu6KbdSHphHnpl80R0ByxS0RxsM5uqtNnCU=";
|
||||
hash = "sha256-gTvjGvS9jWijB7xVMTZZkltGfqreKtXanZlt1ZgFiC4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-sXoqNF7hzE97PkRMBnxVFNPa92CgD5gYeMd0RmzPJzY=";
|
||||
cargoHash = "sha256-iMtX/MNPzjXJG9ebDDdyQrLeqmW9idoty1vjhGLjT/E=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@
|
|||
fribidi,
|
||||
dbus,
|
||||
libpng,
|
||||
pcre,
|
||||
openssl,
|
||||
icu,
|
||||
lua5_4,
|
||||
|
|
@ -71,7 +70,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
fribidi
|
||||
dbus
|
||||
libpng
|
||||
pcre
|
||||
openssl
|
||||
icu
|
||||
lua
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
lang ? "en",
|
||||
libGL,
|
||||
libGLU,
|
||||
wrapQtAppsHook,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
installShellFiles
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
dontWrapQtApps = true;
|
||||
|
||||
|
|
@ -5,16 +5,16 @@
|
|||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "woodpecker-pipeline-transform";
|
||||
version = "0.3.0";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "lafriks";
|
||||
repo = "woodpecker-pipeline-transform";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-5bdNtVjk7TBoS0Z026th674ZXCRRc3DbtVOLl+acKhQ=";
|
||||
hash = "sha256-UXQ+b3SI+MO0T993hslQaRVMdHdPt9RnjyhfmLtooAU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4JRSrkxH8/NlSwUk6KagC5+mx+UXSLvo1thSRciAewc=";
|
||||
vendorHash = "sha256-NE4KUbYA19YJPQW9quSYgm0exj3lToj9Zkiv05TgyOI=";
|
||||
|
||||
meta = {
|
||||
description = "Utility to convert different pipelines to Woodpecker CI pipelines";
|
||||
|
|
|
|||
|
|
@ -37,6 +37,12 @@ mkDerivation {
|
|||
};
|
||||
disabled = gnuradioOlder "3.9" || gnuradioAtLeast "3.11";
|
||||
|
||||
# Boost 1.89 removed the boost_system stub library.
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail 'COMPONENTS system chrono thread' 'COMPONENTS chrono thread'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -1,38 +0,0 @@
|
|||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
qtbase,
|
||||
cmake,
|
||||
wrapQtAppsHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "grantlee";
|
||||
version = "5.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "steveire";
|
||||
repo = "grantlee";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-enP7b6A7Ndew2LJH569fN3IgPu2/KL5rCmU/jmKb9sY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
wrapQtAppsHook
|
||||
];
|
||||
buildInputs = [ qtbase ];
|
||||
|
||||
meta = {
|
||||
description = "Libraries for text templating with Qt";
|
||||
longDescription = ''
|
||||
Grantlee is a set of Free Software libraries written using the Qt framework. Currently two libraries are shipped with Grantlee: Grantlee Templates and Grantlee TextDocument.
|
||||
The goal of Grantlee Templates is to make it easier for application developers to separate the structure of documents from the data they contain, opening the door for theming and advanced generation of other text such as code.
|
||||
The syntax uses the syntax of the Django template system, and the core design of Django is reused in Grantlee.
|
||||
'';
|
||||
|
||||
homepage = "https://github.com/steveire/grantlee";
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
};
|
||||
}
|
||||
|
|
@ -1807,6 +1807,43 @@ final: prev: {
|
|||
}
|
||||
) { };
|
||||
|
||||
lrexlib-pcre2 = callPackage (
|
||||
{
|
||||
buildLuarocksPackage,
|
||||
fetchFromGitHub,
|
||||
fetchurl,
|
||||
luaOlder,
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "lrexlib-pcre2";
|
||||
version = "2.9.2-1";
|
||||
knownRockspec =
|
||||
(fetchurl {
|
||||
url = "mirror://luarocks/lrexlib-pcre2-2.9.2-1.rockspec";
|
||||
sha256 = "181878m8gq9wl7c4h9rsq1iig70n9rmyfbj86swz1v4vi7s7ks9p";
|
||||
}).outPath;
|
||||
src = fetchFromGitHub {
|
||||
owner = "rrthomas";
|
||||
repo = "lrexlib";
|
||||
rev = "rel-2-9-2";
|
||||
hash = "sha256-DzNDve+xeKb+kAcW+o7GK/RsoDhaDAVAWAhgjISCyZc=";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/rrthomas/lrexlib";
|
||||
maintainers = with lib.maintainers; [ wishstudio ];
|
||||
license.fullName = "MIT/X11";
|
||||
description = "Regular expression library binding (PCRE2 flavour).";
|
||||
longDescription = ''
|
||||
Lrexlib is a regular expression library for Lua 5.1-5.4, which
|
||||
provides bindings for several regular expression libraries.
|
||||
This rock provides the PCRE2 bindings.'';
|
||||
};
|
||||
}
|
||||
) { };
|
||||
|
||||
lrexlib-posix = callPackage (
|
||||
{
|
||||
buildLuarocksPackage,
|
||||
|
|
|
|||
|
|
@ -45,6 +45,7 @@
|
|||
openldap,
|
||||
openssl,
|
||||
pcre,
|
||||
pcre2,
|
||||
pkg-config,
|
||||
readline,
|
||||
ripgrep,
|
||||
|
|
@ -435,6 +436,15 @@ in
|
|||
];
|
||||
};
|
||||
|
||||
lrexlib-pcre2 = prev.lrexlib-pcre2.overrideAttrs {
|
||||
externalDeps = [
|
||||
{
|
||||
name = "PCRE2";
|
||||
dep = pcre2;
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
lrexlib-posix = prev.lrexlib-posix.overrideAttrs (old: {
|
||||
buildInputs = old.buildInputs ++ [
|
||||
(lib.getDev libc)
|
||||
|
|
|
|||
|
|
@ -26,14 +26,14 @@
|
|||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "aioesphomeapi";
|
||||
version = "45.0.2";
|
||||
version = "44.24.1"; # must track the major version that home-assistant pins
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "esphome";
|
||||
repo = "aioesphomeapi";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ajucVk5yF0akOIfBX28sjOndpmHQumJBUp5jnq//B+M=";
|
||||
hash = "sha256-D2MJISyHz4s0Rk6wGMrYVJHfvA/Xbw2UEp2KqTqS2nA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitea,
|
||||
fetchFromCodeberg,
|
||||
uv-build,
|
||||
dramatiq,
|
||||
pytestCheckHook,
|
||||
|
|
@ -13,8 +13,7 @@ buildPythonPackage rec {
|
|||
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
src = fetchFromCodeberg {
|
||||
owner = "yaal";
|
||||
repo = "dramatiq-eager-broker";
|
||||
tag = version;
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "itables";
|
||||
version = "2.7.3";
|
||||
version = "2.8.0";
|
||||
|
||||
# itables has 4 different node packages, each with their own
|
||||
# package-lock.json, and partially depending on each other.
|
||||
|
|
@ -39,7 +39,7 @@ buildPythonPackage rec {
|
|||
# the source tarball from pypi, which includes the javascript bundle already.
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-epaA2iCqZJWGgmXTl/GozAPY/bxZJ2DT3bELTWCB/3M=";
|
||||
hash = "sha256-uDJfvb0GEATyHqYkJZROXnGmTCpkhJlk4KSwAM3nA2I=";
|
||||
};
|
||||
|
||||
pyproject = true;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
lib,
|
||||
fetchFromGitea,
|
||||
fetchFromCodeberg,
|
||||
buildPythonPackage,
|
||||
setuptools,
|
||||
}:
|
||||
|
|
@ -9,8 +9,7 @@ buildPythonPackage rec {
|
|||
pname = "rpatool";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
src = fetchFromCodeberg {
|
||||
owner = "shiz";
|
||||
repo = "rpatool";
|
||||
tag = "v${version}";
|
||||
|
|
|
|||
|
|
@ -6,14 +6,15 @@
|
|||
}:
|
||||
|
||||
let
|
||||
inherit (home-assistant) python3Packages;
|
||||
|
||||
manifestRequirementsCheckHook = import ./manifest-requirements-check-hook.nix {
|
||||
inherit makeSetupHook;
|
||||
inherit (home-assistant) python;
|
||||
inherit makeSetupHook python3Packages;
|
||||
};
|
||||
in
|
||||
|
||||
lib.extendMkDerivation {
|
||||
constructDrv = home-assistant.python.pkgs.buildPythonPackage;
|
||||
constructDrv = python3Packages.buildPythonPackage;
|
||||
excludeDrvArgNames = [
|
||||
"meta"
|
||||
"nativeBuildInputs"
|
||||
|
|
@ -52,7 +53,7 @@ lib.extendMkDerivation {
|
|||
'';
|
||||
|
||||
nativeBuildInputs =
|
||||
with home-assistant.python.pkgs;
|
||||
with home-assistant.python3Packages;
|
||||
[
|
||||
manifestRequirementsCheckHook
|
||||
packaging
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{
|
||||
python,
|
||||
python3Packages,
|
||||
makeSetupHook,
|
||||
}:
|
||||
|
||||
makeSetupHook {
|
||||
name = "manifest-check-hook";
|
||||
substitutions = {
|
||||
pythonCheckInterpreter = python.interpreter;
|
||||
pythonCheckInterpreter = python3Packages.python.interpreter;
|
||||
checkManifest = ./check_manifest.py;
|
||||
};
|
||||
} ./manifest-requirements-check-hook.sh
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ function arguments. Pass them into `dependencies` for them to
|
|||
be available to Home Assistant.
|
||||
|
||||
Out-of-tree components need to use Python packages from
|
||||
`home-assistant.python.pkgs` as to not introduce conflicting package
|
||||
`home-assistant.python3Pacakges` as to not introduce conflicting package
|
||||
versions into the Python environment.
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -48,8 +48,8 @@ buildHomeAssistantComponent rec {
|
|||
pytest-timeout
|
||||
pytestCheckHook
|
||||
]
|
||||
++ (homeassistant.getPackages "mqtt" homeassistant.python.pkgs)
|
||||
++ (homeassistant.getPackages "stream" homeassistant.python.pkgs);
|
||||
++ (homeassistant.getPackages "mqtt" homeassistant.python3Packages)
|
||||
++ (homeassistant.getPackages "stream" homeassistant.python3Packages);
|
||||
|
||||
disabledTests = [
|
||||
# https://github.com/blakeblackshear/frigate-hass-integration/issues/922
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ buildHomeAssistantComponent rec {
|
|||
pytest-cov-stub
|
||||
pytestCheckHook
|
||||
]
|
||||
++ home-assistant.getPackages "camera" home-assistant.python.pkgs;
|
||||
++ home-assistant.getPackages "camera" home-assistant.python3Packages;
|
||||
|
||||
disabledTests = [
|
||||
# tests try to open sockets
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ buildHomeAssistantComponent rec {
|
|||
aioresponses
|
||||
pytest-freezegun
|
||||
]
|
||||
++ home-assistant.getPackages "camera" home-assistant.python.pkgs;
|
||||
++ home-assistant.getPackages "camera" home-assistant.python3Packages;
|
||||
|
||||
preCheck = ''
|
||||
patchShebangs --build tests/setup.sh
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ buildHomeAssistantComponent rec {
|
|||
home-assistant
|
||||
pytestCheckHook
|
||||
]
|
||||
++ (home-assistant.getPackages "stream" home-assistant.python.pkgs);
|
||||
++ (home-assistant.getPackages "stream" home-assistant.python3Packages);
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/AlexxIT/YandexStation/releases/tag/${src.tag}";
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
fetchFromGitHub,
|
||||
fetchPypi,
|
||||
fetchpatch,
|
||||
python314,
|
||||
python314Packages,
|
||||
replaceVars,
|
||||
ffmpeg-headless,
|
||||
inetutils,
|
||||
|
|
@ -244,10 +244,9 @@ let
|
|||
})
|
||||
];
|
||||
|
||||
python = python314.override {
|
||||
self = python;
|
||||
packageOverrides = lib.composeManyExtensions (defaultOverrides ++ [ packageOverrides ]);
|
||||
};
|
||||
python3Packages = python314Packages.overrideScope (
|
||||
final: prev: lib.composeManyExtensions (defaultOverrides ++ [ packageOverrides ]) final prev
|
||||
);
|
||||
|
||||
componentPackages = import ./component-packages.nix;
|
||||
|
||||
|
|
@ -257,16 +256,18 @@ let
|
|||
|
||||
getPackages = component: componentPackages.components.${component};
|
||||
|
||||
componentBuildInputs = lib.concatMap (component: getPackages component python.pkgs) extraComponents;
|
||||
componentBuildInputs = lib.concatMap (
|
||||
component: getPackages component python3Packages
|
||||
) extraComponents;
|
||||
|
||||
# Ensure that we are using a consistent package set
|
||||
extraBuildInputs = extraPackages python.pkgs;
|
||||
extraBuildInputs = extraPackages python3Packages;
|
||||
|
||||
# Don't forget to run update-component-packages.py after updating
|
||||
hassVersion = "2026.5.4";
|
||||
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
version =
|
||||
assert (componentPackages.version == hassVersion);
|
||||
|
|
@ -274,7 +275,7 @@ python.pkgs.buildPythonApplication rec {
|
|||
pyproject = true;
|
||||
|
||||
# check REQUIRED_PYTHON_VER in homeassistant/const.py
|
||||
disabled = python.pythonOlder "3.14";
|
||||
disabled = python3Packages.pythonOlder "3.14";
|
||||
|
||||
# don't try and fail to strip 6600+ python files, it takes minutes!
|
||||
dontStrip = true;
|
||||
|
|
@ -293,7 +294,7 @@ python.pkgs.buildPythonApplication rec {
|
|||
hash = "sha256-o5S6rnOTqzPLZpMBxgmp9IpmLlEHLvHTH68ql2EkVbI=";
|
||||
};
|
||||
|
||||
build-system = with python.pkgs; [
|
||||
build-system = with python3Packages; [
|
||||
setuptools
|
||||
];
|
||||
|
||||
|
|
@ -345,7 +346,7 @@ python.pkgs.buildPythonApplication rec {
|
|||
"uv"
|
||||
];
|
||||
|
||||
dependencies = with python.pkgs; [
|
||||
dependencies = with python3Packages; [
|
||||
# Mirror what gets installed for Home Assistant Container, which means
|
||||
# installing what is in requirements.txt. The PEP517 specification gets
|
||||
# embedded in wheel metadata but only represents a subset.
|
||||
|
|
@ -419,7 +420,7 @@ python.pkgs.buildPythonApplication rec {
|
|||
# upstream only tests on Linux, so do we.
|
||||
doCheck = stdenv.hostPlatform.isLinux;
|
||||
|
||||
requirementsTest = with python.pkgs; [
|
||||
requirementsTest = with python3Packages; [
|
||||
# test infrastructure (selectively from requirement_test.txt)
|
||||
freezegun
|
||||
pytest-asyncio
|
||||
|
|
@ -438,7 +439,7 @@ python.pkgs.buildPythonApplication rec {
|
|||
nativeCheckInputs =
|
||||
requirementsTest
|
||||
++ [ versionCheckHook ]
|
||||
++ (with python.pkgs; [
|
||||
++ (with python3Packages; [
|
||||
# Used in tests/non_packaged_scripts/test_alexa_locales.py
|
||||
beautifulsoup4
|
||||
# Used in tests/scripts/test_check_config.py
|
||||
|
|
@ -446,7 +447,7 @@ python.pkgs.buildPythonApplication rec {
|
|||
# Used in tests/helpers/test_httpx_client.py
|
||||
h2
|
||||
])
|
||||
++ lib.concatMap (component: getPackages component python.pkgs) [
|
||||
++ lib.concatMap (component: getPackages component python3Packages) [
|
||||
# some components are needed even if tests in tests/components are disabled
|
||||
"frontend"
|
||||
"hue"
|
||||
|
|
@ -504,12 +505,12 @@ python.pkgs.buildPythonApplication rec {
|
|||
availableComponents
|
||||
extraComponents
|
||||
getPackages
|
||||
python
|
||||
python3Packages
|
||||
supportedComponentsWithTests
|
||||
;
|
||||
pythonPath = python.pkgs.makePythonPath (componentBuildInputs ++ extraBuildInputs);
|
||||
frontend = python.pkgs.home-assistant-frontend;
|
||||
intents = python.pkgs.home-assistant-intents;
|
||||
pythonPath = python3Packages.makePythonPath (componentBuildInputs ++ extraBuildInputs);
|
||||
frontend = python3Packages.home-assistant-frontend;
|
||||
intents = python3Packages.home-assistant-intents;
|
||||
tests = {
|
||||
nixos = nixosTests.home-assistant;
|
||||
components = callPackage ./tests.nix { };
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ buildPythonPackage rec {
|
|||
version = "2026.5.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = python.version != home-assistant.python.version;
|
||||
disabled = python.version != home-assistant.python3Packages.python.version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KapJI";
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
}:
|
||||
|
||||
let
|
||||
getComponentDeps = component: home-assistant.getPackages component home-assistant.python.pkgs;
|
||||
getComponentDeps = component: home-assistant.getPackages component home-assistant.python3Packages;
|
||||
inherit (lib) concatMap;
|
||||
|
||||
# some components' tests have additional dependencies
|
||||
extraCheckInputs = with home-assistant.python.pkgs; {
|
||||
extraCheckInputs = with home-assistant.python3Packages; {
|
||||
alexa = concatMap getComponentDeps [
|
||||
"cloud"
|
||||
"frontend"
|
||||
|
|
@ -185,7 +185,7 @@ lib.listToAttrs (
|
|||
|
||||
nativeCheckInputs =
|
||||
old.requirementsTest
|
||||
++ home-assistant.getPackages component home-assistant.python.pkgs
|
||||
++ home-assistant.getPackages component home-assistant.python3Packages
|
||||
++ extraCheckInputs.${component} or [ ];
|
||||
|
||||
disabledTests = extraDisabledTests.${component} or [ ];
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ from rich.console import Console
|
|||
from rich.table import Table
|
||||
|
||||
COMPONENT_PREFIX = "homeassistant.components"
|
||||
PKG_SET = "home-assistant.python.pkgs"
|
||||
PKG_SET = "home-assistant.python3Packages"
|
||||
|
||||
# If some requirements are matched by multiple or no Python packages, the
|
||||
# following can be used to choose the correct one
|
||||
|
|
|
|||
|
|
@ -2783,8 +2783,6 @@ with pkgs;
|
|||
}
|
||||
);
|
||||
|
||||
mytetra = libsForQt5.callPackage ../applications/office/mytetra { };
|
||||
|
||||
nerd-fonts = recurseIntoAttrs (callPackage ../data/fonts/nerd-fonts { });
|
||||
|
||||
maple-mono = recurseIntoAttrs (callPackage ../data/fonts/maple-font { });
|
||||
|
|
@ -2874,8 +2872,6 @@ with pkgs;
|
|||
|
||||
nwdiag = with python3Packages; toPythonApplication nwdiag;
|
||||
|
||||
ofono-phonesim = libsForQt5.callPackage ../development/tools/ofono-phonesim { };
|
||||
|
||||
ola = callPackage ../applications/misc/ola {
|
||||
protobuf = protobuf_21;
|
||||
};
|
||||
|
|
@ -2886,8 +2882,6 @@ with pkgs;
|
|||
|
||||
open-interpreter = with python3Packages; toPythonApplication open-interpreter;
|
||||
|
||||
openhantek6022 = libsForQt5.callPackage ../applications/science/electronics/openhantek6022 { };
|
||||
|
||||
openmvs = callPackage ../applications/science/misc/openmvs {
|
||||
inherit (llvmPackages) openmp;
|
||||
};
|
||||
|
|
@ -3060,8 +3054,6 @@ with pkgs;
|
|||
|
||||
po4a = perlPackages.Po4a;
|
||||
|
||||
proxmark3 = libsForQt5.callPackage ../tools/security/proxmark3/default.nix { };
|
||||
|
||||
pycflow2dot = with python3.pkgs; toPythonApplication pycflow2dot;
|
||||
|
||||
pyinfra = with python3Packages; toPythonApplication pyinfra;
|
||||
|
|
@ -3084,14 +3076,8 @@ with pkgs;
|
|||
|
||||
mpi = openmpi; # this attribute should used to build MPI applications
|
||||
|
||||
qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { };
|
||||
|
||||
qmarkdowntextedit = libsForQt5.callPackage ../development/libraries/qmarkdowntextedit { };
|
||||
|
||||
quota = if stdenv.hostPlatform.isLinux then linuxquota else unixtools.quota;
|
||||
|
||||
radeon-profile = libsForQt5.callPackage ../tools/misc/radeon-profile { };
|
||||
|
||||
rainbowstream = with python3.pkgs; toPythonApplication rainbowstream;
|
||||
|
||||
rapidgzip = with python3Packages; toPythonApplication rapidgzip;
|
||||
|
|
@ -3200,8 +3186,6 @@ with pkgs;
|
|||
|
||||
strip-nondeterminism = perlPackages.strip-nondeterminism;
|
||||
|
||||
subsurface = libsForQt5.callPackage ../applications/misc/subsurface { };
|
||||
|
||||
sumorobot-manager =
|
||||
python3Packages.callPackage ../applications/science/robotics/sumorobot-manager
|
||||
{ };
|
||||
|
|
@ -3248,8 +3232,6 @@ with pkgs;
|
|||
extraFonts = true;
|
||||
};
|
||||
|
||||
tiled = libsForQt5.callPackage ../applications/editors/tiled { };
|
||||
|
||||
tinc = callPackage ../tools/networking/tinc { };
|
||||
|
||||
tinc_pre = callPackage ../tools/networking/tinc/pre.nix { };
|
||||
|
|
@ -6265,8 +6247,6 @@ with pkgs;
|
|||
|
||||
gst_all_1 = recurseIntoAttrs (callPackage ../development/libraries/gstreamer { });
|
||||
|
||||
grantlee = libsForQt5.callPackage ../development/libraries/grantlee { };
|
||||
|
||||
glirc = haskell.lib.compose.justStaticExecutables haskellPackages.glirc;
|
||||
|
||||
# Not moved to aliases while we decide if we should split the package again.
|
||||
|
|
@ -6557,8 +6537,6 @@ with pkgs;
|
|||
|
||||
libmicrohttpd = libmicrohttpd_1_0;
|
||||
|
||||
libosmscout = libsForQt5.callPackage ../development/libraries/libosmscout { };
|
||||
|
||||
libpeas = callPackage ../development/libraries/libpeas { };
|
||||
libpeas2 = callPackage ../development/libraries/libpeas/2.x.nix { };
|
||||
|
||||
|
|
@ -6937,8 +6915,6 @@ with pkgs;
|
|||
|
||||
pcre2 = callPackage ../development/libraries/pcre2 { };
|
||||
|
||||
pdfhummus = libsForQt5.callPackage ../development/libraries/pdfhummus { };
|
||||
|
||||
inherit
|
||||
(callPackage ../development/libraries/physfs {
|
||||
})
|
||||
|
|
@ -7008,8 +6984,6 @@ with pkgs;
|
|||
|
||||
pth = if stdenv.hostPlatform.isMusl then npth else gnupth;
|
||||
|
||||
qdjango = libsForQt5.callPackage ../development/libraries/qdjango { };
|
||||
|
||||
quartoMinimal = quarto.override {
|
||||
rWrapper = null;
|
||||
python3 = null;
|
||||
|
|
@ -7234,8 +7208,6 @@ with pkgs;
|
|||
|
||||
streamlink-twitch-gui-bin = callPackage ../applications/video/streamlink-twitch-gui/bin.nix { };
|
||||
|
||||
structuresynth = libsForQt5.callPackage ../development/libraries/structuresynth { };
|
||||
|
||||
szurubooru = callPackage ../servers/web-apps/szurubooru { };
|
||||
|
||||
tclap = tclap_1_2;
|
||||
|
|
@ -7812,7 +7784,7 @@ with pkgs;
|
|||
lib.makeExtensible (
|
||||
self:
|
||||
lib.packagesFromDirectoryRecursive {
|
||||
inherit (home-assistant.python.pkgs) callPackage;
|
||||
inherit (home-assistant.python3Packages) callPackage;
|
||||
directory = ../servers/home-assistant/custom-components;
|
||||
}
|
||||
)
|
||||
|
|
@ -7909,8 +7881,6 @@ with pkgs;
|
|||
];
|
||||
};
|
||||
|
||||
mkchromecast = libsForQt5.callPackage ../applications/networking/mkchromecast { };
|
||||
|
||||
moodle = callPackage ../servers/web-apps/moodle { };
|
||||
|
||||
moodle-utils = callPackage ../servers/web-apps/moodle/moodle-utils.nix { };
|
||||
|
|
@ -8868,8 +8838,6 @@ with pkgs;
|
|||
|
||||
activitywatch = callPackage ../applications/office/activitywatch/wrapper.nix { };
|
||||
|
||||
masterpdfeditor4 = libsForQt5.callPackage ../applications/misc/masterpdfeditor4 { };
|
||||
|
||||
inherit
|
||||
({
|
||||
pdfstudio2021 = callPackage ../applications/misc/pdfstudio { year = "2021"; };
|
||||
|
|
@ -9304,12 +9272,8 @@ with pkgs;
|
|||
|
||||
m32edit = callPackage ../applications/audio/midas/m32edit.nix { };
|
||||
|
||||
manuskript = libsForQt5.callPackage ../applications/editors/manuskript { };
|
||||
|
||||
minari = python3Packages.toPythonApplication python3Packages.minari;
|
||||
|
||||
molsketch = libsForQt5.callPackage ../applications/editors/molsketch { };
|
||||
|
||||
graphicsmagick_q16 = graphicsmagick.override { quantumdepth = 16; };
|
||||
graphicsmagick-imagemagick-compat = graphicsmagick.imagemagick-compat;
|
||||
|
||||
|
|
@ -9512,10 +9476,6 @@ with pkgs;
|
|||
fftw = fftwSinglePrec;
|
||||
};
|
||||
|
||||
lemonbar = callPackage ../applications/window-managers/lemonbar { };
|
||||
|
||||
lemonbar-xft = callPackage ../applications/window-managers/lemonbar/xft.nix { };
|
||||
|
||||
libreoffice-bin = callPackage ../applications/office/libreoffice/darwin { };
|
||||
|
||||
libreoffice = hiPrio libreoffice-still;
|
||||
|
|
@ -9607,8 +9567,6 @@ with pkgs;
|
|||
lua = lua5;
|
||||
};
|
||||
|
||||
moolticute = libsForQt5.callPackage ../applications/misc/moolticute { };
|
||||
|
||||
mopidyPackages = recurseIntoAttrs (
|
||||
callPackages ../applications/audio/mopidy {
|
||||
python = python3;
|
||||
|
|
@ -9834,8 +9792,6 @@ with pkgs;
|
|||
|
||||
qbittorrent-enhanced-nox = qbittorrent-enhanced.override { guiSupport = false; };
|
||||
|
||||
qelectrotech = libsForQt5.callPackage ../applications/misc/qelectrotech { };
|
||||
|
||||
qemu-python-utils = python3Packages.toPythonApplication (
|
||||
python3Packages.qemu.override {
|
||||
fuseSupport = true;
|
||||
|
|
@ -9854,8 +9810,6 @@ with pkgs;
|
|||
|
||||
wrapQemuBinfmtP = callPackage ../by-name/qe/qemu/binfmt-p-wrapper.nix { };
|
||||
|
||||
qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { };
|
||||
|
||||
qmplay2-qt5 = qmplay2.override { qtVersion = "5"; };
|
||||
qmplay2-qt6 = qmplay2.override { qtVersion = "6"; };
|
||||
|
||||
|
|
@ -10096,6 +10050,7 @@ with pkgs;
|
|||
thunderbird-bin = thunderbird-latest-bin;
|
||||
thunderbird-latest-bin = wrapThunderbird thunderbird-latest-bin-unwrapped {
|
||||
pname = "thunderbird-bin";
|
||||
libName = "thunderbird-bin-${thunderbird-latest-bin-unwrapped.version}";
|
||||
};
|
||||
thunderbird-latest-bin-unwrapped =
|
||||
callPackage ../applications/networking/mailreaders/thunderbird-bin
|
||||
|
|
@ -10104,6 +10059,7 @@ with pkgs;
|
|||
};
|
||||
thunderbird-esr-bin = wrapThunderbird thunderbird-esr-bin-unwrapped {
|
||||
pname = "thunderbird-esr-bin";
|
||||
libName = "thunderbird-bin-${thunderbird-esr-bin-unwrapped.version}";
|
||||
};
|
||||
thunderbird-esr-bin-unwrapped = callPackage ../applications/networking/mailreaders/thunderbird-bin {
|
||||
generated = import ../applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix;
|
||||
|
|
@ -11061,8 +11017,6 @@ with pkgs;
|
|||
|
||||
trilinos-mpi = trilinos.override { withMPI = true; };
|
||||
|
||||
wolfram-engine = libsForQt5.callPackage ../applications/science/math/wolfram-engine { };
|
||||
|
||||
wolfram-for-jupyter-kernel = callPackage ../applications/editors/jupyter-kernels/wolfram { };
|
||||
|
||||
### SCIENCE/MOLECULAR-DYNAMICS
|
||||
|
|
@ -11329,8 +11283,6 @@ with pkgs;
|
|||
python3 = python312; # fails to build otherwise
|
||||
};
|
||||
|
||||
vite = libsForQt5.callPackage ../applications/science/misc/vite { };
|
||||
|
||||
### SCIENCE / PHYSICS
|
||||
|
||||
hepmc3 = callPackage ../development/libraries/physics/hepmc3 {
|
||||
|
|
|
|||
|
|
@ -1785,10 +1785,10 @@ with self;
|
|||
|
||||
ArchiveTar = buildPerlPackage {
|
||||
pname = "Archive-Tar";
|
||||
version = "3.02";
|
||||
version = "3.10";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/B/BI/BINGOS/Archive-Tar-3.02.tar.gz";
|
||||
hash = "sha256-gWM8h/c3hGGD01wPTJ1ALalHqEa0iBswzObZ6+PInRk=";
|
||||
url = "mirror://cpan/authors/id/B/BI/BINGOS/Archive-Tar-3.10.tar.gz";
|
||||
hash = "sha256-irvDaMxHIwjiqWDEpOi258pJJFefxGPH+oemplbITlY=";
|
||||
};
|
||||
meta = {
|
||||
description = "Manipulates TAR archives";
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ makeScopeWithSplicing' {
|
|||
|
||||
qgpgme = callPackage ../development/libraries/qgpgme { };
|
||||
|
||||
grantlee = callPackage ../development/libraries/grantlee/5 { };
|
||||
grantlee = pkgs.grantlee;
|
||||
|
||||
herqq = callPackage ../by-name/he/herqq/package.nix { };
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue