commit 5c32d7788dcdeb10ff3e8a3911db43462e63b07d · pyrox.dev/nixpkgs

+6 -6

CONTRIBUTING.md

···

       210
       210
        
       This document details our standards for commit messages, reviews, licensing of contributions, etc...

     

       211
       211
        
       Everyone should read and understand these standards before submitting a pull request.

     

       212
       212
        
       

     

       213
       213
       -
       ### Rebasing between branches (i.e. from master to staging)

     

       213
       213
       +
       ### Rebasing between branches (i.e. from `master` to `staging`)

     

       214
       214
        
       [rebase]: #rebasing-between-branches-ie-from-master-to-staging

     

       215
       215
        
       

     

       216
       216
        
       Sometimes, changes must be rebased between branches.

     
···

       271
       271
        
         Here is [an example](https://github.com/nixos/nixpkgs/commit/5688c39af5a6c5f3d646343443683da880eaefb8).

     

       272
       272
        
       

     

       273
       273
        
       > [!Warning]

     

       274
       274
       -
       > Ensure the commits exist on the master branch.

     

       275
       275
       -
       > In the case of squashed or rebased merges, the commit hash will change and the new commits can be found in the merge message at the bottom of the master pull request.

     

       274
       274
       +
       > Ensure the commits exist on the `master` branch.

     

       275
       275
       +
       > In the case of squashed or rebased merges, the commit hash will change and the new commits can be found in the merge message at the bottom of the `master` pull request.

     

       276
       276
        
       

     

       277
       277
        
       - In the pull request description, link to the original pull request to `master`.

     

       278
       278
        
         The pull request title should include `[YY.MM]` matching the release you're backporting to.

     
···

       460
       460
        
         - Yes: Use the `master` branch and [backport the pull request](#how-to-backport-pull-requests).

     

       461
       461
        
         - No: Create separate pull requests to the `master` and `release-YY.MM` branches.

     

       462
       462
        
       

     

       463
       463
       -
       If the change causes a [mass rebuild][mass-rebuild], use the staging branch instead:

     

       463
       463
       +
       If the change causes a [mass rebuild][mass-rebuild], use the `staging` branch instead:

     

       464
       464
        
       - Mass rebuilds to `master` should go to `staging` instead.

     

       465
       465
        
       - Mass rebuilds to `release-YY.MM` should go to `staging-YY.MM` instead.

     

       466
       466
        
       

     
···

       492
       492
        
       

     

       493
       493
        
       Which changes cause mass rebuilds is not formally defined.

     

       494
       494
        
       In order to help the decision, CI automatically assigns [`rebuild` labels](https://github.com/NixOS/nixpkgs/labels?q=rebuild) to pull requests based on the number of packages they cause rebuilds for.

     

       495
       495
       -
       As a rule of thumb, if the number of rebuilds is **over 500**, it can be considered a mass rebuild.

     

       496
       496
       -
       To get a sense for what changes are considered mass rebuilds, see [previously merged pull requests to the staging branches](https://github.com/NixOS/nixpkgs/issues?q=base%3Astaging+-base%3Astaging-next+is%3Amerged).

     

       495
       495
       +
       As a rule of thumb, if the number of rebuilds is **500 or more**, consider targeting the `staging` branch instead of `master`; if the number is **1000 or more**, the pull request causes a mass rebuild, and should target the `staging` branch.

     

       496
       496
       +
       See [previously merged pull requests to the staging branches](https://github.com/NixOS/nixpkgs/issues?q=base%3Astaging+-base%3Astaging-next+is%3Amerged) to get a sense for what changes are considered mass rebuilds.

     

       497
       497
        
       

     

       498
       498
        
       ## Commit conventions

     

       499
       499
        
       [commit-conventions]: #commit-conventions

+1 -1

ci/OWNERS

···

       337
       337
        
       /pkgs/development/compilers/idris2 @mattpolzin

     

       338
       338
        
       

     

       339
       339
        
       # Bazel

     

       340
       340
       -
       /pkgs/development/tools/build-managers/bazel @Profpatsch

     

       340
       340
       +
       /pkgs/by-name/ba/bazel_7 @Profpatsch

     

       341
       341
        
       

     

       342
       342
        
       # NixOS modules for e-mail and dns services

     

       343
       343
        
       /nixos/modules/services/mail/mailman.nix    @peti

+18

maintainers/maintainer-list.nix

···

       10083
       10083
        
           githubId = 665472;

     

       10084
       10084
        
           matrix = "@hehongbo:matrix.org";

     

       10085
       10085
        
         };

     

       10086
       10086
       +
         heichro = {

     

       10087
       10087
       +
           github = "heichro";

     

       10088
       10088
       +
           githubId = 76887148;

     

       10089
       10089
       +
           keys = [ { fingerprint = "BBA7 9E8E 17FE 9C3F BFEA  61E8 30D0 186F 4E19 7E48"; } ];

     

       10090
       10090
       +
           name = "heichro";

     

       10091
       10091
       +
         };

     

       10086
       10092
        
         heijligen = {

     

       10087
       10093
        
           email = "src@posteo.de";

     

       10088
       10094
        
           github = "heijligen";

     
···

       21770
       21776
        
           github = "richardipsum";

     

       21771
       21777
        
           githubId = 10631029;

     

       21772
       21778
        
           name = "Richard Ipsum";

     

       21779
       21779
       +
         };

     

       21780
       21780
       +
         richardjacton = {

     

       21781
       21781
       +
           email = "richardjacton@richardjacton.net";

     

       21782
       21782
       +
           github = "richardjacton";

     

       21783
       21783
       +
           githubId = 6893043;

     

       21784
       21784
       +
           name = "Richard J. Acton";

     

       21785
       21785
       +
           matrix = "@richardjacton:matrix.org";

     

       21786
       21786
       +
           keys = [

     

       21787
       21787
       +
             {

     

       21788
       21788
       +
               fingerprint = "5EE1 1764 8462 E5A3 610C  1964 8E5D EFCF C330 7916";

     

       21789
       21789
       +
             }

     

       21790
       21790
       +
           ];

     

       21773
       21791
        
         };

     

       21774
       21792
        
         richiejp = {

     

       21775
       21793
        
           email = "io@richiejp.com";

nixos/doc/manual/release-notes/rl-2511.section.md

···

       6
       6
        
       

     

       7
       7
        
       - `nixos-rebuild-ng`, a full rewrite of `nixos-rebuild` in Python, is enabled by default from this release. You can disable it by setting [](#opt-system.rebuild.enableNg) to `false` in your configuration if you need, but please report any issues. It is expected that the next major version of NixOS (26.05) will remove the {option}`system.rebuild.enableNg` option.

     

       8
       8
        
       

     

       9
       9
       +
       - `rEFInd`, a graphical boot manager for UEFI systems, can now be used through [](#opt-boot.loader.refind.enable).

     

       10
       10
       +
       

     

       9
       11
        
       - Secure boot support can now be enabled for the Limine bootloader through {option}`boot.loader.limine.secureBoot.enable`. Bootloader install script signs the bootloader, then kernels are hashed during system rebuild and written to a config. This allows Limine to boot only the kernels installed through NixOS system.

     

       10
       12
        
       

     

       11
       13
        
       - The default PostgreSQL version for new NixOS installations (i.e. with `system.stateVersion >= 25.11`) is v17.

nixos/modules/module-list.nix

···

       1817
       1817
        
         ./system/boot/loader/init-script/init-script.nix

     

       1818
       1818
        
         ./system/boot/loader/limine/limine.nix

     

       1819
       1819
        
         ./system/boot/loader/loader.nix

     

       1820
       1820
       +
         ./system/boot/loader/refind/refind.nix

     

       1820
       1821
        
         ./system/boot/loader/systemd-boot/systemd-boot.nix

     

       1821
       1822
        
         ./system/boot/luksroot.nix

     

       1822
       1823
        
         ./system/boot/modprobe.nix

+344

nixos/modules/system/boot/loader/refind/refind-install.py

···

       1
       1
       +
       #!@python3@/bin/python3 -B

     

       2
       2
       +
       

     

       3
       3
       +
       from dataclasses import dataclass

     

       4
       4
       +
       from typing import Any, Callable, Dict, List, Optional, Tuple

     

       5
       5
       +
       

     

       6
       6
       +
       import datetime

     

       7
       7
       +
       import json

     

       8
       8
       +
       from ctypes import CDLL

     

       9
       9
       +
       import os

     

       10
       10
       +
       import psutil

     

       11
       11
       +
       import re

     

       12
       12
       +
       import shutil

     

       13
       13
       +
       import subprocess

     

       14
       14
       +
       import textwrap

     

       15
       15
       +
       

     

       16
       16
       +
       

     

       17
       17
       +
       refind_dir = None

     

       18
       18
       +
       libc = CDLL("libc.so.6")

     

       19
       19
       +
       install_config = json.load(open('@configPath@', 'r'))

     

       20
       20
       +
       

     

       21
       21
       +
       

     

       22
       22
       +
       def config(*path: str) -> Optional[Any]:

     

       23
       23
       +
           result = install_config

     

       24
       24
       +
           for component in path:

     

       25
       25
       +
               result = result[component]

     

       26
       26
       +
           return result

     

       27
       27
       +
       

     

       28
       28
       +
       

     

       29
       29
       +
       def get_system_path(profile: str = 'system', gen: Optional[str] = None, spec: Optional[str] = None) -> str:

     

       30
       30
       +
           basename = f'{profile}-{gen}-link' if gen is not None else profile

     

       31
       31
       +
           profiles_dir = '/nix/var/nix/profiles'

     

       32
       32
       +
           if profile == 'system':

     

       33
       33
       +
               result = os.path.join(profiles_dir, basename)

     

       34
       34
       +
           else:

     

       35
       35
       +
               result = os.path.join(profiles_dir, 'system-profiles', basename)

     

       36
       36
       +
       

     

       37
       37
       +
           if spec is not None:

     

       38
       38
       +
               result = os.path.join(result, 'specialisation', spec)

     

       39
       39
       +
       

     

       40
       40
       +
           return result

     

       41
       41
       +
       

     

       42
       42
       +
       

     

       43
       43
       +
       def get_profiles() -> List[str]:

     

       44
       44
       +
           profiles_dir = '/nix/var/nix/profiles/system-profiles/'

     

       45
       45
       +
           dirs = os.listdir(profiles_dir) if os.path.isdir(profiles_dir) else []

     

       46
       46
       +
       

     

       47
       47
       +
           return [path for path in dirs if not path.endswith('-link')]

     

       48
       48
       +
       

     

       49
       49
       +
       

     

       50
       50
       +
       def get_gens(profile: str = 'system') -> List[Tuple[int, List[str]]]:

     

       51
       51
       +
           nix_env = os.path.join(config('nixPath'), 'bin', 'nix-env')

     

       52
       52
       +
           output = subprocess.check_output([

     

       53
       53
       +
               nix_env, '--list-generations',

     

       54
       54
       +
               '-p', get_system_path(profile),

     

       55
       55
       +
               '--option', 'build-users-group', '',

     

       56
       56
       +
           ], universal_newlines=True)

     

       57
       57
       +
       

     

       58
       58
       +
           gen_lines = output.splitlines()

     

       59
       59
       +
           gen_nums = [int(line.split()[0]) for line in gen_lines]

     

       60
       60
       +
       

     

       61
       61
       +
           return [gen for gen in gen_nums][-config('maxGenerations'):]

     

       62
       62
       +
       

     

       63
       63
       +
       

     

       64
       64
       +
       def is_encrypted(device: str) -> bool:

     

       65
       65
       +
           for name, _ in config('luksDevices'):

     

       66
       66
       +
               if os.readlink(os.path.join('/dev/mapper', name)) == os.readlink(device):

     

       67
       67
       +
                   return True

     

       68
       68
       +
       

     

       69
       69
       +
           return False

     

       70
       70
       +
       

     

       71
       71
       +
       

     

       72
       72
       +
       def is_fs_type_supported(fs_type: str) -> bool:

     

       73
       73
       +
           return fs_type.startswith('vfat')

     

       74
       74
       +
       

     

       75
       75
       +
       

     

       76
       76
       +
       paths = {}

     

       77
       77
       +
       

     

       78
       78
       +
       def get_copied_path_uri(path: str, target: str) -> str:

     

       79
       79
       +
           package_id = os.path.basename(os.path.dirname(path))

     

       80
       80
       +
           suffix = os.path.basename(path)

     

       81
       81
       +
           dest_file = f'{package_id}-{suffix}'

     

       82
       82
       +
           dest_path = os.path.join(refind_dir, target, dest_file)

     

       83
       83
       +
       

     

       84
       84
       +
           if not os.path.exists(dest_path):

     

       85
       85
       +
               copy_file(path, dest_path)

     

       86
       86
       +
           else:

     

       87
       87
       +
               paths[dest_path] = True

     

       88
       88
       +
       

     

       89
       89
       +
           return os.path.join('/efi/refind', target, dest_file)

     

       90
       90
       +
       

     

       91
       91
       +
       def get_path_uri(path: str) -> str:

     

       92
       92
       +
           return get_copied_path_uri(path, "")

     

       93
       93
       +
       

     

       94
       94
       +
       

     

       95
       95
       +
       def get_file_uri(profile: str, gen: Optional[str], spec: Optional[str], name: str) -> str:

     

       96
       96
       +
           gen_path = get_system_path(profile, gen, spec)

     

       97
       97
       +
           path_in_store = os.path.realpath(os.path.join(gen_path, name))

     

       98
       98
       +
           return get_path_uri(path_in_store)

     

       99
       99
       +
       

     

       100
       100
       +
       

     

       101
       101
       +
       def get_kernel_uri(kernel_path: str) -> str:

     

       102
       102
       +
           return get_copied_path_uri(kernel_path, "kernels")

     

       103
       103
       +
       

     

       104
       104
       +
       

     

       105
       105
       +
       @dataclass

     

       106
       106
       +
       class BootSpec:

     

       107
       107
       +
           system: str

     

       108
       108
       +
           init: str

     

       109
       109
       +
           kernel: str

     

       110
       110
       +
           kernelParams: List[str]

     

       111
       111
       +
           label: str

     

       112
       112
       +
           toplevel: str

     

       113
       113
       +
           specialisations: Dict[str, "BootSpec"]

     

       114
       114
       +
           initrd: str | None = None

     

       115
       115
       +
           initrdSecrets: str | None = None

     

       116
       116
       +
       

     

       117
       117
       +
       

     

       118
       118
       +
       def bootjson_to_bootspec(bootjson: dict) -> BootSpec:

     

       119
       119
       +
           specialisations = bootjson['org.nixos.specialisation.v1']

     

       120
       120
       +
           specialisations = {k: bootjson_to_bootspec(v) for k, v in specialisations.items()}

     

       121
       121
       +
           return BootSpec(

     

       122
       122
       +
               **bootjson['org.nixos.bootspec.v1'],

     

       123
       123
       +
               specialisations=specialisations,

     

       124
       124
       +
           )

     

       125
       125
       +
       

     

       126
       126
       +
       

     

       127
       127
       +
       def config_entry(is_sub: bool, bootspec: BootSpec, label: str, time: str) -> str:

     

       128
       128
       +
           entry = ""

     

       129
       129
       +
           if is_sub:

     

       130
       130
       +
               entry += 'sub'

     

       131
       131
       +
       

     

       132
       132
       +
           entry += f'menuentry "{label}" {{\n'

     

       133
       133
       +
           entry += '  loader ' + get_kernel_uri(bootspec.kernel) + '\n'

     

       134
       134
       +
       

     

       135
       135
       +
           if bootspec.initrd:

     

       136
       136
       +
               entry += '  initrd ' + get_kernel_uri(bootspec.initrd) + '\n'

     

       137
       137
       +
       

     

       138
       138
       +
           entry += '  options "' + ' '.join(['init=' + bootspec.init] + bootspec.kernelParams).strip() + '"\n'

     

       139
       139
       +
           entry += '}\n'

     

       140
       140
       +
           return entry

     

       141
       141
       +
       

     

       142
       142
       +
       

     

       143
       143
       +
       def generate_config_entry(profile: str, gen: str, special: bool, group_name: str) -> str:

     

       144
       144
       +
           time = datetime.datetime.fromtimestamp(os.stat(get_system_path(profile,gen), follow_symlinks=False).st_mtime).strftime("%F %H:%M:%S")

     

       145
       145
       +
           boot_json = json.load(open(os.path.join(get_system_path(profile, gen), 'boot.json'), 'r'))

     

       146
       146
       +
           boot_spec = bootjson_to_bootspec(boot_json)

     

       147
       147
       +
       

     

       148
       148
       +
           specialisation_list = boot_spec.specialisations.items()

     

       149
       149
       +
           entry = ""

     

       150
       150
       +
       

     

       151
       151
       +
           if len(specialisation_list) > 0:

     

       152
       152
       +
               entry += f'menuentry "NixOS {group_name} Generation {gen}" {{\n'

     

       153
       153
       +
               entry += config_entry(True, boot_spec, f'Default', str(time))

     

       154
       154
       +
       

     

       155
       155
       +
               for spec, spec_boot_spec in specialisation_list:

     

       156
       156
       +
                   entry += config_entry(True, spec_boot_spec, f'{spec}', str(time))

     

       157
       157
       +
       

     

       158
       158
       +
               entry += '}\n'

     

       159
       159
       +
           else:

     

       160
       160
       +
               entry += config_entry(False, boot_spec, f'NixOS {group_name} Generation {gen}', str(time))

     

       161
       161
       +
           return entry

     

       162
       162
       +
       

     

       163
       163
       +
       

     

       164
       164
       +
       def find_disk_device(part: str) -> str:

     

       165
       165
       +
           part = os.path.realpath(part)

     

       166
       166
       +
           part = part.removeprefix('/dev/')

     

       167
       167
       +
           disk = os.path.realpath(os.path.join('/sys', 'class', 'block', part))

     

       168
       168
       +
           disk = os.path.dirname(disk)

     

       169
       169
       +
       

     

       170
       170
       +
           return os.path.join('/dev', os.path.basename(disk))

     

       171
       171
       +
       

     

       172
       172
       +
       

     

       173
       173
       +
       def find_mounted_device(path: str) -> str:

     

       174
       174
       +
           path = os.path.abspath(path)

     

       175
       175
       +
       

     

       176
       176
       +
           while not os.path.ismount(path):

     

       177
       177
       +
               path = os.path.dirname(path)

     

       178
       178
       +
       

     

       179
       179
       +
           devices = [x for x in psutil.disk_partitions() if x.mountpoint == path]

     

       180
       180
       +
       

     

       181
       181
       +
           assert len(devices) == 1

     

       182
       182
       +
           return devices[0].device

     

       183
       183
       +
       

     

       184
       184
       +
       

     

       185
       185
       +
       def copy_file(from_path: str, to_path: str):

     

       186
       186
       +
           dirname = os.path.dirname(to_path)

     

       187
       187
       +
       

     

       188
       188
       +
           if not os.path.exists(dirname):

     

       189
       189
       +
               os.makedirs(dirname)

     

       190
       190
       +
       

     

       191
       191
       +
           shutil.copyfile(from_path, to_path + ".tmp")

     

       192
       192
       +
           os.rename(to_path + ".tmp", to_path)

     

       193
       193
       +
       

     

       194
       194
       +
           paths[to_path] = True

     

       195
       195
       +
       

     

       196
       196
       +
       

     

       197
       197
       +
       def install_bootloader() -> None:

     

       198
       198
       +
           global refind_dir

     

       199
       199
       +
       

     

       200
       200
       +
           refind_dir = os.path.join(str(config('efiMountPoint')), 'efi', 'refind')

     

       201
       201
       +
       

     

       202
       202
       +
           if not os.path.exists(refind_dir):

     

       203
       203
       +
               os.makedirs(refind_dir)

     

       204
       204
       +
           else:

     

       205
       205
       +
               for dir, dirs, files in os.walk(refind_dir, topdown=True):

     

       206
       206
       +
                   for file in files:

     

       207
       207
       +
                       paths[os.path.join(dir, file)] = False

     

       208
       208
       +
       

     

       209
       209
       +
           profiles = [('system', get_gens())]

     

       210
       210
       +
       

     

       211
       211
       +
           for profile in get_profiles():

     

       212
       212
       +
               profiles += [(profile, get_gens(profile))]

     

       213
       213
       +
       

     

       214
       214
       +
           timeout = config('timeout')

     

       215
       215
       +
       

     

       216
       216
       +
           last_gen = get_gens()[-1]

     

       217
       217
       +
           last_gen_json = json.load(open(os.path.join(get_system_path('system', last_gen), 'boot.json'), 'r'))

     

       218
       218
       +
           last_gen_boot_spec = bootjson_to_bootspec(last_gen_json)

     

       219
       219
       +
       

     

       220
       220
       +
           config_file = str(config('extraConfig')) + '\n'

     

       221
       221
       +
           config_file += textwrap.dedent(f'''

     

       222
       222
       +
               timeout {timeout}

     

       223
       223
       +
               default_selection {3 if len(last_gen_boot_spec.specialisations.items()) > 0 else 2}

     

       224
       224
       +
           ''')

     

       225
       225
       +
       

     

       226
       226
       +
           config_file += textwrap.dedent('''

     

       227
       227
       +
               # NixOS boot entries start here

     

       228
       228
       +
           ''')

     

       229
       229
       +
       

     

       230
       230
       +
           for (profile, gens) in profiles:

     

       231
       231
       +
               group_name = 'default profile' if profile == 'system' else f"profile '{profile}'"

     

       232
       232
       +
               isFirst = True

     

       233
       233
       +
       

     

       234
       234
       +
               for gen in sorted(gens, key=lambda x: x, reverse=True):

     

       235
       235
       +
                   config_file += generate_config_entry(profile, gen, isFirst, group_name)

     

       236
       236
       +
                   isFirst = False

     

       237
       237
       +
       

     

       238
       238
       +
           config_file_path = os.path.join(refind_dir, 'refind.conf')

     

       239
       239
       +
           config_file += '\n# NixOS boot entries end here\n\n'

     

       240
       240
       +
       

     

       241
       241
       +
           with open(f"{config_file_path}.tmp", 'w') as file:

     

       242
       242
       +
               file.truncate()

     

       243
       243
       +
               file.write(config_file.strip())

     

       244
       244
       +
               file.flush()

     

       245
       245
       +
               os.fsync(file.fileno())

     

       246
       246
       +
           os.rename(f"{config_file_path}.tmp", config_file_path)

     

       247
       247
       +
       

     

       248
       248
       +
           paths[config_file_path] = True

     

       249
       249
       +
       

     

       250
       250
       +
           for dest_path, source_path in config('additionalFiles').items():

     

       251
       251
       +
               dest_path = os.path.join(refind_dir, dest_path)

     

       252
       252
       +
       

     

       253
       253
       +
               copy_file(source_path, dest_path)

     

       254
       254
       +
       

     

       255
       255
       +
           cpu_family = config('hostArchitecture', 'family')

     

       256
       256
       +
           if cpu_family == 'x86':

     

       257
       257
       +
               if config('hostArchitecture', 'bits') == 32:

     

       258
       258
       +
                   boot_file = 'BOOTIA32.EFI'

     

       259
       259
       +
                   efi_file = 'refind_ia32.efi'

     

       260
       260
       +
               elif config('hostArchitecture', 'bits') == 64:

     

       261
       261
       +
                   boot_file = 'BOOTX64.EFI'

     

       262
       262
       +
                   efi_file = 'refind_x64.efi'

     

       263
       263
       +
           elif cpu_family == 'arm':

     

       264
       264
       +
               if config('hostArchitecture', 'arch') == 'armv8-a' and config('hostArchitecture', 'bits') == 64:

     

       265
       265
       +
                   boot_file = 'BOOTAA64.EFI'

     

       266
       266
       +
                   efi_file = 'refind_aa64.efi'

     

       267
       267
       +
               else:

     

       268
       268
       +
                   raise Exception(f'Unsupported CPU arch: {config("hostArchitecture", "arch")}')

     

       269
       269
       +
           else:

     

       270
       270
       +
               raise Exception(f'Unsupported CPU family: {cpu_family}')

     

       271
       271
       +
       

     

       272
       272
       +
           efi_path = os.path.join(config('refindPath'), 'share', 'refind', efi_file)

     

       273
       273
       +
           dest_path = os.path.join(config('efiMountPoint'), 'efi', 'boot' if config('efiRemovable') else 'refind', boot_file)

     

       274
       274
       +
       

     

       275
       275
       +
           copy_file(efi_path, dest_path)

     

       276
       276
       +
       

     

       277
       277
       +
           if not config('efiRemovable') and not config('canTouchEfiVariables'):

     

       278
       278
       +
               print('warning: boot.loader.efi.canTouchEfiVariables is set to false while boot.loader.limine.efiInstallAsRemovable.\n  This may render the system unbootable.')

     

       279
       279
       +
       

     

       280
       280
       +
           if config('canTouchEfiVariables'):

     

       281
       281
       +
               if config('efiRemovable'):

     

       282
       282
       +
                   print('note: boot.loader.limine.efiInstallAsRemovable is true, no need to add EFI entry.')

     

       283
       283
       +
               else:

     

       284
       284
       +
                   efibootmgr = os.path.join(str(config('efiBootMgrPath')), 'bin', 'efibootmgr')

     

       285
       285
       +
                   efi_partition = find_mounted_device(str(config('efiMountPoint')))

     

       286
       286
       +
                   efi_disk = find_disk_device(efi_partition)

     

       287
       287
       +
       

     

       288
       288
       +
                   efibootmgr_output = subprocess.check_output([efibootmgr], stderr=subprocess.STDOUT, universal_newlines=True)

     

       289
       289
       +
       

     

       290
       290
       +
                   # Check the output of `efibootmgr` to find if rEFInd is already installed and present in the boot record

     

       291
       291
       +
                   refind_boot_entry = None

     

       292
       292
       +
                   if matches := re.findall(r'Boot([0-9a-fA-F]{4})\*? rEFInd', efibootmgr_output):

     

       293
       293
       +
                       refind_boot_entry = matches[0]

     

       294
       294
       +
       

     

       295
       295
       +
                   # If there's already a Limine entry, replace it

     

       296
       296
       +
                   if refind_boot_entry:

     

       297
       297
       +
                       boot_order = re.findall(r'BootOrder: ((?:[0-9a-fA-F]{4},?)*)', efibootmgr_output)[0]

     

       298
       298
       +
       

     

       299
       299
       +
                       efibootmgr_output = subprocess.check_output([

     

       300
       300
       +
                           efibootmgr,

     

       301
       301
       +
                           '-b', refind_boot_entry,

     

       302
       302
       +
                           '-B',

     

       303
       303
       +
                       ], stderr=subprocess.STDOUT, universal_newlines=True)

     

       304
       304
       +
       

     

       305
       305
       +
                       efibootmgr_output = subprocess.check_output([

     

       306
       306
       +
                           efibootmgr,

     

       307
       307
       +
                           '-c',

     

       308
       308
       +
                           '-b', refind_boot_entry,

     

       309
       309
       +
                           '-d', efi_disk,

     

       310
       310
       +
                           '-p', efi_partition.removeprefix(efi_disk).removeprefix('p'),

     

       311
       311
       +
                           '-l', f'\\efi\\refind\\{boot_file}',

     

       312
       312
       +
                           '-L', 'rEFInd',

     

       313
       313
       +
                           '-o', boot_order,

     

       314
       314
       +
                       ], stderr=subprocess.STDOUT, universal_newlines=True)

     

       315
       315
       +
                   else:

     

       316
       316
       +
                       efibootmgr_output = subprocess.check_output([

     

       317
       317
       +
                           efibootmgr,

     

       318
       318
       +
                           '-c',

     

       319
       319
       +
                           '-d', efi_disk,

     

       320
       320
       +
                           '-p', efi_partition.removeprefix(efi_disk).removeprefix('p'),

     

       321
       321
       +
                           '-l', f'\\efi\\refind\\{boot_file}',

     

       322
       322
       +
                           '-L', 'rEFInd',

     

       323
       323
       +
                       ], stderr=subprocess.STDOUT, universal_newlines=True)

     

       324
       324
       +
       

     

       325
       325
       +
           print("removing unused boot files...")

     

       326
       326
       +
           for path in paths:

     

       327
       327
       +
               if not paths[path]:

     

       328
       328
       +
                   os.remove(path)

     

       329
       329
       +
       

     

       330
       330
       +
       

     

       331
       331
       +
       def main() -> None:

     

       332
       332
       +
           try:

     

       333
       333
       +
               install_bootloader()

     

       334
       334
       +
           finally:

     

       335
       335
       +
               # Since fat32 provides little recovery facilities after a crash,

     

       336
       336
       +
               # it can leave the system in an unbootable state, when a crash/outage

     

       337
       337
       +
               # happens shortly after an update. To decrease the likelihood of this

     

       338
       338
       +
               # event sync the efi filesystem after each update.

     

       339
       339
       +
               rc = libc.syncfs(os.open(f"{config('efiMountPoint')}", os.O_RDONLY))

     

       340
       340
       +
               if rc != 0:

     

       341
       341
       +
                   print(f"could not sync {config('efiMountPoint')}: {os.strerror(rc)}", file=sys.stderr)

     

       342
       342
       +
       

     

       343
       343
       +
       if __name__ == '__main__':

     

       344
       344
       +
           main()

+117

nixos/modules/system/boot/loader/refind/refind.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         config,

     

       3
       3
       +
         options,

     

       4
       4
       +
         lib,

     

       5
       5
       +
         pkgs,

     

       6
       6
       +
         ...

     

       7
       7
       +
       }:

     

       8
       8
       +
       let

     

       9
       9
       +
         inherit (lib)

     

       10
       10
       +
           mkIf

     

       11
       11
       +
           mkEnableOption

     

       12
       12
       +
           mkOption

     

       13
       13
       +
           literalExpression

     

       14
       14
       +
           types

     

       15
       15
       +
           ;

     

       16
       16
       +
       

     

       17
       17
       +
         cfg = config.boot.loader.refind;

     

       18
       18
       +
         efi = config.boot.loader.efi;

     

       19
       19
       +
         refindInstallConfig = pkgs.writeText "refind-install.json" (

     

       20
       20
       +
           builtins.toJSON {

     

       21
       21
       +
             nixPath = config.nix.package;

     

       22
       22
       +
             efiBootMgrPath = pkgs.efibootmgr;

     

       23
       23
       +
             refindPath = cfg.package;

     

       24
       24
       +
             efiMountPoint = efi.efiSysMountPoint;

     

       25
       25
       +
             fileSystems = config.fileSystems;

     

       26
       26
       +
             luksDevices = config.boot.initrd.luks.devices;

     

       27
       27
       +
             canTouchEfiVariables = efi.canTouchEfiVariables;

     

       28
       28
       +
             efiRemovable = cfg.efiInstallAsRemovable;

     

       29
       29
       +
             maxGenerations = if cfg.maxGenerations == null then 0 else cfg.maxGenerations;

     

       30
       30
       +
             hostArchitecture = pkgs.stdenv.hostPlatform.parsed.cpu;

     

       31
       31
       +
             timeout = if config.boot.loader.timeout != null then config.boot.loader.timeout else 10;

     

       32
       32
       +
             extraConfig = cfg.extraConfig;

     

       33
       33
       +
             additionalFiles = cfg.additionalFiles;

     

       34
       34
       +
           }

     

       35
       35
       +
         );

     

       36
       36
       +
       in

     

       37
       37
       +
       {

     

       38
       38
       +
         meta = {

     

       39
       39
       +
           inherit (pkgs.refind.meta) maintainers;

     

       40
       40
       +
         };

     

       41
       41
       +
       

     

       42
       42
       +
         options = {

     

       43
       43
       +
           boot.loader.refind = {

     

       44
       44
       +
             enable = mkEnableOption "the rEFInd boot loader";

     

       45
       45
       +
             extraConfig = lib.mkOption {

     

       46
       46
       +
               default = "";

     

       47
       47
       +
               type = types.lines;

     

       48
       48
       +
               description = ''

     

       49
       49
       +
                 A string which is prepended to refind.conf.

     

       50
       50
       +
               '';

     

       51
       51
       +
             };

     

       52
       52
       +
             package = lib.mkPackageOption pkgs "refind" { };

     

       53
       53
       +
             maxGenerations = lib.mkOption {

     

       54
       54
       +
               default = null;

     

       55
       55
       +
               example = 50;

     

       56
       56
       +
               type = types.nullOr types.int;

     

       57
       57
       +
               description = ''

     

       58
       58
       +
                 Maximum number of latest generations in the boot menu.

     

       59
       59
       +
                 Useful to prevent boot partition of running out of disk space.

     

       60
       60
       +
                 `null` means no limit i.e. all generations that were not

     

       61
       61
       +
                 garbage collected yet.

     

       62
       62
       +
               '';

     

       63
       63
       +
             };

     

       64
       64
       +
             additionalFiles = mkOption {

     

       65
       65
       +
               default = { };

     

       66
       66
       +
               type = types.attrsOf types.path;

     

       67
       67
       +
               example = literalExpression ''

     

       68
       68
       +
                 { "efi/memtest86/memtest86.efi" = "''${pkgs.memtest86-efi}/BOOTX64.efi"; }

     

       69
       69
       +
               '';

     

       70
       70
       +
               description = ''

     

       71
       71
       +
                 A set of files to be copied to {file}`/boot`. Each attribute name denotes the

     

       72
       72
       +
                 destination file name in {file}`/boot`, while the corresponding attribute value

     

       73
       73
       +
                 specifies the source file.

     

       74
       74
       +
               '';

     

       75
       75
       +
             };

     

       76
       76
       +
             efiInstallAsRemovable = mkEnableOption null // {

     

       77
       77
       +
               default = !efi.canTouchEfiVariables;

     

       78
       78
       +
               defaultText = literalExpression "!config.boot.loader.efi.canTouchEfiVariables";

     

       79
       79
       +
               description = ''

     

       80
       80
       +
                 Whether or not to install the rEFInd EFI files as removable.

     

       81
       81
       +
       

     

       82
       82
       +
                 See {option}`boot.loader.grub.efiInstallAsRemovable`

     

       83
       83
       +
               '';

     

       84
       84
       +
             };

     

       85
       85
       +
           };

     

       86
       86
       +
         };

     

       87
       87
       +
       

     

       88
       88
       +
         config = mkIf cfg.enable {

     

       89
       89
       +
           assertions = [

     

       90
       90
       +
             {

     

       91
       91
       +
               assertion =

     

       92
       92
       +
                 pkgs.stdenv.hostPlatform.isx86_64

     

       93
       93
       +
                 || pkgs.stdenv.hostPlatform.isi686

     

       94
       94
       +
                 || pkgs.stdenv.hostPlatform.isAarch64;

     

       95
       95
       +
               message = "rEFInd can only be installed on aarch64 & x86 platforms";

     

       96
       96
       +
             }

     

       97
       97
       +
             {

     

       98
       98
       +
               assertion = pkgs.stdenv.hostPlatform.isEfi;

     

       99
       99
       +
               message = "rEFInd can only be installed on UEFI platforms";

     

       100
       100
       +
             }

     

       101
       101
       +
           ];

     

       102
       102
       +
       

     

       103
       103
       +
           # Common attribute for boot loaders so only one of them can be

     

       104
       104
       +
           # set at once.

     

       105
       105
       +
           system = {

     

       106
       106
       +
             boot.loader.id = "refind";

     

       107
       107
       +
             build.installBootLoader = pkgs.replaceVarsWith {

     

       108
       108
       +
               src = ./refind-install.py;

     

       109
       109
       +
               isExecutable = true;

     

       110
       110
       +
               replacements = {

     

       111
       111
       +
                 python3 = pkgs.python3.withPackages (python-packages: [ python-packages.psutil ]);

     

       112
       112
       +
                 configPath = refindInstallConfig;

     

       113
       113
       +
               };

     

       114
       114
       +
             };

     

       115
       115
       +
           };

     

       116
       116
       +
         };

     

       117
       117
       +
       }

nixos/tests/all-tests.nix

···

       1291
       1291
        
         redis = handleTest ./redis.nix { };

     

       1292
       1292
        
         redlib = runTest ./redlib.nix;

     

       1293
       1293
        
         redmine = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./redmine.nix { };

     

       1294
       1294
       +
         refind = runTest ./refind.nix;

     

       1294
       1295
        
         renovate = runTest ./renovate.nix;

     

       1295
       1296
        
         replace-dependencies = handleTest ./replace-dependencies { };

     

       1296
       1297
        
         reposilite = runTest ./reposilite.nix;

+25

nixos/tests/refind.nix

···

       1
       1
       +
       { lib, pkgs, ... }:

     

       2
       2
       +
       {

     

       3
       3
       +
         name = "refind";

     

       4
       4
       +
         meta = {

     

       5
       5
       +
           inherit (pkgs.refind.meta) maintainers;

     

       6
       6
       +
         };

     

       7
       7
       +
       

     

       8
       8
       +
         nodes.machine =

     

       9
       9
       +
           { ... }:

     

       10
       10
       +
           {

     

       11
       11
       +
             virtualisation.useBootLoader = true;

     

       12
       12
       +
             virtualisation.useEFIBoot = true;

     

       13
       13
       +
       

     

       14
       14
       +
             boot.loader.grub.enable = false;

     

       15
       15
       +
             boot.loader.efi.canTouchEfiVariables = true;

     

       16
       16
       +
             boot.loader.refind.enable = true;

     

       17
       17
       +
             boot.loader.timeout = 1;

     

       18
       18
       +
           };

     

       19
       19
       +
       

     

       20
       20
       +
         testScript = ''

     

       21
       21
       +
           machine.start()

     

       22
       22
       +
           with subtest('Machine boots correctly'):

     

       23
       23
       +
             machine.wait_for_unit('multi-user.target')

     

       24
       24
       +
         '';

     

       25
       25
       +
       }

+13

pkgs/applications/editors/vim/plugins/generated.nix

···

       11998
       11998
        
           meta.hydraPlatforms = [ ];

     

       11999
       11999
        
         };

     

       12000
       12000
        
       

     

       12001
       12001
       +
         oklch-color-picker-nvim = buildVimPlugin {

     

       12002
       12002
       +
           pname = "oklch-color-picker.nvim";

     

       12003
       12003
       +
           version = "2025-09-04";

     

       12004
       12004
       +
           src = fetchFromGitHub {

     

       12005
       12005
       +
             owner = "eero-lehtinen";

     

       12006
       12006
       +
             repo = "oklch-color-picker.nvim";

     

       12007
       12007
       +
             rev = "ae318113cd7d0e4988b6b059327c2778911f1187";

     

       12008
       12008
       +
             sha256 = "0xhraf89b1ppijqmg1gnwp4gvnnmf8h86n8d6s8ydgj910jvagzm";

     

       12009
       12009
       +
           };

     

       12010
       12010
       +
           meta.homepage = "https://github.com/eero-lehtinen/oklch-color-picker.nvim/";

     

       12011
       12011
       +
           meta.hydraPlatforms = [ ];

     

       12012
       12012
       +
         };

     

       12013
       12013
       +
       

     

       12001
       12014
        
         ollama-nvim = buildVimPlugin {

     

       12002
       12015
        
           pname = "ollama.nvim";

     

       12003
       12016
        
           version = "2024-06-09";

pkgs/applications/editors/vim/plugins/vim-plugin-names

···

       921
       921
        
       https://github.com/mhartington/oceanic-next/,,

     

       922
       922
        
       https://github.com/pwntester/octo.nvim/,,

     

       923
       923
        
       https://github.com/refractalize/oil-git-status.nvim/,HEAD,

     

       924
       924
       +
       https://github.com/eero-lehtinen/oklch-color-picker.nvim/,HEAD,

     

       924
       925
        
       https://github.com/nomnivore/ollama.nvim/,HEAD,

     

       925
       926
        
       https://github.com/yonlu/omni.vim/,,

     

       926
       927
        
       https://github.com/Hoffs/omnisharp-extended-lsp.nvim/,HEAD,

+3 -3

pkgs/applications/emulators/libretro/cores/pcsx2.nix

···

       11
       11
        
       }:

     

       12
       12
        
       mkLibretroCore {

     

       13
       13
        
         core = "pcsx2";

     

       14
       14
       -
         version = "0-unstable-2025-08-07";

     

       14
       14
       +
         version = "0-unstable-2025-08-30";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "libretro";

     

       18
       18
        
           repo = "ps2";

     

       19
       19
       -
           rev = "c26b06ac2752a11ee47abc6f9c73595ee874341c";

     

       20
       20
       -
           hash = "sha256-c7y1jCRQd/o4RTrOeqltcH8HOwrb+BLtaw//0ZWW4E0=";

     

       19
       19
       +
           rev = "b0e6c4d7f4abc8cfbf2c55322fc5009a685bc042";

     

       20
       20
       +
           hash = "sha256-6cpVsituAWX6sVP5JUvT7KjYZ7SzvD95EB90e2UxJ9A=";

     

       21
       21
        
           fetchSubmodules = true;

     

       22
       22
        
         };

     

       23
       23

+2 -2

pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix

···

       10
       10
        
       buildMozillaMach rec {

     

       11
       11
        
         pname = "firefox-beta";

     

       12
       12
        
         binaryName = pname;

     

       13
       13
       -
         version = "143.0b7";

     

       13
       13
       +
         version = "143.0b8";

     

       14
       14
        
         applicationName = "Firefox Beta";

     

       15
       15
        
         src = fetchurl {

     

       16
       16
        
           url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";

     

       17
       17
       -
           sha512 = "bf71930c7a5ab2c4ccc4f0179702491bd314763c469501f68df6cef0f1db57da6f16da77bc5d7692c0f5edf8ce616d8f927d2fa59c5c386217b9022a8e9802f8";

     

       17
       17
       +
           sha512 = "bf8e78abcc1cf6c8b48a591d0185c85195a818de0d13bafa3f004ad9c76364a2c07cacdf09fe0ae2e290d9cbce7b8c3ba4b57793cd3d39240023ef53eea08377";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         meta = {

+2 -2

pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix

···

       10
       10
        
       buildMozillaMach rec {

     

       11
       11
        
         pname = "firefox-devedition";

     

       12
       12
        
         binaryName = pname;

     

       13
       13
       -
         version = "143.0b7";

     

       13
       13
       +
         version = "143.0b8";

     

       14
       14
        
         applicationName = "Firefox Developer Edition";

     

       15
       15
        
         requireSigning = false;

     

       16
       16
        
         branding = "browser/branding/aurora";

     

       17
       17
        
         src = fetchurl {

     

       18
       18
        
           url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";

     

       19
       19
       -
           sha512 = "0c1c3af3412b14425df005b53af00e8af526cb6e0bc36f32f6bce1f4332959f35ffed4b795a40e004a41fea9747a7b7c7f6cacfd70b6ef4f54b47556cdc31ec5";

     

       19
       19
       +
           sha512 = "89152a4dd3e17f68d7991fae65a6365a2273fcbef28c245a76e9e068a1f12c486a7d0c6d3cb8988c1c9955b15809fa93e117e25b04f9b1a9d449e685cbf30cfc";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but

+3 -3

pkgs/by-name/ai/airgorah/package.nix

···

       15
       15
        
       

     

       16
       16
        
       rustPlatform.buildRustPackage rec {

     

       17
       17
        
         pname = "airgorah";

     

       18
       18
       -
         version = "0.7.3";

     

       18
       18
       +
         version = "0.7.4";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchFromGitHub {

     

       21
       21
        
           owner = "martin-olivier";

     

       22
       22
        
           repo = "airgorah";

     

       23
       23
        
           tag = "v${version}";

     

       24
       24
       -
           hash = "sha256-cIb40TKkk3gfy4dTP8WyZqQkRGj5nItaQ3NSfexCUOA=";

     

       24
       24
       +
           hash = "sha256-6TH+DRDtWajZjHNmFSKL4XJK+AuDNUbWKRPRryOpSGY=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
       -
         cargoHash = "sha256-3Les/A9fBBjU6NSVVEyXCbjrNSdaEgCl5pZ36ceRDQg=";

     

       27
       27
       +
         cargoHash = "sha256-LiSaNyqsKBZ5nNP7mws1pjhVwTXNBF6e1wSUdG/qYog=";

     

       28
       28
        
       

     

       29
       29
        
         nativeBuildInputs = [

     

       30
       30
        
           pkg-config

+18 -14

pkgs/by-name/cl/clickhouse/generic.nix

···

       90
       90
        
       

     

       91
       91
        
         dontCargoSetupPostUnpack = true;

     

       92
       92
        
       

     

       93
       93
       -
         # Should not be necessary after 25.9

     

       94
       94
       -
         patches = lib.optional (lib.versions.majorMinor version == "25.8") (fetchpatch {

     

       95
       95
       -
           url = "https://github.com/ClickHouse/ClickHouse/commit/67a42b78cdf1c793e78c1adbcc34162f67044032.patch";

     

       96
       96
       -
           sha256 = "7VF+JSztqTWD+aunCS3UVNxlRdwHc2W5fNqzDyeo3Fc=";

     

       97
       97
       -
         });

     

       93
       93
       +
         patches =

     

       94
       94
       +
           lib.optional (lib.versions.majorMinor version == "25.8") (fetchpatch {

     

       95
       95
       +
             # Disable building WASM lexer

     

       96
       96
       +
             url = "https://github.com/ClickHouse/ClickHouse/commit/67a42b78cdf1c793e78c1adbcc34162f67044032.patch";

     

       97
       97
       +
             sha256 = "7VF+JSztqTWD+aunCS3UVNxlRdwHc2W5fNqzDyeo3Fc=";

     

       98
       98
       +
           })

     

       99
       99
       +
           ++

     

       100
       100
       +
       

     

       101
       101
       +
             lib.optional (lib.versions.majorMinor version == "25.8" && stdenv.hostPlatform.isDarwin)

     

       102
       102
       +
               (fetchpatch {

     

       103
       103
       +
                 # Do not intercept memalign on darwin

     

       104
       104
       +
                 url = "https://github.com/ClickHouse/ClickHouse/commit/0cfd2dbe981727fb650f3b9935f5e7e7e843180f.patch";

     

       105
       105
       +
                 sha256 = "1iNYZbugX2g2dxNR1ZiUthzPnhLUR8g118aG23yhgUo=";

     

       106
       106
       +
               });

     

       98
       107
        
       

     

       99
       108
        
         postPatch = ''

     

       100
       109
        
           patchShebangs src/ utils/

     

       101
       101
       -
       

     

       102
       102
       -
           sed -i 's|/usr/bin/env perl|"${lib.getExe perl}"|' contrib/openssl-cmake/CMakeLists.txt

     

       103
       103
       -
       

     

       104
       104
       -
           substituteInPlace utils/list-licenses/list-licenses.sh \

     

       105
       105
       -
             --replace-fail '$(git rev-parse --show-toplevel)' "$NIX_BUILD_TOP/$sourceRoot"

     

       106
       106
       -
         ''

     

       107
       107
       -
         + lib.optionalString (lib.versions.majorMinor version <= "25.6") ''

     

       108
       108
       -
           substituteInPlace src/Storages/System/StorageSystemLicenses.sh \

     

       109
       109
       -
              --replace-fail '$(git rev-parse --show-toplevel)' "$NIX_BUILD_TOP/$sourceRoot"

     

       110
       110
        
         ''

     

       111
       111
        
         + lib.optionalString stdenv.hostPlatform.isDarwin ''

     

       112
       112
        
           substituteInPlace cmake/tools.cmake \

     

       113
       113
        
             --replace-fail 'gfind' 'find' \

     

       114
       114
        
             --replace-fail 'ggrep' 'grep' \

     

       115
       115
        
             --replace-fail '--ld-path=''${LLD_PATH}' '-fuse-ld=lld'

     

       116
       116
       +
       

     

       117
       117
       +
           substituteInPlace utils/list-licenses/list-licenses.sh \

     

       118
       118
       +
             --replace-fail 'gfind' 'find' \

     

       119
       119
       +
             --replace-fail 'ggrep' 'grep'

     

       116
       120
        
         ''

     

       117
       121
        
         # Rust is handled by cmake

     

       118
       122
        
         + lib.optionalString rustSupport ''

+3 -3

pkgs/by-name/co/codex/package.nix

···

       12
       12
        
       }:

     

       13
       13
        
       rustPlatform.buildRustPackage (finalAttrs: {

     

       14
       14
        
         pname = "codex";

     

       15
       15
       -
         version = "0.29.0";

     

       15
       15
       +
         version = "0.30.0";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "openai";

     

       19
       19
        
           repo = "codex";

     

       20
       20
        
           tag = "rust-v${finalAttrs.version}";

     

       21
       21
       -
           hash = "sha256-YCQfycmDPRxMAqo57tt/6IXkUn1JIPTzEHMNbt7m3w0=";

     

       21
       21
       +
           hash = "sha256-9dWVf5Q7sDfAbRIGvUqqwEouJRnS//ujlFvqZ/a8zBk=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         sourceRoot = "${finalAttrs.src.name}/codex-rs";

     

       25
       25
        
       

     

       26
       26
       -
         cargoHash = "sha256-kGjpqkV0OJW8mOW/OhyfXoTgLHHrtHQcw9c8zyVtzgs=";

     

       26
       26
       +
         cargoHash = "sha256-qJn2oN/9LVLhHnaNp+x9cUEMODrGrgV3SiR0ykIx7B4=";

     

       27
       27
        
       

     

       28
       28
        
         nativeBuildInputs = [

     

       29
       29
        
           installShellFiles

+3 -3

pkgs/by-name/em/emmylua-doc-cli/package.nix

···

       6
       6
        
       }:

     

       7
       7
        
       rustPlatform.buildRustPackage (finalAttrs: {

     

       8
       8
        
         pname = "emmylua_doc_cli";

     

       9
       9
       -
         version = "0.12.0";

     

       9
       9
       +
         version = "0.13.0";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "EmmyLuaLs";

     

       13
       13
        
           repo = "emmylua-analyzer-rust";

     

       14
       14
        
           tag = finalAttrs.version;

     

       15
       15
       -
           hash = "sha256-IXoiXfRnGOZQ7c8AJaK8OGjqp1bczd/tKjtpbYdCZlU=";

     

       15
       15
       +
           hash = "sha256-93PlsVvlUravsnW7YBCii04jCEJPP+6U2vYbVBjcX8M=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         buildAndTestSubdir = "crates/emmylua_doc_cli";

     

       19
       19
        
       

     

       20
       20
       -
         cargoHash = "sha256-7QQipbnqelLdzQr+lIORyQNM9SS5yHaJLQ31M52lYCw=";

     

       20
       20
       +
         cargoHash = "sha256-SbsYlIVWDpBU2bxJqXUtOiMHkOoa8Up27X7rVKLLLm0=";

     

       21
       21
        
       

     

       22
       22
        
         nativeInstallCheckInputs = [

     

       23
       23
        
           versionCheckHook

+21

pkgs/by-name/ep/epson-inkjet-printer-workforce-840-series/eps_raster_print-cast.patch

···

       1
       1
       +
       diff --git a/src/raster_to_epson.c b/src/raster_to_epson.c

     

       2
       2
       +
       index 6e621c8..a5ca797 100644

     

       3
       3
       +
       --- a/src/raster_to_epson.c

     

       4
       4
       +
       +++ b/src/raster_to_epson.c

     

       5
       5
       +
       @@ -438,14 +438,14 @@ static int print_page (void)

     

       6
       6
       +
        					break;

     

       7
       7
       +
        				}

     

       8
       8
       +
        

     

       9
       9
       +
       -				if (eps_raster_print(raster_h, image_raw, pageRegion.bytesPerLine, pageRegion.width, &nraster)) {

     

       10
       10
       +
       +				if (eps_raster_print(raster_h, image_raw, pageRegion.bytesPerLine, pageRegion.width, (int *) &nraster)) {

     

       11
       11
       +
        					error  = 1;

     

       12
       12
       +
        					break;

     

       13
       13
       +
        				}

     

       14
       14
       +
        			}

     

       15
       15
       +
        

     

       16
       16
       +
        			// flushing page

     

       17
       17
       +
       -			eps_raster_print(raster_h, NULL, 0, 0, &nraster);

     

       18
       18
       +
       +			eps_raster_print(raster_h, NULL, 0, 0, (int *) &nraster);

     

       19
       19
       +
        

     

       20
       20
       +
        			bAbort = (error) ? TRUE : FALSE;

     

       21
       21
       +
        			if (epcgEndPage (bAbort)) {

+23

pkgs/by-name/ep/epson-inkjet-printer-workforce-840-series/include-raster-helper.patch

···

       1
       1
       +
       diff --git a/src/pagemanager/pagemanager.c b/src/pagemanager/pagemanager.c

     

       2
       2
       +
       index 029e6d3..2881585 100644

     

       3
       3
       +
       --- a/src/pagemanager/pagemanager.c

     

       4
       4
       +
       +++ b/src/pagemanager/pagemanager.c

     

       5
       5
       +
       @@ -23,6 +23,7 @@

     

       6
       6
       +
        #include "debuglog.h"

     

       7
       7
       +
        #include "memory.h"

     

       8
       8
       +
        #include "raster.h"

     

       9
       9
       +
       +#include "raster-helper.h"

     

       10
       10
       +
        #include "pagemanager.h"

     

       11
       11
       +
       

     

       12
       12
       +
        extern int JobCanceled;

     

       13
       13
       +
       diff --git a/src/raster_to_epson.c b/src/raster_to_epson.c

     

       14
       14
       +
       index 6e621c8..6eea77c 100644

     

       15
       15
       +
       --- a/src/raster_to_epson.c

     

       16
       16
       +
       +++ b/src/raster_to_epson.c

     

       17
       17
       +
       @@ -36,6 +36,7 @@

     

       18
       18
       +
        #include "raster.h"

     

       19
       19
       +
        #include "memory.h"

     

       20
       20
       +
        #include "raster_to_epson.h"

     

       21
       21
       +
       +#include "raster-helper.h"

     

       22
       22
       +
        #include "pagemanager.h"

     

       23
       23
       +
        #include "filter_option.h"

+131

pkgs/by-name/ep/epson-inkjet-printer-workforce-840-series/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         autoreconfHook,

     

       3
       3
       +
         cups,

     

       4
       4
       +
         libjpeg,

     

       5
       5
       +
         rpmextract,

     

       6
       6
       +
         fetchurl,

     

       7
       7
       +
         lib,

     

       8
       8
       +
         stdenv,

     

       9
       9
       +
       }:

     

       10
       10
       +
       

     

       11
       11
       +
       let

     

       12
       12
       +
         srcdirs = {

     

       13
       13
       +
           filter = "epson-inkjet-printer-filter-1.0.0";

     

       14
       14
       +
           driver = "epson-inkjet-printer-workforce-840-series-1.0.0";

     

       15
       15
       +
         };

     

       16
       16
       +
       in

     

       17
       17
       +
       stdenv.mkDerivation (finalAttrs: {

     

       18
       18
       +
         pname = "epson-inkjet-printer-workforce-840-series";

     

       19
       19
       +
         version = "1.0.0";

     

       20
       20
       +
       

     

       21
       21
       +
         # The Epson may be unreliable, and it has been since sometime in

     

       22
       22
       +
         # 2024. Non-browser requests using commands like fetchurl receive a

     

       23
       23
       +
         # 403 error, an access denied response -- last checked on

     

       24
       24
       +
         # 2025-08-21.

     

       25
       25
       +
         #

     

       26
       26
       +
         # Therefore, an archive.org link has been added as a fallback

     

       27
       27
       +
         # option just in case.

     

       28
       28
       +
         src = fetchurl {

     

       29
       29
       +
           # NOTE: Don't forget to update the webarchive link too!

     

       30
       30
       +
           urls = [

     

       31
       31
       +
             "https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-workforce-840-series-${finalAttrs.version}-1lsb3.2.src.rpm"

     

       32
       32
       +
             "https://web.archive.org/web/https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-workforce-840-series-${finalAttrs.version}-1lsb3.2.src.rpm"

     

       33
       33
       +
           ];

     

       34
       34
       +
           hash = "sha256-rTYnEmgzqR/wOZYYIe2rO9x2cX8s2qDyTuRaTjzJjbg=";

     

       35
       35
       +
         };

     

       36
       36
       +
         sourceRoot = srcdirs.filter;

     

       37
       37
       +
       

     

       38
       38
       +
         nativeBuildInputs = [

     

       39
       39
       +
           autoreconfHook

     

       40
       40
       +
           rpmextract

     

       41
       41
       +
         ];

     

       42
       42
       +
         buildInputs = [

     

       43
       43
       +
           cups

     

       44
       44
       +
           libjpeg

     

       45
       45
       +
         ];

     

       46
       46
       +
       

     

       47
       47
       +
         unpackPhase = ''

     

       48
       48
       +
           runHook preUnpack

     

       49
       49
       +
       

     

       50
       50
       +
           rpmextract "$src"

     

       51
       51
       +
           for i in ${lib.concatStringsSep " " (builtins.attrValues srcdirs)}; do

     

       52
       52
       +
               tar xvf "$i".tar.gz

     

       53
       53
       +
           done

     

       54
       54
       +
       

     

       55
       55
       +
           runHook postUnpack

     

       56
       56
       +
         '';

     

       57
       57
       +
       

     

       58
       58
       +
         # Both patches fix errors that occur when building with GCC 14.

     

       59
       59
       +
         #

     

       60
       60
       +
         # eps_raster_print-cast.patch fixes 'error: passing argument 5 of

     

       61
       61
       +
         # ‘eps_raster_print’ from incompatible pointer type' in file

     

       62
       62
       +
         # raster_to_epson.c

     

       63
       63
       +
         #

     

       64
       64
       +
         # include-raster-helper.patch fixes 'error: implicit declaration of

     

       65
       65
       +
         # function' in files pagemanager.c and raster_to_epson.c

     

       66
       66
       +
         patches = [

     

       67
       67
       +
           ./eps_raster_print-cast.patch

     

       68
       68
       +
           ./include-raster-helper.patch

     

       69
       69
       +
         ];

     

       70
       70
       +
       

     

       71
       71
       +
         installPhase =

     

       72
       72
       +
           let

     

       73
       73
       +
             filterdir = "$out/lib/cups/filter";

     

       74
       74
       +
             docdir = "$out/share/doc/epson-inkjet-printer-workforce-840-series";

     

       75
       75
       +
             ppddir = "$out/share/cups/model/epson-inkjet-printer-workforce-840-series";

     

       76
       76
       +
             libdir =

     

       77
       77
       +
               if stdenv.hostPlatform.isx86_64 then

     

       78
       78
       +
                 "lib64"

     

       79
       79
       +
               else

     

       80
       80
       +
                 throw "Platforms other than x86_64-linux are not (yet) supported.";

     

       81
       81
       +
           in

     

       82
       82
       +
           ''

     

       83
       83
       +
             runHook preInstall

     

       84
       84
       +
       

     

       85
       85
       +
             mkdir -p "$out" "${docdir}" "${filterdir}" "${ppddir}"

     

       86
       86
       +
             cp src/epson_inkjet_printer_filter "${filterdir}"

     

       87
       87
       +
       

     

       88
       88
       +
             cp AUTHORS COPYING COPYING.EPSON COPYING.LIB "${docdir}"

     

       89
       89
       +
       

     

       90
       90
       +
             cd ../${srcdirs.driver}

     

       91
       91
       +
             cp Manual.txt README "${docdir}"

     

       92
       92
       +
             for ppd in ppds/*; do

     

       93
       93
       +
                 substituteInPlace "$ppd" --replace-fail '/opt/epson-inkjet-printer-workforce-840-series/cups/lib' "$out/lib/cups"

     

       94
       94
       +
                 gzip -c "$ppd" > "${ppddir}/''${ppd#*/}"

     

       95
       95
       +
             done

     

       96
       96
       +
             cp -r resource watermark ${libdir} "$out"

     

       97
       97
       +
       

     

       98
       98
       +
             runHook postInstall

     

       99
       99
       +
           '';

     

       100
       100
       +
       

     

       101
       101
       +
         meta = {

     

       102
       102
       +
           description = "Proprietary CUPS drivers for Epson inkjet printers";

     

       103
       103
       +
           longDescription = ''

     

       104
       104
       +
             This software is a filter program used with the Common UNIX Printing

     

       105
       105
       +
             System (CUPS) under Linux. It supplies high quality printing with

     

       106
       106
       +
             Seiko Epson Color Ink Jet Printers.

     

       107
       107
       +
       

     

       108
       108
       +
             This printer driver is supporting the following printers.

     

       109
       109
       +
       

     

       110
       110
       +
             Epson Stylus Office BX925

     

       111
       111
       +
             Epson WorkForce 840

     

       112
       112
       +
       

     

       113
       113
       +
             To use the driver adjust your configuration.nix file:

     

       114
       114
       +
             ```nix

     

       115
       115
       +
             {

     

       116
       116
       +
               services.printing = {

     

       117
       117
       +
                 enable = true;

     

       118
       118
       +
                 drivers = [ pkgs.epson-inkjet-printer-workforce-840-series ];

     

       119
       119
       +
               };

     

       120
       120
       +
             }

     

       121
       121
       +
             ```

     

       122
       122
       +
           '';

     

       123
       123
       +
           downloadPage = "http://download.ebz.epson.net/dsc/du/02/DriverDownloadInfo.do?LG2=EN&CN2=&DSCMI=16839&DSCCHK=3d7bc6bdfca08006abfb859fb1967183156a7252";

     

       124
       124
       +
           license = with lib.licenses; [

     

       125
       125
       +
             lgpl21

     

       126
       126
       +
             epson

     

       127
       127
       +
           ];

     

       128
       128
       +
           maintainers = with lib.maintainers; [ heichro ];

     

       129
       129
       +
           platforms = [ "x86_64-linux" ];

     

       130
       130
       +
         };

     

       131
       131
       +
       })

+12 -2

pkgs/by-name/gg/gg-jj/package.nix

···

       33
       33
        
         cargoHash = "sha256-AdatJNDqIoRHfaf81iFhOs2JGLIxy7agFJj96bFPj00=";

     

       34
       34
        
       

     

       35
       35
        
         npmDeps = fetchNpmDeps {

     

       36
       36
       -
           inherit (finalAttrs) pname version src;

     

       37
       37
       -
           hash = "sha256-izCl3pE15ocEGYOYCUR1iTR+82nDB06Ed4YOGRGByfI=";

     

       36
       36
       +
           inherit (finalAttrs)

     

       37
       37
       +
             pname

     

       38
       38
       +
             version

     

       39
       39
       +
             src

     

       40
       40
       +
             patches

     

       41
       41
       +
             ;

     

       42
       42
       +
           hash = "sha256-ehXGLpCCN+BNqtwjEatcfR0kQHj5WOofTDR5mLSVW0U=";

     

       38
       43
        
         };

     

       44
       44
       +
       

     

       45
       45
       +
         patches = [

     

       46
       46
       +
           # Remove after https://github.com/gulbanana/gg/pull/68 is released

     

       47
       47
       +
           ./update-tauri-npm-to-match-cargo.patch

     

       48
       48
       +
         ];

     

       39
       49
        
       

     

       40
       50
        
         nativeBuildInputs = [

     

       41
       51
        
           cargo-tauri.hook

+81

pkgs/by-name/gg/gg-jj/update-tauri-npm-to-match-cargo.patch

···

       1
       1
       +
       From 627de4bd148229a1feb327262b9f0b2a75077ed3 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Mitchell Skaggs <skaggsm333@gmail.com>

     

       3
       3
       +
       Date: Mon, 1 Sep 2025 19:02:19 -0500

     

       4
       4
       +
       Subject: [PATCH] update `@tauri-apps/api` and `@tauri-apps/plugin-shell` to

     

       5
       5
       +
        match Cargo versions

     

       6
       6
       +
       

     

       7
       7
       +
       In Tauri *CLI* versions >=2.8.0, the build fails if NPM and Cargo versions

     

       8
       8
       +
       are not aligned. This is not a new requirement, this merely verifies an

     

       9
       9
       +
       existing requirement. The CLI version in Nixpkgs was updated and now

     

       10
       10
       +
       detects this already-existing error.

     

       11
       11
       +
       

     

       12
       12
       +
       This pulls the NPM versions up to match the existing Cargo versions

     

       13
       13
       +
       without touching any other dependencies.

     

       14
       14
       +
       ---

     

       15
       15
       +
        package-lock.json | 18 +++++++++---------

     

       16
       16
       +
        package.json      |  4 ++--

     

       17
       17
       +
        2 files changed, 11 insertions(+), 11 deletions(-)

     

       18
       18
       +
       

     

       19
       19
       +
       diff --git a/package-lock.json b/package-lock.json

     

       20
       20
       +
       index 3affe19..ebe27e7 100644

     

       21
       21
       +
       --- a/package-lock.json

     

       22
       22
       +
       +++ b/package-lock.json

     

       23
       23
       +
       @@ -9,8 +9,8 @@

     

       24
       24
       +
              "version": "0.29.0",

     

       25
       25
       +
              "dependencies": {

     

       26
       26
       +
                "@catppuccin/palette": "^1.0.3",

     

       27
       27
       +
       -        "@tauri-apps/api": "^2.0.0-beta.0",

     

       28
       28
       +
       -        "@tauri-apps/plugin-shell": "^2.0.0-beta.0",

     

       29
       29
       +
       +        "@tauri-apps/api": "^2.4.1",

     

       30
       30
       +
       +        "@tauri-apps/plugin-shell": "2.2.1",

     

       31
       31
       +
                "feather-icons": "^4.29.1",

     

       32
       32
       +
                "modern-normalize": "^2.0.0"

     

       33
       33
       +
              },

     

       34
       34
       +
       @@ -793,9 +793,9 @@

     

       35
       35
       +
              }

     

       36
       36
       +
            },

     

       37
       37
       +
            "node_modules/@tauri-apps/api": {

     

       38
       38
       +
       -      "version": "2.1.1",

     

       39
       39
       +
       -      "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.1.1.tgz",

     

       40
       40
       +
       -      "integrity": "sha512-fzUfFFKo4lknXGJq8qrCidkUcKcH2UHhfaaCNt4GzgzGaW2iS26uFOg4tS3H4P8D6ZEeUxtiD5z0nwFF0UN30A==",

     

       41
       41
       +
       +      "version": "2.4.1",

     

       42
       42
       +
       +      "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.4.1.tgz",

     

       43
       43
       +
       +      "integrity": "sha512-5sYwZCSJb6PBGbBL4kt7CnE5HHbBqwH+ovmOW6ZVju3nX4E3JX6tt2kRklFEH7xMOIwR0btRkZktuLhKvyEQYg==",

     

       44
       44
       +
              "license": "Apache-2.0 OR MIT",

     

       45
       45
       +
              "funding": {

     

       46
       46
       +
                "type": "opencollective",

     

       47
       47
       +
       @@ -1002,9 +1002,9 @@

     

       48
       48
       +
              }

     

       49
       49
       +
            },

     

       50
       50
       +
            "node_modules/@tauri-apps/plugin-shell": {

     

       51
       51
       +
       -      "version": "2.0.1",

     

       52
       52
       +
       -      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-shell/-/plugin-shell-2.0.1.tgz",

     

       53
       53
       +
       -      "integrity": "sha512-akU1b77sw3qHiynrK0s930y8zKmcdrSD60htjH+mFZqv5WaakZA/XxHR3/sF1nNv9Mgmt/Shls37HwnOr00aSw==",

     

       54
       54
       +
       +      "version": "2.2.1",

     

       55
       55
       +
       +      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-shell/-/plugin-shell-2.2.1.tgz",

     

       56
       56
       +
       +      "integrity": "sha512-G1GFYyWe/KlCsymuLiNImUgC8zGY0tI0Y3p8JgBCWduR5IEXlIJS+JuG1qtveitwYXlfJrsExt3enhv5l2/yhA==",

     

       57
       57
       +
              "license": "MIT OR Apache-2.0",

     

       58
       58
       +
              "dependencies": {

     

       59
       59
       +
                "@tauri-apps/api": "^2.0.0"

     

       60
       60
       +
       @@ -2054,4 +2054,4 @@

     

       61
       61
       +
              "license": "ISC"

     

       62
       62
       +
            }

     

       63
       63
       +
          }

     

       64
       64
       +
       -}

     

       65
       65
       +
       \ No newline at end of file

     

       66
       66
       +
       +}

     

       67
       67
       +
       diff --git a/package.json b/package.json

     

       68
       68
       +
       index 6000620..9d61871 100644

     

       69
       69
       +
       --- a/package.json

     

       70
       70
       +
       +++ b/package.json

     

       71
       71
       +
       @@ -14,8 +14,8 @@

     

       72
       72
       +
          },

     

       73
       73
       +
          "dependencies": {

     

       74
       74
       +
            "@catppuccin/palette": "^1.0.3",

     

       75
       75
       +
       -    "@tauri-apps/api": "^2.0.0-beta.0",

     

       76
       76
       +
       -    "@tauri-apps/plugin-shell": "^2.0.0-beta.0",

     

       77
       77
       +
       +    "@tauri-apps/api": "^2.4.1",

     

       78
       78
       +
       +    "@tauri-apps/plugin-shell": "2.2.1",

     

       79
       79
       +
            "feather-icons": "^4.29.1",

     

       80
       80
       +
            "modern-normalize": "^2.0.0"

     

       81
       81
       +
          },

+73

pkgs/by-name/gl/globus-cli/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         fetchFromGitHub,

     

       4
       4
       +
         python3Packages,

     

       5
       5
       +
         installShellFiles,

     

       6
       6
       +
         versionCheckHook,

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       python3Packages.buildPythonApplication rec {

     

       10
       10
       +
         pname = "globus-cli";

     

       11
       11
       +
         version = "3.36.0";

     

       12
       12
       +
         pyproject = true;

     

       13
       13
       +
       

     

       14
       14
       +
         src = fetchFromGitHub {

     

       15
       15
       +
           owner = "globus";

     

       16
       16
       +
           repo = "globus-cli";

     

       17
       17
       +
           tag = version;

     

       18
       18
       +
           hash = "sha256-Phu7nXMICSBFUX8wfzwA4ORBJIkhTDCMCqTyZvcG93c=";

     

       19
       19
       +
         };

     

       20
       20
       +
       

     

       21
       21
       +
         build-system = with python3Packages; [

     

       22
       22
       +
           setuptools

     

       23
       23
       +
           ruamel-yaml

     

       24
       24
       +
         ];

     

       25
       25
       +
       

     

       26
       26
       +
         dependencies = with python3Packages; [

     

       27
       27
       +
           globus-sdk

     

       28
       28
       +
           click

     

       29
       29
       +
           jmespath

     

       30
       30
       +
           packaging

     

       31
       31
       +
           typing-extensions

     

       32
       32
       +
           requests

     

       33
       33
       +
         ];

     

       34
       34
       +
       

     

       35
       35
       +
         nativeBuildInputs = [ installShellFiles ];

     

       36
       36
       +
       

     

       37
       37
       +
         nativeCheckInputs = with python3Packages; [

     

       38
       38
       +
           pytest

     

       39
       39
       +
           pytest-xdist

     

       40
       40
       +
           pytest-timeout

     

       41
       41
       +
           responses

     

       42
       42
       +
       

     

       43
       43
       +
           click

     

       44
       44
       +
           requests

     

       45
       45
       +
           pyjwt

     

       46
       46
       +
           cryptography

     

       47
       47
       +
           packaging

     

       48
       48
       +
           typing-extensions

     

       49
       49
       +
       

     

       50
       50
       +
           pytestCheckHook

     

       51
       51
       +
           versionCheckHook

     

       52
       52
       +
         ];

     

       53
       53
       +
       

     

       54
       54
       +
         versionCheckProgramArg = "version";

     

       55
       55
       +
       

     

       56
       56
       +
         postInstall = ''

     

       57
       57
       +
           mkdir -p completions/{bash,zsh}

     

       58
       58
       +
           $out/bin/globus --bash-completer > completions/bash/globus

     

       59
       59
       +
           $out/bin/globus --zsh-completer > completions/zsh/_globus

     

       60
       60
       +
           installShellCompletion \

     

       61
       61
       +
             --bash completions/bash/globus \

     

       62
       62
       +
             --zsh completions/zsh/_globus

     

       63
       63
       +
         '';

     

       64
       64
       +
       

     

       65
       65
       +
         meta = {

     

       66
       66
       +
           mainProgram = "globus";

     

       67
       67
       +
           description = "Command-line interface to Globus REST APIs, including the Transfer API and the Globus Auth API";

     

       68
       68
       +
           homepage = "https://github.com/globus/globus-cli";

     

       69
       69
       +
           changelog = "https://github.com/globus/globus-cli/releases/tag/${src.tag}";

     

       70
       70
       +
           license = lib.licenses.asl20;

     

       71
       71
       +
           maintainers = [ lib.maintainers.richardjacton ];

     

       72
       72
       +
         };

     

       73
       73
       +
       }

+2 -2

pkgs/by-name/gr/grav/package.nix

···

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
        
       let

     

       9
       9
       -
         version = "1.7.49.2";

     

       9
       9
       +
         version = "1.7.49.4";

     

       10
       10
        
       in

     

       11
       11
        
       stdenvNoCC.mkDerivation {

     

       12
       12
        
         pname = "grav";

     
···

       14
       14
        
       

     

       15
       15
        
         src = fetchzip {

     

       16
       16
        
           url = "https://github.com/getgrav/grav/releases/download/${version}/grav-admin-v${version}.zip";

     

       17
       17
       -
           hash = "sha256-Yu7uFoim12pe4OT/dSsQVcZ6nyYGKWLJbsfLFtI05Z8=";

     

       17
       17
       +
           hash = "sha256-ZOhZ5O5s8P4nqjSsLEu4RpyTfZ34YBi0itETwcRdIPQ=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         patches = [

pkgs/by-name/gr/grub2_pvgrub_image/configs/grub-bootstrap.cfg pkgs/by-name/gr/grub2_pvhgrub_image/configs/grub-bootstrap.cfg

pkgs/by-name/gr/grub2_pvgrub_image/configs/grub.cfg pkgs/by-name/gr/grub2_pvhgrub_image/configs/grub.cfg

-54

pkgs/by-name/gr/grub2_pvgrub_image/package.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         stdenv,

     

       4
       4
       -
         grub2_xen,

     

       5
       5
       -
       }:

     

       6
       6
       -
       

     

       7
       7
       -
       let

     

       8
       8
       -
         efiSystemsBuild = {

     

       9
       9
       -
           i686-linux.target = "i386";

     

       10
       10
       -
           x86_64-linux.target = "x86_64";

     

       11
       11
       -
           armv7l-linux.target = "arm";

     

       12
       12
       -
           aarch64-linux.target = "aarch64";

     

       13
       13
       -
           riscv32-linux.target = "riscv32";

     

       14
       14
       -
           riscv64-linux.target = "riscv64";

     

       15
       15
       -
         };

     

       16
       16
       -
       

     

       17
       17
       -
       in

     

       18
       18
       -
       (

     

       19
       19
       -
       

     

       20
       20
       -
         stdenv.mkDerivation rec {

     

       21
       21
       -
           name = "pvgrub-image";

     

       22
       22
       -
       

     

       23
       23
       -
           configs = ./configs;

     

       24
       24
       -
       

     

       25
       25
       -
           buildInputs = [ grub2_xen ];

     

       26
       26
       -
       

     

       27
       27
       -
           buildCommand = ''

     

       28
       28
       -
             cp "${configs}"/* .

     

       29
       29
       -
             tar -cf memdisk.tar grub.cfg

     

       30
       30
       -
             # We include all modules except all_video.mod as otherwise grub will fail printing "no symbol table"

     

       31
       31
       -
             # if we include it.

     

       32
       32
       -
             grub-mkimage -O "${

     

       33
       33
       -
               efiSystemsBuild.${stdenv.hostPlatform.system}.target

     

       34
       34
       -
             }-xen" -c grub-bootstrap.cfg \

     

       35
       35
       -
               -m memdisk.tar -o "grub-${efiSystemsBuild.${stdenv.hostPlatform.system}.target}-xen.bin" \

     

       36
       36
       -
               $(ls "${grub2_xen}/lib/grub/${

     

       37
       37
       -
                 efiSystemsBuild.${stdenv.hostPlatform.system}.target

     

       38
       38
       -
               }-xen/" |grep 'mod''$'|grep -v '^all_video\.mod''$')

     

       39
       39
       -
             mkdir -p "$out/lib/grub-xen"

     

       40
       40
       -
             cp "grub-${efiSystemsBuild.${stdenv.hostPlatform.system}.target}-xen.bin" $out/lib/grub-xen/

     

       41
       41
       -
           '';

     

       42
       42
       -
       

     

       43
       43
       -
           meta = with lib; {

     

       44
       44
       -
             description = "PvGrub image for use for booting PV Xen guests";

     

       45
       45
       -
       

     

       46
       46
       -
             longDescription = ''

     

       47
       47
       -
               This package provides a PvGrub image for booting Para-Virtualized (PV)

     

       48
       48
       -
               Xen guests

     

       49
       49
       -
             '';

     

       50
       50
       -
       

     

       51
       51
       -
             platforms = platforms.gnu ++ platforms.linux;

     

       52
       52
       -
           };

     

       53
       53
       -
         }

     

       54
       54
       -
       )

+83

pkgs/by-name/gr/grub2_pvhgrub_image/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         stdenv,

     

       4
       4
       +
         grub2_xen,

     

       5
       5
       +
         grub2_xen_pvh,

     

       6
       6
       +
         grubPlatform ? "xen_pvh",

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       assert lib.assertOneOf "grubPlatform" grubPlatform [

     

       10
       10
       +
         "xen"

     

       11
       11
       +
         "xen_pvh"

     

       12
       12
       +
       ];

     

       13
       13
       +
       let

     

       14
       14
       +
         targets = {

     

       15
       15
       +
           i686-linux.target = "i386";

     

       16
       16
       +
           x86_64-linux.target = if grubPlatform == "xen_pvh" then "i386" else "x86_64";

     

       17
       17
       +
         };

     

       18
       18
       +
       in

     

       19
       19
       +
       stdenv.mkDerivation {

     

       20
       20
       +
         name = "grub2_${grubPlatform}_image";

     

       21
       21
       +
       

     

       22
       22
       +
         env = {

     

       23
       23
       +
           GRUB_CONFIGS = "${./configs}";

     

       24
       24
       +
           GRUB_FORMAT = "${targets.${stdenv.buildPlatform.system}.target}-${grubPlatform}";

     

       25
       25
       +
         };

     

       26
       26
       +
       

     

       27
       27
       +
         buildInputs =

     

       28
       28
       +
           lib.optional (grubPlatform == "xen") grub2_xen

     

       29
       29
       +
           ++ lib.optional (grubPlatform == "xen_pvh") grub2_xen_pvh;

     

       30
       30
       +
       

     

       31
       31
       +
         dontUnpack = true;

     

       32
       32
       +
       

     

       33
       33
       +
         buildPhase = ''

     

       34
       34
       +
           cp "$GRUB_CONFIGS"/* .

     

       35
       35
       +
           tar -cf memdisk.tar grub.cfg

     

       36
       36
       +
           grub-mkimage \

     

       37
       37
       +
             -O "$GRUB_FORMAT" \

     

       38
       38
       +
             -c grub-bootstrap.cfg \

     

       39
       39
       +
             -m memdisk.tar \

     

       40
       40
       +
             -o grub-"$GRUB_FORMAT".bin \

     

       41
       41
       +
             ${if grubPlatform == "xen_pvh" then grub2_xen_pvh else grub2_xen}/lib/grub/"$GRUB_FORMAT"/*.mod

     

       42
       42
       +
         '';

     

       43
       43
       +
       

     

       44
       44
       +
         installPhase = ''

     

       45
       45
       +
           mkdir -p "$out/lib/grub-${grubPlatform}"

     

       46
       46
       +
           cp grub-"$GRUB_FORMAT".bin $out/lib/grub-${grubPlatform}/

     

       47
       47
       +
         '';

     

       48
       48
       +
       

     

       49
       49
       +
         dontFixup = true;

     

       50
       50
       +
       

     

       51
       51
       +
         meta = {

     

       52
       52
       +
           description = "PvGrub2 image for booting ${

     

       53
       53
       +
             if grubPlatform == "xen_pvh" then "PVH" else "PV"

     

       54
       54
       +
           } Xen guests";

     

       55
       55
       +
       

     

       56
       56
       +
           longDescription =

     

       57
       57
       +
             if (grubPlatform == "xen_pvh") then

     

       58
       58
       +
               ''

     

       59
       59
       +
                 This package provides a prebuilt PvGrub2 image for booting PVH Xen

     

       60
       60
       +
                 guests (also commonly referred to as PvhGrub2), which searches for

     

       61
       61
       +
                 `grub.cfg` on the guest disk and interprets it to load the kernel,

     

       62
       62
       +
                 eliminating the need to copy the guest kernel to the Dom0.

     

       63
       63
       +
       

     

       64
       64
       +
                 You will need `pkgs.grub2_xen_pvh` to build a customized PvhGrub2

     

       65
       65
       +
                 image. See [PvGrub2](https://wiki.xenproject.org/wiki/PvGrub2) for

     

       66
       66
       +
                 more explanations.

     

       67
       67
       +
               ''

     

       68
       68
       +
             else

     

       69
       69
       +
               ''

     

       70
       70
       +
                 This package provides a prebuilt PvGrub2 image for booting PV Xen

     

       71
       71
       +
                 guests, which searches for `grub.cfg` on the guest disk and interprets

     

       72
       72
       +
                 it to load the kernel, eliminating the need to copy the guest kernel

     

       73
       73
       +
                 to the Dom0.

     

       74
       74
       +
       

     

       75
       75
       +
                 You will need `pkgs.grub2_xen` to build a customized PvGrub2 image.

     

       76
       76
       +
                 See [PvGrub2](https://wiki.xenproject.org/wiki/PvGrub2) for more

     

       77
       77
       +
                 explanations.

     

       78
       78
       +
               '';

     

       79
       79
       +
       

     

       80
       80
       +
           teams = [ lib.teams.xen ];

     

       81
       81
       +
           platforms = lib.attrNames targets;

     

       82
       82
       +
         };

     

       83
       83
       +
       }

+2 -2

pkgs/by-name/ho/hotspot/package.nix

···

       10
       10
        
         kddockwidgets,

     

       11
       11
        
         kdePackages,

     

       12
       12
        
         libelf,

     

       13
       13
       -
         linuxPackages,

     

       13
       13
       +
         perf,

     

       14
       14
        
         qt6,

     

       15
       15
        
         rustc-demangle,

     

       16
       16
        
         zstd,

     
···

       74
       74
        
         qtWrapperArgs = [

     

       75
       75
        
           "--suffix PATH : ${

     

       76
       76
        
             lib.makeBinPath [

     

       77
       77
       -
               linuxPackages.perf

     

       77
       77
       +
               perf

     

       78
       78
        
               binutils

     

       79
       79
        
             ]

     

       80
       80
        
           }"

+62

pkgs/by-name/ma/mado/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         rustPlatform,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         pkg-config,

     

       6
       6
       +
         installShellFiles,

     

       7
       7
       +
         oniguruma,

     

       8
       8
       +
         rust-jemalloc-sys,

     

       9
       9
       +
         stdenv,

     

       10
       10
       +
       }:

     

       11
       11
       +
       rustPlatform.buildRustPackage (finalAttrs: {

     

       12
       12
       +
         pname = "mado";

     

       13
       13
       +
         version = "0.3.0";

     

       14
       14
       +
       

     

       15
       15
       +
         src = fetchFromGitHub {

     

       16
       16
       +
           owner = "akiomik";

     

       17
       17
       +
           repo = "mado";

     

       18
       18
       +
           tag = "v${finalAttrs.version}";

     

       19
       19
       +
           hash = "sha256-wAuV4w0dKfUbJVLTdp59/u4y13SPy3wkRfTlpvyE/zY=";

     

       20
       20
       +
         };

     

       21
       21
       +
       

     

       22
       22
       +
         cargoHash = "sha256-fkalUnPkjjzhLaACh+WQP4tG5VzZ7wmrh5T1DVgSDwM=";

     

       23
       23
       +
       

     

       24
       24
       +
         nativeBuildInputs = [

     

       25
       25
       +
           pkg-config

     

       26
       26
       +
           installShellFiles

     

       27
       27
       +
         ];

     

       28
       28
       +
       

     

       29
       29
       +
         buildInputs = [

     

       30
       30
       +
           oniguruma

     

       31
       31
       +
           rust-jemalloc-sys

     

       32
       32
       +
         ];

     

       33
       33
       +
       

     

       34
       34
       +
         env = {

     

       35
       35
       +
           RUSTONIG_SYSTEM_LIBONIG = true;

     

       36
       36
       +
         };

     

       37
       37
       +
       

     

       38
       38
       +
         postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''

     

       39
       39
       +
           installShellCompletion --cmd mado \

     

       40
       40
       +
             --bash <($out/bin/mado generate-shell-completion bash) \

     

       41
       41
       +
             --zsh <($out/bin/mado generate-shell-completion zsh) \

     

       42
       42
       +
             --fish <($out/bin/mado generate-shell-completion fish)

     

       43
       43
       +
         '';

     

       44
       44
       +
       

     

       45
       45
       +
         checkFlags = [

     

       46
       46
       +
           #   # seem to be slightly broken inside of the build sandbox

     

       47
       47
       +
           "--skip=check_empty_stdin_with_file"

     

       48
       48
       +
           "--skip=check_stdin"

     

       49
       49
       +
           "--skip=check_stdin_with_file"

     

       50
       50
       +
           "--skip=generate_shell_completion_invalid"

     

       51
       51
       +
           "--skip=unknown_command"

     

       52
       52
       +
         ];

     

       53
       53
       +
       

     

       54
       54
       +
         meta = {

     

       55
       55
       +
           description = "Markdown linter written in Rust";

     

       56
       56
       +
           homepage = "https://github.com/akiomik/mado";

     

       57
       57
       +
           changelog = "https://github.com/akiomik/mado/blob/v${finalAttrs.version}/CHANGELOG.md";

     

       58
       58
       +
           license = lib.licenses.asl20;

     

       59
       59
       +
           maintainers = with lib.maintainers; [ jasonxue1 ];

     

       60
       60
       +
           mainProgram = "mado";

     

       61
       61
       +
         };

     

       62
       62
       +
       })

+3 -3

pkgs/by-name/md/mdbook-i18n-helpers/package.nix

···

       6
       6
        
       

     

       7
       7
        
       rustPlatform.buildRustPackage rec {

     

       8
       8
        
         pname = "mdbook-i18n-helpers";

     

       9
       9
       -
         version = "0.3.5";

     

       9
       9
       +
         version = "0.3.6";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "google";

     

       13
       13
        
           repo = "mdbook-i18n-helpers";

     

       14
       14
        
           # TODO fix once upstream uses semver for tags again

     

       15
       15
        
           tag = "mdbook-i18n-helpers-${version}";

     

       16
       16
       -
           hash = "sha256-FdguzuYpMl6i1dvoPNE1Bk+GTmeTrqLUY/sVRsbETtU=";

     

       16
       16
       +
           hash = "sha256-9sJ9FK85UzY3ggh3h1fipbh0LraTvQJ0ZfhSGcahiDM=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         cargoHash = "sha256-ZBGMfJA2diPvvoIXPosUs4ngXU9/GMGa4GAlKIjwm8s=";

     

       19
       19
       +
         cargoHash = "sha256-ZinW9UFp03LXtk+9vuSNojVZtaA7uBlrpdapY48nZdY=";

     

       20
       20
        
       

     

       21
       21
        
         meta = {

     

       22
       22
        
           description = "Helpers for a mdbook i18n workflow based on Gettext";

+3 -2

pkgs/by-name/op/opencode/package.nix

···

       22
       22
        
       in

     

       23
       23
        
       stdenvNoCC.mkDerivation (finalAttrs: {

     

       24
       24
        
         pname = "opencode";

     

       25
       25
       -
         version = "0.6.3";

     

       25
       25
       +
         version = "0.6.4";

     

       26
       26
        
         src = fetchFromGitHub {

     

       27
       27
        
           owner = "sst";

     

       28
       28
        
           repo = "opencode";

     

       29
       29
        
           tag = "v${finalAttrs.version}";

     

       30
       30
       -
           hash = "sha256-hufgCO3g0WZT4+hX1lqmhvrthFO30c0NS3ryNJMmOxo=";

     

       30
       30
       +
           hash = "sha256-o7SzDGbWgCh8cMNK+PeLxAw0bQMKFouHdedUslpA6gw=";

     

       31
       31
        
         };

     

       32
       32
        
       

     

       33
       33
        
         tui = buildGoModule {

     
···

       135
       135
        
             --define OPENCODE_TUI_PATH="'${finalAttrs.tui}/bin/tui'" \

     

       136
       136
        
             --define OPENCODE_VERSION="'${finalAttrs.version}'" \

     

       137
       137
        
             --compile \

     

       138
       138
       +
             --compile-exec-argv="--" \

     

       138
       139
        
             --target=${bun-target.${stdenvNoCC.hostPlatform.system}} \

     

       139
       140
        
             --outfile=opencode \

     

       140
       141
        
             ./packages/opencode/src/index.ts \

+2 -2

pkgs/by-name/op/openlinkhub/package.nix

···

       9
       9
        
       

     

       10
       10
        
       buildGoModule rec {

     

       11
       11
        
         pname = "openlinkhub";

     

       12
       12
       -
         version = "0.6.1";

     

       12
       12
       +
         version = "0.6.2";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "jurkovic-nikola";

     

       16
       16
        
           repo = "OpenLinkHub";

     

       17
       17
        
           tag = version;

     

       18
       18
       -
           hash = "sha256-kEbJwCAs2gTNs0z8A3kOl1O4HQ4L5+urTo+hLh6vOPM=";

     

       18
       18
       +
           hash = "sha256-fmWfHJ6alB+UlHlUrwMQ/npv7SuMjAz5hT0UGhB7O/E=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         proxyVendor = true;

+3 -3

pkgs/by-name/po/postgres-lsp/package.nix

···

       6
       6
        
       }:

     

       7
       7
        
       rustPlatform.buildRustPackage (finalAttrs: {

     

       8
       8
        
         pname = "postgres-lsp";

     

       9
       9
       -
         version = "0.10.0";

     

       9
       9
       +
         version = "0.13.0";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "supabase-community";

     

       13
       13
        
           repo = "postgres-language-server";

     

       14
       14
        
           tag = finalAttrs.version;

     

       15
       15
       -
           hash = "sha256-RwUX5EXRyvmC8LCnlQQIbqnLGn7XYXjLsI9UurCAThs=";

     

       15
       15
       +
           hash = "sha256-0Q8MxKeh12STWIJ9441uTz+qQXEJjCESj21C4X8CBC4=";

     

       16
       16
        
           fetchSubmodules = true;

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         cargoHash = "sha256-qs/M9+iZCx75wv+UcRRH4hjEuNDsnJYKAvnd0DNaRQ8=";

     

       19
       19
       +
         cargoHash = "sha256-oIbS5BUpNOXwiRconqJI/jdXeX05FIZVNl2kYt+79wY=";

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [

     

       22
       22
        
           rustPlatform.bindgenHook

pkgs/by-name/ra/ramalama/package.nix

···

       71
       71
        
           python3.pkgs.pytestCheckHook

     

       72
       72
        
         ];

     

       73
       73
        
       

     

       74
       74
       +
         # Enable when https://github.com/containers/ramalama/pull/1891 is released

     

       75
       75
       +
         disabledTests = [

     

       76
       76
       +
           "test_ollama_model_pull"

     

       77
       77
       +
         ];

     

       78
       78
       +
       

     

       74
       79
        
         passthru = {

     

       75
       80
        
           tests = {

     

       76
       81
        
             withoutPodman = ramalama.override {

+5 -1

pkgs/by-name/re/refind/package.nix

···

       163
       163
        
       

     

       164
       164
        
         passthru.tests = {

     

       165
       165
        
           uefiCdrom = nixosTests.boot.uefiCdrom;

     

       166
       166
       +
           inherit (nixosTests) refind;

     

       166
       167
        
         };

     

       167
       168
        
       

     

       168
       169
        
         meta = with lib; {

     
···

       183
       184
        
             Linux kernels that provide EFI stub support.

     

       184
       185
        
           '';

     

       185
       186
        
           homepage = "http://refind.sourceforge.net/";

     

       186
       186
       -
           maintainers = with maintainers; [ johnrtitor ];

     

       187
       187
       +
           maintainers = with maintainers; [

     

       188
       188
       +
             johnrtitor

     

       189
       189
       +
             RossComputerGuy

     

       190
       190
       +
           ];

     

       187
       191
        
           platforms = [

     

       188
       192
        
             "i686-linux"

     

       189
       193
        
             "x86_64-linux"

+3 -3

pkgs/by-name/re/repomix/package.nix

···

       8
       8
        
       

     

       9
       9
        
       buildNpmPackage rec {

     

       10
       10
        
         pname = "repomix";

     

       11
       11
       -
         version = "1.3.0";

     

       11
       11
       +
         version = "1.4.2";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "yamadashy";

     

       15
       15
        
           repo = "repomix";

     

       16
       16
        
           tag = "v${version}";

     

       17
       17
       -
           hash = "sha256-09neN7sh4TRM+rQBqCQHqW165i6+RY9IF67ft6OgyhI=";

     

       17
       17
       +
           hash = "sha256-65A8HN0Mp8QOEfIjiDZwr/qgWe57XTCdd1eBd3mm9fE=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         npmDepsHash = "sha256-nLxIPwx+zvYCMZ6y9ntbWvrJvO4g5J7Tf9rYk26gyAs=";

     

       20
       20
       +
         npmDepsHash = "sha256-PfElq+C8kazP3OLF5LFAZitIXhVpWdj/fCyH2S7d/zg=";

     

       21
       21
        
       

     

       22
       22
        
         nativeInstallCheckInputs = [ versionCheckHook ];

     

       23
       23
        
         doInstallCheck = true;

+41

pkgs/by-name/sy/systemtap-unwrapped/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         stdenv,

     

       4
       4
       +
         fetchgit,

     

       5
       5
       +
         pkg-config,

     

       6
       6
       +
         gettext,

     

       7
       7
       +
         cpio,

     

       8
       8
       +
         elfutils,

     

       9
       9
       +
         python3,

     

       10
       10
       +
       }:

     

       11
       11
       +
       

     

       12
       12
       +
       stdenv.mkDerivation (finalAttrs: {

     

       13
       13
       +
         pname = "systemtap";

     

       14
       14
       +
         version = "5.2";

     

       15
       15
       +
       

     

       16
       16
       +
         src = fetchgit {

     

       17
       17
       +
           url = "git://sourceware.org/git/systemtap.git";

     

       18
       18
       +
           rev = "release-${finalAttrs.version}";

     

       19
       19
       +
           hash = "sha256-SUPNarZW8vdK9hQaI2kU+rfKWIPiXB4BvJvRNC1T9tU=";

     

       20
       20
       +
         };

     

       21
       21
       +
       

     

       22
       22
       +
         nativeBuildInputs = [

     

       23
       23
       +
           pkg-config

     

       24
       24
       +
           cpio

     

       25
       25
       +
           python3

     

       26
       26
       +
           python3.pkgs.setuptools

     

       27
       27
       +
         ];

     

       28
       28
       +
         buildInputs = [

     

       29
       29
       +
           elfutils

     

       30
       30
       +
           gettext

     

       31
       31
       +
           python3

     

       32
       32
       +
         ];

     

       33
       33
       +
         enableParallelBuilding = true;

     

       34
       34
       +
       

     

       35
       35
       +
         meta = {

     

       36
       36
       +
           homepage = "https://sourceware.org/systemtap/";

     

       37
       37
       +
           description = "Provides a scripting language for instrumentation on a live kernel plus user-space";

     

       38
       38
       +
           license = lib.licenses.gpl2;

     

       39
       39
       +
           platforms = lib.systems.inspect.patterns.isGnu;

     

       40
       40
       +
         };

     

       41
       41
       +
       })

+17

pkgs/by-name/te/tea/package.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         buildGoModule,

     

       4
       4
        
         fetchFromGitea,

     

       5
       5
       +
         installShellFiles,

     

       5
       6
        
       }:

     

       6
       7
        
       

     

       7
       8
        
       buildGoModule rec {

     
···

       28
       29
        
           ];

     

       29
       30
        
           mainProgram = "tea";

     

       30
       31
        
         };

     

       32
       32
       +
       

     

       33
       33
       +
         ldflags = [

     

       34
       34
       +
           "-X code.gitea.io/tea/cmd.Version=${version}"

     

       35
       35
       +
         ];

     

       36
       36
       +
       

     

       37
       37
       +
         nativeBuildInputs = [ installShellFiles ];

     

       38
       38
       +
       

     

       39
       39
       +
         postInstall = ''

     

       40
       40
       +
           installShellCompletion --cmd tea \

     

       41
       41
       +
             --bash <($out/bin/tea completion bash) \

     

       42
       42
       +
             --fish <($out/bin/tea completion fish) \

     

       43
       43
       +
             --zsh <($out/bin/tea completion zsh)

     

       44
       44
       +
       

     

       45
       45
       +
           mkdir $out/share/powershell/ -p

     

       46
       46
       +
           $out/bin/tea completion pwsh > $out/share/powershell/tea.Completion.ps1

     

       47
       47
       +
         '';

     

       31
       48
        
       }

+2 -2

pkgs/by-name/ul/ultrastardx/package.nix

···

       45
       45
        
       in

     

       46
       46
        
       stdenv.mkDerivation rec {

     

       47
       47
        
         pname = "ultrastardx";

     

       48
       48
       -
         version = "2025.8.0";

     

       48
       48
       +
         version = "2025.9.0";

     

       49
       49
        
       

     

       50
       50
        
         src = fetchFromGitHub {

     

       51
       51
        
           owner = "UltraStar-Deluxe";

     

       52
       52
        
           repo = "USDX";

     

       53
       53
        
           rev = "v${version}";

     

       54
       54
       -
           hash = "sha256-rliUJNhvbXbD+ELxwutCoQs6BO1DyJ8J/+mmYHPuvQE=";

     

       54
       54
       +
           hash = "sha256-SQqmcFchXaYNKzQHjBcisZTjAN9TTWuKXv657yWGghw=";

     

       55
       55
        
         };

     

       56
       56
        
       

     

       57
       57
        
         nativeBuildInputs = [

+2 -2

pkgs/by-name/yt/yt-dlp/package.nix

···

       19
       19
        
         # The websites yt-dlp deals with are a very moving target. That means that

     

       20
       20
        
         # downloads break constantly. Because of that, updates should always be backported

     

       21
       21
        
         # to the latest stable release.

     

       22
       22
       -
         version = "2025.08.27";

     

       22
       22
       +
         version = "2025.09.05";

     

       23
       23
        
         pyproject = true;

     

       24
       24
        
       

     

       25
       25
        
         src = fetchFromGitHub {

     

       26
       26
        
           owner = "yt-dlp";

     

       27
       27
        
           repo = "yt-dlp";

     

       28
       28
        
           tag = version;

     

       29
       29
       -
           hash = "sha256-E8++/gK/SpY93UW/9U266Qj1Kkn6CeNou7bKTqpCgFw=";

     

       29
       29
       +
           hash = "sha256-9y6OUVm6hNTTi5FFmd9DHcmAMrvSmDD+4kDe00aMTDI=";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         postPatch = ''

pkgs/development/php-packages/psysh/default.nix pkgs/by-name/ps/psysh/package.nix

pkgs/development/python-modules/lm-eval/default.nix

···

       136
       136
        
           # zeno, gptqmodel, japanese_leaderboard; all = [...];

     

       137
       137
        
         };

     

       138
       138
        
       

     

       139
       139
       +
         pythonRelaxDeps = [ "datasets" ];

     

       140
       140
       +
       

     

       139
       141
        
         pythonImportsCheck = [ "lm_eval" ];

     

       140
       142
        
       

     

       141
       143
        
         nativeCheckInputs = [

-7

pkgs/development/tools/build-managers/bazel/README.md

···

       1
       1
       -
       # The Bazel build tool

     

       2
       2
       -
       

     

       3
       3
       -
       https://bazel.build/

     

       4
       4
       -
       

     

       5
       5
       -
       The bazel tool requires regular maintenance, especially under darwin, so we created a maintainers team.

     

       6
       6
       -
       

     

       7
       7
       -
       Please ping @NixOS/bazel in your github PR/issue to increase your chance of a quick turnaround, thanks!

-52

pkgs/development/tools/build-managers/bazel/bash-tools-test.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         writeText,

     

       3
       3
       -
         bazel,

     

       4
       4
       -
         runLocal,

     

       5
       5
       -
         bazelTest,

     

       6
       6
       -
         distDir,

     

       7
       7
       -
         extraBazelArgs ? "",

     

       8
       8
       -
       }:

     

       9
       9
       -
       

     

       10
       10
       -
       # Tests that certain executables are available in bazel-executed bash shells.

     

       11
       11
       -
       

     

       12
       12
       -
       let

     

       13
       13
       -
         WORKSPACE = writeText "WORKSPACE" ''

     

       14
       14
       -
           workspace(name = "our_workspace")

     

       15
       15
       -
         '';

     

       16
       16
       -
       

     

       17
       17
       -
         fileIn = writeText "input.txt" ''

     

       18
       18
       -
           one

     

       19
       19
       -
           two

     

       20
       20
       -
           three

     

       21
       21
       -
         '';

     

       22
       22
       -
       

     

       23
       23
       -
         fileBUILD = writeText "BUILD" ''

     

       24
       24
       -
           genrule(

     

       25
       25
       -
             name = "tool_usage",

     

       26
       26
       -
             srcs = [ ":input.txt" ],

     

       27
       27
       -
             outs = [ "output.txt" ],

     

       28
       28
       -
             cmd = "cat $(location :input.txt) | gzip - | gunzip - | awk '/t/' > $@",

     

       29
       29
       -
           )

     

       30
       30
       -
         '';

     

       31
       31
       -
       

     

       32
       32
       -
         workspaceDir = runLocal "our_workspace" { } ''

     

       33
       33
       -
           mkdir $out

     

       34
       34
       -
           cp ${WORKSPACE} $out/WORKSPACE

     

       35
       35
       -
           cp ${fileIn} $out/input.txt

     

       36
       36
       -
           cp ${fileBUILD} $out/BUILD

     

       37
       37
       -
         '';

     

       38
       38
       -
       

     

       39
       39
       -
         testBazel = bazelTest {

     

       40
       40
       -
           name = "bazel-test-bash-tools";

     

       41
       41
       -
           bazelPkg = bazel;

     

       42
       42
       -
           inherit workspaceDir;

     

       43
       43
       -
       

     

       44
       44
       -
           bazelScript = ''

     

       45
       45
       -
             ${bazel}/bin/bazel build :tool_usage --distdir=${distDir} ${extraBazelArgs}

     

       46
       46
       -
             cp bazel-bin/output.txt $out

     

       47
       47
       -
             echo "Testing content" && [ "$(cat $out | wc -l)" == "2" ] && echo "OK"

     

       48
       48
       -
           '';

     

       49
       49
       -
         };

     

       50
       50
       -
       

     

       51
       51
       -
       in

     

       52
       52
       -
       testBazel

pkgs/development/tools/build-managers/bazel/bazel_7/darwin_sleep.patch pkgs/by-name/ba/bazel_7/darwin_sleep.patch

+3 -3

pkgs/development/tools/build-managers/bazel/bazel_7/default.nix pkgs/by-name/ba/bazel_7/package.nix

···

       369
       369
        
           # On Darwin, the last argument to gcc is coming up as an empty string. i.e: ''

     

       370
       370
        
           # This is breaking the build of any C target. This patch removes the last

     

       371
       371
        
           # argument if it's found to be an empty string.

     

       372
       372
       -
           ../trim-last-argument-to-gcc-if-empty.patch

     

       372
       372
       +
           ./trim-last-argument-to-gcc-if-empty.patch

     

       373
       373
        
       

     

       374
       374
        
           # --experimental_strict_action_env (which may one day become the default

     

       375
       375
        
           # see bazelbuild/bazel#2574) hardcodes the default

     
···

       377
       377
        
           # This is non hermetic on non-nixos systems. On NixOS, bazel cannot find the required binaries.

     

       378
       378
        
           # So we are replacing this bazel paths by defaultShellPath,

     

       379
       379
        
           # improving hermeticity and making it work in nixos.

     

       380
       380
       -
           (replaceVars ../strict_action_env.patch {

     

       380
       380
       +
           (replaceVars ./strict_action_env.patch {

     

       381
       381
        
             strictActionEnvPatch = defaultShellPath;

     

       382
       382
        
           })

     

       383
       383
        
       

     

       384
       384
        
           # bazel reads its system bazelrc in /etc

     

       385
       385
        
           # override this path to a builtin one

     

       386
       386
       -
           (replaceVars ../bazel_rc.patch {

     

       386
       386
       +
           (replaceVars ./bazel_rc.patch {

     

       387
       387
        
             bazelSystemBazelRCPath = bazelRC;

     

       388
       388
        
           })

     

       389
       389
        
         ]

pkgs/development/tools/build-managers/bazel/bazel_7/java_toolchain.patch pkgs/by-name/ba/bazel_7/java_toolchain.patch

pkgs/development/tools/build-managers/bazel/bazel_7/nix-build-bazel-package-hacks.patch pkgs/by-name/ba/bazel_7/nix-build-bazel-package-hacks.patch

pkgs/development/tools/build-managers/bazel/bazel_7/test_source_sort.patch pkgs/by-name/ba/bazel_7/test_source_sort.patch

pkgs/development/tools/build-managers/bazel/bazel_7/xcode_locator.patch pkgs/by-name/ba/bazel_7/xcode_locator.patch

pkgs/development/tools/build-managers/bazel/bazel_rc.patch pkgs/by-name/ba/bazel_7/bazel_rc.patch

-62

pkgs/development/tools/build-managers/bazel/cpp-test.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         bazel,

     

       3
       3
       -
         bazelTest,

     

       4
       4
       -
         bazel-examples,

     

       5
       5
       -
         stdenv,

     

       6
       6
       -
         cctools,

     

       7
       7
       -
         darwin,

     

       8
       8
       -
         extraBazelArgs ? "",

     

       9
       9
       -
         lib,

     

       10
       10
       -
         runLocal,

     

       11
       11
       -
         runtimeShell,

     

       12
       12
       -
         writeScript,

     

       13
       13
       -
         distDir,

     

       14
       14
       -
       }:

     

       15
       15
       -
       

     

       16
       16
       -
       let

     

       17
       17
       -
       

     

       18
       18
       -
         toolsBazel = writeScript "bazel" ''

     

       19
       19
       -
           #! ${runtimeShell}

     

       20
       20
       -
       

     

       21
       21
       -
           export CXX='${stdenv.cc}/bin/clang++'

     

       22
       22
       -
           export LD='${cctools}/bin/ld'

     

       23
       23
       -
           export LIBTOOL='${cctools}/bin/libtool'

     

       24
       24
       -
           export CC='${stdenv.cc}/bin/clang'

     

       25
       25
       -
       

     

       26
       26
       -
           # XXX: hack for macosX, this flags disable bazel usage of xcode

     

       27
       27
       -
           # See: https://github.com/bazelbuild/bazel/issues/4231

     

       28
       28
       -
           export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1

     

       29
       29
       -
       

     

       30
       30
       -
           exec "$BAZEL_REAL" "$@"

     

       31
       31
       -
         '';

     

       32
       32
       -
       

     

       33
       33
       -
         workspaceDir = runLocal "our_workspace" { } (

     

       34
       34
       -
           ''

     

       35
       35
       -
             cp -r ${bazel-examples}/cpp-tutorial/stage3 $out

     

       36
       36
       -
             find $out -type d -exec chmod 755 {} \;

     

       37
       37
       -
           ''

     

       38
       38
       -
           + (lib.optionalString stdenv.hostPlatform.isDarwin ''

     

       39
       39
       -
             mkdir $out/tools

     

       40
       40
       -
             cp ${toolsBazel} $out/tools/bazel

     

       41
       41
       -
           '')

     

       42
       42
       -
         );

     

       43
       43
       -
       

     

       44
       44
       -
         testBazel = bazelTest {

     

       45
       45
       -
           name = "${bazel.pname}-test-cpp";

     

       46
       46
       -
           inherit workspaceDir;

     

       47
       47
       -
           bazelPkg = bazel;

     

       48
       48
       -
           bazelScript = ''

     

       49
       49
       -
             ${bazel}/bin/bazel build //... \

     

       50
       50
       -
               --verbose_failures \

     

       51
       51
       -
               --distdir=${distDir} \

     

       52
       52
       -
               --curses=no \

     

       53
       53
       -
               ${extraBazelArgs} \

     

       54
       54
       -
           ''

     

       55
       55
       -
           + lib.optionalString (stdenv.hostPlatform.isDarwin) ''

     

       56
       56
       -
             --cxxopt=-x --cxxopt=c++ --host_cxxopt=-x --host_cxxopt=c++ \

     

       57
       57
       -
             --linkopt=-stdlib=libc++ --host_linkopt=-stdlib=libc++ \

     

       58
       58
       -
           '';

     

       59
       59
       -
         };

     

       60
       60
       -
       

     

       61
       61
       -
       in

     

       62
       62
       -
       testBazel

-73

pkgs/development/tools/build-managers/bazel/java-test.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         bazel,

     

       3
       3
       -
         bazelTest,

     

       4
       4
       -
         bazel-examples,

     

       5
       5
       -
         stdenv,

     

       6
       6
       -
         cctools,

     

       7
       7
       -
         extraBazelArgs ? "",

     

       8
       8
       -
         lib,

     

       9
       9
       -
         openjdk8,

     

       10
       10
       -
         jdk11_headless,

     

       11
       11
       -
         runLocal,

     

       12
       12
       -
         runtimeShell,

     

       13
       13
       -
         writeScript,

     

       14
       14
       -
         writeText,

     

       15
       15
       -
         distDir,

     

       16
       16
       -
       }:

     

       17
       17
       -
       

     

       18
       18
       -
       let

     

       19
       19
       -
       

     

       20
       20
       -
         toolsBazel = writeScript "bazel" ''

     

       21
       21
       -
           #! ${runtimeShell}

     

       22
       22
       -
       

     

       23
       23
       -
           export CXX='${stdenv.cc}/bin/clang++'

     

       24
       24
       -
           export LD='${cctools}/bin/ld'

     

       25
       25
       -
           export LIBTOOL='${cctools}/bin/libtool'

     

       26
       26
       -
           export CC='${stdenv.cc}/bin/clang'

     

       27
       27
       -
       

     

       28
       28
       -
           # XXX: hack for macosX, this flags disable bazel usage of xcode

     

       29
       29
       -
           # See: https://github.com/bazelbuild/bazel/issues/4231

     

       30
       30
       -
           export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1

     

       31
       31
       -
       

     

       32
       32
       -
           exec "$BAZEL_REAL" "$@"

     

       33
       33
       -
         '';

     

       34
       34
       -
       

     

       35
       35
       -
         workspaceDir = runLocal "our_workspace" { } (

     

       36
       36
       -
           ''

     

       37
       37
       -
             cp -r ${bazel-examples}/java-tutorial $out

     

       38
       38
       -
             find $out -type d -exec chmod 755 {} \;

     

       39
       39
       -
           ''

     

       40
       40
       -
           + (lib.optionalString stdenv.hostPlatform.isDarwin ''

     

       41
       41
       -
             mkdir $out/tools

     

       42
       42
       -
             cp ${toolsBazel} $out/tools/bazel

     

       43
       43
       -
           '')

     

       44
       44
       -
         );

     

       45
       45
       -
       

     

       46
       46
       -
         testBazel = bazelTest {

     

       47
       47
       -
           name = "${bazel.pname}-test-java";

     

       48
       48
       -
           inherit workspaceDir;

     

       49
       49
       -
           bazelPkg = bazel;

     

       50
       50
       -
           buildInputs = [

     

       51
       51
       -
             (if lib.strings.versionOlder bazel.version "5.0.0" then openjdk8 else jdk11_headless)

     

       52
       52
       -
           ];

     

       53
       53
       -
           bazelScript = ''

     

       54
       54
       -
             ${bazel}/bin/bazel \

     

       55
       55
       -
               run \

     

       56
       56
       -
               --announce_rc \

     

       57
       57
       -
               ${lib.optionalString (lib.strings.versionOlder "5.0.0" bazel.version) "--toolchain_resolution_debug='@bazel_tools//tools/jdk:(runtime_)?toolchain_type'"} \

     

       58
       58
       -
               --distdir=${distDir} \

     

       59
       59
       -
               --verbose_failures \

     

       60
       60
       -
               --curses=no \

     

       61
       61
       -
               --strict_java_deps=off \

     

       62
       62
       -
               //:ProjectRunner \

     

       63
       63
       -
           ''

     

       64
       64
       -
           + lib.optionalString (lib.strings.versionOlder bazel.version "5.0.0") ''

     

       65
       65
       -
             --host_javabase='@local_jdk//:jdk' \

     

       66
       66
       -
             --java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \

     

       67
       67
       -
             --javabase='@local_jdk//:jdk' \

     

       68
       68
       -
           ''

     

       69
       69
       -
           + extraBazelArgs;

     

       70
       70
       -
         };

     

       71
       71
       -
       

     

       72
       72
       -
       in

     

       73
       73
       -
       testBazel

-194

pkgs/development/tools/build-managers/bazel/protobuf-test.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         bazel,

     

       3
       3
       -
         bazelTest,

     

       4
       4
       -
         fetchFromGitHub,

     

       5
       5
       -
         fetchurl,

     

       6
       6
       -
         stdenv,

     

       7
       7
       -
         cctools,

     

       8
       8
       -
         lib,

     

       9
       9
       -
         openjdk8,

     

       10
       10
       -
         jdk11_headless,

     

       11
       11
       -
         runLocal,

     

       12
       12
       -
         runtimeShell,

     

       13
       13
       -
         writeScript,

     

       14
       14
       -
         writeText,

     

       15
       15
       -
         distDir,

     

       16
       16
       -
       }:

     

       17
       17
       -
       

     

       18
       18
       -
       let

     

       19
       19
       -
         com_google_protobuf = fetchFromGitHub {

     

       20
       20
       -
           owner = "protocolbuffers";

     

       21
       21
       -
           repo = "protobuf";

     

       22
       22
       -
           rev = "v3.13.0";

     

       23
       23
       -
           sha256 = "1nqsvi2yfr93kiwlinz8z7c68ilg1j75b2vcpzxzvripxx5h6xhd";

     

       24
       24
       -
         };

     

       25
       25
       -
       

     

       26
       26
       -
         bazel_skylib = fetchFromGitHub {

     

       27
       27
       -
           owner = "bazelbuild";

     

       28
       28
       -
           repo = "bazel-skylib";

     

       29
       29
       -
           rev = "2ec2e6d715e993d96ad6222770805b5bd25399ae";

     

       30
       30
       -
           sha256 = "1z2r2vx6kj102zvp3j032djyv99ski1x1sl4i3p6mswnzrzna86s";

     

       31
       31
       -
         };

     

       32
       32
       -
       

     

       33
       33
       -
         rules_python = fetchFromGitHub {

     

       34
       34
       -
           owner = "bazelbuild";

     

       35
       35
       -
           repo = "rules_python";

     

       36
       36
       -
           rev = "c8c79aae9aa1b61d199ad03d5fe06338febd0774";

     

       37
       37
       -
           sha256 = "1zn58wv5wcylpi0xj7riw34i1jjpqahanxx8y9srwrv0v93b6pqz";

     

       38
       38
       -
         };

     

       39
       39
       -
       

     

       40
       40
       -
         rules_proto = fetchFromGitHub {

     

       41
       41
       -
           owner = "bazelbuild";

     

       42
       42
       -
           repo = "rules_proto";

     

       43
       43
       -
           rev = "a0761ed101b939e19d83b2da5f59034bffc19c12";

     

       44
       44
       -
           sha256 = "09lqfj5fxm1fywxr5w8pnpqd859gb6751jka9fhxjxjzs33glhqf";

     

       45
       45
       -
         };

     

       46
       46
       -
       

     

       47
       47
       -
         net_zlib = fetchurl rec {

     

       48
       48
       -
           url = "https://zlib.net/zlib-1.2.11.tar.gz";

     

       49
       49
       -
           sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1";

     

       50
       50
       -
       

     

       51
       51
       -
           passthru.sha256 = sha256;

     

       52
       52
       -
         };

     

       53
       53
       -
       

     

       54
       54
       -
         WORKSPACE = writeText "WORKSPACE" ''

     

       55
       55
       -
           workspace(name = "our_workspace")

     

       56
       56
       -
       

     

       57
       57
       -
           load("//:proto-support.bzl", "protobuf_deps")

     

       58
       58
       -
           protobuf_deps()

     

       59
       59
       -
           load("@rules_proto//proto:repositories.bzl", "rules_proto_toolchains")

     

       60
       60
       -
           rules_proto_toolchains()

     

       61
       61
       -
         '';

     

       62
       62
       -
       

     

       63
       63
       -
         protoSupport = writeText "proto-support.bzl" ''

     

       64
       64
       -
           """Load dependencies needed to compile the protobuf library as a 3rd-party consumer."""

     

       65
       65
       -
       

     

       66
       66
       -
           load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

     

       67
       67
       -
       

     

       68
       68
       -
           def protobuf_deps():

     

       69
       69
       -
               """Loads common dependencies needed to compile the protobuf library."""

     

       70
       70
       -
       

     

       71
       71
       -
               if "zlib" not in native.existing_rules():

     

       72
       72
       -
                   # proto_library, cc_proto_library, and java_proto_library rules implicitly

     

       73
       73
       -
                   # depend on @com_google_protobuf for protoc and proto runtimes.

     

       74
       74
       -
                   # This statement defines the @com_google_protobuf repo.

     

       75
       75
       -
                   native.local_repository(

     

       76
       76
       -
                       name = "com_google_protobuf",

     

       77
       77
       -
                       path = "${com_google_protobuf}",

     

       78
       78
       -
                   )

     

       79
       79
       -
                   native.local_repository(

     

       80
       80
       -
                       name = "bazel_skylib",

     

       81
       81
       -
                       path = "${bazel_skylib}",

     

       82
       82
       -
                   )

     

       83
       83
       -
                   native.local_repository(

     

       84
       84
       -
                       name = "rules_proto",

     

       85
       85
       -
                       path = "${rules_proto}",

     

       86
       86
       -
                   )

     

       87
       87
       -
                   native.local_repository(

     

       88
       88
       -
                       name = "rules_python",

     

       89
       89
       -
                       path = "${rules_python}",

     

       90
       90
       -
                   )

     

       91
       91
       -
       

     

       92
       92
       -
                   http_archive(

     

       93
       93
       -
                       name = "zlib",

     

       94
       94
       -
                       build_file = "@com_google_protobuf//:third_party/zlib.BUILD",

     

       95
       95
       -
                       sha256 = "${net_zlib.sha256}",

     

       96
       96
       -
                       strip_prefix = "zlib-1.2.11",

     

       97
       97
       -
                       urls = ["file://${net_zlib}"],

     

       98
       98
       -
                   )

     

       99
       99
       -
         '';

     

       100
       100
       -
       

     

       101
       101
       -
         personProto = writeText "person.proto" ''

     

       102
       102
       -
           syntax = "proto3";

     

       103
       103
       -
       

     

       104
       104
       -
           package person;

     

       105
       105
       -
       

     

       106
       106
       -
           message Person {

     

       107
       107
       -
             string name = 1;

     

       108
       108
       -
             int32 id = 2;

     

       109
       109
       -
             string email = 3;

     

       110
       110
       -
           }

     

       111
       111
       -
         '';

     

       112
       112
       -
       

     

       113
       113
       -
         personBUILD = writeText "BUILD" ''

     

       114
       114
       -
           load("@rules_proto//proto:defs.bzl", "proto_library")

     

       115
       115
       -
       

     

       116
       116
       -
           proto_library(

     

       117
       117
       -
               name = "person_proto",

     

       118
       118
       -
               srcs = ["person.proto"],

     

       119
       119
       -
               visibility = ["//visibility:public"],

     

       120
       120
       -
           )

     

       121
       121
       -
       

     

       122
       122
       -
           java_proto_library(

     

       123
       123
       -
               name = "person_java_proto",

     

       124
       124
       -
               deps = [":person_proto"],

     

       125
       125
       -
           )

     

       126
       126
       -
       

     

       127
       127
       -
           cc_proto_library(

     

       128
       128
       -
               name = "person_cc_proto",

     

       129
       129
       -
               deps = [":person_proto"],

     

       130
       130
       -
           )

     

       131
       131
       -
         '';

     

       132
       132
       -
       

     

       133
       133
       -
         toolsBazel = writeScript "bazel" ''

     

       134
       134
       -
           #! ${runtimeShell}

     

       135
       135
       -
       

     

       136
       136
       -
           export CXX='${stdenv.cc}/bin/clang++'

     

       137
       137
       -
           export LD='${cctools}/bin/ld'

     

       138
       138
       -
           export LIBTOOL='${cctools}/bin/libtool'

     

       139
       139
       -
           export CC='${stdenv.cc}/bin/clang'

     

       140
       140
       -
       

     

       141
       141
       -
           # XXX: hack for macosX, this flags disable bazel usage of xcode

     

       142
       142
       -
           # See: https://github.com/bazelbuild/bazel/issues/4231

     

       143
       143
       -
           export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1

     

       144
       144
       -
       

     

       145
       145
       -
           exec "$BAZEL_REAL" "$@"

     

       146
       146
       -
         '';

     

       147
       147
       -
       

     

       148
       148
       -
         workspaceDir = runLocal "our_workspace" { } (

     

       149
       149
       -
           ''

     

       150
       150
       -
             mkdir $out

     

       151
       151
       -
             cp ${WORKSPACE} $out/WORKSPACE

     

       152
       152
       -
             touch $out/BUILD.bazel

     

       153
       153
       -
             cp ${protoSupport} $out/proto-support.bzl

     

       154
       154
       -
             mkdir $out/person

     

       155
       155
       -
             cp ${personProto} $out/person/person.proto

     

       156
       156
       -
             cp ${personBUILD} $out/person/BUILD.bazel

     

       157
       157
       -
           ''

     

       158
       158
       -
           + (lib.optionalString stdenv.hostPlatform.isDarwin ''

     

       159
       159
       -
             mkdir $out/tools

     

       160
       160
       -
             cp ${toolsBazel} $out/tools/bazel

     

       161
       161
       -
           '')

     

       162
       162
       -
         );

     

       163
       163
       -
       

     

       164
       164
       -
         testBazel = bazelTest {

     

       165
       165
       -
           name = "${bazel.pname}-test-protocol-buffers";

     

       166
       166
       -
           inherit workspaceDir;

     

       167
       167
       -
           bazelPkg = bazel;

     

       168
       168
       -
           buildInputs = [

     

       169
       169
       -
             (if lib.strings.versionOlder bazel.version "5.0.0" then openjdk8 else jdk11_headless)

     

       170
       170
       -
           ];

     

       171
       171
       -
           bazelScript = ''

     

       172
       172
       -
             ${bazel}/bin/bazel \

     

       173
       173
       -
               build \

     

       174
       174
       -
               --distdir=${distDir} \

     

       175
       175
       -
               --verbose_failures \

     

       176
       176
       -
               --curses=no \

     

       177
       177
       -
               --subcommands \

     

       178
       178
       -
               --strict_java_deps=off \

     

       179
       179
       -
               --strict_proto_deps=off \

     

       180
       180
       -
               //... \

     

       181
       181
       -
           ''

     

       182
       182
       -
           + lib.optionalString (lib.strings.versionOlder bazel.version "5.0.0") ''

     

       183
       183
       -
             --host_javabase='@local_jdk//:jdk' \

     

       184
       184
       -
             --java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \

     

       185
       185
       -
             --javabase='@local_jdk//:jdk' \

     

       186
       186
       -
           ''

     

       187
       187
       -
           + lib.optionalString (stdenv.hostPlatform.isDarwin) ''

     

       188
       188
       -
             --cxxopt=-x --cxxopt=c++ --host_cxxopt=-x --host_cxxopt=c++ \

     

       189
       189
       -
             --linkopt=-stdlib=libc++ --host_linkopt=-stdlib=libc++ \

     

       190
       190
       -
           '';

     

       191
       191
       -
         };

     

       192
       192
       -
       

     

       193
       193
       -
       in

     

       194
       194
       -
       testBazel

-89

pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         bazel,

     

       3
       3
       -
         bazelTest,

     

       4
       4
       -
         stdenv,

     

       5
       5
       -
         cctools,

     

       6
       6
       -
         extraBazelArgs ? "",

     

       7
       7
       -
         lib,

     

       8
       8
       -
         runLocal,

     

       9
       9
       -
         runtimeShell,

     

       10
       10
       -
         writeScript,

     

       11
       11
       -
         writeText,

     

       12
       12
       -
         distDir,

     

       13
       13
       -
       }:

     

       14
       14
       -
       

     

       15
       15
       -
       let

     

       16
       16
       -
         toolsBazel = writeScript "bazel" ''

     

       17
       17
       -
           #! ${runtimeShell}

     

       18
       18
       -
       

     

       19
       19
       -
           export CXX='${stdenv.cc}/bin/clang++'

     

       20
       20
       -
           export LD='${cctools}/bin/ld'

     

       21
       21
       -
           export LIBTOOL='${cctools}/bin/libtool'

     

       22
       22
       -
           export CC='${stdenv.cc}/bin/clang'

     

       23
       23
       -
       

     

       24
       24
       -
           # XXX: hack for macosX, this flags disable bazel usage of xcode

     

       25
       25
       -
           # See: https://github.com/bazelbuild/bazel/issues/4231

     

       26
       26
       -
           export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1

     

       27
       27
       -
       

     

       28
       28
       -
           exec "$BAZEL_REAL" "$@"

     

       29
       29
       -
         '';

     

       30
       30
       -
       

     

       31
       31
       -
         WORKSPACE = writeText "WORKSPACE" ''

     

       32
       32
       -
           workspace(name = "our_workspace")

     

       33
       33
       -
         '';

     

       34
       34
       -
       

     

       35
       35
       -
         pythonLib = writeText "lib.py" ''

     

       36
       36
       -
           def foo():

     

       37
       37
       -
             return 43

     

       38
       38
       -
         '';

     

       39
       39
       -
       

     

       40
       40
       -
         pythonBin = writeText "bin.py" ''

     

       41
       41
       -
           from lib import foo

     

       42
       42
       -
       

     

       43
       43
       -
           assert foo() == 43

     

       44
       44
       -
         '';

     

       45
       45
       -
       

     

       46
       46
       -
         pythonBUILD = writeText "BUILD" ''

     

       47
       47
       -
           py_library(

     

       48
       48
       -
             name = "lib",

     

       49
       49
       -
             srcs = [ "lib.py" ],

     

       50
       50
       -
           )

     

       51
       51
       -
       

     

       52
       52
       -
           py_binary(

     

       53
       53
       -
             name = "bin",

     

       54
       54
       -
             srcs = [ "bin.py" ],

     

       55
       55
       -
             imports = [ "." ],

     

       56
       56
       -
             deps = [ ":lib" ],

     

       57
       57
       -
           )

     

       58
       58
       -
         '';

     

       59
       59
       -
       

     

       60
       60
       -
         workspaceDir = runLocal "our_workspace" { } (

     

       61
       61
       -
           ''

     

       62
       62
       -
             mkdir $out

     

       63
       63
       -
             cp ${WORKSPACE} $out/WORKSPACE

     

       64
       64
       -
             mkdir $out/python

     

       65
       65
       -
             cp ${pythonLib} $out/python/lib.py

     

       66
       66
       -
             cp ${pythonBin} $out/python/bin.py

     

       67
       67
       -
             cp ${pythonBUILD} $out/python/BUILD.bazel

     

       68
       68
       -
           ''

     

       69
       69
       -
           + (lib.optionalString stdenv.hostPlatform.isDarwin ''

     

       70
       70
       -
             mkdir $out/tools

     

       71
       71
       -
             cp ${toolsBazel} $out/tools/bazel

     

       72
       72
       -
           '')

     

       73
       73
       -
         );

     

       74
       74
       -
       

     

       75
       75
       -
         testBazel = bazelTest {

     

       76
       76
       -
           name = "${bazel.pname}-test-builtin-rules";

     

       77
       77
       -
           inherit workspaceDir;

     

       78
       78
       -
           bazelPkg = bazel;

     

       79
       79
       -
           bazelScript = ''

     

       80
       80
       -
             ${bazel}/bin/bazel \

     

       81
       81
       -
               run \

     

       82
       82
       -
               --distdir=${distDir} \

     

       83
       83
       -
               ${extraBazelArgs} \

     

       84
       84
       -
               //python:bin

     

       85
       85
       -
           '';

     

       86
       86
       -
         };

     

       87
       87
       -
       

     

       88
       88
       -
       in

     

       89
       89
       -
       testBazel

-62

pkgs/development/tools/build-managers/bazel/shebang-test.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         bazel,

     

       3
       3
       -
         bazelTest,

     

       4
       4
       -
         extracted,

     

       5
       5
       -
         ripgrep,

     

       6
       6
       -
         runLocal,

     

       7
       7
       -
         unzip,

     

       8
       8
       -
         ...

     

       9
       9
       -
       }:

     

       10
       10
       -
       

     

       11
       11
       -
       # Tests that all shebangs are patched appropriately.

     

       12
       12
       -
       # #!/usr/bin/... should be replaced by Nix store references.

     

       13
       13
       -
       # #!.../bin/env python should be replaced by Nix store reference to the python interpreter.

     

       14
       14
       -
       

     

       15
       15
       -
       let

     

       16
       16
       -
       

     

       17
       17
       -
         workspaceDir = runLocal "our_workspace" { } "mkdir $out";

     

       18
       18
       -
       

     

       19
       19
       -
         testBazel = bazelTest {

     

       20
       20
       -
           name = "bazel-test-shebangs";

     

       21
       21
       -
           inherit workspaceDir;

     

       22
       22
       -
           bazelPkg = bazel;

     

       23
       23
       -
           bazelScript = ''

     

       24
       24
       -
             set -ueo pipefail

     

       25
       25
       -
             FAIL=

     

       26
       26
       -
             check_shebangs() {

     

       27
       27
       -
               local dir="$1"

     

       28
       28
       -
               { rg -e '#!/usr/bin' -e '#![^[:space:]]*/bin/env' $dir -e && echo && FAIL=1; } || true

     

       29
       29
       -
             }

     

       30
       30
       -
             extract() {

     

       31
       31
       -
               local dir="$1"

     

       32
       32
       -
               find "$dir" -type f '(' -name '*.zip' -or -name '*.jar' ')' -print0 \

     

       33
       33
       -
               | while IFS="" read -r -d "" zip ; do

     

       34
       34
       -
                 echo "Extracting $zip"

     

       35
       35
       -
                 local unzipped="$zip-UNPACKED"

     

       36
       36
       -
                 mkdir -p "$unzipped"

     

       37
       37
       -
                 unzip -qq $zip -d "$unzipped"

     

       38
       38
       -
                 extract "$unzipped"

     

       39
       39
       -
                 rm -rf "$unzipped" "$zip" || true

     

       40
       40
       -
               done

     

       41
       41
       -
               check_shebangs "$dir"

     

       42
       42
       -
             }

     

       43
       43
       -
       

     

       44
       44
       -
             mkdir install_root

     

       45
       45
       -
             cp --no-preserve=all -r ${extracted bazel}/install/*/* install_root/

     

       46
       46
       -
             extract ./install_root

     

       47
       47
       -
       

     

       48
       48
       -
             if [[ $FAIL = 1 ]]; then

     

       49
       49
       -
               echo "Found files in the bazel distribution with illegal shebangs." >&2

     

       50
       50
       -
               echo "Replace those by explicit Nix store paths." >&2

     

       51
       51
       -
               echo "Python scripts should not use \`bin/env python' but the Python interpreter's store path." >&2

     

       52
       52
       -
               exit 1

     

       53
       53
       -
             fi

     

       54
       54
       -
           '';

     

       55
       55
       -
           buildInputs = [

     

       56
       56
       -
             unzip

     

       57
       57
       -
             ripgrep

     

       58
       58
       -
           ];

     

       59
       59
       -
         };

     

       60
       60
       -
       

     

       61
       61
       -
       in

     

       62
       62
       -
       testBazel

pkgs/development/tools/build-managers/bazel/strict_action_env.patch pkgs/by-name/ba/bazel_7/strict_action_env.patch

pkgs/development/tools/build-managers/bazel/trim-last-argument-to-gcc-if-empty.patch pkgs/by-name/ba/bazel_7/trim-last-argument-to-gcc-if-empty.patch

-62

pkgs/development/tools/build-managers/bazel/update-srcDeps.py

···

       1
       1
       -
       #!/usr/bin/env python3

     

       2
       2
       -
       import sys

     

       3
       3
       -
       import json

     

       4
       4
       -
       

     

       5
       5
       -
       if len(sys.argv) == 1:

     

       6
       6
       -
           print("usage: ./this-script WORKSPACE", file=sys.stderr)

     

       7
       7
       -
           print("Takes the bazel WORKSPACE file and reads all archives into a json dict (by evaling it as python code)", file=sys.stderr)

     

       8
       8
       -
           print("Hail Eris.", file=sys.stderr)

     

       9
       9
       -
           sys.exit(1)

     

       10
       10
       -
       

     

       11
       11
       -
       http_archives = []

     

       12
       12
       -
       

     

       13
       13
       -
       # just the kw args are the dict { name, sha256, urls … }

     

       14
       14
       -
       def http_archive(**kw):

     

       15
       15
       -
           http_archives.append(kw)

     

       16
       16
       -
       # like http_file

     

       17
       17
       -
       def http_file(**kw):

     

       18
       18
       -
           http_archives.append(kw)

     

       19
       19
       -
       

     

       20
       20
       -
       # this is inverted from http_archive/http_file and bundles multiple archives

     

       21
       21
       -
       def distdir_tar(**kw):

     

       22
       22
       -
           for archive_name in kw['archives']:

     

       23
       23
       -
               http_archives.append({

     

       24
       24
       -
                   "name": archive_name,

     

       25
       25
       -
                   "sha256": kw['sha256'][archive_name],

     

       26
       26
       -
                   "urls": kw['urls'][archive_name]

     

       27
       27
       -
               })

     

       28
       28
       -
       

     

       29
       29
       -
       # stubs for symbols we are not interested in

     

       30
       30
       -
       # might need to be expanded if new bazel releases add symbols to the workspace

     

       31
       31
       -
       def workspace(name): pass

     

       32
       32
       -
       def load(*args): pass

     

       33
       33
       -
       def bind(**kw): pass

     

       34
       34
       -
       def list_source_repository(**kw): pass

     

       35
       35
       -
       def new_local_repository(**kw): pass

     

       36
       36
       -
       def local_repository(**kw): pass

     

       37
       37
       -
       DOC_VERSIONS = []

     

       38
       38
       -
       def stardoc_repositories(**kw): pass

     

       39
       39
       -
       def skydoc_repositories(**kw): pass

     

       40
       40
       -
       def rules_sass_dependencies(**kw): pass

     

       41
       41
       -
       def node_repositories(**kw): pass

     

       42
       42
       -
       def sass_repositories(**kw): pass

     

       43
       43
       -
       def register_execution_platforms(*args): pass

     

       44
       44
       -
       def rbe_autoconfig(*args, **kw): pass

     

       45
       45
       -
       def rules_pkg_dependencies(*args, **kw): pass

     

       46
       46
       -
       def winsdk_configure(*args, **kw): pass

     

       47
       47
       -
       def register_local_rc_exe_toolchains(*args, **kw): pass

     

       48
       48
       -
       def register_toolchains(*args, **kw): pass

     

       49
       49
       -
       def debian_deps(): pass

     

       50
       50
       -
       def grpc_deps(): pass

     

       51
       51
       -
       def grpc_extra_deps(): pass

     

       52
       52
       -
       def bazel_skylib_workspace(): pass

     

       53
       53
       -
       

     

       54
       54
       -
       # execute the WORKSPACE like it was python code in this module,

     

       55
       55
       -
       # using all the function stubs from above.

     

       56
       56
       -
       with open(sys.argv[1]) as f:

     

       57
       57
       -
           exec(f.read())

     

       58
       58
       -
       

     

       59
       59
       -
       # transform to a dict with the names as keys

     

       60
       60
       -
       d = { el['name']: el for el in http_archives }

     

       61
       61
       -
       

     

       62
       62
       -
       print(json.dumps(d, sort_keys=True, indent=4))

+4 -37

pkgs/development/tools/profiling/systemtap/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
       -
         fetchgit,

     

       4
       4
       -
         pkg-config,

     

       5
       5
       -
         gettext,

     

       6
       3
        
         runCommand,

     

       7
       4
        
         makeWrapper,

     

       8
       8
       -
         cpio,

     

       5
       5
       +
         systemtap-unwrapped,

     

       9
       6
        
         elfutils,

     

       10
       7
        
         kernel,

     

       11
       8
        
         gnumake,

     
···

       15
       12
        
       }:

     

       16
       13
        
       

     

       17
       14
        
       let

     

       18
       18
       -
         ## fetchgit info

     

       19
       19
       -
         url = "git://sourceware.org/git/systemtap.git";

     

       20
       20
       -
         rev = "release-${version}";

     

       21
       21
       -
         hash = "sha256-SUPNarZW8vdK9hQaI2kU+rfKWIPiXB4BvJvRNC1T9tU=";

     

       22
       22
       -
         version = "5.2";

     

       23
       23
       -
       

     

       24
       15
        
         inherit (kernel) stdenv;

     

       25
       16
        
       

     

       26
       26
       -
         ## stap binaries

     

       27
       27
       -
         stapBuild = stdenv.mkDerivation {

     

       28
       28
       -
           pname = "systemtap";

     

       29
       29
       -
           inherit version;

     

       30
       30
       -
           src = fetchgit { inherit url rev hash; };

     

       31
       31
       -
           nativeBuildInputs = [

     

       32
       32
       -
             pkg-config

     

       33
       33
       -
             cpio

     

       34
       34
       -
             python3

     

       35
       35
       -
             python3.pkgs.setuptools

     

       36
       36
       -
           ];

     

       37
       37
       -
           buildInputs = [

     

       38
       38
       -
             elfutils

     

       39
       39
       -
             gettext

     

       40
       40
       -
             python3

     

       41
       41
       -
           ];

     

       42
       42
       -
           enableParallelBuilding = true;

     

       43
       43
       -
         };

     

       44
       44
       -
       

     

       45
       17
        
         ## symlink farm for --sysroot flag

     

       46
       18
        
         sysroot = runCommand "systemtap-sysroot-${kernel.version}" { } ''

     

       47
       19
        
           mkdir -p $out/boot $out/usr/lib/debug

     
···

       53
       25
        
         pypkgs = with python3.pkgs; makePythonPath [ pyparsing ];

     

       54
       26
        
       

     

       55
       27
        
       in

     

       56
       56
       -
       runCommand "systemtap-${version}"

     

       28
       28
       +
       runCommand "systemtap-${systemtap-unwrapped.version}"

     

       57
       29
        
         {

     

       58
       58
       -
           inherit stapBuild;

     

       30
       30
       +
           stapBuild = systemtap-unwrapped;

     

       59
       31
        
           nativeBuildInputs = [ makeWrapper ];

     

       60
       32
        
           passthru.tests = { inherit (nixosTests.systemtap) linux_default linux_latest; };

     

       61
       61
       -
           meta = {

     

       62
       62
       -
             homepage = "https://sourceware.org/systemtap/";

     

       63
       63
       -
             description = "Provides a scripting language for instrumentation on a live kernel plus user-space";

     

       64
       64
       -
             license = lib.licenses.gpl2;

     

       65
       65
       -
             platforms = lib.systems.inspect.patterns.isGnu;

     

       66
       66
       -
           };

     

       33
       33
       +
           inherit (systemtap-unwrapped) meta;

     

       67
       34
        
         }

     

       68
       35
        
         (

     

       69
       36
        
           ''

+8 -46

pkgs/os-specific/linux/kernel/perf/default.nix pkgs/by-name/pe/perf/package.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         fetchurl,

     

       5
       5
       -
         kernel,

     

       5
       5
       +
         linux_latest,

     

       6
       6
        
         elfutils,

     

       7
       7
        
         python3,

     

       8
       8
        
         newt,

     
···

       20
       20
        
         binutils-unwrapped,

     

       21
       21
        
         libiberty,

     

       22
       22
        
         audit,

     

       23
       23
       -
         libbfd,

     

       24
       24
       -
         libbfd_2_38,

     

       25
       23
        
         libopcodes,

     

       26
       26
       -
         libopcodes_2_38,

     

       27
       24
        
         libpfm,

     

       28
       25
        
         libtraceevent,

     

       29
       26
        
         openssl,

     

       30
       30
       -
         systemtap,

     

       27
       27
       +
         systemtap-unwrapped,

     

       31
       28
        
         numactl,

     

       32
       29
        
         zlib,

     

       33
       30
        
         babeltrace,

     
···

       57
       54
        
       

     

       58
       55
        
       stdenv.mkDerivation {

     

       59
       56
        
         pname = "perf-linux";

     

       60
       60
       -
         inherit (kernel) version src;

     

       57
       57
       +
         inherit (linux_latest) version src;

     

       61
       58
        
       

     

       62
       59
        
         strictDeps = true;

     

       63
       60
        
       

     

       64
       61
        
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       65
       62
        
       

     

       66
       66
       -
         patches =

     

       67
       67
       -
           lib.optionals (lib.versionAtLeast kernel.version "5.10" && lib.versionOlder kernel.version "6.13")

     

       68
       68
       -
             [

     

       69
       69
       -
               # fix wrong path to dmesg

     

       70
       70
       -
               ./fix-dmesg-path.diff

     

       71
       71
       -
             ];

     

       72
       72
       -
       

     

       73
       63
        
         postPatch = ''

     

       74
       64
        
           # Linux scripts

     

       75
       65
        
           patchShebangs scripts

     

       76
       66
        
           patchShebangs tools/perf/check-headers.sh

     

       77
       77
       -
         ''

     

       78
       78
       -
         + lib.optionalString (lib.versionAtLeast kernel.version "6.3") ''

     

       79
       67
        
           # perf-specific scripts

     

       80
       68
        
           patchShebangs tools/perf/pmu-events

     

       81
       81
       -
         ''

     

       82
       82
       -
         + ''

     

       83
       69
        
           cd tools/perf

     

       84
       70
        
       

     

       85
       71
        
           for x in util/build-id.c util/dso.c; do

     

       86
       72
        
             substituteInPlace $x --replace /usr/lib/debug /run/current-system/sw/lib/debug

     

       87
       73
        
           done

     

       88
       74
        
       

     

       89
       89
       -
         ''

     

       90
       90
       -
         + lib.optionalString (lib.versionAtLeast kernel.version "5.8") ''

     

       91
       75
        
           substituteInPlace scripts/python/flamegraph.py \

     

       92
       76
        
             --replace "/usr/share/d3-flame-graph/d3-flamegraph-base.html" \

     

       93
       77
        
             "${d3-flame-graph-templates}/share/d3-flame-graph/d3-flamegraph-base.html"

     

       94
       78
        
       

     

       95
       95
       -
         ''

     

       96
       96
       -
         + lib.optionalString (lib.versionAtLeast kernel.version "6.0") ''

     

       97
       79
        
           patchShebangs pmu-events/jevents.py

     

       98
       80
        
         '';

     

       99
       81
        
       

     
···

       137
       119
        
           numactl

     

       138
       120
        
           python3

     

       139
       121
        
           babeltrace

     

       122
       122
       +
           libopcodes

     

       123
       123
       +
           libpfm

     

       124
       124
       +
           python3.pkgs.setuptools

     

       140
       125
        
         ]

     

       141
       141
       -
         ++ (

     

       142
       142
       -
           if (lib.versionAtLeast kernel.version "5.19") then

     

       143
       143
       -
             [

     

       144
       144
       -
               libbfd

     

       145
       145
       -
               libopcodes

     

       146
       146
       -
             ]

     

       147
       147
       -
           else

     

       148
       148
       -
             [

     

       149
       149
       -
               libbfd_2_38

     

       150
       150
       -
               libopcodes_2_38

     

       151
       151
       -
             ]

     

       152
       152
       -
         )

     

       153
       153
       -
         ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform systemtap) systemtap.stapBuild

     

       126
       126
       +
         ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform systemtap-unwrapped) systemtap-unwrapped

     

       154
       127
        
         ++ lib.optional withGtk gtk2

     

       155
       128
        
         ++ lib.optional withZstd zstd

     

       156
       156
       -
         ++ lib.optional withLibcap libcap

     

       157
       157
       -
         ++ lib.optional (lib.versionAtLeast kernel.version "5.8") libpfm

     

       158
       158
       -
         ++ lib.optional (lib.versionAtLeast kernel.version "6.0") python3.pkgs.setuptools

     

       159
       159
       -
         # Python 3.12 no longer includes distutils, not needed for 6.0 and newer.

     

       160
       160
       -
         ++

     

       161
       161
       -
           lib.optional

     

       162
       162
       -
             (!(lib.versionAtLeast kernel.version "6.0") && lib.versionAtLeast python3.version "3.12")

     

       163
       163
       -
             [

     

       164
       164
       -
               python3.pkgs.distutils

     

       165
       165
       -
               python3.pkgs.packaging

     

       166
       166
       -
             ];

     

       129
       129
       +
         ++ lib.optional withLibcap libcap;

     

       167
       130
        
       

     

       168
       131
        
         env.NIX_CFLAGS_COMPILE = toString [

     

       169
       132
        
           "-Wno-error=cpp"

     
···

       206
       169
        
           mainProgram = "perf";

     

       207
       170
        
           maintainers = with maintainers; [ tobim ];

     

       208
       171
        
           platforms = platforms.linux;

     

       209
       209
       -
           broken = kernel.kernelOlder "5";

     

       210
       172
        
         };

     

       211
       173
        
       }

-11

pkgs/os-specific/linux/kernel/perf/fix-dmesg-path.diff

···

       1
       1
       -
       --- a/tools/perf/util/evsel.c	2023-10-20 15:50:53.011023294 +0200

     

       2
       2
       -
       +++ b/tools/perf/util/evsel.c	2023-10-20 15:51:03.205997633 +0200

     

       3
       3
       -
       @@ -3076,7 +3076,7 @@

     

       4
       4
       -
        

     

       5
       5
       -
        	return scnprintf(msg, size,

     

       6
       6
       -
        	"The sys_perf_event_open() syscall returned with %d (%s) for event (%s).\n"

     

       7
       7
       -
       -	"/bin/dmesg | grep -i perf may provide additional information.\n",

     

       8
       8
       -
       +	"\"dmesg | grep -i perf\" may provide additional information.\n",

     

       9
       9
       -
        			 err, str_error_r(err, sbuf, sizeof(sbuf)), evsel__name(evsel));

     

       10
       10
       -
        }

     

       11
       11
       -

+2 -2

pkgs/os-specific/linux/kernel/zen-kernels.nix

···

       23
       23
        
           };

     

       24
       24
        
           # ./update-zen.py lqx

     

       25
       25
        
           lqx = {

     

       26
       26
       -
             version = "6.16.3"; # lqx

     

       26
       26
       +
             version = "6.16.5"; # lqx

     

       27
       27
        
             suffix = "lqx1"; # lqx

     

       28
       28
       -
             sha256 = "0y7ym3kcy936p3kz71dx411l7pms53cfqbq8h8dp9vxw9vhjkh5n"; # lqx

     

       28
       28
       +
             sha256 = "149pkbzsx1z5b8qizf03nz5b4p7in0kbyy8d35svvzrljr6dzjqn"; # lqx

     

       29
       29
        
             isLqx = true;

     

       30
       30
        
           };

     

       31
       31
        
         };

+3 -3

pkgs/servers/sql/postgresql/ext/omnigres.nix

···

       21
       21
        
       in

     

       22
       22
        
       postgresqlBuildExtension (finalAttrs: {

     

       23
       23
        
         pname = "omnigres";

     

       24
       24
       -
         version = "0-unstable-2025-08-24";

     

       24
       24
       +
         version = "0-unstable-2025-09-05";

     

       25
       25
        
       

     

       26
       26
        
         src = fetchFromGitHub {

     

       27
       27
        
           owner = "omnigres";

     

       28
       28
        
           repo = "omnigres";

     

       29
       29
       -
           rev = "8d986ca6c6ebc099af9ffec26bac06b39368b222";

     

       30
       30
       -
           hash = "sha256-3oKzLPyusvDf3Tptd7udkzpMhac6gWmSlevzHV0t5CY=";

     

       29
       29
       +
           rev = "f9ec95c59a786835f38629a2e04a4784a460fba1";

     

       30
       30
       +
           hash = "sha256-F1vG+iAlixdWwW3LIovzwnuL75QTCDlF40QOUD5dNZk=";

     

       31
       31
        
         };

     

       32
       32
        
       

     

       33
       33
        
         # This matches postInstall of PostgreSQL's generic.nix, which does this for the PGXS Makefile.

+14 -1

pkgs/tools/misc/grub/default.nix

···

       28
       28
        
         efiSupport ? false,

     

       29
       29
        
         zfsSupport ? false,

     

       30
       30
        
         xenSupport ? false,

     

       31
       31
       +
         xenPvhSupport ? false,

     

       31
       32
        
         kbdcompSupport ? false,

     

       32
       33
        
         ckbcomp,

     

       33
       34
        
       }:

     
···

       65
       66
        
           x86_64-linux.target = "x86_64";

     

       66
       67
        
         };

     

       67
       68
        
       

     

       69
       69
       +
         xenPvhSystemsBuild = {

     

       70
       70
       +
           i686-linux.target = "i386";

     

       71
       71
       +
           x86_64-linux.target = "i386"; # Xen PVH is only i386 on x86.

     

       72
       72
       +
         };

     

       73
       73
       +
       

     

       68
       74
        
         inPCSystems = lib.any (system: stdenv.hostPlatform.system == system) (lib.attrNames pcSystems);

     

       69
       75
        
       

     

       70
       76
        
         gnulib = fetchgit {

     
···

       84
       90
        
       in

     

       85
       91
        
       

     

       86
       92
        
       assert zfsSupport -> zfs != null;

     

       87
       87
       -
       assert !(efiSupport && xenSupport);

     

       93
       93
       +
       assert !(efiSupport && (xenSupport || xenPvhSupport));

     

       94
       94
       +
       assert !(xenSupport && xenPvhSupport);

     

       88
       95
        
       

     

       89
       96
        
       stdenv.mkDerivation rec {

     

       90
       97
        
         pname = "grub";

     
···

       609
       616
        
         ++ lib.optionals xenSupport [

     

       610
       617
        
           "--with-platform=xen"

     

       611
       618
        
           "--target=${xenSystemsBuild.${stdenv.hostPlatform.system}.target}"

     

       619
       619
       +
         ]

     

       620
       620
       +
         ++ lib.optionals xenPvhSupport [

     

       621
       621
       +
           "--with-platform=xen_pvh"

     

       622
       622
       +
           "--target=${xenPvhSystemsBuild.${stdenv.hostPlatform.system}.target}"

     

       612
       623
        
         ];

     

       613
       624
        
       

     

       614
       625
        
         # save target that grub is compiled for

     
···

       660
       671
        
               lib.attrNames efiSystemsBuild

     

       661
       672
        
             else if xenSupport then

     

       662
       673
        
               lib.attrNames xenSystemsBuild

     

       674
       674
       +
             else if xenPvhSupport then

     

       675
       675
       +
               lib.attrNames xenPvhSystemsBuild

     

       663
       676
        
             else

     

       664
       677
        
               platforms.gnu ++ platforms.linux;

     

       665
       678

+9 -6

pkgs/top-level/all-packages.nix

···

       3061
       3061
        
           xenSupport = true;

     

       3062
       3062
        
         };

     

       3063
       3063
        
       

     

       3064
       3064
       +
         grub2_xen_pvh = grub2.override {

     

       3065
       3065
       +
           xenPvhSupport = true;

     

       3066
       3066
       +
         };

     

       3067
       3067
       +
       

     

       3068
       3068
       +
         grub2_pvgrub_image = grub2_pvhgrub_image.override {

     

       3069
       3069
       +
           grubPlatform = "xen";

     

       3070
       3070
       +
         };

     

       3071
       3071
       +
       

     

       3064
       3072
        
         grub4dos = callPackage ../tools/misc/grub4dos {

     

       3065
       3073
        
           stdenv = stdenv_32bit;

     

       3066
       3074
        
         };

     
···

       5626
       5634
        
           );

     

       5627
       5635
        
         buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { };

     

       5628
       5636
        
       

     

       5629
       5629
       -
         cargo-flamegraph = callPackage ../by-name/ca/cargo-flamegraph/package.nix {

     

       5630
       5630
       -
           inherit (linuxPackages) perf;

     

       5631
       5631
       -
         };

     

       5632
       5632
       -
       

     

       5633
       5637
        
         defaultCrateOverrides = callPackage ../build-support/rust/default-crate-overrides.nix { };

     

       5634
       5638
        
       

     

       5635
       5639
        
         inherit (callPackages ../development/tools/rust/cargo-pgrx { })

     
···

       6479
       6483
        
       

     

       6480
       6484
        
         bazel = bazel_7;

     

       6481
       6485
        
       

     

       6482
       6482
       -
         bazel_7 = callPackage ../development/tools/build-managers/bazel/bazel_7 {

     

       6486
       6486
       +
         bazel_7 = callPackage ../by-name/ba/bazel_7/package.nix {

     

       6483
       6487
        
           inherit (darwin) sigtool;

     

       6484
       6488
        
           buildJdk = jdk21_headless;

     

       6485
       6489
        
           runJdk = jdk21_headless;

     
···

       7023
       7027
        
         pycritty = with python3Packages; toPythonApplication pycritty;

     

       7024
       7028
        
       

     

       7025
       7029
        
         qtcreator = qt6Packages.callPackage ../development/tools/qtcreator {

     

       7026
       7026
       -
           inherit (linuxPackages) perf;

     

       7027
       7030
        
           llvmPackages = llvmPackages_21;

     

       7028
       7031
        
           stdenv = llvmPackages_21.stdenv;

     

       7029
       7032
        
         };

+1 -2

pkgs/top-level/linux-kernels.nix

···

       584
       584
        
       

     

       585
       585
        
               netatop = callPackage ../os-specific/linux/netatop { };

     

       586
       586
        
       

     

       587
       587
       -
               perf = callPackage ../os-specific/linux/kernel/perf { };

     

       588
       588
       -
       

     

       589
       587
        
               prl-tools = callPackage ../os-specific/linux/prl-tools { };

     

       590
       588
        
       

     

       591
       589
        
               isgx = callPackage ../os-specific/linux/isgx { };

     
···

       714
       712
        
               xmm7360-pci = throw "Support for the XMM7360 WWAN card was added to the iosm kmod in mainline kernel version 5.18";

     

       715
       713
        
               amdgpu-pro = throw "amdgpu-pro was removed due to lack of maintenance"; # Added 2024-06-16

     

       716
       714
        
               kvdo = throw "kvdo was removed, because it was added to mainline in kernel version 6.9"; # Added 2024-07-08

     

       715
       715
       +
               perf = lib.warnOnInstantiate "linuxPackages.perf is now perf" pkgs.perf; # Added 2025-08-28

     

       717
       716
        
               system76-power = lib.warnOnInstantiate "kernelPackages.system76-power is now pkgs.system76-power" pkgs.system76-power; # Added 2024-10-16

     

       718
       717
        
               system76-scheduler = lib.warnOnInstantiate "kernelPackages.system76-scheduler is now pkgs.system76-scheduler" pkgs.system76-scheduler; # Added 2024-10-16

     

       719
       718
        
               tuxedo-keyboard = self.tuxedo-drivers; # Added 2024-09-28

+1 -2

pkgs/top-level/php-packages.nix

···

       255
       255
        
             phpstan = callPackage ../development/php-packages/phpstan { };

     

       256
       256
        
       

     

       257
       257
        
             psalm = callPackage ../development/php-packages/psalm { };

     

       258
       258
       -
       

     

       259
       259
       -
             psysh = callPackage ../development/php-packages/psysh { };

     

       260
       258
        
           }

     

       261
       259
        
           // lib.optionalAttrs config.allowAliases {

     

       262
       260
        
             phpcbf = throw "`phpcbf` is now deprecated, use `php-codesniffer` instead which contains both `phpcs` and `phpcbf`.";

     

       263
       261
        
             phpcs = throw "`phpcs` is now deprecated, use `php-codesniffer` instead which contains both `phpcs` and `phpcbf`.";

     

       262
       262
       +
             psysh = throw "`php8${lib.versions.minor php.version}Packages.psysh` is now deprecated, use `psysh`";

     

       264
       263
        
           };

     

       265
       264
        
       

     

       266
       265
        
           # This is a set of PHP extensions meant to be used in php.buildEnv