Merge master into staging-next

Changed files
+208 -258
maintainers
nixos
doc
manual
configuration
modules
programs
services
web-apps
tests
pkgs
by-name
cd
cdncheck
cr
crosvm
fw
ge
geographiclib
ju
junixsocket-common
junixsocket-native-common
ni
nixos-render-docs
src
nixos_render_docs
op
ph
phase-cli
development
compilers
libraries
python-modules
crontab
elmax-api
extruct
govee-local-api
llama-index-indices-managed-llama-cloud
meross-iot
nfcpy
pytest-resource-path
pytransportnswv2
reconplogger
turrishw
wat
yq
os-specific
linux
top-level
+5
maintainers/maintainer-list.nix
···
githubId = 2422454;
name = "Kai Wohlfahrt";
};
kylecarbs = {
name = "Kyle Carberry";
email = "kyle@carberry.com";
···
githubId = 2422454;
name = "Kai Wohlfahrt";
};
+
kyehn = {
+
name = "kyehn";
+
github = "kyehn";
+
githubId = 228304369;
+
};
kylecarbs = {
name = "Kyle Carberry";
email = "kyle@carberry.com";
+6
nixos/doc/manual/configuration/linux-kernel.chapter.md
···
pin your kernel onto a non-longterm version, expect your evaluation to fail as
soon as the version is out of maintenance.
Longterm versions of kernels will be removed before the next stable NixOS that will
exceed the maintenance period of the kernel version.
···
pin your kernel onto a non-longterm version, expect your evaluation to fail as
soon as the version is out of maintenance.
+
A kernel will be removed from nixpkgs when the first batch of stable kernels
+
_after_ the final release is published. E.g. when 6.15.11 is the final release
+
of the 6.15 series and is released together with 6.16.3 and 6.12.43, it will be
+
removed on the release of 6.16.4 and 6.12.44. Custom kernel variants such
+
as linux-hardened are also affected by this.
+
Longterm versions of kernels will be removed before the next stable NixOS that will
exceed the maintenance period of the kernel version.
+3 -1
nixos/modules/programs/rust-motd.nix
···
# Order the sections in the TOML according to the order of sections
# in `cfg.order`.
motdConf =
-
pkgs.runCommand "motd.conf"
{
__structuredAttrs = true;
inherit (cfg) order settings;
···
security.pam.services.sshd.showMotd = lib.mkIf cfg.enableMotdInSSHD true;
users.motdFile = lib.mkIf cfg.enableMotdInSSHD "/var/lib/rust-motd/motd";
services.openssh.extraConfig =
lib.mkIf (cfg.settings ? last_login && cfg.settings.last_login != { })
···
# Order the sections in the TOML according to the order of sections
# in `cfg.order`.
motdConf =
+
pkgs.runCommand "motd.toml"
{
__structuredAttrs = true;
inherit (cfg) order settings;
···
security.pam.services.sshd.showMotd = lib.mkIf cfg.enableMotdInSSHD true;
users.motdFile = lib.mkIf cfg.enableMotdInSSHD "/var/lib/rust-motd/motd";
+
+
programs.rust-motd.settings.global.show_legacy_warning = false;
services.openssh.extraConfig =
lib.mkIf (cfg.settings ? last_login && cfg.settings.last_login != { })
-1
nixos/modules/services/web-apps/nextcloud.nix
···
index index.php index.html /index.php$request_uri;
${lib.optionalString (cfg.nginx.recommendedHttpHeaders) ''
add_header X-Content-Type-Options nosniff;
-
add_header X-XSS-Protection "1; mode=block";
add_header X-Robots-Tag "noindex, nofollow";
add_header X-Permitted-Cross-Domain-Policies none;
add_header X-Frame-Options sameorigin;
···
index index.php index.html /index.php$request_uri;
${lib.optionalString (cfg.nginx.recommendedHttpHeaders) ''
add_header X-Content-Type-Options nosniff;
add_header X-Robots-Tag "noindex, nofollow";
add_header X-Permitted-Cross-Domain-Policies none;
add_header X-Frame-Options sameorigin;
-1
nixos/tests/kernel-generic.nix
···
kernels = pkgs.linuxKernel.vanillaPackages // {
inherit (pkgs.linuxKernel.packages)
linux_6_12_hardened
-
linux_6_15_hardened
linux_rt_5_4
linux_rt_5_10
linux_rt_5_15
···
kernels = pkgs.linuxKernel.vanillaPackages // {
inherit (pkgs.linuxKernel.packages)
linux_6_12_hardened
linux_rt_5_4
linux_rt_5_10
linux_rt_5_15
+2 -2
pkgs/by-name/cd/cdncheck/package.nix
···
buildGoModule rec {
pname = "cdncheck";
-
version = "1.1.33";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "cdncheck";
tag = "v${version}";
-
hash = "sha256-T00lM/jA0+3z5RViQkzACNyUqsgSzYtdgGwNli+nm7w=";
};
vendorHash = "sha256-/1REkZ5+sz/H4T4lXhloz7fu5cLv1GoaD3dlttN+Qd4=";
···
buildGoModule rec {
pname = "cdncheck";
+
version = "1.1.34";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "cdncheck";
tag = "v${version}";
+
hash = "sha256-I/wmKKrXFjaha2sq9l/zFJkkDf6DNNeSAOBcKmnOZNg=";
};
vendorHash = "sha256-/1REkZ5+sz/H4T4lXhloz7fu5cLv1GoaD3dlttN+Qd4=";
+3 -3
pkgs/by-name/cr/crosvm/package.nix
···
rustPlatform.buildRustPackage {
pname = "crosvm";
-
version = "0-unstable-2025-08-18";
src = fetchgit {
url = "https://chromium.googlesource.com/chromiumos/platform/crosvm";
-
rev = "44659aa08a8c89c3dad2e468ff57cdb639c80732";
-
hash = "sha256-bYTZ1R/WPUUZoxmdreFGaRt9epAI+mcIrEvs5RJPUeA=";
fetchSubmodules = true;
};
···
rustPlatform.buildRustPackage {
pname = "crosvm";
+
version = "0-unstable-2025-08-28";
src = fetchgit {
url = "https://chromium.googlesource.com/chromiumos/platform/crosvm";
+
rev = "ce1281988c5639f2a6a4cc6c20c03eb44751de07";
+
hash = "sha256-zorrj6sENcjV+pa2VYhunu8LhxT3oOyDRreHX78HckI=";
fetchSubmodules = true;
};
+48 -37
pkgs/by-name/fw/fwupd/add-option-for-installation-sysconfdir.patch
···
-
commit e798ff19cd36daaed68b86edc7ebdb9dcfe1c057
Author: r-vdp <ramses@well-founded.dev>
Date: Tue Oct 15 11:46:38 2024 +0200
Add option for installation sysconfdir
diff --git a/data/bios-settings.d/meson.build b/data/bios-settings.d/meson.build
-
index b0ff5b106..29b60a3be 100644
--- a/data/bios-settings.d/meson.build
+++ b/data/bios-settings.d/meson.build
-
@@ -1,5 +1,5 @@
if build_standalone and host_machine.system() == 'linux'
install_data('README.md',
- install_dir: join_paths(sysconfdir, 'fwupd', 'bios-settings.d')
+ install_dir: join_paths(datadir, 'fwupd', 'bios-settings.d')
)
endif
diff --git a/data/meson.build b/data/meson.build
-
index 9db5cd756..cf3181c8b 100644
--- a/data/meson.build
+++ b/data/meson.build
-
@@ -27,7 +27,7 @@ endif
-
if build_standalone
install_data(['fwupd.conf'],
- install_dir: join_paths(sysconfdir, 'fwupd'),
+ install_dir: join_paths(sysconfdir_install, 'fwupd'),
install_mode: 'rw-r-----',
)
plugin_quirks += files([
diff --git a/data/pki/meson.build b/data/pki/meson.build
-
index 686064195..72ae401bd 100644
--- a/data/pki/meson.build
+++ b/data/pki/meson.build
-
@@ -7,13 +7,13 @@ install_data([
-
'GPG-KEY-Linux-Foundation-Firmware',
'GPG-KEY-Linux-Vendor-Firmware-Service',
],
- install_dir: join_paths(sysconfdir, 'pki', 'fwupd')
+ install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd')
)
···
'GPG-KEY-Linux-Foundation-Metadata',
'GPG-KEY-Linux-Vendor-Firmware-Service',
],
- install_dir: join_paths(sysconfdir, 'pki', 'fwupd-metadata')
+ install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd-metadata')
)
endif
-
@@ -21,11 +21,11 @@ if supported_pkcs7
-
install_data([
'LVFS-CA.pem',
],
- install_dir: join_paths(sysconfdir, 'pki', 'fwupd')
+ install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd')
)
install_data([
'LVFS-CA.pem',
],
- install_dir: join_paths(sysconfdir, 'pki', 'fwupd-metadata')
+ install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd-metadata')
)
endif
diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build
-
index 10201bc9a..fba712491 100644
--- a/data/remotes.d/meson.build
+++ b/data/remotes.d/meson.build
-
@@ -11,14 +11,14 @@ if build_standalone and get_option('lvfs') != 'false'
-
output: 'lvfs.conf',
configuration: con3,
install: true,
- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
)
configure_file(
input: 'lvfs-testing.conf',
-
output: 'lvfs-testing.conf',
configuration: con3,
install: true,
- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
)
i18n.merge_file(
input: 'lvfs.metainfo.xml',
-
@@ -52,12 +52,12 @@ configure_file(
-
output: 'vendor.conf',
configuration: con2,
install: get_option('vendor_metadata'),
- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
)
configure_file(
input: 'vendor-directory.conf',
-
output: 'vendor-directory.conf',
configuration: con2,
install: true,
- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
)
diff --git a/docs/meson.build b/docs/meson.build
-
index 5693edcc8..181c359a4 100644
--- a/docs/meson.build
+++ b/docs/meson.build
-
@@ -124,7 +124,7 @@ if build_docs
-
],
build_by_default: true,
install: true,
- install_dir: join_paths(datadir, 'doc'),
+ install_dir: join_paths(sysconfdir_install, 'doc'),
)
subdir('hsi-tests.d')
-
@@ -182,7 +182,7 @@ if build_docs
-
],
build_by_default: true,
install: true,
- install_dir: join_paths(datadir, 'doc'),
+ install_dir: join_paths(sysconfdir_install, 'doc'),
)
man_cmd = []
foreach man: man_md
-
@@ -196,7 +196,7 @@ if build_docs
-
man_cmd,
],
install: true,
- install_dir: join_paths(datadir, 'doc', 'fwupd')
+ install_dir: join_paths(sysconfdir_install, 'doc', 'fwupd')
)
if hsi
install_data(['hsi.html'],
-
@@ -204,18 +204,18 @@ if build_docs
)
endif
install_data(['urlmap_fwupd.js'],
- install_dir: join_paths(datadir, 'doc', 'libfwupd')
+ install_dir: join_paths(sysconfdir_install, 'doc', 'libfwupd')
)
install_data(['urlmap_fwupdplugin.js'],
- install_dir: join_paths(datadir, 'doc', 'libfwupdplugin')
+ install_dir: join_paths(sysconfdir_install, 'doc', 'libfwupdplugin')
)
#make devhelp work
install_symlink('libfwupd',
- install_dir: join_paths(datadir, 'doc', 'fwupd'),
+ install_dir: join_paths(sysconfdir_install, 'doc', 'fwupd'),
pointing_to: join_paths('..', 'libfwupd'),
)
install_symlink('libfwupdplugin',
- install_dir: join_paths(datadir, 'doc', 'fwupd'),
+ install_dir: join_paths(sysconfdir_install, 'doc', 'fwupd'),
pointing_to: join_paths('..', 'libfwupdplugin'),
)
endif
diff --git a/meson.build b/meson.build
-
index 2ceaf531c..e4e764b97 100644
--- a/meson.build
+++ b/meson.build
-
@@ -201,6 +201,12 @@ endif
mandir = join_paths(prefix, get_option('mandir'))
localedir = join_paths(prefix, get_option('localedir'))
···
+endif
+
diffcmd = find_program('diff')
-
gio = dependency('gio-2.0', version: '>= 2.72.0')
-
giounix = dependency('gio-unix-2.0', version: '>= 2.72.0', required: false)
diff --git a/meson_options.txt b/meson_options.txt
-
index a4a211fbb..6197fe502 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -7,6 +7,11 @@ option('bluez',
···
type: 'combo',
choices: [
diff --git a/plugins/uefi-capsule/meson.build b/plugins/uefi-capsule/meson.build
-
index 2dfc4d2f0..e5ac73edd 100644
--- a/plugins/uefi-capsule/meson.build
+++ b/plugins/uefi-capsule/meson.build
-
@@ -20,7 +20,7 @@ if host_machine.system() == 'linux'
-
output: '35_fwupd',
configuration: con2,
install: true,
- install_dir: join_paths(sysconfdir, 'grub.d')
+ install_dir: join_paths(sysconfdir_install, 'grub.d')
)
elif host_machine.system() == 'freebsd'
-
backend_srcs += 'fu-uefi-backend-freebsd.c'
-
@@ -93,7 +93,7 @@ if get_option('plugin_uefi_capsule_splash')
-
'--out', '@OUTPUT@',
],
install: true,
- install_dir: join_paths(datadir, 'fwupd'),
+ install_dir: join_paths(sysconfdir_install, 'fwupd'),
)
···
+
commit 448e265ad3fef9a5ef0ff57593dd5a9164118852
Author: r-vdp <ramses@well-founded.dev>
Date: Tue Oct 15 11:46:38 2024 +0200
Add option for installation sysconfdir
diff --git a/data/bios-settings.d/meson.build b/data/bios-settings.d/meson.build
+
index 3f1cb3574..acbdccb61 100644
--- a/data/bios-settings.d/meson.build
+++ b/data/bios-settings.d/meson.build
+
@@ -1,6 +1,6 @@
if build_standalone and host_machine.system() == 'linux'
install_data('README.md',
+
install_tag: 'doc',
- install_dir: join_paths(sysconfdir, 'fwupd', 'bios-settings.d')
+ install_dir: join_paths(datadir, 'fwupd', 'bios-settings.d')
)
endif
diff --git a/data/meson.build b/data/meson.build
+
index 78f54bd83..aae01ed56 100644
--- a/data/meson.build
+++ b/data/meson.build
+
@@ -28,7 +28,7 @@ endif
if build_standalone
install_data(['fwupd.conf'],
+
install_tag: 'runtime',
- install_dir: join_paths(sysconfdir, 'fwupd'),
+ install_dir: join_paths(sysconfdir_install, 'fwupd'),
install_mode: 'rw-r-----',
)
plugin_quirks += files([
diff --git a/data/pki/meson.build b/data/pki/meson.build
+
index 9b1e6b372..5c80ba564 100644
--- a/data/pki/meson.build
+++ b/data/pki/meson.build
+
@@ -8,14 +8,14 @@ install_data([
'GPG-KEY-Linux-Vendor-Firmware-Service',
],
+
install_tag: 'runtime',
- install_dir: join_paths(sysconfdir, 'pki', 'fwupd')
+ install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd')
)
···
'GPG-KEY-Linux-Foundation-Metadata',
'GPG-KEY-Linux-Vendor-Firmware-Service',
],
+
install_tag: 'runtime',
- install_dir: join_paths(sysconfdir, 'pki', 'fwupd-metadata')
+ install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd-metadata')
)
endif
+
@@ -24,12 +24,12 @@ install_data([
'LVFS-CA.pem',
],
+
install_tag: 'runtime',
- install_dir: join_paths(sysconfdir, 'pki', 'fwupd')
+ install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd')
)
install_data([
'LVFS-CA.pem',
],
+
install_tag: 'runtime',
- install_dir: join_paths(sysconfdir, 'pki', 'fwupd-metadata')
+ install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd-metadata')
)
endif
diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build
+
index 77285cafa..7d2cb8f58 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'
configuration: con3,
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-testing.conf',
+
@@ -20,7 +20,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',
+
@@ -58,7 +58,7 @@ configure_file(
configuration: con2,
install: get_option('vendor_metadata'),
+
install_tag: 'runtime',
- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
)
configure_file(
input: 'vendor-directory.conf',
+
@@ -66,5 +66,5 @@ configure_file(
configuration: con2,
install: true,
+
install_tag: 'runtime',
- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
)
diff --git a/docs/meson.build b/docs/meson.build
+
index c1e483f4f..684ec3fbe 100644
--- a/docs/meson.build
+++ b/docs/meson.build
+
@@ -127,7 +127,7 @@ if build_docs
build_by_default: true,
install: true,
+
install_tag: 'doc',
- install_dir: join_paths(datadir, 'doc'),
+ install_dir: join_paths(sysconfdir_install, 'doc'),
)
subdir('hsi-tests.d')
+
@@ -186,7 +186,7 @@ if build_docs
build_by_default: true,
install: true,
+
install_tag: 'doc',
- install_dir: join_paths(datadir, 'doc'),
+ install_dir: join_paths(sysconfdir_install, 'doc'),
)
man_cmd = []
foreach man: man_md
+
@@ -201,31 +201,31 @@ if build_docs
],
install: true,
+
install_tag: 'doc',
- install_dir: join_paths(datadir, 'doc', 'fwupd')
+ install_dir: join_paths(sysconfdir_install, 'doc', 'fwupd')
)
if hsi
install_data(['hsi.html'],
+
install_tag: 'doc',
+
- install_dir : join_paths(datadir, 'doc', 'fwupd')
+
+ install_dir : join_paths(sysconfdir_install, 'doc', 'fwupd')
)
endif
install_data(['urlmap_fwupd.js'],
+
install_tag: 'doc',
- install_dir: join_paths(datadir, 'doc', 'libfwupd')
+ install_dir: join_paths(sysconfdir_install, 'doc', 'libfwupd')
)
install_data(['urlmap_fwupdplugin.js'],
+
install_tag: 'doc',
- install_dir: join_paths(datadir, 'doc', 'libfwupdplugin')
+ install_dir: join_paths(sysconfdir_install, 'doc', 'libfwupdplugin')
)
#make devhelp work
install_symlink('libfwupd',
+
install_tag: 'doc',
- install_dir: join_paths(datadir, 'doc', 'fwupd'),
+ install_dir: join_paths(sysconfdir_install, 'doc', 'fwupd'),
pointing_to: join_paths('..', 'libfwupd'),
)
install_symlink('libfwupdplugin',
+
install_tag: 'doc',
- install_dir: join_paths(datadir, 'doc', 'fwupd'),
+ install_dir: join_paths(sysconfdir_install, 'doc', 'fwupd'),
pointing_to: join_paths('..', 'libfwupdplugin'),
)
endif
diff --git a/meson.build b/meson.build
+
index 4faedcc0b..980f9bb0c 100644
--- a/meson.build
+++ b/meson.build
+
@@ -212,6 +212,12 @@ endif
mandir = join_paths(prefix, get_option('mandir'))
localedir = join_paths(prefix, get_option('localedir'))
···
+endif
+
diffcmd = find_program('diff')
+
gio = dependency('gio-2.0', version: '>= 2.68.0') # limited by RHEL-9, which has v2.68.4
+
giounix = dependency('gio-unix-2.0', version: '>= 2.68.0', required: false)
diff --git a/meson_options.txt b/meson_options.txt
+
index 63c8d288d..04f6651e6 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -7,6 +7,11 @@ option('bluez',
···
type: 'combo',
choices: [
diff --git a/plugins/uefi-capsule/meson.build b/plugins/uefi-capsule/meson.build
+
index 647ace53e..4ee0192df 100644
--- a/plugins/uefi-capsule/meson.build
+++ b/plugins/uefi-capsule/meson.build
+
@@ -23,7 +23,7 @@ if host_machine.system() == 'linux'
configuration: con2,
install: true,
+
install_tag: 'runtime',
- install_dir: join_paths(sysconfdir, 'grub.d')
+ install_dir: join_paths(sysconfdir_install, 'grub.d')
)
elif host_machine.system() == 'freebsd'
+
backend_srcs += 'fu-uefi-capsule-backend-freebsd.c'
+
@@ -98,7 +98,7 @@ if get_option('plugin_uefi_capsule_splash')
],
install: true,
+
install_tag: 'runtime',
- install_dir: join_paths(datadir, 'fwupd'),
+ install_dir: join_paths(sysconfdir_install, 'fwupd'),
)
+3 -3
pkgs/by-name/fw/fwupd/install-fwupdplugin-to-out.patch
···
-
commit 50827b154728a97e5dfcb7d41e5c7155752919c3
Author: r-vdp <ramses@well-founded.dev>
Date: Mon Oct 28 12:07:51 2024 +0100
Install fwupdplugin to out
diff --git a/meson.build b/meson.build
-
index 250b76107..62c127c35 100644
--- a/meson.build
+++ b/meson.build
-
@@ -553,7 +553,7 @@ if build_standalone
if host_machine.system() == 'windows'
libdir_pkg = bindir
else
···
+
commit 1b7f8b3ad7df9a5911fbc45608d9b40e0787baca
Author: r-vdp <ramses@well-founded.dev>
Date: Mon Oct 28 12:07:51 2024 +0100
Install fwupdplugin to out
diff --git a/meson.build b/meson.build
+
index 747d1b385..312513d75 100644
--- a/meson.build
+++ b/meson.build
+
@@ -548,7 +548,7 @@ if build_standalone
if host_machine.system() == 'windows'
libdir_pkg = bindir
else
+14 -14
pkgs/by-name/fw/fwupd/installed-tests-path.patch
···
-
commit 2fa1d39bb54d448ffe59bf6a8358c01f786a1cce
Author: r-vdp <ramses@well-founded.dev>
Date: Tue Oct 15 14:49:53 2024 +0200
Add output for installed tests
diff --git a/data/tests/meson.build b/data/tests/meson.build
-
index a22a989f3..cbd135cfa 100644
--- a/data/tests/meson.build
+++ b/data/tests/meson.build
-
@@ -105,7 +105,7 @@ configure_file(
-
output: 'fwupd-tests.conf',
configuration: con2,
install: true,
- install_dir: join_paths(datadir, 'fwupd', 'remotes.d'),
+ install_dir: join_paths(get_option('installed_test_prefix'), 'etc', 'fwupd', 'remotes.d'),
)
if umockdev_integration_tests.allowed()
diff --git a/meson.build b/meson.build
-
index 5a35cfda1..40ef142f0 100644
--- a/meson.build
+++ b/meson.build
-
@@ -194,8 +194,8 @@ else
datadir = join_paths(prefix, get_option('datadir'))
sysconfdir = join_paths(prefix, get_option('sysconfdir'))
localstatedir = join_paths(prefix, get_option('localstatedir'))
···
daemon_dir = join_paths(libexecdir, 'fwupd')
endif
mandir = join_paths(prefix, get_option('mandir'))
-
@@ -545,6 +545,7 @@ gnome = import('gnome')
i18n = import('i18n')
conf.set_quoted('FWUPD_PREFIX', prefix)
···
conf.set_quoted('FWUPD_LIBDIR', libdir)
conf.set_quoted('FWUPD_LIBEXECDIR', libexecdir)
diff --git a/meson_options.txt b/meson_options.txt
-
index e04bb37c9..b1060ddb8 100644
--- a/meson_options.txt
+++ b/meson_options.txt
-
@@ -333,6 +333,10 @@ option('systemd_syscall_filter',
-
value: 'true',
-
description: 'Enable systemd syscall filter',
)
+option('installed_test_prefix',
+ type: 'string',
···
type: 'boolean',
value: true,
diff --git a/src/tests/host-emulate/meson.build b/src/tests/host-emulate/meson.build
-
index 4bc02e46e..17bc2270d 100644
--- a/src/tests/host-emulate/meson.build
+++ b/src/tests/host-emulate/meson.build
-
@@ -9,7 +9,7 @@ if build_standalone
-
capture: true,
command: [gzip, '-k', '--stdout', '@INPUT@'],
install: true,
- install_dir: join_paths(datadir, 'fwupd', 'host-emulate.d'),
+ install_dir: join_paths(get_option('installed_test_prefix'), 'etc', 'fwupd', 'host-emulate.d'),
)
···
+
commit abaf36af96c7dfc966110c5342d5a8814c0df492
Author: r-vdp <ramses@well-founded.dev>
Date: Tue Oct 15 14:49:53 2024 +0200
Add output for installed tests
diff --git a/data/tests/meson.build b/data/tests/meson.build
+
index da9524677..505d7a80e 100644
--- a/data/tests/meson.build
+++ b/data/tests/meson.build
+
@@ -131,7 +131,7 @@ configure_file(
configuration: con2,
install: true,
+
install_tag: 'tests',
- install_dir: join_paths(datadir, 'fwupd', 'remotes.d'),
+ install_dir: join_paths(get_option('installed_test_prefix'), 'etc', 'fwupd', 'remotes.d'),
)
if umockdev_integration_tests.allowed()
diff --git a/meson.build b/meson.build
+
index 312513d75..4faedcc0b 100644
--- a/meson.build
+++ b/meson.build
+
@@ -205,8 +205,8 @@ else
datadir = join_paths(prefix, get_option('datadir'))
sysconfdir = join_paths(prefix, get_option('sysconfdir'))
localstatedir = join_paths(prefix, get_option('localstatedir'))
···
daemon_dir = join_paths(libexecdir, 'fwupd')
endif
mandir = join_paths(prefix, get_option('mandir'))
+
@@ -536,6 +536,7 @@ gnome = import('gnome')
i18n = import('i18n')
conf.set_quoted('FWUPD_PREFIX', prefix)
···
conf.set_quoted('FWUPD_LIBDIR', libdir)
conf.set_quoted('FWUPD_LIBEXECDIR', libexecdir)
diff --git a/meson_options.txt b/meson_options.txt
+
index 40103c03e..63c8d288d 100644
--- a/meson_options.txt
+++ b/meson_options.txt
+
@@ -174,6 +174,10 @@ option('systemd_unit_user',
+
value: 'fwupd-refresh',
+
description: 'User account to use for fwupd-refresh.service (empty for DynamicUser)',
)
+option('installed_test_prefix',
+ type: 'string',
···
type: 'boolean',
value: true,
diff --git a/src/tests/host-emulate/meson.build b/src/tests/host-emulate/meson.build
+
index 0a67d70e8..7e07c0a49 100644
--- a/src/tests/host-emulate/meson.build
+++ b/src/tests/host-emulate/meson.build
+
@@ -10,7 +10,7 @@ if build_standalone
command: [gzip, '-k', '--stdout', '@INPUT@'],
install: true,
+
install_tag: 'tests',
- install_dir: join_paths(datadir, 'fwupd', 'host-emulate.d'),
+ install_dir: join_paths(get_option('installed_test_prefix'), 'etc', 'fwupd', 'host-emulate.d'),
)
+2 -2
pkgs/by-name/fw/fwupd/package.nix
···
in
stdenv.mkDerivation (finalAttrs: {
pname = "fwupd";
-
version = "2.0.13";
# libfwupd goes to lib
# daemon, plug-ins and libfwupdplugin go to out
···
owner = "fwupd";
repo = "fwupd";
tag = finalAttrs.version;
-
hash = "sha256-iarQfen2MCgQUDST5c81+KBd8gxBqM9EO6f0fN4fZbI=";
};
patches = [
···
in
stdenv.mkDerivation (finalAttrs: {
pname = "fwupd";
+
version = "2.0.14";
# libfwupd goes to lib
# daemon, plug-ins and libfwupdplugin go to out
···
owner = "fwupd";
repo = "fwupd";
tag = finalAttrs.version;
+
hash = "sha256-VUpLYl7SKJqwbM3Lna22txTeMwqtpQieiw1DLX/4xtA=";
};
patches = [
+3 -3
pkgs/by-name/ge/geographiclib/package.nix
···
stdenv.mkDerivation rec {
pname = "geographiclib";
-
version = "2.5.1";
src = fetchFromGitHub {
owner = "geographiclib";
repo = "geographiclib";
tag = "v${version}";
-
hash = "sha256-ZXIRLLvCsVp8RnChjLiAfD38CJFqV8sv/PAEORsF6oc=";
};
outputs = [
···
'';
homepage = "https://geographiclib.sourceforge.io/";
license = lib.licenses.mit;
-
maintainers = with lib.maintainers; [ sikmir ];
platforms = lib.platforms.unix;
};
}
···
stdenv.mkDerivation rec {
pname = "geographiclib";
+
version = "2.5.2";
src = fetchFromGitHub {
owner = "geographiclib";
repo = "geographiclib";
tag = "v${version}";
+
hash = "sha256-bFErzgjxBCtN12UNtnGPuS6bg1sI31gR7WZjawsY3Yo=";
};
outputs = [
···
'';
homepage = "https://geographiclib.sourceforge.io/";
license = lib.licenses.mit;
+
teams = [ lib.teams.geospatial ];
platforms = lib.platforms.unix;
};
}
+18
pkgs/by-name/ju/junixsocket-common/package.nix
···
···
+
{
+
fetchMavenArtifact,
+
lib,
+
}:
+
+
fetchMavenArtifact {
+
groupId = "com.kohlschutter.junixsocket";
+
artifactId = "junixsocket-common";
+
version = "2.10.1";
+
hash = "sha256-GeX3YVrSKT81Mrw/mRsxOWwRYYNOidmmqgx975OcZyk=";
+
meta = {
+
homepage = "https://kohlschutter.github.io/junixsocket/";
+
description = "Java/JNI library that allows the use of Unix Domain Sockets (AF_UNIX sockets) and other socket types, such as AF_TIPC and AF_VSOCK, from Java, using the standard Socket API";
+
license = lib.licenses.asl20;
+
sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
+
maintainers = [ lib.maintainers.vog ];
+
};
+
}
+16
pkgs/by-name/ju/junixsocket-native-common/package.nix
···
···
+
{
+
fetchMavenArtifact,
+
junixsocket-common,
+
lib,
+
}:
+
+
fetchMavenArtifact {
+
groupId = "com.kohlschutter.junixsocket";
+
artifactId = "junixsocket-native-common";
+
inherit (junixsocket-common) version;
+
hash = "sha256-ASbOC68c61de9ReAfU0rFLnzLwYYAgThLsc6tKdyVno=";
+
meta = junixsocket-common.meta // {
+
description = "Binaries of the native JNI library for junixsocket for common platforms";
+
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+
};
+
}
+5 -5
pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/redirects.py
···
This can happen when an identifier was added, renamed, or removed.
Added new content?
-
$ redirects add-content ❬identifier❭ ❬path❭
often:
-
$ redirects add-content ❬identifier❭ index.html
Moved existing content to a different output path?
-
$ redirects move-content ❬identifier❭ ❬path❭
Renamed existing identifiers?
-
$ redirects rename-identifier ❬old-identifier❭ ❬new-identifier❭
Removed content? Redirect to alternatives or relevant release notes.
-
$ redirects remove-and-redirect ❬identifier❭ ❬target-identifier❭
NOTE: Run the right nix-shell to make this command available.
Nixpkgs:
···
This can happen when an identifier was added, renamed, or removed.
Added new content?
+
$ redirects add-content <identifier> <path>
often:
+
$ redirects add-content <identifier> index.html
Moved existing content to a different output path?
+
$ redirects move-content <identifier> <path>
Renamed existing identifiers?
+
$ redirects rename-identifier <old-identifier> <new-identifier>
Removed content? Redirect to alternatives or relevant release notes.
+
$ redirects remove-and-redirect <identifier> <target-identifier>
NOTE: Run the right nix-shell to make this command available.
Nixpkgs:
+7 -16
pkgs/by-name/op/openbao/package.nix
···
{
lib,
fetchFromGitHub,
-
fetchpatch2,
buildGoModule,
installShellFiles,
versionCheckHook,
···
buildGoModule (finalAttrs: {
pname = "openbao";
-
version = "2.3.2";
src = fetchFromGitHub {
owner = "openbao";
repo = "openbao";
tag = "v${finalAttrs.version}";
-
hash = "sha256-r3ZopogeRqsgaM/HEKlS6B0ipaDG/5mKUyzGET3P1e0=";
};
-
vendorHash = "sha256-D4uZmQKe4VuSpuW8JD5NOOq7Nvx8HRXzyvgzkBhsKLQ=";
proxyVendor = true;
-
-
patches = [
-
(fetchpatch2 {
-
# Temporarily revert upstream raising the min go version to 1.24.6
-
# until that go version lands from staging in master.
-
name = "revert-Bump-to-Go-1.24.6.patch";
-
url = "https://github.com/openbao/openbao/commit/85504045ecf2d343b74be2c1cda6c2c0b0d6acff.patch?full_index=1";
-
revert = true;
-
hash = "sha256-tXSnnqrNxgnJ2ya4HjLSh4e+6hdyPgKRsFsmkMNfNRU=";
-
})
-
];
subPackages = [ "." ];
···
changelog = "https://github.com/openbao/openbao/blob/v${finalAttrs.version}/CHANGELOG.md";
license = lib.licenses.mpl20;
mainProgram = "bao";
-
maintainers = with lib.maintainers; [ brianmay ];
};
})
···
{
lib,
fetchFromGitHub,
buildGoModule,
installShellFiles,
versionCheckHook,
···
buildGoModule (finalAttrs: {
pname = "openbao";
+
version = "2.4.0";
src = fetchFromGitHub {
owner = "openbao";
repo = "openbao";
tag = "v${finalAttrs.version}";
+
hash = "sha256-VJCKZYBuw6fenTqRDxvLVNMXlPuDEq43WB7TI2RNWvc=";
};
+
vendorHash = "sha256-4SWpWGWoesUCgSpgOpblkxOpPbBC/grC2S1m7R9qasY=";
proxyVendor = true;
subPackages = [ "." ];
···
changelog = "https://github.com/openbao/openbao/blob/v${finalAttrs.version}/CHANGELOG.md";
license = lib.licenses.mpl20;
mainProgram = "bao";
+
maintainers = with lib.maintainers; [
+
brianmay
+
emilylange
+
];
};
})
+1 -1
pkgs/by-name/op/openbao/ui.nix
···
offlineCache = yarn-berry_3.fetchYarnBerryDeps {
inherit (finalAttrs) src sourceRoot;
-
hash = "sha256-/SKQC+i8tgpYNVJIem8XDp+v7olGbRRgW25UhhLpIu8=";
};
nativeBuildInputs = [
···
offlineCache = yarn-berry_3.fetchYarnBerryDeps {
inherit (finalAttrs) src sourceRoot;
+
hash = "sha256-ZG/br4r2YzPPgsysx7MBy1WtUBkar1U84nkKecZ5bvU=";
};
nativeBuildInputs = [
+2 -2
pkgs/by-name/ph/phase-cli/package.nix
···
python3Packages.buildPythonApplication rec {
pname = "phase-cli";
-
version = "1.19.3";
pyproject = true;
src = fetchFromGitHub {
owner = "phasehq";
repo = "cli";
tag = "v${version}";
-
hash = "sha256-bKbhSV7Xa5LYjHVBlsboQGY0nCtLmAJaFhGpe4ZCb0s=";
};
build-system = with python3Packages; [
···
python3Packages.buildPythonApplication rec {
pname = "phase-cli";
+
version = "1.19.6";
pyproject = true;
src = fetchFromGitHub {
owner = "phasehq";
repo = "cli";
tag = "v${version}";
+
hash = "sha256-SOFMTetw5kEduV7ufY1v2vnv3exDEmnCFBr9q83YVTo=";
};
build-system = with python3Packages; [
+1 -44
pkgs/development/compilers/rust/1_89.nix
···
llvmShared = llvmSharedFor pkgsHostTarget;
# Expose llvmPackages used for rustc from rustc via passthru for LTO in Firefox
-
llvmPackages =
-
if (stdenv.targetPlatform.useLLVM or false) then
-
callPackage (
-
{
-
pkgs,
-
bootBintoolsNoLibc ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintoolsNoLibc,
-
bootBintools ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintools,
-
}:
-
let
-
llvmPackages = llvmPackages_20;
-
-
setStdenv =
-
pkg:
-
pkg.override {
-
stdenv = stdenv.override {
-
allowedRequisites = null;
-
cc = pkgsBuildHost.llvmPackages_20.clangUseLLVM;
-
};
-
};
-
in
-
rec {
-
inherit (llvmPackages) bintools;
-
-
libunwind = setStdenv llvmPackages.libunwind;
-
llvm = setStdenv llvmPackages.llvm;
-
-
libcxx = llvmPackages.libcxx.override {
-
stdenv = stdenv.override {
-
allowedRequisites = null;
-
cc = pkgsBuildHost.llvmPackages_20.clangNoLibcxx;
-
hostPlatform = stdenv.hostPlatform // {
-
useLLVM = !stdenv.hostPlatform.isDarwin;
-
};
-
};
-
inherit libunwind;
-
};
-
-
clangUseLLVM = llvmPackages.clangUseLLVM.override { inherit libcxx; };
-
-
stdenv = overrideCC args.stdenv clangUseLLVM;
-
}
-
) { }
-
else
-
llvmPackages_20;
# Note: the version MUST be the same version that we are building. Upstream
# ensures that each released compiler can compile itself:
···
llvmShared = llvmSharedFor pkgsHostTarget;
# Expose llvmPackages used for rustc from rustc via passthru for LTO in Firefox
+
llvmPackages = llvmPackages_20;
# Note: the version MUST be the same version that we are building. Upstream
# ensures that each released compiler can compile itself:
+1 -10
pkgs/development/compilers/rust/rustc.nix
···
(stdenv.hostPlatform.isLinux && !withBundledLLVM && !stdenv.targetPlatform.isFreeBSD && useLLVM)
"--push-state --as-needed -L${llvmPackages.libcxx}/lib -lc++ -lc++abi -lLLVM-${lib.versions.major llvmPackages.llvm.version} --pop-state"
++ optional (stdenv.hostPlatform.isDarwin && !withBundledLLVM) "-lc++ -lc++abi"
-
++ optional stdenv.hostPlatform.isFreeBSD "-rpath ${llvmPackages.libunwind}/lib"
++ optional stdenv.hostPlatform.isDarwin "-rpath ${llvmSharedForHost.lib}/lib"
);
···
zlib
]
++ optional (!withBundledLLVM) llvmShared.lib
-
++ optional (useLLVM && !withBundledLLVM && !stdenv.targetPlatform.isFreeBSD) [
-
llvmPackages.libunwind
-
# Hack which is used upstream https://github.com/gentoo/gentoo/blob/master/dev-lang/rust/rust-1.78.0.ebuild#L284
-
(runCommandLocal "libunwind-libgcc" { } ''
-
mkdir -p $out/lib
-
ln -s ${llvmPackages.libunwind}/lib/libunwind.so $out/lib/libgcc_s.so
-
ln -s ${llvmPackages.libunwind}/lib/libunwind.so $out/lib/libgcc_s.so.1
-
'')
-
];
outputs = [
"out"
···
(stdenv.hostPlatform.isLinux && !withBundledLLVM && !stdenv.targetPlatform.isFreeBSD && useLLVM)
"--push-state --as-needed -L${llvmPackages.libcxx}/lib -lc++ -lc++abi -lLLVM-${lib.versions.major llvmPackages.llvm.version} --pop-state"
++ optional (stdenv.hostPlatform.isDarwin && !withBundledLLVM) "-lc++ -lc++abi"
++ optional stdenv.hostPlatform.isDarwin "-rpath ${llvmSharedForHost.lib}/lib"
);
···
zlib
]
++ optional (!withBundledLLVM) llvmShared.lib
+
++ optional (useLLVM && !withBundledLLVM) llvmPackages.libunwind;
outputs = [
"out"
+16 -12
pkgs/development/libraries/vigra/default.nix
···
libtiff,
openexr,
python3,
}:
let
···
in
stdenv.mkDerivation (finalAttrs: {
pname = "vigra";
-
version = "1.12.1";
src = fetchFromGitHub {
owner = "ukoethe";
repo = "vigra";
tag = "Version-${lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version}";
-
hash = "sha256-ZmHj1BSyoMBCuxI5hrRiBEb5pDUsGzis+T5FSX27UN8=";
};
-
-
patches = [
-
# Patches to fix compiling on LLVM 19 from https://github.com/ukoethe/vigra/pull/592
-
./fix-llvm-19-1.patch
-
./fix-llvm-19-2.patch
-
];
nativeBuildInputs = [ cmake ];
buildInputs = [
···
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
});
};
};
-
meta = with lib; {
description = "Novel computer vision C++ library with customizable algorithms and data structures";
mainProgram = "vigra-config";
homepage = "https://hci.iwr.uni-heidelberg.de/vigra";
-
license = licenses.mit;
-
maintainers = with maintainers; [ ShamrockLee ];
-
platforms = platforms.unix;
};
})
···
libtiff,
openexr,
python3,
+
writeShellScript,
+
jq,
+
nix-update,
}:
let
···
in
stdenv.mkDerivation (finalAttrs: {
pname = "vigra";
+
version = "1.12.2";
src = fetchFromGitHub {
owner = "ukoethe";
repo = "vigra";
tag = "Version-${lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version}";
+
hash = "sha256-E+O5NbDX1ycDJTht6kW8JzYnhEL6Wd1xp0rcLpdm2HQ=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [
···
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
});
};
+
updateScript = writeShellScript "update-vigra" ''
+
latestVersion=$(curl ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} --fail --silent https://api.github.com/repos/ukoethe/vigra/releases/latest | ${lib.getExe jq} --raw-output .tag_name | sed -E 's/Version-([0-9]+)-([0-9]+)-([0-9]+)/\1.\2.\3/')
+
${lib.getExe nix-update} vigra --version $latestVersion
+
'';
};
+
meta = {
description = "Novel computer vision C++ library with customizable algorithms and data structures";
mainProgram = "vigra-config";
homepage = "https://hci.iwr.uni-heidelberg.de/vigra";
+
license = lib.licenses.mit;
+
maintainers = with lib.maintainers; [
+
ShamrockLee
+
kyehn
+
];
+
platforms = lib.platforms.unix;
};
})
-22
pkgs/development/libraries/vigra/fix-llvm-19-1.patch
···
-
From c04362c082f35e87afbc9441dd2b3821de179055 Mon Sep 17 00:00:00 2001
-
From: Lukas N Wirz <lnwirz@chem.helsinki.fi>
-
Date: Sat, 9 Nov 2024 23:15:40 +0200
-
Subject: [PATCH] fix --this typo
-
-
---
-
include/vigra/multi_iterator_coupled.hxx | 2 +-
-
1 file changed, 1 insertion(+), 1 deletion(-)
-
-
diff --git a/include/vigra/multi_iterator_coupled.hxx b/include/vigra/multi_iterator_coupled.hxx
-
index 6831dad5d..9e6ca3c62 100644
-
--- a/include/vigra/multi_iterator_coupled.hxx
-
+++ b/include/vigra/multi_iterator_coupled.hxx
-
@@ -490,7 +490,7 @@ class CoupledScanOrderIterator<N, HANDLES, 0>
-
CoupledScanOrderIterator operator--(int)
-
{
-
CoupledScanOrderIterator res(*this);
-
- --this;
-
+ std::advance(this, -1);
-
return res;
-
}
-
···
-22
pkgs/development/libraries/vigra/fix-llvm-19-2.patch
···
-
From 191c09c2b086e1b0ab0ca1088e48e35fe492c620 Mon Sep 17 00:00:00 2001
-
From: Lukas N Wirz <lnwirz@chem.helsinki.fi>
-
Date: Sun, 10 Nov 2024 16:01:46 +0200
-
Subject: [PATCH] typo
-
-
---
-
include/vigra/multi_iterator_coupled.hxx | 2 +-
-
1 file changed, 1 insertion(+), 1 deletion(-)
-
-
diff --git a/include/vigra/multi_iterator_coupled.hxx b/include/vigra/multi_iterator_coupled.hxx
-
index 9e6ca3c62..1cb401897 100644
-
--- a/include/vigra/multi_iterator_coupled.hxx
-
+++ b/include/vigra/multi_iterator_coupled.hxx
-
@@ -490,7 +490,7 @@ class CoupledScanOrderIterator<N, HANDLES, 0>
-
CoupledScanOrderIterator operator--(int)
-
{
-
CoupledScanOrderIterator res(*this);
-
- std::advance(this, -1);
-
+ std::advance(*this, -1);
-
return res;
-
}
-
···
+2 -2
pkgs/development/python-modules/crontab/default.nix
···
buildPythonPackage rec {
pname = "crontab";
-
version = "3.2.0";
pyproject = true;
disabled = pythonOlder "3.8";
···
owner = "doctormo";
repo = "python-crontab";
rev = "refs/tags/v${version}";
-
hash = "sha256-OZalqh/A4pBM1Hat4t76Odk2cTmKLwaHGY7pndgIgss=";
};
build-system = [ setuptools ];
···
buildPythonPackage rec {
pname = "crontab";
+
version = "3.3.0";
pyproject = true;
disabled = pythonOlder "3.8";
···
owner = "doctormo";
repo = "python-crontab";
rev = "refs/tags/v${version}";
+
hash = "sha256-eJXtvTRwokbewWrTArHJ2FXGDLvlkGA/5ZZR01koMW8=";
};
build-system = [ setuptools ];
+2 -2
pkgs/development/python-modules/elmax-api/default.nix
···
buildPythonPackage rec {
pname = "elmax-api";
-
version = "0.0.6.4rc0";
pyproject = true;
disabled = pythonOlder "3.8";
···
owner = "albertogeniola";
repo = "elmax-api";
tag = "v${version}";
-
hash = "sha256-BYVfP8B+p4J4gW+64xh9bT9sDcu/lk0R+MvLsYLwRfQ=";
};
build-system = [ setuptools ];
···
buildPythonPackage rec {
pname = "elmax-api";
+
version = "0.0.6.3";
pyproject = true;
disabled = pythonOlder "3.8";
···
owner = "albertogeniola";
repo = "elmax-api";
tag = "v${version}";
+
hash = "sha256-jnm1AFnPxZIgD815ZFxV/i9ar4cZfsYJ0+xDpM3hKmg=";
};
build-system = [ setuptools ];
+2 -2
pkgs/development/python-modules/extruct/default.nix
···
buildPythonPackage rec {
pname = "extruct";
-
version = "0.17.0";
pyproject = true;
disabled = pythonOlder "3.8";
···
owner = "scrapinghub";
repo = "extruct";
tag = "v${version}";
-
hash = "sha256-CfhIqbhrZkJ232grhHxrmj4H1/Bq33ZXe8kovSOWSK0=";
};
nativeBuildInputs = [ setuptools ];
···
buildPythonPackage rec {
pname = "extruct";
+
version = "0.18.0";
pyproject = true;
disabled = pythonOlder "3.8";
···
owner = "scrapinghub";
repo = "extruct";
tag = "v${version}";
+
hash = "sha256-hUSlIlWxrsxGLCE8/DAGSqxx9+7TEkynmXrVnXGjDQ8=";
};
nativeBuildInputs = [ setuptools ];
+2 -2
pkgs/development/python-modules/govee-local-api/default.nix
···
buildPythonPackage rec {
pname = "govee-local-api";
-
version = "2.1.0";
pyproject = true;
disabled = pythonOlder "3.10";
···
owner = "Galorhallen";
repo = "govee-local-api";
tag = "v${version}";
-
hash = "sha256-a5x4RbZ5+ryByr6/yGJw2/dNJBR7/JTYBcvA+Eqygqc=";
};
postPatch = ''
···
buildPythonPackage rec {
pname = "govee-local-api";
+
version = "2.2.0";
pyproject = true;
disabled = pythonOlder "3.10";
···
owner = "Galorhallen";
repo = "govee-local-api";
tag = "v${version}";
+
hash = "sha256-DjerH/51ta0Q3by47+Xo0Fp3nk4igum00mSZeoswYxM=";
};
postPatch = ''
+2 -2
pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix
···
buildPythonPackage rec {
pname = "llama-index-indices-managed-llama-cloud";
-
version = "0.9.0";
pyproject = true;
disabled = pythonOlder "3.8";
···
src = fetchPypi {
pname = "llama_index_indices_managed_llama_cloud";
inherit version;
-
hash = "sha256-+6rbauPucS2vQ5qpvjZ+3h+LGQAYtVAQ18NTddKc5Lc=";
};
pythonRelaxDeps = [ "llama-cloud" ];
···
buildPythonPackage rec {
pname = "llama-index-indices-managed-llama-cloud";
+
version = "0.9.2";
pyproject = true;
disabled = pythonOlder "3.8";
···
src = fetchPypi {
pname = "llama_index_indices_managed_llama_cloud";
inherit version;
+
hash = "sha256-Ga9V2o8SGNgDkPy+XN/vYQCsx1WwF3pAd6kkwxovs0U=";
};
pythonRelaxDeps = [ "llama-cloud" ];
+2 -2
pkgs/development/python-modules/meross-iot/default.nix
···
buildPythonPackage rec {
pname = "meross-iot";
-
version = "0.4.9.0";
pyproject = true;
src = fetchFromGitHub {
owner = "albertogeniola";
repo = "MerossIot";
tag = version;
-
hash = "sha256-EBsWEsP7SzhDbMayD2903T5Q2WDJKboVtyYY4xP8AOE=";
};
build-system = [ setuptools ];
···
buildPythonPackage rec {
pname = "meross-iot";
+
version = "0.4.9.1";
pyproject = true;
src = fetchFromGitHub {
owner = "albertogeniola";
repo = "MerossIot";
tag = version;
+
hash = "sha256-c9nUFCjbuqJaGk5Rqo+Nmr+IYQrWsVqb36mLmYTc47s=";
};
build-system = [ setuptools ];
+2
pkgs/development/python-modules/nfcpy/default.nix
···
ndeflib,
pydes,
pyserial,
pytest-mock,
pytestCheckHook,
pythonOlder,
···
];
nativeCheckInputs = [
mock
pytest-mock
pytestCheckHook
···
ndeflib,
pydes,
pyserial,
+
pytest-tornasync,
pytest-mock,
pytestCheckHook,
pythonOlder,
···
];
nativeCheckInputs = [
+
pytest-tornasync
mock
pytest-mock
pytestCheckHook
+8 -6
pkgs/development/python-modules/pytest-resource-path/default.nix
···
colorama,
pytest,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "pytest-resource-path";
-
version = "1.3.0";
-
format = "setuptools";
-
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "yukihiko-shinoda";
repo = "pytest-resource-path";
-
rev = "v${version}";
-
sha256 = "1siv3pk4fsabz254fdzr7c0pxy124habnbw4ym66pfk883fr96g2";
};
postPatch = ''
···
--replace "pytest-runner" ""
'';
buildInputs = [ pytest ];
-
propagatedBuildInputs = [ colorama ];
nativeCheckInputs = [ pytestCheckHook ];
···
colorama,
pytest,
pytestCheckHook,
+
setuptools,
}:
buildPythonPackage rec {
pname = "pytest-resource-path";
+
version = "1.4.0";
+
pyproject = true;
src = fetchFromGitHub {
owner = "yukihiko-shinoda";
repo = "pytest-resource-path";
+
tag = "v${version}";
+
hash = "sha256-9OBO9b02RrXilXUucerQQMTaQIRXtbcKCHqwwp9tBto=";
};
postPatch = ''
···
--replace "pytest-runner" ""
'';
+
build-system = [ setuptools ];
+
buildInputs = [ pytest ];
+
dependencies = [ colorama ];
nativeCheckInputs = [ pytestCheckHook ];
+2 -2
pkgs/development/python-modules/pytransportnswv2/default.nix
···
buildPythonPackage rec {
pname = "pytransportnswv2";
-
version = "0.9.0";
pyproject = true;
disabled = pythonOlder "3.7";
···
src = fetchPypi {
pname = "PyTransportNSWv2";
inherit version;
-
hash = "sha256-J3OW8fWldbkKzCDlXSv7nucVdyEnDFx8uCicF+ELQkQ=";
};
build-system = [ setuptools ];
···
buildPythonPackage rec {
pname = "pytransportnswv2";
+
version = "2.0.0";
pyproject = true;
disabled = pythonOlder "3.7";
···
src = fetchPypi {
pname = "PyTransportNSWv2";
inherit version;
+
hash = "sha256-+JJ36cUzeK25pWF9eEvgB5G8HGmHmsL7QY3s+AnrjmY=";
};
build-system = [ setuptools ];
+2 -2
pkgs/development/python-modules/reconplogger/default.nix
···
buildPythonPackage rec {
pname = "reconplogger";
-
version = "4.17.1";
pyproject = true;
disabled = pythonOlder "3.8";
···
owner = "omni-us";
repo = "reconplogger";
tag = "v${version}";
-
hash = "sha256-6oFnERueR8TQOFrMiQGbs05wP1NOhp/hqyFJ9ibquEw=";
};
build-system = [ setuptools ];
···
buildPythonPackage rec {
pname = "reconplogger";
+
version = "4.18.0";
pyproject = true;
disabled = pythonOlder "3.8";
···
owner = "omni-us";
repo = "reconplogger";
tag = "v${version}";
+
hash = "sha256-awUGDE9yuPhWMZ4osCJKw8v5V1leoFF3DeCbluHeN70=";
};
build-system = [ setuptools ];
+2 -2
pkgs/development/python-modules/turrishw/default.nix
···
buildPythonPackage rec {
pname = "turrishw";
-
version = "1.0.0";
pyproject = true;
disabled = pythonOlder "3.10";
···
owner = "turris-cz";
repo = "turrishw";
tag = "v${version}";
-
hash = "sha256-elu2f54asdzdn7wQT2CKo8kVYnc1KTakRyr8Nxu+XNw=";
};
build-system = [ hatchling ];
···
buildPythonPackage rec {
pname = "turrishw";
+
version = "1.1.0";
pyproject = true;
disabled = pythonOlder "3.10";
···
owner = "turris-cz";
repo = "turrishw";
tag = "v${version}";
+
hash = "sha256-LQ1ebcVQo7jixAKOPg/oNBnRU8AZebHANfDU4lamB8g=";
};
build-system = [ hatchling ];
+2 -2
pkgs/development/python-modules/wat/default.nix
···
buildPythonPackage rec {
pname = "wat";
-
version = "0.6.0";
pyproject = true;
src = fetchFromGitHub {
owner = "igrek51";
repo = "wat";
rev = version;
-
hash = "sha256-vTq+R/EBkBm27qWR4S9Za6/ppfWD9CLE21SXhTabkhc=";
};
build-system = [ setuptools ];
···
buildPythonPackage rec {
pname = "wat";
+
version = "0.7.0";
pyproject = true;
src = fetchFromGitHub {
owner = "igrek51";
repo = "wat";
rev = version;
+
hash = "sha256-ns5eF5jsmwCvx9jnTLG9w0ujH3cPAjzy9bRMgQHVKj4=";
};
build-system = [ setuptools ];
+7 -4
pkgs/development/python-modules/yq/default.nix
···
jq,
pytestCheckHook,
pyyaml,
setuptools-scm,
replaceVars,
tomlkit,
···
buildPythonPackage rec {
pname = "yq";
version = "3.4.3";
-
format = "setuptools";
src = fetchPypi {
inherit pname version;
···
})
];
-
nativeBuildInputs = [ setuptools-scm ];
-
propagatedBuildInputs = [
argcomplete
pyyaml
tomlkit
···
homepage = "https://github.com/kislyuk/yq";
license = licenses.asl20;
maintainers = with maintainers; [
-
womfoo
SuperSandro2000
];
mainProgram = "yq";
···
jq,
pytestCheckHook,
pyyaml,
+
setuptools,
setuptools-scm,
replaceVars,
tomlkit,
···
buildPythonPackage rec {
pname = "yq";
version = "3.4.3";
+
pyproject = true;
src = fetchPypi {
inherit pname version;
···
})
];
+
build-system = [
+
setuptools
+
setuptools-scm
+
];
+
dependencies = [
argcomplete
pyyaml
tomlkit
···
homepage = "https://github.com/kislyuk/yq";
license = licenses.asl20;
maintainers = with maintainers; [
SuperSandro2000
];
mainProgram = "yq";
+7 -1
pkgs/os-specific/linux/evdi/default.nix
···
hash = "sha256-xB3AHg9t/X8vw5p7ohFQ+WuMjb1P8DAP3pROiwWkVPs=";
};
-
env.NIX_CFLAGS_COMPILE = toString [
"-Wno-error"
"-Wno-error=discarded-qualifiers" # for Linux 4.19 compatibility
"-Wno-error=sign-compare"
];
nativeBuildInputs = kernel.moduleBuildDependencies;
···
makeFlags = kernelModuleMakeFlags ++ [
"KVER=${kernel.modDirVersion}"
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
hardeningDisable = [
···
hash = "sha256-xB3AHg9t/X8vw5p7ohFQ+WuMjb1P8DAP3pROiwWkVPs=";
};
+
env.CFLAGS = toString [
"-Wno-error"
"-Wno-error=discarded-qualifiers" # for Linux 4.19 compatibility
"-Wno-error=sign-compare"
];
+
+
postBuild = ''
+
# Don't use makeFlags for userspace stuff
+
make library pyevdi
+
'';
nativeBuildInputs = kernel.moduleBuildDependencies;
···
makeFlags = kernelModuleMakeFlags ++ [
"KVER=${kernel.modDirVersion}"
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+
"module"
];
hardeningDisable = [
-10
pkgs/os-specific/linux/kernel/hardened/patches.json
···
},
"sha256": "09qfpxyxi3z8cd64r2r5mxvh54a5sx8p5mk4d50y4ga2k6pa66bb",
"version": "6.12.41"
-
},
-
"6.15": {
-
"patch": {
-
"extra": "-hardened1",
-
"name": "linux-hardened-v6.15.9-hardened1.patch",
-
"sha256": "132h0cgv8kzrlz7jprqvwcnragc2v793a759bhg0q6w3ninmncjc",
-
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.15.9-hardened1/linux-hardened-v6.15.9-hardened1.patch"
-
},
-
"sha256": "0zcma8ycdwwzd4yci9752acsv85wh27lahclh5x2yc4jakw3lkz9",
-
"version": "6.15.9"
}
}
···
},
"sha256": "09qfpxyxi3z8cd64r2r5mxvh54a5sx8p5mk4d50y4ga2k6pa66bb",
"version": "6.12.41"
}
}
-5
pkgs/os-specific/linux/kernel/kernels-org.json
···
"hash": "sha256:1bmx2vpxy6nkxnmm2a3zmv9smaajfhvslj6id54j4yq2sc722l5n",
"lts": true
},
-
"6.15": {
-
"version": "6.15.11",
-
"hash": "sha256:14sxwrvw9p4ybizb8ky1rgahc62q0aw5qkmzqp3cpnavqfgldaw9",
-
"lts": false
-
},
"6.16": {
"version": "6.16.4",
"hash": "sha256:08mnd8qir2vxjmgblhnqfrfbv2zlig68f4r5askk7d8h3b3y79fn",
···
"hash": "sha256:1bmx2vpxy6nkxnmm2a3zmv9smaajfhvslj6id54j4yq2sc722l5n",
"lts": true
},
"6.16": {
"version": "6.16.4",
"hash": "sha256:08mnd8qir2vxjmgblhnqfrfbv2zlig68f4r5askk7d8h3b3y79fn",
+4
pkgs/top-level/all-packages.nix
···
or1k-newlib = callPackage ../development/misc/or1k/newlib.nix { };
### DEVELOPMENT / TOOLS
inherit (callPackage ../development/tools/alloy { })
···
or1k-newlib = callPackage ../development/misc/or1k/newlib.nix { };
+
vcsh = callPackage ../by-name/vc/vcsh/package.nix {
+
automake = automake116x;
+
};
+
### DEVELOPMENT / TOOLS
inherit (callPackage ../development/tools/alloy { })
+4 -11
pkgs/top-level/linux-kernels.nix
···
];
};
-
linux_6_15 = callPackage ../os-specific/linux/kernel/mainline.nix {
-
branch = "6.15";
-
kernelPatches = [
-
kernelPatches.bridge_stp_helper
-
kernelPatches.request_key_helper
-
];
-
};
-
linux_6_16 = callPackage ../os-specific/linux/kernel/mainline.nix {
branch = "6.16";
kernelPatches = [
···
linux_latest_libre = deblobKernel packageAliases.linux_latest.kernel;
linux_6_12_hardened = hardenedKernelFor kernels.linux_6_12 { };
-
linux_6_15_hardened = hardenedKernelFor kernels.linux_6_15 { };
linux_hardened = hardenedKernelFor packageAliases.linux_default.kernel { };
}
···
linux_6_11 = throw "linux 6.11 was removed because it has reached its end of life upstream";
linux_6_13 = throw "linux 6.13 was removed because it has reached its end of life upstream";
linux_6_14 = throw "linux 6.14 was removed because it has reached its end of life upstream";
linux_5_10_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS";
linux_5_15_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS";
···
linux_6_11_hardened = throw "linux 6.11 was removed because it has reached its end of life upstream";
linux_6_13_hardened = throw "linux 6.13 was removed because it has reached its end of life upstream";
linux_6_14_hardened = throw "linux 6.14 was removed because it has reached its end of life upstream";
linux_ham = throw "linux_ham has been removed in favour of the standard kernel packages";
}
···
linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1);
linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6);
linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12);
-
linux_6_15 = recurseIntoAttrs (packagesFor kernels.linux_6_15);
linux_6_16 = recurseIntoAttrs (packagesFor kernels.linux_6_16);
}
// lib.optionalAttrs config.allowAliases {
···
linux_6_11 = throw "linux 6.11 was removed because it reached its end of life upstream"; # Added 2025-03-23
linux_6_13 = throw "linux 6.13 was removed because it reached its end of life upstream"; # Added 2025-06-22
linux_6_14 = throw "linux 6.14 was removed because it reached its end of life upstream"; # Added 2025-06-22
};
rtPackages = {
···
linux_hardened = recurseIntoAttrs (packagesFor kernels.linux_hardened);
linux_6_12_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_12_hardened);
-
linux_6_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_15_hardened);
linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);
linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx);
···
linux_6_11_hardened = throw "linux 6.11 was removed because it has reached its end of life upstream";
linux_6_13_hardened = throw "linux 6.13 was removed because it has reached its end of life upstream";
linux_6_14_hardened = throw "linux 6.14 was removed because it has reached its end of life upstream";
linux_ham = throw "linux_ham has been removed in favour of the standard kernel packages";
}
);
···
];
};
linux_6_16 = callPackage ../os-specific/linux/kernel/mainline.nix {
branch = "6.16";
kernelPatches = [
···
linux_latest_libre = deblobKernel packageAliases.linux_latest.kernel;
linux_6_12_hardened = hardenedKernelFor kernels.linux_6_12 { };
linux_hardened = hardenedKernelFor packageAliases.linux_default.kernel { };
}
···
linux_6_11 = throw "linux 6.11 was removed because it has reached its end of life upstream";
linux_6_13 = throw "linux 6.13 was removed because it has reached its end of life upstream";
linux_6_14 = throw "linux 6.14 was removed because it has reached its end of life upstream";
+
linux_6_15 = throw "linux 6.15 was removed because it has reached its end of life upstream";
linux_5_10_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS";
linux_5_15_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS";
···
linux_6_11_hardened = throw "linux 6.11 was removed because it has reached its end of life upstream";
linux_6_13_hardened = throw "linux 6.13 was removed because it has reached its end of life upstream";
linux_6_14_hardened = throw "linux 6.14 was removed because it has reached its end of life upstream";
+
linux_6_15_hardened = throw "linux 6.15 was removed because it has reached its end of life upstream";
linux_ham = throw "linux_ham has been removed in favour of the standard kernel packages";
}
···
linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1);
linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6);
linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12);
linux_6_16 = recurseIntoAttrs (packagesFor kernels.linux_6_16);
}
// lib.optionalAttrs config.allowAliases {
···
linux_6_11 = throw "linux 6.11 was removed because it reached its end of life upstream"; # Added 2025-03-23
linux_6_13 = throw "linux 6.13 was removed because it reached its end of life upstream"; # Added 2025-06-22
linux_6_14 = throw "linux 6.14 was removed because it reached its end of life upstream"; # Added 2025-06-22
+
linux_6_15 = throw "linux 6.15 was removed because it reached its end of life upstream"; # Added 2025-08-23
};
rtPackages = {
···
linux_hardened = recurseIntoAttrs (packagesFor kernels.linux_hardened);
linux_6_12_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_12_hardened);
linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);
linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx);
···
linux_6_11_hardened = throw "linux 6.11 was removed because it has reached its end of life upstream";
linux_6_13_hardened = throw "linux 6.13 was removed because it has reached its end of life upstream";
linux_6_14_hardened = throw "linux 6.14 was removed because it has reached its end of life upstream";
+
linux_6_15_hardened = throw "linux 6.15 was removed because it has reached its end of life upstream";
linux_ham = throw "linux_ham has been removed in favour of the standard kernel packages";
}
);