nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix

Merge master into staging-next

authored by

nixpkgs-ci[bot] and committed by
GitHub
33bedf3c cb93ba8e

+208 -258
+5
maintainers/maintainer-list.nix
··· 14026 14026 githubId = 2422454; 14027 14027 name = "Kai Wohlfahrt"; 14028 14028 }; 14029 + kyehn = { 14030 + name = "kyehn"; 14031 + github = "kyehn"; 14032 + githubId = 228304369; 14033 + }; 14029 14034 kylecarbs = { 14030 14035 name = "Kyle Carberry"; 14031 14036 email = "kyle@carberry.com";
+6
nixos/doc/manual/configuration/linux-kernel.chapter.md
··· 24 24 pin your kernel onto a non-longterm version, expect your evaluation to fail as 25 25 soon as the version is out of maintenance. 26 26 27 + A kernel will be removed from nixpkgs when the first batch of stable kernels 28 + _after_ the final release is published. E.g. when 6.15.11 is the final release 29 + of the 6.15 series and is released together with 6.16.3 and 6.12.43, it will be 30 + removed on the release of 6.16.4 and 6.12.44. Custom kernel variants such 31 + as linux-hardened are also affected by this. 32 + 27 33 Longterm versions of kernels will be removed before the next stable NixOS that will 28 34 exceed the maintenance period of the kernel version. 29 35
+3 -1
nixos/modules/programs/rust-motd.nix
··· 12 12 # Order the sections in the TOML according to the order of sections 13 13 # in `cfg.order`. 14 14 motdConf = 15 - pkgs.runCommand "motd.conf" 15 + pkgs.runCommand "motd.toml" 16 16 { 17 17 __structuredAttrs = true; 18 18 inherit (cfg) order settings; ··· 153 153 154 154 security.pam.services.sshd.showMotd = lib.mkIf cfg.enableMotdInSSHD true; 155 155 users.motdFile = lib.mkIf cfg.enableMotdInSSHD "/var/lib/rust-motd/motd"; 156 + 157 + programs.rust-motd.settings.global.show_legacy_warning = false; 156 158 157 159 services.openssh.extraConfig = 158 160 lib.mkIf (cfg.settings ? last_login && cfg.settings.last_login != { })
-1
nixos/modules/services/web-apps/nextcloud.nix
··· 1531 1531 index index.php index.html /index.php$request_uri; 1532 1532 ${lib.optionalString (cfg.nginx.recommendedHttpHeaders) '' 1533 1533 add_header X-Content-Type-Options nosniff; 1534 - add_header X-XSS-Protection "1; mode=block"; 1535 1534 add_header X-Robots-Tag "noindex, nofollow"; 1536 1535 add_header X-Permitted-Cross-Domain-Policies none; 1537 1536 add_header X-Frame-Options sameorigin;
-1
nixos/tests/kernel-generic.nix
··· 36 36 kernels = pkgs.linuxKernel.vanillaPackages // { 37 37 inherit (pkgs.linuxKernel.packages) 38 38 linux_6_12_hardened 39 - linux_6_15_hardened 40 39 linux_rt_5_4 41 40 linux_rt_5_10 42 41 linux_rt_5_15
+2 -2
pkgs/by-name/cd/cdncheck/package.nix
··· 6 6 7 7 buildGoModule rec { 8 8 pname = "cdncheck"; 9 - version = "1.1.33"; 9 + version = "1.1.34"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "projectdiscovery"; 13 13 repo = "cdncheck"; 14 14 tag = "v${version}"; 15 - hash = "sha256-T00lM/jA0+3z5RViQkzACNyUqsgSzYtdgGwNli+nm7w="; 15 + hash = "sha256-I/wmKKrXFjaha2sq9l/zFJkkDf6DNNeSAOBcKmnOZNg="; 16 16 }; 17 17 18 18 vendorHash = "sha256-/1REkZ5+sz/H4T4lXhloz7fu5cLv1GoaD3dlttN+Qd4=";
+3 -3
pkgs/by-name/cr/crosvm/package.nix
··· 21 21 22 22 rustPlatform.buildRustPackage { 23 23 pname = "crosvm"; 24 - version = "0-unstable-2025-08-18"; 24 + version = "0-unstable-2025-08-28"; 25 25 26 26 src = fetchgit { 27 27 url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; 28 - rev = "44659aa08a8c89c3dad2e468ff57cdb639c80732"; 29 - hash = "sha256-bYTZ1R/WPUUZoxmdreFGaRt9epAI+mcIrEvs5RJPUeA="; 28 + rev = "ce1281988c5639f2a6a4cc6c20c03eb44751de07"; 29 + hash = "sha256-zorrj6sENcjV+pa2VYhunu8LhxT3oOyDRreHX78HckI="; 30 30 fetchSubmodules = true; 31 31 }; 32 32
+48 -37
pkgs/by-name/fw/fwupd/add-option-for-installation-sysconfdir.patch
··· 1 - commit e798ff19cd36daaed68b86edc7ebdb9dcfe1c057 1 + commit 448e265ad3fef9a5ef0ff57593dd5a9164118852 2 2 Author: r-vdp <ramses@well-founded.dev> 3 3 Date: Tue Oct 15 11:46:38 2024 +0200 4 4 5 5 Add option for installation sysconfdir 6 6 7 7 diff --git a/data/bios-settings.d/meson.build b/data/bios-settings.d/meson.build 8 - index b0ff5b106..29b60a3be 100644 8 + index 3f1cb3574..acbdccb61 100644 9 9 --- a/data/bios-settings.d/meson.build 10 10 +++ b/data/bios-settings.d/meson.build 11 - @@ -1,5 +1,5 @@ 11 + @@ -1,6 +1,6 @@ 12 12 if build_standalone and host_machine.system() == 'linux' 13 13 install_data('README.md', 14 + install_tag: 'doc', 14 15 - install_dir: join_paths(sysconfdir, 'fwupd', 'bios-settings.d') 15 16 + install_dir: join_paths(datadir, 'fwupd', 'bios-settings.d') 16 17 ) 17 18 endif 18 19 diff --git a/data/meson.build b/data/meson.build 19 - index 9db5cd756..cf3181c8b 100644 20 + index 78f54bd83..aae01ed56 100644 20 21 --- a/data/meson.build 21 22 +++ b/data/meson.build 22 - @@ -27,7 +27,7 @@ endif 23 - 23 + @@ -28,7 +28,7 @@ endif 24 24 if build_standalone 25 25 install_data(['fwupd.conf'], 26 + install_tag: 'runtime', 26 27 - install_dir: join_paths(sysconfdir, 'fwupd'), 27 28 + install_dir: join_paths(sysconfdir_install, 'fwupd'), 28 29 install_mode: 'rw-r-----', 29 30 ) 30 31 plugin_quirks += files([ 31 32 diff --git a/data/pki/meson.build b/data/pki/meson.build 32 - index 686064195..72ae401bd 100644 33 + index 9b1e6b372..5c80ba564 100644 33 34 --- a/data/pki/meson.build 34 35 +++ b/data/pki/meson.build 35 - @@ -7,13 +7,13 @@ install_data([ 36 - 'GPG-KEY-Linux-Foundation-Firmware', 36 + @@ -8,14 +8,14 @@ install_data([ 37 37 'GPG-KEY-Linux-Vendor-Firmware-Service', 38 38 ], 39 + install_tag: 'runtime', 39 40 - install_dir: join_paths(sysconfdir, 'pki', 'fwupd') 40 41 + install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd') 41 42 ) ··· 44 43 'GPG-KEY-Linux-Foundation-Metadata', 45 44 'GPG-KEY-Linux-Vendor-Firmware-Service', 46 45 ], 46 + install_tag: 'runtime', 47 47 - install_dir: join_paths(sysconfdir, 'pki', 'fwupd-metadata') 48 48 + install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd-metadata') 49 49 ) 50 50 endif 51 51 52 - @@ -21,11 +21,11 @@ if supported_pkcs7 53 - install_data([ 52 + @@ -24,12 +24,12 @@ install_data([ 54 53 'LVFS-CA.pem', 55 54 ], 55 + install_tag: 'runtime', 56 56 - install_dir: join_paths(sysconfdir, 'pki', 'fwupd') 57 57 + install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd') 58 58 ) 59 59 install_data([ 60 60 'LVFS-CA.pem', 61 61 ], 62 + install_tag: 'runtime', 62 63 - install_dir: join_paths(sysconfdir, 'pki', 'fwupd-metadata') 63 64 + install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd-metadata') 64 65 ) 65 66 endif 66 67 diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build 67 - index 10201bc9a..fba712491 100644 68 + index 77285cafa..7d2cb8f58 100644 68 69 --- a/data/remotes.d/meson.build 69 70 +++ b/data/remotes.d/meson.build 70 - @@ -11,14 +11,14 @@ if build_standalone and get_option('lvfs') != 'false' 71 - output: 'lvfs.conf', 71 + @@ -12,7 +12,7 @@ if build_standalone and get_option('lvfs') != 'false' 72 72 configuration: con3, 73 73 install: true, 74 + install_tag: 'runtime', 74 75 - install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), 75 76 + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), 76 77 ) 77 78 configure_file( 78 79 input: 'lvfs-testing.conf', 79 - output: 'lvfs-testing.conf', 80 + @@ -20,7 +20,7 @@ if build_standalone and get_option('lvfs') != 'false' 80 81 configuration: con3, 81 82 install: true, 83 + install_tag: 'runtime', 82 84 - install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), 83 85 + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), 84 86 ) 85 87 i18n.merge_file( 86 88 input: 'lvfs.metainfo.xml', 87 - @@ -52,12 +52,12 @@ configure_file( 88 - output: 'vendor.conf', 89 + @@ -58,7 +58,7 @@ configure_file( 89 90 configuration: con2, 90 91 install: get_option('vendor_metadata'), 92 + install_tag: 'runtime', 91 93 - install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), 92 94 + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), 93 95 ) 94 96 configure_file( 95 97 input: 'vendor-directory.conf', 96 - output: 'vendor-directory.conf', 98 + @@ -66,5 +66,5 @@ configure_file( 97 99 configuration: con2, 98 100 install: true, 101 + install_tag: 'runtime', 99 102 - install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), 100 103 + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), 101 104 ) 102 105 diff --git a/docs/meson.build b/docs/meson.build 103 - index 5693edcc8..181c359a4 100644 106 + index c1e483f4f..684ec3fbe 100644 104 107 --- a/docs/meson.build 105 108 +++ b/docs/meson.build 106 - @@ -124,7 +124,7 @@ if build_docs 107 - ], 109 + @@ -127,7 +127,7 @@ if build_docs 108 110 build_by_default: true, 109 111 install: true, 112 + install_tag: 'doc', 110 113 - install_dir: join_paths(datadir, 'doc'), 111 114 + install_dir: join_paths(sysconfdir_install, 'doc'), 112 115 ) 113 116 114 117 subdir('hsi-tests.d') 115 - @@ -182,7 +182,7 @@ if build_docs 116 - ], 118 + @@ -186,7 +186,7 @@ if build_docs 117 119 build_by_default: true, 118 120 install: true, 121 + install_tag: 'doc', 119 122 - install_dir: join_paths(datadir, 'doc'), 120 123 + install_dir: join_paths(sysconfdir_install, 'doc'), 121 124 ) 122 125 man_cmd = [] 123 126 foreach man: man_md 124 - @@ -196,7 +196,7 @@ if build_docs 125 - man_cmd, 127 + @@ -201,31 +201,31 @@ if build_docs 126 128 ], 127 129 install: true, 130 + install_tag: 'doc', 128 131 - install_dir: join_paths(datadir, 'doc', 'fwupd') 129 132 + install_dir: join_paths(sysconfdir_install, 'doc', 'fwupd') 130 133 ) 131 134 if hsi 132 135 install_data(['hsi.html'], 133 - @@ -204,18 +204,18 @@ if build_docs 136 + install_tag: 'doc', 137 + - install_dir : join_paths(datadir, 'doc', 'fwupd') 138 + + install_dir : join_paths(sysconfdir_install, 'doc', 'fwupd') 134 139 ) 135 140 endif 136 141 install_data(['urlmap_fwupd.js'], 142 + install_tag: 'doc', 137 143 - install_dir: join_paths(datadir, 'doc', 'libfwupd') 138 144 + install_dir: join_paths(sysconfdir_install, 'doc', 'libfwupd') 139 145 ) 140 146 install_data(['urlmap_fwupdplugin.js'], 147 + install_tag: 'doc', 141 148 - install_dir: join_paths(datadir, 'doc', 'libfwupdplugin') 142 149 + install_dir: join_paths(sysconfdir_install, 'doc', 'libfwupdplugin') 143 150 ) 144 151 #make devhelp work 145 152 install_symlink('libfwupd', 153 + install_tag: 'doc', 146 154 - install_dir: join_paths(datadir, 'doc', 'fwupd'), 147 155 + install_dir: join_paths(sysconfdir_install, 'doc', 'fwupd'), 148 156 pointing_to: join_paths('..', 'libfwupd'), 149 157 ) 150 158 install_symlink('libfwupdplugin', 159 + install_tag: 'doc', 151 160 - install_dir: join_paths(datadir, 'doc', 'fwupd'), 152 161 + install_dir: join_paths(sysconfdir_install, 'doc', 'fwupd'), 153 162 pointing_to: join_paths('..', 'libfwupdplugin'), 154 163 ) 155 164 endif 156 165 diff --git a/meson.build b/meson.build 157 - index 2ceaf531c..e4e764b97 100644 166 + index 4faedcc0b..980f9bb0c 100644 158 167 --- a/meson.build 159 168 +++ b/meson.build 160 - @@ -201,6 +201,12 @@ endif 169 + @@ -212,6 +212,12 @@ endif 161 170 mandir = join_paths(prefix, get_option('mandir')) 162 171 localedir = join_paths(prefix, get_option('localedir')) 163 172 ··· 178 167 +endif 179 168 + 180 169 diffcmd = find_program('diff') 181 - gio = dependency('gio-2.0', version: '>= 2.72.0') 182 - giounix = dependency('gio-unix-2.0', version: '>= 2.72.0', required: false) 170 + gio = dependency('gio-2.0', version: '>= 2.68.0') # limited by RHEL-9, which has v2.68.4 171 + giounix = dependency('gio-unix-2.0', version: '>= 2.68.0', required: false) 183 172 diff --git a/meson_options.txt b/meson_options.txt 184 - index a4a211fbb..6197fe502 100644 173 + index 63c8d288d..04f6651e6 100644 185 174 --- a/meson_options.txt 186 175 +++ b/meson_options.txt 187 176 @@ -7,6 +7,11 @@ option('bluez', ··· 197 186 type: 'combo', 198 187 choices: [ 199 188 diff --git a/plugins/uefi-capsule/meson.build b/plugins/uefi-capsule/meson.build 200 - index 2dfc4d2f0..e5ac73edd 100644 189 + index 647ace53e..4ee0192df 100644 201 190 --- a/plugins/uefi-capsule/meson.build 202 191 +++ b/plugins/uefi-capsule/meson.build 203 - @@ -20,7 +20,7 @@ if host_machine.system() == 'linux' 204 - output: '35_fwupd', 192 + @@ -23,7 +23,7 @@ if host_machine.system() == 'linux' 205 193 configuration: con2, 206 194 install: true, 195 + install_tag: 'runtime', 207 196 - install_dir: join_paths(sysconfdir, 'grub.d') 208 197 + install_dir: join_paths(sysconfdir_install, 'grub.d') 209 198 ) 210 199 elif host_machine.system() == 'freebsd' 211 - backend_srcs += 'fu-uefi-backend-freebsd.c' 212 - @@ -93,7 +93,7 @@ if get_option('plugin_uefi_capsule_splash') 213 - '--out', '@OUTPUT@', 200 + backend_srcs += 'fu-uefi-capsule-backend-freebsd.c' 201 + @@ -98,7 +98,7 @@ if get_option('plugin_uefi_capsule_splash') 214 202 ], 215 203 install: true, 204 + install_tag: 'runtime', 216 205 - install_dir: join_paths(datadir, 'fwupd'), 217 206 + install_dir: join_paths(sysconfdir_install, 'fwupd'), 218 207 )
+3 -3
pkgs/by-name/fw/fwupd/install-fwupdplugin-to-out.patch
··· 1 - commit 50827b154728a97e5dfcb7d41e5c7155752919c3 1 + commit 1b7f8b3ad7df9a5911fbc45608d9b40e0787baca 2 2 Author: r-vdp <ramses@well-founded.dev> 3 3 Date: Mon Oct 28 12:07:51 2024 +0100 4 4 5 5 Install fwupdplugin to out 6 6 7 7 diff --git a/meson.build b/meson.build 8 - index 250b76107..62c127c35 100644 8 + index 747d1b385..312513d75 100644 9 9 --- a/meson.build 10 10 +++ b/meson.build 11 - @@ -553,7 +553,7 @@ if build_standalone 11 + @@ -548,7 +548,7 @@ if build_standalone 12 12 if host_machine.system() == 'windows' 13 13 libdir_pkg = bindir 14 14 else
+14 -14
pkgs/by-name/fw/fwupd/installed-tests-path.patch
··· 1 - commit 2fa1d39bb54d448ffe59bf6a8358c01f786a1cce 1 + commit abaf36af96c7dfc966110c5342d5a8814c0df492 2 2 Author: r-vdp <ramses@well-founded.dev> 3 3 Date: Tue Oct 15 14:49:53 2024 +0200 4 4 5 5 Add output for installed tests 6 6 7 7 diff --git a/data/tests/meson.build b/data/tests/meson.build 8 - index a22a989f3..cbd135cfa 100644 8 + index da9524677..505d7a80e 100644 9 9 --- a/data/tests/meson.build 10 10 +++ b/data/tests/meson.build 11 - @@ -105,7 +105,7 @@ configure_file( 12 - output: 'fwupd-tests.conf', 11 + @@ -131,7 +131,7 @@ configure_file( 13 12 configuration: con2, 14 13 install: true, 14 + install_tag: 'tests', 15 15 - install_dir: join_paths(datadir, 'fwupd', 'remotes.d'), 16 16 + install_dir: join_paths(get_option('installed_test_prefix'), 'etc', 'fwupd', 'remotes.d'), 17 17 ) 18 18 19 19 if umockdev_integration_tests.allowed() 20 20 diff --git a/meson.build b/meson.build 21 - index 5a35cfda1..40ef142f0 100644 21 + index 312513d75..4faedcc0b 100644 22 22 --- a/meson.build 23 23 +++ b/meson.build 24 - @@ -194,8 +194,8 @@ else 24 + @@ -205,8 +205,8 @@ else 25 25 datadir = join_paths(prefix, get_option('datadir')) 26 26 sysconfdir = join_paths(prefix, get_option('sysconfdir')) 27 27 localstatedir = join_paths(prefix, get_option('localstatedir')) ··· 32 32 daemon_dir = join_paths(libexecdir, 'fwupd') 33 33 endif 34 34 mandir = join_paths(prefix, get_option('mandir')) 35 - @@ -545,6 +545,7 @@ gnome = import('gnome') 35 + @@ -536,6 +536,7 @@ gnome = import('gnome') 36 36 i18n = import('i18n') 37 37 38 38 conf.set_quoted('FWUPD_PREFIX', prefix) ··· 41 41 conf.set_quoted('FWUPD_LIBDIR', libdir) 42 42 conf.set_quoted('FWUPD_LIBEXECDIR', libexecdir) 43 43 diff --git a/meson_options.txt b/meson_options.txt 44 - index e04bb37c9..b1060ddb8 100644 44 + index 40103c03e..63c8d288d 100644 45 45 --- a/meson_options.txt 46 46 +++ b/meson_options.txt 47 - @@ -333,6 +333,10 @@ option('systemd_syscall_filter', 48 - value: 'true', 49 - description: 'Enable systemd syscall filter', 47 + @@ -174,6 +174,10 @@ option('systemd_unit_user', 48 + value: 'fwupd-refresh', 49 + description: 'User account to use for fwupd-refresh.service (empty for DynamicUser)', 50 50 ) 51 51 +option('installed_test_prefix', 52 52 + type: 'string', ··· 56 56 type: 'boolean', 57 57 value: true, 58 58 diff --git a/src/tests/host-emulate/meson.build b/src/tests/host-emulate/meson.build 59 - index 4bc02e46e..17bc2270d 100644 59 + index 0a67d70e8..7e07c0a49 100644 60 60 --- a/src/tests/host-emulate/meson.build 61 61 +++ b/src/tests/host-emulate/meson.build 62 - @@ -9,7 +9,7 @@ if build_standalone 63 - capture: true, 62 + @@ -10,7 +10,7 @@ if build_standalone 64 63 command: [gzip, '-k', '--stdout', '@INPUT@'], 65 64 install: true, 65 + install_tag: 'tests', 66 66 - install_dir: join_paths(datadir, 'fwupd', 'host-emulate.d'), 67 67 + install_dir: join_paths(get_option('installed_test_prefix'), 'etc', 'fwupd', 'host-emulate.d'), 68 68 )
+2 -2
pkgs/by-name/fw/fwupd/package.nix
··· 133 133 in 134 134 stdenv.mkDerivation (finalAttrs: { 135 135 pname = "fwupd"; 136 - version = "2.0.13"; 136 + version = "2.0.14"; 137 137 138 138 # libfwupd goes to lib 139 139 # daemon, plug-ins and libfwupdplugin go to out ··· 151 151 owner = "fwupd"; 152 152 repo = "fwupd"; 153 153 tag = finalAttrs.version; 154 - hash = "sha256-iarQfen2MCgQUDST5c81+KBd8gxBqM9EO6f0fN4fZbI="; 154 + hash = "sha256-VUpLYl7SKJqwbM3Lna22txTeMwqtpQieiw1DLX/4xtA="; 155 155 }; 156 156 157 157 patches = [
+3 -3
pkgs/by-name/ge/geographiclib/package.nix
··· 8 8 9 9 stdenv.mkDerivation rec { 10 10 pname = "geographiclib"; 11 - version = "2.5.1"; 11 + version = "2.5.2"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "geographiclib"; 15 15 repo = "geographiclib"; 16 16 tag = "v${version}"; 17 - hash = "sha256-ZXIRLLvCsVp8RnChjLiAfD38CJFqV8sv/PAEORsF6oc="; 17 + hash = "sha256-bFErzgjxBCtN12UNtnGPuS6bg1sI31gR7WZjawsY3Yo="; 18 18 }; 19 19 20 20 outputs = [ ··· 43 43 ''; 44 44 homepage = "https://geographiclib.sourceforge.io/"; 45 45 license = lib.licenses.mit; 46 - maintainers = with lib.maintainers; [ sikmir ]; 46 + teams = [ lib.teams.geospatial ]; 47 47 platforms = lib.platforms.unix; 48 48 }; 49 49 }
+18
pkgs/by-name/ju/junixsocket-common/package.nix
··· 1 + { 2 + fetchMavenArtifact, 3 + lib, 4 + }: 5 + 6 + fetchMavenArtifact { 7 + groupId = "com.kohlschutter.junixsocket"; 8 + artifactId = "junixsocket-common"; 9 + version = "2.10.1"; 10 + hash = "sha256-GeX3YVrSKT81Mrw/mRsxOWwRYYNOidmmqgx975OcZyk="; 11 + meta = { 12 + homepage = "https://kohlschutter.github.io/junixsocket/"; 13 + 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"; 14 + license = lib.licenses.asl20; 15 + sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; 16 + maintainers = [ lib.maintainers.vog ]; 17 + }; 18 + }
+16
pkgs/by-name/ju/junixsocket-native-common/package.nix
··· 1 + { 2 + fetchMavenArtifact, 3 + junixsocket-common, 4 + lib, 5 + }: 6 + 7 + fetchMavenArtifact { 8 + groupId = "com.kohlschutter.junixsocket"; 9 + artifactId = "junixsocket-native-common"; 10 + inherit (junixsocket-common) version; 11 + hash = "sha256-ASbOC68c61de9ReAfU0rFLnzLwYYAgThLsc6tKdyVno="; 12 + meta = junixsocket-common.meta // { 13 + description = "Binaries of the native JNI library for junixsocket for common platforms"; 14 + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; 15 + }; 16 + }
+5 -5
pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/redirects.py
··· 58 58 This can happen when an identifier was added, renamed, or removed. 59 59 60 60 Added new content? 61 - $ redirects add-content ❬identifier❭ ❬path❭ 61 + $ redirects add-content <identifier> <path> 62 62 often: 63 - $ redirects add-content ❬identifier❭ index.html 63 + $ redirects add-content <identifier> index.html 64 64 65 65 Moved existing content to a different output path? 66 - $ redirects move-content ❬identifier❭ ❬path❭ 66 + $ redirects move-content <identifier> <path> 67 67 68 68 Renamed existing identifiers? 69 - $ redirects rename-identifier ❬old-identifier❭ ❬new-identifier❭ 69 + $ redirects rename-identifier <old-identifier> <new-identifier> 70 70 71 71 Removed content? Redirect to alternatives or relevant release notes. 72 - $ redirects remove-and-redirect ❬identifier❭ ❬target-identifier❭ 72 + $ redirects remove-and-redirect <identifier> <target-identifier> 73 73 74 74 NOTE: Run the right nix-shell to make this command available. 75 75 Nixpkgs:
+7 -16
pkgs/by-name/op/openbao/package.nix
··· 1 1 { 2 2 lib, 3 3 fetchFromGitHub, 4 - fetchpatch2, 5 4 buildGoModule, 6 5 installShellFiles, 7 6 versionCheckHook, ··· 14 15 15 16 buildGoModule (finalAttrs: { 16 17 pname = "openbao"; 17 - version = "2.3.2"; 18 + version = "2.4.0"; 18 19 19 20 src = fetchFromGitHub { 20 21 owner = "openbao"; 21 22 repo = "openbao"; 22 23 tag = "v${finalAttrs.version}"; 23 - hash = "sha256-r3ZopogeRqsgaM/HEKlS6B0ipaDG/5mKUyzGET3P1e0="; 24 + hash = "sha256-VJCKZYBuw6fenTqRDxvLVNMXlPuDEq43WB7TI2RNWvc="; 24 25 }; 25 26 26 - vendorHash = "sha256-D4uZmQKe4VuSpuW8JD5NOOq7Nvx8HRXzyvgzkBhsKLQ="; 27 + vendorHash = "sha256-4SWpWGWoesUCgSpgOpblkxOpPbBC/grC2S1m7R9qasY="; 27 28 28 29 proxyVendor = true; 29 - 30 - patches = [ 31 - (fetchpatch2 { 32 - # Temporarily revert upstream raising the min go version to 1.24.6 33 - # until that go version lands from staging in master. 34 - name = "revert-Bump-to-Go-1.24.6.patch"; 35 - url = "https://github.com/openbao/openbao/commit/85504045ecf2d343b74be2c1cda6c2c0b0d6acff.patch?full_index=1"; 36 - revert = true; 37 - hash = "sha256-tXSnnqrNxgnJ2ya4HjLSh4e+6hdyPgKRsFsmkMNfNRU="; 38 - }) 39 - ]; 40 30 41 31 subPackages = [ "." ]; 42 32 ··· 77 89 changelog = "https://github.com/openbao/openbao/blob/v${finalAttrs.version}/CHANGELOG.md"; 78 90 license = lib.licenses.mpl20; 79 91 mainProgram = "bao"; 80 - maintainers = with lib.maintainers; [ brianmay ]; 92 + maintainers = with lib.maintainers; [ 93 + brianmay 94 + emilylange 95 + ]; 81 96 }; 82 97 })
+1 -1
pkgs/by-name/op/openbao/ui.nix
··· 12 12 13 13 offlineCache = yarn-berry_3.fetchYarnBerryDeps { 14 14 inherit (finalAttrs) src sourceRoot; 15 - hash = "sha256-/SKQC+i8tgpYNVJIem8XDp+v7olGbRRgW25UhhLpIu8="; 15 + hash = "sha256-ZG/br4r2YzPPgsysx7MBy1WtUBkar1U84nkKecZ5bvU="; 16 16 }; 17 17 18 18 nativeBuildInputs = [
+2 -2
pkgs/by-name/ph/phase-cli/package.nix
··· 7 7 8 8 python3Packages.buildPythonApplication rec { 9 9 pname = "phase-cli"; 10 - version = "1.19.3"; 10 + version = "1.19.6"; 11 11 pyproject = true; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "phasehq"; 15 15 repo = "cli"; 16 16 tag = "v${version}"; 17 - hash = "sha256-bKbhSV7Xa5LYjHVBlsboQGY0nCtLmAJaFhGpe4ZCb0s="; 17 + hash = "sha256-SOFMTetw5kEduV7ufY1v2vnv3exDEmnCFBr9q83YVTo="; 18 18 }; 19 19 20 20 build-system = with python3Packages; [
+1 -44
pkgs/development/compilers/rust/1_89.nix
··· 55 55 llvmShared = llvmSharedFor pkgsHostTarget; 56 56 57 57 # Expose llvmPackages used for rustc from rustc via passthru for LTO in Firefox 58 - llvmPackages = 59 - if (stdenv.targetPlatform.useLLVM or false) then 60 - callPackage ( 61 - { 62 - pkgs, 63 - bootBintoolsNoLibc ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintoolsNoLibc, 64 - bootBintools ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintools, 65 - }: 66 - let 67 - llvmPackages = llvmPackages_20; 68 - 69 - setStdenv = 70 - pkg: 71 - pkg.override { 72 - stdenv = stdenv.override { 73 - allowedRequisites = null; 74 - cc = pkgsBuildHost.llvmPackages_20.clangUseLLVM; 75 - }; 76 - }; 77 - in 78 - rec { 79 - inherit (llvmPackages) bintools; 80 - 81 - libunwind = setStdenv llvmPackages.libunwind; 82 - llvm = setStdenv llvmPackages.llvm; 83 - 84 - libcxx = llvmPackages.libcxx.override { 85 - stdenv = stdenv.override { 86 - allowedRequisites = null; 87 - cc = pkgsBuildHost.llvmPackages_20.clangNoLibcxx; 88 - hostPlatform = stdenv.hostPlatform // { 89 - useLLVM = !stdenv.hostPlatform.isDarwin; 90 - }; 91 - }; 92 - inherit libunwind; 93 - }; 94 - 95 - clangUseLLVM = llvmPackages.clangUseLLVM.override { inherit libcxx; }; 96 - 97 - stdenv = overrideCC args.stdenv clangUseLLVM; 98 - } 99 - ) { } 100 - else 101 - llvmPackages_20; 58 + llvmPackages = llvmPackages_20; 102 59 103 60 # Note: the version MUST be the same version that we are building. Upstream 104 61 # ensures that each released compiler can compile itself:
+1 -10
pkgs/development/compilers/rust/rustc.nix
··· 94 94 (stdenv.hostPlatform.isLinux && !withBundledLLVM && !stdenv.targetPlatform.isFreeBSD && useLLVM) 95 95 "--push-state --as-needed -L${llvmPackages.libcxx}/lib -lc++ -lc++abi -lLLVM-${lib.versions.major llvmPackages.llvm.version} --pop-state" 96 96 ++ optional (stdenv.hostPlatform.isDarwin && !withBundledLLVM) "-lc++ -lc++abi" 97 - ++ optional stdenv.hostPlatform.isFreeBSD "-rpath ${llvmPackages.libunwind}/lib" 98 97 ++ optional stdenv.hostPlatform.isDarwin "-rpath ${llvmSharedForHost.lib}/lib" 99 98 ); 100 99 ··· 384 385 zlib 385 386 ] 386 387 ++ optional (!withBundledLLVM) llvmShared.lib 387 - ++ optional (useLLVM && !withBundledLLVM && !stdenv.targetPlatform.isFreeBSD) [ 388 - llvmPackages.libunwind 389 - # Hack which is used upstream https://github.com/gentoo/gentoo/blob/master/dev-lang/rust/rust-1.78.0.ebuild#L284 390 - (runCommandLocal "libunwind-libgcc" { } '' 391 - mkdir -p $out/lib 392 - ln -s ${llvmPackages.libunwind}/lib/libunwind.so $out/lib/libgcc_s.so 393 - ln -s ${llvmPackages.libunwind}/lib/libunwind.so $out/lib/libgcc_s.so.1 394 - '') 395 - ]; 388 + ++ optional (useLLVM && !withBundledLLVM) llvmPackages.libunwind; 396 389 397 390 outputs = [ 398 391 "out"
+16 -12
pkgs/development/libraries/vigra/default.nix
··· 12 12 libtiff, 13 13 openexr, 14 14 python3, 15 + writeShellScript, 16 + jq, 17 + nix-update, 15 18 }: 16 19 17 20 let ··· 22 19 in 23 20 stdenv.mkDerivation (finalAttrs: { 24 21 pname = "vigra"; 25 - version = "1.12.1"; 22 + version = "1.12.2"; 26 23 27 24 src = fetchFromGitHub { 28 25 owner = "ukoethe"; 29 26 repo = "vigra"; 30 27 tag = "Version-${lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version}"; 31 - hash = "sha256-ZmHj1BSyoMBCuxI5hrRiBEb5pDUsGzis+T5FSX27UN8="; 28 + hash = "sha256-E+O5NbDX1ycDJTht6kW8JzYnhEL6Wd1xp0rcLpdm2HQ="; 32 29 }; 33 - 34 - patches = [ 35 - # Patches to fix compiling on LLVM 19 from https://github.com/ukoethe/vigra/pull/592 36 - ./fix-llvm-19-1.patch 37 - ./fix-llvm-19-2.patch 38 - ]; 39 30 40 31 nativeBuildInputs = [ cmake ]; 41 32 buildInputs = [ ··· 66 69 doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; 67 70 }); 68 71 }; 72 + updateScript = writeShellScript "update-vigra" '' 73 + 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/') 74 + ${lib.getExe nix-update} vigra --version $latestVersion 75 + ''; 69 76 }; 70 77 71 - meta = with lib; { 78 + meta = { 72 79 description = "Novel computer vision C++ library with customizable algorithms and data structures"; 73 80 mainProgram = "vigra-config"; 74 81 homepage = "https://hci.iwr.uni-heidelberg.de/vigra"; 75 - license = licenses.mit; 76 - maintainers = with maintainers; [ ShamrockLee ]; 77 - platforms = platforms.unix; 82 + license = lib.licenses.mit; 83 + maintainers = with lib.maintainers; [ 84 + ShamrockLee 85 + kyehn 86 + ]; 87 + platforms = lib.platforms.unix; 78 88 }; 79 89 })
-22
pkgs/development/libraries/vigra/fix-llvm-19-1.patch
··· 1 - From c04362c082f35e87afbc9441dd2b3821de179055 Mon Sep 17 00:00:00 2001 2 - From: Lukas N Wirz <lnwirz@chem.helsinki.fi> 3 - Date: Sat, 9 Nov 2024 23:15:40 +0200 4 - Subject: [PATCH] fix --this typo 5 - 6 - --- 7 - include/vigra/multi_iterator_coupled.hxx | 2 +- 8 - 1 file changed, 1 insertion(+), 1 deletion(-) 9 - 10 - diff --git a/include/vigra/multi_iterator_coupled.hxx b/include/vigra/multi_iterator_coupled.hxx 11 - index 6831dad5d..9e6ca3c62 100644 12 - --- a/include/vigra/multi_iterator_coupled.hxx 13 - +++ b/include/vigra/multi_iterator_coupled.hxx 14 - @@ -490,7 +490,7 @@ class CoupledScanOrderIterator<N, HANDLES, 0> 15 - CoupledScanOrderIterator operator--(int) 16 - { 17 - CoupledScanOrderIterator res(*this); 18 - - --this; 19 - + std::advance(this, -1); 20 - return res; 21 - } 22 -
-22
pkgs/development/libraries/vigra/fix-llvm-19-2.patch
··· 1 - From 191c09c2b086e1b0ab0ca1088e48e35fe492c620 Mon Sep 17 00:00:00 2001 2 - From: Lukas N Wirz <lnwirz@chem.helsinki.fi> 3 - Date: Sun, 10 Nov 2024 16:01:46 +0200 4 - Subject: [PATCH] typo 5 - 6 - --- 7 - include/vigra/multi_iterator_coupled.hxx | 2 +- 8 - 1 file changed, 1 insertion(+), 1 deletion(-) 9 - 10 - diff --git a/include/vigra/multi_iterator_coupled.hxx b/include/vigra/multi_iterator_coupled.hxx 11 - index 9e6ca3c62..1cb401897 100644 12 - --- a/include/vigra/multi_iterator_coupled.hxx 13 - +++ b/include/vigra/multi_iterator_coupled.hxx 14 - @@ -490,7 +490,7 @@ class CoupledScanOrderIterator<N, HANDLES, 0> 15 - CoupledScanOrderIterator operator--(int) 16 - { 17 - CoupledScanOrderIterator res(*this); 18 - - std::advance(this, -1); 19 - + std::advance(*this, -1); 20 - return res; 21 - } 22 -
+2 -2
pkgs/development/python-modules/crontab/default.nix
··· 11 11 12 12 buildPythonPackage rec { 13 13 pname = "crontab"; 14 - version = "3.2.0"; 14 + version = "3.3.0"; 15 15 pyproject = true; 16 16 17 17 disabled = pythonOlder "3.8"; ··· 20 20 owner = "doctormo"; 21 21 repo = "python-crontab"; 22 22 rev = "refs/tags/v${version}"; 23 - hash = "sha256-OZalqh/A4pBM1Hat4t76Odk2cTmKLwaHGY7pndgIgss="; 23 + hash = "sha256-eJXtvTRwokbewWrTArHJ2FXGDLvlkGA/5ZZR01koMW8="; 24 24 }; 25 25 26 26 build-system = [ setuptools ];
+2 -2
pkgs/development/python-modules/elmax-api/default.nix
··· 12 12 13 13 buildPythonPackage rec { 14 14 pname = "elmax-api"; 15 - version = "0.0.6.4rc0"; 15 + version = "0.0.6.3"; 16 16 pyproject = true; 17 17 18 18 disabled = pythonOlder "3.8"; ··· 21 21 owner = "albertogeniola"; 22 22 repo = "elmax-api"; 23 23 tag = "v${version}"; 24 - hash = "sha256-BYVfP8B+p4J4gW+64xh9bT9sDcu/lk0R+MvLsYLwRfQ="; 24 + hash = "sha256-jnm1AFnPxZIgD815ZFxV/i9ar4cZfsYJ0+xDpM3hKmg="; 25 25 }; 26 26 27 27 build-system = [ setuptools ];
+2 -2
pkgs/development/python-modules/extruct/default.nix
··· 18 18 19 19 buildPythonPackage rec { 20 20 pname = "extruct"; 21 - version = "0.17.0"; 21 + version = "0.18.0"; 22 22 pyproject = true; 23 23 24 24 disabled = pythonOlder "3.8"; ··· 27 27 owner = "scrapinghub"; 28 28 repo = "extruct"; 29 29 tag = "v${version}"; 30 - hash = "sha256-CfhIqbhrZkJ232grhHxrmj4H1/Bq33ZXe8kovSOWSK0="; 30 + hash = "sha256-hUSlIlWxrsxGLCE8/DAGSqxx9+7TEkynmXrVnXGjDQ8="; 31 31 }; 32 32 33 33 nativeBuildInputs = [ setuptools ];
+2 -2
pkgs/development/python-modules/govee-local-api/default.nix
··· 9 9 10 10 buildPythonPackage rec { 11 11 pname = "govee-local-api"; 12 - version = "2.1.0"; 12 + version = "2.2.0"; 13 13 pyproject = true; 14 14 15 15 disabled = pythonOlder "3.10"; ··· 18 18 owner = "Galorhallen"; 19 19 repo = "govee-local-api"; 20 20 tag = "v${version}"; 21 - hash = "sha256-a5x4RbZ5+ryByr6/yGJw2/dNJBR7/JTYBcvA+Eqygqc="; 21 + hash = "sha256-DjerH/51ta0Q3by47+Xo0Fp3nk4igum00mSZeoswYxM="; 22 22 }; 23 23 24 24 postPatch = ''
+2 -2
pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix
··· 10 10 11 11 buildPythonPackage rec { 12 12 pname = "llama-index-indices-managed-llama-cloud"; 13 - version = "0.9.0"; 13 + version = "0.9.2"; 14 14 pyproject = true; 15 15 16 16 disabled = pythonOlder "3.8"; ··· 18 18 src = fetchPypi { 19 19 pname = "llama_index_indices_managed_llama_cloud"; 20 20 inherit version; 21 - hash = "sha256-+6rbauPucS2vQ5qpvjZ+3h+LGQAYtVAQ18NTddKc5Lc="; 21 + hash = "sha256-Ga9V2o8SGNgDkPy+XN/vYQCsx1WwF3pAd6kkwxovs0U="; 22 22 }; 23 23 24 24 pythonRelaxDeps = [ "llama-cloud" ];
+2 -2
pkgs/development/python-modules/meross-iot/default.nix
··· 11 11 12 12 buildPythonPackage rec { 13 13 pname = "meross-iot"; 14 - version = "0.4.9.0"; 14 + version = "0.4.9.1"; 15 15 pyproject = true; 16 16 17 17 src = fetchFromGitHub { 18 18 owner = "albertogeniola"; 19 19 repo = "MerossIot"; 20 20 tag = version; 21 - hash = "sha256-EBsWEsP7SzhDbMayD2903T5Q2WDJKboVtyYY4xP8AOE="; 21 + hash = "sha256-c9nUFCjbuqJaGk5Rqo+Nmr+IYQrWsVqb36mLmYTc47s="; 22 22 }; 23 23 24 24 build-system = [ setuptools ];
+2
pkgs/development/python-modules/nfcpy/default.nix
··· 7 7 ndeflib, 8 8 pydes, 9 9 pyserial, 10 + pytest-tornasync, 10 11 pytest-mock, 11 12 pytestCheckHook, 12 13 pythonOlder, ··· 35 34 ]; 36 35 37 36 nativeCheckInputs = [ 37 + pytest-tornasync 38 38 mock 39 39 pytest-mock 40 40 pytestCheckHook
+8 -6
pkgs/development/python-modules/pytest-resource-path/default.nix
··· 6 6 colorama, 7 7 pytest, 8 8 pytestCheckHook, 9 + setuptools, 9 10 }: 10 11 11 12 buildPythonPackage rec { 12 13 pname = "pytest-resource-path"; 13 - version = "1.3.0"; 14 - format = "setuptools"; 15 - disabled = pythonOlder "3.5"; 14 + version = "1.4.0"; 15 + pyproject = true; 16 16 17 17 src = fetchFromGitHub { 18 18 owner = "yukihiko-shinoda"; 19 19 repo = "pytest-resource-path"; 20 - rev = "v${version}"; 21 - sha256 = "1siv3pk4fsabz254fdzr7c0pxy124habnbw4ym66pfk883fr96g2"; 20 + tag = "v${version}"; 21 + hash = "sha256-9OBO9b02RrXilXUucerQQMTaQIRXtbcKCHqwwp9tBto="; 22 22 }; 23 23 24 24 postPatch = '' ··· 26 26 --replace "pytest-runner" "" 27 27 ''; 28 28 29 + build-system = [ setuptools ]; 30 + 29 31 buildInputs = [ pytest ]; 30 32 31 - propagatedBuildInputs = [ colorama ]; 33 + dependencies = [ colorama ]; 32 34 33 35 nativeCheckInputs = [ pytestCheckHook ]; 34 36
+2 -2
pkgs/development/python-modules/pytransportnswv2/default.nix
··· 11 11 12 12 buildPythonPackage rec { 13 13 pname = "pytransportnswv2"; 14 - version = "0.9.0"; 14 + version = "2.0.0"; 15 15 pyproject = true; 16 16 17 17 disabled = pythonOlder "3.7"; ··· 19 19 src = fetchPypi { 20 20 pname = "PyTransportNSWv2"; 21 21 inherit version; 22 - hash = "sha256-J3OW8fWldbkKzCDlXSv7nucVdyEnDFx8uCicF+ELQkQ="; 22 + hash = "sha256-+JJ36cUzeK25pWF9eEvgB5G8HGmHmsL7QY3s+AnrjmY="; 23 23 }; 24 24 25 25 build-system = [ setuptools ];
+2 -2
pkgs/development/python-modules/reconplogger/default.nix
··· 14 14 15 15 buildPythonPackage rec { 16 16 pname = "reconplogger"; 17 - version = "4.17.1"; 17 + version = "4.18.0"; 18 18 pyproject = true; 19 19 20 20 disabled = pythonOlder "3.8"; ··· 23 23 owner = "omni-us"; 24 24 repo = "reconplogger"; 25 25 tag = "v${version}"; 26 - hash = "sha256-6oFnERueR8TQOFrMiQGbs05wP1NOhp/hqyFJ9ibquEw="; 26 + hash = "sha256-awUGDE9yuPhWMZ4osCJKw8v5V1leoFF3DeCbluHeN70="; 27 27 }; 28 28 29 29 build-system = [ setuptools ];
+2 -2
pkgs/development/python-modules/turrishw/default.nix
··· 10 10 11 11 buildPythonPackage rec { 12 12 pname = "turrishw"; 13 - version = "1.0.0"; 13 + version = "1.1.0"; 14 14 pyproject = true; 15 15 16 16 disabled = pythonOlder "3.10"; ··· 19 19 owner = "turris-cz"; 20 20 repo = "turrishw"; 21 21 tag = "v${version}"; 22 - hash = "sha256-elu2f54asdzdn7wQT2CKo8kVYnc1KTakRyr8Nxu+XNw="; 22 + hash = "sha256-LQ1ebcVQo7jixAKOPg/oNBnRU8AZebHANfDU4lamB8g="; 23 23 }; 24 24 25 25 build-system = [ hatchling ];
+2 -2
pkgs/development/python-modules/wat/default.nix
··· 10 10 11 11 buildPythonPackage rec { 12 12 pname = "wat"; 13 - version = "0.6.0"; 13 + version = "0.7.0"; 14 14 pyproject = true; 15 15 16 16 src = fetchFromGitHub { 17 17 owner = "igrek51"; 18 18 repo = "wat"; 19 19 rev = version; 20 - hash = "sha256-vTq+R/EBkBm27qWR4S9Za6/ppfWD9CLE21SXhTabkhc="; 20 + hash = "sha256-ns5eF5jsmwCvx9jnTLG9w0ujH3cPAjzy9bRMgQHVKj4="; 21 21 }; 22 22 23 23 build-system = [ setuptools ];
+7 -4
pkgs/development/python-modules/yq/default.nix
··· 6 6 jq, 7 7 pytestCheckHook, 8 8 pyyaml, 9 + setuptools, 9 10 setuptools-scm, 10 11 replaceVars, 11 12 tomlkit, ··· 16 15 buildPythonPackage rec { 17 16 pname = "yq"; 18 17 version = "3.4.3"; 19 - format = "setuptools"; 18 + pyproject = true; 20 19 21 20 src = fetchPypi { 22 21 inherit pname version; ··· 29 28 }) 30 29 ]; 31 30 32 - nativeBuildInputs = [ setuptools-scm ]; 31 + build-system = [ 32 + setuptools 33 + setuptools-scm 34 + ]; 33 35 34 - propagatedBuildInputs = [ 36 + dependencies = [ 35 37 argcomplete 36 38 pyyaml 37 39 tomlkit ··· 52 48 homepage = "https://github.com/kislyuk/yq"; 53 49 license = licenses.asl20; 54 50 maintainers = with maintainers; [ 55 - womfoo 56 51 SuperSandro2000 57 52 ]; 58 53 mainProgram = "yq";
+7 -1
pkgs/os-specific/linux/evdi/default.nix
··· 26 26 hash = "sha256-xB3AHg9t/X8vw5p7ohFQ+WuMjb1P8DAP3pROiwWkVPs="; 27 27 }; 28 28 29 - env.NIX_CFLAGS_COMPILE = toString [ 29 + env.CFLAGS = toString [ 30 30 "-Wno-error" 31 31 "-Wno-error=discarded-qualifiers" # for Linux 4.19 compatibility 32 32 "-Wno-error=sign-compare" 33 33 ]; 34 + 35 + postBuild = '' 36 + # Don't use makeFlags for userspace stuff 37 + make library pyevdi 38 + ''; 34 39 35 40 nativeBuildInputs = kernel.moduleBuildDependencies; 36 41 ··· 48 43 makeFlags = kernelModuleMakeFlags ++ [ 49 44 "KVER=${kernel.modDirVersion}" 50 45 "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" 46 + "module" 51 47 ]; 52 48 53 49 hardeningDisable = [
-10
pkgs/os-specific/linux/kernel/hardened/patches.json
··· 8 8 }, 9 9 "sha256": "09qfpxyxi3z8cd64r2r5mxvh54a5sx8p5mk4d50y4ga2k6pa66bb", 10 10 "version": "6.12.41" 11 - }, 12 - "6.15": { 13 - "patch": { 14 - "extra": "-hardened1", 15 - "name": "linux-hardened-v6.15.9-hardened1.patch", 16 - "sha256": "132h0cgv8kzrlz7jprqvwcnragc2v793a759bhg0q6w3ninmncjc", 17 - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.15.9-hardened1/linux-hardened-v6.15.9-hardened1.patch" 18 - }, 19 - "sha256": "0zcma8ycdwwzd4yci9752acsv85wh27lahclh5x2yc4jakw3lkz9", 20 - "version": "6.15.9" 21 11 } 22 12 }
-5
pkgs/os-specific/linux/kernel/kernels-org.json
··· 34 34 "hash": "sha256:1bmx2vpxy6nkxnmm2a3zmv9smaajfhvslj6id54j4yq2sc722l5n", 35 35 "lts": true 36 36 }, 37 - "6.15": { 38 - "version": "6.15.11", 39 - "hash": "sha256:14sxwrvw9p4ybizb8ky1rgahc62q0aw5qkmzqp3cpnavqfgldaw9", 40 - "lts": false 41 - }, 42 37 "6.16": { 43 38 "version": "6.16.4", 44 39 "hash": "sha256:08mnd8qir2vxjmgblhnqfrfbv2zlig68f4r5askk7d8h3b3y79fn",
+4
pkgs/top-level/all-packages.nix
··· 6402 6402 6403 6403 or1k-newlib = callPackage ../development/misc/or1k/newlib.nix { }; 6404 6404 6405 + vcsh = callPackage ../by-name/vc/vcsh/package.nix { 6406 + automake = automake116x; 6407 + }; 6408 + 6405 6409 ### DEVELOPMENT / TOOLS 6406 6410 6407 6411 inherit (callPackage ../development/tools/alloy { })
+4 -11
pkgs/top-level/linux-kernels.nix
··· 210 210 ]; 211 211 }; 212 212 213 - linux_6_15 = callPackage ../os-specific/linux/kernel/mainline.nix { 214 - branch = "6.15"; 215 - kernelPatches = [ 216 - kernelPatches.bridge_stp_helper 217 - kernelPatches.request_key_helper 218 - ]; 219 - }; 220 - 221 213 linux_6_16 = callPackage ../os-specific/linux/kernel/mainline.nix { 222 214 branch = "6.16"; 223 215 kernelPatches = [ ··· 287 295 linux_latest_libre = deblobKernel packageAliases.linux_latest.kernel; 288 296 289 297 linux_6_12_hardened = hardenedKernelFor kernels.linux_6_12 { }; 290 - linux_6_15_hardened = hardenedKernelFor kernels.linux_6_15 { }; 291 298 292 299 linux_hardened = hardenedKernelFor packageAliases.linux_default.kernel { }; 293 300 } ··· 297 306 linux_6_11 = throw "linux 6.11 was removed because it has reached its end of life upstream"; 298 307 linux_6_13 = throw "linux 6.13 was removed because it has reached its end of life upstream"; 299 308 linux_6_14 = throw "linux 6.14 was removed because it has reached its end of life upstream"; 309 + linux_6_15 = throw "linux 6.15 was removed because it has reached its end of life upstream"; 300 310 301 311 linux_5_10_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS"; 302 312 linux_5_15_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS"; ··· 311 319 linux_6_11_hardened = throw "linux 6.11 was removed because it has reached its end of life upstream"; 312 320 linux_6_13_hardened = throw "linux 6.13 was removed because it has reached its end of life upstream"; 313 321 linux_6_14_hardened = throw "linux 6.14 was removed because it has reached its end of life upstream"; 322 + linux_6_15_hardened = throw "linux 6.15 was removed because it has reached its end of life upstream"; 314 323 315 324 linux_ham = throw "linux_ham has been removed in favour of the standard kernel packages"; 316 325 } ··· 731 738 linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1); 732 739 linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6); 733 740 linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12); 734 - linux_6_15 = recurseIntoAttrs (packagesFor kernels.linux_6_15); 735 741 linux_6_16 = recurseIntoAttrs (packagesFor kernels.linux_6_16); 736 742 } 737 743 // lib.optionalAttrs config.allowAliases { ··· 740 748 linux_6_11 = throw "linux 6.11 was removed because it reached its end of life upstream"; # Added 2025-03-23 741 749 linux_6_13 = throw "linux 6.13 was removed because it reached its end of life upstream"; # Added 2025-06-22 742 750 linux_6_14 = throw "linux 6.14 was removed because it reached its end of life upstream"; # Added 2025-06-22 751 + linux_6_15 = throw "linux 6.15 was removed because it reached its end of life upstream"; # Added 2025-08-23 743 752 }; 744 753 745 754 rtPackages = { ··· 771 778 linux_hardened = recurseIntoAttrs (packagesFor kernels.linux_hardened); 772 779 773 780 linux_6_12_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_12_hardened); 774 - linux_6_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_15_hardened); 775 781 776 782 linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); 777 783 linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); ··· 797 805 linux_6_11_hardened = throw "linux 6.11 was removed because it has reached its end of life upstream"; 798 806 linux_6_13_hardened = throw "linux 6.13 was removed because it has reached its end of life upstream"; 799 807 linux_6_14_hardened = throw "linux 6.14 was removed because it has reached its end of life upstream"; 808 + linux_6_15_hardened = throw "linux 6.15 was removed because it has reached its end of life upstream"; 800 809 linux_ham = throw "linux_ham has been removed in favour of the standard kernel packages"; 801 810 } 802 811 );