diff --git a/doc/build-aux/pandoc-filters/docbook-writer/html-elements.lua b/doc/build-aux/pandoc-filters/docbook-writer/html-elements.lua new file mode 100644 index 000000000000..8f4de40ce5f8 --- /dev/null +++ b/doc/build-aux/pandoc-filters/docbook-writer/html-elements.lua @@ -0,0 +1,11 @@ +--[[ +Converts some HTML elements commonly used in Markdown to corresponding DocBook elements. +]] + +function RawInline(elem) + if elem.format == 'html' and elem.text == '' then + return pandoc.RawInline('docbook', '') + elseif elem.format == 'html' and elem.text == '' then + return pandoc.RawInline('docbook', '') + end +end diff --git a/doc/doc-support/lib-function-docs.nix b/doc/doc-support/lib-function-docs.nix index f6d613cac0b6..cbcbed4310af 100644 --- a/doc/doc-support/lib-function-docs.nix +++ b/doc/doc-support/lib-function-docs.nix @@ -22,6 +22,7 @@ with pkgs; stdenv.mkDerivation { docgen lists 'List manipulation functions' docgen debug 'Debugging functions' docgen options 'NixOS / nixpkgs option handling' + docgen filesystem 'Filesystem functions' docgen sources 'Source filtering functions' ''; } diff --git a/doc/functions/library.xml b/doc/functions/library.xml index 21bcf5b88c9d..b291356c14b8 100644 --- a/doc/functions/library.xml +++ b/doc/functions/library.xml @@ -26,5 +26,7 @@ + + diff --git a/lib/filesystem.nix b/lib/filesystem.nix index 0a1275e547cf..948196055203 100644 --- a/lib/filesystem.nix +++ b/lib/filesystem.nix @@ -1,9 +1,23 @@ +# Functions for copying sources to the Nix store. { lib }: -{ # haskellPathsInDir : Path -> Map String Path - # A map of all haskell packages defined in the given path, - # identified by having a cabal file with the same name as the - # directory itself. - haskellPathsInDir = root: + +let + inherit (lib.strings) + hasPrefix + ; +in + +{ + /* + A map of all haskell packages defined in the given path, + identified by having a cabal file with the same name as the + directory itself. + + Type: Path -> Map String Path + */ + haskellPathsInDir = + # The directory within to search + root: let # Files in the root root-files = builtins.attrNames (builtins.readDir root); # Files with their full paths @@ -17,15 +31,18 @@ builtins.pathExists (value + "/${name}.cabal") ) root-files-with-paths; in builtins.listToAttrs cabal-subdirs; - # locateDominatingFile : RegExp - # -> Path - # -> Nullable { path : Path; - # matches : [ MatchResults ]; - # } - # Find the first directory containing a file matching 'pattern' - # upward from a given 'file'. - # Returns 'null' if no directories contain a file matching 'pattern'. - locateDominatingFile = pattern: file: + /* + Find the first directory containing a file matching 'pattern' + upward from a given 'file'. + Returns 'null' if no directories contain a file matching 'pattern'. + + Type: RegExp -> Path -> Nullable { path : Path; matches : [ MatchResults ]; } + */ + locateDominatingFile = + # The pattern to search for + pattern: + # The file to start searching upward from + file: let go = path: let files = builtins.attrNames (builtins.readDir path); matches = builtins.filter (match: match != null) @@ -44,10 +61,15 @@ in go (if isDir then file else parent); - # listFilesRecursive: Path -> [ Path ] - # - # Given a directory, return a flattened list of all files within it recursively. - listFilesRecursive = dir: lib.flatten (lib.mapAttrsToList (name: type: + /* + Given a directory, return a flattened list of all files within it recursively. + + Type: Path -> [ Path ] + */ + listFilesRecursive = + # The path to recursively list + dir: + lib.flatten (lib.mapAttrsToList (name: type: if type == "directory" then lib.filesystem.listFilesRecursive (dir + "/${name}") else diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index d60b6911ec77..49bc50ae6131 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -63,7 +63,7 @@ luaepnf,,,,,, luaevent,,,,,, luaexpat,,,,1.4.1-1,,arobyn flosse luaffi,,,http://luarocks.org/dev,,, -luafilesystem,,,,1.7.0-2,,flosse +luafilesystem,,,,1.8.0-1,,flosse lualogging,,,,,, luaossl,,,,,5.1, luaposix,,,,34.1.1-1,,vyp lblasc diff --git a/nixos/doc/manual/from_md/installation/installing-usb.section.xml b/nixos/doc/manual/from_md/installation/installing-usb.section.xml index df266eb16800..9d12ac45aac2 100644 --- a/nixos/doc/manual/from_md/installation/installing-usb.section.xml +++ b/nixos/doc/manual/from_md/installation/installing-usb.section.xml @@ -1,35 +1,135 @@
- Booting from a USB Drive + Booting from a USB flash drive - For systems without CD drive, the NixOS live CD can be booted from a - USB stick. You can use the dd utility to write - the image: dd if=path-to-image of=/dev/sdX. Be - careful about specifying the correct drive; you can use the - lsblk command to get a list of block devices. + The image has to be written verbatim to the USB flash drive for it + to be bootable on UEFI and BIOS systems. Here are the recommended + tools to do that. - - On macOS +
+ Creating bootable USB flash drive with a graphical + tool + + Etcher is a popular and user-friendly tool. It works on Linux, + Windows and macOS. + + + Download it from + balena.io, + start the program, select the downloaded NixOS ISO, then select + the USB flash drive and flash it. + + + + Etcher reports errors and usage statistics by default, which can + be disabled in the settings. + + + + An alternative is + USBImager, + which is very simple and does not connect to the internet. + Download the version with write-only (wo) interface for your + system. Start the program, select the image, select the USB flash + drive and click Write. + +
+
+ Creating bootable USB flash drive from a Terminal on + Linux + + + + Plug in the USB flash drive. + + + + + Find the corresponding device with lsblk. + You can distinguish them by their size. + + + + + Make sure all partitions on the device are properly unmounted. + Replace sdX with your device (e.g. + sdb). + + + -$ diskutil list -[..] -/dev/diskN (external, physical): - #: TYPE NAME SIZE IDENTIFIER -[..] -$ diskutil unmountDisk diskN -Unmount of all volumes on diskN was successful -$ sudo dd if=nix.iso of=/dev/rdiskN bs=1M +sudo umount /dev/sdX* + + + + + Then use the dd utility to write the image + to the USB flash drive. + + + + +sudo dd if=<path-to-image> of=/dev/sdX bs=4M conv=fsync + +
+
+ Creating bootable USB flash drive from a Terminal on + macOS + + + + Plug in the USB flash drive. + + + + + Find the corresponding device with + diskutil list. You can distinguish them by + their size. + + + + + Make sure all partitions on the device are properly unmounted. + Replace diskX with your device (e.g. + disk1). + + + + +diskutil unmountDisk diskX + + + + + Then use the dd utility to write the image + to the USB flash drive. + + + + +sudo dd if=<path-to-image> of=/dev/rdiskX bs=4m - Using the 'raw' rdiskN device instead of - diskN completes in minutes instead of hours. After dd completes, a GUI dialog "The disk you inserted was not readable by this computer" will pop up, which can be ignored. - - - The dd utility will write the image verbatim to - the drive, making it the recommended option for both UEFI and - non-UEFI installations. - + + + Using the 'raw' rdiskX device instead of + diskX with dd completes in minutes instead of + hours. + + + + + + Eject the disk when it is finished. + + + + +diskutil eject /dev/diskX + +
diff --git a/nixos/doc/manual/from_md/installation/installing.chapter.xml b/nixos/doc/manual/from_md/installation/installing.chapter.xml index e0ff368b800c..02a0f14b984a 100644 --- a/nixos/doc/manual/from_md/installation/installing.chapter.xml +++ b/nixos/doc/manual/from_md/installation/installing.chapter.xml @@ -1,26 +1,212 @@ Installing NixOS
- Booting the system + Booting from the install medium + + To begin the installation, you have to boot your computer from the + install drive. + + + + + Plug in the install drive. Then turn on or restart your + computer. + + + + + Open the boot menu by pressing the appropriate key, which is + usually shown on the display on early boot. Select the USB + flash drive (the option usually contains the word + USB). If you choose the incorrect drive, your + computer will likely continue to boot as normal. In that case + restart your computer and pick a different drive. + + + + The key to open the boot menu is different across computer + brands and even models. It can be F12, but + also F1, F9, + F10, Enter, + Del, Esc or another + function key. If you are unsure and don’t see it on the + early boot screen, you can search online for your computers + brand, model followed by boot from usb. The + computer might not even have that feature, so you have to go + into the BIOS/UEFI settings to change the boot order. Again, + search online for details about your specific computer + model. + + + For Apple computers with Intel processors press and hold the + ⌥ (Option or Alt) key until you see the + boot menu. On Apple silicon press and hold the power button. + + + + + If your computer supports both BIOS and UEFI boot, choose + the UEFI option. + + + + + If you use a CD for the installation, the computer will + probably boot from it automatically. If not, choose the + option containing the word CD from the boot + menu. + + + + + + Shortly after selecting the appropriate boot drive, you should + be presented with a menu with different installer options. + Leave the default and wait (or press Enter to + speed up). + + + + + The graphical images will start their corresponding desktop + environment and the graphical installer, which can take some + time. The minimal images will boot to a command line. You have + to follow the instructions in + there. + + + +
+
+ Graphical Installation + + The graphical installer is recommended for desktop users and will + guide you through the installation. + + + + + In the Welcome screen, you can select the + language of the Installer and the installed system. + + + + Leaving the language as American English will + make it easier to search for error messages in a search + engine or to report an issue. + + + + + + Next you should choose your location to have the timezone set + correctly. You can actually click on the map! + + + + The installer will use an online service to guess your + location based on your public IP address. + + + + + + Then you can select the keyboard layout. The default keyboard + model should work well with most desktop keyboards. If you + have a special keyboard or notebook, your model might be in + the list. Select the language you are most comfortable typing + in. + + + + + On the Users screen, you have to type in your + display name, login name and password. You can also enable an + option to automatically login to the desktop. + + + + + Then you have the option to choose a desktop environment. If + you want to create a custom setup with a window manager, you + can select No desktop. + + + + If you don’t have a favorite desktop and don’t know which + one to choose, you can stick to either GNOME or Plasma. They + have a quite different design, so you should choose + whichever you like better. They are both popular choices and + well tested on NixOS. + + + + + + You have the option to allow unfree software in the next + screen. + + + + + The easiest option in the Partitioning screen + is Erase disk, which will delete all data from + the selected disk and install the system on it. Also select + Swap (with Hibernation) in the dropdown below + it. You have the option to encrypt the whole disk with LUKS. + + + + At the top left you see if the Installer was booted with + BIOS or UEFI. If you know your system supports UEFI and it + shows BIOS, reboot with the correct option. + + + + + Make sure you have selected the correct disk at the top and + that no valuable data is still on the disk! It will be + deleted when formatting the disk. + + + + + + Check the choices you made in the Summary and + click Install. + + + + The installation takes about 15 minutes. The time varies + based on the selected desktop environment, internet + connection speed and disk write speed. + + + + + + When the install is complete, remove the USB flash drive and + reboot into your new system! + + + +
+
+ Manual Installation NixOS can be installed on BIOS or UEFI systems. The procedure for - a UEFI installation is by and large the same as a BIOS - installation. The differences are mentioned in the steps that - follow. - - - The installation media can be burned to a CD, or now more - commonly, burned to a USB drive (see - ). - - - The installation media contains a basic NixOS installation. When - it’s finished booting, it should have detected most of your - hardware. + a UEFI installation is broadly the same as for a BIOS + installation. The differences are mentioned in the following + steps. The NixOS manual is available by running - nixos-help. + nixos-help in the command line or from the + application menu in the desktop environment. + + + To have access to the command line on the graphical images, open + Terminal (GNOME) or Konsole (Plasma) from the application menu. You are logged-in automatically as nixos. The @@ -31,11 +217,8 @@ $ sudo -i - If you downloaded the graphical ISO image, you can run - systemctl start display-manager to start the - desktop environment. If you want to continue on the terminal, you - can use loadkeys to switch to your preferred - keyboard layout. (We even provide neo2 via + You can use loadkeys to switch to your + preferred keyboard layout. (We even provide neo2 via loadkeys de neo!) @@ -49,8 +232,12 @@ $ sudo -i bootloader lists boot entries, select the serial console boot entry. -
+
Networking in the installer + + + + The boot process should have brought up networking (check ip a). Networking is necessary for the @@ -130,179 +317,239 @@ OK able to login.
-
-
- Partitioning and formatting - - The NixOS installer doesn’t do any partitioning or formatting, so - you need to do that yourself. - - - The NixOS installer ships with multiple partitioning tools. The - examples below use parted, but also provides - fdisk, gdisk, - cfdisk, and cgdisk. - - - The recommended partition scheme differs depending if the computer - uses Legacy Boot or - UEFI. - -
- UEFI (GPT) +
+ Partitioning and formatting - Here's an example partition scheme for UEFI, using - /dev/sda as the device. + + - + + The NixOS installer doesn’t do any partitioning or formatting, + so you need to do that yourself. + + + The NixOS installer ships with multiple partitioning tools. The + examples below use parted, but also provides + fdisk, gdisk, + cfdisk, and cgdisk. + + + The recommended partition scheme differs depending if the + computer uses Legacy Boot or + UEFI. + +
+ UEFI (GPT) - You can safely ignore parted's - informational message about needing to update /etc/fstab. + + - - - + + Here's an example partition scheme for UEFI, using + /dev/sda as the device. + + - Create a GPT partition table. + You can safely ignore parted's + informational message about needing to update /etc/fstab. - + + + + + Create a GPT partition table. + + # parted /dev/sda -- mklabel gpt - - - - Add the root partition. This will fill - the disk except for the end part, where the swap will live, - and the space left in front (512MiB) which will be used by - the boot partition. - - + + + + Add the root partition. This will + fill the disk except for the end part, where the swap will + live, and the space left in front (512MiB) which will be + used by the boot partition. + + # parted /dev/sda -- mkpart primary 512MB -8GB - - - - Next, add a swap partition. The size - required will vary according to needs, here a 8GB one is - created. - - + + + + Next, add a swap partition. The size + required will vary according to needs, here a 8GB one is + created. + + # parted /dev/sda -- mkpart primary linux-swap -8GB 100% - + + + The swap partition size rules are no different than for + other Linux distributions. + + + + - The swap partition size rules are no different than for - other Linux distributions. + Finally, the boot partition. NixOS by + default uses the ESP (EFI system partition) as its + /boot partition. It uses the + initially reserved 512MiB at the start of the disk. - - - - - Finally, the boot partition. NixOS by - default uses the ESP (EFI system partition) as its - /boot partition. It uses the initially - reserved 512MiB at the start of the disk. - - + # parted /dev/sda -- mkpart ESP fat32 1MB 512MB # parted /dev/sda -- set 3 esp on - - - - Once complete, you can follow with - . - -
-
- Legacy Boot (MBR) - - Here's an example partition scheme for Legacy Boot, using - /dev/sda as the device. - - + + - You can safely ignore parted's - informational message about needing to update /etc/fstab. + Once complete, you can follow with + . - +
+
+ Legacy Boot (MBR) + + + + + + Here's an example partition scheme for Legacy Boot, using + /dev/sda as the device. + + + + You can safely ignore parted's + informational message about needing to update /etc/fstab. + + + + + + Create a MBR partition table. + + +# parted /dev/sda -- mklabel msdos + + + + + Add the root partition. This will + fill the the disk except for the end part, where the swap + will live. + + +# parted /dev/sda -- mkpart primary 1MB -8GB + + + + + Set the root partition’s boot flag to on. This allows the + disk to be booted from. + + +# parted /dev/sda -- set 1 boot on + + + + + Finally, add a swap partition. The + size required will vary according to needs, here a 8GiB + one is created. + + +# parted /dev/sda -- mkpart primary linux-swap -8GB 100% + + + + The swap partition size rules are no different than for + other Linux distributions. + + + + + + Once complete, you can follow with + . + +
+
+ Formatting + + + + + + Use the following commands: + + + + + For initialising Ext4 partitions: + mkfs.ext4. It is recommended that you + assign a unique symbolic label to the file system using + the option -L label, since this makes + the file system configuration independent from device + changes. For example: + + +# mkfs.ext4 -L nixos /dev/sda1 + + + + + For creating swap partitions: mkswap. + Again it’s recommended to assign a label to the swap + partition: -L label. For example: + + +# mkswap -L swap /dev/sda2 + + + + + UEFI systems + + + For creating boot partitions: mkfs.fat. + Again it’s recommended to assign a label to the boot + partition: -n label. For example: + + +# mkfs.fat -F 32 -n boot /dev/sda3 + + + + + For creating LVM volumes, the LVM commands, e.g., + pvcreate, vgcreate, + and lvcreate. + + + + + For creating software RAID devices, use + mdadm. + + + +
+
+
+ Installing + + + + - Create a MBR partition table. + Mount the target file system on which NixOS should be + installed on /mnt, e.g. -# parted /dev/sda -- mklabel msdos - - - - - Add the root partition. This will fill - the the disk except for the end part, where the swap will - live. - - -# parted /dev/sda -- mkpart primary 1MB -8GB - - - - - Set the root partition’s boot flag to on. This allows the - disk to be booted from. - - -# parted /dev/sda -- set 1 boot on - - - - - Finally, add a swap partition. The size - required will vary according to needs, here a 8GiB one is - created. - - -# parted /dev/sda -- mkpart primary linux-swap -8GB 100% - - - - The swap partition size rules are no different than for - other Linux distributions. - - - - - - Once complete, you can follow with - . - -
-
- Formatting - - Use the following commands: - - - - - For initialising Ext4 partitions: - mkfs.ext4. It is recommended that you - assign a unique symbolic label to the file system using the - option -L label, since this makes the - file system configuration independent from device changes. - For example: - - -# mkfs.ext4 -L nixos /dev/sda1 - - - - - For creating swap partitions: mkswap. - Again it’s recommended to assign a label to the swap - partition: -L label. For example: - - -# mkswap -L swap /dev/sda2 +# mount /dev/disk/by-label/nixos /mnt @@ -310,322 +557,287 @@ OK UEFI systems - For creating boot partitions: mkfs.fat. - Again it’s recommended to assign a label to the boot - partition: -n label. For example: + Mount the boot file system on /mnt/boot, + e.g. -# mkfs.fat -F 32 -n boot /dev/sda3 - - - - - For creating LVM volumes, the LVM commands, e.g., - pvcreate, vgcreate, - and lvcreate. - - - - - For creating software RAID devices, use - mdadm. - - - -
-
-
- Installing - - - - Mount the target file system on which NixOS should be - installed on /mnt, e.g. - - -# mount /dev/disk/by-label/nixos /mnt - - - - - UEFI systems - - - Mount the boot file system on /mnt/boot, - e.g. - - # mkdir -p /mnt/boot # mount /dev/disk/by-label/boot /mnt/boot - - - - If your machine has a limited amount of memory, you may want - to activate swap devices now - (swapon device). The installer (or rather, - the build actions that it may spawn) may need quite a bit of - RAM, depending on your configuration. - - + + + + If your machine has a limited amount of memory, you may want + to activate swap devices now + (swapon device). The installer (or + rather, the build actions that it may spawn) may need quite + a bit of RAM, depending on your configuration. + + # swapon /dev/sda2 - - - - You now need to create a file - /mnt/etc/nixos/configuration.nix that - specifies the intended configuration of the system. This is - because NixOS has a declarative - configuration model: you create or edit a description of the - desired configuration of your system, and then NixOS takes - care of making it happen. The syntax of the NixOS - configuration file is described in - , while a list of - available configuration options appears in - . A minimal example is shown in - Example: NixOS Configuration. - - - The command nixos-generate-config can - generate an initial configuration file for you: - - + + + + You now need to create a file + /mnt/etc/nixos/configuration.nix that + specifies the intended configuration of the system. This is + because NixOS has a declarative + configuration model: you create or edit a description of the + desired configuration of your system, and then NixOS takes + care of making it happen. The syntax of the NixOS + configuration file is described in + , while a list of + available configuration options appears in + . A minimal example is shown in + Example: NixOS + Configuration. + + + The command nixos-generate-config can + generate an initial configuration file for you: + + # nixos-generate-config --root /mnt - - You should then edit - /mnt/etc/nixos/configuration.nix to suit - your needs: - - + + You should then edit + /mnt/etc/nixos/configuration.nix to suit + your needs: + + # nano /mnt/etc/nixos/configuration.nix - - If you’re using the graphical ISO image, other editors may be - available (such as vim). If you have - network access, you can also install other editors – for - instance, you can install Emacs by running - nix-env -f '<nixpkgs>' -iA emacs. - - - - - BIOS systems - - - - You must set the option - to - specify on which disk the GRUB boot loader is to be - installed. Without it, NixOS cannot boot. - - - If there are other operating systems running on the - machine before installing NixOS, the - - option can be set to true to - automatically add them to the grub menu. - - - - - - UEFI systems - - - - You must select a boot-loader, either system-boot or - GRUB. The recommended option is systemd-boot: set the - option - - to true. - nixos-generate-config should do this - automatically for new configurations when booted in UEFI - mode. - - - You may want to look at the options starting with - boot.loader.efi - and - boot.loader.systemd-boot - as well. - - - If you want to use GRUB, set - to - nodev and - to - true. - - - With system-boot, you should not need any special - configuration to detect other installed systems. With - GRUB, set - to - true, but this will only detect - windows partitions, not other linux distributions. If - you dual boot another linux distribution, use - system-boot instead. - - - - - - If you need to configure networking for your machine the - configuration options are described in - . In particular, while wifi - is supported on the installation image, it is not enabled by - default in the configuration generated by - nixos-generate-config. - - - Another critical option is fileSystems, - specifying the file systems that need to be mounted by NixOS. - However, you typically don’t need to set it yourself, because - nixos-generate-config sets it automatically - in - /mnt/etc/nixos/hardware-configuration.nix - from your currently mounted file systems. (The configuration - file hardware-configuration.nix is included - from configuration.nix and will be - overwritten by future invocations of - nixos-generate-config; thus, you generally - should not modify it.) Additionally, you may want to look at - Hardware - configuration for known-hardware at this point or after - installation. - - - Depending on your hardware configuration or type of file - system, you may need to set the option - boot.initrd.kernelModules to include the - kernel modules that are necessary for mounting the root file - system, otherwise the installed system will not be able to - boot. (If this happens, boot from the installation media - again, mount the target file system on - /mnt, fix - /mnt/etc/nixos/configuration.nix and - rerun nixos-install.) In most cases, - nixos-generate-config will figure out the - required modules. + If you’re using the graphical ISO image, other editors may + be available (such as vim). If you have + network access, you can also install other editors – for + instance, you can install Emacs by running + nix-env -f '<nixpkgs>' -iA emacs. - - - - - Do the installation: - - + + + + BIOS systems + + + + You must set the option + to + specify on which disk the GRUB boot loader is to be + installed. Without it, NixOS cannot boot. + + + If there are other operating systems running on the + machine before installing NixOS, the + + option can be set to true to + automatically add them to the grub menu. + + + + + + UEFI systems + + + + You must select a boot-loader, either system-boot or + GRUB. The recommended option is systemd-boot: set the + option + + to true. + nixos-generate-config should do + this automatically for new configurations when booted + in UEFI mode. + + + You may want to look at the options starting with + boot.loader.efi + and + boot.loader.systemd-boot + as well. + + + If you want to use GRUB, set + to + nodev and + to + true. + + + With system-boot, you should not need any special + configuration to detect other installed systems. With + GRUB, set + to + true, but this will only detect + windows partitions, not other linux distributions. If + you dual boot another linux distribution, use + system-boot instead. + + + + + + If you need to configure networking for your machine the + configuration options are described in + . In particular, while wifi + is supported on the installation image, it is not enabled by + default in the configuration generated by + nixos-generate-config. + + + Another critical option is fileSystems, + specifying the file systems that need to be mounted by + NixOS. However, you typically don’t need to set it yourself, + because nixos-generate-config sets it + automatically in + /mnt/etc/nixos/hardware-configuration.nix + from your currently mounted file systems. (The configuration + file hardware-configuration.nix is + included from configuration.nix and will + be overwritten by future invocations of + nixos-generate-config; thus, you + generally should not modify it.) Additionally, you may want + to look at + Hardware + configuration for known-hardware at this point or + after installation. + + + + Depending on your hardware configuration or type of file + system, you may need to set the option + boot.initrd.kernelModules to include + the kernel modules that are necessary for mounting the + root file system, otherwise the installed system will not + be able to boot. (If this happens, boot from the + installation media again, mount the target file system on + /mnt, fix + /mnt/etc/nixos/configuration.nix and + rerun nixos-install.) In most cases, + nixos-generate-config will figure out + the required modules. + + + + + + Do the installation: + + # nixos-install - - This will install your system based on the configuration you - provided. If anything fails due to a configuration problem or - any other issue (such as a network outage while downloading - binaries from the NixOS binary cache), you can re-run - nixos-install after fixing your - configuration.nix. - - - As the last step, nixos-install will ask - you to set the password for the root user, - e.g. - - + + This will install your system based on the configuration you + provided. If anything fails due to a configuration problem + or any other issue (such as a network outage while + downloading binaries from the NixOS binary cache), you can + re-run nixos-install after fixing your + configuration.nix. + + + As the last step, nixos-install will ask + you to set the password for the root + user, e.g. + + setting root password... New password: *** Retype new password: *** - + + + For unattended installations, it is possible to use + nixos-install --no-root-passwd in order + to disable the password prompt entirely. + + + + - For unattended installations, it is possible to use - nixos-install --no-root-passwd in order - to disable the password prompt entirely. + If everything went well: - - - - - If everything went well: - - + # reboot - - - - You should now be able to boot into the installed NixOS. The - GRUB boot menu shows a list of available - configurations (initially just one). Every time you - change the NixOS configuration (see - Changing - Configuration), a new item is added to the menu. This - allows you to easily roll back to a previous configuration if - something goes wrong. - - - You should log in and change the root - password with passwd. - - - You’ll probably want to create some user accounts as well, - which can be done with useradd: - - + + + + You should now be able to boot into the installed NixOS. The + GRUB boot menu shows a list of available + configurations (initially just one). Every time + you change the NixOS configuration (see + Changing + Configuration), a new item is added to the menu. This + allows you to easily roll back to a previous configuration + if something goes wrong. + + + You should log in and change the root + password with passwd. + + + You’ll probably want to create some user accounts as well, + which can be done with useradd: + + $ useradd -c 'Eelco Dolstra' -m eelco $ passwd eelco - - You may also want to install some software. This will be - covered in . - - - -
-
- Installation summary - - To summarise, Example: - Commands for Installing NixOS on - /dev/sda shows a typical sequence of - commands for installing NixOS on an empty hard drive (here - /dev/sda). Example: - NixOS Configuration shows a corresponding configuration Nix - expression. - - - - Example: Example partition schemes for - NixOS on /dev/sda (MBR) - - + + You may also want to install some software. This will be + covered in . + + + +
+
+ Installation summary + + + + + + To summarise, Example: + Commands for Installing NixOS on + /dev/sda shows a typical sequence of + commands for installing NixOS on an empty hard drive (here + /dev/sda). Example: + NixOS Configuration shows a corresponding configuration + Nix expression. + + + + Example: Example partition schemes for + NixOS on /dev/sda (MBR) + + # parted /dev/sda -- mklabel msdos # parted /dev/sda -- mkpart primary 1MiB -8GiB # parted /dev/sda -- mkpart primary linux-swap -8GiB 100% - - - Example: Example partition schemes for - NixOS on /dev/sda (UEFI) - - + + + Example: Example partition schemes for + NixOS on /dev/sda (UEFI) + + # parted /dev/sda -- mklabel gpt # parted /dev/sda -- mkpart primary 512MiB -8GiB # parted /dev/sda -- mkpart primary linux-swap -8GiB 100% # parted /dev/sda -- mkpart ESP fat32 1MiB 512MiB # parted /dev/sda -- set 3 esp on - - - Example: Commands for Installing NixOS on - /dev/sda - - - With a partitioned disk. - - + + + Example: Commands for Installing NixOS + on /dev/sda + + + With a partitioned disk. + + # mkfs.ext4 -L nixos /dev/sda1 # mkswap -L swap /dev/sda2 # swapon /dev/sda2 @@ -638,11 +850,11 @@ $ passwd eelco # nixos-install # reboot - - - Example: NixOS Configuration - - + + + Example: NixOS Configuration + + { config, pkgs, ... }: { imports = [ # Include the results of the hardware scan. @@ -661,6 +873,7 @@ $ passwd eelco services.sshd.enable = true; } +
Additional installation notes diff --git a/nixos/doc/manual/from_md/installation/obtaining.chapter.xml b/nixos/doc/manual/from_md/installation/obtaining.chapter.xml index a922feda2536..d187adfc0c53 100644 --- a/nixos/doc/manual/from_md/installation/obtaining.chapter.xml +++ b/nixos/doc/manual/from_md/installation/obtaining.chapter.xml @@ -2,16 +2,15 @@ Obtaining NixOS NixOS ISO images can be downloaded from the - NixOS - download page. There are a number of installation options. If - you happen to have an optical drive and a spare CD, burning the - image to CD and booting from that is probably the easiest option. - Most people will need to prepare a USB stick to boot from. - describes the preferred - method to prepare a USB stick. A number of alternative methods are - presented in the - NixOS - Wiki. + NixOS + download page. Follow the instructions in + to create a bootable USB + flash drive. + + + If you have a very old system that can’t boot from USB, you can burn + the image to an empty CD. NixOS might not work very well on such + systems. As an alternative to installing NixOS yourself, you can get a @@ -23,16 +22,16 @@ Using virtual appliances in Open Virtualization Format (OVF) that can be imported into VirtualBox. These are available from the - NixOS + NixOS download page. - Using AMIs for Amazon’s EC2. To find one for your region and - instance type, please refer to the - list - of most recent AMIs. + Using AMIs for Amazon’s EC2. To find one for your region, please + refer to the + download + page. diff --git a/nixos/doc/manual/installation/installing-usb.section.md b/nixos/doc/manual/installation/installing-usb.section.md index d893e22e6381..da32935a7a10 100644 --- a/nixos/doc/manual/installation/installing-usb.section.md +++ b/nixos/doc/manual/installation/installing-usb.section.md @@ -1,31 +1,72 @@ -# Booting from a USB Drive {#sec-booting-from-usb} +# Booting from a USB flash drive {#sec-booting-from-usb} -For systems without CD drive, the NixOS live CD can be booted from a USB -stick. You can use the `dd` utility to write the image: -`dd if=path-to-image of=/dev/sdX`. Be careful about specifying the correct -drive; you can use the `lsblk` command to get a list of block devices. +The image has to be written verbatim to the USB flash drive for it to be +bootable on UEFI and BIOS systems. Here are the recommended tools to do that. -::: {.note} -::: {.title} -On macOS +## Creating bootable USB flash drive with a graphical tool {#sec-booting-from-usb-graphical} + +Etcher is a popular and user-friendly tool. It works on Linux, Windows and macOS. + +Download it from [balena.io](https://www.balena.io/etcher/), start the program, +select the downloaded NixOS ISO, then select the USB flash drive and flash it. + +::: {.warning} +Etcher reports errors and usage statistics by default, which can be disabled in +the settings. ::: -```ShellSession -$ diskutil list -[..] -/dev/diskN (external, physical): - #: TYPE NAME SIZE IDENTIFIER -[..] -$ diskutil unmountDisk diskN -Unmount of all volumes on diskN was successful -$ sudo dd if=nix.iso of=/dev/rdiskN bs=1M -``` +An alternative is [USBImager](https://bztsrc.gitlab.io/usbimager), +which is very simple and does not connect to the internet. Download the version +with write-only (wo) interface for your system. Start the program, +select the image, select the USB flash drive and click "Write". -Using the \'raw\' `rdiskN` device instead of `diskN` completes in -minutes instead of hours. After `dd` completes, a GUI dialog \"The disk -you inserted was not readable by this computer\" will pop up, which can -be ignored. -::: +## Creating bootable USB flash drive from a Terminal on Linux {#sec-booting-from-usb-linux} -The `dd` utility will write the image verbatim to the drive, making it -the recommended option for both UEFI and non-UEFI installations. +1. Plug in the USB flash drive. +2. Find the corresponding device with `lsblk`. You can distinguish them by + their size. +3. Make sure all partitions on the device are properly unmounted. Replace `sdX` + with your device (e.g. `sdb`). + + ```ShellSession + sudo umount /dev/sdX* + ``` + +4. Then use the `dd` utility to write the image to the USB flash drive. + + ```ShellSession + sudo dd if= of=/dev/sdX bs=4M conv=fsync + ``` + +## Creating bootable USB flash drive from a Terminal on macOS {#sec-booting-from-usb-macos} + +1. Plug in the USB flash drive. +2. Find the corresponding device with `diskutil list`. You can distinguish them + by their size. +3. Make sure all partitions on the device are properly unmounted. Replace `diskX` + with your device (e.g. `disk1`). + + ```ShellSession + diskutil unmountDisk diskX + ``` + +4. Then use the `dd` utility to write the image to the USB flash drive. + + ```ShellSession + sudo dd if= of=/dev/rdiskX bs=4m + ``` + + After `dd` completes, a GUI dialog \"The disk + you inserted was not readable by this computer\" will pop up, which can + be ignored. + + ::: {.note} + Using the \'raw\' `rdiskX` device instead of `diskX` with dd completes in + minutes instead of hours. + ::: + +5. Eject the disk when it is finished. + + ```ShellSession + diskutil eject /dev/diskX + ``` diff --git a/nixos/doc/manual/installation/installing.chapter.md b/nixos/doc/manual/installation/installing.chapter.md index b1e58b14b783..44e7e29421d6 100644 --- a/nixos/doc/manual/installation/installing.chapter.md +++ b/nixos/doc/manual/installation/installing.chapter.md @@ -1,30 +1,143 @@ # Installing NixOS {#sec-installation} -## Booting the system {#sec-installation-booting} +## Booting from the install medium {#sec-installation-booting} + +To begin the installation, you have to boot your computer from the install drive. + +1. Plug in the install drive. Then turn on or restart your computer. + +2. Open the boot menu by pressing the appropriate key, which is usually shown + on the display on early boot. + Select the USB flash drive (the option usually contains the word "USB"). + If you choose the incorrect drive, your computer will likely continue to + boot as normal. In that case restart your computer and pick a + different drive. + + ::: {.note} + The key to open the boot menu is different across computer brands and even + models. It can be F12, but also F1, + F9, F10, Enter, Del, + Esc or another function key. If you are unsure and don't see + it on the early boot screen, you can search online for your computers + brand, model followed by "boot from usb". + The computer might not even have that feature, so you have to go into the + BIOS/UEFI settings to change the boot order. Again, search online for + details about your specific computer model. + + For Apple computers with Intel processors press and hold the ⌥ + (Option or Alt) key until you see the boot menu. On Apple silicon press + and hold the power button. + ::: + + ::: {.note} + If your computer supports both BIOS and UEFI boot, choose the UEFI option. + ::: + + ::: {.note} + If you use a CD for the installation, the computer will probably boot from + it automatically. If not, choose the option containing the word "CD" from + the boot menu. + ::: + +3. Shortly after selecting the appropriate boot drive, you should be + presented with a menu with different installer options. Leave the default + and wait (or press Enter to speed up). + +4. The graphical images will start their corresponding desktop environment + and the graphical installer, which can take some time. The minimal images + will boot to a command line. You have to follow the instructions in + [](#sec-installation-manual) there. + +## Graphical Installation {#sec-installation-graphical} + +The graphical installer is recommended for desktop users and will guide you +through the installation. + +1. In the "Welcome" screen, you can select the language of the Installer and + the installed system. + + ::: {.tip} + Leaving the language as "American English" will make it easier to search for + error messages in a search engine or to report an issue. + ::: + +2. Next you should choose your location to have the timezone set correctly. + You can actually click on the map! + + ::: {.note} + The installer will use an online service to guess your location based on + your public IP address. + ::: + +3. Then you can select the keyboard layout. The default keyboard model should + work well with most desktop keyboards. If you have a special keyboard or + notebook, your model might be in the list. Select the language you are most + comfortable typing in. + +4. On the "Users" screen, you have to type in your display name, login name + and password. You can also enable an option to automatically login to the + desktop. + +5. Then you have the option to choose a desktop environment. If you want to + create a custom setup with a window manager, you can select "No desktop". + + ::: {.tip} + If you don't have a favorite desktop and don't know which one to choose, + you can stick to either GNOME or Plasma. They have a quite different + design, so you should choose whichever you like better. + They are both popular choices and well tested on NixOS. + ::: + +6. You have the option to allow unfree software in the next screen. + +7. The easiest option in the "Partitioning" screen is "Erase disk", which will + delete all data from the selected disk and install the system on it. + Also select "Swap (with Hibernation)" in the dropdown below it. + You have the option to encrypt the whole disk with LUKS. + + ::: {.note} + At the top left you see if the Installer was booted with BIOS or UEFI. If + you know your system supports UEFI and it shows "BIOS", reboot with the + correct option. + ::: + + ::: {.warning} + Make sure you have selected the correct disk at the top and that no + valuable data is still on the disk! It will be deleted when + formatting the disk. + ::: + +8. Check the choices you made in the "Summary" and click "Install". + + ::: {.note} + The installation takes about 15 minutes. The time varies based on the + selected desktop environment, internet connection speed and disk write speed. + ::: + +9. When the install is complete, remove the USB flash drive and + reboot into your new system! + +## Manual Installation {#sec-installation-manual} NixOS can be installed on BIOS or UEFI systems. The procedure for a UEFI -installation is by and large the same as a BIOS installation. The -differences are mentioned in the steps that follow. +installation is broadly the same as for a BIOS installation. The differences +are mentioned in the following steps. -The installation media can be burned to a CD, or now more commonly, -"burned" to a USB drive (see [](#sec-booting-from-usb)). +The NixOS manual is available by running `nixos-help` in the command line +or from the application menu in the desktop environment. -The installation media contains a basic NixOS installation. When it's -finished booting, it should have detected most of your hardware. - -The NixOS manual is available by running `nixos-help`. +To have access to the command line on the graphical images, open +Terminal (GNOME) or Konsole (Plasma) from the application menu. You are logged-in automatically as `nixos`. The `nixos` user account has an empty password so you can use `sudo` without a password: + ```ShellSession $ sudo -i ``` -If you downloaded the graphical ISO image, you can run `systemctl -start display-manager` to start the desktop environment. If you want -to continue on the terminal, you can use `loadkeys` to switch to your -preferred keyboard layout. (We even provide neo2 via `loadkeys de -neo`!) +You can use `loadkeys` to switch to your preferred keyboard layout. +(We even provide neo2 via `loadkeys de neo`!) If the text is too small to be legible, try `setfont ter-v32n` to increase the font size. @@ -33,7 +146,8 @@ To install over a serial port connect with `115200n8` (e.g. `picocom -b 115200 /dev/ttyUSB0`). When the bootloader lists boot entries, select the serial console boot entry. -### Networking in the installer {#sec-installation-booting-networking} +### Networking in the installer {#sec-installation-manual-networking} +[]{#sec-installation-booting-networking} The boot process should have brought up networking (check `ip a`). Networking is necessary for the installer, since it will @@ -100,7 +214,8 @@ placed by mounting the image on a different machine). Alternatively you must set a password for either `root` or `nixos` with `passwd` to be able to login. -## Partitioning and formatting {#sec-installation-partitioning} +### Partitioning and formatting {#sec-installation-manual-partitioning} +[]{#sec-installation-partitioning} The NixOS installer doesn't do any partitioning or formatting, so you need to do that yourself. @@ -112,7 +227,8 @@ below use `parted`, but also provides `fdisk`, `gdisk`, `cfdisk`, and The recommended partition scheme differs depending if the computer uses *Legacy Boot* or *UEFI*. -### UEFI (GPT) {#sec-installation-partitioning-UEFI} +#### UEFI (GPT) {#sec-installation-manual-partitioning-UEFI} +[]{#sec-installation-partitioning-UEFI} Here\'s an example partition scheme for UEFI, using `/dev/sda` as the device. @@ -158,9 +274,10 @@ update /etc/fstab. ``` Once complete, you can follow with -[](#sec-installation-partitioning-formatting). +[](#sec-installation-manual-partitioning-formatting). -### Legacy Boot (MBR) {#sec-installation-partitioning-MBR} +#### Legacy Boot (MBR) {#sec-installation-manual-partitioning-MBR} +[]{#sec-installation-partitioning-MBR} Here\'s an example partition scheme for Legacy Boot, using `/dev/sda` as the device. @@ -202,9 +319,10 @@ update /etc/fstab. ::: Once complete, you can follow with -[](#sec-installation-partitioning-formatting). +[](#sec-installation-manual-partitioning-formatting). -### Formatting {#sec-installation-partitioning-formatting} +#### Formatting {#sec-installation-manual-partitioning-formatting} +[]{#sec-installation-partitioning-formatting} Use the following commands: @@ -239,7 +357,8 @@ Use the following commands: - For creating software RAID devices, use `mdadm`. -## Installing {#sec-installation-installing} +### Installing {#sec-installation-manual-installing} +[]{#sec-installation-installing} 1. Mount the target file system on which NixOS should be installed on `/mnt`, e.g. @@ -410,7 +529,8 @@ Use the following commands: You may also want to install some software. This will be covered in [](#sec-package-management). -## Installation summary {#sec-installation-summary} +### Installation summary {#sec-installation-manual-summary} +[]{#sec-installation-summary} To summarise, [Example: Commands for Installing NixOS on `/dev/sda`](#ex-install-sequence) shows a typical sequence of commands for installing NixOS on an empty hard diff --git a/nixos/doc/manual/installation/obtaining.chapter.md b/nixos/doc/manual/installation/obtaining.chapter.md index 832ec6146a9d..a72194ecf985 100644 --- a/nixos/doc/manual/installation/obtaining.chapter.md +++ b/nixos/doc/manual/installation/obtaining.chapter.md @@ -1,24 +1,21 @@ # Obtaining NixOS {#sec-obtaining} NixOS ISO images can be downloaded from the [NixOS download -page](https://nixos.org/nixos/download.html). There are a number of -installation options. If you happen to have an optical drive and a spare -CD, burning the image to CD and booting from that is probably the -easiest option. Most people will need to prepare a USB stick to boot -from. [](#sec-booting-from-usb) describes the preferred method to -prepare a USB stick. A number of alternative methods are presented in -the [NixOS Wiki](https://nixos.wiki/wiki/NixOS_Installation_Guide#Making_the_installation_media). +page](https://nixos.org/download.html#nixos-iso). Follow the instructions in +[](#sec-booting-from-usb) to create a bootable USB flash drive. + +If you have a very old system that can't boot from USB, you can burn the image +to an empty CD. NixOS might not work very well on such systems. As an alternative to installing NixOS yourself, you can get a running NixOS system through several other means: - Using virtual appliances in Open Virtualization Format (OVF) that can be imported into VirtualBox. These are available from the [NixOS - download page](https://nixos.org/nixos/download.html). + download page](https://nixos.org/download.html#nixos-virtualbox). -- Using AMIs for Amazon's EC2. To find one for your region and - instance type, please refer to the [list of most recent - AMIs](https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/virtualisation/ec2-amis.nix). +- Using AMIs for Amazon's EC2. To find one for your region, please refer + to the [download page](https://nixos.org/download.html#nixos-amazon). - Using NixOps, the NixOS-based cloud deployment tool, which allows you to provision VirtualBox and EC2 NixOS instances from declarative diff --git a/nixos/doc/manual/md-to-db.sh b/nixos/doc/manual/md-to-db.sh index 2091f9b31cd2..beb0ff9f7082 100755 --- a/nixos/doc/manual/md-to-db.sh +++ b/nixos/doc/manual/md-to-db.sh @@ -19,6 +19,7 @@ pandoc_flags=( "--lua-filter=$DIR/../../../doc/build-aux/pandoc-filters/myst-reader/roles.lua" "--lua-filter=$DIR/../../../doc/build-aux/pandoc-filters/link-unix-man-references.lua" "--lua-filter=$DIR/../../../doc/build-aux/pandoc-filters/docbook-writer/rst-roles.lua" + "--lua-filter=$DIR/../../../doc/build-aux/pandoc-filters/docbook-writer/html-elements.lua" "--lua-filter=$DIR/../../../doc/build-aux/pandoc-filters/docbook-writer/labelless-link-is-xref.lua" -f "commonmark${pandoc_commonmark_enabled_extensions}+smart" -t docbook diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 9e15844f7dd2..414d5cfe9dfd 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -852,7 +852,7 @@ in { }; contactPoints = mkOption { - description = lib.mdDoc "List of contact points to import or update."; + description = lib.mdDoc "List of contact points to import or update. Please note that sensitive data will end up in world-readable Nix store."; default = []; type = types.listOf (types.submodule { freeformType = provisioningSettingsFormat.type; @@ -1158,17 +1158,23 @@ in { }; config = mkIf cfg.enable { - warnings = flatten [ + warnings = let + usesFileProvider = opt: defaultValue: builtins.match "^${defaultValue}$|^\\$__file\\{.*}$" opt != null; + in flatten [ (optional ( - cfg.settings.database.password != "" || - cfg.settings.security.admin_password != "admin" + ! usesFileProvider cfg.settings.database.password "" || + ! usesFileProvider cfg.settings.security.admin_password "admin" ) "Grafana passwords will be stored as plaintext in the Nix store! Use file provider instead.") (optional ( let checkOpts = opt: any (x: x.password != null || x.basicAuthPassword != null || x.secureJsonData != null) opt; datasourcesUsed = if (cfg.provision.datasources.settings == null) then [] else cfg.provision.datasources.settings.datasources; in if (builtins.isList cfg.provision.datasources) then checkOpts cfg.provision.datasources else checkOpts datasourcesUsed - ) "Datasource passwords will be stored as plaintext in the Nix store! Use file provider instead.") + ) '' + Datasource passwords will be stored as plaintext in the Nix store! + It is not possible to use file provider in provisioning; please provision + datasources via `services.grafana.provision.datasources.path` instead. + '') (optional ( any (x: x.secure_settings != null) cfg.provision.notifiers ) "Notifier secure settings will be stored as plaintext in the Nix store! Use file provider instead.") diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix index 779e7d4ad44b..dad8c3d3e38b 100644 --- a/nixos/modules/services/web-apps/mastodon.nix +++ b/nixos/modules/services/web-apps/mastodon.nix @@ -475,7 +475,6 @@ in { } // cfgService; after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; }; systemd.services.mastodon-init-db = lib.mkIf cfg.automaticMigrations { @@ -500,16 +499,21 @@ in { # System Call Filtering SystemCallFilter = [ ("~" + lib.concatStringsSep " " (systemCallsList ++ [ "@resources" ])) "@chown" "pipe" "pipe2" ]; } // cfgService; - after = [ "mastodon-init-dirs.service" "network.target" ] ++ (if databaseActuallyCreateLocally then [ "postgresql.service" ] else []); - wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "mastodon-init-dirs.service" ] + ++ lib.optional databaseActuallyCreateLocally "postgresql.service"; + requires = [ "mastodon-init-dirs.service" ] + ++ lib.optional databaseActuallyCreateLocally "postgresql.service"; }; systemd.services.mastodon-streaming = { - after = [ "network.target" ] - ++ (if databaseActuallyCreateLocally then [ "postgresql.service" ] else []) - ++ (if cfg.automaticMigrations then [ "mastodon-init-db.service" ] else [ "mastodon-init-dirs.service" ]); - description = "Mastodon streaming"; + after = [ "network.target" "mastodon-init-dirs.service" ] + ++ lib.optional databaseActuallyCreateLocally "postgresql.service" + ++ lib.optional cfg.automaticMigrations "mastodon-init-db.service"; + requires = [ "mastodon-init-dirs.service" ] + ++ lib.optional databaseActuallyCreateLocally "postgresql.service" + ++ lib.optional cfg.automaticMigrations "mastodon-init-db.service"; wantedBy = [ "multi-user.target" ]; + description = "Mastodon streaming"; environment = env // (if cfg.enableUnixSocket then { SOCKET = "/run/mastodon-streaming/streaming.socket"; } else { PORT = toString(cfg.streamingPort); } @@ -529,11 +533,14 @@ in { }; systemd.services.mastodon-web = { - after = [ "network.target" ] - ++ (if databaseActuallyCreateLocally then [ "postgresql.service" ] else []) - ++ (if cfg.automaticMigrations then [ "mastodon-init-db.service" ] else [ "mastodon-init-dirs.service" ]); - description = "Mastodon web"; + after = [ "network.target" "mastodon-init-dirs.service" ] + ++ lib.optional databaseActuallyCreateLocally "postgresql.service" + ++ lib.optional cfg.automaticMigrations "mastodon-init-db.service"; + requires = [ "mastodon-init-dirs.service" ] + ++ lib.optional databaseActuallyCreateLocally "postgresql.service" + ++ lib.optional cfg.automaticMigrations "mastodon-init-db.service"; wantedBy = [ "multi-user.target" ]; + description = "Mastodon web"; environment = env // (if cfg.enableUnixSocket then { SOCKET = "/run/mastodon-web/web.socket"; } else { PORT = toString(cfg.webPort); } @@ -554,11 +561,14 @@ in { }; systemd.services.mastodon-sidekiq = { - after = [ "network.target" ] - ++ (if databaseActuallyCreateLocally then [ "postgresql.service" ] else []) - ++ (if cfg.automaticMigrations then [ "mastodon-init-db.service" ] else [ "mastodon-init-dirs.service" ]); - description = "Mastodon sidekiq"; + after = [ "network.target" "mastodon-init-dirs.service" ] + ++ lib.optional databaseActuallyCreateLocally "postgresql.service" + ++ lib.optional cfg.automaticMigrations "mastodon-init-db.service"; + requires = [ "mastodon-init-dirs.service" ] + ++ lib.optional databaseActuallyCreateLocally "postgresql.service" + ++ lib.optional cfg.automaticMigrations "mastodon-init-db.service"; wantedBy = [ "multi-user.target" ]; + description = "Mastodon sidekiq"; environment = env // { PORT = toString(cfg.sidekiqPort); DB_POOL = toString cfg.sidekiqThreads; diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix index c0488a0e93a3..79af02710c32 100644 --- a/nixos/tests/kafka.nix +++ b/nixos/tests/kafka.nix @@ -50,7 +50,7 @@ let kafka.wait_until_succeeds( "${kafkaPackage}/bin/kafka-topics.sh --create " - + "--zookeeper zookeeper1:2181 --partitions 1 " + + "--bootstrap-server localhost:9092 --partitions 1 " + "--replication-factor 1 --topic testtopic" ) kafka.succeed( @@ -58,19 +58,12 @@ let + "${kafkaPackage}/bin/kafka-console-producer.sh " + "--broker-list localhost:9092 --topic testtopic" ) - '' + (if name == "kafka_0_9" then '' - assert "test 1" in kafka.succeed( - "${kafkaPackage}/bin/kafka-console-consumer.sh " - + "--zookeeper zookeeper1:2181 --topic testtopic " - + "--from-beginning --max-messages 1" - ) - '' else '' assert "test 1" in kafka.succeed( "${kafkaPackage}/bin/kafka-console-consumer.sh " + "--bootstrap-server localhost:9092 --topic testtopic " + "--from-beginning --max-messages 1" ) - ''); + ''; }) { inherit system; }); in with pkgs; { diff --git a/nixos/tests/tracee.nix b/nixos/tests/tracee.nix index 26d0ada931b1..72e82ec0b7ed 100644 --- a/nixos/tests/tracee.nix +++ b/nixos/tests/tracee.nix @@ -14,15 +14,18 @@ import ./make-test-python.nix ({ pkgs, ... }: { patches = oa.patches or [] ++ [ # change the prefix from /usr/bin to /run to find nix processes ../../pkgs/tools/security/tracee/test-EventFilters-prefix-nix-friendly.patch - # skip magic_write test that currently fails - ../../pkgs/tools/security/tracee/test-EventFilters-magic_write-skip.patch ]; buildPhase = '' runHook preBuild # just build the static lib we need for the go test binary - make $makeFlags ''${enableParallelBuilding:+-j$NIX_BUILD_CORES -l$NIX_BUILD_CORES} bpf-core ./dist/btfhub ./dist/libbpf/libbpf.a + make $makeFlags ''${enableParallelBuilding:+-j$NIX_BUILD_CORES -l$NIX_BUILD_CORES} bpf-core ./dist/btfhub + + # remove the /usr/bin prefix to work with the patch above + substituteInPlace tests/integration/integration_test.go \ + --replace "/usr/bin/ls" "ls" + # then compile the tests to be ran later - CGO_CFLAGS="-I$PWD/dist/libbpf" CGO_LDFLAGS="-lelf -lz $PWD/dist/libbpf/libbpf.a" go test -tags core,ebpf,integration -p 1 -c -o $GOPATH/tracee-integration ./tests/integration/... + CGO_LDFLAGS="$(pkg-config --libs libbpf)" go test -tags core,ebpf,integration -p 1 -c -o $GOPATH/tracee-integration ./tests/integration/... runHook postBuild ''; doCheck = false; diff --git a/pkgs/applications/editors/rehex/default.nix b/pkgs/applications/editors/rehex/default.nix index 6a67d6df743c..ef1ae88902cf 100644 --- a/pkgs/applications/editors/rehex/default.nix +++ b/pkgs/applications/editors/rehex/default.nix @@ -8,9 +8,10 @@ , capstone , jansson , libunistring -, wxGTK31 +, wxGTK32 , lua53Packages , perlPackages +, gtk3 , Carbon , Cocoa , IOKit @@ -18,21 +19,22 @@ stdenv.mkDerivation rec { pname = "rehex"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "solemnwarning"; repo = pname; rev = version; - hash = "sha256-VBHNrOVIz7UM9tY1V7Ykwt4Cv0fY++8gXc2og4sLDk8="; + hash = "sha256-UgwCfy2ssaPuSWeN2SXHBDXv/uLdrDoGr/Q9wXiuCnc="; }; nativeBuildInputs = [ pkg-config which zip ] ++ lib.optionals stdenv.isDarwin [ libicns ]; - buildInputs = [ capstone jansson libunistring wxGTK31 ] + buildInputs = [ capstone jansson libunistring wxGTK32 ] ++ (with lua53Packages; [ lua busted ]) ++ (with perlPackages; [ perl TemplateToolkit ]) + ++ lib.optionals stdenv.isLinux [ gtk3 ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa IOKit ]; makeFlags = [ "prefix=${placeholder "out"}" ] diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 6fcce74aa329..55f7375e0020 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -281,12 +281,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-10-19"; + version = "2022-10-24"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "fe35502e8c05d33bbc359487ee5b9cf7fad2a76a"; - sha256 = "0w702smq4wa9cgx17mwsj59yl0rr1msppa5d3js0bkj27ij3g33k"; + rev = "01c21b6a204b548b78e9cdff451d5d1a42af23d1"; + sha256 = "0acpfyl6803kjphbcjgw3xkvhk2g0kvbjlhqbkf1jssya34mzhax"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -341,12 +341,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2022-10-21"; + version = "2022-10-25"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "b488dd5aeb787e030052a0583a345aa33c580b83"; - sha256 = "0spa9nb93ksbap177prwcicixf522dzkmlzq7flgb92yfh2hwm8b"; + rev = "1c1d63d923fdbad74b826664e4fd75fb2d068e75"; + sha256 = "11pzd5bzin4138iky36idvqd8416h2cchs0xjwlddad1v7s6biyl"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -798,12 +798,12 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2022-10-20"; + version = "2022-10-22"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "68a2751728f9ab3d3510f0fe9165a2a451aa8727"; - sha256 = "0npwghnll4csngr0ly4wvqbrgmyn1dra138z43nm069w6n157q9g"; + rev = "88fc13534f26d4a6a8fc48caf73f91a0568c5d09"; + sha256 = "0gmxby72is161cxdj9wa328z93rxi2ip1sy8v0nbwmvlr9l2vc4b"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -1278,12 +1278,12 @@ final: prev: cmp-fuzzy-path = buildVimPluginFrom2Nix { pname = "cmp-fuzzy-path"; - version = "2022-10-13"; + version = "2022-10-23"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-fuzzy-path"; - rev = "2c0f893eee7c773871fc4ddf400b6339ab7914a6"; - sha256 = "0m6wlns0zi07fmn9szx055chm8r83yigyjd2ykphw3z110b02wqv"; + rev = "72e1fc3922d21fbd6dbc3dd7344bce5f4b2defa8"; + sha256 = "1hqdq4d20gww7pkbfr4cd8y98xawf8vmjgaksncj67ry9mrbj8lh"; }; meta.homepage = "https://github.com/tzachar/cmp-fuzzy-path/"; }; @@ -1374,12 +1374,12 @@ final: prev: cmp-nvim-lsp-document-symbol = buildVimPluginFrom2Nix { pname = "cmp-nvim-lsp-document-symbol"; - version = "2022-03-22"; + version = "2022-10-24"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lsp-document-symbol"; - rev = "c3f0086ed9882e52e0ae38dd5afa915f69054941"; - sha256 = "1jprb86z081kpxyb2dhw3n1pq15dzcc9wlwmpb6k43mqd7k8q11l"; + rev = "069a207be6a0327dcc62c957dbb38156b210733a"; + sha256 = "1gpw9zmx60y6zrxb7ncgmak7sgzg8j5fhd4hqx2qkkrq6qkh07d3"; }; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp-document-symbol/"; }; @@ -1650,12 +1650,12 @@ final: prev: coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2022-10-05"; + version = "2022-10-25"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "cb405c0dc72312a06d17710a537ab0e6b6758648"; - sha256 = "12s2nxyck0hwxk3z4h5knss9wsjmwiimj9kxs4bywwibwlwgnf6i"; + rev = "812b0a47d0c8b066684d75bc6f9ad84627f8579e"; + sha256 = "1fr86avlyggkinai630pnji8d94wzsw14hb5d4yr8jn3rv9a8cmk"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; @@ -1722,12 +1722,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-10-21"; + version = "2022-10-24"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "84739fd4059e3a8b0ed1b2ac7eba7c8a2ad76c79"; - sha256 = "0pc1183ydmn2c06zl2zgxlidcrw6fw104fxi868fifbvm13q3sd9"; + rev = "69a596f24e31aa6e6932f30123b809633e27df51"; + sha256 = "1b3084ssfj1d1j2cj3gn281y5263rsdw5ccwynl6jv2zjl88vm76"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1798,8 +1798,8 @@ final: prev: src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "e8d4847f0ca246a605c720b4a740b57f7cdb3a65"; - sha256 = "18ih0wc7gk8kvx9bhafbdajb6jf225l25rjfjamwy83i4kcn4xl0"; + rev = "491ffa37ea7033850998d7f0ef04387c063ed2f6"; + sha256 = "19pdrway7zx0rd9w96i8dl84v5m2ac8ag1c0qg3dny9c6ain2bjv"; }; meta.homepage = "https://github.com/wincent/command-t/"; }; @@ -2010,24 +2010,24 @@ final: prev: coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2022-10-21"; + version = "2022-10-25"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "340c074eedb58c72aecba13acdb17e6d34779898"; - sha256 = "1p6ivb9amaassvmfz8117k3bxyf5x18zay75fc6h1f4vdm594g6c"; + rev = "8aa3998926d37c238dd76583c8e6aef6604d63d2"; + sha256 = "0zgh3gmrnackp9mq6q96y17i5ij9h6psv31s7vawvzw47jfv2nsv"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2022-10-21"; + version = "2022-10-25"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "37d29e9ab0f1f4db7ce10ec116c14e8c74584142"; - sha256 = "0b9h9ggxkrkdavg0h9dpkm8nkicmdz7lk3ix18xl9br2vmlah3bb"; + rev = "7f91024846de1259f211c337ad186a819ae74b3c"; + sha256 = "1nzwl690m4bmqlmcpd8ym97jcdapv9n6wvz60nr99l4qbq5y8yv4"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2046,12 +2046,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-10-21"; + version = "2022-10-25"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "a6e5c0921f58fa6bee85d3c33915d8397125dc0e"; - sha256 = "1hgnbz7dk8ac5klqjdc85m149vlhdjqfrxx1l8kcxxraws3zzfsk"; + rev = "202aab5417009eda55227fa9e3895dce573a21b4"; + sha256 = "136vdi0blkjxj9qyl36v8fjrlk6jmbffrk5bgxg05hsmhd021gnh"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2564,12 +2564,12 @@ final: prev: dial-nvim = buildVimPluginFrom2Nix { pname = "dial.nvim"; - version = "2022-10-18"; + version = "2022-10-22"; src = fetchFromGitHub { owner = "monaqa"; repo = "dial.nvim"; - rev = "fa74b74732520e224ed05cb8bc938806258011ce"; - sha256 = "10yp92776vn8g19bdn7m9rrb8vx5p2r326xz6ssy6s140g3sg0hc"; + rev = "9ba17c2ee636a8e7fdef5b69d6aac54dd26f4384"; + sha256 = "0c22dg8mscgv8kgxmynj0vagp2lrccp1mjv0ski3mr5d4gq83x9q"; }; meta.homepage = "https://github.com/monaqa/dial.nvim/"; }; @@ -2842,12 +2842,12 @@ final: prev: fidget-nvim = buildVimPluginFrom2Nix { pname = "fidget.nvim"; - version = "2022-10-02"; + version = "2022-10-25"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "1097a86db8ba38e390850dc4035a03ed234a4673"; - sha256 = "15pspfihd2rjzyw6pzd3yycjrn98nx79njasrn4j4sl4ivlay5g6"; + rev = "2cf9997d3bde2323a1a0934826ec553423005a26"; + sha256 = "04y9lm3cm4ik0hi5b95p1wch6l460wn29dxcrn9abqbsfzwnv3d7"; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; @@ -2963,12 +2963,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2022-10-12"; + version = "2022-10-22"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "fd16b4d9dc58119eeee57e9915864c4480d591fd"; - sha256 = "18fzpij4c11jvxhsjp65cmmc7nna4p3whjsx8a0a263kahh8npfp"; + rev = "b838c362477a4af8a0251518a6865e518f4ed6eb"; + sha256 = "166p9hqfx9rhj9g199adb0nmqjx1kq0y5xdpq784jslyfaj3xngv"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3071,12 +3071,12 @@ final: prev: fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2022-10-19"; + version = "2022-10-23"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "5eeacc2f6646a2b51f99cb321c4d1e6c48abf22f"; - sha256 = "0gp23r9kfnakcb4rxks9xx8dfiphgwwx34vccbmx51d490yb4b50"; + rev = "abc3aed243115dc18fc41acd49b9037655a561af"; + sha256 = "0s7p8blmlwzxy4lcb8rww6jfb3ws2y1b9pmf5czw867kd5r084b7"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3167,12 +3167,12 @@ final: prev: git-blame-nvim = buildVimPluginFrom2Nix { pname = "git-blame.nvim"; - version = "2022-09-26"; + version = "2022-10-23"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "08e75b7061f4a654ef62b0cac43a9015c87744a2"; - sha256 = "1dkccgbq1xjm8cxpiqwg7czqsqhdxf19fc88nnz31854qsdx01s5"; + rev = "7c498272d0f97c583fc3a92f196231a90455eb19"; + sha256 = "0fm6qxqb6yq62lxz8iz0kc07xn6951zh2xqird7prp7vdvh1d78q"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -3227,12 +3227,12 @@ final: prev: gitsigns-nvim = buildNeovimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2022-10-16"; + version = "2022-10-21"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "56e01cb0ea52635854e97bd2dd2587c8ebfab978"; - sha256 = "0rdfnw2pr0hjxlw7bfjfvbh7lll4ba8ymp5nxq58d0jq01lzsxkr"; + rev = "21ab05c2629ef613b1c3452d12469f936855648b"; + sha256 = "0c7m07h56fk273780awlrx234dlxzbb75a1i2x65i1hvysjw67bz"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3299,12 +3299,12 @@ final: prev: goto-preview = buildVimPluginFrom2Nix { pname = "goto-preview"; - version = "2022-07-19"; + version = "2022-10-22"; src = fetchFromGitHub { owner = "rmagatti"; repo = "goto-preview"; - rev = "a5af27cff485b325f0ef2dcdf55ae51faed05cba"; - sha256 = "11dzbl8jh6pwfys87bj9awysmfhhlmyzbhh8vfqdisbmmmqz3c3y"; + rev = "778cf600684a87eb36f9bb469346cfa8d5384a76"; + sha256 = "1f4mxr73q1jgfrfir6ydmaa165fbhzmayxrl1srwx1n96ws5q4fg"; }; meta.homepage = "https://github.com/rmagatti/goto-preview/"; }; @@ -3419,12 +3419,12 @@ final: prev: gv-vim = buildVimPluginFrom2Nix { pname = "gv.vim"; - version = "2022-06-17"; + version = "2022-10-25"; src = fetchFromGitHub { owner = "junegunn"; repo = "gv.vim"; - rev = "1507838ee67f9b298def89cbfc404a0fee4a4b8c"; - sha256 = "0fkwhyywjhh2r6c8534kvfn3shv3rjvcc53wm2pz3yqk73b6r2c9"; + rev = "320cc8c477c5acc4fa0e52a460d87b2af54fa051"; + sha256 = "1w0vwdvhbjs5gfggxrdphysj7y4yd53kklijgybjcchwjz98pncb"; }; meta.homepage = "https://github.com/junegunn/gv.vim/"; }; @@ -4007,12 +4007,12 @@ final: prev: leap-nvim = buildVimPluginFrom2Nix { pname = "leap.nvim"; - version = "2022-10-15"; + version = "2022-10-23"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "a9d3232b178fddabb6660dc19abf40e05d6841b0"; - sha256 = "0ip1cylfsdcfjswg7f3lkwnxqab5x1mdhmik7krhis9c2x5harg2"; + rev = "847a1dcfb1a3a576860151754d95fb3b0014663e"; + sha256 = "16dg98qs0531hfcvg6mfb643nivgsx6q4jz8yl2cqd89c0mkfgq4"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; @@ -4163,12 +4163,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed.nvim"; - version = "2022-08-16"; + version = "2022-10-21"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "a5b79ddbd755ac8d21a8704c370b5f643dda94aa"; - sha256 = "0r4d6vvj412sj0hadxckirgfa68zkqxxij1609f5nmv9kvm6w190"; + rev = "299eefa6a9e2d881f1194587c573dad619fdb96f"; + sha256 = "1697plp2f6r5vmayi4xw23lj69pc31r3zh3p07rzxgl2ir4zrj1z"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -4319,12 +4319,12 @@ final: prev: lsp-overloads-nvim = buildVimPluginFrom2Nix { pname = "lsp-overloads.nvim"; - version = "2022-10-12"; + version = "2022-10-21"; src = fetchFromGitHub { owner = "Issafalcon"; repo = "lsp-overloads.nvim"; - rev = "ad00f4e4e00cd8b2dd355587a9428330ca40de2b"; - sha256 = "1b0j8h9jvnkhxzdg4bx4fhm9k5dgr5jvjqhdsrs6l7199hl5p4jq"; + rev = "2d8671d6787045bed518dce9c2f82a0ece76ed66"; + sha256 = "1v873y2b52v2sa09ans6rs3f5kylb6izx2ffd9wpdg5y8i9s83s1"; }; meta.homepage = "https://github.com/Issafalcon/lsp-overloads.nvim/"; }; @@ -4390,12 +4390,12 @@ final: prev: lspcontainers-nvim = buildVimPluginFrom2Nix { pname = "lspcontainers.nvim"; - version = "2022-06-25"; + version = "2022-10-23"; src = fetchFromGitHub { owner = "lspcontainers"; repo = "lspcontainers.nvim"; - rev = "ea430ff6e155dc26f971573eb21422d77cf9d8f0"; - sha256 = "0rv3prk475f8hzhmf888j7kyvc37pmhi3w4xmgmpqqj486jplz39"; + rev = "648dfb56195b3d4450c3974ce86fb1f2ff8b55d5"; + sha256 = "1xrf4knmddf5mhinsfjwgcgi3h1lff19ck2ffih2868kmps771dl"; }; meta.homepage = "https://github.com/lspcontainers/lspcontainers.nvim/"; }; @@ -4438,12 +4438,12 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine.nvim"; - version = "2022-10-19"; + version = "2022-10-23"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "abb03129e0b0b7f4c992b1b4c98245cd4422e7d5"; - sha256 = "1lwwhiwqv5f1i0v6a6g6zbmj5pfs5ya3mnxn3d36q8zf4ssz8xfh"; + rev = "3325d5d43a7a2bc9baeef2b7e58e1d915278beaf"; + sha256 = "1kz3kzgz7hl27hvxqb9kdiw6y7gyc9qyd3qppm1bp3s4kxbp2fm6"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; @@ -4475,12 +4475,12 @@ final: prev: lush-nvim = buildNeovimPluginFrom2Nix { pname = "lush.nvim"; - version = "2022-10-16"; + version = "2022-10-22"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "97001cd2978ac8fff4f87acf4c5ee0fa59224ab8"; - sha256 = "0q1p2q59gjffc7rnqb0lzvy77lnqyzkrnhp6arfb0sqgfnqra8dw"; + rev = "57e0b8574d1edf00f16e7ee82ea39bbe19825cb1"; + sha256 = "0vmyzk2hmrf5cvw7f43djn7980c558r9fwf3c5wbv1r8vipr0vik"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -4535,12 +4535,12 @@ final: prev: material-nvim = buildVimPluginFrom2Nix { pname = "material.nvim"; - version = "2022-10-20"; + version = "2022-10-24"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "7fca639bd8e3c775be885383002cf8ebdc93a6f7"; - sha256 = "17ih1lsxpalpj63gp2mdgwnzrvayqxn8s52wn1m4s92d0fs8pn3j"; + rev = "757ce580c0901d7459fe3bfdb4eb0f3d92b38f05"; + sha256 = "09bp1pnjza3sixj7z5vg47h5wvfq57jm4mij05zggd01g7ibmnfq"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -4559,12 +4559,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2022-10-21"; + version = "2022-10-24"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "8087764d8c38cfa604511f57dab51ad64316c16c"; - sha256 = "09ycmhdb7rihb0dldl6pma6b8z6arx7pbh2i41avp3r30lgnxnv4"; + rev = "8b0f423d4d95aaa165b687a687b4651401040986"; + sha256 = "1k10fbam4fllkfrqcg54b5p9kcsyhbhyx1n2m0cliq72ygpnm4vv"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -4931,36 +4931,36 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2022-10-21"; + version = "2022-10-25"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "97ebf23c0d4f5a11f1d68a5abd468751b14980a1"; - sha256 = "023ndb3y0ak4id4svzj3g9lqlp8azp7bsb6y9h17mglll9kh6mdr"; + rev = "b475883321cb4fed8e932e462d7d85f0693492a1"; + sha256 = "1bapaw8awz9d2zxxs5w8lw027lavfdnfq40jbm2pxbg81z2nsj24"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2022-10-21"; + version = "2022-10-23"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "c4be749032b39a34ad89dddacda2f93a85d43a93"; - sha256 = "19f921m51943v731mmbzvknfjwrra2vjz3ppxzh935r3cq9l8ca0"; + rev = "b08bd3a914777ff62ae2d7c17df9549c4b1dd778"; + sha256 = "12fm51xi8dnqvizvy59vda7nvkr4mv9g6ipz3w7f0kf5r2avqrd2"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2022-10-02"; + version = "2022-10-25"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "74c9e29b61780345d3ad9d7a4a4437607caead4a"; - sha256 = "07szj9ajv3n8hpx0ibvysi0p5rfshcnbk0v3jyh2lvrcvky2qkqg"; + rev = "b53d6b1302a7b66521500b6dd2810bc5764cb2e6"; + sha256 = "1c2pmfxcgx8jdlhcllzx4615cjgz224vyxjsa59pv93rwlpvjm0m"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -5015,12 +5015,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-10-20"; + version = "2022-10-23"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "9b3ea123f738391f78968e95402368c7ee48db65"; - sha256 = "05l26h1q9z5yfx70vzvkcmqd5v5j4j7napdxbjmp8pxad2yghc8q"; + rev = "f5604d9053e375622821ea28db21ea6718310f6f"; + sha256 = "1skz1knih9bh3w4q5348b5ma6mpp84bxaksg4m53iy451adp7kry"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -5075,12 +5075,12 @@ final: prev: neovim-ayu = buildVimPluginFrom2Nix { pname = "neovim-ayu"; - version = "2022-10-20"; + version = "2022-10-22"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "08ae56d07f175ac997324e89dd25229f7ab1bdfa"; - sha256 = "0kklva47g1jf9ab1psgbxfw3w995kvg54jxzc9zplj4z8ppmp4hw"; + rev = "3a0e91b9b120500b5e56c3c4fff6669bc5987142"; + sha256 = "0liygpqlxhkdyc7n8c8mwavazrbjvn1wyv5gkb0h58kflr05bh1d"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -5195,12 +5195,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2022-10-20"; + version = "2022-10-22"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "2ae719a01b80ca0629d5983aa9b23e7daf00744b"; - sha256 = "1ph52n0y0pzb32wnzjg753wm8v5nj0l2wy00f6pyad9im2fmarqj"; + rev = "28eeaaea2e9fafc1c6b22eef6b9a6e2b53fa02a8"; + sha256 = "0al7d2qahbpchmg846ax2w2rmxdpk20nav4dsa444kdfwahk7v8x"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -5243,12 +5243,12 @@ final: prev: noice-nvim = buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2022-10-21"; + version = "2022-10-25"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "dbb13d8fd7ff5329dbcd789ab01f460cf580ae1a"; - sha256 = "00iw8lc9d6cn5qad4iqxkf2553k6fpk0ygf9h9bhzr3xyx0bnwpb"; + rev = "3e440ca16f3f7786ec23f13f2db0c23f306a8d22"; + sha256 = "11lx2ggvr2g2f3jf6l4naw4jiz44l3a3spy7bkvdd0xc5kwwrjkh"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; @@ -5267,24 +5267,24 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord.nvim"; - version = "2022-10-17"; + version = "2022-10-23"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "bf4d094d80329da1b4bdcdb8e274bbe6f8473c34"; - sha256 = "0x5w8qqlyfbx6f1aab24kxif0n7q219dwxl4hc2mpj5lq9a00j6j"; + rev = "c8d932b46f3583f072c87204dd6fb575972053db"; + sha256 = "191fhg7jffna513hvks7i9b2bs086dj4vmjf2nhdr6w32m4fh4vh"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; nordic-nvim = buildVimPluginFrom2Nix { pname = "nordic.nvim"; - version = "2022-10-20"; + version = "2022-10-23"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "nordic.nvim"; - rev = "1d6602e05fa0bc256979a5af6f1a3bc4a13d64a9"; - sha256 = "0iz0x03685vps5ns6hws1ym727s1c5535q8v21nkxzzm4qbwhi8j"; + rev = "31c6b3a97be94abaf021da95cde0f87e5b006e0f"; + sha256 = "1v5mc7301jxipc2ds4hsj094a01x7iwx4xpxp5kqmaiang9mwsky"; }; meta.homepage = "https://github.com/andersevenrud/nordic.nvim/"; }; @@ -5315,12 +5315,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-10-20"; + version = "2022-10-24"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "24463756e80ce381f530c02debe781f3c7ba7599"; - sha256 = "07297dpachnvjpn9fff5yrbavaayxpgfwc0qyfi0na2ghylkhqn4"; + rev = "82910058ab2c317816b13c3e5ecebc8eec793b30"; + sha256 = "0ylpl6qg9wgigx23pvvhci2dc9jn6k7ky51h82v0rvdwk0lvccax"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -5435,12 +5435,12 @@ final: prev: nvim-cmp = buildNeovimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2022-10-16"; + version = "2022-10-22"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "e94d3489311f941788756953df23ca84f83eec95"; - sha256 = "1v6iw2bqaqxzspl239jw3aqj64mc9sq2xxibvll7rmxxgv2mgyb5"; + rev = "cdb77665bbf23bd2717d424ddf4bf98057c30bb3"; + sha256 = "1yyg4ja7vsf1wwjydq6hx6zdgq1pdbklagzh09nh14p98kw4rdqj"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -5457,6 +5457,18 @@ final: prev: meta.homepage = "https://github.com/weilbith/nvim-code-action-menu/"; }; + nvim-cokeline = buildVimPluginFrom2Nix { + pname = "nvim-cokeline"; + version = "2022-09-11"; + src = fetchFromGitHub { + owner = "noib3"; + repo = "nvim-cokeline"; + rev = "501f93ec84af0d505d95d3827cad470b9c5e86dc"; + sha256 = "1vb6p497rwi6jmj08a3vpcxkc6c9qkblkv56gn1qgrdrx66gh0q5"; + }; + meta.homepage = "https://github.com/noib3/nvim-cokeline/"; + }; + nvim-colorizer-lua = buildVimPluginFrom2Nix { pname = "nvim-colorizer.lua"; version = "2022-09-28"; @@ -5615,12 +5627,12 @@ final: prev: nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2022-07-26"; + version = "2022-10-24"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "4408d2c10618636101945e9cd9ef9d68fc335e19"; - sha256 = "1i57n41z8qpn5a626spkvn08jnbnhygia7hw2d0bvlcy56xx5wv4"; + rev = "8b0a2e4d072c1451be80b1fd523942553e1e5e50"; + sha256 = "17hg58f25sxqidlfkqlijs2k229fpmdf8bai5d2f086nv14s1m6q"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; @@ -5663,12 +5675,12 @@ final: prev: nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2022-10-19"; + version = "2022-10-21"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "75cf2f7dfc640f23e476cedc3f9784ce02f4f88b"; - sha256 = "1s24x17041dhgpkql43ma33bamqr54n6g3ggl3qndqby07zp66r1"; + rev = "aa6f885a8b5a07015f56626d473980e1edd5b3cc"; + sha256 = "1khd10mflf0kf3cynbwgrndrkvb5ygmry29sm06q55x6b2zsmckv"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -5687,12 +5699,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2022-10-19"; + version = "2022-10-23"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "a59ab0202810c7230d54725535c3ca5dfe5bcbfc"; - sha256 = "0dacpcmvsqsxdm0w2x30yxhlkqmng3nal8adva9sbmqywann6cxq"; + rev = "47472f648f329c1bf23257c9e5230535949baeec"; + sha256 = "1flyjwzma2vrmf8vbpwck5x74xv490r19d2y733llxr34vkmip2y"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -5771,12 +5783,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-10-21"; + version = "2022-10-25"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "ee2e8c63cff0a8bfc7f4ef985ea466f10bb7e691"; - sha256 = "19mx9dg9x1yp0rvvh83xxkkb92w7wqdw6i79ncfiffigplwlcfmi"; + rev = "a035031fd6f6bcb5b433fe0f32d755ba7485406d"; + sha256 = "1g7gwbwjdwk6x4crkc66331fmi27lbns49hvjmvyvn9b4rq0c1fn"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -5807,12 +5819,12 @@ final: prev: nvim-metals = buildVimPluginFrom2Nix { pname = "nvim-metals"; - version = "2022-10-20"; + version = "2022-10-24"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "f2893fb6e3f089131fc8f7b45eb4eb86682034f4"; - sha256 = "142rmhbqzjwg13zn9z50w92avq2gkylf7prcc35xf5rs9mc3kh0l"; + rev = "2a60af7dfe2daf6b4635c81d3241304eaa7bb741"; + sha256 = "13vvb1xjyicsh36x81jn76brh4x5qpgiyl7b0159s8xrlv67a029"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -5901,6 +5913,18 @@ final: prev: meta.homepage = "https://github.com/olrtg/nvim-rename-state/"; }; + nvim-scrollbar = buildVimPluginFrom2Nix { + pname = "nvim-scrollbar"; + version = "2022-10-19"; + src = fetchFromGitHub { + owner = "petertriho"; + repo = "nvim-scrollbar"; + rev = "b17bc9b4a28cf191dda3964568707577c3e6b03d"; + sha256 = "0yjl97iwr580qxwcr4j5gf8qhfvhcl179cj98js9c87bzp25q28v"; + }; + meta.homepage = "https://github.com/petertriho/nvim-scrollbar/"; + }; + nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; version = "2022-09-26"; @@ -5975,36 +5999,36 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2022-10-18"; + version = "2022-10-24"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "2b970635d1ef531355a380258372411576ecad4d"; - sha256 = "0n0qxhl0jn5xr0xqh02vfj0zizqfpgcpykxxa84a13jmmbg0ypmv"; + rev = "1be1e17be5841274253fb445f1b5db90bade7539"; + sha256 = "1dman1mrg6f2w1hi74si20gnzhs0ldqa0b6pi4jlphp7ba2bkm5f"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-10-20"; + version = "2022-10-25"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "c4c358e9badb181f4a05a4d8fd0c986a1cf5001b"; - sha256 = "1wqxnnl55ms46dfjag93knmnbvc19z4vyb9nhaj0iz70n24s0qd7"; + rev = "0eff7beaf8cf7e631a7e8edc0d363e0b0a8f6f1d"; + sha256 = "0n6cljmljhzdbw8pfkppnkaxzim80d956py34gcm7rapm1h0zj4i"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2022-10-15"; + version = "2022-10-23"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "2466e8007290b6228183171965b6ce1a2f111995"; - sha256 = "0sql2fdswvix0c8xkcckiqxgwm95qda7akvl3kdlckrsw3g1fjwb"; + rev = "09455f941a1611666a6343f68b97dd0a12d4c846"; + sha256 = "15k66mzkfjz57qfbdxpzjmkks1l63s25s33vaj4364jvlwfwaqrf"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -6203,12 +6227,12 @@ final: prev: onedark-nvim = buildVimPluginFrom2Nix { pname = "onedark.nvim"; - version = "2022-10-19"; + version = "2022-10-22"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "fdfe7bfff486acd102aae7fb2ff52e7e5f6c2bad"; - sha256 = "0z9kagqv196v0gcgm9zl1fp61j01msl4d00lndnlwnlggn2xcbf7"; + rev = "7aeca4713a922139b5e14c037b5faf34dc41c8d2"; + sha256 = "10s589bxij0g55m9fab64338av6g21b9ahpf2ncrsihgnr1319x5"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; @@ -6227,12 +6251,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2022-10-21"; + version = "2022-10-24"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "e9478c3e39ebeef1799f021f65eac44c39c0e5bc"; - sha256 = "0v99ysgapaq1w3249wlc4b2dm04zv8mn2f9l5b78vncgvvwi6ipf"; + rev = "caf2626b3af666a5b2f67f194d453197b71b0b62"; + sha256 = "160xrciwbkrjk3p2zxaanzmyy3rmllljn6hrfx6q7rfp0357s0kd"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -6287,24 +6311,24 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2022-10-16"; + version = "2022-10-23"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "7979893dc5d480b7f5f148f4c4db36841d720917"; - sha256 = "04k0xy9i60mqfa8y8r7zspprclws2qw1z5g9ia4ba1ydi76i7y4v"; + rev = "2479971860e1237e4f0dafb6cbf412dfc8a3d89c"; + sha256 = "1bjxmlrjpgsc70yjphb8y0mkyyy3amk49j4jsbjyh2qzdfh4bghs"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; package-info-nvim = buildVimPluginFrom2Nix { pname = "package-info.nvim"; - version = "2022-09-25"; + version = "2022-10-24"; src = fetchFromGitHub { owner = "vuki656"; repo = "package-info.nvim"; - rev = "9e81a0514489479c2e4bf31efc94a227dcc96ed1"; - sha256 = "1fjbamy8f9n0p71v03fxvf32acm9sylanzqn33dwziwjxf80rm59"; + rev = "0b7433ede19ad507edfaf7a924ee159f271a52c3"; + sha256 = "1yrf8ays1r92pa6jdrslsapqnk86pl0q5746q3kfj2zxvp2469m0"; }; meta.homepage = "https://github.com/vuki656/package-info.nvim/"; }; @@ -6721,12 +6745,12 @@ final: prev: registers-nvim = buildVimPluginFrom2Nix { pname = "registers.nvim"; - version = "2022-10-14"; + version = "2022-10-22"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "a87a7c57dc4c133166fb98bc7c2eded9826ff402"; - sha256 = "18sg4zphyrsjwdyy63zlkckzq8spn8b7yfbz4c27y3q63qayqpnp"; + rev = "9c11534cbc01aeba573805522d2f8f9bcc24379c"; + sha256 = "0pchq82jrzg1ip00fwv44cxp14k6l6j8xp916l1wbqc0izvfq775"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -7418,6 +7442,18 @@ final: prev: meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; + tabby-nvim = buildVimPluginFrom2Nix { + pname = "tabby.nvim"; + version = "2022-10-17"; + src = fetchFromGitHub { + owner = "nanozuki"; + repo = "tabby.nvim"; + rev = "18c8effd11f801793e1a8b9adb4d6ef7fbedf57b"; + sha256 = "0r68260gc5ln2z338mm7xb4v4y3p8xzkx1wlwagqp35dhgrl2kpn"; + }; + meta.homepage = "https://github.com/nanozuki/tabby.nvim/"; + }; + tabline-nvim = buildVimPluginFrom2Nix { pname = "tabline.nvim"; version = "2022-06-13"; @@ -7541,12 +7577,12 @@ final: prev: taskwiki = buildVimPluginFrom2Nix { pname = "taskwiki"; - version = "2022-06-28"; + version = "2022-10-21"; src = fetchFromGitHub { owner = "tools-life"; repo = "taskwiki"; - rev = "22557e7d4281ec915efdc308fc114141f627b1ea"; - sha256 = "0zssxhfwfpgf60q88gpfyq8w1w549y70hyxqcs9pc8ib0d47m577"; + rev = "c8e379f8acab92e77b9378c03758976bdc79bcab"; + sha256 = "0d1za9qab4h7wia13pvlkisl6cc2zg5655q88vl2dy1y0pkpjxbr"; }; meta.homepage = "https://github.com/tools-life/taskwiki/"; }; @@ -7794,12 +7830,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2022-10-09"; + version = "2022-10-24"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "f174a0367b4fc7cb17710d867e25ea792311c418"; - sha256 = "1hra6vrr25xan0xwjc76m14ml6hwrm7nx2wapl44zx3m29hwfasx"; + rev = "5c7db4055d89f9057d562f4f8b9d03189c9f9786"; + sha256 = "1mc80m83jfnjwnaxnsl3d96xm03wycal58xwm19fcgs8nsdn3010"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -7999,12 +8035,12 @@ final: prev: tokyonight-nvim = buildVimPluginFrom2Nix { pname = "tokyonight.nvim"; - version = "2022-10-20"; + version = "2022-10-23"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "9a0843ba36ff9720198ca15ac2351c40186543ab"; - sha256 = "0srzfqwpfqs0iyhm10xfyrfx0zwj78kzqbhc12gkm1fp6nmh8n2g"; + rev = "16a294bea92dc8f16ad205c71ce61bf05e79deb3"; + sha256 = "1vazlpml0f8hvn4w4jdahvphpyg8mkd5fak1w84cvn0814frz6w5"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -8251,12 +8287,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2022-10-16"; + version = "2022-10-21"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "a84365d01f9d2854165309392ebce6ba9134d4fd"; - sha256 = "1f4lfp7gr8ry0pq8ghdih3hdzfkhck0nd49d4jicl1vvb1v6xd1m"; + rev = "5b85bd0e0c165c863d491cf31da15e7805bd09d5"; + sha256 = "01vjcqz7rarhbjcfd54njp11gcd9dnzbxr0j4n5fvk1prjk9qawn"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -8801,6 +8837,18 @@ final: prev: meta.homepage = "https://github.com/nathangrigg/vim-beancount/"; }; + vim-bepoptimist = buildVimPluginFrom2Nix { + pname = "vim-bepoptimist"; + version = "2022-06-24"; + src = fetchFromGitHub { + owner = "sheoak"; + repo = "vim-bepoptimist"; + rev = "7b1f01905112c9e0b25adc5b1cd2650a5eee5e88"; + sha256 = "1650amv8q866ysxfm4xsf5hx1xx6ccg6xga2w0ziyf62s5frgbxd"; + }; + meta.homepage = "https://github.com/sheoak/vim-bepoptimist/"; + }; + vim-better-whitespace = buildVimPluginFrom2Nix { pname = "vim-better-whitespace"; version = "2022-06-30"; @@ -9096,7 +9144,7 @@ final: prev: owner = "flazz"; repo = "vim-colorschemes"; rev = "fd8f122cef604330c96a6a6e434682dbdfb878c9"; - sha256 = "1cg8q7w0vgl73aw1b9zz0zh5vw5d2pm8pm54fhfzva4azg56f416"; + sha256 = "0kpsf6j20fgblc8vhqn7ymr52v2d1h52vc7rbxmxfwdm80nvv3g5"; }; meta.homepage = "https://github.com/flazz/vim-colorschemes/"; }; @@ -9679,12 +9727,12 @@ final: prev: vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2022-09-08"; + version = "2022-10-21"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "d3ac089c66c728ffcd2ed55a71f80dfa314d2632"; - sha256 = "1x46y782q1nb9sa6y4n687pgjhwbv88k6c5yv536bd6dz1s4jmhr"; + rev = "b91fcd9fd69cd6a76fe430622637870255fe7715"; + sha256 = "0qfdsjjq8xfnaskr8rai0nh7535zii4w44pn2lcz4szm8za3y1ks"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -9847,12 +9895,12 @@ final: prev: vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2022-08-24"; + version = "2022-10-22"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "f19b6203191d69de955d91467a5707959572119b"; - sha256 = "0gnfnh15rmjvsyzlb9cw6nwvz46lmkiqzmifi8dvwrn0fi868hzf"; + rev = "400a12081f188f3fb639f8f962456764f39c6ff1"; + sha256 = "1rfg2wniappm64y5b6j6nmqsp41axgs6f3ghdzcjgak71b6mbng9"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -10389,12 +10437,12 @@ final: prev: vim-jsonnet = buildVimPluginFrom2Nix { pname = "vim-jsonnet"; - version = "2019-07-29"; + version = "2022-10-24"; src = fetchFromGitHub { owner = "google"; repo = "vim-jsonnet"; - rev = "b7459b36e5465515f7cf81d0bb0e66e42a7c2eb5"; - sha256 = "0fc6xpiyxly3ibs4lzn6dk9yd2cc353qb8lavag7zmims1bncvqf"; + rev = "f3b4ae76eeb01ef7c3cc3693455989a62d334327"; + sha256 = "1kpqpxbhpfkjy8d7bhgnx9625rbfga6dip90w94b6aybjz7dpgv5"; }; meta.homepage = "https://github.com/google/vim-jsonnet/"; }; @@ -10629,12 +10677,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2022-10-19"; + version = "2022-10-25"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "a85b71bfc862753ee11ae5986d882bd9588b17a2"; - sha256 = "00ll4lk9x0aail43dzlls70w53zggjz2am9kkn31cwhn4v5g9gng"; + rev = "9d4dbf7e689af58b1289cb1be9d755dc96b0de04"; + sha256 = "1xv236fyj6nxvn5afs18yxpkx38h9cfvl21rn81ikjvvim1vz9h7"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -12359,12 +12407,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2022-10-18"; + version = "2022-10-23"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "79e759d919c95b415f72714456b2a78ce73e106b"; - sha256 = "0ch52ya12niz4wr5njrg71lqa6fhgcjphidg1n7dcyy4l0zvs9ny"; + rev = "abd013d512e58b3770fab65a3230cd840a24475c"; + sha256 = "0h8xa2b9q7j91x0cvsscfyqkvfzf7rx3cqs59hxxvpcw96l4qwlx"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -12527,12 +12575,12 @@ final: prev: vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2022-10-15"; + version = "2022-10-23"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "7de8a71e5d6e39a05e259f9ad4dba5e0aee8bbba"; - sha256 = "0ak5v459sw7ryvs6rf5nvwwcsws5qq22jn0cgly7b9z3s861h3c5"; + rev = "03010115eb8bdda00ce5f845cc2f7025700e33bb"; + sha256 = "1m6blqw8rii859gs7d17x50nbb4f50g2s4a56j3j2qyv1k05kafn"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -12851,12 +12899,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2022-10-21"; + version = "2022-10-24"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "9c245831abf8b2685121101888dd4814c853fddc"; - sha256 = "0jjplsl3isvqq247fh0zf28dh9s1l06ygrn345nijkl0fasspr7y"; + rev = "fbec71d82bf5d7a395bcd31d23faa5cf309dc1b7"; + sha256 = "1pg1w7gj2qbqsp0bjh08hfzkinnsj2zsn2rcgchcy35jz5g240h6"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -12864,12 +12912,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-10-20"; + version = "2022-10-23"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "caaea7e9df67113b53207d4a9454ebce09eb63d2"; - sha256 = "152wb08g31fvp3n8r6v5mnnqcm0vdvj9wj0qaaw80jsys1qp1dq3"; + rev = "71e6e2d27520477975a5c86d568b1ed1b781bba3"; + sha256 = "092nviq0n3yl7ccg13mqxypkw0pr63f3hizf0r7vvkvfjld27n9f"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -12972,12 +13020,12 @@ final: prev: which-key-nvim = buildVimPluginFrom2Nix { pname = "which-key.nvim"; - version = "2022-10-21"; + version = "2022-10-25"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "26eb5300565b7bc1f5d8163ef2c49d6f0a14bc5f"; - sha256 = "0agfa4nbfwrq7zczzr93653gpk4x8i5vgv628fh1nif26idgqwki"; + rev = "08c230d4f053df2fb89ab356142bf63559bbab7f"; + sha256 = "101lmb4g2xnblcd13akzgmg002php65z16dgyzxrdxlkynswbc7q"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; @@ -13008,12 +13056,12 @@ final: prev: windows-nvim = buildVimPluginFrom2Nix { pname = "windows.nvim"; - version = "2022-09-28"; + version = "2022-10-22"; src = fetchFromGitHub { owner = "anuvyklack"; repo = "windows.nvim"; - rev = "e3a1217976d4ec8d2515cb634dbf5d26cabd46d5"; - sha256 = "1wpbspyjxcdvvbdysk0982wg24fy0p47df6c8d9rs2dmzb9zghv3"; + rev = "e88fd8b18eb266dae90bf828802d418386c8637f"; + sha256 = "01lby85gqqzvpinngh4j4xr3d8dkszzv50dz09syfzfqyr4blnr5"; }; meta.homepage = "https://github.com/anuvyklack/windows.nvim/"; }; @@ -13213,12 +13261,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2022-10-21"; + version = "2022-10-24"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "c9c272f8f53968473873478591bfb4f5c1418370"; - sha256 = "019kg05yczcshm7s1dw4dnc05vdglk4yk548r98mq38ara8vjb3h"; + rev = "0f32c4ba5748f59240478d08823af36dda5b6226"; + sha256 = "0zhjyl1xhmdhclx014py8wcwl45w0j7jsw77ia3l1kwynrr12wia"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -13237,24 +13285,24 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2022-10-21"; + version = "2022-10-25"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "ccf090af9b708b9ad3531527ec69e12e6d8c58fa"; - sha256 = "06k75radisg84mzb0254b9c8mm2d3j5hsmcyn74h7d53m1ccvwg0"; + rev = "758d12cb7deeac9e6a159e02f34a1b6a229aebd2"; + sha256 = "0phlszy2prr2zvcp0nzcw79vnwj3plbp5a4wsy1f7wdp3qm7r1sk"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; dracula-vim = buildVimPluginFrom2Nix { pname = "dracula-vim"; - version = "2022-03-24"; + version = "2022-10-24"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "d7723a842a6cfa2f62cf85530ab66eb418521dc2"; - sha256 = "1qzil8rwpdzf64gq63ds0cf509ldam77l3fz02g1mia5dry75r02"; + rev = "7ebadce59c087f441b7baacff68e1667386d119a"; + sha256 = "1i0gxwih7sc4mkhdg6g7cldx1fgpdy16lnqz2a03d1icfddbyp7n"; }; meta.homepage = "https://github.com/dracula/vim/"; }; @@ -13273,12 +13321,12 @@ final: prev: gruvbox-community = buildVimPluginFrom2Nix { pname = "gruvbox-community"; - version = "2022-08-03"; + version = "2022-10-24"; src = fetchFromGitHub { owner = "gruvbox-community"; repo = "gruvbox"; - rev = "95b120a15d0765037d2836d04e3360c273caf111"; - sha256 = "1f20vj5apic54lc0hd7a2nhg9vfb4lrjhgkzf84mkbfd39p162fc"; + rev = "ec6ef450645eb6a1af843f57a40bcaf4e278e1ac"; + sha256 = "1p2klqkrrbky6jfj36px8ipg5dpb1iqz57gi9nmi1mpq9zpmm2nq"; }; meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; @@ -13309,12 +13357,12 @@ final: prev: rose-pine = buildVimPluginFrom2Nix { pname = "rose-pine"; - version = "2022-10-20"; + version = "2022-10-24"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "82c86091b4dd999761a0494408d30e39a51f49c2"; - sha256 = "125lv3hb1vimv1bfx8dxmiap97dihm28fkhh4na98i5hjf7lhqas"; + rev = "27a822e95b6581b706364e02fd8276d967438f82"; + sha256 = "1wg6yzf2w3ly30mpjg05vg7ik4912cfxc8558j2iq7vb960bcwwl"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 10d49fe58ffe..fc87e8ea02c3 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -459,6 +459,7 @@ https://github.com/ojroques/nvim-bufdel/,, https://github.com/roxma/nvim-cm-racer/,, https://github.com/hrsh7th/nvim-cmp/,, https://github.com/weilbith/nvim-code-action-menu/,, +https://github.com/noib3/nvim-cokeline/,HEAD, https://github.com/nvchad/nvim-colorizer.lua/,, https://github.com/terrortylor/nvim-comment/,, https://github.com/hrsh7th/nvim-compe/,, @@ -496,6 +497,7 @@ https://github.com/yamatsum/nvim-nonicons/,, https://github.com/rcarriga/nvim-notify/,, https://github.com/gennaro-tedesco/nvim-peekup/,, https://github.com/olrtg/nvim-rename-state/,HEAD, +https://github.com/petertriho/nvim-scrollbar/,HEAD, https://github.com/dstein64/nvim-scrollview/,, https://github.com/dcampos/nvim-snippy/,HEAD, https://github.com/ishan9299/nvim-solarized-lua/,, @@ -622,6 +624,7 @@ https://github.com/keith/swift.vim/,, https://github.com/AndrewRadev/switch.vim/,, https://github.com/simrat39/symbols-outline.nvim/,, https://github.com/vim-syntastic/syntastic/,, +https://github.com/nanozuki/tabby.nvim/,HEAD, https://github.com/kdheepak/tabline.nvim/,, https://github.com/vim-scripts/tabmerge/,, https://github.com/codota/tabnine-vim/,, @@ -740,6 +743,7 @@ https://github.com/gioele/vim-autoswap/,, https://github.com/bazelbuild/vim-bazel/,, https://github.com/moll/vim-bbye/,, https://github.com/nathangrigg/vim-beancount/,, +https://github.com/sheoak/vim-bepoptimist/,HEAD, https://github.com/ntpeters/vim-better-whitespace/,, https://github.com/MattesGroeger/vim-bookmarks/,, https://github.com/gyim/vim-boxdraw/,, diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index bcf73969c161..01e80d1f3e6a 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2178,8 +2178,8 @@ let mktplcRef = { name = "metals"; publisher = "scalameta"; - version = "1.12.18"; - sha256 = "104h3qfdn0y4138g3mdw1209qqh3mj3jsdsbzpnw2plk1cmr3nx5"; + version = "1.20.0"; + sha256 = "3EjXzSMBIim13dRP1fBmbV/OtLmBjvcmjDXwYoeGfLA="; }; meta = { license = lib.licenses.asl20; diff --git a/pkgs/applications/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix index 88c0ced4a249..f1432d8db558 100644 --- a/pkgs/applications/emulators/rpcs3/default.nix +++ b/pkgs/applications/emulators/rpcs3/default.nix @@ -9,10 +9,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "14289-0da81d22d"; - rpcs3Version = "0.0.24-14289-0da81d22d"; - rpcs3Revision = "0da81d22d340dca1ac098a9de5274641bdc77869"; - rpcs3Sha256 = "0qblfsdyngj8bb7g49am0q0mq5llwx3g4x4gi6h0jynk0d9j0ir0"; + rpcs3GitVersion = "14337-5210df688"; + rpcs3Version = "0.0.24-14337-5210df688"; + rpcs3Revision = "5210df688262ec7fd8c21230d30e568d98724c8f"; + rpcs3Sha256 = "1m0j53xl6g01s27bi2p9j23m724gq7a3hss7kqhc239a5m9akqdg"; ittapi = fetchFromGitHub { owner = "intel"; diff --git a/pkgs/applications/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix index 765f7b12721a..73e93707ceed 100644 --- a/pkgs/applications/emulators/ryujinx/default.nix +++ b/pkgs/applications/emulators/ryujinx/default.nix @@ -29,13 +29,13 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.1.257"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.327"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "81f1a4dc3161882b0385c9d4752fbba84b9eca96"; - sha256 = "1p4c8k8pc47hl32bml050fvxyhdjcd002xx60rwvzlgvdgw6b3xq"; + rev = "9719b6a1129c017d96532ff026e2bb933c0b2d0b"; + sha256 = "1vm1zwjm02jp64gjcfn923lxc4hqwgw44w9rspjy97q2z6r9vwjh"; }; nugetDeps = ./deps.nix; diff --git a/pkgs/applications/emulators/ryujinx/deps.nix b/pkgs/applications/emulators/ryujinx/deps.nix index 39fef4cad2ee..6486c13c7952 100644 --- a/pkgs/applications/emulators/ryujinx/deps.nix +++ b/pkgs/applications/emulators/ryujinx/deps.nix @@ -159,7 +159,7 @@ (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.1-preview.1"; sha256 = "0mwj2yl4gn40lry03yqkj7sbi1drmm672dv88481sgah4c21lzrq"; }) (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.0"; sha256 = "135ni4rba4wy4wyzy9ip11f3dwb1ipn38z9ps1p9xhw8jc06y5vp"; }) (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.1-preview.1"; sha256 = "1k50abd147pif9z9lkckbbk91ga1vv6k4skjz2n7wpll6fn0fvlv"; }) - (fetchNuGet { pname = "SPB"; version = "0.0.4-build24"; sha256 = "13wfjx5n540mlxlvys39g2rajrqbycdkyci2pcp3wygkqn4d87hm"; }) + (fetchNuGet { pname = "SPB"; version = "0.0.4-build27"; sha256 = "16i10lp4w7gi5rzjs9v9vns858n735ixcb83kl2qqq9qwyrnv8mw"; }) (fetchNuGet { pname = "Svg.Custom"; version = "0.5.14"; sha256 = "1wjghs2n5hk7zszzk2p2a8m6ga2gc8sfd5mdqi15sbfkmwg2nbw7"; }) (fetchNuGet { pname = "Svg.Model"; version = "0.5.14"; sha256 = "1xilk95bmnsl93sbr7pah0jrjrnccf1ikcn8s7rkm0yjkj382hc8"; }) (fetchNuGet { pname = "Svg.Skia"; version = "0.5.14"; sha256 = "02wv040wi8ijw9mwg3c84f8bfyfv9n99ji8q1v2bs11b463zsyd1"; }) diff --git a/pkgs/applications/misc/limesctl/default.nix b/pkgs/applications/misc/limesctl/default.nix index 1fddd369779a..77f2a6cb4a93 100644 --- a/pkgs/applications/misc/limesctl/default.nix +++ b/pkgs/applications/misc/limesctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "limesctl"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "sapcc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+KOtGf+WgI2PhfFJnNyx5ycekRmfbqjSqvWOEhG65Oo="; + sha256 = "sha256-2eB+VpMrhzs0Dg+X1sf7TVW7uK/URETUuWO82jQl57k="; }; - vendorSha256 = "sha256-LzLUz6diWva2HaxlhEGElbwUvUhCR0Tjsk/G/n5N3+k="; + vendorSha256 = "sha256-VKxwdlyQUYmxubl4Y2uKvekuHd62GcGaoPeUBC+lcJU="; subPackages = [ "." ]; diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index 5ac167a10031..590ca3304516 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -1,10 +1,12 @@ -{ stdenv, lib +{ stdenv +, lib , alsa-utils , at-spi2-core , cmake , curl , dbus , fetchFromGitHub +, fetchpatch , flac , gtk3 , jasper @@ -26,6 +28,7 @@ , libxkbcommon , lsb-release , lz4 +, makeWrapper , pcre , pkg-config , portaudio @@ -33,7 +36,7 @@ , tinyxml , udev , util-linux -, wxGTK31-gtk3 +, wxGTK32 , xorg }: @@ -48,9 +51,32 @@ stdenv.mkDerivation rec { hash = "sha256-sNZYf/2gtjRrrGPuazVnKTgcuIQpKPazhexqlK21T4g="; }; - nativeBuildInputs = [ cmake lsb-release pkg-config ]; + patches = [ + (fetchpatch { + url = "https://github.com/OpenCPN/OpenCPN/commit/30fa16850ba97d3df0622273947e3e3975b8e6c0.patch"; + sha256 = "sha256-Sb4FE9QJA5kMJi52/x1Az6rMTS3WSURPx4QAhcv2j9E="; + }) + ]; + + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace cmake/TargetSetup.cmake \ + --replace '"sw_vers" "-productVersion"' '"echo" "1"' + sed -i '/fixup_bundle/d' CMakeLists.txt + '' + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + substituteInPlace CMakeLists.txt \ + --replace 'DARWIN_VERSION LESS 16' 'TRUE' + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ] ++ lib.optionals stdenv.isLinux [ + lsb-release + ] ++ lib.optionals stdenv.isDarwin [ + makeWrapper + ]; + buildInputs = [ - alsa-utils at-spi2-core curl dbus @@ -65,8 +91,6 @@ stdenv.mkDerivation rec { libexif libogg libopus - libselinux - libsepol libsndfile libthai libunarr @@ -78,23 +102,36 @@ stdenv.mkDerivation rec { portaudio sqlite tinyxml + wxGTK32 + ] ++ lib.optionals stdenv.isLinux [ + alsa-utils + libselinux + libsepol udev util-linux - wxGTK31-gtk3 xorg.libXdmcp xorg.libXtst ]; - cmakeFlags = [ "-DOCPN_BUNDLE_DOCS=true" ]; + NIX_CFLAGS_COMPILE = lib.optionals (!stdenv.hostPlatform.isx86) [ + "-DSQUISH_USE_SSE=0" + ]; + + postInstall = lib.optionals stdenv.isDarwin '' + mkdir -p $out/Applications + mv $out/bin/OpenCPN.app $out/Applications + makeWrapper $out/Applications/OpenCPN.app/Contents/MacOS/OpenCPN $out/bin/opencpn + ''; + doCheck = true; meta = with lib; { description = "A concise ChartPlotter/Navigator"; maintainers = with maintainers; [ kragniz lovesegfault ]; - platforms = [ "x86_64-linux" ]; - license = licenses.gpl2; + platforms = platforms.unix; + license = licenses.gpl2Plus; homepage = "https://opencpn.org/"; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 04240bfb5480..9a286b92a7e7 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,985 +1,985 @@ { - version = "106.0.1"; + version = "106.0.2"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/ach/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/ach/firefox-106.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "73e8b50a234cf18ad9f4ee8d5ae54a3b33a560ad1555aaad92399d5d489c4127"; + sha256 = "a95a15867548160d795cd1ecb56ae90b7aa9c7db6f15d5cae8cdb522c471cdd4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/af/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/af/firefox-106.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "c74ebe3630f36c9f07265c9fae64e6efa120851640c6b413a473777220cf79bc"; + sha256 = "00d2e72c8317c8cd88520836589aebaaa97eb161e77ebf874d0b8c4395c8a5c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/an/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/an/firefox-106.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "dd1871d27579d521857d3c86e4bfb3eac6a229f1999cfc0ee621cb7e4be182b0"; + sha256 = "628f5521bcaf38cdbaf748f523daf1a881fcb37da1cab7d7045841190ed70844"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/ar/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/ar/firefox-106.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "a2015703716433213ce8deaa99ddc521c248883359cdb6342e85e337c4ea606e"; + sha256 = "15ae1a91abc73bddaa0cd6050a9fd4ed5bed116efc269bf086d40fc6b7d9e66d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/ast/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/ast/firefox-106.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "5ded0e6d3b3fe582f2b0700eb0e11c57d41f5bd0ae16d2d5f380e6d716e28d15"; + sha256 = "b9d5c9e81c4ed5e13ac4c03e8cd8a7678879b96ec5b7ed3be246a6b3d9885136"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/az/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/az/firefox-106.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "10ac2f3970f2db6101aca9919bc2b3bc9939138e667710c3d6c8299a15c42642"; + sha256 = "a55f10740870877967a526164ffe8ccb5bb4fdce3d94844656e169f2e5e7471c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/be/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/be/firefox-106.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "fdd878cb53813f28339d609a72fdc3da215310f6fad80dd912c667eaebbe804e"; + sha256 = "dc0d2d3e5cfd38a6792ae32b83eae236f2d69ca38b7909014cfdbe437a7baa2e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/bg/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/bg/firefox-106.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "5875e2aeab9b270f2c0b2d07c039e12ce7d9d6470975b4a929ee854cfb9903b5"; + sha256 = "0719c8d93c132ad4c0e1ca3fd766eb9eb4ae4a717c007d6a67e61f3f24baaefd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/bn/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/bn/firefox-106.0.2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "a0377b5d4efbf79ab6bd3ab166dda109ed5448c171679e771d08cf8ad2ab1d02"; + sha256 = "e15d4412acefee301cae865e5832cc874c1ff5bb848a14e5ae7a7d9e1b08a11f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/br/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/br/firefox-106.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "01215f4d29a1b4af05a7d8cbc4b26f22db5d37c39e1363b1493822791cf99b0e"; + sha256 = "b420bcc5cb164ff7711cc140cc848a1651816037120ac8e0769ccf2c7d33002f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/bs/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/bs/firefox-106.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "ee6b84e55789a7c603c3354e5ffcccbd0b0bbbee529390f3f02678454b2d2bb6"; + sha256 = "6f83923e2538169e91d75534bb2ccd18e7d9d5a2928ea0c156572644e50c3d02"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/ca-valencia/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/ca-valencia/firefox-106.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "af588ab3d57e3dd7e44354a7946da274b7db487a794b803b8ebd39b2ddefdf74"; + sha256 = "6bbb1c08426d7cd8965e641cb682ab3c5fcb91f2a67c017ccdb7145084b83150"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/ca/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/ca/firefox-106.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "7d9b6451777d8ae449767d5349f78cab647969f5223c40a990d2032e358872c3"; + sha256 = "9281bda763a73ecd6152d2a3d35508dbcd0f1eeb9f346add142266105629a2e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/cak/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/cak/firefox-106.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "895a24e38cb5ada57768ae44de17ac111f11dfc2305e9408d334a481b710f66a"; + sha256 = "69065cf7bbe58b24f06202ecdf10b005f2da751528b447492e50b6b8cdd19f64"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/cs/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/cs/firefox-106.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "efdf4568777c9c33cfc84c2d966a06b1b2642185e0e2c2fd826dee2c402c0c7d"; + sha256 = "657bf102caa80c87d77610ef41933f4690c9c20f937678b38b3db6203b2d1a71"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/cy/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/cy/firefox-106.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "1db8b754aba37a1b1212359681de5ab2735c3cd1eb663bf97496f18e84d0aa05"; + sha256 = "e2080798d42f3067d0f0880cb391b5cbabe0ec8bef54fae40d02c4833dd3a876"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/da/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/da/firefox-106.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "03fc6a07c44099474f746ccd3d72dae0b40aa86347d0015db5660bfeb5a87ca5"; + sha256 = "09918393e885c564f495ed22a6f417c5224fb781892d084d2509651769cab99d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/de/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/de/firefox-106.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "209cad4c90e876d2126db2cf828ba1610c956a133fd9cbb242de6466a43e07d5"; + sha256 = "a33be323b31c8d9f882a920537f2ab2621e11c3d029a8d121d717527611c73f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/dsb/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/dsb/firefox-106.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "9edb173dc9532aa9de3dc740d31b107d7c8871fe1c82cbc8490277aab01c1b25"; + sha256 = "32fad47a2d1dd6b63ad8f02b33aca3aa1d807b6944b0f602ff3d807f9f49655d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/el/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/el/firefox-106.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "fccf555e8e6e59a3b055f451d91b3ff1c8f9e03a9d6caa88d8cabe0bd45fe0b9"; + sha256 = "9e01a4bbbd9181840f1a06ba740b76495e350dac97bc96b3ec1e7cfef406c05e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/en-CA/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/en-CA/firefox-106.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "9b51182e6e7c46c04bf90bf46a36c138943f506a274028c0168919a5b8b1b0a6"; + sha256 = "74408046e004ed3929a025ad633247284a7e0882be7944b45869356e6f015610"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/en-GB/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/en-GB/firefox-106.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "83980222caa3a7e62385bd87e43f86da1a685638c9400064aebc4be0bea3d447"; + sha256 = "38e421e36a84fc50942000a5af4158c925d2a3675dc8a5114e736d33db527e72"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/en-US/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/en-US/firefox-106.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "9158e760a1baf524d2dd5095f44e71cfb50062e00074bbd8368b88c9eb547085"; + sha256 = "4867a211001cc289fbe8ee5eaa04f72691d9a61e44f7c5ddb339ba8a37501bac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/eo/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/eo/firefox-106.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "0430f1e7c0284a7654fb207e68138da7aa3c8a6e788668cfe2c9921d5d013822"; + sha256 = "9c18807ab6bc451596ddf83640ac916cae7f1fc6dfb70f4893cc51552cdcf5bd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/es-AR/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/es-AR/firefox-106.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "2ac1a9880364afed678a259f9c3e2082b9d1cf774b2dbcfdb8a0cac66cddcabe"; + sha256 = "7e25cf4a75e1ddfe8e9b793d675bd74790234f58092c42f8901093c1e963b4c8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/es-CL/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/es-CL/firefox-106.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "75abcd1c04e11dfc9043f9b934aafe40c443a9023e0c39a30848457cd364a40d"; + sha256 = "8952eefcfea95e60954a4c97c2d8cfc3e542548c91221924ce5b4f68c54bbded"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/es-ES/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/es-ES/firefox-106.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "f4afd36de73083e46e62dd1a71ecbfa1eb6244f61c29ccd5763519474634ce27"; + sha256 = "66e59163dd0ea4f156d71e3742b9adc1f22f5de1d1046e8b761988784a4df756"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/es-MX/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/es-MX/firefox-106.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "b3d9d0101ad8794c7591f407e49ab395ea9def5ed9bf7b51ab5fe2167c49b71d"; + sha256 = "be08a87f8eda8845618524112a53cb427272e8365dbd637267d500b23258deca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/et/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/et/firefox-106.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "a518a583fef63e926931bd2a200293dcabf9a22ff1f7554f03f6ebef9c614e4f"; + sha256 = "0d0660e2a7e5c4c17afad2a68f2f0d262f1fc8366d877b441eb0fd18450e57db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/eu/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/eu/firefox-106.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "f98694a3a3c21d836b1efb322d60989f90f31af8c06e483739cd33c73053a5b7"; + sha256 = "ca37cf5bc2efdb5636ea6ad654a64d73a285c46544d887ff8abc38fb6778ee09"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/fa/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/fa/firefox-106.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "1b6afbac73fbb4c54d83d7599a67062bf64bfba3e67bf9e4fbee9249efcd62c0"; + sha256 = "445dd3b89c33b15e935b32a84e711859c55238b384b3ecb443f9093a4201906f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/ff/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/ff/firefox-106.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "d78fcd480fe27cb04c3e5e2677598312e45786a3100037fc3fcad5fe64ae073d"; + sha256 = "6d101c69335026ae36ce9193dbd27487c0e6f47a3199d276263a523d71d302eb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/fi/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/fi/firefox-106.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "c2c05b0f0be4adbe9824f34e59ec131ecd53f1d41279dbe55db2f533d1837b3d"; + sha256 = "267ea3695844ff090b5ff0a53d16bd5bbd6c7726485096be643fb5ba20e51e7a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/fr/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/fr/firefox-106.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "1b84a24eba4cdccbe9148ed3dae7f5990f8aceae9174c079ce735bae491592d5"; + sha256 = "74ad72a8c00681707efbe993476a26571ed90e7ad4485d91b9f39d8b89ecfc18"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/fy-NL/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/fy-NL/firefox-106.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "11c46d35616eb8000030bba7ec711c3d2f0bd71d8fe1b00716ceb087b615949f"; + sha256 = "f4623d18d7a63afb0643ccb7d7c3e1d93704bec786cf192561c463b9c6ebd33f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/ga-IE/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/ga-IE/firefox-106.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "c82a8582e7c7a290940f34747dbac10b82a3a7a1dd25f5ec29ea6760452f9ceb"; + sha256 = "49d0044e38634a531334b356975bf4f023ab0161bb926c6ac7a608adc0f863f6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/gd/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/gd/firefox-106.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "a134d92e8ba86138a4fe48abe30e99db22a0eda3d752388b4811f5ded602b2e2"; + sha256 = "686f456dd0655f6047ae0e44be3acee9655f2cc51964fc9aebdaaf9a30c12e26"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/gl/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/gl/firefox-106.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "917ddb3b29c5e79b3133228b2369eda2f1fa8a80e1df045c7f574de98cc20589"; + sha256 = "b4d5ece230195e2f9b21640a924b74d93cd6da609ab7364ac3be82f49fbcd3f1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/gn/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/gn/firefox-106.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "62d6f290a6d2c5004475a69994238425d9f86809d8bb892ab5d024fc976eb95e"; + sha256 = "a8e1079a2dc93d6c653f9ad423d554edfb8a85d8edccb00d0819d38d55096239"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/gu-IN/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/gu-IN/firefox-106.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "84b800fda564718c88aeabc8c80a93f81bfd793de36df1692037e5211439533d"; + sha256 = "4397fb92b09bd037af12d36cba3dff684673d62b9e9c36ae9774ccb6901acfc4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/he/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/he/firefox-106.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "4a45350737358be849dd662ba00ed9678c02fc3c6ee976bbe604ba22973b03f8"; + sha256 = "bb7d3e2ee215d73b0cfeb65aee4b4acbcc9524806fe5ec5ae5e7449456c841bc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/hi-IN/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/hi-IN/firefox-106.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "10893632acbc8e59a85aaa5f99e5995d483e79c707ae7b59c3db8f7538ad61fa"; + sha256 = "03eebd1be19a3f2a6f4b869e2f6edc245c6be9001d99c645c280c09a35b7ed7e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/hr/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/hr/firefox-106.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "f948c69b4aba2cbaa0bd64fa3bff0db6ea333db055a5977edeba19fd714d39b0"; + sha256 = "6e17c3970a6af1ee74a04ff87886a309176a1f830d3bac1af7df097abcb1bc27"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/hsb/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/hsb/firefox-106.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "b5420b68bc0ac11e84545cbec819f6845464e640591c2cb472e5ecf03c1067d2"; + sha256 = "b8a8c4444cf5761daf104bad3e7e75e9bfd5fa5ceb3558176a4bb071b62e996f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/hu/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/hu/firefox-106.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "3699a369965dd8b33045dcc1add1d7b5bf3807e6ab0fe71738ad8a3d10c9b992"; + sha256 = "12ea9f3811a0b37114cd86821261e95438011438dd10a109fe8aaf625db45e7c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/hy-AM/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/hy-AM/firefox-106.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "736ffa083db4fe0a09bee5180ce21a72d232ef93de39d328087d77c700177450"; + sha256 = "971ec09c1904c6670266b82e2079f14e6643e628688b1b901f2b0a162b891edf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/ia/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/ia/firefox-106.0.2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "e379bdbc02cbeea8a6ef08c699c31ab21c8a7c850165b3eadf14f9776acee0b4"; + sha256 = "4f41904dce35a44ca6387bdf254bb115e3f2334bbed68c3a2ccc965b6b9c7410"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/id/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/id/firefox-106.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "494d9711fd6cb8a24a4f9ce8b5a469def31508acfa74a349f5847fab8877bdce"; + sha256 = "2ce89ec7c303034099253792717099bb7452e9bca62dc6930102bbecb6795583"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/is/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/is/firefox-106.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "b9b5f39f8837b0196d23dcb6126649a163183a3f4a7beea9abf5d2cbc45b5431"; + sha256 = "651d29de95edbf3e789259134629eae2cd0d6ac756ea602e133a9e7f7a7c4534"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/it/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/it/firefox-106.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "cf472e023000a836092a65c9bc13f3f4bbb1ccc019f0d3618f5f3901ba978c2e"; + sha256 = "d9eaae70584e1d2523f0e10896e2f943b034445b24590151d83a11d10b8d6d80"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/ja/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/ja/firefox-106.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "24ad2d46cc17176061de745853dfa149b30006d32652af4bcca0da7852d61bb0"; + sha256 = "27ffa5b43fc50b04ceb6bf8d83c06dc5eb0c594bdafcca5dfa3fa2911d4367c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/ka/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/ka/firefox-106.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "4449b8e64a566f6db99c8474d1710dfdcb7cf9986f84ffe052fed4523a0de585"; + sha256 = "b2458fd9e59a863ed9b2fc27df76c9d08751a4d8a38a7b75391ad7429b6007e6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/kab/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/kab/firefox-106.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "22891b7087460d0409b24feb8465e2262ae48a7ca672a04ee4aadf7d6c75a735"; + sha256 = "5ae2300865c9b4259dcb0ad0c04ce7ee20220412590c14bfc0fa3f3fe6f499bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/kk/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/kk/firefox-106.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "433d1cf6015a8bdeb1ad7ed8ab277d12d7d4bee0ea13e0b9a05d6f9e21485706"; + sha256 = "18d9192ca60825e69e2ff2f20b9d80e15841b4357a15bfa1772b3dda1ac82338"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/km/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/km/firefox-106.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "797e9129412851205ad74f7b319babdb80510a5e3ad5f09d2f95660cc146fff7"; + sha256 = "2d7c01f03a96679cb89db9006a16e8860ec66637c8ccaf442f11bd3546640cf0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/kn/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/kn/firefox-106.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "58ee62330f425ec58475012db703fdf28c0f44187fc68c64532b92812ceabbf5"; + sha256 = "d86317c4e6e1c8401408e7ae6604d754d398f0f5c4ae98ca1ae31b56e3ef932f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/ko/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/ko/firefox-106.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "30634665e61e844b46f6ee8ccf6c746b233dd91677dde760453656e38913a241"; + sha256 = "1e95325f28b3819ad65ff0349d56960c64bbd01a10a8a1686fbb43aa37cb2099"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/lij/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/lij/firefox-106.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "175284c0c30974322c1c95904de89b0745c14a78675e3251de90b5447831fa84"; + sha256 = "e51203491e50b3fdd4fedf222de92530d0f643a4073da840a656ebbb6afa4814"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/lt/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/lt/firefox-106.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "a15760d13d2ffaec7d1836d283e9fb6273be0b7ff56c39fd2e90fbf8cbf7e4f2"; + sha256 = "149a79f50070461c71725c2fa07177f660a6fb3bffe2b7f143def76cb3c35ae4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/lv/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/lv/firefox-106.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "784e762e4b4df65bf9b0b0a201c7a1e65d13420dedf453874d0c78d829ebbfa4"; + sha256 = "bf19016f98ec6d300b6e7e1bddd8f101ca9367d886c8365d17bb44df1fbcc274"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/mk/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/mk/firefox-106.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "b963f3c63d25b2a8aad44c49251b2fc2db17fa7b3b72b2e98556533a495361b2"; + sha256 = "663ef98d22e3ca66ac9c339ec5805bbe940aca63b1e321fb6fcc03bd26d1c949"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/mr/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/mr/firefox-106.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "8f965d02d454a6e31a81ca735a91a5f9a350ccf45fab391c79bb030a7c8249e6"; + sha256 = "a207db0ddf400cb54edaf6992a47e4bae65afc0262534fa37e5c4707abc87d5d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/ms/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/ms/firefox-106.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "e0709a20cb781ffb644696b50df6c5ce9add7db7dfcf0bed64a4847a45c46c6e"; + sha256 = "8d1abd8672750bd881b62f2fd4ef7b3247a63cc1ded01c3c2ce991614b522996"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/my/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/my/firefox-106.0.2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "8bd42bef785ec15afef51aabdf23decea06aa94eca556b3713f25c36288bf8e0"; + sha256 = "fdf33de4e57d28e603a1577ec855be4626fac1db2ee9b73f5272729858a6dd4f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/nb-NO/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/nb-NO/firefox-106.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "83279396c312b820f37f34f11ec52bcba331e8d11ade896e27dc474624feb5c2"; + sha256 = "1818f104a255c9dffd1e6bd8538cbd30c5c341711cd240335e317e176a696c71"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/ne-NP/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/ne-NP/firefox-106.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "1147aef4411e3e74d0d1ed1f3fa5dbdcdc2a36a7f67002c8eca481190d866531"; + sha256 = "d38d2dd5faf44450fa64f415c360688c7acebfe4cef06dc89c8bac66455f64a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/nl/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/nl/firefox-106.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "9697a3ab2b05108c01fc8434d8b59decac8a74340d50b3fbbdd406ea04b16a39"; + sha256 = "5331aae4ab2dae40be77cb7e6a6a01f9c76e76c6a291d63ca2f344ed59ca615a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/nn-NO/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/nn-NO/firefox-106.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "976cb735ade2287ae2ea27faff1b9e9db115394e00adc75ece405da318df8270"; + sha256 = "a79e4a6cea928c6d3ea0c0f555d1e6eff5213afc84202a582416d3b6ab2ff9f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/oc/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/oc/firefox-106.0.2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "05c591c51075d01ac5b84b30b464ebf793431cb53eb9297e27f40023744e0b06"; + sha256 = "eec2e9932a84a9604b0dcf049d28c41c6d7bda994b0e11c16293b977b1b65c89"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/pa-IN/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/pa-IN/firefox-106.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "c91e34d9f97ade64458c959977a2a311370afbdce2c9a3799d5805376c505e72"; + sha256 = "0c85aed3085e28f1274dd09336ae5e577febfc9c9322187cb98f7ce2b077013d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/pl/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/pl/firefox-106.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "9d81b7ae684e7e17eace812a788dfa43206f694a8cda25199d9b570233157da4"; + sha256 = "8562567e75385657e7ad682b5e9d2f6624e9569788e4c572a63f051d7a58a573"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/pt-BR/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/pt-BR/firefox-106.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "83ce307ea323ad4f09e4fde06f21074b6c02ad58a9f75634c85bf02218adce20"; + sha256 = "a8645f76303929ddf2dd090e1ab58ec90fde03bd030a98f669a60afdb4d16e80"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/pt-PT/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/pt-PT/firefox-106.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "9cd2ef64b8b5a22a9f9a73a5a6722afc50b3a524f54205bc418b1d379304baf0"; + sha256 = "aab96db900f43a32866fba9a5cb7996919155046e5bd4090a633aa842fb13829"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/rm/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/rm/firefox-106.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "3604fd722d51f94caf96a219f80f6f1407c375709c07a14191dedc53faa30ed6"; + sha256 = "b310207c893c7d304d358e9b8cec9d94596b4c937158045afb0e620ae8b7926c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/ro/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/ro/firefox-106.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "4df00206ee7950b2406c2d3a1b25365dc7a3d2aaf5cf8c86dce4189f6b05c18b"; + sha256 = "f18c3ff90f12195751faf4c0ad40d747fe459880f1ad2e0d2bc25f0671afe3a2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/ru/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/ru/firefox-106.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "ae0913701bff929b5dfa6521b19aa207f2c89a841ffd2882e10b6011d406aa9c"; + sha256 = "564b7750a35a85078335dc9b6f161bcfc62aec37732c251535c1b3e5414130a2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/sco/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/sco/firefox-106.0.2.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "2e6386b04c8008f02d497e70a5be4b422ac700d99da925674e43c4567936d798"; + sha256 = "24f797a7e3bb82cce34c273a4634576288b98dedaa87303bb1138fc6cb3a0ae1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/si/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/si/firefox-106.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "b386202c5e3fa869e30285cfec881589566cfbd147aeafd651e38a4da9ac8846"; + sha256 = "1422779ad86ae676fc7c6260c744d9e2f719550d6290794e047027603991cc42"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/sk/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/sk/firefox-106.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "1f29f08de3dfb9f203003ecca1d841e580b4bf7c3df2078134d6de26be14ab35"; + sha256 = "6ebe551cc3b405fb9faf3f0ac592577d8ae70b43b959e690a509adb2a32b996a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/sl/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/sl/firefox-106.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "dd63a87c587ba9e2ba489cd9e100f732c60297ff09eea279f0c249a6ff392921"; + sha256 = "93acd1a4f81e649056125a93d4b932ed6dd73349589169782d5e69754bca8641"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/son/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/son/firefox-106.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "39120dcd7f5b33066333fe47a0777bae144a90be97af8e7ca528ca746b717ff2"; + sha256 = "296e7bb53bb44ffd7036dcd3cb683a6250e58ca8cca92a08d849fde8ef5a9aae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/sq/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/sq/firefox-106.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "7aa0dc316eb51f0eb80fa744c2dfbc903bd4fffce228a675bc2fc1826592133d"; + sha256 = "654693d85aab899cc0a7402654808bd1f1de4d662e89fc6911a1d76576f1eec3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/sr/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/sr/firefox-106.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "d9dd66f19af5f1ba67b44a24856db0b9f880d77f37a9ece171fb358552487291"; + sha256 = "35dded72957eaf0f41732ea266815b3e999306c89b09a34e469eb1870ab7e0d2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/sv-SE/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/sv-SE/firefox-106.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "546fad48ae858fded383618b9bf35b4d235f40bcc62ecf40efd964e52e9d3b57"; + sha256 = "c163a543ab17a2455818961f7d05c21fad41aa1f058e72a6933062d9aeb46120"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/szl/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/szl/firefox-106.0.2.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "7f1b7214249ccb4a041eab383860a5004de208cfb1040eb7712adc0f65d6871a"; + sha256 = "89db4c0a6374cc59c79fc2c01f4b4708ee8945173f2d479c9f1bb874fc563f3c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/ta/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/ta/firefox-106.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "c9520b62c0516f9b7b6cfeee81d6a5880ae3ae8ecea8678428062744dc265fd0"; + sha256 = "31a37e0bdfbe64bed707d638e99966d188cc19b4281373332f28897a23f1a823"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/te/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/te/firefox-106.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "294c701a6b47da257a7aef3acb864513c606dc68357f17ceff3f090610d9fb64"; + sha256 = "ed43c3bcb25393c45fec508c2b7a186b831644c4dcbbea13b04d292b7e9d3d37"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/th/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/th/firefox-106.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "d2d57c38f19b735f9d0c63f1b90935ec5f59657b7824e46e5384f94bd6abeab6"; + sha256 = "749bd07bb5688876a622929fd7c3d1b564b177e04c107f47ae3194a19d51c9e2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/tl/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/tl/firefox-106.0.2.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "47f6a00479833afc6af7dc045a505fba7961b093715f16e5b8e33bb9697ccd6f"; + sha256 = "e3b95230a96f2d21816652b3415606d058e1f61047fb12c8df8fa7faefb55fc4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/tr/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/tr/firefox-106.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "5191edc55d2f0b7604094c30c0eaabaa319525ef084e8e18b7bc4de6442e188a"; + sha256 = "6794ae7099b774eda4887f3991539ce1b332132da962664db665ba6c15bab3a2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/trs/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/trs/firefox-106.0.2.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "b159860b09d16362d4f2655204a2c06fa48bb1c7be5c81749897eb57aa7a1799"; + sha256 = "69880d46bbcbb7e1232f5d7591a951c04b0f53e949769eacd3dcc9d6b7e1b41e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/uk/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/uk/firefox-106.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "d76a4e4d240d1631724b285fbebdfd9e976378e60bbb07347533b56763683911"; + sha256 = "44412afcec90e901dff146d7d7ddef253da1a287847ec0133c4403c1bbfc38e0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/ur/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/ur/firefox-106.0.2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "2cf7d4e8e6658162e004de86db9d98ae1d456c661aefd6f6a1ef917fbbbc7233"; + sha256 = "3dbdafb2cba4978141e59c34946eec2c85eee70d6af26a7b3a6f49f42ea21461"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/uz/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/uz/firefox-106.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "e2c3501af9eb9de310791ba9b94268fc2aedabe3936e200289c323fafeb718e7"; + sha256 = "0fc317d758bd97acd29be9fd558c617ef2ba6b05ea191037f6186f4c2872a58e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/vi/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/vi/firefox-106.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "ff5f115d3359884681f3f7a28f3335d8df1c88911f8228a52ba9c5e80bd88ba8"; + sha256 = "937fe371888bc6ed844117658d2cbc229a7bba72ef5976ba34c8d78b42315953"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/xh/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/xh/firefox-106.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "aa7a710d3c1359cc925aa6e6d503463c6eff67cf1e1f7b0db4b32e74d5140fd8"; + sha256 = "862fad90ca797a244194728aae810bc6d71e597c56a8b278e279a61c1573e3d2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/zh-CN/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/zh-CN/firefox-106.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "5544af3676984c4500836e39a583d605bba5ddad08a8a6c818fa7821890af654"; + sha256 = "45f36aa501abc63f03acb631e8cf473f0a85533b2eb7b37ceef64844388167f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/zh-TW/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-x86_64/zh-TW/firefox-106.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "d449f7d3875ff492ed8afc7fa4ce3766937e698d6e03409d814719bd7174d5d6"; + sha256 = "9c3f1a93c2f6681639e9341d9e94f14e095d69bdcad9491fca35a8b96aeda507"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/ach/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/ach/firefox-106.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "9f16b041726372d5d947f09ae20084e423a7d66522d10fc13bb310962f0ace1e"; + sha256 = "ff7cb6615610da86deb65b637995c169e169883e34bf04d992978b34ca048c14"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/af/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/af/firefox-106.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "51635da47398168ee27f1c546ff7c30416957e0576225b5885fa0d5afd46944c"; + sha256 = "751a67836897f9ca51c6bc05e14d9324d8338f8eb0336a9019279dc880a363ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/an/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/an/firefox-106.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "59c1fcbdfaf19665f1347fe07a26ba2744a44c7c9c946634968316dc6cd6abc8"; + sha256 = "9be574726561492a29b979cb2fc991f71ae2c81da12539d8ced43d49414a7bbc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/ar/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/ar/firefox-106.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "e51caa00e64b352573d9dc27f73a23c37e49a701e69a2fa77487156a9128787c"; + sha256 = "81805067f99e3b36eb5978b2e1f2ff8a593f7f2b04b34899a23a819e445a3aa0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/ast/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/ast/firefox-106.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "0b0e9804abf625490d5ba732be309a40931a876fb5c4d92b527ed14fe16aa68d"; + sha256 = "4aaefafb226f2332f863ce27ec660183f70dff35be2fbb9de92366f2ee5a7210"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/az/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/az/firefox-106.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "a3dbac31a3a24ba0803a8c90fd1ff918beca26d1823c8341ceed57fdfebfe466"; + sha256 = "65876b65e0081365133f0b56cbd4c0408489f9e4774120a7174b468d33e63a95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/be/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/be/firefox-106.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "6d1b85c455fa034cda37c57d259ebb1a7b261338a1fc1c36987401f9eb6c758d"; + sha256 = "777a7acc4908be97fb1bc2cdce4a6556411544e3b08e12459d9768b97c780be2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/bg/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/bg/firefox-106.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "7b98a1b4caa746f20a1344b637ff2d02e63d6050014859202705d050caf9f797"; + sha256 = "4a84f6843fe96ccc907e81446a903f00bb53f895d1908890ed986d7178b6b2a1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/bn/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/bn/firefox-106.0.2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "7cbb1f7c6a5edc7e6c601cb7b118705633f1ffea9a6841b906222192cc5f11d4"; + sha256 = "082a903c25901df9c7ab899e7a64f873e54b0c2dba0a29c5cd28483e8811a2ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/br/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/br/firefox-106.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "914174e70aadbbdd4f03eb917aa731b8635968366cc8446cc77cae657033a232"; + sha256 = "096c99a050d60f5922207dd56e4e63ab979567393ac2b65815974594e4f05e98"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/bs/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/bs/firefox-106.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "9cf593de0045b3834159e60ce8029ae52708168dde86b24d131b0ed1a3ae1413"; + sha256 = "94b8768283c4670b04e40dde655d2ca065e37accdac0e7e80bb55c95c95ab411"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/ca-valencia/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/ca-valencia/firefox-106.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "163bc54ff5fa0978c49221c005770a4717e0662a736c9c907148652be0cebf46"; + sha256 = "bd3600ddd2e05aa75e18fc73bad52fb60cc2a4f2fbf73f6fa539e79b22796345"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/ca/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/ca/firefox-106.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "2c29871e0e6e5cd9017d4eaa24893f39adc9251f7be041ba51dadadce43e58b5"; + sha256 = "3c6e4eaffd1b54ad058e7c121287cae86e1352a981962b142abdd4c49c8f1070"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/cak/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/cak/firefox-106.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "d60bc6e8c14b8a3afe33817e3930022ee244552443d04dd610c1944d7b90145b"; + sha256 = "c2b86923123f53fa1b2b897945b17e30d5392b2105b20db00607e59e44c4f46a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/cs/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/cs/firefox-106.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "b9d729d027c86bb620bca4f2d0792a6242c0d1963f0e1c94f37caed59deea1df"; + sha256 = "44a3ba503bb5a7ef7d2573025aa099e264e72aaf8030bf9e7d6c3ceb82a2e68c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/cy/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/cy/firefox-106.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "97d388f2fc00182366b4674eeffa8f96d0b05af2e39f500fce67e059343bdbbf"; + sha256 = "0304334256b8d47d8a816852b78d3c29af989b7b0f2d7940e95b452fe104a5a4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/da/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/da/firefox-106.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "155ccc093c3253ef01194e2bfbbffff0d19fe5d08a9a3895fd6a0c3ba6b1b7ed"; + sha256 = "b37ade9536c34da27c8c91b22be1d45f165eadd84940f985d8497335751673a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/de/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/de/firefox-106.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "955c284fdc1b89e621d846f91fdd91dc3e7aac8101a037fe4b0fa1eb1f8053cb"; + sha256 = "cad1df16c66cd4562162478f761ced90e4a1d12295e0ca463b9696cc0b008217"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/dsb/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/dsb/firefox-106.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "7f549ac2d20c33180439773c83a13abbef0f0056c8359604bfcab7d9635a9be3"; + sha256 = "f95273407309ea09d910ca24b6006058cb0c9bd64d882b3e8f65fd35ae02a372"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/el/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/el/firefox-106.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "34fdcd82dc8583d8439a9df7ef5771cd33e9838ac4325681950e9c54a9eb7f92"; + sha256 = "db63e09480f68a581826209a4b310a9613ab6ff121ad9acf8af08ef5ca62cd4e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/en-CA/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/en-CA/firefox-106.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "9f16e13defab325482328d3f0466caa251ef5a3832712e51db5016f9bf6e5ed5"; + sha256 = "fcdf6248e9af0e06b03dcb8d58c7bf83549c9be3870263493af726350c6132b4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/en-GB/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/en-GB/firefox-106.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "8d7a94a808bba71e0ebfc017a96ec2c74fcfe28cf911777161f6a2908119de6a"; + sha256 = "b16c35485e553e2696eeaf1edc5ff694ec305aa9d2f275f220a7edb07da63ea4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/en-US/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/en-US/firefox-106.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "7bd5efeb3b023624c61ddb4e0683e2573d0b6b49e5521ac8fc4474c8c0c09618"; + sha256 = "c38e91cc105f2823867edb9f3fa1859dd9d2c8becbf233b92ed6c2a1f3db2098"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/eo/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/eo/firefox-106.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "53bee07b6caf2dab18cb842ae3573556eecf1c2ceed46cfb554037d25ad41a8b"; + sha256 = "7c3772deb11133747b044f3a6154cc2bc5473b4aa7b62592b5468c0431a9142c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/es-AR/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/es-AR/firefox-106.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "8881872e1fa6f5303dc6cc7327a3e95da16d8f56cca34e63c66f7254f00e9658"; + sha256 = "1d32eee719c6b3935ba7f9ad9ff09093ff023ab19b272b72062cbf2d600dcb46"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/es-CL/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/es-CL/firefox-106.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "35ba78d075be404efce761219c208d3def7ee403282fa705be692e0d71cb9c52"; + sha256 = "542c76e72142bda3e0a30f6fef089870454a4e386c610a56a87f204af8e79333"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/es-ES/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/es-ES/firefox-106.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "89c9786196fca856a663502cbafdcb55a79a217fc220924fa3f3e91c3417de93"; + sha256 = "96b6f287f95c21dc101f0a9c4777274bbd048273137144c8af0d3192d15d173f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/es-MX/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/es-MX/firefox-106.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "1ee912ea7423355dc51a966dc4d4d0b6c361a9f4186f24e9ee8c6d68f7f9f544"; + sha256 = "ea9ab69d3845a3ca5c40f075322f396157df1fedf06f7532338edc0e56f00347"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/et/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/et/firefox-106.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "ff21dd87e571a32d55d5bfd5a9bc16ff90dfdbdf91714bc2526c004d703397aa"; + sha256 = "5c6f31f84dfbedb6353f7ea1ad0b30afa6026cf097d1250657f7a53d4bac8f63"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/eu/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/eu/firefox-106.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "907163e0021cb42c55cb84ba5b428683890688d0e506a3293c2e6df7336b913c"; + sha256 = "31ac00373c5b6225c196cb2d68777e84a40a7f45acb662c8b91348cdddc4f005"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/fa/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/fa/firefox-106.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "93dc288231d3b77cda50be5a3c12ea95281db2bb84068c9463ffd0bd20b93d22"; + sha256 = "e9685352aa8739d9dc74eae40207cc2aa29789eb38d8b8c41b9d548009503748"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/ff/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/ff/firefox-106.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "a93a552e57909b286104c6d3b067beb770d3cbb3c2c6933f5769ede79e5297a0"; + sha256 = "79e74b29f58825fc0f52a238c5427ebf17f1d2fae8832c938e1e9d9a8a56ad74"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/fi/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/fi/firefox-106.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "caf0865c18940bd33b38213fecf477e71ed76589f4f403f542adb1e3fe65c9ac"; + sha256 = "87c64b2a7cdbe464971707fd815b3f85e3b474f697cd2930c3d1f7ab9967eaba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/fr/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/fr/firefox-106.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "9ec7d97c4ba107b63daba71b4585e6fb2ac1ae5de66cd46bdce7afa188794dd6"; + sha256 = "6641d4ab2f34c498abb20f6ae24684791f40d4c52ad3be8c3b36551fce8a2633"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/fy-NL/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/fy-NL/firefox-106.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "9ae4c647c4ed2710eff78cf3e9966cafa5ef3d92044a8b6e0df730259f6c7eb2"; + sha256 = "2674a6ba3e045cd5408e6784751e0df57cbf3d8da78aaa2c96936ef469a4961f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/ga-IE/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/ga-IE/firefox-106.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "eea019930245e8ecdfe9bbba7d848f079119574a8efcc7efa726156ee8ffb777"; + sha256 = "a2719929b4a7df16afd24f7cd34bec351ede6b9b6813cf2a4f8dd29ca3fe4e55"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/gd/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/gd/firefox-106.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "8740cebb2df60e63a2c5d68d369385aa7e4b00c83b6f21bf684b645a2747742b"; + sha256 = "2cc0d55e9e850036d5a5e2e592259e7ec7ffb5ffd55d782a2fc7f75420ca0e0b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/gl/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/gl/firefox-106.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "5a5678395eb604617f1f26bb088a0a8f490ee60accc943ddb7530c14cce47956"; + sha256 = "b718dd6e7a4a88bbc0a5a0bb3adbeb3934e91c0d20366a4bd961cad5672f617b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/gn/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/gn/firefox-106.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "6c9e8ee762bdd01acf05d08b3ba78bc297b6752833a5155c8aa65f8a9b5608d2"; + sha256 = "41f96a2050cdb77c973b836d5210deaea06d3a442e4fe26ff5507d5d46e56cd1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/gu-IN/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/gu-IN/firefox-106.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "778e5de0eb1f22ce6962b3a197b4b8667cd05207be4536f9fd1b83fb1ecd5416"; + sha256 = "16bd5d310065f2212b1d82899a6c3b96a084b8aab5c056d513646860eaa62466"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/he/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/he/firefox-106.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "d079b3279dbfb36b2a9fde267de7e11a71fce9ed9767c249033461908d1af647"; + sha256 = "8d47900c31dd65267f3b69df8774d7c9d86adf61e6a24c71b35b94e7ef014eef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/hi-IN/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/hi-IN/firefox-106.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "cd1bf706a138e4ccf2fb3491a67432e258717a06c2bbfb1ed583a80c264ad880"; + sha256 = "2c1f46a2fdfd3197759b90b2d8c99338222fd58cd6f954c611ec6b134e84b560"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/hr/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/hr/firefox-106.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "ee6d2101e9b1b9281fd7fa2bd074cccb657d36acc961c43537206cb838af9c74"; + sha256 = "a9ec34c078067af32321c0961a0884611f81db6ae5326cfbf43d365971d81907"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/hsb/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/hsb/firefox-106.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "31a1bd9112c514739e98d110453a1b9fc7c4c097e9d22498f21242cafb3e0514"; + sha256 = "7049c623624bd2a77a60a46cc26d03046c10e6b9fa16f0f15c3ccc1280c60a0f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/hu/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/hu/firefox-106.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "8fddf8bffa16805c67cf9b72c6b21b0955753209ba23807bfc2de6bef4de0051"; + sha256 = "3e16bd536849182fa379940fcae415d7f3c4301a6db4a69ae3d18fa577a3efff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/hy-AM/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/hy-AM/firefox-106.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "69fc52e3c2307fb36d6b165a814c5e55898b87026febc759dc6014c9de375962"; + sha256 = "160a129e8b45fe510e48d5af2d47784918abde95742b2af9e7c07021289afbea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/ia/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/ia/firefox-106.0.2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "9d7f9a4706ec8180795e2aab4cf5cd82295f138616888ca88ee35d76d7457166"; + sha256 = "a6a4ad785e368af7297cd81de7b8b84ad71e23fec7dcf29e98dec4c4d6ee0113"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/id/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/id/firefox-106.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "4a888680e35bf060abbe36c5b9955786e162be412282dfbf2e1949003b06ca00"; + sha256 = "e20fc5d397d6164daea9eb4bd7b0ea867d5e4c92f5214f4f17d974206fb873b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/is/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/is/firefox-106.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "2ff3a4bc90a77986f8d9b35a216d2abdda2f0e2c61b617a86c24e722a36e68a7"; + sha256 = "c3702a5614e26c8ed18c16b5da89aef502c4782a9d186c66b7f469a98a979b1a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/it/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/it/firefox-106.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "ee804ceab7b4a42e9e781ea4b2d65d877561bb85bdf1e3079514c973b27106b4"; + sha256 = "4c46c918b41626b18276d5cc4aff99d5a0c2198e35d914382f9d291d6dc80f87"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/ja/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/ja/firefox-106.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "6875c91a033986e4600dbe8bdd2326b3d9f1233fd81162860479aeec5eeb67e4"; + sha256 = "514f482e47b24036797e1d099ee0a74fec299db6cd94e9054876281b3563060d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/ka/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/ka/firefox-106.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "9e571e902b4925c9294f1093d161607943df0b9797c3e4dae323ad7271258a90"; + sha256 = "37b633f8ff1c59151de9e19fdd8ba605605ce8cac08ac390252a2d5e6c152ae5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/kab/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/kab/firefox-106.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "31e00fb9ca697f18a1770be7665b981bd8fc5558cf2247f3211056603b396e08"; + sha256 = "ecf398fffea7aeb1cca615a07b7019a3e6502560f51ad64faa7d605aecd96bf4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/kk/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/kk/firefox-106.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "3d369677b8fe663847e30c0399a2dde9e4692d209aeffb6a2411516bd5607040"; + sha256 = "2ec26c7b974d7ea99dbee18cebce959c47be50351b381cc4c4d2ae5d2af92fca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/km/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/km/firefox-106.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "654218c82d49aa77e1d2c28892b027944976eed8195de5f674d651b163291fa0"; + sha256 = "4f3dc1496fb295ea8183dd0a1fae88059a96bf6747c2eef2cdeaaa8eb5b17018"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/kn/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/kn/firefox-106.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "cda09b1ab169473fbc8a201807cbceef4382ab0a346fd428d95ba2754dc776f4"; + sha256 = "c535f442a0ff34c01644ffeb1e961c1bdd6082c7e95a0e1bb96a11ceb7c59b35"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/ko/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/ko/firefox-106.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "c94b4936819f53a76cdf9b50077f8ae66c69153ffb3f34b556a9ec2c6f655474"; + sha256 = "c557a384b02898a2c833141ccd1caf8fdfe9fb6664ebf309d2707d1f6262c0a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/lij/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/lij/firefox-106.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "4930d71723c240f5493bd032d4a578b2dbf87073be4cd3bf3b43674d48c1efca"; + sha256 = "13a613ae949181b221b82b9fe92e42ff23add007a3440368d8d5300e074abfe7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/lt/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/lt/firefox-106.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "0323e677a9748aa13a282152504751e41e19bc4692e926898a23d70b1bce8240"; + sha256 = "fc068c98c2afbd044dbbbf39af2d757886d65a6194cab353bb49073e05a82e7e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/lv/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/lv/firefox-106.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "6de336ecdb9ec67d3cd24416fbfa2430b54add6d5e586b672b3cae977a017933"; + sha256 = "e83039f4b306c38ee2562fb4e2ec74d8d92806b170a70fe61a840a05e0fcb54e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/mk/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/mk/firefox-106.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "5332892231716c401846a780eb18df1f3944f29db61d0f05418a0044a51a36df"; + sha256 = "7aa2a1d7210d306e848b905a5d44ee0d15bb54e8f12e4ee23a5fc7953404ebbd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/mr/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/mr/firefox-106.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "8be7fc6fea188481fc98eb1141afc3f283b716270f8281fa96fff774f2d55070"; + sha256 = "4566542d424952d3630c410c328cd4c146f840978a5d37f665af3d0ba332f473"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/ms/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/ms/firefox-106.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "c72395da50fb54753fe2488c0125e0d0b1f1c3e521538ba57f9c47a15c6b9743"; + sha256 = "a8b25cb78b3493e3c3fdd1af81042aee8b820473bd2301a4f0a4ec38caab1276"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/my/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/my/firefox-106.0.2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "b2f56edaea8f9c4d4928edf913803cd2bd281af82d239b865c80e204ed7f00c2"; + sha256 = "9e113258a9f0bc79f97db9807de6615a447c35d243db543966eb0e79f6f15932"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/nb-NO/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/nb-NO/firefox-106.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "271e700ad7521a9f7a346b26e0ad80e2e912668eba81a0f16fb596d0a1e660b9"; + sha256 = "17b2d98d2cb497328106f77be1dbd53912b41c066b1a099f8af64d67f79f13eb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/ne-NP/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/ne-NP/firefox-106.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "34b974927f7bc142a0cb1bb432e25ac5105ca1c3d56a7673262334cdd0888a8e"; + sha256 = "fad578cfbd91b14ff66e06570bd07b5f23e7a6e8602cf3677d07272bad4e8c0d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/nl/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/nl/firefox-106.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "d10248e4af2639ef157d834a72a5f863171a538454b9b78da42fdebf4c5897b2"; + sha256 = "64019fb5ac2ca70f32ec28e1a54728890219af74ec2758413edc48d9c187eabf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/nn-NO/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/nn-NO/firefox-106.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "cbe5407ee2f158bf859cb6bdb83dbefc7136aeb2c5aa14df6fb6a4ecd907e9bd"; + sha256 = "f56012f01809d3b1b5197ebec59d02635bc1e72f3c8dfbe21fe510cf5daa9f4a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/oc/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/oc/firefox-106.0.2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "59f81bf4f2ca3478434e53442ee910875de1b59c4e0efa81e0e57cb908a40ac9"; + sha256 = "547fbccd4497db9ba216ec93c7944a85496b86f3cad5dbc18de25aa1dd67ca6d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/pa-IN/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/pa-IN/firefox-106.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "cb760a9bde61467ffc3f19401d1b6d20d70ee02cda9c1dc9d63b63dc88a79786"; + sha256 = "62f35e782ce5bd4a35d9610e0ad1193323f90624216aea86e6cec6aeb1ce7eea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/pl/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/pl/firefox-106.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "603606ad44552ddfb930527d8041eddfbb52159ac96914e1ee949594a4bea149"; + sha256 = "2657ca1eaa03f89eb8e40abb87268fed9189be8a6e8f2926281fa853c762003c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/pt-BR/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/pt-BR/firefox-106.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "a603d3078db5f27db9a6af118001f904912e3a7eccdca862996de5af6d52d72b"; + sha256 = "3d4ad803deae54f0bba2b6ec94951cdeb2980b7f1c19f57dd9ed4de555d69261"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/pt-PT/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/pt-PT/firefox-106.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "222fa8104474c2cb83b289692e2d32575ad78c7aa3694ac079fbf2499c95d01b"; + sha256 = "00fde3c6a5f1be11f92d47ba904f990b58e4bb9c46ab4ad8800ed9081e9adbc7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/rm/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/rm/firefox-106.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "76c269dc85488160029d93a0726907e72d08b940b460a845533b969d444521ce"; + sha256 = "d0ecd24e232b2a68c0da03865ae35cde2855163dc5e71b56cac84319af1e9576"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/ro/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/ro/firefox-106.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "932691e66c21d0037116b9250e927d51c3f53dbe146b20e6672034cc1f9234cd"; + sha256 = "5f03a25631b4b7763f7bf2c948c1a610e095f2f87ba8fa217f49baae5802a065"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/ru/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/ru/firefox-106.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "e12a4565d69e3e34f16f901539c706141f6be02d6d5382bdd49c22543ffc71be"; + sha256 = "4ba5c10bb06632c63fd42342d6aa3a6171c127431dba6ef878376947ad3eaa91"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/sco/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/sco/firefox-106.0.2.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "9a19c5b3c9decc0d2f08f410b4e65312561878822d6e8cf5f7db0d2c976f2eb4"; + sha256 = "2bae09ad0120b77c0ecfe8c9f9db2b6b297dd7867a42836ca27124eaaa02bbe7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/si/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/si/firefox-106.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "4030598f2716585c30334151d4147b01b3ddf363c668ae971c52b779e0bf7ffa"; + sha256 = "3380c01b1ce07b0ad624fe2872ad5cd8053d2b2d51444918bb6455ccc1947bc5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/sk/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/sk/firefox-106.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "c247c6b1657e55c27ba10bd5256eb5d68a0ae51aa0a53c98d5eb03430c9401db"; + sha256 = "e48a45bee33b8414921dd07380780d8f13ba1e6b923b717659c14c0a4a3da29e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/sl/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/sl/firefox-106.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "5c854b94c2c84136ac320787f04702b4334d2d52e95a97bf80fe014a06df0591"; + sha256 = "519a2735c36d182c4c4ed4103132564feab0bdf8afc55c0454bb93779297aefe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/son/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/son/firefox-106.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "c8ea64963e41d236541ad5e9eaabc6c87e1da684ad211627134b48c193ef9004"; + sha256 = "704901257ec45996fdfe11ad99eb52eab0573aed1bb0eb560788bd23a6f636f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/sq/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/sq/firefox-106.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "86a58fc53be72682e686d7bd317117b93b1a074df4a2a4eaea781a31f295f246"; + sha256 = "0040245c995bd9d51775b102c41f714a9ba77cecdf1169de6214f467f3765a4e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/sr/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/sr/firefox-106.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "5241ad256931a6a59c40f2bf8478676951b6030ab89965c1085289cfbe85d62f"; + sha256 = "032848b75d881d223c776c51b080b326b4a09e3d7494ed1a4531ed630eafc293"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/sv-SE/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/sv-SE/firefox-106.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "55ccc7815c95a1f023cc0a0771d9ce8b7f5e309f5ecc5dd56b9a85d2c3b46f18"; + sha256 = "7ac309cf2e56bbba5146836569687df0dc024eb0c5bcac50cc536fd789b2eec3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/szl/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/szl/firefox-106.0.2.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "9125a91d898a510ee268398684de1ff34b49b13e8a7661bc4d90ffdacf3e6252"; + sha256 = "0d4238828f09d4f2e12083f1ae0a3fd13488d100b0d3660dc8ff480b7a1c4c04"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/ta/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/ta/firefox-106.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "911c397b47ff1d3ba9e1e990d1c08e9ad6d3a092e09f8cbdca3537c81b386fe7"; + sha256 = "f5f8373c8588e34cc0fe60abfe44cb6e2cae83826fb59c7e65bd7bc4599d2fee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/te/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/te/firefox-106.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "25627e0fb575426dffda0d3c87e2f444dfff2d0b3cc2219548a033a02e990f1d"; + sha256 = "e85fa16dd5c780d3ba92d64c75194b8610fa1cb42002a83ccd81ec1b92dd3ed2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/th/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/th/firefox-106.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "d44972ab642179ccfa6de2ec6cc6d6a4332362e23167c4a1de2f2f011ff2448f"; + sha256 = "8aa714a7ef1b4e884364571e8d54057d33923105e5dff50f90ea965cbfe36a13"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/tl/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/tl/firefox-106.0.2.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "9a5775198e4305242211a2e44ff8dbbf3b78b02b227887e3b5704af770641f50"; + sha256 = "9f3e59cca6c56dafa7682a142630775c2de737491ccc95c6298fe290c06feb44"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/tr/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/tr/firefox-106.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "ffabcb2913e2bcc678696d073170377f30f9559c3c8a0d3a7a6b16e74c4c3ac7"; + sha256 = "c1457d4ea162643ceeaa644bb10098f44069c87b65188073587599e0a0dd1eb7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/trs/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/trs/firefox-106.0.2.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "b5d3a5d575c04ae36290a5d5142ef7f993674d2861486bec2fa1bd24520eb5e5"; + sha256 = "d7e51bae403116e17acd009bd3302d407c1614c453e9bb0bb6886ee60c45da02"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/uk/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/uk/firefox-106.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "3b0b32b94d9e0258c7555b09c38c71b22c6c22ef06dcf005400d0bd6a766d5d9"; + sha256 = "1c79157df0cd80ec651ab43054ad9064f868d2aeac44e576dd2a08aba083ae50"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/ur/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/ur/firefox-106.0.2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "3915095ea690e0bba685e71da49b689561a122fb3914ee4ed2430d991104f16e"; + sha256 = "be045e0336cd865c4882040d0badbf0fe53847ff88a32f975790cf3b76347ddd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/uz/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/uz/firefox-106.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "73e9355528be81af00fb55143f6491c798213be197b7fcfe200e80d1075c3282"; + sha256 = "eeb222a8109f98aee6e6ceb1e0c7ef4a59ea1de6953f1859fff62de45602fc82"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/vi/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/vi/firefox-106.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "0a36154fda9cd6877a2068474da60d859cc1338c38d1897ac1d9085d73bed0df"; + sha256 = "be0ca0eeb058c1a7b84d49d66efb04d02a6852f0f77e97d01221a87785ad0449"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/xh/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/xh/firefox-106.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "1befeacf0ad002e6cf7cf2ff8d57277eac4d05f2df68dd2f97ac4063cbf5c573"; + sha256 = "281015f7c01ff64c2dbedc154c401761a9070cd05d4971b1eb22e01edd16db27"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/zh-CN/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/zh-CN/firefox-106.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "8c607afb1a79b9e3af94cbd4a1f847c8aef5fb4dbc31157a49ec52b89515d129"; + sha256 = "6d6640d8bb82f081dbaa0c58b5cc4fe65855d232297c02bd5af1f9712fc2d94e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/zh-TW/firefox-106.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.2/linux-i686/zh-TW/firefox-106.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "a5fc3a0d052781f8511da1ba585d7fa7e0ab0786d8eef596bb1744fdc9600e13"; + sha256 = "c162cb00ad7133eefd88042568fbe74b628ecf70d11b8f50c5259d81477e78cc"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 09a24cbf21ae..6f9c93b62244 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -3,10 +3,10 @@ rec { firefox = buildMozillaMach rec { pname = "firefox"; - version = "106.0.1"; + version = "106.0.2"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "15f5a65a69e11dd0c463b358cafb5ad0f31db93619b9ec3f89e8c5e14d4d319d9423fe4dcd0dbbcbedc1ad444dcbd8e5e30e483220277f5b550bff6124b66519"; + sha512 = "2aad75c05c3398c19842be46dcde275581344b09f0c65b51a630cef201545996ee00f8020f52a0d7b6416d9ad52cbd5c71b8f1cdf47cd18e4abf1ba21f7cdb93"; }; # This patch could be applied anywhere (just rebuild, no effect) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 8256f036f2e3..688d6140afb4 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -87,7 +87,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "11.5.4"; + version = "11.5.5"; lang = "en-US"; @@ -99,7 +99,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "sha256-23P8Ew0asOptDYVJ0xA+ATOOT92nz/I2F2+CsAejfKo="; + sha256 = "sha256-AOt0PFot6Qh9voqvi5bagW0HLk2kP8b6A2c8Jdv5vkQ="; }; i686-linux = fetchurl { @@ -109,7 +109,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "sha256-ye4qq+zH1AlDItP8lKfA9YIJ7AMg1Roc4itpr0kWNtY="; + sha256 = "sha256-MQrJgdAsNvG+WCx4eeb2UHZp/0LoOIhZZQUKESNIGZY="; }; }; in diff --git a/pkgs/applications/networking/cluster/kyverno/default.nix b/pkgs/applications/networking/cluster/kyverno/default.nix index da602ac6864b..6ff8edd737ff 100644 --- a/pkgs/applications/networking/cluster/kyverno/default.nix +++ b/pkgs/applications/networking/cluster/kyverno/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kyverno"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "kyverno"; repo = "kyverno"; rev = "v${version}"; - sha256 = "sha256-VJhn3z/utbcZdJjmVzsjyqPfpKMmDXSKUcoALSmawqs="; + sha256 = "sha256-pwT+fzFzJBkQkWmeHlqbTVSmmh7p3h7M4p5Wrrq+vJM="; }; ldflags = [ @@ -18,7 +18,7 @@ buildGoModule rec { "-X github.com/kyverno/kyverno/pkg/version.BuildTime=1970-01-01_00:00:00" ]; - vendorSha256 = "sha256-8Sk36IFk3tL/wqDnKJw/K1MtKBZuVRRFkyMl4b/XwDI="; + vendorSha256 = "sha256-QE2OWymT/ke/5+f3Sw5MBadorcn/vXJXvwOaFNqhxWQ="; subPackages = [ "cmd/cli/kubectl-kyverno" ]; diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 4afadc218e71..c5f8b3364fec 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "werf"; - version = "1.2.180"; + version = "1.2.184"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-6I1Elq5tA7Vh+FaPYNVfEynTbw35WM/UuruqArGhsz4="; + hash = "sha256-u3Mf7a+IGLWYvAt/Db/BwvtGc66SnYz5Qx2BkCCLKPg="; }; - vendorHash = "sha256-rdrIJ1knarb7tEXl4BxYckHdX5oS2yvfcuRAI16ThU4="; + vendorHash = "sha256-T9xGLQcnO9xyRVNX3xCwsOOXWvBbhhw9dH8gW7aBUjE="; proxyVendor = true; @@ -36,16 +36,18 @@ buildGoModule rec { "-s" "-w" "-X github.com/werf/werf/pkg/werf.Version=${src.rev}" - ] ++ lib.optionals stdenv.isLinux [ - "-extldflags '-static'" + ] ++ lib.optionals (CGO_ENABLED == 1) [ + "-extldflags=-static" "-linkmode external" ]; tags = [ "containers_image_openpgp" "dfrunmount" + "dfrunnetwork" + "dfrunsecurity" "dfssh" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals (CGO_ENABLED == 1) [ "exclude_graphdriver_devicemapper" "netgo" "no_devmapper" diff --git a/pkgs/applications/radio/gnuradio/3.8.nix b/pkgs/applications/radio/gnuradio/3.8.nix index f3a56cfdb055..301193a65785 100644 --- a/pkgs/applications/radio/gnuradio/3.8.nix +++ b/pkgs/applications/radio/gnuradio/3.8.nix @@ -271,11 +271,11 @@ stdenv.mkDerivation rec { # order to build, see https://github.com/qradiolink/qradiolink/issues/67 ++ lib.optionals (hasFeature "gr-vocoder") [ "-DLIBCODEC2_FOUND=TRUE" - "-DLIBCODEC2_LIBRARIES=${codec2}/lib/libcodec2.so" + "-DLIBCODEC2_LIBRARIES=${codec2}/lib/libcodec2${stdenv.hostPlatform.extensions.sharedLibrary}" "-DLIBCODEC2_INCLUDE_DIRS=${codec2}/include" "-DLIBCODEC2_HAS_FREEDV_API=ON" "-DLIBGSM_FOUND=TRUE" - "-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm.so" + "-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm${stdenv.hostPlatform.extensions.sharedLibrary}" "-DLIBGSM_INCLUDE_DIRS=${gsm}/include/gsm" ] ++ lib.optionals (hasFeature "volk" && volk != null) [ diff --git a/pkgs/applications/radio/gnuradio/3.9.nix b/pkgs/applications/radio/gnuradio/3.9.nix index 29998fb2097a..e54c502060a2 100644 --- a/pkgs/applications/radio/gnuradio/3.9.nix +++ b/pkgs/applications/radio/gnuradio/3.9.nix @@ -296,7 +296,7 @@ stdenv.mkDerivation rec { # This is the only python reference worth removing, if needed. + lib.optionalString (!hasFeature "python-support") '' ${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake - ${removeReferencesTo}/bin/remove-references-to -t ${python} $(readlink -f $out/lib/libgnuradio-runtime.so) + ${removeReferencesTo}/bin/remove-references-to -t ${python} $(readlink -f $out/lib/libgnuradio-runtime${stdenv.hostPlatform.extensions.sharedLibrary}) ${removeReferencesTo}/bin/remove-references-to -t ${python.pkgs.pybind11} $out/lib/cmake/gnuradio/gnuradio-runtimeTargets.cmake '' ; diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index 01fa40ebcf3c..39aa9336aec9 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -317,7 +317,7 @@ stdenv.mkDerivation rec { # This is the only python reference worth removing, if needed. + lib.optionalString (!hasFeature "python-support") '' ${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake - ${removeReferencesTo}/bin/remove-references-to -t ${python} $(readlink -f $out/lib/libgnuradio-runtime.so) + ${removeReferencesTo}/bin/remove-references-to -t ${python} $(readlink -f $out/lib/libgnuradio-runtime${stdenv.hostPlatform.extensions.sharedLibrary}) ${removeReferencesTo}/bin/remove-references-to -t ${python.pkgs.pybind11} $out/lib/cmake/gnuradio/gnuradio-runtimeTargets.cmake '' ; diff --git a/pkgs/applications/radio/gnuradio/shared.nix b/pkgs/applications/radio/gnuradio/shared.nix index acb13cc1e2a3..a5ae83eb3513 100644 --- a/pkgs/applications/radio/gnuradio/shared.nix +++ b/pkgs/applications/radio/gnuradio/shared.nix @@ -84,7 +84,11 @@ rec { postInstall = "" # Gcc references + lib.optionalString (hasFeature "gnuradio-runtime") '' - ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libgnuradio-runtime.so) + ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libgnuradio-runtime${stdenv.hostPlatform.extensions.sharedLibrary}) + '' + # Clang references in InstalledDir + + lib.optionalString (hasFeature "gnuradio-runtime" && stdenv.isDarwin) '' + ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc.cc} $(readlink -f $out/lib/libgnuradio-runtime${stdenv.hostPlatform.extensions.sharedLibrary}) '' ; # NOTE: Outputs are disabled due to upstream not using GNU InstallDIrs cmake @@ -112,7 +116,6 @@ rec { doCheck = false; meta = with lib; { - broken = stdenv.isDarwin; description = "Software Defined Radio (SDR) software"; longDescription = '' GNU Radio is a free & open-source software development toolkit that @@ -126,6 +129,6 @@ rec { homepage = "https://www.gnuradio.org"; license = licenses.gpl3; platforms = platforms.unix; - maintainers = with maintainers; [ doronbehar bjornfor fpletz ]; + maintainers = with maintainers; [ doronbehar bjornfor fpletz jiegec ]; }; } diff --git a/pkgs/applications/radio/gnuradio/wrapper.nix b/pkgs/applications/radio/gnuradio/wrapper.nix index 57d8f75320bb..926022353e41 100644 --- a/pkgs/applications/radio/gnuradio/wrapper.nix +++ b/pkgs/applications/radio/gnuradio/wrapper.nix @@ -98,19 +98,21 @@ let "${ lib.makeSearchPath unwrapped.qt.qtbase.qtPluginPrefix - (builtins.map lib.getBin [ + (builtins.map lib.getBin ([ unwrapped.qt.qtbase + ] ++ lib.optionals stdenv.isLinux [ unwrapped.qt.qtwayland - ]) + ])) }" "--prefix" "QML2_IMPORT_PATH" ":" "${ lib.makeSearchPath unwrapped.qt.qtbase.qtQmlPrefix - (builtins.map lib.getBin [ + (builtins.map lib.getBin ([ unwrapped.qt.qtbase + ] ++ lib.optionals stdenv.isLinux [ unwrapped.qt.qtwayland - ]) + ])) }" ] else diff --git a/pkgs/applications/video/davinci-resolve/default.nix b/pkgs/applications/video/davinci-resolve/default.nix index 6ae5759f6d16..f931e905127f 100644 --- a/pkgs/applications/video/davinci-resolve/default.nix +++ b/pkgs/applications/video/davinci-resolve/default.nix @@ -16,6 +16,7 @@ , xkeyboard_config , glib , libarchive +, libxcrypt , python2 }: @@ -154,6 +155,7 @@ buildFHSUserEnv { ocl-icd glib libarchive + libxcrypt # provides libcrypt.so.1 xdg-utils # xdg-open needed to open URLs python2 # currently they want python 3.6 which is EOL diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 9cc7b9d3893b..83824b6cb943 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -238,19 +238,19 @@ rec { # Get revisions from # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* docker_20_10 = callPackage dockerGen rec { - version = "20.10.20"; + version = "20.10.21"; rev = "v${version}"; - sha256 = "sha256-hzD4p0cunU21n0eXuMPRz37T+KSvQ583cs64f51CxLM="; + sha256 = "sha256-hPQ1t7L2fqoFWoinqIrDwFQ1bo9TzMb4l3HmAotIUS8="; moby-src = fetchFromGitHub { owner = "moby"; repo = "moby"; rev = "v${version}"; - sha256 = "sha256-BfFnG0cR0FyQvX683RPsY0gC5w2wvgvmDZgKnDJsnG4="; + sha256 = "sha256-BcYDh/UEmmURt7hWLWdPTKVu/Nzoeq/shE+HnUoh8b4="; }; runcRev = "v1.1.4"; runcSha256 = "sha256-ougJHW1Z+qZ324P8WpZqawY1QofKnn8WezP7orzRTdA="; - containerdRev = "v1.6.8"; - containerdSha256 = "sha256-0UiPhkTWV61DnAF5kWd1FctX8i0sXaJ1p/xCMznY/A8="; + containerdRev = "v1.6.9"; + containerdSha256 = "sha256-KvQdYQLzgt/MKPsA/mO5un6nE3/xcvVYwIveNn/uDnU="; tiniRev = "v0.19.0"; tiniSha256 = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix index 4a7ce6f6d46d..0b538b769764 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-display"; - version = "2.3.2"; + version = "2.3.3"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-3sYZCazGnTjIi3Iry5673TMI13sD0GuY+46AK+NJH70="; + sha256 = "sha256-d25++3msaS9dg2Rsl7mrAezDn8Lawd3/X0XPH5Zy6Rc="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix index b59e26e344f7..c11a8ff6e268 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-security-privacy"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-jT8aYE36ZAeB9ng3RojVqxzmLtzpbsNRHPuDQ03XKcI="; + sha256 = "sha256-k8IQumV8rjV3U4ACm5FxCqzSdwqKBaGAqsv45hsP/7c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/gnuradio-modules/grnet/default.nix b/pkgs/development/gnuradio-modules/grnet/default.nix index 6e8b72a6565b..fc12abd8cfa5 100644 --- a/pkgs/development/gnuradio-modules/grnet/default.nix +++ b/pkgs/development/gnuradio-modules/grnet/default.nix @@ -1,6 +1,7 @@ { lib , mkDerivation , fetchFromGitHub +, fetchpatch , gnuradio , cmake , pkg-config @@ -54,6 +55,16 @@ mkDerivation { inherit src; disabledForGRafter = "3.10"; + patches = [ + # Use cross platform struct ip instead of iphdr + # https://github.com/ghostop14/gr-grnet/pull/19 + (fetchpatch { + name = "fix-compilation-on-darwin.patch"; + url = "https://github.com/ghostop14/gr-grnet/commit/52c07daa9ba595b76ffa5dd90c0c96694d95d140.patch"; + sha256 = "sha256-1gJaYLIn09blOhALMfBPROt5YBXaosG41Vsd3+5h518="; + }) + ]; + buildInputs = [ boost log4cpp diff --git a/pkgs/development/gnuradio-modules/osmosdr/default.nix b/pkgs/development/gnuradio-modules/osmosdr/default.nix index b0c7a43c8e4c..20fe12826671 100644 --- a/pkgs/development/gnuradio-modules/osmosdr/default.nix +++ b/pkgs/development/gnuradio-modules/osmosdr/default.nix @@ -1,4 +1,6 @@ { lib +, stdenv +, darwin , mkDerivation , fetchgit , gnuradio @@ -58,6 +60,9 @@ in mkDerivation { ] ++ lib.optionals (gnuradio.hasFeature "gr-ctrlport") [ thrift python.pkgs.thrift + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.IOKit + darwin.apple_sdk.frameworks.Security ]; cmakeFlags = [ (if (gnuradio.hasFeature "python-support") then diff --git a/pkgs/development/libraries/libad9361/default.nix b/pkgs/development/libraries/libad9361/default.nix index 74707897bd0c..115f37161553 100644 --- a/pkgs/development/libraries/libad9361/default.nix +++ b/pkgs/development/libraries/libad9361/default.nix @@ -15,11 +15,19 @@ stdenv.mkDerivation rec { buildInputs = [ libiio ]; + postPatch = lib.optionalString stdenv.isDarwin '' + # Fix iio include path on darwin to match linux + for i in test/*.c; do + substituteInPlace $i \ + --replace 'iio/iio.h' 'iio.h' + done + ''; + meta = with lib; { description = "IIO AD9361 library for filter design and handling, multi-chip sync, etc"; homepage = "http://analogdevicesinc.github.io/libad9361-iio/"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ sikmir ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix index 400da08cab32..c495935e1402 100644 --- a/pkgs/development/libraries/libiio/default.nix +++ b/pkgs/development/libraries/libiio/default.nix @@ -10,11 +10,14 @@ , libaio , runtimeShell , lib +, pkg-config +, CFNetwork +, CoreServices }: stdenv.mkDerivation rec { pname = "libiio"; - version = "0.23"; + version = "0.24"; outputs = [ "out" "lib" "dev" "python" ]; @@ -22,7 +25,7 @@ stdenv.mkDerivation rec { owner = "analogdevicesinc"; repo = "libiio"; rev = "v${version}"; - sha256 = "0awny9zb43dcnxa5jpxay2zxswydblnbn4x6vi5mlw1r48pzhjf8"; + sha256 = "sha256-c5HsxCdp1cv5BGTQ/8dc8J893zk9ntbfAudLpqoQ1ow="; }; # Revert after https://github.com/NixOS/nixpkgs/issues/125008 is @@ -33,6 +36,7 @@ stdenv.mkDerivation rec { cmake flex bison + pkg-config ]; buildInputs = [ @@ -40,12 +44,17 @@ stdenv.mkDerivation rec { libxml2 libusb1 avahi - libaio - ] ++ lib.optional python.isPy3k python.pkgs.setuptools; + ] ++ lib.optional python.isPy3k python.pkgs.setuptools + ++ lib.optional stdenv.isLinux libaio + ++ lib.optionals stdenv.isDarwin [ CFNetwork CoreServices ]; cmakeFlags = [ "-DUDEV_RULES_INSTALL_DIR=${placeholder "out"}/lib/udev/rules.d" "-DPYTHON_BINDINGS=on" + # osx framework is disabled, + # the linux-like directory structure is used for proper output splitting + "-DOSX_PACKAGE=off" + "-DOSX_FRAMEWORK=off" ]; postPatch = '' @@ -65,7 +74,7 @@ stdenv.mkDerivation rec { description = "API for interfacing with the Linux Industrial I/O Subsystem"; homepage = "https://github.com/analogdevicesinc/libiio"; license = licenses.lgpl21Plus; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/development/libraries/libunarr/default.nix b/pkgs/development/libraries/libunarr/default.nix index 94269e85c66d..ccf65e64d293 100644 --- a/pkgs/development/libraries/libunarr/default.nix +++ b/pkgs/development/libraries/libunarr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake }: +{ lib, stdenv, fetchurl, fetchpatch, cmake }: stdenv.mkDerivation rec { pname = "libunarr"; @@ -16,11 +16,16 @@ stdenv.mkDerivation rec { substituteInPlace pkg-config.pc.cmake \ --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + '' + # ld: unknown option: --no-undefined + + lib.optionalString stdenv.isDarwin '' + substituteInPlace CMakeLists.txt \ + --replace '-Wl,--no-undefined -Wl,--as-needed' '-Wl,-undefined,error' ''; meta = with lib; { homepage = "https://github.com/selmf/unarr"; description = "A lightweight decompression library with support for rar, tar and zip archives"; - license = licenses.lgpl3; + license = licenses.lgpl3Plus; }; } diff --git a/pkgs/development/libraries/qwt/default.nix b/pkgs/development/libraries/qwt/default.nix index e74f8300bf72..9a2a53587e48 100644 --- a/pkgs/development/libraries/qwt/default.nix +++ b/pkgs/development/libraries/qwt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, qtbase, qtsvg, qttools, qmake }: +{ lib, stdenv, fetchurl, qtbase, qtsvg, qttools, qmake, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "qwt"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ qtbase qtsvg qttools ]; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ qmake ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; postPatch = '' sed -e "s|QWT_INSTALL_PREFIX.*=.*|QWT_INSTALL_PREFIX = $out|g" -i qwtconfig.pri diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index fa6731161cd3..57f616e088dd 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -1958,17 +1958,17 @@ luafilesystem = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast }: buildLuarocksPackage { pname = "luafilesystem"; - version = "1.7.0-2"; + version = "1.8.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luafilesystem-1.7.0-2.rockspec"; - sha256 = "0xivgn8bbkx1g5a30jrjcv4hg5mpiiyrm3fhlz9lndgbh4cnjrq6"; + url = "mirror://luarocks/luafilesystem-1.8.0-1.rockspec"; + sha256 = "18nkaks0b75dmycljg5vljap5w8d0ysdkg96yl5szgzr7nzrymfa"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/keplerproject/luafilesystem", - "rev": "de87218e9798c4dd1a40d65403d99e9e82e1cfa0", - "date": "2017-09-15T20:07:33-03:00", - "path": "/nix/store/20xm4942kvnb8kypg76jl7zrym5cz03c-luafilesystem", - "sha256": "0zmprgkm9zawdf9wnw0v3w6ibaj442wlc6alp39hmw610fl4vghi", + "rev": "7c6e1b013caec0602ca4796df3b1d7253a2dd258", + "date": "2020-04-22T22:16:42-03:00", + "path": "/nix/store/qzjav1cmn4zwclpfs0xzykpbv835d84z-luafilesystem", + "sha256": "16hpwhj6zgkjns3zilcg3lxfijm3cl71v39y9n5lbjk4b9kkwh54", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 494e1ac87993..9632eb1931c5 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.23"; + version = "9.2.24"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-CWjqVtVioIiEf6kvqknt4KiQmom3bA3AOJQHszKOLWM="; + hash = "sha256-bRoSYl+VmlACWdS3m4G4a/649yMRtYp+J6pHPEAFtCk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index c709c0538651..38d82f156eea 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -46,7 +46,7 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.2.23"; + version = "9.2.24"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -55,7 +55,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-qI/KKfbr2M46Bn8+4qbB6NCmaTF4nHzm+dZ3AJrsD2o="; + hash = "sha256-STFNKFI35PpdlZ5537G2+6RBRJDsrEb1MQNLLQnhiB8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index 508d6670c6d2..ec7555b22492 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/pkgs/development/python-modules/apache-beam/default.nix @@ -27,18 +27,20 @@ , pymongo , pytestCheckHook , python -, pythonAtLeast , python-dateutil +, pythonAtLeast +, pythonRelaxDepsHook , pytz , pyyaml , requests , requests-mock +, scikit-learn , setuptools , sqlalchemy , tenacity -, typing-extensions , testcontainers -, scikit-learn }: +, typing-extensions +}: buildPythonPackage rec { pname = "apache-beam"; @@ -51,14 +53,16 @@ buildPythonPackage rec { sha256 = "sha256-0S7Dj6PMSbZkEAY6ZLUpKVfe/tFxsq60TTAFj0Qhtv0="; }; - # See https://github.com/NixOS/nixpkgs/issues/156957. - postPatch = '' - substituteInPlace setup.py \ - --replace "dill>=0.3.1.1,<0.3.2" "dill" \ - --replace "pyarrow>=0.15.1,<8.0.0" "pyarrow" \ - --replace "numpy>=1.14.3,<1.23.0" "numpy" \ - --replace "pymongo>=3.8.0,<4.0.0" "pymongo" - ''; + pythonRelaxDeps = [ + # See https://github.com/NixOS/nixpkgs/issues/156957 + "dill" + "numpy" + "pyarrow" + "pymongo" + + # See https://github.com/NixOS/nixpkgs/issues/193613 + "protobuf" + ]; sourceRoot = "source/sdks/python"; @@ -66,6 +70,7 @@ buildPythonPackage rec { cython grpcio-tools mypy-protobuf + pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index ce6c61a343eb..bd266603ebfd 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.23"; + version = "9.2.24"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-PjxM25k8wTl5e0ZyIVCUq6BENiLRMAgMaUeUaxYTIBo="; + hash = "sha256-e8s8/HzJ8yeqcUarGCnDGHzwMUqYj/1/rC6p+zWihLk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/chacha20poly1305/default.nix b/pkgs/development/python-modules/chacha20poly1305/default.nix new file mode 100644 index 000000000000..d4f88b0a7349 --- /dev/null +++ b/pkgs/development/python-modules/chacha20poly1305/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "chacha20poly1305"; + version = "0.0.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-8vAFx89GOP+k/wbALHh0gGi2QpFnlcbRbHzF41XnDt8="; + }; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "chacha20poly1305" + ]; + + meta = with lib; { + description = "Module that implements ChaCha20Poly1305"; + homepage = "https://github.com/ph4r05/py-chacha20poly1305"; + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index dde59ca5088d..b9317fe50f12 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.23"; + version = "9.2.24"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-geTAvIVgvlGHYc3W2v1jNg2+sfbIhEHmE2uCvT6fIug="; + hash = "sha256-I5uf7K5QBhgbumRMuFmJKPOmwXjmf4BP1JiFuxk40AA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 3cc83b2a9ba9..fc8674232698 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,7 +16,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.23"; + version = "9.2.24"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-fuKBmJcH8h2oM7M0XYdLcGbLI/sm51nKM4d8099MKnw="; + hash = "sha256-xCU/9V+rncJxpv5MnalpyKSLr85K3y+CYEqvAN9ixt0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ezdxf/default.nix b/pkgs/development/python-modules/ezdxf/default.nix index 6e1349883ada..c04017b4e49d 100644 --- a/pkgs/development/python-modules/ezdxf/default.nix +++ b/pkgs/development/python-modules/ezdxf/default.nix @@ -38,6 +38,8 @@ buildPythonPackage rec { "test_from_nurbs_python_curve_to_ezdxf_bspline" "test_from_ezdxf_bspline_to_nurbs_python_curve_non_rational" "test_from_ezdxf_bspline_to_nurbs_python_curve_rational" + # AssertionError: assert 44.99999999999999 == 45 + "test_dimension_transform_interface" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index ce1e35f06e82..87762215f76b 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2022.10.9"; + version = "2022.10.10"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-QBYJnQzKGQDPJJ6mWRBYwuPiv+Yktu31SparORuvUwY="; + sha256 = "sha256-msSAZAKJFN4bjnJABuAI+rZ5HJSzKFkq4LV2jat6Tas="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-bsblan/default.nix b/pkgs/development/python-modules/python-bsblan/default.nix new file mode 100644 index 000000000000..73f41f63b121 --- /dev/null +++ b/pkgs/development/python-modules/python-bsblan/default.nix @@ -0,0 +1,64 @@ +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, packaging +, poetry-core +, pydantic +, pytest-asyncio +, pytest-mock +, pytestCheckHook +, pythonOlder +, yarl +}: + +buildPythonPackage rec { + pname = "python-bsblan"; + version = "0.5.6"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "liudger"; + repo = pname; + rev = "v${version}"; + hash = "sha256-eTKexiuomlTryy2bD2w9Pzhb4R9C3OIbLNX+7h/5l+c="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + packaging + pydantic + yarl + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytest-mock + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'version = "0.0.0"' 'version = "${version}"' \ + --replace "--cov" "" + ''; + + pythonImportsCheck = [ + "bsblan" + ]; + + meta = with lib; { + description = "Module to control and monitor an BSBLan device programmatically"; + homepage = "https://github.com/liudger/python-bsblan"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 7921185102aa..8817503fe108 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.23"; + version = "9.2.24"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-PCAIrfgcCXzcN7Oq9JTZYJF/8gUGcoXXvG+aJ4kLQQs="; + hash = "sha256-PRrr/ry4OEdn45y5AiW6uwcKfxvDUwt1ylfgsOR47HI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index 5bd7d15d1121..c7775aa435d6 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "timetagger"; - version = "22.9.3"; + version = "22.10.1"; src = fetchFromGitHub { owner = "almarklein"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-9YmO0nD6QSFMSXsWlfbRxNWW1nwe7WXinC9pLe7rDEY="; + sha256 = "sha256-+7PKYVZfX+zDBKpaFwEVftyp4yPL90X9HSQDvoNNFuA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/wxPython/4.2.nix b/pkgs/development/python-modules/wxPython/4.2.nix index a68d6cb4590a..cd112f8511c3 100644 --- a/pkgs/development/python-modules/wxPython/4.2.nix +++ b/pkgs/development/python-modules/wxPython/4.2.nix @@ -1,6 +1,7 @@ { lib , stdenv , buildPythonPackage +, setuptools , pythonOlder , fetchPypi , substituteAll @@ -61,6 +62,7 @@ buildPythonPackage rec { nativeBuildInputs = [ attrdict pkg-config + setuptools SDL sip which diff --git a/pkgs/development/tools/codeowners/default.nix b/pkgs/development/tools/codeowners/default.nix index a7ab92c0228a..ad75aa888b5c 100644 --- a/pkgs/development/tools/codeowners/default.nix +++ b/pkgs/development/tools/codeowners/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "codeowners"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "hmarr"; repo = pname; rev = "v${version}"; - hash = "sha256-4/e+EnRI2YfSx10mU7oOZ3JVE4TNEFwD2YJv+C0qBhI="; + hash = "sha256-ttJLJtuZrY71eKcjoSLypGTUeXd2lAJlM10Ft9YEEKc="; }; vendorSha256 = "sha256-UMLM9grPSmx3nAh1/y7YhMWk12/JcT75/LQvjnLfCyE="; diff --git a/pkgs/development/tools/dprint/default.nix b/pkgs/development/tools/dprint/default.nix index da8ee030fad2..8f5435f82728 100644 --- a/pkgs/development/tools/dprint/default.nix +++ b/pkgs/development/tools/dprint/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "dprint"; - version = "0.32.1"; + version = "0.32.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-CZSGE9HsxBX7vqLLPTLWFi/NGHa1FXA6YWqFHvzVeAQ="; + sha256 = "sha256-F7hqSbCGP3p+6khNMfuUABAvtB8MMABcpX7zK9rWhrQ="; }; - cargoSha256 = "sha256-vYiCSU02mHUKKe0tyB+byhNZhZ+d8yhQf8IKI5r/qYU="; + cargoSha256 = "sha256-Azsky2rst+z33EKfZ+6LSeF+MpSNjNxQrLkqxgLAQ1o="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/development/tools/misc/pahole/default.nix b/pkgs/development/tools/misc/pahole/default.nix index 7a60da1e53a3..ab4db7a8cc8c 100644 --- a/pkgs/development/tools/misc/pahole/default.nix +++ b/pkgs/development/tools/misc/pahole/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pahole"; - version = "1.23"; + version = "1.24"; src = fetchgit { url = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git"; rev = "v${version}"; - sha256 = "sha256-Dt3ZcUfjwdtTTv6qRFRgwK5GFWXdpN7fvb9KhpS1O94="; + sha256 = "sha256-OPseVKt5kIKgK096+ufKrWMS1E/7Z0uxNqCMN6wKfKg="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/tools/oras/default.nix b/pkgs/development/tools/oras/default.nix index 61e7e07b2edf..b0adcadd8440 100644 --- a/pkgs/development/tools/oras/default.nix +++ b/pkgs/development/tools/oras/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "oras"; - version = "0.14.1"; + version = "0.15.1"; src = fetchFromGitHub { owner = "oras-project"; repo = "oras"; rev = "v${version}"; - sha256 = "sha256-SE79SQtQT+HRHjxRXnu2bWNKj56P5Szhdo+CpvQRwlI="; + sha256 = "sha256-8QmMC4eB7WNxfEsVRUzv/gb7QmNBvcgDEENa1XxpCug="; }; - vendorSha256 = "sha256-ufTQlqMRIFgyH+xO+fPKBTQ9blqM9thiYrVlQDmgUqQ="; + vendorSha256 = "sha256-THqrGnJnNDL6BJpRxeNLPjWB+SEUMUhiVOcJZDTM6n8="; ldflags = [ "-s" diff --git a/pkgs/development/tools/rust/cargo-modules/default.nix b/pkgs/development/tools/rust/cargo-modules/default.nix index 5c5a210724a2..b6a6c2f53539 100644 --- a/pkgs/development/tools/rust/cargo-modules/default.nix +++ b/pkgs/development/tools/rust/cargo-modules/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-modules"; - version = "0.5.12"; + version = "0.5.14"; src = fetchCrate { inherit pname version; - sha256 = "sha256-Fm3D1VnudZhXpH7ymQNpViwwODvXYeO/e2xT3XXfclk="; + sha256 = "sha256-urbyWNbmj2qEO4JJ/waRXGRJ9L5KgwsRB5Wh9yib8zc="; }; - cargoSha256 = "sha256-PiYonf+aD+Q3mWtP+7NDu9wu3vKrMRAlYh94fXLMWD8="; + cargoSha256 = "sha256-3OxO+j5UuPEg9xNmN+kIqpdq6fVnFpgx5xCaMNue52g="; buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation diff --git a/pkgs/os-specific/darwin/moltenvk/default.nix b/pkgs/os-specific/darwin/moltenvk/default.nix index de005cf77fd9..3171f444517a 100644 --- a/pkgs/os-specific/darwin/moltenvk/default.nix +++ b/pkgs/os-specific/darwin/moltenvk/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "MoltenVK"; - version = "1.1.11"; + version = "1.2.0"; buildInputs = [ AppKit Foundation Metal QuartzCore cereal ] ++ lib.attrValues finalAttrs.passthru; @@ -39,8 +39,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "73c9630da979017b2f7e19c6549e2bdb93d9b238"; - hash = "sha256-+NKp/4e3iruAcTunpxksvCHxoVYmPd0kFI8JDJJUVg4="; + rev = "5755de46b07e4374c05fb1081f65f7ae1f8cca81"; + hash = "sha256-huPrQr+lPi7QCF8CufAavHEKGDDimGrcskiojhH9QYk="; }; })).override { inherit (finalAttrs.passthru) spirv-headers spirv-tools; }; spirv-cross = spirv-cross.overrideAttrs (old: { @@ -49,32 +49,32 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Cross"; - rev = "61c603f3baa5270e04bcfb6acf83c654e3c57679"; - hash = "sha256-gV5ba8SlPmkUptZkQfrrEDoFXrFTfs3eVOf807cO/f8="; + rev = "f09ba2777714871bddb70d049878af34b94fa54d"; + hash = "sha256-yVpLW1DbcHDuM9Bm3uGhAC0v9XjmpBoU9x7kmWdg6/o="; }; }); spirv-headers = spirv-headers.overrideAttrs (_: { src = fetchFromGitHub { owner = "KhronosGroup"; repo = "spirv-headers"; - rev = "b2a156e1c0434bc8c99aaebba1c7be98be7ac580"; - hash = "sha256-qYhFoRrQOlvYvVXhIFsa3dZuORDpZyVC5peeYmGNimw="; + rev = "85a1ed200d50660786c1a88d9166e871123cce39"; + hash = "sha256-lUWgZYGPu+IaLUrbtyC7R0o3Hq/q7C7BE8r7DAsiC30="; }; }); spirv-tools = (spirv-tools.overrideAttrs (old: { src = fetchFromGitHub { owner = "KhronosGroup"; repo = "spirv-tools"; - rev = "5e61ea2098220059e89523f1f47b0bcd8c33b89a"; - hash = "sha256-jpVvjrNrTAKUY4sjUT/gCUElLtW4BrznH1DbStojGB8="; + rev = "eb0a36633d2acf4de82588504f951ad0f2cecacb"; + hash = "sha256-sqjQoz9v9alSPc0ujEcWZxDAWh2S6oAPP1+JZmNCpA0="; }; })).override { inherit (finalAttrs.passthru) spirv-headers; }; vulkan-headers = vulkan-headers.overrideAttrs (old: { src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Headers"; - rev = "c896e2f920273bfee852da9cca2a356bc1c2031e"; - hash = "sha256-zUT5+Ttmkrj51a9FS1tQxoYMS0Y0xV8uaCEJNur4khc="; + rev = "98f440ce6868c94f5ec6e198cc1adda4760e8849"; + hash = "sha256-EoD48jBoJmIet4BDC6bYxOsKK2358SZ/NcZeM61q/5g="; }; }); }; @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "KhronosGroup"; repo = "MoltenVK"; rev = "v${finalAttrs.version}"; - hash = "sha256-+/vlZvEuake0E2jFZOcctEVGMCcXelGPQJXt1EI06us="; + hash = "sha256-PqrKGNGw7nJbirRgIargIV6Jbgoblu+2fn5qdHKI6BI="; }; patches = [ diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix index 5e0b5850f015..3693c9868df8 100644 --- a/pkgs/os-specific/linux/kernel/perf/default.nix +++ b/pkgs/os-specific/linux/kernel/perf/default.nix @@ -74,9 +74,11 @@ stdenv.mkDerivation { installFlags = [ "install" "install-man" "ASCIIDOC8=1" "prefix=$(out)" ]; preFixup = '' - # pull in 'objdump' into PATH to make annotations work + # Pull in 'objdump' into PATH to make annotations work. + # The embeded Python interpreter will search PATH to calculate the Python path configuration(Should be fixed by upstream). + # Add python.interpreter to PATH for now. wrapProgram $out/bin/perf \ - --prefix PATH : "${binutils-unwrapped}/bin" + --prefix PATH : ${lib.makeBinPath ([ binutils-unwrapped ] ++ (if (lib.versionAtLeast kernel.version "4.19") then [ python3 ] else [ python2 ]))} ''; meta = with lib; { diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index bf51260c7fe1..cb3691460bd7 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -75,6 +75,10 @@ stdenv.mkDerivation rec { chmod +x $out/bin\/* ''; + passthru = { + inherit jre; # Used by the NixOS module to select the supported jre + }; + meta = with lib; { homepage = "https://kafka.apache.org"; description = "A high-throughput distributed messaging system"; @@ -83,5 +87,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.ragge ]; platforms = platforms.unix; }; - passthru = { inherit jdk17_headless; }; } diff --git a/pkgs/servers/etebase/default.nix b/pkgs/servers/etebase/default.nix index f92a533542dc..1aab4a4591db 100644 --- a/pkgs/servers/etebase/default.nix +++ b/pkgs/servers/etebase/default.nix @@ -1,28 +1,28 @@ -{ lib, fetchFromGitHub, buildPythonPackage, aioredis, aiofiles, django_3 -, fastapi, msgpack, pynacl, typing-extensions +{ lib, fetchFromGitHub, buildPythonPackage, aiofiles, django_3 +, fastapi, msgpack, pynacl, redis, typing-extensions , withLdap ? true, python-ldap }: buildPythonPackage rec { pname = "etebase-server"; - version = "0.9.1"; + version = "0.10.0"; format = "other"; src = fetchFromGitHub { owner = "etesync"; repo = "server"; rev = "v${version}"; - sha256 = "sha256-mYXy0N7ohNk3K2XNB6JvULF6lhL5dV8yBvooR6RuV1E="; + sha256 = "sha256-z6aiXSWdLcDfOpqC5epsclXWxJq59MqWDQOnnFqGwz4="; }; patches = [ ./secret.patch ]; propagatedBuildInputs = [ - aioredis aiofiles django_3 fastapi msgpack pynacl + redis typing-extensions ] ++ lib.optional withLdap python-ldap; diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 6c01f6762873..e71cd6a84bb4 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "mattermost"; - version = "7.3.0"; + version = "7.4.0"; src = fetchFromGitHub { owner = "mattermost"; repo = "mattermost-server"; rev = "v${version}"; - sha256 = "sha256-WDFay0XeaeNR/yX5if9Ab9XwzFF4cIGwBOrhc2rlX/c="; + sha256 = "sha256-GgspsSzfr1DKcSaLO6tDguCTQlK1c9SuTzRZmTvoNG4="; }; webapp = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - sha256 = "sha256-fIjasaaAEMPLaxo86MfASqTp/0WzzTDKJACKWuWby/A="; + sha256 = "sha256-N4wvgrTmg1J06IPmpLlPHOHNNB+bH2BBQgEsv9GWCN0="; }; vendorSha256 = "sha256-qZQXNVbJZDddVE+xk6F8XJCEg5dhhuXz68wcn2Uvmxk="; diff --git a/pkgs/servers/web-apps/wordpress/packages/plugins.json b/pkgs/servers/web-apps/wordpress/packages/plugins.json index 443967e25259..74be4614dfeb 100644 --- a/pkgs/servers/web-apps/wordpress/packages/plugins.json +++ b/pkgs/servers/web-apps/wordpress/packages/plugins.json @@ -101,18 +101,18 @@ "sha256": "1flggxd6hw0ps3b0y32a2aj9g3zfpzbaiwzx1zn2s7zpxn508y1b", "version": "5.3.1" }, - "wordpress-seo": { - "path": "wordpress-seo/tags/19.8", - "rev": "2796969", - "sha256": "0vnj7b37s9rra2m957baz8ki4z6x6acl76wgx8yj2063823q0pl2", - "version": "19.8" - }, "webp-express": { "path": "webp-express/tags/0.25.5", "rev": "2728620", "sha256": "0m8hbz72kvzlrcb5jnyfka90xfk1dg602rwmf22xnawzbw52532p", "version": "0.25.5" }, + "wordpress-seo": { + "path": "wordpress-seo/tags/19.8", + "rev": "2796969", + "sha256": "0vnj7b37s9rra2m957baz8ki4z6x6acl76wgx8yj2063823q0pl2", + "version": "19.8" + }, "worker": { "path": "worker/tags/4.9.14", "rev": "2739771", @@ -125,6 +125,12 @@ "sha256": "1wkj15vclbh4l38fkrmbmc4w7lapfydq9rrpn508ki19f4544dam", "version": "1.0" }, + "wp-fastest-cache": { + "path": "wp-fastest-cache/tags/1.0.6", + "rev": "2793013", + "sha256": "14xqqnv1snc2nc4y7cc6mmjkfkds18lk4xh7x75cbhy5cd8nqx8x", + "version": "1.0.6" + }, "wp-gdpr-compliance": { "path": "wp-gdpr-compliance/tags/2.0.20", "rev": "2793947", @@ -138,10 +144,10 @@ "version": "3.6.1" }, "wp-statistics": { - "path": "wp-statistics/tags/13.2.6", - "rev": "2781181", - "sha256": "0vzlhlnna2dx4kyi24rqhbrx5n5zsw51hqgsaslfiyyir64dkzgz", - "version": "13.2.6" + "path": "wp-statistics/tags/13.2.7", + "rev": "2803072", + "sha256": "001b9q8vmpj3rvlv2s8h7c9m2xvd58mcvcas99n4bmllzrxy2pji", + "version": "13.2.7" }, "wp-user-avatars": { "path": "wp-user-avatars/trunk", diff --git a/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json b/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json index 8a52aca60696..e0e6458684da 100644 --- a/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json +++ b/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json @@ -19,9 +19,10 @@ , "webp-express" , "wordpress-seo" , "worker" -, "wp-mail-smtp" +, "wp-change-email-sender" +, "wp-fastest-cache" , "wp-gdpr-compliance" +, "wp-mail-smtp" , "wp-statistics" , "wp-user-avatars" -, "wp-change-email-sender" ] diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 88636d66f6fb..3330ad17a5a4 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }: stdenv.mkDerivation rec { - version = "2022-10-24"; + version = "2022-10-25"; pname = "oh-my-zsh"; - rev = "bb8a0aa2c1c54c3aeb3e703397ab050fd62e36e6"; + rev = "49691b58b3c1fbe64b927ec88d5e9697f76e2a80"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "bLuUkT81eJ37WtLasNzDNiGY21SveCZO7Ma5fbb61mc="; + sha256 = "z6cwBsOxMEdm+3QeqeDPIya0jzvrcxrkl7ssd+dHkKo="; }; strictDeps = true; diff --git a/pkgs/tools/cd-dvd/ventoy-bin/default.nix b/pkgs/tools/cd-dvd/ventoy-bin/default.nix index 08fd6dd0666c..9930ec2511d8 100644 --- a/pkgs/tools/cd-dvd/ventoy-bin/default.nix +++ b/pkgs/tools/cd-dvd/ventoy-bin/default.nix @@ -51,11 +51,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ventoy-bin"; - version = "1.0.80"; + version = "1.0.81"; src = fetchurl { url = "https://github.com/ventoy/Ventoy/releases/download/v${finalAttrs.version}/ventoy-${finalAttrs.version}-linux.tar.gz"; - hash = "sha256-FmMpMUy8VqwbOiRWZdoY76ToSoWWbBGM5h/9VS8rYRY="; + hash = "sha256-15y05g+F+oEFYUUy7SE57GZ1RSHqdZnk2iOPsy1L0GI="; }; patches = [ diff --git a/pkgs/tools/compression/bzip3/default.nix b/pkgs/tools/compression/bzip3/default.nix index 9ee2109fc453..0c978adbc705 100644 --- a/pkgs/tools/compression/bzip3/default.nix +++ b/pkgs/tools/compression/bzip3/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bzip3"; - version = "1.1.7"; + version = "1.1.8"; outputs = [ "bin" "dev" "out" ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "kspalaiologos"; repo = "bzip3"; rev = version; - hash = "sha256-dRdsKB1wpcDcgGZwoVQTcvrORmN/NhqKGoPwD5p5BQk="; + hash = "sha256-ok5LwarXVe2gwwfIWVSfHHY0lt1IfGtkLPlVo757G6g="; }; postPatch = '' diff --git a/pkgs/tools/misc/tbls/default.nix b/pkgs/tools/misc/tbls/default.nix index 5e8bfab94dc6..1377cd4255cc 100644 --- a/pkgs/tools/misc/tbls/default.nix +++ b/pkgs/tools/misc/tbls/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "tbls"; - version = "1.56.3"; + version = "1.56.4"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; rev = "v${version}"; - hash = "sha256-ll2S9/62MdOcYhTiNM06Ck2UAnZL82CF1YCe3qtJeRo="; + hash = "sha256-b9cYt7s7tbPQZtT5/3MY2zDeASd32FP0f5sN34w/fmI="; }; vendorHash = "sha256-pmnSeQHZEtsshldfq6D/r5pMYA5ivMWkzjOq2/WseYU="; diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index b6446f7c9e86..8ca1cdde5e8c 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.46.1"; + version = "0.46.2"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MTnxKw1aH1DfUNCf3Rcrb93ShAsQ3/pJTpYB3LAu894="; + sha256 = "sha256-yqlnjPy0rjA0C2hBtFfc+hMwOk18okSKZufqc0uDJLE="; }; vendorSha256 = null; diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix index 80ef87217d83..95d7613436f6 100644 --- a/pkgs/tools/package-management/home-manager/default.nix +++ b/pkgs/tools/package-management/home-manager/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "home-manager"; - version = "2022-04-17"; + version = "2022-10-25"; src = fetchFromGitHub { owner = "nix-community"; repo = "home-manager"; - rev = "620ed197f3624dafa5f42e61d5c043f39b8df366"; - sha256 = "sha256-BoBvGT71yOfrNDTZQs7+FX0zb4yjMBETgIjtTsdJw+o="; + rev = "7dc4e4ebd71280842b4d30975439980baaac9db8"; + sha256 = "sha256-kINnLxC0KFalUk4tVO/H5hUU7FVAOYYcUSWrsBpnl+I="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/chain-bench/default.nix b/pkgs/tools/security/chain-bench/default.nix index b340188f014d..1ba61016afbc 100644 --- a/pkgs/tools/security/chain-bench/default.nix +++ b/pkgs/tools/security/chain-bench/default.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "chain-bench"; - version = "0.1.4"; + version = "0.1.6"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-H0CSeZ7plMJJ3vaf+ihm/PQMPw4DnNsAaVsH4zP8wqs="; + sha256 = "sha256-UpUKt6R5Yr/L0n7DFqIO6s8Y8WT5UYDjMO/QmhcsOxE="; }; - vendorSha256 = "sha256-wBt0NbRJdU9yfRx2aIA5P6Q0Q3oysJBnfFbAx1yr3fI="; + vendorSha256 = "sha256-R6V4dE2cNKcsBweSaUWjZHKnUQP/kADAbW2aTQc7TAg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/security/tracee/default.nix b/pkgs/tools/security/tracee/default.nix index e85911fc7511..bb4b558fc685 100644 --- a/pkgs/tools/security/tracee/default.nix +++ b/pkgs/tools/security/tracee/default.nix @@ -19,23 +19,26 @@ let in buildGoModule rec { pname = "tracee"; - version = "0.8.3"; + version = "0.9.2"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VxTJcl7gHRZEXpFbxU4iMwqxuR1r0BNSseWQ5ijWHU4="; + sha256 = "sha256-w/x7KhopkADKvpDc5TE5Kf34pRY6HP3kX1Lqujnl0b8="; }; - vendorSha256 = "sha256-szPoJUtzya3+8dOnkDxHEs3+a1LTVoMMLjUSrUlfiGg="; + vendorSha256 = "sha256-5RXNRNoMydFcemNGgyfqcUPtfMVgMYdiyWo/sZi8GQw="; + + patches = [ + ./use-our-libbpf.patch + ]; enableParallelBuilding = true; # needed to build bpf libs hardeningDisable = [ "stackprotector" ]; nativeBuildInputs = [ pkg-config clang ]; - # ensure libbpf version exactly matches the version added as a submodule - buildInputs = [ libbpf zlib elfutils ]; + buildInputs = [ elfutils libbpf zlib ]; makeFlags = [ "VERSION=v${version}" @@ -44,16 +47,9 @@ buildGoModule rec { "CMD_GIT=echo" ]; - # TODO: patch tracee to take libbpf.a and headers via include path - preBuild = '' - mkdir -p 3rdparty/libbpf/src - mkdir -p ./dist - cp -r ${libbpf}/lib ./dist/libbpf - chmod +w ./dist/libbpf - cp -r ${libbpf}/include/bpf ./dist/libbpf/ - ''; buildPhase = '' runHook preBuild + mkdir -p ./dist make $makeFlags ''${enableParallelBuilding:+-j$NIX_BUILD_CORES} bpf-core all runHook postBuild ''; diff --git a/pkgs/tools/security/tracee/test-EventFilters-magic_write-skip.patch b/pkgs/tools/security/tracee/test-EventFilters-magic_write-skip.patch deleted file mode 100644 index 878327efd492..000000000000 --- a/pkgs/tools/security/tracee/test-EventFilters-magic_write-skip.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/tests/integration/integration_test.go b/tests/integration/integration_test.go -index afbc5330..3b38a1b8 100644 ---- a/tests/integration/integration_test.go -+++ b/tests/integration/integration_test.go -@@ -205,11 +205,6 @@ func Test_EventFilters(t *testing.T) { - filterArgs []string - eventFunc func(*testing.T, *[]trace.Event) - }{ -- { -- name: "do a file write", -- filterArgs: []string{"event=magic_write"}, -- eventFunc: checkMagicwrite, -- }, - { - name: "execute a command", - filterArgs: []string{"comm=ls"}, diff --git a/pkgs/tools/security/tracee/use-our-libbpf.patch b/pkgs/tools/security/tracee/use-our-libbpf.patch new file mode 100644 index 000000000000..562bdb6e09f0 --- /dev/null +++ b/pkgs/tools/security/tracee/use-our-libbpf.patch @@ -0,0 +1,129 @@ +diff --git a/Makefile b/Makefile +index c72cf63d..e96b7eed 100644 +--- a/Makefile ++++ b/Makefile +@@ -50,6 +50,7 @@ CMD_STATICCHECK ?= staticcheck + # libs + # + ++LIB_BPF ?= libbpf + LIB_ELF ?= libelf + LIB_ZLIB ?= zlib + +@@ -172,10 +173,6 @@ env: + @echo "KERN_BUILD_PATH $(KERN_BUILD_PATH)" + @echo "KERN_SRC_PATH $(KERN_SRC_PATH)" + @echo --------------------------------------- +- @echo "LIBBPF_CFLAGS $(LIBBPF_CFLAGS)" +- @echo "LIBBPF_LDLAGS $(LIBBPF_LDFLAGS)" +- @echo "LIBBPF_SRC $(LIBBPF_SRC)" +- @echo --------------------------------------- + @echo "STATIC $(STATIC)" + @echo --------------------------------------- + @echo "BPF_VCPU $(BPF_VCPU)" +@@ -274,8 +271,6 @@ OUTPUT_DIR = ./dist + $(OUTPUT_DIR): + # + @$(CMD_MKDIR) -p $@ +- @$(CMD_MKDIR) -p $@/libbpf +- @$(CMD_MKDIR) -p $@/libbpf/obj + + # + # embedded btfhub +@@ -286,37 +281,6 @@ $(OUTPUT_DIR)/btfhub: + @$(CMD_MKDIR) -p $@ + @$(CMD_TOUCH) $@/.place-holder # needed for embed.FS + +-# +-# libbpf +-# +- +-LIBBPF_CFLAGS = "-fPIC" +-LIBBPF_LDLAGS = +-LIBBPF_SRC = ./3rdparty/libbpf/src +- +-$(OUTPUT_DIR)/libbpf/libbpf.a: \ +- $(LIBBPF_SRC) \ +- $(wildcard $(LIBBPF_SRC)/*.[ch]) \ +- | .checkver_$(CMD_CLANG) $(OUTPUT_DIR) +-# +- CC="$(CMD_CLANG)" \ +- CFLAGS="$(LIBBPF_CFLAGS)" \ +- LD_FLAGS="$(LIBBPF_LDFLAGS)" \ +- $(MAKE) \ +- -C $(LIBBPF_SRC) \ +- BUILD_STATIC_ONLY=1 \ +- DESTDIR=$(abspath ./$(OUTPUT_DIR)/libbpf/) \ +- OBJDIR=$(abspath ./$(OUTPUT_DIR)/libbpf/obj) \ +- INCLUDEDIR= LIBDIR= UAPIDIR= prefix= libdir= \ +- install install_uapi_headers +- +-$(LIBBPF_SRC): \ +- | .check_$(CMD_GIT) +-# +-ifeq ($(wildcard $@), ) +- @$(CMD_GIT) submodule update --init --recursive +-endif +- + # + # non co-re ebpf + # +@@ -333,7 +297,6 @@ BPF_NOCORE_TAG = $(subst .,_,$(KERN_RELEASE)).$(subst .,_,$(VERSION)) + bpf-nocore: $(OUTPUT_DIR)/tracee.bpf.$(BPF_NOCORE_TAG).o + + $(OUTPUT_DIR)/tracee.bpf.$(BPF_NOCORE_TAG).o: \ +- $(OUTPUT_DIR)/libbpf/libbpf.a \ + $(TRACEE_EBPF_OBJ_SRC) + # + MAKEFLAGS="--no-print-directory" +@@ -351,7 +314,6 @@ $(OUTPUT_DIR)/tracee.bpf.$(BPF_NOCORE_TAG).o: \ + -I $(KERN_SRC_PATH)/include/uapi \ + -I $(KERN_BUILD_PATH)/include/generated \ + -I $(KERN_BUILD_PATH)/include/generated/uapi \ +- -I $(OUTPUT_DIR)/libbpf \ + -I ./3rdparty/include \ + -Wunused \ + -Wall \ +@@ -412,7 +374,6 @@ TRACEE_EBPF_OBJ_CORE_HEADERS = $(shell find pkg/ebpf/c -name *.h) + bpf-core: $(OUTPUT_DIR)/tracee.bpf.core.o + + $(OUTPUT_DIR)/tracee.bpf.core.o: \ +- $(OUTPUT_DIR)/libbpf/libbpf.a \ + $(TRACEE_EBPF_OBJ_SRC) \ + $(TRACEE_EBPF_OBJ_CORE_HEADERS) + # +@@ -421,7 +382,6 @@ $(OUTPUT_DIR)/tracee.bpf.core.o: \ + -D__BPF_TRACING__ \ + -DCORE \ + -I./pkg/ebpf/c/ \ +- -I$(OUTPUT_DIR)/libbpf/ \ + -I ./3rdparty/include \ + -target bpf \ + -O2 -g \ +@@ -447,8 +407,8 @@ ifeq ($(STATIC), 1) + GO_TAGS_EBPF := $(GO_TAGS_EBPF),netgo + endif + +-CUSTOM_CGO_CFLAGS = "-I$(abspath $(OUTPUT_DIR)/libbpf)" +-CUSTOM_CGO_LDFLAGS = "$(shell $(call pkg_config, $(LIB_ELF))) $(shell $(call pkg_config, $(LIB_ZLIB))) $(abspath $(OUTPUT_DIR)/libbpf/libbpf.a)" ++CUSTOM_CGO_CFLAGS = "" ++CUSTOM_CGO_LDFLAGS = "$(shell $(call pkg_config, $(LIB_BPF))) $(shell $(call pkg_config, $(LIB_ELF))) $(shell $(call pkg_config, $(LIB_ZLIB)))" + + GO_ENV_EBPF = + GO_ENV_EBPF += GOOS=linux +@@ -468,6 +428,7 @@ $(OUTPUT_DIR)/tracee-ebpf: \ + $(TRACEE_EBPF_SRC) \ + ./embedded-ebpf.go \ + | .checkver_$(CMD_GO) \ ++ .checklib_$(LIB_BPF) \ + .checklib_$(LIB_ELF) \ + .checklib_$(LIB_ZLIB) \ + btfhub +@@ -658,7 +619,6 @@ test-rules: \ + .PHONY: test-upstream-libbpfgo + test-upstream-libbpfgo: \ + .checkver_$(CMD_GO) \ +- $(OUTPUT_DIR)/libbpf/libbpf.a + # + ./tests/libbpfgo.sh $(GO_ENV_EBPF) + diff --git a/pkgs/tools/text/gucci/default.nix b/pkgs/tools/text/gucci/default.nix index 8d9bd5279af0..f98f5e1cc039 100644 --- a/pkgs/tools/text/gucci/default.nix +++ b/pkgs/tools/text/gucci/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gucci"; - version = "1.5.4"; + version = "1.6.5"; src = fetchFromGitHub { owner = "noqcks"; repo = "gucci"; rev = "refs/tags/${version}"; - sha256 = "sha256-HJPNpLRJPnziSMvxLCiNDeCWO439ELSZs/4Cq1a7Amo="; + sha256 = "sha256-x4qCdw+hw1cZ9NY+9eEHksBn+6K0v3QZ1fuT9PX75pc="; }; - vendorSha256 = "sha256-rAZCj5xtwTgd9/KDYnQTU1jbabtWJF5MCFgcmixDN/Q="; + vendorSha256 = "sha256-YSAzbilyLip3cbnfVGlbHTW5cxmJyw/FYdYHXAqet+Q="; ldflags = [ "-s" "-w" "-X main.AppVersion=${version}" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8dba9defae36..5bb6ee76bac7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12076,7 +12076,7 @@ with pkgs; tracebox = callPackage ../tools/networking/tracebox { stdenv = gcc10StdenvCompat; }; tracee = callPackage ../tools/security/tracee { - buildGoModule = buildGo118Module; # tests fail with 1.19 + libbpf = libbpf_1; # keep inline with their submodule }; tracefilegen = callPackage ../development/tools/analysis/garcosim/tracefilegen { }; @@ -17292,7 +17292,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - pahole = callPackage ../development/tools/misc/pahole {}; + pahole = callPackage ../development/tools/misc/pahole { + libbpf = libbpf_1; + }; panopticon = callPackage ../development/tools/analysis/panopticon {}; @@ -20028,6 +20030,7 @@ with pkgs; libgxps = callPackage ../development/libraries/libgxps { }; libiio = callPackage ../development/libraries/libiio { + inherit (darwin.apple_sdk.frameworks) CFNetwork CoreServices; python = python3; }; @@ -28263,7 +28266,7 @@ with pkgs; python = python3; }; }; - gnuradio3_9Packages = lib.recurseIntoAttrs gnuradio.pkgs; + gnuradio3_9Packages = lib.recurseIntoAttrs gnuradio3_9.pkgs; # A build without gui components and other utilites not needed for end user # libraries gnuradio3_9Minimal = gnuradio.override { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e293253b127b..aa2f29d61ef0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1749,6 +1749,8 @@ in { cgroup-utils = callPackage ../development/python-modules/cgroup-utils { }; + chacha20poly1305 = callPackage ../development/python-modules/chacha20poly1305 { }; + chacha20poly1305-reuseable = callPackage ../development/python-modules/chacha20poly1305-reuseable { }; chai = callPackage ../development/python-modules/chai { }; @@ -9014,6 +9016,8 @@ in { python-box = callPackage ../development/python-modules/python-box { }; + python-bsblan = callPackage ../development/python-modules/python-bsblan { }; + python-cinderclient = callPackage ../development/python-modules/python-cinderclient { }; python-constraint = callPackage ../development/python-modules/python-constraint { };