From 9c1623cbe45600298c152250e2a41342131aa7bd Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 30 Jun 2021 17:43:06 +0800 Subject: [PATCH 001/167] nixos: nixos/doc/configuration/profiles/*.xml to CommonMark --- nixos/doc/manual/configuration/profiles.xml | 22 ++++++------ .../profiles/all-hardware.section.md | 11 ++++++ .../configuration/profiles/all-hardware.xml | 21 ----------- .../configuration/profiles/base.section.md | 7 ++++ .../manual/configuration/profiles/base.xml | 15 -------- .../profiles/clone-config.section.md | 11 ++++++ .../configuration/profiles/clone-config.xml | 21 ----------- .../configuration/profiles/demo.section.md | 4 +++ .../manual/configuration/profiles/demo.xml | 14 -------- .../profiles/docker-container.section.md | 7 ++++ .../profiles/docker-container.xml | 16 --------- .../profiles/graphical.section.md | 10 ++++++ .../configuration/profiles/graphical.xml | 20 ----------- .../profiles/hardened.section.md | 20 +++++++++++ .../configuration/profiles/hardened.xml | 32 ----------------- .../profiles/headless.section.md | 9 +++++ .../configuration/profiles/headless.xml | 19 ---------- .../profiles/installation-device.section.md | 24 +++++++++++++ .../profiles/installation-device.xml | 36 ------------------- .../configuration/profiles/minimal.section.md | 9 +++++ .../manual/configuration/profiles/minimal.xml | 17 --------- .../profiles/qemu-guest.section.md | 7 ++++ .../configuration/profiles/qemu-guest.xml | 17 --------- .../profiles/all-hardware.section.xml | 16 +++++++++ .../configuration/profiles/base.section.xml | 10 ++++++ .../profiles/clone-config.section.xml | 16 +++++++++ .../configuration/profiles/demo.section.xml | 10 ++++++ .../profiles/docker-container.section.xml | 12 +++++++ .../profiles/graphical.section.xml | 17 +++++++++ .../profiles/hardened.section.xml | 26 ++++++++++++++ .../profiles/headless.section.xml | 18 ++++++++++ .../profiles/installation-device.section.xml | 33 +++++++++++++++++ .../profiles/minimal.section.xml | 15 ++++++++ .../profiles/qemu-guest.section.xml | 11 ++++++ 34 files changed, 314 insertions(+), 239 deletions(-) create mode 100644 nixos/doc/manual/configuration/profiles/all-hardware.section.md delete mode 100644 nixos/doc/manual/configuration/profiles/all-hardware.xml create mode 100644 nixos/doc/manual/configuration/profiles/base.section.md delete mode 100644 nixos/doc/manual/configuration/profiles/base.xml create mode 100644 nixos/doc/manual/configuration/profiles/clone-config.section.md delete mode 100644 nixos/doc/manual/configuration/profiles/clone-config.xml create mode 100644 nixos/doc/manual/configuration/profiles/demo.section.md delete mode 100644 nixos/doc/manual/configuration/profiles/demo.xml create mode 100644 nixos/doc/manual/configuration/profiles/docker-container.section.md delete mode 100644 nixos/doc/manual/configuration/profiles/docker-container.xml create mode 100644 nixos/doc/manual/configuration/profiles/graphical.section.md delete mode 100644 nixos/doc/manual/configuration/profiles/graphical.xml create mode 100644 nixos/doc/manual/configuration/profiles/hardened.section.md delete mode 100644 nixos/doc/manual/configuration/profiles/hardened.xml create mode 100644 nixos/doc/manual/configuration/profiles/headless.section.md delete mode 100644 nixos/doc/manual/configuration/profiles/headless.xml create mode 100644 nixos/doc/manual/configuration/profiles/installation-device.section.md delete mode 100644 nixos/doc/manual/configuration/profiles/installation-device.xml create mode 100644 nixos/doc/manual/configuration/profiles/minimal.section.md delete mode 100644 nixos/doc/manual/configuration/profiles/minimal.xml create mode 100644 nixos/doc/manual/configuration/profiles/qemu-guest.section.md delete mode 100644 nixos/doc/manual/configuration/profiles/qemu-guest.xml create mode 100644 nixos/doc/manual/from_md/configuration/profiles/all-hardware.section.xml create mode 100644 nixos/doc/manual/from_md/configuration/profiles/base.section.xml create mode 100644 nixos/doc/manual/from_md/configuration/profiles/clone-config.section.xml create mode 100644 nixos/doc/manual/from_md/configuration/profiles/demo.section.xml create mode 100644 nixos/doc/manual/from_md/configuration/profiles/docker-container.section.xml create mode 100644 nixos/doc/manual/from_md/configuration/profiles/graphical.section.xml create mode 100644 nixos/doc/manual/from_md/configuration/profiles/hardened.section.xml create mode 100644 nixos/doc/manual/from_md/configuration/profiles/headless.section.xml create mode 100644 nixos/doc/manual/from_md/configuration/profiles/installation-device.section.xml create mode 100644 nixos/doc/manual/from_md/configuration/profiles/minimal.section.xml create mode 100644 nixos/doc/manual/from_md/configuration/profiles/qemu-guest.section.xml diff --git a/nixos/doc/manual/configuration/profiles.xml b/nixos/doc/manual/configuration/profiles.xml index 9d08f7f7bed2..6994c7e31705 100644 --- a/nixos/doc/manual/configuration/profiles.xml +++ b/nixos/doc/manual/configuration/profiles.xml @@ -25,15 +25,15 @@ What follows is a brief explanation on the purpose and use-case for each profile. Detailing each option configured by each one is out of scope. - - - - - - - - - - - + + + + + + + + + + + diff --git a/nixos/doc/manual/configuration/profiles/all-hardware.section.md b/nixos/doc/manual/configuration/profiles/all-hardware.section.md new file mode 100644 index 000000000000..0344b32c52f9 --- /dev/null +++ b/nixos/doc/manual/configuration/profiles/all-hardware.section.md @@ -0,0 +1,11 @@ +# All Hardware {#sec-profile-all-hardware} + +Enables all hardware supported by NixOS: i.e., all firmware is included, and +all devices from which one may boot are enabled in the initrd. Its primary +use is in the NixOS installation CDs. + +The enabled kernel modules include support for SATA and PATA, SCSI +(partially), USB, Firewire (untested), Virtio (QEMU, KVM, etc.), VMware, and +Hyper-V. Additionally, [`hardware.enableAllFirmware`](options.html#opt-hardware.enableAllFirmware) is +enabled, and the firmware for the ZyDAS ZD1211 chipset is specifically +installed. diff --git a/nixos/doc/manual/configuration/profiles/all-hardware.xml b/nixos/doc/manual/configuration/profiles/all-hardware.xml deleted file mode 100644 index 2936f71069d5..000000000000 --- a/nixos/doc/manual/configuration/profiles/all-hardware.xml +++ /dev/null @@ -1,21 +0,0 @@ -
- All Hardware - - - Enables all hardware supported by NixOS: i.e., all firmware is included, and - all devices from which one may boot are enabled in the initrd. Its primary - use is in the NixOS installation CDs. - - - - The enabled kernel modules include support for SATA and PATA, SCSI - (partially), USB, Firewire (untested), Virtio (QEMU, KVM, etc.), VMware, and - Hyper-V. Additionally, is - enabled, and the firmware for the ZyDAS ZD1211 chipset is specifically - installed. - -
diff --git a/nixos/doc/manual/configuration/profiles/base.section.md b/nixos/doc/manual/configuration/profiles/base.section.md new file mode 100644 index 000000000000..59b3068fda32 --- /dev/null +++ b/nixos/doc/manual/configuration/profiles/base.section.md @@ -0,0 +1,7 @@ +# Base {#sec-profile-base} + +Defines the software packages included in the "minimal" installation CD. It +installs several utilities useful in a simple recovery or install media, such +as a text-mode web browser, and tools for manipulating block devices, +networking, hardware diagnostics, and filesystems (with their respective +kernel modules). diff --git a/nixos/doc/manual/configuration/profiles/base.xml b/nixos/doc/manual/configuration/profiles/base.xml deleted file mode 100644 index b75f6ba25b4f..000000000000 --- a/nixos/doc/manual/configuration/profiles/base.xml +++ /dev/null @@ -1,15 +0,0 @@ -
- Base - - - Defines the software packages included in the "minimal" installation CD. It - installs several utilities useful in a simple recovery or install media, such - as a text-mode web browser, and tools for manipulating block devices, - networking, hardware diagnostics, and filesystems (with their respective - kernel modules). - -
diff --git a/nixos/doc/manual/configuration/profiles/clone-config.section.md b/nixos/doc/manual/configuration/profiles/clone-config.section.md new file mode 100644 index 000000000000..e2583715e517 --- /dev/null +++ b/nixos/doc/manual/configuration/profiles/clone-config.section.md @@ -0,0 +1,11 @@ +# Clone Config {#sec-profile-clone-config} + +This profile is used in installer images. It provides an editable +configuration.nix that imports all the modules that were also used when +creating the image in the first place. As a result it allows users to edit +and rebuild the live-system. + +On images where the installation media also becomes an installation target, +copying over `configuration.nix` should be disabled by +setting `installer.cloneConfig` to `false`. +For example, this is done in `sd-image-aarch64-installer.nix`. diff --git a/nixos/doc/manual/configuration/profiles/clone-config.xml b/nixos/doc/manual/configuration/profiles/clone-config.xml deleted file mode 100644 index 9c70cf352041..000000000000 --- a/nixos/doc/manual/configuration/profiles/clone-config.xml +++ /dev/null @@ -1,21 +0,0 @@ -
- Clone Config - - - This profile is used in installer images. It provides an editable - configuration.nix that imports all the modules that were also used when - creating the image in the first place. As a result it allows users to edit - and rebuild the live-system. - - - - On images where the installation media also becomes an installation target, - copying over configuration.nix should be disabled by - setting installer.cloneConfig to false. - For example, this is done in sd-image-aarch64-installer.nix. - -
diff --git a/nixos/doc/manual/configuration/profiles/demo.section.md b/nixos/doc/manual/configuration/profiles/demo.section.md new file mode 100644 index 000000000000..a50f5a00adad --- /dev/null +++ b/nixos/doc/manual/configuration/profiles/demo.section.md @@ -0,0 +1,4 @@ +# Demo {#sec-profile-demo} + +This profile just enables a `demo` user, with password `demo`, uid `1000`, `wheel` group and +[autologin in the SDDM display manager](options.html#opt-services.xserver.displayManager.autoLogin). diff --git a/nixos/doc/manual/configuration/profiles/demo.xml b/nixos/doc/manual/configuration/profiles/demo.xml deleted file mode 100644 index bc801bb3dc5b..000000000000 --- a/nixos/doc/manual/configuration/profiles/demo.xml +++ /dev/null @@ -1,14 +0,0 @@ -
- Demo - - - This profile just enables a demo - user, with password demo, uid 1000, - wheel group and - autologin in the SDDM display manager. - -
diff --git a/nixos/doc/manual/configuration/profiles/docker-container.section.md b/nixos/doc/manual/configuration/profiles/docker-container.section.md new file mode 100644 index 000000000000..59954112c30e --- /dev/null +++ b/nixos/doc/manual/configuration/profiles/docker-container.section.md @@ -0,0 +1,7 @@ +# Docker Container {#sec-profile-docker-container} + +This is the profile from which the Docker images are generated. It prepares a +working system by importing the [Minimal](#sec-profile-minimal) and +[Clone Config](#sec-profile-clone-config) profiles, and +setting appropriate configuration options that are useful inside a container +context, like [`boot.isContainer`](options.html#opt-boot.isContainer). diff --git a/nixos/doc/manual/configuration/profiles/docker-container.xml b/nixos/doc/manual/configuration/profiles/docker-container.xml deleted file mode 100644 index efa7b8f24c43..000000000000 --- a/nixos/doc/manual/configuration/profiles/docker-container.xml +++ /dev/null @@ -1,16 +0,0 @@ -
- Docker Container - - - This is the profile from which the Docker images are generated. It prepares a - working system by importing the - Minimal and - Clone Config profiles, and - setting appropriate configuration options that are useful inside a container - context, like . - -
diff --git a/nixos/doc/manual/configuration/profiles/graphical.section.md b/nixos/doc/manual/configuration/profiles/graphical.section.md new file mode 100644 index 000000000000..767cde9b79e6 --- /dev/null +++ b/nixos/doc/manual/configuration/profiles/graphical.section.md @@ -0,0 +1,10 @@ +# Graphical {#sec-profile-graphical} + +Defines a NixOS configuration with the Plasma 5 desktop. It's used by the +graphical installation CD. + +It sets [`services.xserver.enable`](options.html#opt-services.xserver.enable), +[`services.xserver.displayManager.sddm.enable`](options.html#opt-services.xserver.displayManager.sddm.enable), +[`services.xserver.desktopManager.plasma5.enable`](options.html#opt-services.xserver.desktopManager.plasma5.enable), +and [`services.xserver.libinput.enable`](options.html#opt-services.xserver.libinput.enable) to true. It also +includes glxinfo and firefox in the system packages list. diff --git a/nixos/doc/manual/configuration/profiles/graphical.xml b/nixos/doc/manual/configuration/profiles/graphical.xml deleted file mode 100644 index cc6d0825d241..000000000000 --- a/nixos/doc/manual/configuration/profiles/graphical.xml +++ /dev/null @@ -1,20 +0,0 @@ -
- Graphical - - - Defines a NixOS configuration with the Plasma 5 desktop. It's used by the - graphical installation CD. - - - - It sets , - , - , and - to true. It also - includes glxinfo and firefox in the system packages list. - -
diff --git a/nixos/doc/manual/configuration/profiles/hardened.section.md b/nixos/doc/manual/configuration/profiles/hardened.section.md new file mode 100644 index 000000000000..958da94d261b --- /dev/null +++ b/nixos/doc/manual/configuration/profiles/hardened.section.md @@ -0,0 +1,20 @@ +# Hardened {#sec-profile-hardened} + +A profile with most (vanilla) hardening options enabled by default, +potentially at the cost of stability, features and performance. + +This includes a hardened kernel, and limiting the system information +available to processes through the `/sys` and +`/proc` filesystems. It also disables the User Namespaces +feature of the kernel, which stops Nix from being able to build anything +(this particular setting can be overriden via +[`security.allowUserNamespaces`](options.html#opt-security.allowUserNamespaces)). See the +[profile source](https://github.com/nixos/nixpkgs/tree/master/nixos/modules/profiles/hardened.nix) +for further detail on which settings are altered. + +::: {.warning} +This profile enables options that are known to affect system +stability. If you experience any stability issues when using the +profile, try disabling it. If you report an issue and use this +profile, always mention that you do. +::: diff --git a/nixos/doc/manual/configuration/profiles/hardened.xml b/nixos/doc/manual/configuration/profiles/hardened.xml deleted file mode 100644 index 4a51754cc7ae..000000000000 --- a/nixos/doc/manual/configuration/profiles/hardened.xml +++ /dev/null @@ -1,32 +0,0 @@ -
- Hardened - - - A profile with most (vanilla) hardening options enabled by default, - potentially at the cost of stability, features and performance. - - - - This includes a hardened kernel, and limiting the system information - available to processes through the /sys and - /proc filesystems. It also disables the User Namespaces - feature of the kernel, which stops Nix from being able to build anything - (this particular setting can be overriden via - ). See the - - profile source for further detail on which settings are altered. - - - - This profile enables options that are known to affect system - stability. If you experience any stability issues when using the - profile, try disabling it. If you report an issue and use this - profile, always mention that you do. - - -
diff --git a/nixos/doc/manual/configuration/profiles/headless.section.md b/nixos/doc/manual/configuration/profiles/headless.section.md new file mode 100644 index 000000000000..1db4a82a4dea --- /dev/null +++ b/nixos/doc/manual/configuration/profiles/headless.section.md @@ -0,0 +1,9 @@ +# Headless {#sec-profile-headless} + +Common configuration for headless machines (e.g., Amazon EC2 instances). + +Disables [sound](options.html#opt-sound.enable), +[vesa](options.html#opt-boot.vesa), serial consoles, +[emergency mode](options.html#opt-systemd.enableEmergencyMode), +[grub splash images](options.html#opt-boot.loader.grub.splashImage) +and configures the kernel to reboot automatically on panic. diff --git a/nixos/doc/manual/configuration/profiles/headless.xml b/nixos/doc/manual/configuration/profiles/headless.xml deleted file mode 100644 index 1b64497ebf7f..000000000000 --- a/nixos/doc/manual/configuration/profiles/headless.xml +++ /dev/null @@ -1,19 +0,0 @@ -
- Headless - - - Common configuration for headless machines (e.g., Amazon EC2 instances). - - - - Disables sound, - vesa, serial consoles, - emergency mode, - grub splash images - and configures the kernel to reboot automatically on panic. - -
diff --git a/nixos/doc/manual/configuration/profiles/installation-device.section.md b/nixos/doc/manual/configuration/profiles/installation-device.section.md new file mode 100644 index 000000000000..aa5678c031a3 --- /dev/null +++ b/nixos/doc/manual/configuration/profiles/installation-device.section.md @@ -0,0 +1,24 @@ +# Installation Device {#sec-profile-installation-device} + +Provides a basic configuration for installation devices like CDs. +This enables redistributable firmware, includes the +[Clone Config profile](#sec-profile-clone-config) +and a copy of the Nixpkgs channel, so `nixos-install` +works out of the box. + +Documentation for [Nixpkgs](options.html#opt-documentation.enable) +and [NixOS](options.html#opt-documentation.nixos.enable) are +forcefully enabled (to override the +[Minimal profile](#sec-profile-minimal) preference); the +NixOS manual is shown automatically on TTY 8, udisks is disabled. +Autologin is enabled as `nixos` user, while passwordless +login as both `root` and `nixos` is possible. +Passwordless `sudo` is enabled too. +[wpa_supplicant](options.html#opt-networking.wireless.enable) is +enabled, but configured to not autostart. + +It is explained how to login, start the ssh server, and if available, +how to start the display manager. + +Several settings are tweaked so that the installer has a better chance of +succeeding under low-memory environments. diff --git a/nixos/doc/manual/configuration/profiles/installation-device.xml b/nixos/doc/manual/configuration/profiles/installation-device.xml deleted file mode 100644 index 192ae955b689..000000000000 --- a/nixos/doc/manual/configuration/profiles/installation-device.xml +++ /dev/null @@ -1,36 +0,0 @@ -
- Installation Device - - - Provides a basic configuration for installation devices like CDs. - This enables redistributable firmware, includes the - Clone Config profile - and a copy of the Nixpkgs channel, so nixos-install - works out of the box. - - - Documentation for Nixpkgs - and NixOS are - forcefully enabled (to override the - Minimal profile preference); the - NixOS manual is shown automatically on TTY 8, udisks is disabled. - Autologin is enabled as nixos user, while passwordless - login as both root and nixos is possible. - Passwordless sudo is enabled too. - wpa_supplicant is - enabled, but configured to not autostart. - - - It is explained how to login, start the ssh server, and if available, - how to start the display manager. - - - - Several settings are tweaked so that the installer has a better chance of - succeeding under low-memory environments. - -
diff --git a/nixos/doc/manual/configuration/profiles/minimal.section.md b/nixos/doc/manual/configuration/profiles/minimal.section.md new file mode 100644 index 000000000000..d5a569d66209 --- /dev/null +++ b/nixos/doc/manual/configuration/profiles/minimal.section.md @@ -0,0 +1,9 @@ +# Minimal {#sec-profile-minimal} + +This profile defines a small NixOS configuration. It does not contain any +graphical stuff. It's a very short file that enables +[noXlibs](options.html#opt-environment.noXlibs), sets +[`i18n.supportedLocales`](options.html#opt-i18n.supportedLocales) to +only support the user-selected locale, +[disables packages' documentation](options.html#opt-documentation.enable), +and [disables sound](options.html#opt-sound.enable). diff --git a/nixos/doc/manual/configuration/profiles/minimal.xml b/nixos/doc/manual/configuration/profiles/minimal.xml deleted file mode 100644 index 179f2d0be64b..000000000000 --- a/nixos/doc/manual/configuration/profiles/minimal.xml +++ /dev/null @@ -1,17 +0,0 @@ -
- Minimal - - - This profile defines a small NixOS configuration. It does not contain any - graphical stuff. It's a very short file that enables - noXlibs, sets - i18n.supportedLocales to - only support the user-selected locale, - disables packages' documentation - , and disables sound. - -
diff --git a/nixos/doc/manual/configuration/profiles/qemu-guest.section.md b/nixos/doc/manual/configuration/profiles/qemu-guest.section.md new file mode 100644 index 000000000000..d7e3cae9cb0f --- /dev/null +++ b/nixos/doc/manual/configuration/profiles/qemu-guest.section.md @@ -0,0 +1,7 @@ +# QEMU Guest {#sec-profile-qemu-guest} + +This profile contains common configuration for virtual machines running under +QEMU (using virtio). + +It makes virtio modules available on the initrd and sets the system time from +the hardware clock to work around a bug in qemu-kvm. diff --git a/nixos/doc/manual/configuration/profiles/qemu-guest.xml b/nixos/doc/manual/configuration/profiles/qemu-guest.xml deleted file mode 100644 index 3ed97b94b510..000000000000 --- a/nixos/doc/manual/configuration/profiles/qemu-guest.xml +++ /dev/null @@ -1,17 +0,0 @@ -
- QEMU Guest - - - This profile contains common configuration for virtual machines running under - QEMU (using virtio). - - - - It makes virtio modules available on the initrd and sets the system time from - the hardware clock to work around a bug in qemu-kvm. - -
diff --git a/nixos/doc/manual/from_md/configuration/profiles/all-hardware.section.xml b/nixos/doc/manual/from_md/configuration/profiles/all-hardware.section.xml new file mode 100644 index 000000000000..e355ffb752d5 --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/profiles/all-hardware.section.xml @@ -0,0 +1,16 @@ +
+ All Hardware + + Enables all hardware supported by NixOS: i.e., all firmware is + included, and all devices from which one may boot are enabled in the + initrd. Its primary use is in the NixOS installation CDs. + + + The enabled kernel modules include support for SATA and PATA, SCSI + (partially), USB, Firewire (untested), Virtio (QEMU, KVM, etc.), + VMware, and Hyper-V. Additionally, + hardware.enableAllFirmware + is enabled, and the firmware for the ZyDAS ZD1211 chipset is + specifically installed. + +
diff --git a/nixos/doc/manual/from_md/configuration/profiles/base.section.xml b/nixos/doc/manual/from_md/configuration/profiles/base.section.xml new file mode 100644 index 000000000000..83d35bd28676 --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/profiles/base.section.xml @@ -0,0 +1,10 @@ +
+ Base + + Defines the software packages included in the minimal + installation CD. It installs several utilities useful in a simple + recovery or install media, such as a text-mode web browser, and + tools for manipulating block devices, networking, hardware + diagnostics, and filesystems (with their respective kernel modules). + +
diff --git a/nixos/doc/manual/from_md/configuration/profiles/clone-config.section.xml b/nixos/doc/manual/from_md/configuration/profiles/clone-config.section.xml new file mode 100644 index 000000000000..9430b49ea33d --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/profiles/clone-config.section.xml @@ -0,0 +1,16 @@ +
+ Clone Config + + This profile is used in installer images. It provides an editable + configuration.nix that imports all the modules that were also used + when creating the image in the first place. As a result it allows + users to edit and rebuild the live-system. + + + On images where the installation media also becomes an installation + target, copying over configuration.nix should be + disabled by setting installer.cloneConfig to + false. For example, this is done in + sd-image-aarch64-installer.nix. + +
diff --git a/nixos/doc/manual/from_md/configuration/profiles/demo.section.xml b/nixos/doc/manual/from_md/configuration/profiles/demo.section.xml new file mode 100644 index 000000000000..8b8c09118d92 --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/profiles/demo.section.xml @@ -0,0 +1,10 @@ +
+ Demo + + This profile just enables a demo user, with + password demo, uid 1000, + wheel group and + autologin + in the SDDM display manager. + +
diff --git a/nixos/doc/manual/from_md/configuration/profiles/docker-container.section.xml b/nixos/doc/manual/from_md/configuration/profiles/docker-container.section.xml new file mode 100644 index 000000000000..28dcd2b1a2d4 --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/profiles/docker-container.section.xml @@ -0,0 +1,12 @@ +
+ Docker Container + + This is the profile from which the Docker images are generated. It + prepares a working system by importing the + Minimal and + Clone Config + profiles, and setting appropriate configuration options that are + useful inside a container context, like + boot.isContainer. + +
diff --git a/nixos/doc/manual/from_md/configuration/profiles/graphical.section.xml b/nixos/doc/manual/from_md/configuration/profiles/graphical.section.xml new file mode 100644 index 000000000000..644a8ea590bb --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/profiles/graphical.section.xml @@ -0,0 +1,17 @@ +
+ Graphical + + Defines a NixOS configuration with the Plasma 5 desktop. It’s used + by the graphical installation CD. + + + It sets + services.xserver.enable, + services.xserver.displayManager.sddm.enable, + services.xserver.desktopManager.plasma5.enable, + and + services.xserver.libinput.enable + to true. It also includes glxinfo and firefox in the system packages + list. + +
diff --git a/nixos/doc/manual/from_md/configuration/profiles/hardened.section.xml b/nixos/doc/manual/from_md/configuration/profiles/hardened.section.xml new file mode 100644 index 000000000000..a08bc8432306 --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/profiles/hardened.section.xml @@ -0,0 +1,26 @@ +
+ Hardened + + A profile with most (vanilla) hardening options enabled by default, + potentially at the cost of stability, features and performance. + + + This includes a hardened kernel, and limiting the system information + available to processes through the /sys and + /proc filesystems. It also disables the User + Namespaces feature of the kernel, which stops Nix from being able to + build anything (this particular setting can be overriden via + security.allowUserNamespaces). + See the + profile + source for further detail on which settings are altered. + + + + This profile enables options that are known to affect system + stability. If you experience any stability issues when using the + profile, try disabling it. If you report an issue and use this + profile, always mention that you do. + + +
diff --git a/nixos/doc/manual/from_md/configuration/profiles/headless.section.xml b/nixos/doc/manual/from_md/configuration/profiles/headless.section.xml new file mode 100644 index 000000000000..a89551abd411 --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/profiles/headless.section.xml @@ -0,0 +1,18 @@ +
+ Headless + + Common configuration for headless machines (e.g., Amazon EC2 + instances). + + + Disables + sound, + vesa, serial + consoles, + emergency + mode, + grub + splash images and configures the kernel to reboot + automatically on panic. + +
diff --git a/nixos/doc/manual/from_md/configuration/profiles/installation-device.section.xml b/nixos/doc/manual/from_md/configuration/profiles/installation-device.section.xml new file mode 100644 index 000000000000..8a8265c03c03 --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/profiles/installation-device.section.xml @@ -0,0 +1,33 @@ +
+ Installation Device + + Provides a basic configuration for installation devices like CDs. + This enables redistributable firmware, includes the + Clone Config profile + and a copy of the Nixpkgs channel, so + nixos-install works out of the box. + + + Documentation for + Nixpkgs + and + NixOS + are forcefully enabled (to override the + Minimal profile + preference); the NixOS manual is shown automatically on TTY 8, + udisks is disabled. Autologin is enabled as nixos + user, while passwordless login as both root and + nixos is possible. Passwordless + sudo is enabled too. + wpa_supplicant + is enabled, but configured to not autostart. + + + It is explained how to login, start the ssh server, and if + available, how to start the display manager. + + + Several settings are tweaked so that the installer has a better + chance of succeeding under low-memory environments. + +
diff --git a/nixos/doc/manual/from_md/configuration/profiles/minimal.section.xml b/nixos/doc/manual/from_md/configuration/profiles/minimal.section.xml new file mode 100644 index 000000000000..5653b3f01c3f --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/profiles/minimal.section.xml @@ -0,0 +1,15 @@ +
+ Minimal + + This profile defines a small NixOS configuration. It does not + contain any graphical stuff. It’s a very short file that enables + noXlibs, + sets + i18n.supportedLocales + to only support the user-selected locale, + disables + packages’ documentation, and + disables + sound. + +
diff --git a/nixos/doc/manual/from_md/configuration/profiles/qemu-guest.section.xml b/nixos/doc/manual/from_md/configuration/profiles/qemu-guest.section.xml new file mode 100644 index 000000000000..f33464f9db4d --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/profiles/qemu-guest.section.xml @@ -0,0 +1,11 @@ +
+ QEMU Guest + + This profile contains common configuration for virtual machines + running under QEMU (using virtio). + + + It makes virtio modules available on the initrd and sets the system + time from the hardware clock to work around a bug in qemu-kvm. + +
From cba561d1a8b71d5bd9eb6d600feddfe106620eea Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 1 Jul 2021 19:35:48 +0800 Subject: [PATCH 002/167] nixos: nixos/doc/manual/configuration/adding-custom-packages.xml to CommonMark --- .../adding-custom-packages.section.md | 74 +++++++++++++++++ .../configuration/adding-custom-packages.xml | 73 ----------------- .../configuration/declarative-packages.xml | 2 +- .../adding-custom-packages.section.xml | 81 +++++++++++++++++++ 4 files changed, 156 insertions(+), 74 deletions(-) create mode 100644 nixos/doc/manual/configuration/adding-custom-packages.section.md delete mode 100644 nixos/doc/manual/configuration/adding-custom-packages.xml create mode 100644 nixos/doc/manual/from_md/configuration/adding-custom-packages.section.xml diff --git a/nixos/doc/manual/configuration/adding-custom-packages.section.md b/nixos/doc/manual/configuration/adding-custom-packages.section.md new file mode 100644 index 000000000000..14370c891260 --- /dev/null +++ b/nixos/doc/manual/configuration/adding-custom-packages.section.md @@ -0,0 +1,74 @@ +# Adding Custom Packages {#sec-custom-packages} + +It's possible that a package you need is not available in NixOS. In that +case, you can do two things. First, you can clone the Nixpkgs +repository, add the package to your clone, and (optionally) submit a +patch or pull request to have it accepted into the main Nixpkgs repository. +This is described in detail in the [Nixpkgs manual](https://nixos.org/nixpkgs/manual). +In short, you clone Nixpkgs: + +```ShellSession +$ git clone https://github.com/NixOS/nixpkgs +$ cd nixpkgs +``` + +Then you write and test the package as described in the Nixpkgs manual. +Finally, you add it to [`environment.systemPackages`](options.html#opt-environment.systemPackages), e.g. + +```nix +environment.systemPackages = [ pkgs.my-package ]; +``` + +and you run `nixos-rebuild`, specifying your own Nixpkgs tree: + +```ShellSession +# nixos-rebuild switch -I nixpkgs=/path/to/my/nixpkgs +``` + +The second possibility is to add the package outside of the Nixpkgs +tree. For instance, here is how you specify a build of the +[GNU Hello](https://www.gnu.org/software/hello/) package directly in +`configuration.nix`: + +```nix +environment.systemPackages = + let + my-hello = with pkgs; stdenv.mkDerivation rec { + name = "hello-2.8"; + src = fetchurl { + url = "mirror://gnu/hello/${name}.tar.gz"; + sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6"; + }; + }; + in + [ my-hello ]; +``` + +Of course, you can also move the definition of `my-hello` into a +separate Nix expression, e.g. + +```nix +environment.systemPackages = [ (import ./my-hello.nix) ]; +``` + +where `my-hello.nix` contains: + +```nix +with import {}; # bring all of Nixpkgs into scope + +stdenv.mkDerivation rec { + name = "hello-2.8"; + src = fetchurl { + url = "mirror://gnu/hello/${name}.tar.gz"; + sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6"; + }; +} +``` + +This allows testing the package easily: + +```ShellSession +$ nix-build my-hello.nix +$ ./result/bin/hello +Hello, world! +``` diff --git a/nixos/doc/manual/configuration/adding-custom-packages.xml b/nixos/doc/manual/configuration/adding-custom-packages.xml deleted file mode 100644 index 19eb2429d0a0..000000000000 --- a/nixos/doc/manual/configuration/adding-custom-packages.xml +++ /dev/null @@ -1,73 +0,0 @@ -
- Adding Custom Packages - - - It’s possible that a package you need is not available in NixOS. In that - case, you can do two things. First, you can clone the Nixpkgs repository, add - the package to your clone, and (optionally) submit a patch or pull request to - have it accepted into the main Nixpkgs repository. This is described in - detail in the Nixpkgs - manual. In short, you clone Nixpkgs: - -$ git clone https://github.com/NixOS/nixpkgs -$ cd nixpkgs - - Then you write and test the package as described in the Nixpkgs manual. - Finally, you add it to environment.systemPackages, e.g. - - = [ pkgs.my-package ]; - - and you run nixos-rebuild, specifying your own Nixpkgs - tree: - -# nixos-rebuild switch -I nixpkgs=/path/to/my/nixpkgs - - - - The second possibility is to add the package outside of the Nixpkgs tree. For - instance, here is how you specify a build of the - GNU Hello - package directly in configuration.nix: - - = - let - my-hello = with pkgs; stdenv.mkDerivation rec { - name = "hello-2.8"; - src = fetchurl { - url = "mirror://gnu/hello/${name}.tar.gz"; - sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6"; - }; - }; - in - [ my-hello ]; - - Of course, you can also move the definition of my-hello - into a separate Nix expression, e.g. - - = [ (import ./my-hello.nix) ]; - - where my-hello.nix contains: - -with import <nixpkgs> {}; # bring all of Nixpkgs into scope - -stdenv.mkDerivation rec { - name = "hello-2.8"; - src = fetchurl { - url = "mirror://gnu/hello/${name}.tar.gz"; - sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6"; - }; -} - - This allows testing the package easily: - -$ nix-build my-hello.nix -$ ./result/bin/hello -Hello, world! - - -
diff --git a/nixos/doc/manual/configuration/declarative-packages.xml b/nixos/doc/manual/configuration/declarative-packages.xml index cd84d1951d24..648bb76cf3b2 100644 --- a/nixos/doc/manual/configuration/declarative-packages.xml +++ b/nixos/doc/manual/configuration/declarative-packages.xml @@ -50,5 +50,5 @@ nixos.firefox firefox-23.0 Mozilla Firefox - the browser, reloaded - + diff --git a/nixos/doc/manual/from_md/configuration/adding-custom-packages.section.xml b/nixos/doc/manual/from_md/configuration/adding-custom-packages.section.xml new file mode 100644 index 000000000000..80e3aa692128 --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/adding-custom-packages.section.xml @@ -0,0 +1,81 @@ +
+ Adding Custom Packages + + It’s possible that a package you need is not available in NixOS. In + that case, you can do two things. First, you can clone the Nixpkgs + repository, add the package to your clone, and (optionally) submit a + patch or pull request to have it accepted into the main Nixpkgs + repository. This is described in detail in the + Nixpkgs + manual. In short, you clone Nixpkgs: + + +$ git clone https://github.com/NixOS/nixpkgs +$ cd nixpkgs + + + Then you write and test the package as described in the Nixpkgs + manual. Finally, you add it to + environment.systemPackages, + e.g. + + +environment.systemPackages = [ pkgs.my-package ]; + + + and you run nixos-rebuild, specifying your own + Nixpkgs tree: + + +# nixos-rebuild switch -I nixpkgs=/path/to/my/nixpkgs + + + The second possibility is to add the package outside of the Nixpkgs + tree. For instance, here is how you specify a build of the + GNU + Hello package directly in + configuration.nix: + + +environment.systemPackages = + let + my-hello = with pkgs; stdenv.mkDerivation rec { + name = "hello-2.8"; + src = fetchurl { + url = "mirror://gnu/hello/${name}.tar.gz"; + sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6"; + }; + }; + in + [ my-hello ]; + + + Of course, you can also move the definition of + my-hello into a separate Nix expression, e.g. + + +environment.systemPackages = [ (import ./my-hello.nix) ]; + + + where my-hello.nix contains: + + +with import <nixpkgs> {}; # bring all of Nixpkgs into scope + +stdenv.mkDerivation rec { + name = "hello-2.8"; + src = fetchurl { + url = "mirror://gnu/hello/${name}.tar.gz"; + sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6"; + }; +} + + + This allows testing the package easily: + + +$ nix-build my-hello.nix +$ ./result/bin/hello +Hello, world! + +
From 9f4535ff162f55b2a3a3620de068352382dfcd58 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 1 Jul 2021 19:36:41 +0800 Subject: [PATCH 003/167] nixos: nixos/doc/manual/configuration/customizing-packages.xml to CommonMark --- .../customizing-packages.section.md | 74 +++++++++++++++ .../configuration/customizing-packages.xml | 86 ------------------ .../configuration/declarative-packages.xml | 2 +- .../customizing-packages.section.xml | 90 +++++++++++++++++++ 4 files changed, 165 insertions(+), 87 deletions(-) create mode 100644 nixos/doc/manual/configuration/customizing-packages.section.md delete mode 100644 nixos/doc/manual/configuration/customizing-packages.xml create mode 100644 nixos/doc/manual/from_md/configuration/customizing-packages.section.xml diff --git a/nixos/doc/manual/configuration/customizing-packages.section.md b/nixos/doc/manual/configuration/customizing-packages.section.md new file mode 100644 index 000000000000..480aed61211e --- /dev/null +++ b/nixos/doc/manual/configuration/customizing-packages.section.md @@ -0,0 +1,74 @@ +# Customising Packages {#sec-customising-packages} + +Some packages in Nixpkgs have options to enable or disable optional +functionality or change other aspects of the package. For instance, the +Firefox wrapper package (which provides Firefox with a set of plugins +such as the Adobe Flash player) has an option to enable the Google Talk +plugin. It can be set in `configuration.nix` as follows: +`nixpkgs.config.firefox.enableGoogleTalkPlugin = true;` + +::: {.warning} +Unfortunately, Nixpkgs currently lacks a way to query available +configuration options. +::: + +Apart from high-level options, it's possible to tweak a package in +almost arbitrary ways, such as changing or disabling dependencies of a +package. For instance, the Emacs package in Nixpkgs by default has a +dependency on GTK 2. If you want to build it against GTK 3, you can +specify that as follows: + +```nix +environment.systemPackages = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ]; +``` + +The function `override` performs the call to the Nix function that +produces Emacs, with the original arguments amended by the set of +arguments specified by you. So here the function argument `gtk` gets the +value `pkgs.gtk3`, causing Emacs to depend on GTK 3. (The parentheses +are necessary because in Nix, function application binds more weakly +than list construction, so without them, +[`environment.systemPackages`](options.html#opt-environment.systemPackages) +would be a list with two elements.) + +Even greater customisation is possible using the function +`overrideAttrs`. While the `override` mechanism above overrides the +arguments of a package function, `overrideAttrs` allows changing the +*attributes* passed to `mkDerivation`. This permits changing any aspect +of the package, such as the source code. For instance, if you want to +override the source code of Emacs, you can say: + +```nix +environment.systemPackages = [ + (pkgs.emacs.overrideAttrs (oldAttrs: { + name = "emacs-25.0-pre"; + src = /path/to/my/emacs/tree; + })) +]; +``` + +Here, `overrideAttrs` takes the Nix derivation specified by `pkgs.emacs` +and produces a new derivation in which the original's `name` and `src` +attribute have been replaced by the given values by re-calling +`stdenv.mkDerivation`. The original attributes are accessible via the +function argument, which is conventionally named `oldAttrs`. + +The overrides shown above are not global. They do not affect the +original package; other packages in Nixpkgs continue to depend on the +original rather than the customised package. This means that if another +package in your system depends on the original package, you end up with +two instances of the package. If you want to have everything depend on +your customised instance, you can apply a *global* override as follows: + +```nix +nixpkgs.config.packageOverrides = pkgs: + { emacs = pkgs.emacs.override { gtk = pkgs.gtk3; }; + }; +``` + +The effect of this definition is essentially equivalent to modifying the +`emacs` attribute in the Nixpkgs source tree. Any package in Nixpkgs +that depends on `emacs` will be passed your customised instance. +(However, the value `pkgs.emacs` in `nixpkgs.config.packageOverrides` +refers to the original rather than overridden instance, to prevent an +infinite recursion.) diff --git a/nixos/doc/manual/configuration/customizing-packages.xml b/nixos/doc/manual/configuration/customizing-packages.xml deleted file mode 100644 index 34e6ab4b24d6..000000000000 --- a/nixos/doc/manual/configuration/customizing-packages.xml +++ /dev/null @@ -1,86 +0,0 @@ -
- Customising Packages - - - Some packages in Nixpkgs have options to enable or disable optional - functionality or change other aspects of the package. For instance, the - Firefox wrapper package (which provides Firefox with a set of plugins such as - the Adobe Flash player) has an option to enable the Google Talk plugin. It - can be set in configuration.nix as follows: - nixpkgs.config.firefox.enableGoogleTalkPlugin = true; - - - - - Unfortunately, Nixpkgs currently lacks a way to query available - configuration options. - - - - - Apart from high-level options, it’s possible to tweak a package in almost - arbitrary ways, such as changing or disabling dependencies of a package. For - instance, the Emacs package in Nixpkgs by default has a dependency on GTK 2. - If you want to build it against GTK 3, you can specify that as follows: - - = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ]; - - The function override performs the call to the Nix - function that produces Emacs, with the original arguments amended by the set - of arguments specified by you. So here the function argument - gtk gets the value pkgs.gtk3, causing - Emacs to depend on GTK 3. (The parentheses are necessary because in Nix, - function application binds more weakly than list construction, so without - them, would be a list with - two elements.) - - - - Even greater customisation is possible using the function - overrideAttrs. While the override - mechanism above overrides the arguments of a package function, - overrideAttrs allows changing the - attributes passed to mkDerivation. - This permits changing any aspect of the package, such as the source code. For - instance, if you want to override the source code of Emacs, you can say: - - = [ - (pkgs.emacs.overrideAttrs (oldAttrs: { - name = "emacs-25.0-pre"; - src = /path/to/my/emacs/tree; - })) -]; - - Here, overrideAttrs takes the Nix derivation specified by - pkgs.emacs and produces a new derivation in which the - original’s name and src attribute - have been replaced by the given values by re-calling - stdenv.mkDerivation. The original attributes are - accessible via the function argument, which is conventionally named - oldAttrs. - - - - The overrides shown above are not global. They do not affect the original - package; other packages in Nixpkgs continue to depend on the original rather - than the customised package. This means that if another package in your - system depends on the original package, you end up with two instances of the - package. If you want to have everything depend on your customised instance, - you can apply a global override as follows: - -nixpkgs.config.packageOverrides = pkgs: - { emacs = pkgs.emacs.override { gtk = pkgs.gtk3; }; - }; - - The effect of this definition is essentially equivalent to modifying the - emacs attribute in the Nixpkgs source tree. Any package in - Nixpkgs that depends on emacs will be passed your - customised instance. (However, the value pkgs.emacs in - nixpkgs.config.packageOverrides refers to the original - rather than overridden instance, to prevent an infinite recursion.) - -
diff --git a/nixos/doc/manual/configuration/declarative-packages.xml b/nixos/doc/manual/configuration/declarative-packages.xml index 648bb76cf3b2..8d321929f3f0 100644 --- a/nixos/doc/manual/configuration/declarative-packages.xml +++ b/nixos/doc/manual/configuration/declarative-packages.xml @@ -48,7 +48,7 @@ nixos.firefox firefox-23.0 Mozilla Firefox - the browser, reloaded nixos-rebuild switch. - + diff --git a/nixos/doc/manual/from_md/configuration/customizing-packages.section.xml b/nixos/doc/manual/from_md/configuration/customizing-packages.section.xml new file mode 100644 index 000000000000..661fb8475b38 --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/customizing-packages.section.xml @@ -0,0 +1,90 @@ +
+ Customising Packages + + Some packages in Nixpkgs have options to enable or disable optional + functionality or change other aspects of the package. For instance, + the Firefox wrapper package (which provides Firefox with a set of + plugins such as the Adobe Flash player) has an option to enable the + Google Talk plugin. It can be set in + configuration.nix as follows: + nixpkgs.config.firefox.enableGoogleTalkPlugin = true; + + + + Unfortunately, Nixpkgs currently lacks a way to query available + configuration options. + + + + Apart from high-level options, it’s possible to tweak a package in + almost arbitrary ways, such as changing or disabling dependencies of + a package. For instance, the Emacs package in Nixpkgs by default has + a dependency on GTK 2. If you want to build it against GTK 3, you + can specify that as follows: + + +environment.systemPackages = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ]; + + + The function override performs the call to the + Nix function that produces Emacs, with the original arguments + amended by the set of arguments specified by you. So here the + function argument gtk gets the value + pkgs.gtk3, causing Emacs to depend on GTK 3. (The + parentheses are necessary because in Nix, function application binds + more weakly than list construction, so without them, + environment.systemPackages + would be a list with two elements.) + + + Even greater customisation is possible using the function + overrideAttrs. While the + override mechanism above overrides the arguments + of a package function, overrideAttrs allows + changing the attributes passed to + mkDerivation. This permits changing any aspect of + the package, such as the source code. For instance, if you want to + override the source code of Emacs, you can say: + + +environment.systemPackages = [ + (pkgs.emacs.overrideAttrs (oldAttrs: { + name = "emacs-25.0-pre"; + src = /path/to/my/emacs/tree; + })) +]; + + + Here, overrideAttrs takes the Nix derivation + specified by pkgs.emacs and produces a new + derivation in which the original’s name and + src attribute have been replaced by the given + values by re-calling stdenv.mkDerivation. The + original attributes are accessible via the function argument, which + is conventionally named oldAttrs. + + + The overrides shown above are not global. They do not affect the + original package; other packages in Nixpkgs continue to depend on + the original rather than the customised package. This means that if + another package in your system depends on the original package, you + end up with two instances of the package. If you want to have + everything depend on your customised instance, you can apply a + global override as follows: + + +nixpkgs.config.packageOverrides = pkgs: + { emacs = pkgs.emacs.override { gtk = pkgs.gtk3; }; + }; + + + The effect of this definition is essentially equivalent to modifying + the emacs attribute in the Nixpkgs source tree. + Any package in Nixpkgs that depends on emacs will + be passed your customised instance. (However, the value + pkgs.emacs in + nixpkgs.config.packageOverrides refers to the + original rather than overridden instance, to prevent an infinite + recursion.) + +
From 07ca0e237ee479ff2b430989391179568b952864 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 1 Jul 2021 21:13:13 +0800 Subject: [PATCH 004/167] nixos: nixos/doc/manual/configuration/config-file.xml to CommonMark --- .../configuration/config-file.section.md | 175 +++++++++++++ .../doc/manual/configuration/config-file.xml | 216 ---------------- .../manual/configuration/config-syntax.xml | 2 +- .../configuration/config-file.section.xml | 231 ++++++++++++++++++ 4 files changed, 407 insertions(+), 217 deletions(-) create mode 100644 nixos/doc/manual/configuration/config-file.section.md delete mode 100644 nixos/doc/manual/configuration/config-file.xml create mode 100644 nixos/doc/manual/from_md/configuration/config-file.section.xml diff --git a/nixos/doc/manual/configuration/config-file.section.md b/nixos/doc/manual/configuration/config-file.section.md new file mode 100644 index 000000000000..9254544177cc --- /dev/null +++ b/nixos/doc/manual/configuration/config-file.section.md @@ -0,0 +1,175 @@ +# NixOS Configuration File {#sec-configuration-file} + +The NixOS configuration file generally looks like this: + +```nix +{ config, pkgs, ... }: + +{ option definitions +} +``` + +The first line (`{ config, pkgs, ... }:`) denotes that this is actually +a function that takes at least the two arguments `config` and `pkgs`. +(These are explained later, in chapter [](#sec-writing-modules)) The +function returns a *set* of option definitions (`{ ... }`). +These definitions have the form `name = value`, where `name` is the +name of an option and `value` is its value. For example, + +```nix +{ config, pkgs, ... }: + +{ services.httpd.enable = true; + services.httpd.adminAddr = "alice@example.org"; + services.httpd.virtualHosts.localhost.documentRoot = "/webroot"; +} +``` + +defines a configuration with three option definitions that together +enable the Apache HTTP Server with `/webroot` as the document root. + +Sets can be nested, and in fact dots in option names are shorthand for +defining a set containing another set. For instance, +[`services.httpd.enable`](options.html#opt-services.httpd.enable) defines a set named +`services` that contains a set named `httpd`, which in turn contains an +option definition named `enable` with value `true`. This means that the +example above can also be written as: + +```nix +{ config, pkgs, ... }: + +{ services = { + httpd = { + enable = true; + adminAddr = "alice@example.org"; + virtualHosts = { + localhost = { + documentRoot = "/webroot"; + }; + }; + }; + }; +} +``` + +which may be more convenient if you have lots of option definitions that +share the same prefix (such as `services.httpd`). + +NixOS checks your option definitions for correctness. For instance, if +you try to define an option that doesn't exist (that is, doesn't have a +corresponding *option declaration*), `nixos-rebuild` will give an error +like: + +```plain +The option `services.httpd.enable' defined in `/etc/nixos/configuration.nix' does not exist. +``` + +Likewise, values in option definitions must have a correct type. For +instance, `services.httpd.enable` must be a Boolean (`true` or `false`). +Trying to give it a value of another type, such as a string, will cause +an error: + +```plain +The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is not a boolean. +``` + +Options have various types of values. The most important are: + +Strings + +: Strings are enclosed in double quotes, e.g. + + ```nix + networking.hostName = "dexter"; + ``` + + Special characters can be escaped by prefixing them with a backslash + (e.g. `\"`). + + Multi-line strings can be enclosed in *double single quotes*, e.g. + + ```nix + networking.extraHosts = + '' + 127.0.0.2 other-localhost + 10.0.0.1 server + ''; + ``` + + The main difference is that it strips from each line a number of + spaces equal to the minimal indentation of the string as a whole + (disregarding the indentation of empty lines), and that characters + like `"` and `\` are not special (making it more convenient for + including things like shell code). See more info about this in the + Nix manual [here](https://nixos.org/nix/manual/#ssec-values). + +Booleans + +: These can be `true` or `false`, e.g. + + ```nix + networking.firewall.enable = true; + networking.firewall.allowPing = false; + ``` + +Integers + +: For example, + + ```nix + boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 60; + ``` + + (Note that here the attribute name `net.ipv4.tcp_keepalive_time` is + enclosed in quotes to prevent it from being interpreted as a set + named `net` containing a set named `ipv4`, and so on. This is + because it's not a NixOS option but the literal name of a Linux + kernel setting.) + +Sets + +: Sets were introduced above. They are name/value pairs enclosed in + braces, as in the option definition + + ```nix + fileSystems."/boot" = + { device = "/dev/sda1"; + fsType = "ext4"; + options = [ "rw" "data=ordered" "relatime" ]; + }; + ``` + +Lists + +: The important thing to note about lists is that list elements are + separated by whitespace, like this: + + ```nix + boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ]; + ``` + + List elements can be any other type, e.g. sets: + + ```nix + swapDevices = [ { device = "/dev/disk/by-label/swap"; } ]; + ``` + +Packages + +: Usually, the packages you need are already part of the Nix Packages + collection, which is a set that can be accessed through the function + argument `pkgs`. Typical uses: + + ```nix + environment.systemPackages = + [ pkgs.thunderbird + pkgs.emacs + ]; + + services.postgresql.package = pkgs.postgresql_10; + ``` + + The latter option definition changes the default PostgreSQL package + used by NixOS's PostgreSQL service to 10.x. For more information on + packages, including how to add new ones, see + [](#sec-custom-packages). diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml deleted file mode 100644 index 19cfb57920df..000000000000 --- a/nixos/doc/manual/configuration/config-file.xml +++ /dev/null @@ -1,216 +0,0 @@ -
- NixOS Configuration File - - - The NixOS configuration file generally looks like this: - -{ config, pkgs, ... }: - -{ option definitions -} - - The first line ({ config, pkgs, ... }:) denotes that this - is actually a function that takes at least the two arguments - config and pkgs. (These are explained - later, in chapter ) The function returns - a set of option definitions ({ - ... }). These definitions have the form - name = - value, where - name is the name of an option and - value is its value. For example, - -{ config, pkgs, ... }: - -{ = true; - = "alice@example.org"; - services.httpd.virtualHosts.localhost.documentRoot = "/webroot"; -} - - defines a configuration with three option definitions that together enable - the Apache HTTP Server with /webroot as the document - root. - - - - Sets can be nested, and in fact dots in option names are shorthand for - defining a set containing another set. For instance, - defines a set named - services that contains a set named - httpd, which in turn contains an option definition named - enable with value true. This means that - the example above can also be written as: - -{ config, pkgs, ... }: - -{ services = { - httpd = { - enable = true; - adminAddr = "alice@example.org"; - virtualHosts = { - localhost = { - documentRoot = "/webroot"; - }; - }; - }; - }; -} - - which may be more convenient if you have lots of option definitions that - share the same prefix (such as services.httpd). - - - - NixOS checks your option definitions for correctness. For instance, if you - try to define an option that doesn’t exist (that is, doesn’t have a - corresponding option declaration), - nixos-rebuild will give an error like: - -The option `services.httpd.enable' defined in `/etc/nixos/configuration.nix' does not exist. - - Likewise, values in option definitions must have a correct type. For - instance, must be a Boolean - (true or false). Trying to give it a - value of another type, such as a string, will cause an error: - -The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is not a boolean. - - - - - Options have various types of values. The most important are: - - - - Strings - - - - Strings are enclosed in double quotes, e.g. - - = "dexter"; - - Special characters can be escaped by prefixing them with a backslash - (e.g. \"). - - - Multi-line strings can be enclosed in double single - quotes, e.g. - - = - '' - 127.0.0.2 other-localhost - 10.0.0.1 server - ''; - - The main difference is that it strips from each line a number of spaces - equal to the minimal indentation of the string as a whole (disregarding - the indentation of empty lines), and that characters like - " and \ are not special (making it - more convenient for including things like shell code). See more info - about this in the Nix manual - here. - - - - - - Booleans - - - - These can be true or false, e.g. - - = true; - = false; - - - - - - - Integers - - - - For example, - -."net.ipv4.tcp_keepalive_time" = 60; - - (Note that here the attribute name - net.ipv4.tcp_keepalive_time is enclosed in quotes to - prevent it from being interpreted as a set named net - containing a set named ipv4, and so on. This is - because it’s not a NixOS option but the literal name of a Linux kernel - setting.) - - - - - - Sets - - - - Sets were introduced above. They are name/value pairs enclosed in braces, - as in the option definition - -."/boot" = - { device = "/dev/sda1"; - fsType = "ext4"; - options = [ "rw" "data=ordered" "relatime" ]; - }; - - - - - - - Lists - - - - The important thing to note about lists is that list elements are - separated by whitespace, like this: - - = [ "fuse" "kvm-intel" "coretemp" ]; - - List elements can be any other type, e.g. sets: - -swapDevices = [ { device = "/dev/disk/by-label/swap"; } ]; - - - - - - - Packages - - - - Usually, the packages you need are already part of the Nix Packages - collection, which is a set that can be accessed through the function - argument pkgs. Typical uses: - - = - [ pkgs.thunderbird - pkgs.emacs - ]; - - = pkgs.postgresql_10; - - The latter option definition changes the default PostgreSQL package used - by NixOS’s PostgreSQL service to 10.x. For more information on - packages, including how to add new ones, see - . - - - - - -
diff --git a/nixos/doc/manual/configuration/config-syntax.xml b/nixos/doc/manual/configuration/config-syntax.xml index a374c6a87074..518d8eb627f8 100644 --- a/nixos/doc/manual/configuration/config-syntax.xml +++ b/nixos/doc/manual/configuration/config-syntax.xml @@ -18,7 +18,7 @@ xlink:href="https://nixos.org/nix/manual/#chap-writing-nix-expressions">Nix manual, but here we give a short overview of the most important constructs useful in NixOS configuration files. - + diff --git a/nixos/doc/manual/from_md/configuration/config-file.section.xml b/nixos/doc/manual/from_md/configuration/config-file.section.xml new file mode 100644 index 000000000000..b7ba17b8ceec --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/config-file.section.xml @@ -0,0 +1,231 @@ +
+ NixOS Configuration File + + The NixOS configuration file generally looks like this: + + +{ config, pkgs, ... }: + +{ option definitions +} + + + The first line ({ config, pkgs, ... }:) denotes + that this is actually a function that takes at least the two + arguments config and pkgs. + (These are explained later, in chapter + ) The function returns a + set of option definitions + ({ ... }). These definitions have the form + name = value, where name is + the name of an option and value is its value. For + example, + + +{ config, pkgs, ... }: + +{ services.httpd.enable = true; + services.httpd.adminAddr = "alice@example.org"; + services.httpd.virtualHosts.localhost.documentRoot = "/webroot"; +} + + + defines a configuration with three option definitions that together + enable the Apache HTTP Server with /webroot as + the document root. + + + Sets can be nested, and in fact dots in option names are shorthand + for defining a set containing another set. For instance, + services.httpd.enable + defines a set named services that contains a set + named httpd, which in turn contains an option + definition named enable with value + true. This means that the example above can also + be written as: + + +{ config, pkgs, ... }: + +{ services = { + httpd = { + enable = true; + adminAddr = "alice@example.org"; + virtualHosts = { + localhost = { + documentRoot = "/webroot"; + }; + }; + }; + }; +} + + + which may be more convenient if you have lots of option definitions + that share the same prefix (such as + services.httpd). + + + NixOS checks your option definitions for correctness. For instance, + if you try to define an option that doesn’t exist (that is, doesn’t + have a corresponding option declaration), + nixos-rebuild will give an error like: + + +The option `services.httpd.enable' defined in `/etc/nixos/configuration.nix' does not exist. + + + Likewise, values in option definitions must have a correct type. For + instance, services.httpd.enable must be a Boolean + (true or false). Trying to + give it a value of another type, such as a string, will cause an + error: + + +The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is not a boolean. + + + Options have various types of values. The most important are: + + + + + Strings + + + + Strings are enclosed in double quotes, e.g. + + +networking.hostName = "dexter"; + + + Special characters can be escaped by prefixing them with a + backslash (e.g. \"). + + + Multi-line strings can be enclosed in double single + quotes, e.g. + + +networking.extraHosts = + '' + 127.0.0.2 other-localhost + 10.0.0.1 server + ''; + + + The main difference is that it strips from each line a number + of spaces equal to the minimal indentation of the string as a + whole (disregarding the indentation of empty lines), and that + characters like " and + \ are not special (making it more + convenient for including things like shell code). See more + info about this in the Nix manual + here. + + + + + + Booleans + + + + These can be true or + false, e.g. + + +networking.firewall.enable = true; +networking.firewall.allowPing = false; + + + + + + Integers + + + + For example, + + +boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 60; + + + (Note that here the attribute name + net.ipv4.tcp_keepalive_time is enclosed in + quotes to prevent it from being interpreted as a set named + net containing a set named + ipv4, and so on. This is because it’s not a + NixOS option but the literal name of a Linux kernel setting.) + + + + + + Sets + + + + Sets were introduced above. They are name/value pairs enclosed + in braces, as in the option definition + + +fileSystems."/boot" = + { device = "/dev/sda1"; + fsType = "ext4"; + options = [ "rw" "data=ordered" "relatime" ]; + }; + + + + + + Lists + + + + The important thing to note about lists is that list elements + are separated by whitespace, like this: + + +boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ]; + + + List elements can be any other type, e.g. sets: + + +swapDevices = [ { device = "/dev/disk/by-label/swap"; } ]; + + + + + + Packages + + + + Usually, the packages you need are already part of the Nix + Packages collection, which is a set that can be accessed + through the function argument pkgs. Typical + uses: + + +environment.systemPackages = + [ pkgs.thunderbird + pkgs.emacs + ]; + +services.postgresql.package = pkgs.postgresql_10; + + + The latter option definition changes the default PostgreSQL + package used by NixOS’s PostgreSQL service to 10.x. For more + information on packages, including how to add new ones, see + . + + + + +
From 6122fb4123c98cbc39276c97d7d307dc82d32c58 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 1 Jul 2021 21:14:17 +0800 Subject: [PATCH 005/167] nixos: nixos/doc/manual/configuration/modularity.xml to CommonMark --- .../manual/configuration/config-syntax.xml | 3 +- .../configuration/modularity.section.md | 133 +++++++++++++++ nixos/doc/manual/configuration/modularity.xml | 146 ----------------- .../configuration/modularity.section.xml | 154 ++++++++++++++++++ 4 files changed, 288 insertions(+), 148 deletions(-) create mode 100644 nixos/doc/manual/configuration/modularity.section.md delete mode 100644 nixos/doc/manual/configuration/modularity.xml create mode 100644 nixos/doc/manual/from_md/configuration/modularity.section.xml diff --git a/nixos/doc/manual/configuration/config-syntax.xml b/nixos/doc/manual/configuration/config-syntax.xml index 518d8eb627f8..430ecb4d7918 100644 --- a/nixos/doc/manual/configuration/config-syntax.xml +++ b/nixos/doc/manual/configuration/config-syntax.xml @@ -20,6 +20,5 @@ xlink:href="https://nixos.org/nix/manual/#chap-writing-nix-expressions">Nix - - + diff --git a/nixos/doc/manual/configuration/modularity.section.md b/nixos/doc/manual/configuration/modularity.section.md new file mode 100644 index 000000000000..23854cb503e0 --- /dev/null +++ b/nixos/doc/manual/configuration/modularity.section.md @@ -0,0 +1,133 @@ +# Modularity {#sec-modularity} + +The NixOS configuration mechanism is modular. If your +`configuration.nix` becomes too big, you can split it into multiple +files. Likewise, if you have multiple NixOS configurations (e.g. for +different computers) with some commonality, you can move the common +configuration into a shared file. + +Modules have exactly the same syntax as `configuration.nix`. In fact, +`configuration.nix` is itself a module. You can use other modules by +including them from `configuration.nix`, e.g.: + +```nix +{ config, pkgs, ... }: + +{ imports = [ ./vpn.nix ./kde.nix ]; + services.httpd.enable = true; + environment.systemPackages = [ pkgs.emacs ]; + ... +} +``` + +Here, we include two modules from the same directory, `vpn.nix` and +`kde.nix`. The latter might look like this: + +```nix +{ config, pkgs, ... }: + +{ services.xserver.enable = true; + services.xserver.displayManager.sddm.enable = true; + services.xserver.desktopManager.plasma5.enable = true; + environment.systemPackages = [ pkgs.vim ]; +} +``` + +Note that both `configuration.nix` and `kde.nix` define the option +[`environment.systemPackages`](options.html#opt-environment.systemPackages). When multiple modules define an +option, NixOS will try to *merge* the definitions. In the case of +[`environment.systemPackages`](options.html#opt-environment.systemPackages), that's easy: the lists of +packages can simply be concatenated. The value in `configuration.nix` is +merged last, so for list-type options, it will appear at the end of the +merged list. If you want it to appear first, you can use `mkBefore`: + +```nix +boot.kernelModules = mkBefore [ "kvm-intel" ]; +``` + +This causes the `kvm-intel` kernel module to be loaded before any other +kernel modules. + +For other types of options, a merge may not be possible. For instance, +if two modules define [`services.httpd.adminAddr`](options.html#opt-services.httpd.adminAddr), +`nixos-rebuild` will give an error: + +```plain +The unique option `services.httpd.adminAddr' is defined multiple times, in `/etc/nixos/httpd.nix' and `/etc/nixos/configuration.nix'. +``` + +When that happens, it's possible to force one definition take precedence +over the others: + +```nix +services.httpd.adminAddr = pkgs.lib.mkForce "bob@example.org"; +``` + +When using multiple modules, you may need to access configuration values +defined in other modules. This is what the `config` function argument is +for: it contains the complete, merged system configuration. That is, +`config` is the result of combining the configurations returned by every +module [^1] . For example, here is a module that adds some packages to +[`environment.systemPackages`](options.html#opt-environment.systemPackages) only if +[`services.xserver.enable`](options.html#opt-services.xserver.enable) is set to `true` somewhere else: + +```nix +{ config, pkgs, ... }: + +{ environment.systemPackages = + if config.services.xserver.enable then + [ pkgs.firefox + pkgs.thunderbird + ] + else + [ ]; +} +``` + +With multiple modules, it may not be obvious what the final value of a +configuration option is. The command `nixos-option` allows you to find +out: + +```ShellSession +$ nixos-option services.xserver.enable +true + +$ nixos-option boot.kernelModules +[ "tun" "ipv6" "loop" ... ] +``` + +Interactive exploration of the configuration is possible using `nix + repl`, a read-eval-print loop for Nix expressions. A typical use: + +```ShellSession +$ nix repl '' + +nix-repl> config.networking.hostName +"mandark" + +nix-repl> map (x: x.hostName) config.services.httpd.virtualHosts +[ "example.org" "example.gov" ] +``` + +While abstracting your configuration, you may find it useful to generate +modules using code, instead of writing files. The example below would +have the same effect as importing a file which sets those options. + +```nix +{ config, pkgs, ... }: + +let netConfig = hostName: { + networking.hostName = hostName; + networking.useDHCP = false; +}; + +in + +{ imports = [ (netConfig "nixos.localdomain") ]; } +``` + +[^1]: If you're wondering how it's possible that the (indirect) *result* + of a function is passed as an *input* to that same function: that's + because Nix is a "lazy" language --- it only computes values when + they are needed. This works as long as no individual configuration + value depends on itself. diff --git a/nixos/doc/manual/configuration/modularity.xml b/nixos/doc/manual/configuration/modularity.xml deleted file mode 100644 index d6eee4e9d76e..000000000000 --- a/nixos/doc/manual/configuration/modularity.xml +++ /dev/null @@ -1,146 +0,0 @@ -
- Modularity - - - The NixOS configuration mechanism is modular. If your - configuration.nix becomes too big, you can split it into - multiple files. Likewise, if you have multiple NixOS configurations (e.g. for - different computers) with some commonality, you can move the common - configuration into a shared file. - - - - Modules have exactly the same syntax as - configuration.nix. In fact, - configuration.nix is itself a module. You can use other - modules by including them from configuration.nix, e.g.: - -{ config, pkgs, ... }: - -{ imports = [ ./vpn.nix ./kde.nix ]; - = true; - = [ pkgs.emacs ]; - ... -} - - Here, we include two modules from the same directory, - vpn.nix and kde.nix. The latter - might look like this: - -{ config, pkgs, ... }: - -{ = true; - = true; - = true; - = [ pkgs.vim ]; -} - - Note that both configuration.nix and - kde.nix define the option - . When multiple modules - define an option, NixOS will try to merge the - definitions. In the case of , - that’s easy: the lists of packages can simply be concatenated. The value in - configuration.nix is merged last, so for list-type - options, it will appear at the end of the merged list. If you want it to - appear first, you can use mkBefore: - - = mkBefore [ "kvm-intel" ]; - - This causes the kvm-intel kernel module to be loaded - before any other kernel modules. - - - - For other types of options, a merge may not be possible. For instance, if two - modules define , - nixos-rebuild will give an error: - -The unique option `services.httpd.adminAddr' is defined multiple times, in `/etc/nixos/httpd.nix' and `/etc/nixos/configuration.nix'. - - When that happens, it’s possible to force one definition take precedence - over the others: - - = pkgs.lib.mkForce "bob@example.org"; - - - - - When using multiple modules, you may need to access configuration values - defined in other modules. This is what the config function - argument is for: it contains the complete, merged system configuration. That - is, config is the result of combining the configurations - returned by every module - - - If you’re wondering how it’s possible that the (indirect) - result of a function is passed as an - input to that same function: that’s because Nix is a - “lazy” language — it only computes values when they are needed. This - works as long as no individual configuration value depends on itself. - - - . For example, here is a module that adds some packages to - only if - is set to - true somewhere else: - -{ config, pkgs, ... }: - -{ = - if config. then - [ pkgs.firefox - pkgs.thunderbird - ] - else - [ ]; -} - - - - - With multiple modules, it may not be obvious what the final value of a - configuration option is. The command allows you - to find out: - -$ nixos-option -true - -$ nixos-option -[ "tun" "ipv6" "loop" ... ] - - Interactive exploration of the configuration is possible using nix - repl, a read-eval-print loop for Nix expressions. A typical use: - -$ nix repl '<nixpkgs/nixos>' - -nix-repl> config. -"mandark" - -nix-repl> map (x: x.hostName) config. -[ "example.org" "example.gov" ] - - - - - While abstracting your configuration, you may find it useful to generate - modules using code, instead of writing files. The example below would have - the same effect as importing a file which sets those options. - -{ config, pkgs, ... }: - -let netConfig = hostName: { - networking.hostName = hostName; - networking.useDHCP = false; -}; - -in - -{ imports = [ (netConfig "nixos.localdomain") ]; } - - -
diff --git a/nixos/doc/manual/from_md/configuration/modularity.section.xml b/nixos/doc/manual/from_md/configuration/modularity.section.xml new file mode 100644 index 000000000000..d5db37c13cfb --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/modularity.section.xml @@ -0,0 +1,154 @@ +
+ Modularity + + The NixOS configuration mechanism is modular. If your + configuration.nix becomes too big, you can split + it into multiple files. Likewise, if you have multiple NixOS + configurations (e.g. for different computers) with some commonality, + you can move the common configuration into a shared file. + + + Modules have exactly the same syntax as + configuration.nix. In fact, + configuration.nix is itself a module. You can use + other modules by including them from + configuration.nix, e.g.: + + +{ config, pkgs, ... }: + +{ imports = [ ./vpn.nix ./kde.nix ]; + services.httpd.enable = true; + environment.systemPackages = [ pkgs.emacs ]; + ... +} + + + Here, we include two modules from the same directory, + vpn.nix and kde.nix. The + latter might look like this: + + +{ config, pkgs, ... }: + +{ services.xserver.enable = true; + services.xserver.displayManager.sddm.enable = true; + services.xserver.desktopManager.plasma5.enable = true; + environment.systemPackages = [ pkgs.vim ]; +} + + + Note that both configuration.nix and + kde.nix define the option + environment.systemPackages. + When multiple modules define an option, NixOS will try to + merge the definitions. In the case of + environment.systemPackages, + that’s easy: the lists of packages can simply be concatenated. The + value in configuration.nix is merged last, so for + list-type options, it will appear at the end of the merged list. If + you want it to appear first, you can use + mkBefore: + + +boot.kernelModules = mkBefore [ "kvm-intel" ]; + + + This causes the kvm-intel kernel module to be + loaded before any other kernel modules. + + + For other types of options, a merge may not be possible. For + instance, if two modules define + services.httpd.adminAddr, + nixos-rebuild will give an error: + + +The unique option `services.httpd.adminAddr' is defined multiple times, in `/etc/nixos/httpd.nix' and `/etc/nixos/configuration.nix'. + + + When that happens, it’s possible to force one definition take + precedence over the others: + + +services.httpd.adminAddr = pkgs.lib.mkForce "bob@example.org"; + + + When using multiple modules, you may need to access configuration + values defined in other modules. This is what the + config function argument is for: it contains the + complete, merged system configuration. That is, + config is the result of combining the + configurations returned by every module + + If you’re wondering how it’s possible that the (indirect) + result of a function is passed as an + input to that same function: that’s because + Nix is a lazy language — it only computes values + when they are needed. This works as long as no individual + configuration value depends on itself. + + . For example, here is a module that adds some packages + to + environment.systemPackages + only if + services.xserver.enable + is set to true somewhere else: + + +{ config, pkgs, ... }: + +{ environment.systemPackages = + if config.services.xserver.enable then + [ pkgs.firefox + pkgs.thunderbird + ] + else + [ ]; +} + + + With multiple modules, it may not be obvious what the final value of + a configuration option is. The command + nixos-option allows you to find out: + + +$ nixos-option services.xserver.enable +true + +$ nixos-option boot.kernelModules +[ "tun" "ipv6" "loop" ... ] + + + Interactive exploration of the configuration is possible using + nix repl, a read-eval-print loop for Nix + expressions. A typical use: + + +$ nix repl '<nixpkgs/nixos>' + +nix-repl> config.networking.hostName +"mandark" + +nix-repl> map (x: x.hostName) config.services.httpd.virtualHosts +[ "example.org" "example.gov" ] + + + While abstracting your configuration, you may find it useful to + generate modules using code, instead of writing files. The example + below would have the same effect as importing a file which sets + those options. + + +{ config, pkgs, ... }: + +let netConfig = hostName: { + networking.hostName = hostName; + networking.useDHCP = false; +}; + +in + +{ imports = [ (netConfig "nixos.localdomain") ]; } + +
From 800c1f15a3ad3cbbce948d652b46406adeb2fc56 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 1 Jul 2021 21:14:59 +0800 Subject: [PATCH 006/167] nixos: nixos/doc/manual/configuration/summary.xml to CommonMark --- .../manual/configuration/config-syntax.xml | 1 + .../manual/configuration/summary.section.md | 46 +++ nixos/doc/manual/configuration/summary.xml | 227 ------------ .../from_md/configuration/summary.section.xml | 332 ++++++++++++++++++ 4 files changed, 379 insertions(+), 227 deletions(-) create mode 100644 nixos/doc/manual/configuration/summary.section.md delete mode 100644 nixos/doc/manual/configuration/summary.xml create mode 100644 nixos/doc/manual/from_md/configuration/summary.section.xml diff --git a/nixos/doc/manual/configuration/config-syntax.xml b/nixos/doc/manual/configuration/config-syntax.xml index 430ecb4d7918..d1351ff934e5 100644 --- a/nixos/doc/manual/configuration/config-syntax.xml +++ b/nixos/doc/manual/configuration/config-syntax.xml @@ -21,4 +21,5 @@ xlink:href="https://nixos.org/nix/manual/#chap-writing-nix-expressions">Nix + diff --git a/nixos/doc/manual/configuration/summary.section.md b/nixos/doc/manual/configuration/summary.section.md new file mode 100644 index 000000000000..8abbbe257fd9 --- /dev/null +++ b/nixos/doc/manual/configuration/summary.section.md @@ -0,0 +1,46 @@ +# Syntax Summary {#sec-nix-syntax-summary} + +Below is a summary of the most important syntactic constructs in the Nix +expression language. It's not complete. In particular, there are many +other built-in functions. See the [Nix +manual](https://nixos.org/nix/manual/#chap-writing-nix-expressions) for +the rest. + +| Example | Description | +|-----------------------------------------------|--------------------------------------------------------------------------------------------------------------------| +| *Basic values* | | +| `"Hello world"` | A string | +| `"${pkgs.bash}/bin/sh"` | A string containing an expression (expands to `"/nix/store/hash-bash-version/bin/sh"`) | +| `true`, `false` | Booleans | +| `123` | An integer | +| `./foo.png` | A path (relative to the containing Nix expression) | +| *Compound values* | | +| `{ x = 1; y = 2; }` | A set with attributes named `x` and `y` | +| `{ foo.bar = 1; }` | A nested set, equivalent to `{ foo = { bar = 1; }; }` | +| `rec { x = "foo"; y = x + "bar"; }` | A recursive set, equivalent to `{ x = "foo"; y = "foobar"; }` | +| `[ "foo" "bar" ]` | A list with two elements | +| *Operators* | | +| `"foo" + "bar"` | String concatenation | +| `1 + 2` | Integer addition | +| `"foo" == "f" + "oo"` | Equality test (evaluates to `true`) | +| `"foo" != "bar"` | Inequality test (evaluates to `true`) | +| `!true` | Boolean negation | +| `{ x = 1; y = 2; }.x` | Attribute selection (evaluates to `1`) | +| `{ x = 1; y = 2; }.z or 3` | Attribute selection with default (evaluates to `3`) | +| `{ x = 1; y = 2; } // { z = 3; }` | Merge two sets (attributes in the right-hand set taking precedence) | +| *Control structures* | | +| `if 1 + 1 == 2 then "yes!" else "no!"` | Conditional expression | +| `assert 1 + 1 == 2; "yes!"` | Assertion check (evaluates to `"yes!"`). See [](#sec-assertions) for using assertions in modules | +| `let x = "foo"; y = "bar"; in x + y` | Variable definition | +| `with pkgs.lib; head [ 1 2 3 ]` | Add all attributes from the given set to the scope (evaluates to `1`) | +| *Functions (lambdas)* | | +| `x: x + 1` | A function that expects an integer and returns it increased by 1 | +| `(x: x + 1) 100` | A function call (evaluates to 101) | +| `let inc = x: x + 1; in inc (inc (inc 100))` | A function bound to a variable and subsequently called by name (evaluates to 103) | +| `{ x, y }: x + y` | A function that expects a set with required attributes `x` and `y` and concatenates them | +| `{ x, y ? "bar" }: x + y` | A function that expects a set with required attribute `x` and optional `y`, using `"bar"` as default value for `y` | +| `{ x, y, ... }: x + y` | A function that expects a set with required attributes `x` and `y` and ignores any other attributes | +| `{ x, y } @ args: x + y` | A function that expects a set with required attributes `x` and `y`, and binds the whole set to `args` | +| *Built-in functions* | | +| `import ./foo.nix` | Load and return Nix expression in given file | +| `map (x: x + x) [ 1 2 3 ]` | Apply a function to every element of a list (evaluates to `[ 2 4 6 ]`) | diff --git a/nixos/doc/manual/configuration/summary.xml b/nixos/doc/manual/configuration/summary.xml deleted file mode 100644 index 289face16de9..000000000000 --- a/nixos/doc/manual/configuration/summary.xml +++ /dev/null @@ -1,227 +0,0 @@ -
- Syntax Summary - - - Below is a summary of the most important syntactic constructs in the Nix - expression language. It’s not complete. In particular, there are many other - built-in functions. See the - Nix - manual for the rest. - - - - - - - - - Example - Description - - - - - Basic values - - - - "Hello world" - - A string - - - "${pkgs.bash}/bin/sh" - - A string containing an expression (expands to "/nix/store/hash-bash-version/bin/sh") - - - true, false - - Booleans - - - 123 - - An integer - - - ./foo.png - - A path (relative to the containing Nix expression) - - - Compound values - - - - { x = 1; y = 2; } - - A set with attributes named x and y - - - - { foo.bar = 1; } - - A nested set, equivalent to { foo = { bar = 1; }; } - - - - rec { x = "foo"; y = x + "bar"; } - - A recursive set, equivalent to { x = "foo"; y = "foobar"; } - - - - [ "foo" "bar" ] - - A list with two elements - - - Operators - - - - "foo" + "bar" - - String concatenation - - - 1 + 2 - - Integer addition - - - "foo" == "f" + "oo" - - Equality test (evaluates to true) - - - "foo" != "bar" - - Inequality test (evaluates to true) - - - !true - - Boolean negation - - - { x = 1; y = 2; }.x - - Attribute selection (evaluates to 1) - - - { x = 1; y = 2; }.z or 3 - - Attribute selection with default (evaluates to 3) - - - { x = 1; y = 2; } // { z = 3; } - - Merge two sets (attributes in the right-hand set taking precedence) - - - Control structures - - - - if 1 + 1 == 2 then "yes!" else "no!" - - Conditional expression - - - assert 1 + 1 == 2; "yes!" - - Assertion check (evaluates to "yes!"). See for using assertions in modules - - - let x = "foo"; y = "bar"; in x + y - - Variable definition - - - with pkgs.lib; head [ 1 2 3 ] - - Add all attributes from the given set to the scope - (evaluates to 1) - - - Functions (lambdas) - - - - x: x + 1 - - A function that expects an integer and returns it increased by 1 - - - (x: x + 1) 100 - - A function call (evaluates to 101) - - - let inc = x: x + 1; in inc (inc (inc 100)) - - A function bound to a variable and subsequently called by name (evaluates to 103) - - - { x, y }: x + y - - A function that expects a set with required attributes - x and y and concatenates - them - - - { x, y ? "bar" }: x + y - - A function that expects a set with required attribute - x and optional y, using - "bar" as default value for - y - - - - { x, y, ... }: x + y - - A function that expects a set with required attributes - x and y and ignores any - other attributes - - - { x, y } @ args: x + y - - A function that expects a set with required attributes - x and y, and binds the - whole set to args - - - - Built-in functions - - - - import ./foo.nix - - Load and return Nix expression in given file - - - map (x: x + x) [ 1 2 3 ] - - Apply a function to every element of a list (evaluates to [ 2 4 6 ]) - - - - - -
diff --git a/nixos/doc/manual/from_md/configuration/summary.section.xml b/nixos/doc/manual/from_md/configuration/summary.section.xml new file mode 100644 index 000000000000..96a178c4930e --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/summary.section.xml @@ -0,0 +1,332 @@ +
+ Syntax Summary + + Below is a summary of the most important syntactic constructs in the + Nix expression language. It’s not complete. In particular, there are + many other built-in functions. See the + Nix + manual for the rest. + + + + + + + + + Example + + + Description + + + + + + + Basic values + + + + + + + "Hello world" + + + A string + + + + + "${pkgs.bash}/bin/sh" + + + A string containing an expression (expands to + "/nix/store/hash-bash-version/bin/sh") + + + + + true, false + + + Booleans + + + + + 123 + + + An integer + + + + + ./foo.png + + + A path (relative to the containing Nix expression) + + + + + Compound values + + + + + + + { x = 1; y = 2; } + + + A set with attributes named x and + y + + + + + { foo.bar = 1; } + + + A nested set, equivalent to + { foo = { bar = 1; }; } + + + + + rec { x = "foo"; y = x + "bar"; } + + + A recursive set, equivalent to + { x = "foo"; y = "foobar"; } + + + + + [ "foo" "bar" ] + + + A list with two elements + + + + + Operators + + + + + + + "foo" + "bar" + + + String concatenation + + + + + 1 + 2 + + + Integer addition + + + + + "foo" == "f" + "oo" + + + Equality test (evaluates to true) + + + + + "foo" != "bar" + + + Inequality test (evaluates to true) + + + + + !true + + + Boolean negation + + + + + { x = 1; y = 2; }.x + + + Attribute selection (evaluates to 1) + + + + + { x = 1; y = 2; }.z or 3 + + + Attribute selection with default (evaluates to + 3) + + + + + { x = 1; y = 2; } // { z = 3; } + + + Merge two sets (attributes in the right-hand set taking + precedence) + + + + + Control structures + + + + + + + if 1 + 1 == 2 then "yes!" else "no!" + + + Conditional expression + + + + + assert 1 + 1 == 2; "yes!" + + + Assertion check (evaluates to + "yes!"). See + for using assertions in + modules + + + + + let x = "foo"; y = "bar"; in x + y + + + Variable definition + + + + + with pkgs.lib; head [ 1 2 3 ] + + + Add all attributes from the given set to the scope + (evaluates to 1) + + + + + Functions (lambdas) + + + + + + + x: x + 1 + + + A function that expects an integer and returns it increased + by 1 + + + + + (x: x + 1) 100 + + + A function call (evaluates to 101) + + + + + let inc = x: x + 1; in inc (inc (inc 100)) + + + A function bound to a variable and subsequently called by + name (evaluates to 103) + + + + + { x, y }: x + y + + + A function that expects a set with required attributes + x and y and + concatenates them + + + + + { x, y ? "bar" }: x + y + + + A function that expects a set with required attribute + x and optional y, + using "bar" as default value + for y + + + + + { x, y, ... }: x + y + + + A function that expects a set with required attributes + x and y and ignores + any other attributes + + + + + { x, y } @ args: x + y + + + A function that expects a set with required attributes + x and y, and binds the + whole set to args + + + + + Built-in functions + + + + + + + import ./foo.nix + + + Load and return Nix expression in given file + + + + + map (x: x + x) [ 1 2 3 ] + + + Apply a function to every element of a list (evaluates to + [ 2 4 6 ]) + + + + + +
From c10ad53007d228f547026e31742ea7da46140824 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 1 Jul 2021 23:09:53 +0800 Subject: [PATCH 007/167] nixos: nixos/doc/manual/configuration/network-manager.xml to CommonMark --- .../configuration/network-manager.section.md | 42 ++++++++++++++++ .../manual/configuration/network-manager.xml | 48 ------------------ nixos/doc/manual/configuration/networking.xml | 2 +- .../configuration/network-manager.section.xml | 49 +++++++++++++++++++ 4 files changed, 92 insertions(+), 49 deletions(-) create mode 100644 nixos/doc/manual/configuration/network-manager.section.md delete mode 100644 nixos/doc/manual/configuration/network-manager.xml create mode 100644 nixos/doc/manual/from_md/configuration/network-manager.section.xml diff --git a/nixos/doc/manual/configuration/network-manager.section.md b/nixos/doc/manual/configuration/network-manager.section.md new file mode 100644 index 000000000000..f269d5bbd170 --- /dev/null +++ b/nixos/doc/manual/configuration/network-manager.section.md @@ -0,0 +1,42 @@ +# NetworkManager {#sec-networkmanager} + +To facilitate network configuration, some desktop environments use +NetworkManager. You can enable NetworkManager by setting: + +```nix +networking.networkmanager.enable = true; +``` + +some desktop managers (e.g., GNOME) enable NetworkManager automatically +for you. + +All users that should have permission to change network settings must +belong to the `networkmanager` group: + +```nix +users.users.alice.extraGroups = [ "networkmanager" ]; +``` + +NetworkManager is controlled using either `nmcli` or `nmtui` +(curses-based terminal user interface). See their manual pages for +details on their usage. Some desktop environments (GNOME, KDE) have +their own configuration tools for NetworkManager. On XFCE, there is no +configuration tool for NetworkManager by default: by enabling +[`programs.nm-applet.enable`](options.html#opt-programs.nm-applet.enable), the graphical applet will be +installed and will launch automatically when the graphical session is +started. + +::: {.note} +`networking.networkmanager` and `networking.wireless` (WPA Supplicant) +can be used together if desired. To do this you need to instruct +NetworkManager to ignore those interfaces like: + +```nix +networking.networkmanager.unmanaged = [ + "*" "except:type:wwan" "except:type:gsm" +]; +``` + +Refer to the option description for the exact syntax and references to +external documentation. +::: diff --git a/nixos/doc/manual/configuration/network-manager.xml b/nixos/doc/manual/configuration/network-manager.xml deleted file mode 100644 index 94d229fd803f..000000000000 --- a/nixos/doc/manual/configuration/network-manager.xml +++ /dev/null @@ -1,48 +0,0 @@ -
- NetworkManager - - - To facilitate network configuration, some desktop environments use - NetworkManager. You can enable NetworkManager by setting: - - = true; - - some desktop managers (e.g., GNOME) enable NetworkManager automatically for - you. - - - - All users that should have permission to change network settings must belong - to the networkmanager group: - -users.users.alice.extraGroups = [ "networkmanager" ]; - - - - - NetworkManager is controlled using either nmcli or - nmtui (curses-based terminal user interface). See their - manual pages for details on their usage. Some desktop environments (GNOME, - KDE) have their own configuration tools for NetworkManager. On XFCE, there is - no configuration tool for NetworkManager by default: by enabling , the - graphical applet will be installed and will launch automatically when the graphical session is started. - - - - - networking.networkmanager and networking.wireless - (WPA Supplicant) can be used together if desired. To do this you need to instruct - NetworkManager to ignore those interfaces like: - - = [ - "*" "except:type:wwan" "except:type:gsm" -]; - - Refer to the option description for the exact syntax and references to external documentation. - - -
diff --git a/nixos/doc/manual/configuration/networking.xml b/nixos/doc/manual/configuration/networking.xml index 8369e9c9c852..6b078bb3b6cb 100644 --- a/nixos/doc/manual/configuration/networking.xml +++ b/nixos/doc/manual/configuration/networking.xml @@ -8,7 +8,7 @@ This section describes how to configure networking components on your NixOS machine. - + diff --git a/nixos/doc/manual/from_md/configuration/network-manager.section.xml b/nixos/doc/manual/from_md/configuration/network-manager.section.xml new file mode 100644 index 000000000000..fd3f26ab621c --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/network-manager.section.xml @@ -0,0 +1,49 @@ +
+ NetworkManager + + To facilitate network configuration, some desktop environments use + NetworkManager. You can enable NetworkManager by setting: + + +networking.networkmanager.enable = true; + + + some desktop managers (e.g., GNOME) enable NetworkManager + automatically for you. + + + All users that should have permission to change network settings + must belong to the networkmanager group: + + +users.users.alice.extraGroups = [ "networkmanager" ]; + + + NetworkManager is controlled using either nmcli + or nmtui (curses-based terminal user interface). + See their manual pages for details on their usage. Some desktop + environments (GNOME, KDE) have their own configuration tools for + NetworkManager. On XFCE, there is no configuration tool for + NetworkManager by default: by enabling + programs.nm-applet.enable, + the graphical applet will be installed and will launch automatically + when the graphical session is started. + + + + networking.networkmanager and + networking.wireless (WPA Supplicant) can be + used together if desired. To do this you need to instruct + NetworkManager to ignore those interfaces like: + + +networking.networkmanager.unmanaged = [ + "*" "except:type:wwan" "except:type:gsm" +]; + + + Refer to the option description for the exact syntax and + references to external documentation. + + +
From 83fc29ffb90742fb341a24aa27d2ad344b97a754 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 1 Jul 2021 23:10:48 +0800 Subject: [PATCH 008/167] nixos: nixos/doc/manual/configuration/ssh.xml to CommonMark --- nixos/doc/manual/configuration/networking.xml | 2 +- nixos/doc/manual/configuration/ssh.section.md | 19 +++++++++++++ nixos/doc/manual/configuration/ssh.xml | 27 ------------------- .../from_md/configuration/ssh.section.xml | 23 ++++++++++++++++ 4 files changed, 43 insertions(+), 28 deletions(-) create mode 100644 nixos/doc/manual/configuration/ssh.section.md delete mode 100644 nixos/doc/manual/configuration/ssh.xml create mode 100644 nixos/doc/manual/from_md/configuration/ssh.section.xml diff --git a/nixos/doc/manual/configuration/networking.xml b/nixos/doc/manual/configuration/networking.xml index 6b078bb3b6cb..c326785dbe3f 100644 --- a/nixos/doc/manual/configuration/networking.xml +++ b/nixos/doc/manual/configuration/networking.xml @@ -9,7 +9,7 @@ machine. - + diff --git a/nixos/doc/manual/configuration/ssh.section.md b/nixos/doc/manual/configuration/ssh.section.md new file mode 100644 index 000000000000..9390108ad8b2 --- /dev/null +++ b/nixos/doc/manual/configuration/ssh.section.md @@ -0,0 +1,19 @@ +# Secure Shell Access {#sec-ssh} + +Secure shell (SSH) access to your machine can be enabled by setting: + +```nix +services.openssh.enable = true; +``` + +By default, root logins using a password are disallowed. They can be +disabled entirely by setting +[`services.openssh.permitRootLogin`](options.html#opt-services.openssh.permitRootLogin) to `"no"`. + +You can declaratively specify authorised RSA/DSA public keys for a user +as follows: + +```nix +users.users.alice.openssh.authorizedKeys.keys = + [ "ssh-dss AAAAB3NzaC1kc3MAAACBAPIkGWVEt4..." ]; +``` diff --git a/nixos/doc/manual/configuration/ssh.xml b/nixos/doc/manual/configuration/ssh.xml deleted file mode 100644 index 95ad3edff935..000000000000 --- a/nixos/doc/manual/configuration/ssh.xml +++ /dev/null @@ -1,27 +0,0 @@ -
- Secure Shell Access - - - Secure shell (SSH) access to your machine can be enabled by setting: - - = true; - - By default, root logins using a password are disallowed. They can be disabled - entirely by setting to - "no". - - - - You can declaratively specify authorised RSA/DSA public keys for a user as - follows: - - -users.users.alice.openssh.authorizedKeys.keys = - [ "ssh-dss AAAAB3NzaC1kc3MAAACBAPIkGWVEt4..." ]; - - -
diff --git a/nixos/doc/manual/from_md/configuration/ssh.section.xml b/nixos/doc/manual/from_md/configuration/ssh.section.xml new file mode 100644 index 000000000000..46046064535e --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/ssh.section.xml @@ -0,0 +1,23 @@ +
+ Secure Shell Access + + Secure shell (SSH) access to your machine can be enabled by setting: + + +services.openssh.enable = true; + + + By default, root logins using a password are disallowed. They can be + disabled entirely by setting + services.openssh.permitRootLogin + to "no". + + + You can declaratively specify authorised RSA/DSA public keys for a + user as follows: + + +users.users.alice.openssh.authorizedKeys.keys = + [ "ssh-dss AAAAB3NzaC1kc3MAAACBAPIkGWVEt4..." ]; + +
From 3d423e2b1563ef4d38d0bb190935a26b58409b67 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 1 Jul 2021 23:11:54 +0800 Subject: [PATCH 009/167] nixos: nixos/doc/manual/configuration/ipv4-config.xml to CommonMark --- .../configuration/ipv4-config.section.md | 35 +++++++++++++++ .../doc/manual/configuration/ipv4-config.xml | 43 ------------------- nixos/doc/manual/configuration/networking.xml | 2 +- .../configuration/ipv4-config.section.xml | 43 +++++++++++++++++++ 4 files changed, 79 insertions(+), 44 deletions(-) create mode 100644 nixos/doc/manual/configuration/ipv4-config.section.md delete mode 100644 nixos/doc/manual/configuration/ipv4-config.xml create mode 100644 nixos/doc/manual/from_md/configuration/ipv4-config.section.xml diff --git a/nixos/doc/manual/configuration/ipv4-config.section.md b/nixos/doc/manual/configuration/ipv4-config.section.md new file mode 100644 index 000000000000..8a870df60945 --- /dev/null +++ b/nixos/doc/manual/configuration/ipv4-config.section.md @@ -0,0 +1,35 @@ +# IPv4 Configuration {#sec-ipv4} + +By default, NixOS uses DHCP (specifically, `dhcpcd`) to automatically +configure network interfaces. However, you can configure an interface +manually as follows: + +```nix +networking.interfaces.eth0.ipv4.addresses = [ { + address = "192.168.1.2"; + prefixLength = 24; +} ]; +``` + +Typically you'll also want to set a default gateway and set of name +servers: + +```nix +networking.defaultGateway = "192.168.1.1"; +networking.nameservers = [ "8.8.8.8" ]; +``` + +::: {.note} +Statically configured interfaces are set up by the systemd service +`interface-name-cfg.service`. The default gateway and name server +configuration is performed by `network-setup.service`. +::: + +The host name is set using [`networking.hostName`](options.html#opt-networking.hostName): + +```nix +networking.hostName = "cartman"; +``` + +The default host name is `nixos`. Set it to the empty string (`""`) to +allow the DHCP server to provide the host name. diff --git a/nixos/doc/manual/configuration/ipv4-config.xml b/nixos/doc/manual/configuration/ipv4-config.xml deleted file mode 100644 index 884becf0979a..000000000000 --- a/nixos/doc/manual/configuration/ipv4-config.xml +++ /dev/null @@ -1,43 +0,0 @@ -
- IPv4 Configuration - - - By default, NixOS uses DHCP (specifically, dhcpcd) to - automatically configure network interfaces. However, you can configure an - interface manually as follows: - -networking.interfaces.eth0.ipv4.addresses = [ { - address = "192.168.1.2"; - prefixLength = 24; -} ]; - - Typically you’ll also want to set a default gateway and set of name - servers: - - = "192.168.1.1"; - = [ "8.8.8.8" ]; - - - - - - Statically configured interfaces are set up by the systemd service - interface-name-cfg.service. - The default gateway and name server configuration is performed by - network-setup.service. - - - - - The host name is set using : - - = "cartman"; - - The default host name is nixos. Set it to the empty string - ("") to allow the DHCP server to provide the host name. - -
diff --git a/nixos/doc/manual/configuration/networking.xml b/nixos/doc/manual/configuration/networking.xml index c326785dbe3f..6203d2ba8dca 100644 --- a/nixos/doc/manual/configuration/networking.xml +++ b/nixos/doc/manual/configuration/networking.xml @@ -10,7 +10,7 @@ - + diff --git a/nixos/doc/manual/from_md/configuration/ipv4-config.section.xml b/nixos/doc/manual/from_md/configuration/ipv4-config.section.xml new file mode 100644 index 000000000000..06a70b65cfbc --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/ipv4-config.section.xml @@ -0,0 +1,43 @@ +
+ IPv4 Configuration + + By default, NixOS uses DHCP (specifically, + dhcpcd) to automatically configure network + interfaces. However, you can configure an interface manually as + follows: + + +networking.interfaces.eth0.ipv4.addresses = [ { + address = "192.168.1.2"; + prefixLength = 24; +} ]; + + + Typically you’ll also want to set a default gateway and set of name + servers: + + +networking.defaultGateway = "192.168.1.1"; +networking.nameservers = [ "8.8.8.8" ]; + + + + Statically configured interfaces are set up by the systemd service + interface-name-cfg.service. The default gateway + and name server configuration is performed by + network-setup.service. + + + + The host name is set using + networking.hostName: + + +networking.hostName = "cartman"; + + + The default host name is nixos. Set it to the + empty string ("") to allow the DHCP + server to provide the host name. + +
From dbd2d379da8aafc41a2bdaff0a7226dd88527b9e Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 1 Jul 2021 23:12:39 +0800 Subject: [PATCH 010/167] nixos: nixos/doc/manual/configuration/ipv6-config.xml to CommonMark --- .../configuration/ipv6-config.section.md | 42 +++++++++++++++ .../doc/manual/configuration/ipv6-config.xml | 54 ------------------- nixos/doc/manual/configuration/networking.xml | 2 +- .../configuration/ipv6-config.section.xml | 47 ++++++++++++++++ 4 files changed, 90 insertions(+), 55 deletions(-) create mode 100644 nixos/doc/manual/configuration/ipv6-config.section.md delete mode 100644 nixos/doc/manual/configuration/ipv6-config.xml create mode 100644 nixos/doc/manual/from_md/configuration/ipv6-config.section.xml diff --git a/nixos/doc/manual/configuration/ipv6-config.section.md b/nixos/doc/manual/configuration/ipv6-config.section.md new file mode 100644 index 000000000000..6d51a21aa64a --- /dev/null +++ b/nixos/doc/manual/configuration/ipv6-config.section.md @@ -0,0 +1,42 @@ +# IPv6 Configuration {#sec-ipv6} + +IPv6 is enabled by default. Stateless address autoconfiguration is used +to automatically assign IPv6 addresses to all interfaces, and Privacy +Extensions (RFC 4946) are enabled by default. You can adjust the default +for this by setting [`networking.tempAddresses`](options.html#opt-networking.tempAddresses). This option +may be overridden on a per-interface basis by +[`networking.interfaces..tempAddress`](options.html#opt-networking.interfaces._name_.tempAddress). You can disable +IPv6 support globally by setting: + +```nix +networking.enableIPv6 = false; +``` + +You can disable IPv6 on a single interface using a normal sysctl (in +this example, we use interface `eth0`): + +```nix +boot.kernel.sysctl."net.ipv6.conf.eth0.disable_ipv6" = true; +``` + +As with IPv4 networking interfaces are automatically configured via +DHCPv6. You can configure an interface manually: + +```nix +networking.interfaces.eth0.ipv6.addresses = [ { + address = "fe00:aa:bb:cc::2"; + prefixLength = 64; +} ]; +``` + +For configuring a gateway, optionally with explicitly specified +interface: + +```nix +networking.defaultGateway6 = { + address = "fe00::1"; + interface = "enp0s3"; +}; +``` + +See [](#sec-ipv4) for similar examples and additional information. diff --git a/nixos/doc/manual/configuration/ipv6-config.xml b/nixos/doc/manual/configuration/ipv6-config.xml deleted file mode 100644 index 45e85dbf3dfd..000000000000 --- a/nixos/doc/manual/configuration/ipv6-config.xml +++ /dev/null @@ -1,54 +0,0 @@ -
- IPv6 Configuration - - - IPv6 is enabled by default. Stateless address autoconfiguration is used to - automatically assign IPv6 addresses to all interfaces, and Privacy - Extensions (RFC 4946) are enabled by default. You can adjust the default - for this by setting . - This option may be overridden on a per-interface basis by - . - You can disable IPv6 support globally by setting: - - = false; - - - - - You can disable IPv6 on a single interface using a normal sysctl (in this - example, we use interface eth0): - -."net.ipv6.conf.eth0.disable_ipv6" = true; - - - - - As with IPv4 networking interfaces are automatically configured via DHCPv6. - You can configure an interface manually: - -networking.interfaces.eth0.ipv6.addresses = [ { - address = "fe00:aa:bb:cc::2"; - prefixLength = 64; -} ]; - - - - - For configuring a gateway, optionally with explicitly specified interface: - - = { - address = "fe00::1"; - interface = "enp0s3"; -}; - - - - - See for similar examples and additional - information. - -
diff --git a/nixos/doc/manual/configuration/networking.xml b/nixos/doc/manual/configuration/networking.xml index 6203d2ba8dca..102659224327 100644 --- a/nixos/doc/manual/configuration/networking.xml +++ b/nixos/doc/manual/configuration/networking.xml @@ -11,7 +11,7 @@ - + diff --git a/nixos/doc/manual/from_md/configuration/ipv6-config.section.xml b/nixos/doc/manual/from_md/configuration/ipv6-config.section.xml new file mode 100644 index 000000000000..ac3c2cd4b21c --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/ipv6-config.section.xml @@ -0,0 +1,47 @@ +
+ IPv6 Configuration + + IPv6 is enabled by default. Stateless address autoconfiguration is + used to automatically assign IPv6 addresses to all interfaces, and + Privacy Extensions (RFC 4946) are enabled by default. You can adjust + the default for this by setting + networking.tempAddresses. + This option may be overridden on a per-interface basis by + networking.interfaces.<name>.tempAddress. + You can disable IPv6 support globally by setting: + + +networking.enableIPv6 = false; + + + You can disable IPv6 on a single interface using a normal sysctl (in + this example, we use interface eth0): + + +boot.kernel.sysctl."net.ipv6.conf.eth0.disable_ipv6" = true; + + + As with IPv4 networking interfaces are automatically configured via + DHCPv6. You can configure an interface manually: + + +networking.interfaces.eth0.ipv6.addresses = [ { + address = "fe00:aa:bb:cc::2"; + prefixLength = 64; +} ]; + + + For configuring a gateway, optionally with explicitly specified + interface: + + +networking.defaultGateway6 = { + address = "fe00::1"; + interface = "enp0s3"; +}; + + + See for similar examples and additional + information. + +
From 97bfa927fae7362f8c11f70abe6f71dc7c31aa40 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 1 Jul 2021 23:13:41 +0800 Subject: [PATCH 011/167] nixos: nixos/doc/manual/configuration/firewall.xml to CommonMark --- .../manual/configuration/firewall.section.md | 32 +++++++++++++++ nixos/doc/manual/configuration/firewall.xml | 37 ------------------ nixos/doc/manual/configuration/networking.xml | 2 +- .../configuration/firewall.section.xml | 39 +++++++++++++++++++ 4 files changed, 72 insertions(+), 38 deletions(-) create mode 100644 nixos/doc/manual/configuration/firewall.section.md delete mode 100644 nixos/doc/manual/configuration/firewall.xml create mode 100644 nixos/doc/manual/from_md/configuration/firewall.section.xml diff --git a/nixos/doc/manual/configuration/firewall.section.md b/nixos/doc/manual/configuration/firewall.section.md new file mode 100644 index 000000000000..40f7fb7c6d51 --- /dev/null +++ b/nixos/doc/manual/configuration/firewall.section.md @@ -0,0 +1,32 @@ +# Firewall {#sec-firewall} + +NixOS has a simple stateful firewall that blocks incoming connections +and other unexpected packets. The firewall applies to both IPv4 and IPv6 +traffic. It is enabled by default. It can be disabled as follows: + +```nix +networking.firewall.enable = false; +``` + +If the firewall is enabled, you can open specific TCP ports to the +outside world: + +```nix +networking.firewall.allowedTCPPorts = [ 80 443 ]; +``` + +Note that TCP port 22 (ssh) is opened automatically if the SSH daemon is +enabled (`services.openssh.enable = true`). UDP ports can be opened through +[`networking.firewall.allowedUDPPorts`](options.html#opt-networking.firewall.allowedUDPPorts). + +To open ranges of TCP ports: + +```nix +networking.firewall.allowedTCPPortRanges = [ + { from = 4000; to = 4007; } + { from = 8000; to = 8010; } +]; +``` + +Similarly, UDP port ranges can be opened through +[`networking.firewall.allowedUDPPortRanges`](options.html#opt-networking.firewall.allowedUDPPortRanges). diff --git a/nixos/doc/manual/configuration/firewall.xml b/nixos/doc/manual/configuration/firewall.xml deleted file mode 100644 index 47a19ac82c0f..000000000000 --- a/nixos/doc/manual/configuration/firewall.xml +++ /dev/null @@ -1,37 +0,0 @@ -
- Firewall - - - NixOS has a simple stateful firewall that blocks incoming connections and - other unexpected packets. The firewall applies to both IPv4 and IPv6 traffic. - It is enabled by default. It can be disabled as follows: - - = false; - - If the firewall is enabled, you can open specific TCP ports to the outside - world: - - = [ 80 443 ]; - - Note that TCP port 22 (ssh) is opened automatically if the SSH daemon is - enabled (). UDP ports can be opened through - . - - - - To open ranges of TCP ports: - - = [ - { from = 4000; to = 4007; } - { from = 8000; to = 8010; } -]; - - Similarly, UDP port ranges can be opened through - . - -
diff --git a/nixos/doc/manual/configuration/networking.xml b/nixos/doc/manual/configuration/networking.xml index 102659224327..c24f87afc57e 100644 --- a/nixos/doc/manual/configuration/networking.xml +++ b/nixos/doc/manual/configuration/networking.xml @@ -12,7 +12,7 @@ - + diff --git a/nixos/doc/manual/from_md/configuration/firewall.section.xml b/nixos/doc/manual/from_md/configuration/firewall.section.xml new file mode 100644 index 000000000000..ebb121f75ffb --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/firewall.section.xml @@ -0,0 +1,39 @@ +
+ Firewall + + NixOS has a simple stateful firewall that blocks incoming + connections and other unexpected packets. The firewall applies to + both IPv4 and IPv6 traffic. It is enabled by default. It can be + disabled as follows: + + +networking.firewall.enable = false; + + + If the firewall is enabled, you can open specific TCP ports to the + outside world: + + +networking.firewall.allowedTCPPorts = [ 80 443 ]; + + + Note that TCP port 22 (ssh) is opened automatically if the SSH + daemon is enabled + (services.openssh.enable = true). UDP ports can + be opened through + networking.firewall.allowedUDPPorts. + + + To open ranges of TCP ports: + + +networking.firewall.allowedTCPPortRanges = [ + { from = 4000; to = 4007; } + { from = 8000; to = 8010; } +]; + + + Similarly, UDP port ranges can be opened through + networking.firewall.allowedUDPPortRanges. + +
From 54419f6e59c4fa0f39bc0cf367b7d690b9a4d40b Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 1 Jul 2021 23:14:20 +0800 Subject: [PATCH 012/167] nixos: nixos/doc/manual/configuration/wireless.xml to CommonMark --- nixos/doc/manual/configuration/networking.xml | 2 +- .../manual/configuration/wireless.section.md | 67 +++++++++++++++++ nixos/doc/manual/configuration/wireless.xml | 70 ------------------ .../configuration/wireless.section.xml | 73 +++++++++++++++++++ 4 files changed, 141 insertions(+), 71 deletions(-) create mode 100644 nixos/doc/manual/configuration/wireless.section.md delete mode 100644 nixos/doc/manual/configuration/wireless.xml create mode 100644 nixos/doc/manual/from_md/configuration/wireless.section.xml diff --git a/nixos/doc/manual/configuration/networking.xml b/nixos/doc/manual/configuration/networking.xml index c24f87afc57e..f5587195f1f1 100644 --- a/nixos/doc/manual/configuration/networking.xml +++ b/nixos/doc/manual/configuration/networking.xml @@ -13,7 +13,7 @@ - + diff --git a/nixos/doc/manual/configuration/wireless.section.md b/nixos/doc/manual/configuration/wireless.section.md new file mode 100644 index 000000000000..6b223d843ac5 --- /dev/null +++ b/nixos/doc/manual/configuration/wireless.section.md @@ -0,0 +1,67 @@ +# Wireless Networks {#sec-wireless} + +For a desktop installation using NetworkManager (e.g., GNOME), you just +have to make sure the user is in the `networkmanager` group and you can +skip the rest of this section on wireless networks. + +NixOS will start wpa_supplicant for you if you enable this setting: + +```nix +networking.wireless.enable = true; +``` + +NixOS lets you specify networks for wpa_supplicant declaratively: + +```nix +networking.wireless.networks = { + echelon = { # SSID with no spaces or special characters + psk = "abcdefgh"; + }; + "echelon's AP" = { # SSID with spaces and/or special characters + psk = "ijklmnop"; + }; + echelon = { # Hidden SSID + hidden = true; + psk = "qrstuvwx"; + }; + free.wifi = {}; # Public wireless network +}; +``` + +Be aware that keys will be written to the nix store in plaintext! When +no networks are set, it will default to using a configuration file at +`/etc/wpa_supplicant.conf`. You should edit this file yourself to define +wireless networks, WPA keys and so on (see wpa_supplicant.conf(5)). + +If you are using WPA2 you can generate pskRaw key using +`wpa_passphrase`: + +```ShellSession +$ wpa_passphrase ESSID PSK +network={ + ssid="echelon" + #psk="abcdefgh" + psk=dca6d6ed41f4ab5a984c9f55f6f66d4efdc720ebf66959810f4329bb391c5435 +} +``` + +```nix +networking.wireless.networks = { + echelon = { + pskRaw = "dca6d6ed41f4ab5a984c9f55f6f66d4efdc720ebf66959810f4329bb391c5435"; + }; +} +``` + +or you can use it to directly generate the `wpa_supplicant.conf`: + +```ShellSession +# wpa_passphrase ESSID PSK > /etc/wpa_supplicant.conf +``` + +After you have edited the `wpa_supplicant.conf`, you need to restart the +wpa_supplicant service. + +```ShellSession +# systemctl restart wpa_supplicant.service +``` diff --git a/nixos/doc/manual/configuration/wireless.xml b/nixos/doc/manual/configuration/wireless.xml deleted file mode 100644 index 247d29d58314..000000000000 --- a/nixos/doc/manual/configuration/wireless.xml +++ /dev/null @@ -1,70 +0,0 @@ -
- Wireless Networks - - - For a desktop installation using NetworkManager (e.g., GNOME), you just have - to make sure the user is in the networkmanager group and you can - skip the rest of this section on wireless networks. - - - - NixOS will start wpa_supplicant for you if you enable this setting: - - = true; - - NixOS lets you specify networks for wpa_supplicant declaratively: - - = { - echelon = { # SSID with no spaces or special characters - psk = "abcdefgh"; - }; - "echelon's AP" = { # SSID with spaces and/or special characters - psk = "ijklmnop"; - }; - echelon = { # Hidden SSID - hidden = true; - psk = "qrstuvwx"; - }; - free.wifi = {}; # Public wireless network -}; - - Be aware that keys will be written to the nix store in plaintext! When no - networks are set, it will default to using a configuration file at - /etc/wpa_supplicant.conf. You should edit this file - yourself to define wireless networks, WPA keys and so on (see - wpa_supplicant.conf - 5 ). - - - - If you are using WPA2 you can generate pskRaw key using - wpa_passphrase: - -$ wpa_passphrase ESSID PSK -network={ - ssid="echelon" - #psk="abcdefgh" - psk=dca6d6ed41f4ab5a984c9f55f6f66d4efdc720ebf66959810f4329bb391c5435 -} - - - = { - echelon = { - pskRaw = "dca6d6ed41f4ab5a984c9f55f6f66d4efdc720ebf66959810f4329bb391c5435"; - }; -} - - or you can use it to directly generate the - wpa_supplicant.conf: - -# wpa_passphrase ESSID PSK > /etc/wpa_supplicant.conf - After you have edited the wpa_supplicant.conf, you need to - restart the wpa_supplicant service. - -# systemctl restart wpa_supplicant.service - -
diff --git a/nixos/doc/manual/from_md/configuration/wireless.section.xml b/nixos/doc/manual/from_md/configuration/wireless.section.xml new file mode 100644 index 000000000000..82bc20135157 --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/wireless.section.xml @@ -0,0 +1,73 @@ +
+ Wireless Networks + + For a desktop installation using NetworkManager (e.g., GNOME), you + just have to make sure the user is in the + networkmanager group and you can skip the rest of + this section on wireless networks. + + + NixOS will start wpa_supplicant for you if you enable this setting: + + +networking.wireless.enable = true; + + + NixOS lets you specify networks for wpa_supplicant declaratively: + + +networking.wireless.networks = { + echelon = { # SSID with no spaces or special characters + psk = "abcdefgh"; + }; + "echelon's AP" = { # SSID with spaces and/or special characters + psk = "ijklmnop"; + }; + echelon = { # Hidden SSID + hidden = true; + psk = "qrstuvwx"; + }; + free.wifi = {}; # Public wireless network +}; + + + Be aware that keys will be written to the nix store in plaintext! + When no networks are set, it will default to using a configuration + file at /etc/wpa_supplicant.conf. You should edit + this file yourself to define wireless networks, WPA keys and so on + (see wpa_supplicant.conf(5)). + + + If you are using WPA2 you can generate pskRaw key using + wpa_passphrase: + + +$ wpa_passphrase ESSID PSK +network={ + ssid="echelon" + #psk="abcdefgh" + psk=dca6d6ed41f4ab5a984c9f55f6f66d4efdc720ebf66959810f4329bb391c5435 +} + + +networking.wireless.networks = { + echelon = { + pskRaw = "dca6d6ed41f4ab5a984c9f55f6f66d4efdc720ebf66959810f4329bb391c5435"; + }; +} + + + or you can use it to directly generate the + wpa_supplicant.conf: + + +# wpa_passphrase ESSID PSK > /etc/wpa_supplicant.conf + + + After you have edited the wpa_supplicant.conf, + you need to restart the wpa_supplicant service. + + +# systemctl restart wpa_supplicant.service + +
From 55aa106c0b7fbb9f50b3bc791749fcb9822bb971 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 1 Jul 2021 23:15:04 +0800 Subject: [PATCH 013/167] nixos: nixos/doc/manual/configuration/ad-hoc-network-config.xml to CommonMark --- .../ad-hoc-network-config.section.md | 13 ++++++++++++ .../configuration/ad-hoc-network-config.xml | 20 ------------------- nixos/doc/manual/configuration/networking.xml | 2 +- .../ad-hoc-network-config.section.xml | 17 ++++++++++++++++ 4 files changed, 31 insertions(+), 21 deletions(-) create mode 100644 nixos/doc/manual/configuration/ad-hoc-network-config.section.md delete mode 100644 nixos/doc/manual/configuration/ad-hoc-network-config.xml create mode 100644 nixos/doc/manual/from_md/configuration/ad-hoc-network-config.section.xml diff --git a/nixos/doc/manual/configuration/ad-hoc-network-config.section.md b/nixos/doc/manual/configuration/ad-hoc-network-config.section.md new file mode 100644 index 000000000000..9131f42842b7 --- /dev/null +++ b/nixos/doc/manual/configuration/ad-hoc-network-config.section.md @@ -0,0 +1,13 @@ +# Ad-Hoc Configuration {#ad-hoc-network-config} + +You can use [`networking.localCommands`](options.html#opt-networking.localCommands) to +specify shell commands to be run at the end of `network-setup.service`. This +is useful for doing network configuration not covered by the existing NixOS +modules. For instance, to statically configure an IPv6 address: + +```nix +networking.localCommands = + '' + ip -6 addr add 2001:610:685:1::1/64 dev eth0 + ''; +``` diff --git a/nixos/doc/manual/configuration/ad-hoc-network-config.xml b/nixos/doc/manual/configuration/ad-hoc-network-config.xml deleted file mode 100644 index 00e595c7cb7f..000000000000 --- a/nixos/doc/manual/configuration/ad-hoc-network-config.xml +++ /dev/null @@ -1,20 +0,0 @@ -
- Ad-Hoc Configuration - - - You can use to specify shell - commands to be run at the end of network-setup.service. - This is useful for doing network configuration not covered by the existing - NixOS modules. For instance, to statically configure an IPv6 address: - - = - '' - ip -6 addr add 2001:610:685:1::1/64 dev eth0 - ''; - - -
diff --git a/nixos/doc/manual/configuration/networking.xml b/nixos/doc/manual/configuration/networking.xml index f5587195f1f1..d48536bd48c6 100644 --- a/nixos/doc/manual/configuration/networking.xml +++ b/nixos/doc/manual/configuration/networking.xml @@ -14,7 +14,7 @@ - + diff --git a/nixos/doc/manual/from_md/configuration/ad-hoc-network-config.section.xml b/nixos/doc/manual/from_md/configuration/ad-hoc-network-config.section.xml new file mode 100644 index 000000000000..0424642b978c --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/ad-hoc-network-config.section.xml @@ -0,0 +1,17 @@ +
+ Ad-Hoc Configuration + + You can use + networking.localCommands + to specify shell commands to be run at the end of + network-setup.service. This is useful for doing + network configuration not covered by the existing NixOS modules. For + instance, to statically configure an IPv6 address: + + +networking.localCommands = + '' + ip -6 addr add 2001:610:685:1::1/64 dev eth0 + ''; + +
From e602771722d1820620f0e5cbecc821d561684a71 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 1 Jul 2021 23:16:05 +0800 Subject: [PATCH 014/167] nixos: nixos/doc/manual/configuration/renaming-interfaces.xml to CommonMark --- nixos/doc/manual/configuration/networking.xml | 2 +- .../renaming-interfaces.section.md | 51 ++++++++++++++ .../configuration/renaming-interfaces.xml | 67 ------------------- .../renaming-interfaces.section.xml | 62 +++++++++++++++++ 4 files changed, 114 insertions(+), 68 deletions(-) create mode 100644 nixos/doc/manual/configuration/renaming-interfaces.section.md delete mode 100644 nixos/doc/manual/configuration/renaming-interfaces.xml create mode 100644 nixos/doc/manual/from_md/configuration/renaming-interfaces.section.xml diff --git a/nixos/doc/manual/configuration/networking.xml b/nixos/doc/manual/configuration/networking.xml index d48536bd48c6..5dd0278569b9 100644 --- a/nixos/doc/manual/configuration/networking.xml +++ b/nixos/doc/manual/configuration/networking.xml @@ -15,6 +15,6 @@ - + diff --git a/nixos/doc/manual/configuration/renaming-interfaces.section.md b/nixos/doc/manual/configuration/renaming-interfaces.section.md new file mode 100644 index 000000000000..affa1e0147da --- /dev/null +++ b/nixos/doc/manual/configuration/renaming-interfaces.section.md @@ -0,0 +1,51 @@ +# Renaming network interfaces {#sec-rename-ifs} + +NixOS uses the udev [predictable naming +scheme](https://systemd.io/PREDICTABLE_INTERFACE_NAMES/) to assign names +to network interfaces. This means that by default cards are not given +the traditional names like `eth0` or `eth1`, whose order can change +unpredictably across reboots. Instead, relying on physical locations and +firmware information, the scheme produces names like `ens1`, `enp2s0`, +etc. + +These names are predictable but less memorable and not necessarily +stable: for example installing new hardware or changing firmware +settings can result in a [name +change](https://github.com/systemd/systemd/issues/3715#issue-165347602). +If this is undesirable, for example if you have a single ethernet card, +you can revert to the traditional scheme by setting +[`networking.usePredictableInterfaceNames`](options.html#opt-networking.usePredictableInterfaceNames) +to `false`. + +## Assigning custom names {#sec-custom-ifnames} + +In case there are multiple interfaces of the same type, it's better to +assign custom names based on the device hardware address. For example, +we assign the name `wan` to the interface with MAC address +`52:54:00:12:01:01` using a netword link unit: + +```nix +systemd.network.links."10-wan" = { + matchConfig.MACAddress = "52:54:00:12:01:01"; + linkConfig.Name = "wan"; +}; +``` + +Note that links are directly read by udev, *not networkd*, and will work +even if networkd is disabled. + +Alternatively, we can use a plain old udev rule: + +```nix +services.udev.initrdRules = '' + SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", \ + ATTR{address}=="52:54:00:12:01:01", KERNEL=="eth*", NAME="wan" +''; +``` + +::: {.warning} +The rule must be installed in the initrd using +`services.udev.initrdRules`, not the usual `services.udev.extraRules` +option. This is to avoid race conditions with other programs controlling +the interface. +::: diff --git a/nixos/doc/manual/configuration/renaming-interfaces.xml b/nixos/doc/manual/configuration/renaming-interfaces.xml deleted file mode 100644 index d760bb3a4dac..000000000000 --- a/nixos/doc/manual/configuration/renaming-interfaces.xml +++ /dev/null @@ -1,67 +0,0 @@ -
- Renaming network interfaces - - - NixOS uses the udev - predictable naming scheme - to assign names to network interfaces. This means that by default - cards are not given the traditional names like - eth0 or eth1, whose order can - change unpredictably across reboots. Instead, relying on physical - locations and firmware information, the scheme produces names like - ens1, enp2s0, etc. - - - - These names are predictable but less memorable and not necessarily - stable: for example installing new hardware or changing firmware - settings can result in a - name change. - If this is undesirable, for example if you have a single ethernet - card, you can revert to the traditional scheme by setting - to - false. - - -
- Assigning custom names - - In case there are multiple interfaces of the same type, it’s better to - assign custom names based on the device hardware address. For - example, we assign the name wan to the interface - with MAC address 52:54:00:12:01:01 using a - netword link unit: - - - systemd.network.links."10-wan" = { - matchConfig.MACAddress = "52:54:00:12:01:01"; - linkConfig.Name = "wan"; - }; - - - Note that links are directly read by udev, not networkd, - and will work even if networkd is disabled. - - - Alternatively, we can use a plain old udev rule: - - - services.udev.initrdRules = '' - SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", \ - ATTR{address}=="52:54:00:12:01:01", KERNEL=="eth*", NAME="wan" - ''; - - - - The rule must be installed in the initrd using - services.udev.initrdRules, not the usual - services.udev.extraRules option. This is to avoid race - conditions with other programs controlling the interface. - -
- -
diff --git a/nixos/doc/manual/from_md/configuration/renaming-interfaces.section.xml b/nixos/doc/manual/from_md/configuration/renaming-interfaces.section.xml new file mode 100644 index 000000000000..80c162ca85e0 --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/renaming-interfaces.section.xml @@ -0,0 +1,62 @@ +
+ Renaming network interfaces + + NixOS uses the udev + predictable + naming scheme to assign names to network interfaces. This + means that by default cards are not given the traditional names like + eth0 or eth1, whose order can + change unpredictably across reboots. Instead, relying on physical + locations and firmware information, the scheme produces names like + ens1, enp2s0, etc. + + + These names are predictable but less memorable and not necessarily + stable: for example installing new hardware or changing firmware + settings can result in a + name + change. If this is undesirable, for example if you have a + single ethernet card, you can revert to the traditional scheme by + setting + networking.usePredictableInterfaceNames + to false. + +
+ Assigning custom names + + In case there are multiple interfaces of the same type, it’s + better to assign custom names based on the device hardware + address. For example, we assign the name wan to + the interface with MAC address + 52:54:00:12:01:01 using a netword link unit: + + +systemd.network.links."10-wan" = { + matchConfig.MACAddress = "52:54:00:12:01:01"; + linkConfig.Name = "wan"; +}; + + + Note that links are directly read by udev, not + networkd, and will work even if networkd is disabled. + + + Alternatively, we can use a plain old udev rule: + + +services.udev.initrdRules = '' + SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", \ + ATTR{address}=="52:54:00:12:01:01", KERNEL=="eth*", NAME="wan" +''; + + + + The rule must be installed in the initrd using + services.udev.initrdRules, not the usual + services.udev.extraRules option. This is to + avoid race conditions with other programs controlling the + interface. + + +
+
From 0e7b4e60a846af1d4487ebe1218f8e07fffaa89b Mon Sep 17 00:00:00 2001 From: heisenberg33 <45217677+heisenberg33@users.noreply.github.com> Date: Thu, 1 Jul 2021 13:03:03 -0700 Subject: [PATCH 015/167] Fix default pager environment Causes `dmesg -H` (aka `dmesg --human`) to actually work. --- nixos/modules/programs/environment.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix index 8877356360a5..39010323f61e 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -18,7 +18,8 @@ in environment.variables = { NIXPKGS_CONFIG = "/etc/nix/nixpkgs-config.nix"; - PAGER = mkDefault "less -R"; + PAGER = mkDefault "less"; + LESS = mkDefault "-R"; EDITOR = mkDefault "nano"; XDG_CONFIG_DIRS = [ "/etc/xdg" ]; # needs to be before profile-relative paths to allow changes through environment.etc }; From 79134b77aa823231b0fab75f0de366acb773ee19 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 2 Jul 2021 09:27:20 +0800 Subject: [PATCH 016/167] nixos: nixos/doc/manual/configuration/luks-file-systems.xml to CommonMark --- .../doc/manual/configuration/file-systems.xml | 2 +- .../luks-file-systems.section.md | 77 +++++++++++++++++ .../configuration/luks-file-systems.xml | 78 ----------------- .../luks-file-systems.section.xml | 84 +++++++++++++++++++ 4 files changed, 162 insertions(+), 79 deletions(-) create mode 100644 nixos/doc/manual/configuration/luks-file-systems.section.md delete mode 100644 nixos/doc/manual/configuration/luks-file-systems.xml create mode 100644 nixos/doc/manual/from_md/configuration/luks-file-systems.section.xml diff --git a/nixos/doc/manual/configuration/file-systems.xml b/nixos/doc/manual/configuration/file-systems.xml index 42c59844ff4a..908b5d6c4681 100644 --- a/nixos/doc/manual/configuration/file-systems.xml +++ b/nixos/doc/manual/configuration/file-systems.xml @@ -53,6 +53,6 @@ "nofail" ];. - + diff --git a/nixos/doc/manual/configuration/luks-file-systems.section.md b/nixos/doc/manual/configuration/luks-file-systems.section.md new file mode 100644 index 000000000000..b5d0407d1659 --- /dev/null +++ b/nixos/doc/manual/configuration/luks-file-systems.section.md @@ -0,0 +1,77 @@ +# LUKS-Encrypted File Systems {#sec-luks-file-systems} + +NixOS supports file systems that are encrypted using *LUKS* (Linux +Unified Key Setup). For example, here is how you create an encrypted +Ext4 file system on the device +`/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d`: + +```ShellSession +# cryptsetup luksFormat /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d + +WARNING! +======== +This will overwrite data on /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d irrevocably. + +Are you sure? (Type uppercase yes): YES +Enter LUKS passphrase: *** +Verify passphrase: *** + +# cryptsetup luksOpen /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d crypted +Enter passphrase for /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d: *** + +# mkfs.ext4 /dev/mapper/crypted +``` + +The LUKS volume should be automatically picked up by +`nixos-generate-config`, but you might want to verify that your +`hardware-configuration.nix` looks correct. To manually ensure that the +system is automatically mounted at boot time as `/`, add the following +to `configuration.nix`: + +```nix +boot.initrd.luks.devices.crypted.device = "/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d"; +fileSystems."/".device = "/dev/mapper/crypted"; +``` + +Should grub be used as bootloader, and `/boot` is located on an +encrypted partition, it is necessary to add the following grub option: + +```nix +boot.loader.grub.enableCryptodisk = true; +``` + +## FIDO2 {#sec-luks-file-systems-fido2} + +NixOS also supports unlocking your LUKS-Encrypted file system using a +FIDO2 compatible token. In the following example, we will create a new +FIDO2 credential and add it as a new key to our existing device +`/dev/sda2`: + +```ShellSession +# export FIDO2_LABEL="/dev/sda2 @ $HOSTNAME" +# fido2luks credential "$FIDO2_LABEL" +f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7 + +# fido2luks -i add-key /dev/sda2 f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7 +Password: +Password (again): +Old password: +Old password (again): +Added to key to device /dev/sda2, slot: 2 +``` + +To ensure that this file system is decrypted using the FIDO2 compatible +key, add the following to `configuration.nix`: + +```nix +boot.initrd.luks.fido2Support = true; +boot.initrd.luks.devices."/dev/sda2".fido2.credential = "f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7"; +``` + +You can also use the FIDO2 passwordless setup, but for security reasons, +you might want to enable it only when your device is PIN protected, such +as [Trezor](https://trezor.io/). + +```nix +boot.initrd.luks.devices."/dev/sda2".fido2.passwordLess = true; +``` diff --git a/nixos/doc/manual/configuration/luks-file-systems.xml b/nixos/doc/manual/configuration/luks-file-systems.xml deleted file mode 100644 index d8654d71ac00..000000000000 --- a/nixos/doc/manual/configuration/luks-file-systems.xml +++ /dev/null @@ -1,78 +0,0 @@ -
- LUKS-Encrypted File Systems - - - NixOS supports file systems that are encrypted using - LUKS (Linux Unified Key Setup). For example, here is how - you create an encrypted Ext4 file system on the device - /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d: - -# cryptsetup luksFormat /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d - -WARNING! -======== -This will overwrite data on /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d irrevocably. - -Are you sure? (Type uppercase yes): YES -Enter LUKS passphrase: *** -Verify passphrase: *** - -# cryptsetup luksOpen /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d crypted -Enter passphrase for /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d: *** - -# mkfs.ext4 /dev/mapper/crypted - - The LUKS volume should be automatically picked up by - nixos-generate-config, but you might want to verify that your - hardware-configuration.nix looks correct. - - To manually ensure that the system is automatically mounted at boot time as - /, add the following to - configuration.nix: - -boot.initrd.luks.devices.crypted.device = "/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d"; -."/".device = "/dev/mapper/crypted"; - - Should grub be used as bootloader, and /boot is located - on an encrypted partition, it is necessary to add the following grub option: - = true; - -
- FIDO2 - - - NixOS also supports unlocking your LUKS-Encrypted file system using a FIDO2 compatible token. In the following example, we will create a new FIDO2 credential - and add it as a new key to our existing device /dev/sda2: - - -# export FIDO2_LABEL="/dev/sda2 @ $HOSTNAME" -# fido2luks credential "$FIDO2_LABEL" -f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7 - -# fido2luks -i add-key /dev/sda2 f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7 -Password: -Password (again): -Old password: -Old password (again): -Added to key to device /dev/sda2, slot: 2 - - - To ensure that this file system is decrypted using the FIDO2 compatible key, add the following to configuration.nix: - -boot.initrd.luks.fido2Support = true; -boot.initrd.luks.devices."/dev/sda2".fido2.credential = "f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7"; - - - You can also use the FIDO2 passwordless setup, but for security reasons, you might want to enable it only when your device is PIN protected, such as Trezor. - - -boot.initrd.luks.devices."/dev/sda2".fido2.passwordLess = true; - - -
- -
diff --git a/nixos/doc/manual/from_md/configuration/luks-file-systems.section.xml b/nixos/doc/manual/from_md/configuration/luks-file-systems.section.xml new file mode 100644 index 000000000000..42b766eba98b --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/luks-file-systems.section.xml @@ -0,0 +1,84 @@ +
+ LUKS-Encrypted File Systems + + NixOS supports file systems that are encrypted using + LUKS (Linux Unified Key Setup). For example, + here is how you create an encrypted Ext4 file system on the device + /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d: + + +# cryptsetup luksFormat /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d + +WARNING! +======== +This will overwrite data on /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d irrevocably. + +Are you sure? (Type uppercase yes): YES +Enter LUKS passphrase: *** +Verify passphrase: *** + +# cryptsetup luksOpen /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d crypted +Enter passphrase for /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d: *** + +# mkfs.ext4 /dev/mapper/crypted + + + The LUKS volume should be automatically picked up by + nixos-generate-config, but you might want to + verify that your hardware-configuration.nix looks + correct. To manually ensure that the system is automatically mounted + at boot time as /, add the following to + configuration.nix: + + +boot.initrd.luks.devices.crypted.device = "/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d"; +fileSystems."/".device = "/dev/mapper/crypted"; + + + Should grub be used as bootloader, and /boot is + located on an encrypted partition, it is necessary to add the + following grub option: + + +boot.loader.grub.enableCryptodisk = true; + +
+ FIDO2 + + NixOS also supports unlocking your LUKS-Encrypted file system + using a FIDO2 compatible token. In the following example, we will + create a new FIDO2 credential and add it as a new key to our + existing device /dev/sda2: + + +# export FIDO2_LABEL="/dev/sda2 @ $HOSTNAME" +# fido2luks credential "$FIDO2_LABEL" +f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7 + +# fido2luks -i add-key /dev/sda2 f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7 +Password: +Password (again): +Old password: +Old password (again): +Added to key to device /dev/sda2, slot: 2 + + + To ensure that this file system is decrypted using the FIDO2 + compatible key, add the following to + configuration.nix: + + +boot.initrd.luks.fido2Support = true; +boot.initrd.luks.devices."/dev/sda2".fido2.credential = "f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7"; + + + You can also use the FIDO2 passwordless setup, but for security + reasons, you might want to enable it only when your device is PIN + protected, such as + Trezor. + + +boot.initrd.luks.devices."/dev/sda2".fido2.passwordLess = true; + +
+
From 865b3918f2a0853dfadc104394bbc98be114cf17 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 2 Jul 2021 10:08:04 +0800 Subject: [PATCH 017/167] nixos: nixos/doc/manual/configuration/ad-hoc-packages.xml to CommonMark --- .../configuration/ad-hoc-packages.section.md | 51 ++++++++++++++++ .../manual/configuration/ad-hoc-packages.xml | 61 ------------------- .../doc/manual/configuration/package-mgmt.xml | 2 +- .../configuration/ad-hoc-packages.section.xml | 59 ++++++++++++++++++ 4 files changed, 111 insertions(+), 62 deletions(-) create mode 100644 nixos/doc/manual/configuration/ad-hoc-packages.section.md delete mode 100644 nixos/doc/manual/configuration/ad-hoc-packages.xml create mode 100644 nixos/doc/manual/from_md/configuration/ad-hoc-packages.section.xml diff --git a/nixos/doc/manual/configuration/ad-hoc-packages.section.md b/nixos/doc/manual/configuration/ad-hoc-packages.section.md new file mode 100644 index 000000000000..e9d574903a10 --- /dev/null +++ b/nixos/doc/manual/configuration/ad-hoc-packages.section.md @@ -0,0 +1,51 @@ +# Ad-Hoc Package Management {#sec-ad-hoc-packages} + +With the command `nix-env`, you can install and uninstall packages from +the command line. For instance, to install Mozilla Thunderbird: + +```ShellSession +$ nix-env -iA nixos.thunderbird +``` + +If you invoke this as root, the package is installed in the Nix profile +`/nix/var/nix/profiles/default` and visible to all users of the system; +otherwise, the package ends up in +`/nix/var/nix/profiles/per-user/username/profile` and is not visible to +other users. The `-A` flag specifies the package by its attribute name; +without it, the package is installed by matching against its package +name (e.g. `thunderbird`). The latter is slower because it requires +matching against all available Nix packages, and is ambiguous if there +are multiple matching packages. + +Packages come from the NixOS channel. You typically upgrade a package by +updating to the latest version of the NixOS channel: + +```ShellSession +$ nix-channel --update nixos +``` + +and then running `nix-env -i` again. Other packages in the profile are +*not* affected; this is the crucial difference with the declarative +style of package management, where running `nixos-rebuild switch` causes +all packages to be updated to their current versions in the NixOS +channel. You can however upgrade all packages for which there is a newer +version by doing: + +```ShellSession +$ nix-env -u '*' +``` + +A package can be uninstalled using the `-e` flag: + +```ShellSession +$ nix-env -e thunderbird +``` + +Finally, you can roll back an undesirable `nix-env` action: + +```ShellSession +$ nix-env --rollback +``` + +`nix-env` has many more flags. For details, see the nix-env(1) manpage or +the Nix manual. diff --git a/nixos/doc/manual/configuration/ad-hoc-packages.xml b/nixos/doc/manual/configuration/ad-hoc-packages.xml deleted file mode 100644 index c7e882d846fa..000000000000 --- a/nixos/doc/manual/configuration/ad-hoc-packages.xml +++ /dev/null @@ -1,61 +0,0 @@ -
- Ad-Hoc Package Management - - - With the command nix-env, you can install and uninstall - packages from the command line. For instance, to install Mozilla Thunderbird: - -$ nix-env -iA nixos.thunderbird - If you invoke this as root, the package is installed in the Nix profile - /nix/var/nix/profiles/default and visible to all users - of the system; otherwise, the package ends up in - /nix/var/nix/profiles/per-user/username/profile - and is not visible to other users. The flag specifies the - package by its attribute name; without it, the package is installed by - matching against its package name (e.g. thunderbird). The - latter is slower because it requires matching against all available Nix - packages, and is ambiguous if there are multiple matching packages. - - - - Packages come from the NixOS channel. You typically upgrade a package by - updating to the latest version of the NixOS channel: - -$ nix-channel --update nixos - - and then running nix-env -i again. Other packages in the - profile are not affected; this is the crucial difference - with the declarative style of package management, where running - nixos-rebuild switch causes all packages to be updated to - their current versions in the NixOS channel. You can however upgrade all - packages for which there is a newer version by doing: - -$ nix-env -u '*' - - - - - A package can be uninstalled using the flag: - -$ nix-env -e thunderbird - - - - - Finally, you can roll back an undesirable nix-env action: - -$ nix-env --rollback - - - - - nix-env has many more flags. For details, see the - - nix-env - 1 manpage or the Nix manual. - -
diff --git a/nixos/doc/manual/configuration/package-mgmt.xml b/nixos/doc/manual/configuration/package-mgmt.xml index e8ac5d0681a9..2f9395d26fa8 100644 --- a/nixos/doc/manual/configuration/package-mgmt.xml +++ b/nixos/doc/manual/configuration/package-mgmt.xml @@ -27,5 +27,5 @@ - + diff --git a/nixos/doc/manual/from_md/configuration/ad-hoc-packages.section.xml b/nixos/doc/manual/from_md/configuration/ad-hoc-packages.section.xml new file mode 100644 index 000000000000..c9a8d4f3f106 --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/ad-hoc-packages.section.xml @@ -0,0 +1,59 @@ +
+ Ad-Hoc Package Management + + With the command nix-env, you can install and + uninstall packages from the command line. For instance, to install + Mozilla Thunderbird: + + +$ nix-env -iA nixos.thunderbird + + + If you invoke this as root, the package is installed in the Nix + profile /nix/var/nix/profiles/default and visible + to all users of the system; otherwise, the package ends up in + /nix/var/nix/profiles/per-user/username/profile + and is not visible to other users. The -A flag + specifies the package by its attribute name; without it, the package + is installed by matching against its package name (e.g. + thunderbird). The latter is slower because it + requires matching against all available Nix packages, and is + ambiguous if there are multiple matching packages. + + + Packages come from the NixOS channel. You typically upgrade a + package by updating to the latest version of the NixOS channel: + + +$ nix-channel --update nixos + + + and then running nix-env -i again. Other packages + in the profile are not affected; this is the + crucial difference with the declarative style of package management, + where running nixos-rebuild switch causes all + packages to be updated to their current versions in the NixOS + channel. You can however upgrade all packages for which there is a + newer version by doing: + + +$ nix-env -u '*' + + + A package can be uninstalled using the -e flag: + + +$ nix-env -e thunderbird + + + Finally, you can roll back an undesirable nix-env + action: + + +$ nix-env --rollback + + + nix-env has many more flags. For details, see the + nix-env(1) manpage or the Nix manual. + +
From b5215f3f73a7b4f6780c7215dade87513322cd5a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 2 Jul 2021 10:46:34 +0800 Subject: [PATCH 018/167] nixos: nixos/doc/manual/administration/maintenance-mode.xml to CommonMark --- .../administration/maintenance-mode.section.md | 11 +++++++++++ .../manual/administration/maintenance-mode.xml | 16 ---------------- .../manual/administration/troubleshooting.xml | 2 +- .../administration/maintenance-mode.section.xml | 14 ++++++++++++++ 4 files changed, 26 insertions(+), 17 deletions(-) create mode 100644 nixos/doc/manual/administration/maintenance-mode.section.md delete mode 100644 nixos/doc/manual/administration/maintenance-mode.xml create mode 100644 nixos/doc/manual/from_md/administration/maintenance-mode.section.xml diff --git a/nixos/doc/manual/administration/maintenance-mode.section.md b/nixos/doc/manual/administration/maintenance-mode.section.md new file mode 100644 index 000000000000..0aec013c0a9b --- /dev/null +++ b/nixos/doc/manual/administration/maintenance-mode.section.md @@ -0,0 +1,11 @@ +# Maintenance Mode {#sec-maintenance-mode} + +You can enter rescue mode by running: + +```ShellSession +# systemctl rescue +``` + +This will eventually give you a single-user root shell. Systemd will +stop (almost) all system services. To get out of maintenance mode, just +exit from the rescue shell. diff --git a/nixos/doc/manual/administration/maintenance-mode.xml b/nixos/doc/manual/administration/maintenance-mode.xml deleted file mode 100644 index 74abfdd7c663..000000000000 --- a/nixos/doc/manual/administration/maintenance-mode.xml +++ /dev/null @@ -1,16 +0,0 @@ -
- Maintenance Mode - - - You can enter rescue mode by running: - -# systemctl rescue - This will eventually give you a single-user root shell. Systemd will stop - (almost) all system services. To get out of maintenance mode, just exit from - the rescue shell. - -
diff --git a/nixos/doc/manual/administration/troubleshooting.xml b/nixos/doc/manual/administration/troubleshooting.xml index b055acadacf3..a7d731922213 100644 --- a/nixos/doc/manual/administration/troubleshooting.xml +++ b/nixos/doc/manual/administration/troubleshooting.xml @@ -9,7 +9,7 @@ you manage your NixOS system. - + diff --git a/nixos/doc/manual/from_md/administration/maintenance-mode.section.xml b/nixos/doc/manual/from_md/administration/maintenance-mode.section.xml new file mode 100644 index 000000000000..c86b1911c117 --- /dev/null +++ b/nixos/doc/manual/from_md/administration/maintenance-mode.section.xml @@ -0,0 +1,14 @@ +
+ Maintenance Mode + + You can enter rescue mode by running: + + +# systemctl rescue + + + This will eventually give you a single-user root shell. Systemd will + stop (almost) all system services. To get out of maintenance mode, + just exit from the rescue shell. + +
From 99493b61ea5dc657a3febc6291bc83802005ad89 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 2 Jul 2021 10:47:32 +0800 Subject: [PATCH 019/167] nixos: nixos/doc/manual/administration/rollback.xml to CommonMark --- .../manual/administration/rollback.section.md | 38 +++++++++++++++++ nixos/doc/manual/administration/rollback.xml | 41 ------------------ .../manual/administration/troubleshooting.xml | 2 +- .../administration/rollback.section.xml | 42 +++++++++++++++++++ 4 files changed, 81 insertions(+), 42 deletions(-) create mode 100644 nixos/doc/manual/administration/rollback.section.md delete mode 100644 nixos/doc/manual/administration/rollback.xml create mode 100644 nixos/doc/manual/from_md/administration/rollback.section.xml diff --git a/nixos/doc/manual/administration/rollback.section.md b/nixos/doc/manual/administration/rollback.section.md new file mode 100644 index 000000000000..290d685a2a18 --- /dev/null +++ b/nixos/doc/manual/administration/rollback.section.md @@ -0,0 +1,38 @@ +# Rolling Back Configuration Changes {#sec-rollback} + +After running `nixos-rebuild` to switch to a new configuration, you may +find that the new configuration doesn't work very well. In that case, +there are several ways to return to a previous configuration. + +First, the GRUB boot manager allows you to boot into any previous +configuration that hasn't been garbage-collected. These configurations +can be found under the GRUB submenu "NixOS - All configurations". This +is especially useful if the new configuration fails to boot. After the +system has booted, you can make the selected configuration the default +for subsequent boots: + +```ShellSession +# /run/current-system/bin/switch-to-configuration boot +``` + +Second, you can switch to the previous configuration in a running +system: + +```ShellSession +# nixos-rebuild switch --rollback +``` + +This is equivalent to running: + +```ShellSession +# /nix/var/nix/profiles/system-N-link/bin/switch-to-configuration switch +``` + +where `N` is the number of the NixOS system configuration. To get a +list of the available configurations, do: + +```ShellSession +$ ls -l /nix/var/nix/profiles/system-*-link +... +lrwxrwxrwx 1 root root 78 Aug 12 13:54 /nix/var/nix/profiles/system-268-link -> /nix/store/202b...-nixos-13.07pre4932_5a676e4-4be1055 +``` diff --git a/nixos/doc/manual/administration/rollback.xml b/nixos/doc/manual/administration/rollback.xml deleted file mode 100644 index 80d79e1a53f1..000000000000 --- a/nixos/doc/manual/administration/rollback.xml +++ /dev/null @@ -1,41 +0,0 @@ -
- Rolling Back Configuration Changes - - - After running nixos-rebuild to switch to a new - configuration, you may find that the new configuration doesn’t work very - well. In that case, there are several ways to return to a previous - configuration. - - - - First, the GRUB boot manager allows you to boot into any previous - configuration that hasn’t been garbage-collected. These configurations can - be found under the GRUB submenu “NixOS - All configurations”. This is - especially useful if the new configuration fails to boot. After the system - has booted, you can make the selected configuration the default for - subsequent boots: - -# /run/current-system/bin/switch-to-configuration boot - - - - Second, you can switch to the previous configuration in a running system: - -# nixos-rebuild switch --rollback - This is equivalent to running: - -# /nix/var/nix/profiles/system-N-link/bin/switch-to-configuration switch - where N is the number of the NixOS system - configuration. To get a list of the available configurations, do: - -$ ls -l /nix/var/nix/profiles/system-*-link -... -lrwxrwxrwx 1 root root 78 Aug 12 13:54 /nix/var/nix/profiles/system-268-link -> /nix/store/202b...-nixos-13.07pre4932_5a676e4-4be1055 - - -
diff --git a/nixos/doc/manual/administration/troubleshooting.xml b/nixos/doc/manual/administration/troubleshooting.xml index a7d731922213..16cf4f00b26d 100644 --- a/nixos/doc/manual/administration/troubleshooting.xml +++ b/nixos/doc/manual/administration/troubleshooting.xml @@ -10,7 +10,7 @@ - + diff --git a/nixos/doc/manual/from_md/administration/rollback.section.xml b/nixos/doc/manual/from_md/administration/rollback.section.xml new file mode 100644 index 000000000000..a8df053011c5 --- /dev/null +++ b/nixos/doc/manual/from_md/administration/rollback.section.xml @@ -0,0 +1,42 @@ +
+ Rolling Back Configuration Changes + + After running nixos-rebuild to switch to a new + configuration, you may find that the new configuration doesn’t work + very well. In that case, there are several ways to return to a + previous configuration. + + + First, the GRUB boot manager allows you to boot into any previous + configuration that hasn’t been garbage-collected. These + configurations can be found under the GRUB submenu NixOS - + All configurations. This is especially useful if the new + configuration fails to boot. After the system has booted, you can + make the selected configuration the default for subsequent boots: + + +# /run/current-system/bin/switch-to-configuration boot + + + Second, you can switch to the previous configuration in a running + system: + + +# nixos-rebuild switch --rollback + + + This is equivalent to running: + + +# /nix/var/nix/profiles/system-N-link/bin/switch-to-configuration switch + + + where N is the number of the NixOS system + configuration. To get a list of the available configurations, do: + + +$ ls -l /nix/var/nix/profiles/system-*-link +... +lrwxrwxrwx 1 root root 78 Aug 12 13:54 /nix/var/nix/profiles/system-268-link -> /nix/store/202b...-nixos-13.07pre4932_5a676e4-4be1055 + +
From 4df0b9903d391b7531e06ca859c46f261335bdc1 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 2 Jul 2021 10:48:31 +0800 Subject: [PATCH 020/167] nixos: nixos/doc/manual/administration/store-corruption.xml to CommonMark --- .../store-corruption.section.md | 28 +++++++++++++++ .../administration/store-corruption.xml | 36 ------------------- .../manual/administration/troubleshooting.xml | 2 +- .../store-corruption.section.xml | 34 ++++++++++++++++++ 4 files changed, 63 insertions(+), 37 deletions(-) create mode 100644 nixos/doc/manual/administration/store-corruption.section.md delete mode 100644 nixos/doc/manual/administration/store-corruption.xml create mode 100644 nixos/doc/manual/from_md/administration/store-corruption.section.xml diff --git a/nixos/doc/manual/administration/store-corruption.section.md b/nixos/doc/manual/administration/store-corruption.section.md new file mode 100644 index 000000000000..bd8a5772b37c --- /dev/null +++ b/nixos/doc/manual/administration/store-corruption.section.md @@ -0,0 +1,28 @@ +# Nix Store Corruption {#sec-nix-store-corruption} + +After a system crash, it's possible for files in the Nix store to become +corrupted. (For instance, the Ext4 file system has the tendency to +replace un-synced files with zero bytes.) NixOS tries hard to prevent +this from happening: it performs a `sync` before switching to a new +configuration, and Nix's database is fully transactional. If corruption +still occurs, you may be able to fix it automatically. + +If the corruption is in a path in the closure of the NixOS system +configuration, you can fix it by doing + +```ShellSession +# nixos-rebuild switch --repair +``` + +This will cause Nix to check every path in the closure, and if its +cryptographic hash differs from the hash recorded in Nix's database, the +path is rebuilt or redownloaded. + +You can also scan the entire Nix store for corrupt paths: + +```ShellSession +# nix-store --verify --check-contents --repair +``` + +Any corrupt paths will be redownloaded if they're available in a binary +cache; otherwise, they cannot be repaired. diff --git a/nixos/doc/manual/administration/store-corruption.xml b/nixos/doc/manual/administration/store-corruption.xml deleted file mode 100644 index b9d11152d5e1..000000000000 --- a/nixos/doc/manual/administration/store-corruption.xml +++ /dev/null @@ -1,36 +0,0 @@ -
- Nix Store Corruption - - - After a system crash, it’s possible for files in the Nix store to become - corrupted. (For instance, the Ext4 file system has the tendency to replace - un-synced files with zero bytes.) NixOS tries hard to prevent this from - happening: it performs a sync before switching to a new - configuration, and Nix’s database is fully transactional. If corruption - still occurs, you may be able to fix it automatically. - - - - If the corruption is in a path in the closure of the NixOS system - configuration, you can fix it by doing - -# nixos-rebuild switch --repair - - This will cause Nix to check every path in the closure, and if its - cryptographic hash differs from the hash recorded in Nix’s database, the - path is rebuilt or redownloaded. - - - - You can also scan the entire Nix store for corrupt paths: - -# nix-store --verify --check-contents --repair - - Any corrupt paths will be redownloaded if they’re available in a binary - cache; otherwise, they cannot be repaired. - -
diff --git a/nixos/doc/manual/administration/troubleshooting.xml b/nixos/doc/manual/administration/troubleshooting.xml index 16cf4f00b26d..218324b299ac 100644 --- a/nixos/doc/manual/administration/troubleshooting.xml +++ b/nixos/doc/manual/administration/troubleshooting.xml @@ -11,6 +11,6 @@ - + diff --git a/nixos/doc/manual/from_md/administration/store-corruption.section.xml b/nixos/doc/manual/from_md/administration/store-corruption.section.xml new file mode 100644 index 000000000000..9ed572d484dc --- /dev/null +++ b/nixos/doc/manual/from_md/administration/store-corruption.section.xml @@ -0,0 +1,34 @@ +
+ Nix Store Corruption + + After a system crash, it’s possible for files in the Nix store to + become corrupted. (For instance, the Ext4 file system has the + tendency to replace un-synced files with zero bytes.) NixOS tries + hard to prevent this from happening: it performs a + sync before switching to a new configuration, and + Nix’s database is fully transactional. If corruption still occurs, + you may be able to fix it automatically. + + + If the corruption is in a path in the closure of the NixOS system + configuration, you can fix it by doing + + +# nixos-rebuild switch --repair + + + This will cause Nix to check every path in the closure, and if its + cryptographic hash differs from the hash recorded in Nix’s database, + the path is rebuilt or redownloaded. + + + You can also scan the entire Nix store for corrupt paths: + + +# nix-store --verify --check-contents --repair + + + Any corrupt paths will be redownloaded if they’re available in a + binary cache; otherwise, they cannot be repaired. + +
From 828474abfb4ccd324c1fce3da5f7b0ff454bb21e Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 2 Jul 2021 10:49:14 +0800 Subject: [PATCH 021/167] nixos: nixos/doc/manual/administration/network-problems.xml to CommonMark --- .../network-problems.section.md | 21 +++++++++++++++ .../administration/network-problems.xml | 27 ------------------- .../manual/administration/troubleshooting.xml | 2 +- .../network-problems.section.xml | 25 +++++++++++++++++ 4 files changed, 47 insertions(+), 28 deletions(-) create mode 100644 nixos/doc/manual/administration/network-problems.section.md delete mode 100644 nixos/doc/manual/administration/network-problems.xml create mode 100644 nixos/doc/manual/from_md/administration/network-problems.section.xml diff --git a/nixos/doc/manual/administration/network-problems.section.md b/nixos/doc/manual/administration/network-problems.section.md new file mode 100644 index 000000000000..d360120d72d0 --- /dev/null +++ b/nixos/doc/manual/administration/network-problems.section.md @@ -0,0 +1,21 @@ +# Network Problems {#sec-nix-network-issues} + +Nix uses a so-called *binary cache* to optimise building a package from +source into downloading it as a pre-built binary. That is, whenever a +command like `nixos-rebuild` needs a path in the Nix store, Nix will try +to download that path from the Internet rather than build it from +source. The default binary cache is `https://cache.nixos.org/`. If this +cache is unreachable, Nix operations may take a long time due to HTTP +connection timeouts. You can disable the use of the binary cache by +adding `--option use-binary-caches false`, e.g. + +```ShellSession +# nixos-rebuild switch --option use-binary-caches false +``` + +If you have an alternative binary cache at your disposal, you can use it +instead: + +```ShellSession +# nixos-rebuild switch --option binary-caches http://my-cache.example.org/ +``` diff --git a/nixos/doc/manual/administration/network-problems.xml b/nixos/doc/manual/administration/network-problems.xml deleted file mode 100644 index 1035e4e056a9..000000000000 --- a/nixos/doc/manual/administration/network-problems.xml +++ /dev/null @@ -1,27 +0,0 @@ -
- Network Problems - - - Nix uses a so-called binary cache to optimise building a - package from source into downloading it as a pre-built binary. That is, - whenever a command like nixos-rebuild needs a path in the - Nix store, Nix will try to download that path from the Internet rather than - build it from source. The default binary cache is - https://cache.nixos.org/. If this cache is unreachable, Nix - operations may take a long time due to HTTP connection timeouts. You can - disable the use of the binary cache by adding , e.g. - -# nixos-rebuild switch --option use-binary-caches false - - If you have an alternative binary cache at your disposal, you can use it - instead: - -# nixos-rebuild switch --option binary-caches http://my-cache.example.org/ - - -
diff --git a/nixos/doc/manual/administration/troubleshooting.xml b/nixos/doc/manual/administration/troubleshooting.xml index 218324b299ac..d447b537335b 100644 --- a/nixos/doc/manual/administration/troubleshooting.xml +++ b/nixos/doc/manual/administration/troubleshooting.xml @@ -12,5 +12,5 @@ - + diff --git a/nixos/doc/manual/from_md/administration/network-problems.section.xml b/nixos/doc/manual/from_md/administration/network-problems.section.xml new file mode 100644 index 000000000000..4c0598ca94e8 --- /dev/null +++ b/nixos/doc/manual/from_md/administration/network-problems.section.xml @@ -0,0 +1,25 @@ +
+ Network Problems + + Nix uses a so-called binary cache to optimise + building a package from source into downloading it as a pre-built + binary. That is, whenever a command like + nixos-rebuild needs a path in the Nix store, Nix + will try to download that path from the Internet rather than build + it from source. The default binary cache is + https://cache.nixos.org/. If this cache is + unreachable, Nix operations may take a long time due to HTTP + connection timeouts. You can disable the use of the binary cache by + adding --option use-binary-caches false, e.g. + + +# nixos-rebuild switch --option use-binary-caches false + + + If you have an alternative binary cache at your disposal, you can + use it instead: + + +# nixos-rebuild switch --option binary-caches http://my-cache.example.org/ + +
From 0ac3e57ac1caa8249b966acda47ae3c08e5d31f1 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 2 Jul 2021 11:57:33 +0800 Subject: [PATCH 022/167] nixos: nixos/doc/manual/administration/imperative-containers.xml to CommonMark --- .../doc/manual/administration/containers.xml | 2 +- .../imperative-containers.section.md | 115 +++++++++++++++ .../administration/imperative-containers.xml | 123 ---------------- .../imperative-containers.section.xml | 131 ++++++++++++++++++ 4 files changed, 247 insertions(+), 124 deletions(-) create mode 100644 nixos/doc/manual/administration/imperative-containers.section.md delete mode 100644 nixos/doc/manual/administration/imperative-containers.xml create mode 100644 nixos/doc/manual/from_md/administration/imperative-containers.section.xml diff --git a/nixos/doc/manual/administration/containers.xml b/nixos/doc/manual/administration/containers.xml index 0d3355e56a58..0ea6844146e8 100644 --- a/nixos/doc/manual/administration/containers.xml +++ b/nixos/doc/manual/administration/containers.xml @@ -28,7 +28,7 @@ contrast, in the imperative approach, containers are configured and updated independently from the host system. - + diff --git a/nixos/doc/manual/administration/imperative-containers.section.md b/nixos/doc/manual/administration/imperative-containers.section.md new file mode 100644 index 000000000000..05196bf5d819 --- /dev/null +++ b/nixos/doc/manual/administration/imperative-containers.section.md @@ -0,0 +1,115 @@ +# Imperative Container Management {#sec-imperative-containers} + +We'll cover imperative container management using `nixos-container` +first. Be aware that container management is currently only possible as +`root`. + +You create a container with identifier `foo` as follows: + +```ShellSession +# nixos-container create foo +``` + +This creates the container's root directory in `/var/lib/containers/foo` +and a small configuration file in `/etc/containers/foo.conf`. It also +builds the container's initial system configuration and stores it in +`/nix/var/nix/profiles/per-container/foo/system`. You can modify the +initial configuration of the container on the command line. For +instance, to create a container that has `sshd` running, with the given +public key for `root`: + +```ShellSession +# nixos-container create foo --config ' + services.openssh.enable = true; + users.users.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"]; +' +``` + +By default the next free address in the `10.233.0.0/16` subnet will be +chosen as container IP. This behavior can be altered by setting +`--host-address` and `--local-address`: + +```ShellSession +# nixos-container create test --config-file test-container.nix \ + --local-address 10.235.1.2 --host-address 10.235.1.1 +``` + +Creating a container does not start it. To start the container, run: + +```ShellSession +# nixos-container start foo +``` + +This command will return as soon as the container has booted and has +reached `multi-user.target`. On the host, the container runs within a +systemd unit called `container@container-name.service`. Thus, if +something went wrong, you can get status info using `systemctl`: + +```ShellSession +# systemctl status container@foo +``` + +If the container has started successfully, you can log in as root using +the `root-login` operation: + +```ShellSession +# nixos-container root-login foo +[root@foo:~]# +``` + +Note that only root on the host can do this (since there is no +authentication). You can also get a regular login prompt using the +`login` operation, which is available to all users on the host: + +```ShellSession +# nixos-container login foo +foo login: alice +Password: *** +``` + +With `nixos-container run`, you can execute arbitrary commands in the +container: + +```ShellSession +# nixos-container run foo -- uname -a +Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux +``` + +There are several ways to change the configuration of the container. +First, on the host, you can edit +`/var/lib/container/name/etc/nixos/configuration.nix`, and run + +```ShellSession +# nixos-container update foo +``` + +This will build and activate the new configuration. You can also specify +a new configuration on the command line: + +```ShellSession +# nixos-container update foo --config ' + services.httpd.enable = true; + services.httpd.adminAddr = "foo@example.org"; + networking.firewall.allowedTCPPorts = [ 80 ]; +' + +# curl http://$(nixos-container show-ip foo)/ +… +``` + +However, note that this will overwrite the container's +`/etc/nixos/configuration.nix`. + +Alternatively, you can change the configuration from within the +container itself by running `nixos-rebuild switch` inside the container. +Note that the container by default does not have a copy of the NixOS +channel, so you should run `nix-channel --update` first. + +Containers can be stopped and started using `nixos-container + stop` and `nixos-container start`, respectively, or by using +`systemctl` on the container's service unit. To destroy a container, +including its file system, do + +```ShellSession +# nixos-container destroy foo +``` diff --git a/nixos/doc/manual/administration/imperative-containers.xml b/nixos/doc/manual/administration/imperative-containers.xml deleted file mode 100644 index bc19acf9f690..000000000000 --- a/nixos/doc/manual/administration/imperative-containers.xml +++ /dev/null @@ -1,123 +0,0 @@ -
- Imperative Container Management - - - We’ll cover imperative container management using - nixos-container first. Be aware that container management - is currently only possible as root. - - - - You create a container with identifier foo as follows: - -# nixos-container create foo - - This creates the container’s root directory in - /var/lib/containers/foo and a small configuration file - in /etc/containers/foo.conf. It also builds the - container’s initial system configuration and stores it in - /nix/var/nix/profiles/per-container/foo/system. You can - modify the initial configuration of the container on the command line. For - instance, to create a container that has sshd running, - with the given public key for root: - -# nixos-container create foo --config ' - = true; - users.users.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"]; -' - - By default the next free address in the 10.233.0.0/16 subnet will be chosen - as container IP. This behavior can be altered by setting --host-address and - --local-address: - -# nixos-container create test --config-file test-container.nix \ - --local-address 10.235.1.2 --host-address 10.235.1.1 - - - - - Creating a container does not start it. To start the container, run: - -# nixos-container start foo - - This command will return as soon as the container has booted and has reached - multi-user.target. On the host, the container runs within - a systemd unit called - container@container-name.service. - Thus, if something went wrong, you can get status info using - systemctl: - -# systemctl status container@foo - - - - - If the container has started successfully, you can log in as root using the - root-login operation: - -# nixos-container root-login foo -[root@foo:~]# - - Note that only root on the host can do this (since there is no - authentication). You can also get a regular login prompt using the - login operation, which is available to all users on the - host: - -# nixos-container login foo -foo login: alice -Password: *** - - With nixos-container run, you can execute arbitrary - commands in the container: - -# nixos-container run foo -- uname -a -Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux - - - - - There are several ways to change the configuration of the container. First, - on the host, you can edit - /var/lib/container/name/etc/nixos/configuration.nix, - and run - -# nixos-container update foo - - This will build and activate the new configuration. You can also specify a - new configuration on the command line: - -# nixos-container update foo --config ' - = true; - = "foo@example.org"; - = [ 80 ]; -' - -# curl http://$(nixos-container show-ip foo)/ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">… - - However, note that this will overwrite the container’s - /etc/nixos/configuration.nix. - - - - Alternatively, you can change the configuration from within the container - itself by running nixos-rebuild switch inside the - container. Note that the container by default does not have a copy of the - NixOS channel, so you should run nix-channel --update - first. - - - - Containers can be stopped and started using nixos-container - stop and nixos-container start, respectively, or - by using systemctl on the container’s service unit. To - destroy a container, including its file system, do - -# nixos-container destroy foo - - -
diff --git a/nixos/doc/manual/from_md/administration/imperative-containers.section.xml b/nixos/doc/manual/from_md/administration/imperative-containers.section.xml new file mode 100644 index 000000000000..59ecfdee5af0 --- /dev/null +++ b/nixos/doc/manual/from_md/administration/imperative-containers.section.xml @@ -0,0 +1,131 @@ +
+ Imperative Container Management + + We’ll cover imperative container management using + nixos-container first. Be aware that container + management is currently only possible as root. + + + You create a container with identifier foo as + follows: + + +# nixos-container create foo + + + This creates the container’s root directory in + /var/lib/containers/foo and a small configuration + file in /etc/containers/foo.conf. It also builds + the container’s initial system configuration and stores it in + /nix/var/nix/profiles/per-container/foo/system. + You can modify the initial configuration of the container on the + command line. For instance, to create a container that has + sshd running, with the given public key for + root: + + +# nixos-container create foo --config ' + services.openssh.enable = true; + users.users.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"]; +' + + + By default the next free address in the + 10.233.0.0/16 subnet will be chosen as container + IP. This behavior can be altered by setting + --host-address and + --local-address: + + +# nixos-container create test --config-file test-container.nix \ + --local-address 10.235.1.2 --host-address 10.235.1.1 + + + Creating a container does not start it. To start the container, run: + + +# nixos-container start foo + + + This command will return as soon as the container has booted and has + reached multi-user.target. On the host, the + container runs within a systemd unit called + container@container-name.service. Thus, if + something went wrong, you can get status info using + systemctl: + + +# systemctl status container@foo + + + If the container has started successfully, you can log in as root + using the root-login operation: + + +# nixos-container root-login foo +[root@foo:~]# + + + Note that only root on the host can do this (since there is no + authentication). You can also get a regular login prompt using the + login operation, which is available to all users + on the host: + + +# nixos-container login foo +foo login: alice +Password: *** + + + With nixos-container run, you can execute + arbitrary commands in the container: + + +# nixos-container run foo -- uname -a +Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux + + + There are several ways to change the configuration of the container. + First, on the host, you can edit + /var/lib/container/name/etc/nixos/configuration.nix, + and run + + +# nixos-container update foo + + + This will build and activate the new configuration. You can also + specify a new configuration on the command line: + + +# nixos-container update foo --config ' + services.httpd.enable = true; + services.httpd.adminAddr = "foo@example.org"; + networking.firewall.allowedTCPPorts = [ 80 ]; +' + +# curl http://$(nixos-container show-ip foo)/ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">… + + + However, note that this will overwrite the container’s + /etc/nixos/configuration.nix. + + + Alternatively, you can change the configuration from within the + container itself by running nixos-rebuild switch + inside the container. Note that the container by default does not + have a copy of the NixOS channel, so you should run + nix-channel --update first. + + + Containers can be stopped and started using + nixos-container stop and + nixos-container start, respectively, or by using + systemctl on the container’s service unit. To + destroy a container, including its file system, do + + +# nixos-container destroy foo + +
From 4f0efa8d7db269720192f6a4e3a2ffcbe35e30b3 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 2 Jul 2021 11:58:34 +0800 Subject: [PATCH 023/167] nixos: nixos/doc/manual/administration/declarative-containers.xml to CommonMark --- .../doc/manual/administration/containers.xml | 2 +- .../declarative-containers.section.md | 48 +++++++++++++++ .../administration/declarative-containers.xml | 60 ------------------- .../declarative-containers.section.xml | 60 +++++++++++++++++++ 4 files changed, 109 insertions(+), 61 deletions(-) create mode 100644 nixos/doc/manual/administration/declarative-containers.section.md delete mode 100644 nixos/doc/manual/administration/declarative-containers.xml create mode 100644 nixos/doc/manual/from_md/administration/declarative-containers.section.xml diff --git a/nixos/doc/manual/administration/containers.xml b/nixos/doc/manual/administration/containers.xml index 0ea6844146e8..f149ce7bbfe6 100644 --- a/nixos/doc/manual/administration/containers.xml +++ b/nixos/doc/manual/administration/containers.xml @@ -29,6 +29,6 @@ independently from the host system. - + diff --git a/nixos/doc/manual/administration/declarative-containers.section.md b/nixos/doc/manual/administration/declarative-containers.section.md new file mode 100644 index 000000000000..273672fc10ca --- /dev/null +++ b/nixos/doc/manual/administration/declarative-containers.section.md @@ -0,0 +1,48 @@ +# Declarative Container Specification {#sec-declarative-containers} + +You can also specify containers and their configuration in the host's +`configuration.nix`. For example, the following specifies that there +shall be a container named `database` running PostgreSQL: + +```nix +containers.database = + { config = + { config, pkgs, ... }: + { services.postgresql.enable = true; + services.postgresql.package = pkgs.postgresql_9_6; + }; + }; +``` + +If you run `nixos-rebuild switch`, the container will be built. If the +container was already running, it will be updated in place, without +rebooting. The container can be configured to start automatically by +setting `containers.database.autoStart = true` in its configuration. + +By default, declarative containers share the network namespace of the +host, meaning that they can listen on (privileged) ports. However, they +cannot change the network configuration. You can give a container its +own network as follows: + +```nix +containers.database = { + privateNetwork = true; + hostAddress = "192.168.100.10"; + localAddress = "192.168.100.11"; +}; +``` + +This gives the container a private virtual Ethernet interface with IP +address `192.168.100.11`, which is hooked up to a virtual Ethernet +interface on the host with IP address `192.168.100.10`. (See the next +section for details on container networking.) + +To disable the container, just remove it from `configuration.nix` and +run `nixos-rebuild + switch`. Note that this will not delete the root directory of the +container in `/var/lib/containers`. Containers can be destroyed using +the imperative method: `nixos-container destroy foo`. + +Declarative containers can be started and stopped using the +corresponding systemd service, e.g. +`systemctl start container@database`. diff --git a/nixos/doc/manual/administration/declarative-containers.xml b/nixos/doc/manual/administration/declarative-containers.xml deleted file mode 100644 index d03dbc4d7055..000000000000 --- a/nixos/doc/manual/administration/declarative-containers.xml +++ /dev/null @@ -1,60 +0,0 @@ -
- Declarative Container Specification - - - You can also specify containers and their configuration in the host’s - configuration.nix. For example, the following specifies - that there shall be a container named database running - PostgreSQL: - -containers.database = - { config = - { config, pkgs, ... }: - { = true; - = pkgs.postgresql_9_6; - }; - }; - - If you run nixos-rebuild switch, the container will be - built. If the container was already running, it will be updated in place, - without rebooting. The container can be configured to start automatically by - setting containers.database.autoStart = true in its - configuration. - - - - By default, declarative containers share the network namespace of the host, - meaning that they can listen on (privileged) ports. However, they cannot - change the network configuration. You can give a container its own network as - follows: - -containers.database = { - privateNetwork = true; - hostAddress = "192.168.100.10"; - localAddress = "192.168.100.11"; -}; - - This gives the container a private virtual Ethernet interface with IP address - 192.168.100.11, which is hooked up to a virtual Ethernet - interface on the host with IP address 192.168.100.10. (See - the next section for details on container networking.) - - - - To disable the container, just remove it from - configuration.nix and run nixos-rebuild - switch. Note that this will not delete the root directory of the - container in /var/lib/containers. Containers can be - destroyed using the imperative method: nixos-container destroy - foo. - - - - Declarative containers can be started and stopped using the corresponding - systemd service, e.g. systemctl start container@database. - -
diff --git a/nixos/doc/manual/from_md/administration/declarative-containers.section.xml b/nixos/doc/manual/from_md/administration/declarative-containers.section.xml new file mode 100644 index 000000000000..a918314a2723 --- /dev/null +++ b/nixos/doc/manual/from_md/administration/declarative-containers.section.xml @@ -0,0 +1,60 @@ +
+ Declarative Container Specification + + You can also specify containers and their configuration in the + host’s configuration.nix. For example, the + following specifies that there shall be a container named + database running PostgreSQL: + + +containers.database = + { config = + { config, pkgs, ... }: + { services.postgresql.enable = true; + services.postgresql.package = pkgs.postgresql_9_6; + }; + }; + + + If you run nixos-rebuild switch, the container + will be built. If the container was already running, it will be + updated in place, without rebooting. The container can be configured + to start automatically by setting + containers.database.autoStart = true in its + configuration. + + + By default, declarative containers share the network namespace of + the host, meaning that they can listen on (privileged) ports. + However, they cannot change the network configuration. You can give + a container its own network as follows: + + +containers.database = { + privateNetwork = true; + hostAddress = "192.168.100.10"; + localAddress = "192.168.100.11"; +}; + + + This gives the container a private virtual Ethernet interface with + IP address 192.168.100.11, which is hooked up to + a virtual Ethernet interface on the host with IP address + 192.168.100.10. (See the next section for details + on container networking.) + + + To disable the container, just remove it from + configuration.nix and run + nixos-rebuild switch. Note that this will not + delete the root directory of the container in + /var/lib/containers. Containers can be destroyed + using the imperative method: + nixos-container destroy foo. + + + Declarative containers can be started and stopped using the + corresponding systemd service, e.g. + systemctl start container@database. + +
From 9b52df304bb8e4f2ef0f00ad1cdabcc3243e7733 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 2 Jul 2021 11:59:12 +0800 Subject: [PATCH 024/167] nixos: nixos/doc/manual/administration/container-networking.xml to CommonMark --- .../container-networking.section.md | 44 ++++++++++++++ .../administration/container-networking.xml | 59 ------------------- .../doc/manual/administration/containers.xml | 2 +- .../container-networking.section.xml | 54 +++++++++++++++++ 4 files changed, 99 insertions(+), 60 deletions(-) create mode 100644 nixos/doc/manual/administration/container-networking.section.md delete mode 100644 nixos/doc/manual/administration/container-networking.xml create mode 100644 nixos/doc/manual/from_md/administration/container-networking.section.xml diff --git a/nixos/doc/manual/administration/container-networking.section.md b/nixos/doc/manual/administration/container-networking.section.md new file mode 100644 index 000000000000..0873768376cc --- /dev/null +++ b/nixos/doc/manual/administration/container-networking.section.md @@ -0,0 +1,44 @@ +# Container Networking {#sec-container-networking} + +When you create a container using `nixos-container create`, it gets it +own private IPv4 address in the range `10.233.0.0/16`. You can get the +container's IPv4 address as follows: + +```ShellSession +# nixos-container show-ip foo +10.233.4.2 + +$ ping -c1 10.233.4.2 +64 bytes from 10.233.4.2: icmp_seq=1 ttl=64 time=0.106 ms +``` + +Networking is implemented using a pair of virtual Ethernet devices. The +network interface in the container is called `eth0`, while the matching +interface in the host is called `ve-container-name` (e.g., `ve-foo`). +The container has its own network namespace and the `CAP_NET_ADMIN` +capability, so it can perform arbitrary network configuration such as +setting up firewall rules, without affecting or having access to the +host's network. + +By default, containers cannot talk to the outside network. If you want +that, you should set up Network Address Translation (NAT) rules on the +host to rewrite container traffic to use your external IP address. This +can be accomplished using the following configuration on the host: + +```nix +networking.nat.enable = true; +networking.nat.internalInterfaces = ["ve-+"]; +networking.nat.externalInterface = "eth0"; +``` + +where `eth0` should be replaced with the desired external interface. +Note that `ve-+` is a wildcard that matches all container interfaces. + +If you are using Network Manager, you need to explicitly prevent it from +managing container interfaces: + +```nix +networking.networkmanager.unmanaged = [ "interface-name:ve-*" ]; +``` + +You may need to restart your system for the changes to take effect. diff --git a/nixos/doc/manual/administration/container-networking.xml b/nixos/doc/manual/administration/container-networking.xml deleted file mode 100644 index 42486f01fe8c..000000000000 --- a/nixos/doc/manual/administration/container-networking.xml +++ /dev/null @@ -1,59 +0,0 @@ -
- Container Networking - - - When you create a container using nixos-container create, - it gets it own private IPv4 address in the range - 10.233.0.0/16. You can get the container’s IPv4 address - as follows: - -# nixos-container show-ip foo -10.233.4.2 - -$ ping -c1 10.233.4.2 -64 bytes from 10.233.4.2: icmp_seq=1 ttl=64 time=0.106 ms - - - - - Networking is implemented using a pair of virtual Ethernet devices. The - network interface in the container is called eth0, while - the matching interface in the host is called - ve-container-name (e.g., - ve-foo). The container has its own network namespace and - the CAP_NET_ADMIN capability, so it can perform arbitrary - network configuration such as setting up firewall rules, without affecting or - having access to the host’s network. - - - - By default, containers cannot talk to the outside network. If you want that, - you should set up Network Address Translation (NAT) rules on the host to - rewrite container traffic to use your external IP address. This can be - accomplished using the following configuration on the host: - - = true; - = ["ve-+"]; - = "eth0"; - - where eth0 should be replaced with the desired external - interface. Note that ve-+ is a wildcard that matches all - container interfaces. - - - - If you are using Network Manager, you need to explicitly prevent it from - managing container interfaces: - -networking.networkmanager.unmanaged = [ "interface-name:ve-*" ]; - - - - - You may need to restart your system for the changes to take effect. - -
diff --git a/nixos/doc/manual/administration/containers.xml b/nixos/doc/manual/administration/containers.xml index f149ce7bbfe6..8e0e300f367b 100644 --- a/nixos/doc/manual/administration/containers.xml +++ b/nixos/doc/manual/administration/containers.xml @@ -30,5 +30,5 @@ - + diff --git a/nixos/doc/manual/from_md/administration/container-networking.section.xml b/nixos/doc/manual/from_md/administration/container-networking.section.xml new file mode 100644 index 000000000000..788a2b7b0acb --- /dev/null +++ b/nixos/doc/manual/from_md/administration/container-networking.section.xml @@ -0,0 +1,54 @@ +
+ Container Networking + + When you create a container using + nixos-container create, it gets it own private + IPv4 address in the range 10.233.0.0/16. You can + get the container’s IPv4 address as follows: + + +# nixos-container show-ip foo +10.233.4.2 + +$ ping -c1 10.233.4.2 +64 bytes from 10.233.4.2: icmp_seq=1 ttl=64 time=0.106 ms + + + Networking is implemented using a pair of virtual Ethernet devices. + The network interface in the container is called + eth0, while the matching interface in the host is + called ve-container-name (e.g., + ve-foo). The container has its own network + namespace and the CAP_NET_ADMIN capability, so it + can perform arbitrary network configuration such as setting up + firewall rules, without affecting or having access to the host’s + network. + + + By default, containers cannot talk to the outside network. If you + want that, you should set up Network Address Translation (NAT) rules + on the host to rewrite container traffic to use your external IP + address. This can be accomplished using the following configuration + on the host: + + +networking.nat.enable = true; +networking.nat.internalInterfaces = ["ve-+"]; +networking.nat.externalInterface = "eth0"; + + + where eth0 should be replaced with the desired + external interface. Note that ve-+ is a wildcard + that matches all container interfaces. + + + If you are using Network Manager, you need to explicitly prevent it + from managing container interfaces: + + +networking.networkmanager.unmanaged = [ "interface-name:ve-*" ]; + + + You may need to restart your system for the changes to take effect. + +
From 5f0e1822e8533a266ef56607d305f657b98f58cd Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 2 Jul 2021 22:50:10 +0800 Subject: [PATCH 025/167] nixos: nixos/doc/manual/installation/installing-usb.xml to CommonMark --- .../installation/installing-usb.section.xml | 35 ++++++++++++++++ .../installation/installing-usb.section.md | 31 ++++++++++++++ .../manual/installation/installing-usb.xml | 40 ------------------- nixos/doc/manual/installation/installing.xml | 2 +- 4 files changed, 67 insertions(+), 41 deletions(-) create mode 100644 nixos/doc/manual/from_md/installation/installing-usb.section.xml create mode 100644 nixos/doc/manual/installation/installing-usb.section.md delete mode 100644 nixos/doc/manual/installation/installing-usb.xml diff --git a/nixos/doc/manual/from_md/installation/installing-usb.section.xml b/nixos/doc/manual/from_md/installation/installing-usb.section.xml new file mode 100644 index 000000000000..b46a1d565557 --- /dev/null +++ b/nixos/doc/manual/from_md/installation/installing-usb.section.xml @@ -0,0 +1,35 @@ +
+ Booting from a USB 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. + + + On macOS + +$ 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 + + + 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. + +
diff --git a/nixos/doc/manual/installation/installing-usb.section.md b/nixos/doc/manual/installation/installing-usb.section.md new file mode 100644 index 000000000000..ae58c08e5237 --- /dev/null +++ b/nixos/doc/manual/installation/installing-usb.section.md @@ -0,0 +1,31 @@ +# Booting from a USB 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. + +::: {.note} +::: {.title} +On macOS +::: + +```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 +``` + +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. diff --git a/nixos/doc/manual/installation/installing-usb.xml b/nixos/doc/manual/installation/installing-usb.xml deleted file mode 100644 index 83598635acca..000000000000 --- a/nixos/doc/manual/installation/installing-usb.xml +++ /dev/null @@ -1,40 +0,0 @@ -
- Booting from a USB 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. - - On macOS - - -$ 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 - - 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. - -
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index f03b9443d23b..f7b527b9cf55 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -566,7 +566,7 @@ Retype new UNIX password: ***
Additional installation notes - + From f6a42c131ad6d2d0604d90deee86d371a639a43d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 2 Jul 2021 22:50:58 +0800 Subject: [PATCH 026/167] nixos: nixos/doc/manual/installation/installing-pxe.xml to CommonMark --- .../installation/installing-pxe.section.xml | 42 ++++++++++++++++ .../installation/installing-pxe.section.md | 32 ++++++++++++ .../manual/installation/installing-pxe.xml | 50 ------------------- nixos/doc/manual/installation/installing.xml | 2 +- 4 files changed, 75 insertions(+), 51 deletions(-) create mode 100644 nixos/doc/manual/from_md/installation/installing-pxe.section.xml create mode 100644 nixos/doc/manual/installation/installing-pxe.section.md delete mode 100644 nixos/doc/manual/installation/installing-pxe.xml diff --git a/nixos/doc/manual/from_md/installation/installing-pxe.section.xml b/nixos/doc/manual/from_md/installation/installing-pxe.section.xml new file mode 100644 index 000000000000..1dd15ddacba8 --- /dev/null +++ b/nixos/doc/manual/from_md/installation/installing-pxe.section.xml @@ -0,0 +1,42 @@ +
+ Booting from the <quote>netboot</quote> media (PXE) + + Advanced users may wish to install NixOS using an existing PXE or + iPXE setup. + + + These instructions assume that you have an existing PXE or iPXE + infrastructure and simply want to add the NixOS installer as another + option. To build the necessary files from a recent version of + nixpkgs, you can run: + + +nix-build -A netboot.x86_64-linux nixos/release.nix + + + This will create a result directory containing: * + bzImage – the Linux kernel * + initrd – the initrd file * + netboot.ipxe – an example ipxe script + demonstrating the appropriate kernel command line arguments for this + image + + + If you’re using plain PXE, configure your boot loader to use the + bzImage and initrd files and + have it provide the same kernel command line arguments found in + netboot.ipxe. + + + If you’re using iPXE, depending on how your HTTP/FTP/etc. server is + configured you may be able to use netboot.ipxe + unmodified, or you may need to update the paths to the files to + match your server’s directory layout. + + + In the future we may begin making these files available as build + products from hydra at which point we will update this documentation + with instructions on how to obtain them either for placing on a + dedicated TFTP server or to boot them directly over the internet. + +
diff --git a/nixos/doc/manual/installation/installing-pxe.section.md b/nixos/doc/manual/installation/installing-pxe.section.md new file mode 100644 index 000000000000..2016a258251f --- /dev/null +++ b/nixos/doc/manual/installation/installing-pxe.section.md @@ -0,0 +1,32 @@ +# Booting from the "netboot" media (PXE) {#sec-booting-from-pxe} + +Advanced users may wish to install NixOS using an existing PXE or iPXE +setup. + +These instructions assume that you have an existing PXE or iPXE +infrastructure and simply want to add the NixOS installer as another +option. To build the necessary files from a recent version of nixpkgs, +you can run: + +```ShellSession +nix-build -A netboot.x86_64-linux nixos/release.nix +``` + +This will create a `result` directory containing: \* `bzImage` -- the +Linux kernel \* `initrd` -- the initrd file \* `netboot.ipxe` -- an +example ipxe script demonstrating the appropriate kernel command line +arguments for this image + +If you're using plain PXE, configure your boot loader to use the +`bzImage` and `initrd` files and have it provide the same kernel command +line arguments found in `netboot.ipxe`. + +If you're using iPXE, depending on how your HTTP/FTP/etc. server is +configured you may be able to use `netboot.ipxe` unmodified, or you may +need to update the paths to the files to match your server's directory +layout. + +In the future we may begin making these files available as build +products from hydra at which point we will update this documentation +with instructions on how to obtain them either for placing on a +dedicated TFTP server or to boot them directly over the internet. diff --git a/nixos/doc/manual/installation/installing-pxe.xml b/nixos/doc/manual/installation/installing-pxe.xml deleted file mode 100644 index ea88fbdad7e2..000000000000 --- a/nixos/doc/manual/installation/installing-pxe.xml +++ /dev/null @@ -1,50 +0,0 @@ -
- Booting from the <quote>netboot</quote> media (PXE) - - - Advanced users may wish to install NixOS using an existing PXE or iPXE setup. - - - - These instructions assume that you have an existing PXE or iPXE - infrastructure and simply want to add the NixOS installer as another option. - To build the necessary files from a recent version of nixpkgs, you can run: - - - -nix-build -A netboot.x86_64-linux nixos/release.nix - - - - This will create a result directory containing: * - bzImage – the Linux kernel * initrd - – the initrd file * netboot.ipxe – an example ipxe - script demonstrating the appropriate kernel command line arguments for this - image - - - - If you’re using plain PXE, configure your boot loader to use the - bzImage and initrd files and have it - provide the same kernel command line arguments found in - netboot.ipxe. - - - - If you’re using iPXE, depending on how your HTTP/FTP/etc. server is - configured you may be able to use netboot.ipxe unmodified, - or you may need to update the paths to the files to match your server’s - directory layout - - - - In the future we may begin making these files available as build products - from hydra at which point we will update this documentation with instructions - on how to obtain them either for placing on a dedicated TFTP server or to - boot them directly over the internet. - -
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index f7b527b9cf55..6bfe9ebcad67 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -568,7 +568,7 @@ Retype new UNIX password: *** - + From 5a4d8ad834e92d99b39de7e673fe26650cf3a175 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 2 Jul 2021 22:51:29 +0800 Subject: [PATCH 027/167] nixos: nixos/doc/manual/installation/installing-virtualbox-guest.xml to CommonMark --- .../installing-virtualbox-guest.section.xml | 92 ++++++++++++++++ .../installing-virtualbox-guest.section.md | 59 ++++++++++ .../installing-virtualbox-guest.xml | 103 ------------------ nixos/doc/manual/installation/installing.xml | 2 +- 4 files changed, 152 insertions(+), 104 deletions(-) create mode 100644 nixos/doc/manual/from_md/installation/installing-virtualbox-guest.section.xml create mode 100644 nixos/doc/manual/installation/installing-virtualbox-guest.section.md delete mode 100644 nixos/doc/manual/installation/installing-virtualbox-guest.xml diff --git a/nixos/doc/manual/from_md/installation/installing-virtualbox-guest.section.xml b/nixos/doc/manual/from_md/installation/installing-virtualbox-guest.section.xml new file mode 100644 index 000000000000..c8bb286c8f33 --- /dev/null +++ b/nixos/doc/manual/from_md/installation/installing-virtualbox-guest.section.xml @@ -0,0 +1,92 @@ +
+ Installing in a VirtualBox guest + + Installing NixOS into a VirtualBox guest is convenient for users who + want to try NixOS without installing it on bare metal. If you want + to use a pre-made VirtualBox appliance, it is available at + the + downloads page. If you want to set up a VirtualBox guest + manually, follow these instructions: + + + + + Add a New Machine in VirtualBox with OS Type "Linux / Other + Linux" + + + + + Base Memory Size: 768 MB or higher. + + + + + New Hard Disk of 8 GB or higher. + + + + + Mount the CD-ROM with the NixOS ISO (by clicking on CD/DVD-ROM) + + + + + Click on Settings / System / Processor and enable PAE/NX + + + + + Click on Settings / System / Acceleration and enable + "VT-x/AMD-V" acceleration + + + + + Click on Settings / Display / Screen and select VMSVGA as + Graphics Controller + + + + + Save the settings, start the virtual machine, and continue + installation like normal + + + + + There are a few modifications you should make in configuration.nix. + Enable booting: + + +boot.loader.grub.device = "/dev/sda"; + + + Also remove the fsck that runs at startup. It will always fail to + run, stopping your boot until you press *. + + +boot.initrd.checkJournalingFS = false; + + + Shared folders can be given a name and a path in the host system in + the VirtualBox settings (Machine / Settings / Shared Folders, then + click on the "Add" icon). Add the following to the + /etc/nixos/configuration.nix to auto-mount them. + If you do not add "nofail", the system + will not boot properly. + + +{ config, pkgs, ...} : +{ + fileSystems."/virtualboxshare" = { + fsType = "vboxsf"; + device = "nameofthesharedfolder"; + options = [ "rw" "nofail" ]; + }; +} + + + The folder will be available directly under the root directory. + +
diff --git a/nixos/doc/manual/installation/installing-virtualbox-guest.section.md b/nixos/doc/manual/installation/installing-virtualbox-guest.section.md new file mode 100644 index 000000000000..e9c2a621c1bb --- /dev/null +++ b/nixos/doc/manual/installation/installing-virtualbox-guest.section.md @@ -0,0 +1,59 @@ +# Installing in a VirtualBox guest {#sec-instaling-virtualbox-guest} + +Installing NixOS into a VirtualBox guest is convenient for users who +want to try NixOS without installing it on bare metal. If you want to +use a pre-made VirtualBox appliance, it is available at [the downloads +page](https://nixos.org/nixos/download.html). If you want to set up a +VirtualBox guest manually, follow these instructions: + +1. Add a New Machine in VirtualBox with OS Type \"Linux / Other Linux\" + +1. Base Memory Size: 768 MB or higher. + +1. New Hard Disk of 8 GB or higher. + +1. Mount the CD-ROM with the NixOS ISO (by clicking on CD/DVD-ROM) + +1. Click on Settings / System / Processor and enable PAE/NX + +1. Click on Settings / System / Acceleration and enable \"VT-x/AMD-V\" + acceleration + +1. Click on Settings / Display / Screen and select VMSVGA as Graphics + Controller + +1. Save the settings, start the virtual machine, and continue + installation like normal + +There are a few modifications you should make in configuration.nix. +Enable booting: + +```nix +boot.loader.grub.device = "/dev/sda"; +``` + +Also remove the fsck that runs at startup. It will always fail to run, +stopping your boot until you press `*`. + +```nix +boot.initrd.checkJournalingFS = false; +``` + +Shared folders can be given a name and a path in the host system in the +VirtualBox settings (Machine / Settings / Shared Folders, then click on +the \"Add\" icon). Add the following to the +`/etc/nixos/configuration.nix` to auto-mount them. If you do not add +`"nofail"`, the system will not boot properly. + +```nix +{ config, pkgs, ...} : +{ + fileSystems."/virtualboxshare" = { + fsType = "vboxsf"; + device = "nameofthesharedfolder"; + options = [ "rw" "nofail" ]; + }; +} +``` + +The folder will be available directly under the root directory. diff --git a/nixos/doc/manual/installation/installing-virtualbox-guest.xml b/nixos/doc/manual/installation/installing-virtualbox-guest.xml deleted file mode 100644 index 019e5098a8e2..000000000000 --- a/nixos/doc/manual/installation/installing-virtualbox-guest.xml +++ /dev/null @@ -1,103 +0,0 @@ -
- Installing in a VirtualBox guest - - - Installing NixOS into a VirtualBox guest is convenient for users who want to - try NixOS without installing it on bare metal. If you want to use a pre-made - VirtualBox appliance, it is available at - the downloads - page. If you want to set up a VirtualBox guest manually, follow these - instructions: - - - - - - Add a New Machine in VirtualBox with OS Type "Linux / Other Linux" - - - - - Base Memory Size: 768 MB or higher. - - - - - New Hard Disk of 8 GB or higher. - - - - - Mount the CD-ROM with the NixOS ISO (by clicking on CD/DVD-ROM) - - - - - Click on Settings / System / Processor and enable PAE/NX - - - - - Click on Settings / System / Acceleration and enable "VT-x/AMD-V" - acceleration - - - - - Click on Settings / Display / Screen and select VMSVGA as Graphics Controller - - - - - Save the settings, start the virtual machine, and continue installation - like normal - - - - - - There are a few modifications you should make in configuration.nix. Enable - booting: - - - - = "/dev/sda"; - - - - Also remove the fsck that runs at startup. It will always fail to run, - stopping your boot until you press *. - - - - = false; - - - - Shared folders can be given a name and a path in the host system in the - VirtualBox settings (Machine / Settings / Shared Folders, then click on the - "Add" icon). Add the following to the - /etc/nixos/configuration.nix to auto-mount them. If you do - not add "nofail", the system will not boot properly. - - - -{ config, pkgs, ...} : -{ - fileSystems."/virtualboxshare" = { - fsType = "vboxsf"; - device = "nameofthesharedfolder"; - options = [ "rw" "nofail" ]; - }; -} - - - - The folder will be available directly under the root directory. - -
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index 6bfe9ebcad67..55375469447f 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -570,7 +570,7 @@ Retype new UNIX password: *** - + From 060684efa1485ee5745cd9077d8cd4953f3da0c5 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 2 Jul 2021 22:52:17 +0800 Subject: [PATCH 028/167] nixos: nixos/doc/manual/installation/installing-from-other-distro.xml to CommonMark --- .../installing-from-other-distro.section.xml | 388 ++++++++++++++++++ .../installing-from-other-distro.section.md | 279 +++++++++++++ .../installing-from-other-distro.xml | 364 ---------------- nixos/doc/manual/installation/installing.xml | 2 +- 4 files changed, 668 insertions(+), 365 deletions(-) create mode 100644 nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml create mode 100644 nixos/doc/manual/installation/installing-from-other-distro.section.md delete mode 100644 nixos/doc/manual/installation/installing-from-other-distro.xml diff --git a/nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml b/nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml new file mode 100644 index 000000000000..525531a47813 --- /dev/null +++ b/nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml @@ -0,0 +1,388 @@ +
+ Installing from another Linux distribution + + Because Nix (the package manager) & Nixpkgs (the Nix packages + collection) can both be installed on any (most?) Linux + distributions, they can be used to install NixOS in various creative + ways. You can, for instance: + + + + + Install NixOS on another partition, from your existing Linux + distribution (without the use of a USB or optical device!) + + + + + Install NixOS on the same partition (in place!), from your + existing non-NixOS Linux distribution using + NIXOS_LUSTRATE. + + + + + Install NixOS on your hard drive from the Live CD of any Linux + distribution. + + + + + The first steps to all these are the same: + + + + + Install the Nix package manager: + + + Short version: + + +$ curl -L https://nixos.org/nix/install | sh +$ . $HOME/.nix-profile/etc/profile.d/nix.sh # …or open a fresh shell + + + More details in the + + Nix manual + + + + + Switch to the NixOS channel: + + + If you've just installed Nix on a non-NixOS distribution, you + will be on the nixpkgs channel by default. + + +$ nix-channel --list +nixpkgs https://nixos.org/channels/nixpkgs-unstable + + + As that channel gets released without running the NixOS tests, + it will be safer to use the nixos-* channels + instead: + + +$ nix-channel --add https://nixos.org/channels/nixos-version nixpkgs + + + You may want to throw in a + nix-channel --update for good measure. + + + + + Install the NixOS installation tools: + + + You'll need nixos-generate-config and + nixos-install, but this also makes some man + pages and nixos-enter available, just in case + you want to chroot into your NixOS partition. NixOS installs + these by default, but you don't have NixOS yet.. + + +$ nix-env -f '<nixpkgs>' -iA nixos-install-tools + + + + + + The following 5 steps are only for installing NixOS to another + partition. For installing NixOS in place using + NIXOS_LUSTRATE, skip ahead. + + + + Prepare your target partition: + + + At this point it is time to prepare your target partition. + Please refer to the partitioning, file-system creation, and + mounting steps of + + + If you're about to install NixOS in place using + NIXOS_LUSTRATE there is nothing to do for + this step. + + + + + Generate your NixOS configuration: + + +$ sudo `which nixos-generate-config` --root /mnt + + + You'll probably want to edit the configuration files. Refer to + the nixos-generate-config step in + for more information. + + + Consider setting up the NixOS bootloader to give you the ability + to boot on your existing Linux partition. For instance, if + you're using GRUB and your existing distribution is running + Ubuntu, you may want to add something like this to your + configuration.nix: + + +boot.loader.grub.extraEntries = '' + menuentry "Ubuntu" { + search --set=ubuntu --fs-uuid 3cc3e652-0c1f-4800-8451-033754f68e6e + configfile "($ubuntu)/boot/grub/grub.cfg" + } +''; + + + (You can find the appropriate UUID for your partition in + /dev/disk/by-uuid) + + + + + Create the nixbld group and user on your + original distribution: + + +$ sudo groupadd -g 30000 nixbld +$ sudo useradd -u 30000 -g nixbld -G nixbld nixbld + + + + + Download/build/install NixOS: + + + + Once you complete this step, you might no longer be able to + boot on existing systems without the help of a rescue USB + drive or similar. + + + + + On some distributions there are separate PATHS for programs + intended only for root. In order for the installation to + succeed, you might have to use + PATH="$PATH:/usr/sbin:/sbin" in + the following command. + + + +$ sudo PATH="$PATH" NIX_PATH="$NIX_PATH" `which nixos-install` --root /mnt + + + Again, please refer to the nixos-install step + in for more information. + + + That should be it for installation to another partition! + + + + + Optionally, you may want to clean up your non-NixOS + distribution: + + +$ sudo userdel nixbld +$ sudo groupdel nixbld + + + If you do not wish to keep the Nix package manager installed + either, run something like + sudo rm -rv ~/.nix-* /nix and remove the line + that the Nix installer added to your + ~/.profile. + + + + + + The following steps are only for installing NixOS in place + using NIXOS_LUSTRATE: + + + + Generate your NixOS configuration: + + +$ sudo `which nixos-generate-config` --root / + + + Note that this will place the generated configuration files in + /etc/nixos. You'll probably want to edit the + configuration files. Refer to the + nixos-generate-config step in + for more information. + + + You'll likely want to set a root password for your first boot + using the configuration files because you won't have a chance to + enter a password until after you reboot. You can initalize the + root password to an empty one with this line: (and of course + don't forget to set one once you've rebooted or to lock the + account with sudo passwd -l root if you use + sudo) + + +users.users.root.initialHashedPassword = ""; + + + + + Build the NixOS closure and install it in the + system profile: + + +$ nix-env -p /nix/var/nix/profiles/system -f '<nixpkgs/nixos>' -I nixos-config=/etc/nixos/configuration.nix -iA system + + + + + Change ownership of the /nix tree to root + (since your Nix install was probably single user): + + +$ sudo chown -R 0.0 /nix + + + + + Set up the /etc/NIXOS and + /etc/NIXOS_LUSTRATE files: + + + /etc/NIXOS officializes that this is now a + NixOS partition (the bootup scripts require its presence). + + + /etc/NIXOS_LUSTRATE tells the NixOS bootup + scripts to move everything that's in the + root partition to /old-root. This will move + your existing distribution out of the way in the very early + stages of the NixOS bootup. There are exceptions (we do need to + keep NixOS there after all), so the NixOS lustrate process will + not touch: + + + + + The /nix directory + + + + + The /boot directory + + + + + Any file or directory listed in + /etc/NIXOS_LUSTRATE (one per line) + + + + + + Support for NIXOS_LUSTRATE was added in + NixOS 16.09. The act of "lustrating" refers to the + wiping of the existing distribution. Creating + /etc/NIXOS_LUSTRATE can also be used on + NixOS to remove all mutable files from your root partition + (anything that's not in /nix or + /boot gets "lustrated" on the + next boot. + + + lustrate /ˈlʌstreɪt/ verb. + + + purify by expiatory sacrifice, ceremonial washing, or some + other ritual action. + + + + Let's create the files: + + +$ sudo touch /etc/NIXOS +$ sudo touch /etc/NIXOS_LUSTRATE + + + Let's also make sure the NixOS configuration files are kept once + we reboot on NixOS: + + +$ echo etc/nixos | sudo tee -a /etc/NIXOS_LUSTRATE + + + + + Finally, move the /boot directory of your + current distribution out of the way (the lustrate process will + take care of the rest once you reboot, but this one must be + moved out now because NixOS needs to install its own boot files: + + + + Once you complete this step, your current distribution will no + longer be bootable! If you didn't get all the NixOS + configuration right, especially those settings pertaining to + boot loading and root partition, NixOS may not be bootable + either. Have a USB rescue device ready in case this happens. + + + +$ sudo mv -v /boot /boot.bak && +sudo /nix/var/nix/profiles/system/bin/switch-to-configuration boot + + + Cross your fingers, reboot, hopefully you should get a NixOS + prompt! + + + + + If for some reason you want to revert to the old distribution, + you'll need to boot on a USB rescue disk and do something along + these lines: + + +# mkdir root +# mount /dev/sdaX root +# mkdir root/nixos-root +# mv -v root/* root/nixos-root/ +# mv -v root/nixos-root/old-root/* root/ +# mv -v root/boot.bak root/boot # We had renamed this by hand earlier +# umount root +# reboot + + + This may work as is or you might also need to reinstall the boot + loader. + + + And of course, if you're happy with NixOS and no longer need the + old distribution: + + +sudo rm -rf /old-root + + + + + It's also worth noting that this whole process can be automated. + This is especially useful for Cloud VMs, where provider do not + provide NixOS. For instance, + nixos-infect + uses the lustrate process to convert Digital Ocean droplets to + NixOS from other distributions automatically. + + + +
diff --git a/nixos/doc/manual/installation/installing-from-other-distro.section.md b/nixos/doc/manual/installation/installing-from-other-distro.section.md new file mode 100644 index 000000000000..d9060eb89c37 --- /dev/null +++ b/nixos/doc/manual/installation/installing-from-other-distro.section.md @@ -0,0 +1,279 @@ +# Installing from another Linux distribution {#sec-installing-from-other-distro} + +Because Nix (the package manager) & Nixpkgs (the Nix packages +collection) can both be installed on any (most?) Linux distributions, +they can be used to install NixOS in various creative ways. You can, for +instance: + +1. Install NixOS on another partition, from your existing Linux + distribution (without the use of a USB or optical device!) + +1. Install NixOS on the same partition (in place!), from your existing + non-NixOS Linux distribution using `NIXOS_LUSTRATE`. + +1. Install NixOS on your hard drive from the Live CD of any Linux + distribution. + +The first steps to all these are the same: + +1. Install the Nix package manager: + + Short version: + + ```ShellSession + $ curl -L https://nixos.org/nix/install | sh + $ . $HOME/.nix-profile/etc/profile.d/nix.sh # …or open a fresh shell + ``` + + More details in the [ Nix + manual](https://nixos.org/nix/manual/#chap-quick-start) + +1. Switch to the NixOS channel: + + If you\'ve just installed Nix on a non-NixOS distribution, you will + be on the `nixpkgs` channel by default. + + ```ShellSession + $ nix-channel --list + nixpkgs https://nixos.org/channels/nixpkgs-unstable + ``` + + As that channel gets released without running the NixOS tests, it + will be safer to use the `nixos-*` channels instead: + + ```ShellSession + $ nix-channel --add https://nixos.org/channels/nixos-version nixpkgs + ``` + + You may want to throw in a `nix-channel --update` for good measure. + +1. Install the NixOS installation tools: + + You\'ll need `nixos-generate-config` and `nixos-install`, but this + also makes some man pages and `nixos-enter` available, just in case + you want to chroot into your NixOS partition. NixOS installs these + by default, but you don\'t have NixOS yet.. + + ```ShellSession + $ nix-env -f '' -iA nixos-install-tools + ``` + +1. ::: {.note} + The following 5 steps are only for installing NixOS to another + partition. For installing NixOS in place using `NIXOS_LUSTRATE`, + skip ahead. + ::: + + Prepare your target partition: + + At this point it is time to prepare your target partition. Please + refer to the partitioning, file-system creation, and mounting steps + of [](#sec-installation) + + If you\'re about to install NixOS in place using `NIXOS_LUSTRATE` + there is nothing to do for this step. + +1. Generate your NixOS configuration: + + ```ShellSession + $ sudo `which nixos-generate-config` --root /mnt + ``` + + You\'ll probably want to edit the configuration files. Refer to the + `nixos-generate-config` step in [](#sec-installation) for more + information. + + Consider setting up the NixOS bootloader to give you the ability to + boot on your existing Linux partition. For instance, if you\'re + using GRUB and your existing distribution is running Ubuntu, you may + want to add something like this to your `configuration.nix`: + + ```nix + boot.loader.grub.extraEntries = '' + menuentry "Ubuntu" { + search --set=ubuntu --fs-uuid 3cc3e652-0c1f-4800-8451-033754f68e6e + configfile "($ubuntu)/boot/grub/grub.cfg" + } + ''; + ``` + + (You can find the appropriate UUID for your partition in + `/dev/disk/by-uuid`) + +1. Create the `nixbld` group and user on your original distribution: + + ```ShellSession + $ sudo groupadd -g 30000 nixbld + $ sudo useradd -u 30000 -g nixbld -G nixbld nixbld + ``` + +1. Download/build/install NixOS: + + ::: {.warning} + Once you complete this step, you might no longer be able to boot on + existing systems without the help of a rescue USB drive or similar. + ::: + + ::: {.note} + On some distributions there are separate PATHS for programs intended + only for root. In order for the installation to succeed, you might + have to use `PATH="$PATH:/usr/sbin:/sbin"` in the following command. + ::: + + ```ShellSession + $ sudo PATH="$PATH" NIX_PATH="$NIX_PATH" `which nixos-install` --root /mnt + ``` + + Again, please refer to the `nixos-install` step in + [](#sec-installation) for more information. + + That should be it for installation to another partition! + +1. Optionally, you may want to clean up your non-NixOS distribution: + + ```ShellSession + $ sudo userdel nixbld + $ sudo groupdel nixbld + ``` + + If you do not wish to keep the Nix package manager installed either, + run something like `sudo rm -rv ~/.nix-* /nix` and remove the line + that the Nix installer added to your `~/.profile`. + +1. ::: {.note} + The following steps are only for installing NixOS in place using + `NIXOS_LUSTRATE`: + ::: + + Generate your NixOS configuration: + + ```ShellSession + $ sudo `which nixos-generate-config` --root / + ``` + + Note that this will place the generated configuration files in + `/etc/nixos`. You\'ll probably want to edit the configuration files. + Refer to the `nixos-generate-config` step in + [](#sec-installation) for more information. + + You\'ll likely want to set a root password for your first boot using + the configuration files because you won\'t have a chance to enter a + password until after you reboot. You can initalize the root password + to an empty one with this line: (and of course don\'t forget to set + one once you\'ve rebooted or to lock the account with + `sudo passwd -l root` if you use `sudo`) + + ```nix + users.users.root.initialHashedPassword = ""; + ``` + +1. Build the NixOS closure and install it in the `system` profile: + + ```ShellSession + $ nix-env -p /nix/var/nix/profiles/system -f '' -I nixos-config=/etc/nixos/configuration.nix -iA system + ``` + +1. Change ownership of the `/nix` tree to root (since your Nix install + was probably single user): + + ```ShellSession + $ sudo chown -R 0.0 /nix + ``` + +1. Set up the `/etc/NIXOS` and `/etc/NIXOS_LUSTRATE` files: + + `/etc/NIXOS` officializes that this is now a NixOS partition (the + bootup scripts require its presence). + + `/etc/NIXOS_LUSTRATE` tells the NixOS bootup scripts to move + *everything* that\'s in the root partition to `/old-root`. This will + move your existing distribution out of the way in the very early + stages of the NixOS bootup. There are exceptions (we do need to keep + NixOS there after all), so the NixOS lustrate process will not + touch: + + - The `/nix` directory + + - The `/boot` directory + + - Any file or directory listed in `/etc/NIXOS_LUSTRATE` (one per + line) + + ::: {.note} + Support for `NIXOS_LUSTRATE` was added in NixOS 16.09. The act of + \"lustrating\" refers to the wiping of the existing distribution. + Creating `/etc/NIXOS_LUSTRATE` can also be used on NixOS to remove + all mutable files from your root partition (anything that\'s not in + `/nix` or `/boot` gets \"lustrated\" on the next boot. + + lustrate /ˈlʌstreɪt/ verb. + + purify by expiatory sacrifice, ceremonial washing, or some other + ritual action. + ::: + + Let\'s create the files: + + ```ShellSession + $ sudo touch /etc/NIXOS + $ sudo touch /etc/NIXOS_LUSTRATE + ``` + + Let\'s also make sure the NixOS configuration files are kept once we + reboot on NixOS: + + ```ShellSession + $ echo etc/nixos | sudo tee -a /etc/NIXOS_LUSTRATE + ``` + +1. Finally, move the `/boot` directory of your current distribution out + of the way (the lustrate process will take care of the rest once you + reboot, but this one must be moved out now because NixOS needs to + install its own boot files: + + ::: {.warning} + Once you complete this step, your current distribution will no + longer be bootable! If you didn\'t get all the NixOS configuration + right, especially those settings pertaining to boot loading and root + partition, NixOS may not be bootable either. Have a USB rescue + device ready in case this happens. + ::: + + ```ShellSession + $ sudo mv -v /boot /boot.bak && + sudo /nix/var/nix/profiles/system/bin/switch-to-configuration boot + ``` + + Cross your fingers, reboot, hopefully you should get a NixOS prompt! + +1. If for some reason you want to revert to the old distribution, + you\'ll need to boot on a USB rescue disk and do something along + these lines: + + ```ShellSession + # mkdir root + # mount /dev/sdaX root + # mkdir root/nixos-root + # mv -v root/* root/nixos-root/ + # mv -v root/nixos-root/old-root/* root/ + # mv -v root/boot.bak root/boot # We had renamed this by hand earlier + # umount root + # reboot + ``` + + This may work as is or you might also need to reinstall the boot + loader. + + And of course, if you\'re happy with NixOS and no longer need the + old distribution: + + ```ShellSession + sudo rm -rf /old-root + ``` + +1. It\'s also worth noting that this whole process can be automated. + This is especially useful for Cloud VMs, where provider do not + provide NixOS. For instance, + [nixos-infect](https://github.com/elitak/nixos-infect) uses the + lustrate process to convert Digital Ocean droplets to NixOS from + other distributions automatically. diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixos/doc/manual/installation/installing-from-other-distro.xml deleted file mode 100644 index 63d1d52b01b2..000000000000 --- a/nixos/doc/manual/installation/installing-from-other-distro.xml +++ /dev/null @@ -1,364 +0,0 @@ - -
- Installing from another Linux distribution - - - Because Nix (the package manager) & Nixpkgs (the Nix packages collection) - can both be installed on any (most?) Linux distributions, they can be used to - install NixOS in various creative ways. You can, for instance: - - - - - - Install NixOS on another partition, from your existing Linux distribution - (without the use of a USB or optical device!) - - - - - Install NixOS on the same partition (in place!), from your existing - non-NixOS Linux distribution using NIXOS_LUSTRATE. - - - - - Install NixOS on your hard drive from the Live CD of any Linux - distribution. - - - - - - The first steps to all these are the same: - - - - - - Install the Nix package manager: - - - Short version: - - -$ curl -L https://nixos.org/nix/install | sh -$ . $HOME/.nix-profile/etc/profile.d/nix.sh # …or open a fresh shell - - More details in the - - Nix manual - - - - - Switch to the NixOS channel: - - - If you've just installed Nix on a non-NixOS distribution, you will be on - the nixpkgs channel by default. - - -$ nix-channel --list -nixpkgs https://nixos.org/channels/nixpkgs-unstable - - As that channel gets released without running the NixOS tests, it will be - safer to use the nixos-* channels instead: - - -$ nix-channel --add https://nixos.org/channels/nixos-version nixpkgs - - You may want to throw in a nix-channel --update for good - measure. - - - - - Install the NixOS installation tools: - - - You'll need nixos-generate-config and - nixos-install, but this also makes some man pages - and nixos-enter available, just in case you want to chroot into your - NixOS partition. NixOS installs these by default, but you don't have - NixOS yet.. - - $ nix-env -f '<nixpkgs>' -iA nixos-install-tools - - - - - The following 5 steps are only for installing NixOS to another partition. - For installing NixOS in place using NIXOS_LUSTRATE, - skip ahead. - - - - Prepare your target partition: - - - At this point it is time to prepare your target partition. Please refer to - the partitioning, file-system creation, and mounting steps of - - - - If you're about to install NixOS in place using - NIXOS_LUSTRATE there is nothing to do for this step. - - - - - Generate your NixOS configuration: - -$ sudo `which nixos-generate-config` --root /mnt - - You'll probably want to edit the configuration files. Refer to the - nixos-generate-config step in - for more - information. - - - Consider setting up the NixOS bootloader to give you the ability to boot on - your existing Linux partition. For instance, if you're using GRUB and your - existing distribution is running Ubuntu, you may want to add something like - this to your configuration.nix: - - - = '' - menuentry "Ubuntu" { - search --set=ubuntu --fs-uuid 3cc3e652-0c1f-4800-8451-033754f68e6e - configfile "($ubuntu)/boot/grub/grub.cfg" - } -''; - - (You can find the appropriate UUID for your partition in - /dev/disk/by-uuid) - - - - - Create the nixbld group and user on your original - distribution: - - -$ sudo groupadd -g 30000 nixbld -$ sudo useradd -u 30000 -g nixbld -G nixbld nixbld - - - - Download/build/install NixOS: - - - - Once you complete this step, you might no longer be able to boot on - existing systems without the help of a rescue USB drive or similar. - - - - - On some distributions there are separate PATHS for programs intended only for root. - In order for the installation to succeed, you might have to use PATH="$PATH:/usr/sbin:/sbin" - in the following command. - - -$ sudo PATH="$PATH" NIX_PATH="$NIX_PATH" `which nixos-install` --root /mnt - - Again, please refer to the nixos-install step in - for more information. - - - That should be it for installation to another partition! - - - - - Optionally, you may want to clean up your non-NixOS distribution: - - -$ sudo userdel nixbld -$ sudo groupdel nixbld - - If you do not wish to keep the Nix package manager installed either, run - something like sudo rm -rv ~/.nix-* /nix and remove the - line that the Nix installer added to your ~/.profile. - - - - - - The following steps are only for installing NixOS in place using - NIXOS_LUSTRATE: - - - - Generate your NixOS configuration: - -$ sudo `which nixos-generate-config` --root / - - Note that this will place the generated configuration files in - /etc/nixos. You'll probably want to edit the - configuration files. Refer to the nixos-generate-config - step in for more - information. - - - You'll likely want to set a root password for your first boot using the - configuration files because you won't have a chance to enter a password - until after you reboot. You can initalize the root password to an empty one - with this line: (and of course don't forget to set one once you've rebooted - or to lock the account with sudo passwd -l root if you - use sudo) - - -users.users.root.initialHashedPassword = ""; - - - - - Build the NixOS closure and install it in the system - profile: - -$ nix-env -p /nix/var/nix/profiles/system -f '<nixpkgs/nixos>' -I nixos-config=/etc/nixos/configuration.nix -iA system - - - - Change ownership of the /nix tree to root (since your - Nix install was probably single user): - -$ sudo chown -R 0.0 /nix - - - - Set up the /etc/NIXOS and - /etc/NIXOS_LUSTRATE files: - - - /etc/NIXOS officializes that this is now a NixOS - partition (the bootup scripts require its presence). - - - /etc/NIXOS_LUSTRATE tells the NixOS bootup scripts to - move everything that's in the root partition to - /old-root. This will move your existing distribution out - of the way in the very early stages of the NixOS bootup. There are - exceptions (we do need to keep NixOS there after all), so the NixOS - lustrate process will not touch: - - - - - The /nix directory - - - - - The /boot directory - - - - - Any file or directory listed in /etc/NIXOS_LUSTRATE - (one per line) - - - - - - Support for NIXOS_LUSTRATE was added in NixOS 16.09. - The act of "lustrating" refers to the wiping of the existing distribution. - Creating /etc/NIXOS_LUSTRATE can also be used on NixOS - to remove all mutable files from your root partition (anything that's not - in /nix or /boot gets "lustrated" on - the next boot. - - - lustrate /ˈlʌstreɪt/ verb. - - - purify by expiatory sacrifice, ceremonial washing, or some other ritual - action. - - - - Let's create the files: - - -$ sudo touch /etc/NIXOS -$ sudo touch /etc/NIXOS_LUSTRATE - - - Let's also make sure the NixOS configuration files are kept once we reboot - on NixOS: - - -$ echo etc/nixos | sudo tee -a /etc/NIXOS_LUSTRATE - - - - - Finally, move the /boot directory of your current - distribution out of the way (the lustrate process will take care of the - rest once you reboot, but this one must be moved out now because NixOS - needs to install its own boot files: - - - - Once you complete this step, your current distribution will no longer be - bootable! If you didn't get all the NixOS configuration right, especially - those settings pertaining to boot loading and root partition, NixOS may - not be bootable either. Have a USB rescue device ready in case this - happens. - - - -$ sudo mv -v /boot /boot.bak && -sudo /nix/var/nix/profiles/system/bin/switch-to-configuration boot - - - Cross your fingers, reboot, hopefully you should get a NixOS prompt! - - - - - If for some reason you want to revert to the old distribution, you'll need - to boot on a USB rescue disk and do something along these lines: - - -# mkdir root -# mount /dev/sdaX root -# mkdir root/nixos-root -# mv -v root/* root/nixos-root/ -# mv -v root/nixos-root/old-root/* root/ -# mv -v root/boot.bak root/boot # We had renamed this by hand earlier -# umount root -# reboot - - This may work as is or you might also need to reinstall the boot loader - - - And of course, if you're happy with NixOS and no longer need the old - distribution: - -sudo rm -rf /old-root - - - - It's also worth noting that this whole process can be automated. This is - especially useful for Cloud VMs, where provider do not provide NixOS. For - instance, - nixos-infect - uses the lustrate process to convert Digital Ocean droplets to NixOS from - other distributions automatically. - - - -
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index 55375469447f..4f7db8bc6072 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -572,7 +572,7 @@ Retype new UNIX password: *** - +
From 445e922b5bdc104b9797fc2bd58a243d3b942572 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 2 Jul 2021 22:52:47 +0800 Subject: [PATCH 029/167] nixos: nixos/doc/manual/installation/installing-behind-a-proxy.xml to CommonMark --- .../installing-behind-a-proxy.section.xml | 41 ++++++++++++++++ .../installing-behind-a-proxy.section.md | 29 +++++++++++ .../installing-behind-a-proxy.xml | 48 ------------------- nixos/doc/manual/installation/installing.xml | 2 +- 4 files changed, 71 insertions(+), 49 deletions(-) create mode 100644 nixos/doc/manual/from_md/installation/installing-behind-a-proxy.section.xml create mode 100644 nixos/doc/manual/installation/installing-behind-a-proxy.section.md delete mode 100644 nixos/doc/manual/installation/installing-behind-a-proxy.xml diff --git a/nixos/doc/manual/from_md/installation/installing-behind-a-proxy.section.xml b/nixos/doc/manual/from_md/installation/installing-behind-a-proxy.section.xml new file mode 100644 index 000000000000..a551807cd47c --- /dev/null +++ b/nixos/doc/manual/from_md/installation/installing-behind-a-proxy.section.xml @@ -0,0 +1,41 @@ +
+ Installing behind a proxy + + To install NixOS behind a proxy, do the following before running + nixos-install. + + + + + Update proxy configuration in + /mnt/etc/nixos/configuration.nix to keep the + internet accessible after reboot. + + +networking.proxy.default = "http://user:password@proxy:port/"; +networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + + + + Setup the proxy environment variables in the shell where you are + running nixos-install. + + +# proxy_url="http://user:password@proxy:port/" +# export http_proxy="$proxy_url" +# export HTTP_PROXY="$proxy_url" +# export https_proxy="$proxy_url" +# export HTTPS_PROXY="$proxy_url" + + + + + + If you are switching networks with different proxy configurations, + use the specialisation option in + configuration.nix to switch proxies at runtime. + Refer to for more information. + + +
diff --git a/nixos/doc/manual/installation/installing-behind-a-proxy.section.md b/nixos/doc/manual/installation/installing-behind-a-proxy.section.md new file mode 100644 index 000000000000..aca151531d0f --- /dev/null +++ b/nixos/doc/manual/installation/installing-behind-a-proxy.section.md @@ -0,0 +1,29 @@ +# Installing behind a proxy {#sec-installing-behind-proxy} + +To install NixOS behind a proxy, do the following before running +`nixos-install`. + +1. Update proxy configuration in `/mnt/etc/nixos/configuration.nix` to + keep the internet accessible after reboot. + + ```nix + networking.proxy.default = "http://user:password@proxy:port/"; + networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + ``` + +1. Setup the proxy environment variables in the shell where you are + running `nixos-install`. + + ```ShellSession + # proxy_url="http://user:password@proxy:port/" + # export http_proxy="$proxy_url" + # export HTTP_PROXY="$proxy_url" + # export https_proxy="$proxy_url" + # export HTTPS_PROXY="$proxy_url" + ``` + +::: {.note} +If you are switching networks with different proxy configurations, use +the `specialisation` option in `configuration.nix` to switch proxies at +runtime. Refer to [](#ch-options) for more information. +::: diff --git a/nixos/doc/manual/installation/installing-behind-a-proxy.xml b/nixos/doc/manual/installation/installing-behind-a-proxy.xml deleted file mode 100644 index 6788882aa8c0..000000000000 --- a/nixos/doc/manual/installation/installing-behind-a-proxy.xml +++ /dev/null @@ -1,48 +0,0 @@ -
- Installing behind a proxy - - - To install NixOS behind a proxy, do the following before running - nixos-install. - - - - - - Update proxy configuration in - /mnt/etc/nixos/configuration.nix to keep the internet - accessible after reboot. - - -networking.proxy.default = "http://user:password@proxy:port/"; -networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - - - - Setup the proxy environment variables in the shell where you are running - nixos-install. - - -# proxy_url="http://user:password@proxy:port/" -# export http_proxy="$proxy_url" -# export HTTP_PROXY="$proxy_url" -# export https_proxy="$proxy_url" -# export HTTPS_PROXY="$proxy_url" - - - - - - - If you are switching networks with different proxy configurations, use the - specialisation option in - configuration.nix to switch proxies at runtime. Refer to - for more information. - - -
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index 4f7db8bc6072..49c68c616be6 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -574,6 +574,6 @@ Retype new UNIX password: *** - + From 409934a6e5f29ea9b9ac0ffc186b9a4772c4145a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Jul 2021 12:00:40 +0800 Subject: [PATCH 030/167] nixos: nixos/doc/manual/development/sources.xml to CommonMark --- nixos/doc/manual/development/development.xml | 2 +- .../doc/manual/development/sources.chapter.md | 77 ++++++++++++++++ nixos/doc/manual/development/sources.xml | 85 ------------------ .../from_md/development/sources.chapter.xml | 90 +++++++++++++++++++ 4 files changed, 168 insertions(+), 86 deletions(-) create mode 100644 nixos/doc/manual/development/sources.chapter.md delete mode 100644 nixos/doc/manual/development/sources.xml create mode 100644 nixos/doc/manual/from_md/development/sources.chapter.xml diff --git a/nixos/doc/manual/development/development.xml b/nixos/doc/manual/development/development.xml index eb505567962c..d536d877add7 100644 --- a/nixos/doc/manual/development/development.xml +++ b/nixos/doc/manual/development/development.xml @@ -9,7 +9,7 @@ This chapter describes how you can modify and extend NixOS. - + diff --git a/nixos/doc/manual/development/sources.chapter.md b/nixos/doc/manual/development/sources.chapter.md new file mode 100644 index 000000000000..88173f7135bd --- /dev/null +++ b/nixos/doc/manual/development/sources.chapter.md @@ -0,0 +1,77 @@ +# Getting the Sources {#sec-getting-sources} + +By default, NixOS's `nixos-rebuild` command uses the NixOS and Nixpkgs +sources provided by the `nixos` channel (kept in +`/nix/var/nix/profiles/per-user/root/channels/nixos`). To modify NixOS, +however, you should check out the latest sources from Git. This is as +follows: + +```ShellSession +$ git clone https://github.com/NixOS/nixpkgs +$ cd nixpkgs +$ git remote update origin +``` + +This will check out the latest Nixpkgs sources to `./nixpkgs` the NixOS +sources to `./nixpkgs/nixos`. (The NixOS source tree lives in a +subdirectory of the Nixpkgs repository.) The `nixpkgs` repository has +branches that correspond to each Nixpkgs/NixOS channel (see +[](#sec-upgrading) for more information about channels). Thus, the +Git branch `origin/nixos-17.03` will contain the latest built and tested +version available in the `nixos-17.03` channel. + +It's often inconvenient to develop directly on the master branch, since +if somebody has just committed (say) a change to GCC, then the binary +cache may not have caught up yet and you'll have to rebuild everything +from source. So you may want to create a local branch based on your +current NixOS version: + +```ShellSession +$ nixos-version +17.09pre104379.6e0b727 (Hummingbird) + +$ git checkout -b local 6e0b727 +``` + +Or, to base your local branch on the latest version available in a NixOS +channel: + +```ShellSession +$ git remote update origin +$ git checkout -b local origin/nixos-17.03 +``` + +(Replace `nixos-17.03` with the name of the channel you want to use.) +You can use `git merge` or `git + rebase` to keep your local branch in sync with the channel, e.g. + +```ShellSession +$ git remote update origin +$ git merge origin/nixos-17.03 +``` + +You can use `git cherry-pick` to copy commits from your local branch to +the upstream branch. + +If you want to rebuild your system using your (modified) sources, you +need to tell `nixos-rebuild` about them using the `-I` flag: + +```ShellSession +# nixos-rebuild switch -I nixpkgs=/my/sources/nixpkgs +``` + +If you want `nix-env` to use the expressions in `/my/sources`, use +`nix-env -f + /my/sources/nixpkgs`, or change the default by adding a symlink in +`~/.nix-defexpr`: + +```ShellSession +$ ln -s /my/sources/nixpkgs ~/.nix-defexpr/nixpkgs +``` + +You may want to delete the symlink `~/.nix-defexpr/channels_root` to +prevent root's NixOS channel from clashing with your own tree (this may +break the command-not-found utility though). If you want to go back to +the default state, you may just remove the `~/.nix-defexpr` directory +completely, log out and log in again and it should have been recreated +with a link to the root channels. diff --git a/nixos/doc/manual/development/sources.xml b/nixos/doc/manual/development/sources.xml deleted file mode 100644 index b333ccabb420..000000000000 --- a/nixos/doc/manual/development/sources.xml +++ /dev/null @@ -1,85 +0,0 @@ - - Getting the Sources - - By default, NixOS’s nixos-rebuild command uses the NixOS - and Nixpkgs sources provided by the nixos channel (kept in - /nix/var/nix/profiles/per-user/root/channels/nixos). To - modify NixOS, however, you should check out the latest sources from Git. This - is as follows: - -$ git clone https://github.com/NixOS/nixpkgs -$ cd nixpkgs -$ git remote update origin - - This will check out the latest Nixpkgs sources to - ./nixpkgs the NixOS sources to - ./nixpkgs/nixos. (The NixOS source tree lives in a - subdirectory of the Nixpkgs repository.) The - nixpkgs repository has branches that correspond - to each Nixpkgs/NixOS channel (see for more - information about channels). Thus, the Git branch - origin/nixos-17.03 will contain the latest built and - tested version available in the nixos-17.03 channel. - - - It’s often inconvenient to develop directly on the master branch, since if - somebody has just committed (say) a change to GCC, then the binary cache may - not have caught up yet and you’ll have to rebuild everything from source. - So you may want to create a local branch based on your current NixOS version: - -$ nixos-version -17.09pre104379.6e0b727 (Hummingbird) - -$ git checkout -b local 6e0b727 - - Or, to base your local branch on the latest version available in a NixOS - channel: - -$ git remote update origin -$ git checkout -b local origin/nixos-17.03 - - (Replace nixos-17.03 with the name of the channel you want - to use.) You can use git merge or git - rebase to keep your local branch in sync with the channel, e.g. - -$ git remote update origin -$ git merge origin/nixos-17.03 - - You can use git cherry-pick to copy commits from your - local branch to the upstream branch. - - - If you want to rebuild your system using your (modified) sources, you need to - tell nixos-rebuild about them using the - flag: - -# nixos-rebuild switch -I nixpkgs=/my/sources/nixpkgs - - - - If you want nix-env to use the expressions in - /my/sources, use nix-env -f - /my/sources/nixpkgs, or change the - default by adding a symlink in ~/.nix-defexpr: - -$ ln -s /my/sources/nixpkgs ~/.nix-defexpr/nixpkgs - - You may want to delete the symlink - ~/.nix-defexpr/channels_root to prevent root’s NixOS - channel from clashing with your own tree (this may break the - command-not-found utility though). If you want to go back to the default - state, you may just remove the ~/.nix-defexpr directory - completely, log out and log in again and it should have been recreated with a - link to the root channels. - - - diff --git a/nixos/doc/manual/from_md/development/sources.chapter.xml b/nixos/doc/manual/from_md/development/sources.chapter.xml new file mode 100644 index 000000000000..aac18c9d06c8 --- /dev/null +++ b/nixos/doc/manual/from_md/development/sources.chapter.xml @@ -0,0 +1,90 @@ + + Getting the Sources + + By default, NixOS’s nixos-rebuild command uses + the NixOS and Nixpkgs sources provided by the + nixos channel (kept in + /nix/var/nix/profiles/per-user/root/channels/nixos). + To modify NixOS, however, you should check out the latest sources + from Git. This is as follows: + + +$ git clone https://github.com/NixOS/nixpkgs +$ cd nixpkgs +$ git remote update origin + + + This will check out the latest Nixpkgs sources to + ./nixpkgs the NixOS sources to + ./nixpkgs/nixos. (The NixOS source tree lives in + a subdirectory of the Nixpkgs repository.) The + nixpkgs repository has branches that correspond + to each Nixpkgs/NixOS channel (see + for more information about channels). Thus, the Git branch + origin/nixos-17.03 will contain the latest built + and tested version available in the nixos-17.03 + channel. + + + It’s often inconvenient to develop directly on the master branch, + since if somebody has just committed (say) a change to GCC, then the + binary cache may not have caught up yet and you’ll have to rebuild + everything from source. So you may want to create a local branch + based on your current NixOS version: + + +$ nixos-version +17.09pre104379.6e0b727 (Hummingbird) + +$ git checkout -b local 6e0b727 + + + Or, to base your local branch on the latest version available in a + NixOS channel: + + +$ git remote update origin +$ git checkout -b local origin/nixos-17.03 + + + (Replace nixos-17.03 with the name of the channel + you want to use.) You can use git merge or + git rebase to keep your local branch in sync with + the channel, e.g. + + +$ git remote update origin +$ git merge origin/nixos-17.03 + + + You can use git cherry-pick to copy commits from + your local branch to the upstream branch. + + + If you want to rebuild your system using your (modified) sources, + you need to tell nixos-rebuild about them using + the -I flag: + + +# nixos-rebuild switch -I nixpkgs=/my/sources/nixpkgs + + + If you want nix-env to use the expressions in + /my/sources, use + nix-env -f /my/sources/nixpkgs, or change the + default by adding a symlink in ~/.nix-defexpr: + + +$ ln -s /my/sources/nixpkgs ~/.nix-defexpr/nixpkgs + + + You may want to delete the symlink + ~/.nix-defexpr/channels_root to prevent root’s + NixOS channel from clashing with your own tree (this may break the + command-not-found utility though). If you want to go back to the + default state, you may just remove the + ~/.nix-defexpr directory completely, log out and + log in again and it should have been recreated with a link to the + root channels. + + From 51bf2e175ea8f511f6ed94ecb6c7cca3a873ccd7 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Jul 2021 12:01:42 +0800 Subject: [PATCH 031/167] nixos: nixos/doc/manual/development/building-parts.xml to CommonMark --- .../development/building-parts.chapter.md | 74 +++++++++++ .../doc/manual/development/building-parts.xml | 121 ----------------- nixos/doc/manual/development/development.xml | 2 +- .../development/building-parts.chapter.xml | 124 ++++++++++++++++++ 4 files changed, 199 insertions(+), 122 deletions(-) create mode 100644 nixos/doc/manual/development/building-parts.chapter.md delete mode 100644 nixos/doc/manual/development/building-parts.xml create mode 100644 nixos/doc/manual/from_md/development/building-parts.chapter.xml diff --git a/nixos/doc/manual/development/building-parts.chapter.md b/nixos/doc/manual/development/building-parts.chapter.md new file mode 100644 index 000000000000..79ddaa37140b --- /dev/null +++ b/nixos/doc/manual/development/building-parts.chapter.md @@ -0,0 +1,74 @@ +# Building Specific Parts of NixOS {#sec-building-parts} + +With the command `nix-build`, you can build specific parts of your NixOS +configuration. This is done as follows: + +```ShellSession +$ cd /path/to/nixpkgs/nixos +$ nix-build -A config.option +``` + +where `option` is a NixOS option with type "derivation" (i.e. something +that can be built). Attributes of interest include: + +`system.build.toplevel` + +: The top-level option that builds the entire NixOS system. Everything + else in your configuration is indirectly pulled in by this option. + This is what `nixos-rebuild` builds and what `/run/current-system` + points to afterwards. + + A shortcut to build this is: + + ```ShellSession + $ nix-build -A system + ``` + +`system.build.manual.manualHTML` + +: The NixOS manual. + +`system.build.etc` + +: A tree of symlinks that form the static parts of `/etc`. + +`system.build.initialRamdisk` , `system.build.kernel` + +: The initial ramdisk and kernel of the system. This allows a quick + way to test whether the kernel and the initial ramdisk boot + correctly, by using QEMU's `-kernel` and `-initrd` options: + + ```ShellSession + $ nix-build -A config.system.build.initialRamdisk -o initrd + $ nix-build -A config.system.build.kernel -o kernel + $ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/null + ``` + +`system.build.nixos-rebuild` , `system.build.nixos-install` , `system.build.nixos-generate-config` + +: These build the corresponding NixOS commands. + +`systemd.units.unit-name.unit` + +: This builds the unit with the specified name. Note that since unit + names contain dots (e.g. `httpd.service`), you need to put them + between quotes, like this: + + ```ShellSession + $ nix-build -A 'config.systemd.units."httpd.service".unit' + ``` + + You can also test individual units, without rebuilding the whole + system, by putting them in `/run/systemd/system`: + + ```ShellSession + $ cp $(nix-build -A 'config.systemd.units."httpd.service".unit')/httpd.service \ + /run/systemd/system/tmp-httpd.service + # systemctl daemon-reload + # systemctl start tmp-httpd.service + ``` + + Note that the unit must not have the same name as any unit in + `/etc/systemd/system` since those take precedence over + `/run/systemd/system`. That's why the unit is installed as + `tmp-httpd.service` here. diff --git a/nixos/doc/manual/development/building-parts.xml b/nixos/doc/manual/development/building-parts.xml deleted file mode 100644 index 88369fb891b3..000000000000 --- a/nixos/doc/manual/development/building-parts.xml +++ /dev/null @@ -1,121 +0,0 @@ - - Building Specific Parts of NixOS - - With the command nix-build, you can build specific parts - of your NixOS configuration. This is done as follows: - -$ cd /path/to/nixpkgs/nixos -$ nix-build -A config.option - where option is a NixOS option with type - “derivation” (i.e. something that can be built). Attributes of interest - include: - - - - system.build.toplevel - - - - The top-level option that builds the entire NixOS system. Everything else - in your configuration is indirectly pulled in by this option. This is - what nixos-rebuild builds and what - /run/current-system points to afterwards. - - - A shortcut to build this is: - -$ nix-build -A system - - - - - - system.build.manual.manualHTML - - - - The NixOS manual. - - - - - - system.build.etc - - - - A tree of symlinks that form the static parts of - /etc. - - - - - - system.build.initialRamdisk - - - system.build.kernel - - - - The initial ramdisk and kernel of the system. This allows a quick way to - test whether the kernel and the initial ramdisk boot correctly, by using - QEMU’s and options: - -$ nix-build -A config.system.build.initialRamdisk -o initrd -$ nix-build -A config.system.build.kernel -o kernel -$ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/null - - - - - - - system.build.nixos-rebuild - - - system.build.nixos-install - - - system.build.nixos-generate-config - - - - These build the corresponding NixOS commands. - - - - - - systemd.units.unit-name.unit - - - - This builds the unit with the specified name. Note that since unit names - contain dots (e.g. httpd.service), you need to put - them between quotes, like this: - -$ nix-build -A 'config.systemd.units."httpd.service".unit' - - You can also test individual units, without rebuilding the whole system, - by putting them in /run/systemd/system: - -$ cp $(nix-build -A 'config.systemd.units."httpd.service".unit')/httpd.service \ - /run/systemd/system/tmp-httpd.service -# systemctl daemon-reload -# systemctl start tmp-httpd.service - - Note that the unit must not have the same name as any unit in - /etc/systemd/system since those take precedence over - /run/systemd/system. That’s why the unit is - installed as tmp-httpd.service here. - - - - - - diff --git a/nixos/doc/manual/development/development.xml b/nixos/doc/manual/development/development.xml index d536d877add7..5b2fedf16066 100644 --- a/nixos/doc/manual/development/development.xml +++ b/nixos/doc/manual/development/development.xml @@ -11,7 +11,7 @@ - + diff --git a/nixos/doc/manual/from_md/development/building-parts.chapter.xml b/nixos/doc/manual/from_md/development/building-parts.chapter.xml new file mode 100644 index 000000000000..4df24cc95652 --- /dev/null +++ b/nixos/doc/manual/from_md/development/building-parts.chapter.xml @@ -0,0 +1,124 @@ + + Building Specific Parts of NixOS + + With the command nix-build, you can build + specific parts of your NixOS configuration. This is done as follows: + + +$ cd /path/to/nixpkgs/nixos +$ nix-build -A config.option + + + where option is a NixOS option with type + derivation (i.e. something that can be built). + Attributes of interest include: + + + + + system.build.toplevel + + + + The top-level option that builds the entire NixOS system. + Everything else in your configuration is indirectly pulled in + by this option. This is what nixos-rebuild + builds and what /run/current-system points + to afterwards. + + + A shortcut to build this is: + + +$ nix-build -A system + + + + + + system.build.manual.manualHTML + + + + The NixOS manual. + + + + + + system.build.etc + + + + A tree of symlinks that form the static parts of + /etc. + + + + + + system.build.initialRamdisk , + system.build.kernel + + + + The initial ramdisk and kernel of the system. This allows a + quick way to test whether the kernel and the initial ramdisk + boot correctly, by using QEMU’s -kernel and + -initrd options: + + +$ nix-build -A config.system.build.initialRamdisk -o initrd +$ nix-build -A config.system.build.kernel -o kernel +$ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/null + + + + + + system.build.nixos-rebuild , + system.build.nixos-install , + system.build.nixos-generate-config + + + + These build the corresponding NixOS commands. + + + + + + systemd.units.unit-name.unit + + + + This builds the unit with the specified name. Note that since + unit names contain dots (e.g. + httpd.service), you need to put them + between quotes, like this: + + +$ nix-build -A 'config.systemd.units."httpd.service".unit' + + + You can also test individual units, without rebuilding the + whole system, by putting them in + /run/systemd/system: + + +$ cp $(nix-build -A 'config.systemd.units."httpd.service".unit')/httpd.service \ + /run/systemd/system/tmp-httpd.service +# systemctl daemon-reload +# systemctl start tmp-httpd.service + + + Note that the unit must not have the same name as any unit in + /etc/systemd/system since those take + precedence over /run/systemd/system. That’s + why the unit is installed as + tmp-httpd.service here. + + + + + From d80bde37a820767757a5ab33a83a7485822f5625 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Jul 2021 12:02:48 +0800 Subject: [PATCH 032/167] nixos: nixos/doc/manual/development/testing-installer.xml to CommonMark --- nixos/doc/manual/development/development.xml | 2 +- .../development/testing-installer.chapter.md | 18 +++++++++++++++ .../manual/development/testing-installer.xml | 22 ------------------- .../development/testing-installer.chapter.xml | 22 +++++++++++++++++++ 4 files changed, 41 insertions(+), 23 deletions(-) create mode 100644 nixos/doc/manual/development/testing-installer.chapter.md delete mode 100644 nixos/doc/manual/development/testing-installer.xml create mode 100644 nixos/doc/manual/from_md/development/testing-installer.chapter.xml diff --git a/nixos/doc/manual/development/development.xml b/nixos/doc/manual/development/development.xml index 5b2fedf16066..05c6a5b11341 100644 --- a/nixos/doc/manual/development/development.xml +++ b/nixos/doc/manual/development/development.xml @@ -15,5 +15,5 @@ - + diff --git a/nixos/doc/manual/development/testing-installer.chapter.md b/nixos/doc/manual/development/testing-installer.chapter.md new file mode 100644 index 000000000000..2eaa01614920 --- /dev/null +++ b/nixos/doc/manual/development/testing-installer.chapter.md @@ -0,0 +1,18 @@ +# Testing the Installer {#ch-testing-installer} + +Building, burning, and booting from an installation CD is rather +tedious, so here is a quick way to see if the installer works properly: + +```ShellSession +# mount -t tmpfs none /mnt +# nixos-generate-config --root /mnt +$ nix-build '' -A config.system.build.nixos-install +# ./result/bin/nixos-install +``` + +To start a login shell in the new NixOS installation in `/mnt`: + +```ShellSession +$ nix-build '' -A config.system.build.nixos-enter +# ./result/bin/nixos-enter +``` diff --git a/nixos/doc/manual/development/testing-installer.xml b/nixos/doc/manual/development/testing-installer.xml deleted file mode 100644 index 902f995fbc1b..000000000000 --- a/nixos/doc/manual/development/testing-installer.xml +++ /dev/null @@ -1,22 +0,0 @@ - - Testing the Installer - - Building, burning, and booting from an installation CD is rather tedious, so - here is a quick way to see if the installer works properly: - -# mount -t tmpfs none /mnt -# nixos-generate-config --root /mnt -$ nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-install -# ./result/bin/nixos-install - To start a login shell in the new NixOS installation in - /mnt: - -$ nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-enter -# ./result/bin/nixos-enter - - - diff --git a/nixos/doc/manual/from_md/development/testing-installer.chapter.xml b/nixos/doc/manual/from_md/development/testing-installer.chapter.xml new file mode 100644 index 000000000000..286d49f3c291 --- /dev/null +++ b/nixos/doc/manual/from_md/development/testing-installer.chapter.xml @@ -0,0 +1,22 @@ + + Testing the Installer + + Building, burning, and booting from an installation CD is rather + tedious, so here is a quick way to see if the installer works + properly: + + +# mount -t tmpfs none /mnt +# nixos-generate-config --root /mnt +$ nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-install +# ./result/bin/nixos-install + + + To start a login shell in the new NixOS installation in + /mnt: + + +$ nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-enter +# ./result/bin/nixos-enter + + From 1f3d513839a5e721798d155fe4d1b3e5e613383e Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Jul 2021 12:09:57 +0800 Subject: [PATCH 033/167] nixos: nixos/doc/manual/development/writing-documentation.xml to CommonMark --- nixos/doc/manual/development/development.xml | 2 +- .../writing-documentation.chapter.md | 93 +++++++++++ .../development/writing-documentation.xml | 150 ------------------ .../writing-documentation.chapter.xml | 144 +++++++++++++++++ 4 files changed, 238 insertions(+), 151 deletions(-) create mode 100644 nixos/doc/manual/development/writing-documentation.chapter.md delete mode 100644 nixos/doc/manual/development/writing-documentation.xml create mode 100644 nixos/doc/manual/from_md/development/writing-documentation.chapter.xml diff --git a/nixos/doc/manual/development/development.xml b/nixos/doc/manual/development/development.xml index 05c6a5b11341..670a391e3801 100644 --- a/nixos/doc/manual/development/development.xml +++ b/nixos/doc/manual/development/development.xml @@ -12,7 +12,7 @@ - + diff --git a/nixos/doc/manual/development/writing-documentation.chapter.md b/nixos/doc/manual/development/writing-documentation.chapter.md new file mode 100644 index 000000000000..7c29f600d701 --- /dev/null +++ b/nixos/doc/manual/development/writing-documentation.chapter.md @@ -0,0 +1,93 @@ +# Writing NixOS Documentation {#sec-writing-documentation} + +As NixOS grows, so too does the need for a catalogue and explanation of +its extensive functionality. Collecting pertinent information from +disparate sources and presenting it in an accessible style would be a +worthy contribution to the project. + +## Building the Manual {#sec-writing-docs-building-the-manual} + +The DocBook sources of the [](#book-nixos-manual) are in the +[`nixos/doc/manual`](https://github.com/NixOS/nixpkgs/tree/master/nixos/doc/manual) +subdirectory of the Nixpkgs repository. + +You can quickly validate your edits with `make`: + +```ShellSession +$ cd /path/to/nixpkgs/nixos/doc/manual +$ nix-shell +nix-shell$ make +``` + +Once you are done making modifications to the manual, it\'s important to +build it before committing. You can do that as follows: + +```ShellSession +nix-build nixos/release.nix -A manual.x86_64-linux +``` + +When this command successfully finishes, it will tell you where the +manual got generated. The HTML will be accessible through the `result` +symlink at `./result/share/doc/nixos/index.html`. + +## Editing DocBook XML {#sec-writing-docs-editing-docbook-xml} + +For general information on how to write in DocBook, see [DocBook 5: The +Definitive Guide](http://www.docbook.org/tdg5/en/html/docbook.html). + +Emacs nXML Mode is very helpful for editing DocBook XML because it +validates the document as you write, and precisely locates errors. To +use it, see [](#sec-emacs-docbook-xml). + +[Pandoc](http://pandoc.org) can generate DocBook XML from a multitude of +formats, which makes a good starting point. Here is an example of Pandoc +invocation to convert GitHub-Flavoured MarkDown to DocBook 5 XML: + +```ShellSession +pandoc -f markdown_github -t docbook5 docs.md -o my-section.md +``` + +Pandoc can also quickly convert a single `section.xml` to HTML, which is +helpful when drafting. + +Sometimes writing valid DocBook is simply too difficult. In this case, +submit your documentation updates in a [GitHub +Issue](https://github.com/NixOS/nixpkgs/issues/new) and someone will +handle the conversion to XML for you. + +## Creating a Topic {#sec-writing-docs-creating-a-topic} + +You can use an existing topic as a basis for the new topic or create a +topic from scratch. + +Keep the following guidelines in mind when you create and add a topic: + +- The NixOS [`book`](http://www.docbook.org/tdg5/en/html/book.html) + element is in `nixos/doc/manual/manual.xml`. It includes several + [`parts`](http://www.docbook.org/tdg5/en/html/book.html) which are in + subdirectories. + +- Store the topic file in the same directory as the `part` to which it + belongs. If your topic is about configuring a NixOS module, then the + XML file can be stored alongside the module definition `nix` file. + +- If you include multiple words in the file name, separate the words + with a dash. For example: `ipv6-config.xml`. + +- Make sure that the `xml:id` value is unique. You can use abbreviations + if the ID is too long. For example: `nixos-config`. + +- Determine whether your topic is a chapter or a section. If you are + unsure, open an existing topic file and check whether the main + element is chapter or section. + +## Adding a Topic to the Book {#sec-writing-docs-adding-a-topic} + +Open the parent XML file and add an `xi:include` element to the list of +chapters with the file name of the topic that you created. If you +created a `section`, you add the file to the `chapter` file. If you created +a `chapter`, you add the file to the `part` file. + +If the topic is about configuring a NixOS module, it can be +automatically included in the manual by using the `meta.doc` attribute. +See [](#sec-meta-attributes) for an explanation. diff --git a/nixos/doc/manual/development/writing-documentation.xml b/nixos/doc/manual/development/writing-documentation.xml deleted file mode 100644 index 89fab6665616..000000000000 --- a/nixos/doc/manual/development/writing-documentation.xml +++ /dev/null @@ -1,150 +0,0 @@ - - Writing NixOS Documentation - - As NixOS grows, so too does the need for a catalogue and explanation of its - extensive functionality. Collecting pertinent information from disparate - sources and presenting it in an accessible style would be a worthy - contribution to the project. - -
- Building the Manual - - - The DocBook sources of the are in the - nixos/doc/manual - subdirectory of the Nixpkgs repository. - - - - You can quickly validate your edits with make: - - - -$ cd /path/to/nixpkgs/nixos/doc/manual -$ nix-shell -nix-shell$ make - - - - Once you are done making modifications to the manual, it's important to - build it before committing. You can do that as follows: - - -nix-build nixos/release.nix -A manual.x86_64-linux - - - When this command successfully finishes, it will tell you where the manual - got generated. The HTML will be accessible through the - result symlink at - ./result/share/doc/nixos/index.html. - -
-
- Editing DocBook XML - - - For general information on how to write in DocBook, see - DocBook - 5: The Definitive Guide. - - - - Emacs nXML Mode is very helpful for editing DocBook XML because it validates - the document as you write, and precisely locates errors. To use it, see - . - - - - Pandoc can generate DocBook XML - from a multitude of formats, which makes a good starting point. - - Pandoc invocation to convert GitHub-Flavoured MarkDown to DocBook 5 XML -pandoc -f markdown_github -t docbook5 docs.md -o my-section.md - - Pandoc can also quickly convert a single section.xml to - HTML, which is helpful when drafting. - - - - Sometimes writing valid DocBook is simply too difficult. In this case, - submit your documentation updates in a - GitHub - Issue and someone will handle the conversion to XML for you. - -
-
- Creating a Topic - - - You can use an existing topic as a basis for the new topic or create a topic - from scratch. - - - - Keep the following guidelines in mind when you create and add a topic: - - - - The NixOS - book - element is in nixos/doc/manual/manual.xml. It - includes several - parts - which are in subdirectories. - - - - - Store the topic file in the same directory as the part to - which it belongs. If your topic is about configuring a NixOS module, then - the XML file can be stored alongside the module definition - nix file. - - - - - If you include multiple words in the file name, separate the words with a - dash. For example: ipv6-config.xml. - - - - - Make sure that the xml:id value is unique. You can use - abbreviations if the ID is too long. For example: - nixos-config. - - - - - Determine whether your topic is a chapter or a section. If you are - unsure, open an existing topic file and check whether the main element is - chapter or section. - - - - -
-
- Adding a Topic to the Book - - - Open the parent XML file and add an xi:include element to - the list of chapters with the file name of the topic that you created. If - you created a section, you add the file to the chapter - file. If you created a chapter, you add the file to the - part file. - - - - If the topic is about configuring a NixOS module, it can be automatically - included in the manual by using the meta.doc attribute. - See for an explanation. - -
- diff --git a/nixos/doc/manual/from_md/development/writing-documentation.chapter.xml b/nixos/doc/manual/from_md/development/writing-documentation.chapter.xml new file mode 100644 index 000000000000..a42067f4e995 --- /dev/null +++ b/nixos/doc/manual/from_md/development/writing-documentation.chapter.xml @@ -0,0 +1,144 @@ + + Writing NixOS Documentation + + As NixOS grows, so too does the need for a catalogue and explanation + of its extensive functionality. Collecting pertinent information + from disparate sources and presenting it in an accessible style + would be a worthy contribution to the project. + +
+ Building the Manual + + The DocBook sources of the + are in the + nixos/doc/manual + subdirectory of the Nixpkgs repository. + + + You can quickly validate your edits with make: + + +$ cd /path/to/nixpkgs/nixos/doc/manual +$ nix-shell +nix-shell$ make + + + Once you are done making modifications to the manual, it's + important to build it before committing. You can do that as + follows: + + +nix-build nixos/release.nix -A manual.x86_64-linux + + + When this command successfully finishes, it will tell you where + the manual got generated. The HTML will be accessible through the + result symlink at + ./result/share/doc/nixos/index.html. + +
+
+ Editing DocBook XML + + For general information on how to write in DocBook, see + DocBook + 5: The Definitive Guide. + + + Emacs nXML Mode is very helpful for editing DocBook XML because it + validates the document as you write, and precisely locates errors. + To use it, see . + + + Pandoc can generate + DocBook XML from a multitude of formats, which makes a good + starting point. Here is an example of Pandoc invocation to convert + GitHub-Flavoured MarkDown to DocBook 5 XML: + + +pandoc -f markdown_github -t docbook5 docs.md -o my-section.md + + + Pandoc can also quickly convert a single + section.xml to HTML, which is helpful when + drafting. + + + Sometimes writing valid DocBook is simply too difficult. In this + case, submit your documentation updates in a + GitHub + Issue and someone will handle the conversion to XML for + you. + +
+
+ Creating a Topic + + You can use an existing topic as a basis for the new topic or + create a topic from scratch. + + + Keep the following guidelines in mind when you create and add a + topic: + + + + + The NixOS + book + element is in nixos/doc/manual/manual.xml. + It includes several + parts + which are in subdirectories. + + + + + Store the topic file in the same directory as the + part to which it belongs. If your topic is + about configuring a NixOS module, then the XML file can be + stored alongside the module definition nix + file. + + + + + If you include multiple words in the file name, separate the + words with a dash. For example: + ipv6-config.xml. + + + + + Make sure that the xml:id value is unique. + You can use abbreviations if the ID is too long. For example: + nixos-config. + + + + + Determine whether your topic is a chapter or a section. If you + are unsure, open an existing topic file and check whether the + main element is chapter or section. + + + +
+
+ Adding a Topic to the Book + + Open the parent XML file and add an xi:include + element to the list of chapters with the file name of the topic + that you created. If you created a section, you + add the file to the chapter file. If you + created a chapter, you add the file to the + part file. + + + If the topic is about configuring a NixOS module, it can be + automatically included in the manual by using the + meta.doc attribute. See + for an explanation. + +
+ From d37933c01f5bda5ed0d838d28d5e8180559ea953 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Jul 2021 14:31:14 +0800 Subject: [PATCH 034/167] nixos: nixos/doc/manual/administration/service-mgmt.xml to CommonMark --- nixos/doc/manual/administration/running.xml | 2 +- .../administration/service-mgmt.chapter.md | 121 +++++++++++++++ .../manual/administration/service-mgmt.xml | 140 ----------------- .../administration/service-mgmt.chapter.xml | 142 ++++++++++++++++++ 4 files changed, 264 insertions(+), 141 deletions(-) create mode 100644 nixos/doc/manual/administration/service-mgmt.chapter.md delete mode 100644 nixos/doc/manual/administration/service-mgmt.xml create mode 100644 nixos/doc/manual/from_md/administration/service-mgmt.chapter.xml diff --git a/nixos/doc/manual/administration/running.xml b/nixos/doc/manual/administration/running.xml index 19bec1f7794d..73dff4691920 100644 --- a/nixos/doc/manual/administration/running.xml +++ b/nixos/doc/manual/administration/running.xml @@ -10,7 +10,7 @@ such as how to use the systemd service manager. - + diff --git a/nixos/doc/manual/administration/service-mgmt.chapter.md b/nixos/doc/manual/administration/service-mgmt.chapter.md new file mode 100644 index 000000000000..ba5c4cf15d54 --- /dev/null +++ b/nixos/doc/manual/administration/service-mgmt.chapter.md @@ -0,0 +1,121 @@ +# Service Management {#sec-systemctl} + +In NixOS, all system services are started and monitored using the +systemd program. systemd is the "init" process of the system (i.e. PID +1), the parent of all other processes. It manages a set of so-called +"units", which can be things like system services (programs), but also +mount points, swap files, devices, targets (groups of units) and more. +Units can have complex dependencies; for instance, one unit can require +that another unit must be successfully started before the first unit can +be started. When the system boots, it starts a unit named +`default.target`; the dependencies of this unit cause all system +services to be started, file systems to be mounted, swap files to be +activated, and so on. + +## Interacting with a running systemd {#sect-nixos-systemd-general} + +The command `systemctl` is the main way to interact with `systemd`. The +following paragraphs demonstrate ways to interact with any OS running +systemd as init system. NixOS is of no exception. The [next section +](#sect-nixos-systemd-nixos) explains NixOS specific things worth +knowing. + +Without any arguments, `systmctl` the status of active units: + +```ShellSession +$ systemctl +-.mount loaded active mounted / +swapfile.swap loaded active active /swapfile +sshd.service loaded active running SSH Daemon +graphical.target loaded active active Graphical Interface +... +``` + +You can ask for detailed status information about a unit, for instance, +the PostgreSQL database service: + +```ShellSession +$ systemctl status postgresql.service +postgresql.service - PostgreSQL Server + Loaded: loaded (/nix/store/pn3q73mvh75gsrl8w7fdlfk3fq5qm5mw-unit/postgresql.service) + Active: active (running) since Mon, 2013-01-07 15:55:57 CET; 9h ago + Main PID: 2390 (postgres) + CGroup: name=systemd:/system/postgresql.service + ├─2390 postgres + ├─2418 postgres: writer process + ├─2419 postgres: wal writer process + ├─2420 postgres: autovacuum launcher process + ├─2421 postgres: stats collector process + └─2498 postgres: zabbix zabbix [local] idle + +Jan 07 15:55:55 hagbard postgres[2394]: [1-1] LOG: database system was shut down at 2013-01-07 15:55:05 CET +Jan 07 15:55:57 hagbard postgres[2390]: [1-1] LOG: database system is ready to accept connections +Jan 07 15:55:57 hagbard postgres[2420]: [1-1] LOG: autovacuum launcher started +Jan 07 15:55:57 hagbard systemd[1]: Started PostgreSQL Server. +``` + +Note that this shows the status of the unit (active and running), all +the processes belonging to the service, as well as the most recent log +messages from the service. + +Units can be stopped, started or restarted: + +```ShellSession +# systemctl stop postgresql.service +# systemctl start postgresql.service +# systemctl restart postgresql.service +``` + +These operations are synchronous: they wait until the service has +finished starting or stopping (or has failed). Starting a unit will +cause the dependencies of that unit to be started as well (if +necessary). + +## systemd in NixOS {#sect-nixos-systemd-nixos} + +Packages in Nixpkgs sometimes provide systemd units with them, usually +in e.g `#pkg-out#/lib/systemd/`. Putting such a package in +`environment.systemPackages` doesn\'t make the service available to +users or the system. + +In order to enable a systemd *system* service with provided upstream +package, use (e.g): + +```nix +systemd.packages = [ pkgs.packagekit ]; +``` + +Usually NixOS modules written by the community do the above, plus take +care of other details. If a module was written for a service you are +interested in, you\'d probably need only to use +`services.#name#.enable = true;`. These services are defined in +Nixpkgs\' [ `nixos/modules/` directory +](https://github.com/NixOS/nixpkgs/tree/master/nixos/modules). In case +the service is simple enough, the above method should work, and start +the service on boot. + +*User* systemd services on the other hand, should be treated +differently. Given a package that has a systemd unit file at +`#pkg-out#/lib/systemd/user/`, using [](#opt-systemd.packages) will +make you able to start the service via `systemctl --user start`, but it +won\'t start automatically on login. However, You can imperatively +enable it by adding the package\'s attribute to [ +`systemd.packages`](#opt-environment.systemPackages) and then do this +(e.g): + +```ShellSession +$ mkdir -p ~/.config/systemd/user/default.target.wants +$ ln -s /run/current-system/sw/lib/systemd/user/syncthing.service ~/.config/systemd/user/default.target.wants/ +$ systemctl --user daemon-reload +$ systemctl --user enable syncthing.service +``` + +If you are interested in a timer file, use `timers.target.wants` instead +of `default.target.wants` in the 1st and 2nd command. + +Using `systemctl --user enable syncthing.service` instead of the above, +will work, but it\'ll use the absolute path of `syncthing.service` for +the symlink, and this path is in `/nix/store/.../lib/systemd/user/`. +Hence [garbage collection](#sec-nix-gc) will remove that file and you +will wind up with a broken symlink in your systemd configuration, which +in turn will not make the service / timer start on login. diff --git a/nixos/doc/manual/administration/service-mgmt.xml b/nixos/doc/manual/administration/service-mgmt.xml deleted file mode 100644 index 863b0d47f6c7..000000000000 --- a/nixos/doc/manual/administration/service-mgmt.xml +++ /dev/null @@ -1,140 +0,0 @@ - - Service Management - - In NixOS, all system services are started and monitored using the systemd - program. systemd is the “init” process of the system (i.e. PID 1), the - parent of all other processes. It manages a set of so-called “units”, - which can be things like system services (programs), but also mount points, - swap files, devices, targets (groups of units) and more. Units can have - complex dependencies; for instance, one unit can require that another unit - must be successfully started before the first unit can be started. When the - system boots, it starts a unit named default.target; the - dependencies of this unit cause all system services to be started, file - systems to be mounted, swap files to be activated, and so on. - -
- Interacting with a running systemd - - The command systemctl is the main way to interact with - systemd. The following paragraphs demonstrate ways to - interact with any OS running systemd as init system. NixOS is of no - exception. The next section - explains NixOS specific things worth knowing. - - - Without any arguments, systmctl the status of active units: - -$ systemctl --.mount loaded active mounted / -swapfile.swap loaded active active /swapfile -sshd.service loaded active running SSH Daemon -graphical.target loaded active active Graphical Interface -... - - - - You can ask for detailed status information about a unit, for instance, the - PostgreSQL database service: - -$ systemctl status postgresql.service -postgresql.service - PostgreSQL Server - Loaded: loaded (/nix/store/pn3q73mvh75gsrl8w7fdlfk3fq5qm5mw-unit/postgresql.service) - Active: active (running) since Mon, 2013-01-07 15:55:57 CET; 9h ago - Main PID: 2390 (postgres) - CGroup: name=systemd:/system/postgresql.service - ├─2390 postgres - ├─2418 postgres: writer process - ├─2419 postgres: wal writer process - ├─2420 postgres: autovacuum launcher process - ├─2421 postgres: stats collector process - └─2498 postgres: zabbix zabbix [local] idle - -Jan 07 15:55:55 hagbard postgres[2394]: [1-1] LOG: database system was shut down at 2013-01-07 15:55:05 CET -Jan 07 15:55:57 hagbard postgres[2390]: [1-1] LOG: database system is ready to accept connections -Jan 07 15:55:57 hagbard postgres[2420]: [1-1] LOG: autovacuum launcher started -Jan 07 15:55:57 hagbard systemd[1]: Started PostgreSQL Server. - - Note that this shows the status of the unit (active and running), all the - processes belonging to the service, as well as the most recent log messages - from the service. - - - Units can be stopped, started or restarted: - -# systemctl stop postgresql.service -# systemctl start postgresql.service -# systemctl restart postgresql.service - - These operations are synchronous: they wait until the service has finished - starting or stopping (or has failed). Starting a unit will cause the - dependencies of that unit to be started as well (if necessary). - - -
-
- systemd in NixOS - - Packages in Nixpkgs sometimes provide systemd units with them, usually in - e.g #pkg-out#/lib/systemd/. Putting such a package in - environment.systemPackages doesn't make the service - available to users or the system. - - - In order to enable a systemd system service with - provided upstream package, use (e.g): - - = [ pkgs.packagekit ]; - - - - Usually NixOS modules written by the community do the above, plus take care of - other details. If a module was written for a service you are interested in, - you'd probably need only to use - services.#name#.enable = true;. These services are defined - in Nixpkgs' - - nixos/modules/ directory . In case the service is - simple enough, the above method should work, and start the service on boot. - - - User systemd services on the other hand, should be - treated differently. Given a package that has a systemd unit file at - #pkg-out#/lib/systemd/user/, using - will make you able to start the service via - systemctl --user start, but it won't start automatically on login. - - However, You can imperatively enable it by adding the package's attribute to - - systemd.packages and then do this (e.g): - -$ mkdir -p ~/.config/systemd/user/default.target.wants -$ ln -s /run/current-system/sw/lib/systemd/user/syncthing.service ~/.config/systemd/user/default.target.wants/ -$ systemctl --user daemon-reload -$ systemctl --user enable syncthing.service - - If you are interested in a timer file, use timers.target.wants - instead of default.target.wants in the 1st and 2nd command. - - - Using systemctl --user enable syncthing.service instead of - the above, will work, but it'll use the absolute path of - syncthing.service for the symlink, and this path is in - /nix/store/.../lib/systemd/user/. Hence - garbage collection will remove that file - and you will wind up with a broken symlink in your systemd configuration, which - in turn will not make the service / timer start on login. - -
- - diff --git a/nixos/doc/manual/from_md/administration/service-mgmt.chapter.xml b/nixos/doc/manual/from_md/administration/service-mgmt.chapter.xml new file mode 100644 index 000000000000..0e1fceb50d07 --- /dev/null +++ b/nixos/doc/manual/from_md/administration/service-mgmt.chapter.xml @@ -0,0 +1,142 @@ + + Service Management + + In NixOS, all system services are started and monitored using the + systemd program. systemd is the init process of the + system (i.e. PID 1), the parent of all other processes. It manages a + set of so-called units, which can be things like + system services (programs), but also mount points, swap files, + devices, targets (groups of units) and more. Units can have complex + dependencies; for instance, one unit can require that another unit + must be successfully started before the first unit can be started. + When the system boots, it starts a unit named + default.target; the dependencies of this unit + cause all system services to be started, file systems to be mounted, + swap files to be activated, and so on. + +
+ Interacting with a running systemd + + The command systemctl is the main way to + interact with systemd. The following paragraphs + demonstrate ways to interact with any OS running systemd as init + system. NixOS is of no exception. The + next section + explains NixOS specific things worth knowing. + + + Without any arguments, systmctl the status of + active units: + + +$ systemctl +-.mount loaded active mounted / +swapfile.swap loaded active active /swapfile +sshd.service loaded active running SSH Daemon +graphical.target loaded active active Graphical Interface +... + + + You can ask for detailed status information about a unit, for + instance, the PostgreSQL database service: + + +$ systemctl status postgresql.service +postgresql.service - PostgreSQL Server + Loaded: loaded (/nix/store/pn3q73mvh75gsrl8w7fdlfk3fq5qm5mw-unit/postgresql.service) + Active: active (running) since Mon, 2013-01-07 15:55:57 CET; 9h ago + Main PID: 2390 (postgres) + CGroup: name=systemd:/system/postgresql.service + ├─2390 postgres + ├─2418 postgres: writer process + ├─2419 postgres: wal writer process + ├─2420 postgres: autovacuum launcher process + ├─2421 postgres: stats collector process + └─2498 postgres: zabbix zabbix [local] idle + +Jan 07 15:55:55 hagbard postgres[2394]: [1-1] LOG: database system was shut down at 2013-01-07 15:55:05 CET +Jan 07 15:55:57 hagbard postgres[2390]: [1-1] LOG: database system is ready to accept connections +Jan 07 15:55:57 hagbard postgres[2420]: [1-1] LOG: autovacuum launcher started +Jan 07 15:55:57 hagbard systemd[1]: Started PostgreSQL Server. + + + Note that this shows the status of the unit (active and running), + all the processes belonging to the service, as well as the most + recent log messages from the service. + + + Units can be stopped, started or restarted: + + +# systemctl stop postgresql.service +# systemctl start postgresql.service +# systemctl restart postgresql.service + + + These operations are synchronous: they wait until the service has + finished starting or stopping (or has failed). Starting a unit + will cause the dependencies of that unit to be started as well (if + necessary). + +
+
+ systemd in NixOS + + Packages in Nixpkgs sometimes provide systemd units with them, + usually in e.g #pkg-out#/lib/systemd/. Putting + such a package in environment.systemPackages + doesn't make the service available to users or the system. + + + In order to enable a systemd system service + with provided upstream package, use (e.g): + + +systemd.packages = [ pkgs.packagekit ]; + + + Usually NixOS modules written by the community do the above, plus + take care of other details. If a module was written for a service + you are interested in, you'd probably need only to use + services.#name#.enable = true;. These services + are defined in Nixpkgs' + + nixos/modules/ directory . In case the + service is simple enough, the above method should work, and start + the service on boot. + + + User systemd services on the other hand, + should be treated differently. Given a package that has a systemd + unit file at #pkg-out#/lib/systemd/user/, using + will make you able to + start the service via systemctl --user start, + but it won't start automatically on login. However, You can + imperatively enable it by adding the package's attribute to + + systemd.packages and then do this (e.g): + + +$ mkdir -p ~/.config/systemd/user/default.target.wants +$ ln -s /run/current-system/sw/lib/systemd/user/syncthing.service ~/.config/systemd/user/default.target.wants/ +$ systemctl --user daemon-reload +$ systemctl --user enable syncthing.service + + + If you are interested in a timer file, use + timers.target.wants instead of + default.target.wants in the 1st and 2nd + command. + + + Using systemctl --user enable syncthing.service + instead of the above, will work, but it'll use the absolute path + of syncthing.service for the symlink, and this + path is in /nix/store/.../lib/systemd/user/. + Hence garbage collection will + remove that file and you will wind up with a broken symlink in + your systemd configuration, which in turn will not make the + service / timer start on login. + +
+ From adbe4e34d61a1e6db49a4a4ffec236a1017d9507 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Jul 2021 14:31:57 +0800 Subject: [PATCH 035/167] nixos: nixos/doc/manual/administration/rebooting.xml to CommonMark --- .../administration/rebooting.chapter.md | 31 +++++++++++++++ nixos/doc/manual/administration/rebooting.xml | 35 ----------------- nixos/doc/manual/administration/running.xml | 2 +- .../administration/rebooting.chapter.xml | 38 +++++++++++++++++++ 4 files changed, 70 insertions(+), 36 deletions(-) create mode 100644 nixos/doc/manual/administration/rebooting.chapter.md delete mode 100644 nixos/doc/manual/administration/rebooting.xml create mode 100644 nixos/doc/manual/from_md/administration/rebooting.chapter.xml diff --git a/nixos/doc/manual/administration/rebooting.chapter.md b/nixos/doc/manual/administration/rebooting.chapter.md new file mode 100644 index 000000000000..7a16a3a4ce5c --- /dev/null +++ b/nixos/doc/manual/administration/rebooting.chapter.md @@ -0,0 +1,31 @@ +# Rebooting and Shutting Down {#sec-rebooting} + +The system can be shut down (and automatically powered off) by doing: + +```ShellSession +# shutdown +``` + +This is equivalent to running `systemctl poweroff`. + +To reboot the system, run + +```ShellSession +# reboot +``` + +which is equivalent to `systemctl reboot`. Alternatively, you can +quickly reboot the system using `kexec`, which bypasses the BIOS by +directly loading the new kernel into memory: + +```ShellSession +# systemctl kexec +``` + +The machine can be suspended to RAM (if supported) using `systemctl + suspend`, and suspended to disk using `systemctl + hibernate`. + +These commands can be run by any user who is logged in locally, i.e. on +a virtual console or in X11; otherwise, the user is asked for +authentication. diff --git a/nixos/doc/manual/administration/rebooting.xml b/nixos/doc/manual/administration/rebooting.xml deleted file mode 100644 index c57d885c5f3c..000000000000 --- a/nixos/doc/manual/administration/rebooting.xml +++ /dev/null @@ -1,35 +0,0 @@ - - Rebooting and Shutting Down - - The system can be shut down (and automatically powered off) by doing: - -# shutdown - - This is equivalent to running systemctl poweroff. - - - To reboot the system, run - -# reboot - - which is equivalent to systemctl reboot. Alternatively, - you can quickly reboot the system using kexec, which - bypasses the BIOS by directly loading the new kernel into memory: - -# systemctl kexec - - - - The machine can be suspended to RAM (if supported) using systemctl - suspend, and suspended to disk using systemctl - hibernate. - - - These commands can be run by any user who is logged in locally, i.e. on a - virtual console or in X11; otherwise, the user is asked for authentication. - - diff --git a/nixos/doc/manual/administration/running.xml b/nixos/doc/manual/administration/running.xml index 73dff4691920..30322e7239c7 100644 --- a/nixos/doc/manual/administration/running.xml +++ b/nixos/doc/manual/administration/running.xml @@ -11,7 +11,7 @@ - + diff --git a/nixos/doc/manual/from_md/administration/rebooting.chapter.xml b/nixos/doc/manual/from_md/administration/rebooting.chapter.xml new file mode 100644 index 000000000000..78ee75afb642 --- /dev/null +++ b/nixos/doc/manual/from_md/administration/rebooting.chapter.xml @@ -0,0 +1,38 @@ + + Rebooting and Shutting Down + + The system can be shut down (and automatically powered off) by + doing: + + +# shutdown + + + This is equivalent to running systemctl poweroff. + + + To reboot the system, run + + +# reboot + + + which is equivalent to systemctl reboot. + Alternatively, you can quickly reboot the system using + kexec, which bypasses the BIOS by directly + loading the new kernel into memory: + + +# systemctl kexec + + + The machine can be suspended to RAM (if supported) using + systemctl suspend, and suspended to disk using + systemctl hibernate. + + + These commands can be run by any user who is logged in locally, i.e. + on a virtual console or in X11; otherwise, the user is asked for + authentication. + + From 8ee759d7cf636e5f0747691874843fc52eb02296 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Jul 2021 14:32:35 +0800 Subject: [PATCH 036/167] nixos: nixos/doc/manual/administration/user-sessions.xml to CommonMark --- nixos/doc/manual/administration/running.xml | 2 +- .../administration/user-sessions.chapter.md | 43 +++++++++++++++++ .../manual/administration/user-sessions.xml | 45 ------------------ .../administration/user-sessions.chapter.xml | 46 +++++++++++++++++++ 4 files changed, 90 insertions(+), 46 deletions(-) create mode 100644 nixos/doc/manual/administration/user-sessions.chapter.md delete mode 100644 nixos/doc/manual/administration/user-sessions.xml create mode 100644 nixos/doc/manual/from_md/administration/user-sessions.chapter.xml diff --git a/nixos/doc/manual/administration/running.xml b/nixos/doc/manual/administration/running.xml index 30322e7239c7..8a5e25e717fa 100644 --- a/nixos/doc/manual/administration/running.xml +++ b/nixos/doc/manual/administration/running.xml @@ -12,7 +12,7 @@ - + diff --git a/nixos/doc/manual/administration/user-sessions.chapter.md b/nixos/doc/manual/administration/user-sessions.chapter.md new file mode 100644 index 000000000000..5ff468b30122 --- /dev/null +++ b/nixos/doc/manual/administration/user-sessions.chapter.md @@ -0,0 +1,43 @@ +# User Sessions {#sec-user-sessions} + +Systemd keeps track of all users who are logged into the system (e.g. on +a virtual console or remotely via SSH). The command `loginctl` allows +querying and manipulating user sessions. For instance, to list all user +sessions: + +```ShellSession +$ loginctl + SESSION UID USER SEAT + c1 500 eelco seat0 + c3 0 root seat0 + c4 500 alice +``` + +This shows that two users are logged in locally, while another is logged +in remotely. ("Seats" are essentially the combinations of displays and +input devices attached to the system; usually, there is only one seat.) +To get information about a session: + +```ShellSession +$ loginctl session-status c3 +c3 - root (0) + Since: Tue, 2013-01-08 01:17:56 CET; 4min 42s ago + Leader: 2536 (login) + Seat: seat0; vc3 + TTY: /dev/tty3 + Service: login; type tty; class user + State: online + CGroup: name=systemd:/user/root/c3 + ├─ 2536 /nix/store/10mn4xip9n7y9bxqwnsx7xwx2v2g34xn-shadow-4.1.5.1/bin/login -- + ├─10339 -bash + └─10355 w3m nixos.org +``` + +This shows that the user is logged in on virtual console 3. It also +lists the processes belonging to this session. Since systemd keeps track +of this, you can terminate a session in a way that ensures that all the +session's processes are gone: + +```ShellSession +# loginctl terminate-session c3 +``` diff --git a/nixos/doc/manual/administration/user-sessions.xml b/nixos/doc/manual/administration/user-sessions.xml deleted file mode 100644 index 9acb147ac1a6..000000000000 --- a/nixos/doc/manual/administration/user-sessions.xml +++ /dev/null @@ -1,45 +0,0 @@ - - User Sessions - - Systemd keeps track of all users who are logged into the system (e.g. on a - virtual console or remotely via SSH). The command loginctl - allows querying and manipulating user sessions. For instance, to list all - user sessions: - -$ loginctl - SESSION UID USER SEAT - c1 500 eelco seat0 - c3 0 root seat0 - c4 500 alice - - This shows that two users are logged in locally, while another is logged in - remotely. (“Seats” are essentially the combinations of displays and input - devices attached to the system; usually, there is only one seat.) To get - information about a session: - -$ loginctl session-status c3 -c3 - root (0) - Since: Tue, 2013-01-08 01:17:56 CET; 4min 42s ago - Leader: 2536 (login) - Seat: seat0; vc3 - TTY: /dev/tty3 - Service: login; type tty; class user - State: online - CGroup: name=systemd:/user/root/c3 - ├─ 2536 /nix/store/10mn4xip9n7y9bxqwnsx7xwx2v2g34xn-shadow-4.1.5.1/bin/login -- - ├─10339 -bash - └─10355 w3m nixos.org - - This shows that the user is logged in on virtual console 3. It also lists the - processes belonging to this session. Since systemd keeps track of this, you - can terminate a session in a way that ensures that all the session’s - processes are gone: - -# loginctl terminate-session c3 - - - diff --git a/nixos/doc/manual/from_md/administration/user-sessions.chapter.xml b/nixos/doc/manual/from_md/administration/user-sessions.chapter.xml new file mode 100644 index 000000000000..e8c64f153fc5 --- /dev/null +++ b/nixos/doc/manual/from_md/administration/user-sessions.chapter.xml @@ -0,0 +1,46 @@ + + User Sessions + + Systemd keeps track of all users who are logged into the system + (e.g. on a virtual console or remotely via SSH). The command + loginctl allows querying and manipulating user + sessions. For instance, to list all user sessions: + + +$ loginctl + SESSION UID USER SEAT + c1 500 eelco seat0 + c3 0 root seat0 + c4 500 alice + + + This shows that two users are logged in locally, while another is + logged in remotely. (Seats are essentially the + combinations of displays and input devices attached to the system; + usually, there is only one seat.) To get information about a + session: + + +$ loginctl session-status c3 +c3 - root (0) + Since: Tue, 2013-01-08 01:17:56 CET; 4min 42s ago + Leader: 2536 (login) + Seat: seat0; vc3 + TTY: /dev/tty3 + Service: login; type tty; class user + State: online + CGroup: name=systemd:/user/root/c3 + ├─ 2536 /nix/store/10mn4xip9n7y9bxqwnsx7xwx2v2g34xn-shadow-4.1.5.1/bin/login -- + ├─10339 -bash + └─10355 w3m nixos.org + + + This shows that the user is logged in on virtual console 3. It also + lists the processes belonging to this session. Since systemd keeps + track of this, you can terminate a session in a way that ensures + that all the session’s processes are gone: + + +# loginctl terminate-session c3 + + From e63f523491e0bb757f66b91d5efb2d709612f4bd Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Jul 2021 14:33:50 +0800 Subject: [PATCH 037/167] nixos: nixos/doc/manual/administration/control-groups.xml to CommonMark --- .../administration/control-groups.chapter.md | 59 ++++++++++++++++ .../manual/administration/control-groups.xml | 65 ------------------ nixos/doc/manual/administration/running.xml | 2 +- .../administration/control-groups.chapter.xml | 67 +++++++++++++++++++ 4 files changed, 127 insertions(+), 66 deletions(-) create mode 100644 nixos/doc/manual/administration/control-groups.chapter.md delete mode 100644 nixos/doc/manual/administration/control-groups.xml create mode 100644 nixos/doc/manual/from_md/administration/control-groups.chapter.xml diff --git a/nixos/doc/manual/administration/control-groups.chapter.md b/nixos/doc/manual/administration/control-groups.chapter.md new file mode 100644 index 000000000000..abe8dd80b5ab --- /dev/null +++ b/nixos/doc/manual/administration/control-groups.chapter.md @@ -0,0 +1,59 @@ +# Control Groups {#sec-cgroups} + +To keep track of the processes in a running system, systemd uses +*control groups* (cgroups). A control group is a set of processes used +to allocate resources such as CPU, memory or I/O bandwidth. There can be +multiple control group hierarchies, allowing each kind of resource to be +managed independently. + +The command `systemd-cgls` lists all control groups in the `systemd` +hierarchy, which is what systemd uses to keep track of the processes +belonging to each service or user session: + +```ShellSession +$ systemd-cgls +├─user +│ └─eelco +│ └─c1 +│ ├─ 2567 -:0 +│ ├─ 2682 kdeinit4: kdeinit4 Running... +│ ├─ ... +│ └─10851 sh -c less -R +└─system + ├─httpd.service + │ ├─2444 httpd -f /nix/store/3pyacby5cpr55a03qwbnndizpciwq161-httpd.conf -DNO_DETACH + │ └─... + ├─dhcpcd.service + │ └─2376 dhcpcd --config /nix/store/f8dif8dsi2yaa70n03xir8r653776ka6-dhcpcd.conf + └─ ... +``` + +Similarly, `systemd-cgls cpu` shows the cgroups in the CPU hierarchy, +which allows per-cgroup CPU scheduling priorities. By default, every +systemd service gets its own CPU cgroup, while all user sessions are in +the top-level CPU cgroup. This ensures, for instance, that a thousand +run-away processes in the `httpd.service` cgroup cannot starve the CPU +for one process in the `postgresql.service` cgroup. (By contrast, it +they were in the same cgroup, then the PostgreSQL process would get +1/1001 of the cgroup's CPU time.) You can limit a service's CPU share in +`configuration.nix`: + +```nix +systemd.services.httpd.serviceConfig.CPUShares = 512; +``` + +By default, every cgroup has 1024 CPU shares, so this will halve the CPU +allocation of the `httpd.service` cgroup. + +There also is a `memory` hierarchy that controls memory allocation +limits; by default, all processes are in the top-level cgroup, so any +service or session can exhaust all available memory. Per-cgroup memory +limits can be specified in `configuration.nix`; for instance, to limit +`httpd.service` to 512 MiB of RAM (excluding swap): + +```nix +systemd.services.httpd.serviceConfig.MemoryLimit = "512M"; +``` + +The command `systemd-cgtop` shows a continuously updated list of all +cgroups with their CPU and memory usage. diff --git a/nixos/doc/manual/administration/control-groups.xml b/nixos/doc/manual/administration/control-groups.xml deleted file mode 100644 index 16d03cc0d1ab..000000000000 --- a/nixos/doc/manual/administration/control-groups.xml +++ /dev/null @@ -1,65 +0,0 @@ - - Control Groups - - To keep track of the processes in a running system, systemd uses - control groups (cgroups). A control group is a set of - processes used to allocate resources such as CPU, memory or I/O bandwidth. - There can be multiple control group hierarchies, allowing each kind of - resource to be managed independently. - - - The command systemd-cgls lists all control groups in the - systemd hierarchy, which is what systemd uses to keep - track of the processes belonging to each service or user session: - -$ systemd-cgls -├─user -│ └─eelco -│ └─c1 -│ ├─ 2567 -:0 -│ ├─ 2682 kdeinit4: kdeinit4 Running... -│ ├─ ... -│ └─10851 sh -c less -R -└─system - ├─httpd.service - │ ├─2444 httpd -f /nix/store/3pyacby5cpr55a03qwbnndizpciwq161-httpd.conf -DNO_DETACH - │ └─... - ├─dhcpcd.service - │ └─2376 dhcpcd --config /nix/store/f8dif8dsi2yaa70n03xir8r653776ka6-dhcpcd.conf - └─ ... - - Similarly, systemd-cgls cpu shows the cgroups in the CPU - hierarchy, which allows per-cgroup CPU scheduling priorities. By default, - every systemd service gets its own CPU cgroup, while all user sessions are in - the top-level CPU cgroup. This ensures, for instance, that a thousand - run-away processes in the httpd.service cgroup cannot - starve the CPU for one process in the postgresql.service - cgroup. (By contrast, it they were in the same cgroup, then the PostgreSQL - process would get 1/1001 of the cgroup’s CPU time.) You can limit a - service’s CPU share in configuration.nix: - -systemd.services.httpd.serviceConfig.CPUShares = 512; - - By default, every cgroup has 1024 CPU shares, so this will halve the CPU - allocation of the httpd.service cgroup. - - - There also is a memory hierarchy that controls memory - allocation limits; by default, all processes are in the top-level cgroup, so - any service or session can exhaust all available memory. Per-cgroup memory - limits can be specified in configuration.nix; for - instance, to limit httpd.service to 512 MiB of RAM - (excluding swap): - -systemd.services.httpd.serviceConfig.MemoryLimit = "512M"; - - - - The command systemd-cgtop shows a continuously updated - list of all cgroups with their CPU and memory usage. - - diff --git a/nixos/doc/manual/administration/running.xml b/nixos/doc/manual/administration/running.xml index 8a5e25e717fa..43642b659a8e 100644 --- a/nixos/doc/manual/administration/running.xml +++ b/nixos/doc/manual/administration/running.xml @@ -13,7 +13,7 @@ - + diff --git a/nixos/doc/manual/from_md/administration/control-groups.chapter.xml b/nixos/doc/manual/from_md/administration/control-groups.chapter.xml new file mode 100644 index 000000000000..8dab2c9d44b4 --- /dev/null +++ b/nixos/doc/manual/from_md/administration/control-groups.chapter.xml @@ -0,0 +1,67 @@ + + Control Groups + + To keep track of the processes in a running system, systemd uses + control groups (cgroups). A control group is a + set of processes used to allocate resources such as CPU, memory or + I/O bandwidth. There can be multiple control group hierarchies, + allowing each kind of resource to be managed independently. + + + The command systemd-cgls lists all control groups + in the systemd hierarchy, which is what systemd + uses to keep track of the processes belonging to each service or + user session: + + +$ systemd-cgls +├─user +│ └─eelco +│ └─c1 +│ ├─ 2567 -:0 +│ ├─ 2682 kdeinit4: kdeinit4 Running... +│ ├─ ... +│ └─10851 sh -c less -R +└─system + ├─httpd.service + │ ├─2444 httpd -f /nix/store/3pyacby5cpr55a03qwbnndizpciwq161-httpd.conf -DNO_DETACH + │ └─... + ├─dhcpcd.service + │ └─2376 dhcpcd --config /nix/store/f8dif8dsi2yaa70n03xir8r653776ka6-dhcpcd.conf + └─ ... + + + Similarly, systemd-cgls cpu shows the cgroups in + the CPU hierarchy, which allows per-cgroup CPU scheduling + priorities. By default, every systemd service gets its own CPU + cgroup, while all user sessions are in the top-level CPU cgroup. + This ensures, for instance, that a thousand run-away processes in + the httpd.service cgroup cannot starve the CPU + for one process in the postgresql.service cgroup. + (By contrast, it they were in the same cgroup, then the PostgreSQL + process would get 1/1001 of the cgroup’s CPU time.) You can limit a + service’s CPU share in configuration.nix: + + +systemd.services.httpd.serviceConfig.CPUShares = 512; + + + By default, every cgroup has 1024 CPU shares, so this will halve the + CPU allocation of the httpd.service cgroup. + + + There also is a memory hierarchy that controls + memory allocation limits; by default, all processes are in the + top-level cgroup, so any service or session can exhaust all + available memory. Per-cgroup memory limits can be specified in + configuration.nix; for instance, to limit + httpd.service to 512 MiB of RAM (excluding swap): + + +systemd.services.httpd.serviceConfig.MemoryLimit = "512M"; + + + The command systemd-cgtop shows a continuously + updated list of all cgroups with their CPU and memory usage. + + From e4ad7d6fc7047ba322aea64a846f7781129aa508 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Jul 2021 14:34:58 +0800 Subject: [PATCH 038/167] nixos: nixos/doc/manual/administration/logging.xml to CommonMark --- .../manual/administration/logging.chapter.md | 38 ++++++++++++++++ nixos/doc/manual/administration/logging.xml | 43 ------------------ nixos/doc/manual/administration/running.xml | 2 +- .../administration/logging.chapter.xml | 45 +++++++++++++++++++ 4 files changed, 84 insertions(+), 44 deletions(-) create mode 100644 nixos/doc/manual/administration/logging.chapter.md delete mode 100644 nixos/doc/manual/administration/logging.xml create mode 100644 nixos/doc/manual/from_md/administration/logging.chapter.xml diff --git a/nixos/doc/manual/administration/logging.chapter.md b/nixos/doc/manual/administration/logging.chapter.md new file mode 100644 index 000000000000..4ce6f5e9fa72 --- /dev/null +++ b/nixos/doc/manual/administration/logging.chapter.md @@ -0,0 +1,38 @@ +# Logging {#sec-logging} + +System-wide logging is provided by systemd's *journal*, which subsumes +traditional logging daemons such as syslogd and klogd. Log entries are +kept in binary files in `/var/log/journal/`. The command `journalctl` +allows you to see the contents of the journal. For example, + +```ShellSession +$ journalctl -b +``` + +shows all journal entries since the last reboot. (The output of +`journalctl` is piped into `less` by default.) You can use various +options and match operators to restrict output to messages of interest. +For instance, to get all messages from PostgreSQL: + +```ShellSession +$ journalctl -u postgresql.service +-- Logs begin at Mon, 2013-01-07 13:28:01 CET, end at Tue, 2013-01-08 01:09:57 CET. -- +... +Jan 07 15:44:14 hagbard postgres[2681]: [2-1] LOG: database system is shut down +-- Reboot -- +Jan 07 15:45:10 hagbard postgres[2532]: [1-1] LOG: database system was shut down at 2013-01-07 15:44:14 CET +Jan 07 15:45:13 hagbard postgres[2500]: [1-1] LOG: database system is ready to accept connections +``` + +Or to get all messages since the last reboot that have at least a +"critical" severity level: + +```ShellSession +$ journalctl -b -p crit +Dec 17 21:08:06 mandark sudo[3673]: pam_unix(sudo:auth): auth could not identify password for [alice] +Dec 29 01:30:22 mandark kernel[6131]: [1053513.909444] CPU6: Core temperature above threshold, cpu clock throttled (total events = 1) +``` + +The system journal is readable by root and by users in the `wheel` and +`systemd-journal` groups. All users have a private journal that can be +read using `journalctl`. diff --git a/nixos/doc/manual/administration/logging.xml b/nixos/doc/manual/administration/logging.xml deleted file mode 100644 index da4877fcdf08..000000000000 --- a/nixos/doc/manual/administration/logging.xml +++ /dev/null @@ -1,43 +0,0 @@ - - Logging - - System-wide logging is provided by systemd’s journal, - which subsumes traditional logging daemons such as syslogd and klogd. Log - entries are kept in binary files in /var/log/journal/. - The command journalctl allows you to see the contents of - the journal. For example, - -$ journalctl -b - - shows all journal entries since the last reboot. (The output of - journalctl is piped into less by - default.) You can use various options and match operators to restrict output - to messages of interest. For instance, to get all messages from PostgreSQL: - -$ journalctl -u postgresql.service --- Logs begin at Mon, 2013-01-07 13:28:01 CET, end at Tue, 2013-01-08 01:09:57 CET. -- -... -Jan 07 15:44:14 hagbard postgres[2681]: [2-1] LOG: database system is shut down --- Reboot -- -Jan 07 15:45:10 hagbard postgres[2532]: [1-1] LOG: database system was shut down at 2013-01-07 15:44:14 CET -Jan 07 15:45:13 hagbard postgres[2500]: [1-1] LOG: database system is ready to accept connections - - Or to get all messages since the last reboot that have at least a - “critical” severity level: - -$ journalctl -b -p crit -Dec 17 21:08:06 mandark sudo[3673]: pam_unix(sudo:auth): auth could not identify password for [alice] -Dec 29 01:30:22 mandark kernel[6131]: [1053513.909444] CPU6: Core temperature above threshold, cpu clock throttled (total events = 1) - - - - The system journal is readable by root and by users in the - wheel and systemd-journal groups. All - users have a private journal that can be read using - journalctl. - - diff --git a/nixos/doc/manual/administration/running.xml b/nixos/doc/manual/administration/running.xml index 43642b659a8e..aeccc843792b 100644 --- a/nixos/doc/manual/administration/running.xml +++ b/nixos/doc/manual/administration/running.xml @@ -14,7 +14,7 @@ - + diff --git a/nixos/doc/manual/from_md/administration/logging.chapter.xml b/nixos/doc/manual/from_md/administration/logging.chapter.xml new file mode 100644 index 000000000000..4da38c065a27 --- /dev/null +++ b/nixos/doc/manual/from_md/administration/logging.chapter.xml @@ -0,0 +1,45 @@ + + Logging + + System-wide logging is provided by systemd’s + journal, which subsumes traditional logging + daemons such as syslogd and klogd. Log entries are kept in binary + files in /var/log/journal/. The command + journalctl allows you to see the contents of the + journal. For example, + + +$ journalctl -b + + + shows all journal entries since the last reboot. (The output of + journalctl is piped into less + by default.) You can use various options and match operators to + restrict output to messages of interest. For instance, to get all + messages from PostgreSQL: + + +$ journalctl -u postgresql.service +-- Logs begin at Mon, 2013-01-07 13:28:01 CET, end at Tue, 2013-01-08 01:09:57 CET. -- +... +Jan 07 15:44:14 hagbard postgres[2681]: [2-1] LOG: database system is shut down +-- Reboot -- +Jan 07 15:45:10 hagbard postgres[2532]: [1-1] LOG: database system was shut down at 2013-01-07 15:44:14 CET +Jan 07 15:45:13 hagbard postgres[2500]: [1-1] LOG: database system is ready to accept connections + + + Or to get all messages since the last reboot that have at least a + critical severity level: + + +$ journalctl -b -p crit +Dec 17 21:08:06 mandark sudo[3673]: pam_unix(sudo:auth): auth could not identify password for [alice] +Dec 29 01:30:22 mandark kernel[6131]: [1053513.909444] CPU6: Core temperature above threshold, cpu clock throttled (total events = 1) + + + The system journal is readable by root and by users in the + wheel and systemd-journal + groups. All users have a private journal that can be read using + journalctl. + + From c603692b0cfb096e9f8b861b7ce39978779a200a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Jul 2021 14:35:18 +0800 Subject: [PATCH 039/167] nixos: nixos/doc/manual/administration/cleaning-store.xml to CommonMark --- .../administration/cleaning-store.chapter.md | 62 ++++++++++++++++ .../manual/administration/cleaning-store.xml | 63 ---------------- nixos/doc/manual/administration/running.xml | 2 +- .../administration/cleaning-store.chapter.xml | 71 +++++++++++++++++++ 4 files changed, 134 insertions(+), 64 deletions(-) create mode 100644 nixos/doc/manual/administration/cleaning-store.chapter.md delete mode 100644 nixos/doc/manual/administration/cleaning-store.xml create mode 100644 nixos/doc/manual/from_md/administration/cleaning-store.chapter.xml diff --git a/nixos/doc/manual/administration/cleaning-store.chapter.md b/nixos/doc/manual/administration/cleaning-store.chapter.md new file mode 100644 index 000000000000..fb2090b31d84 --- /dev/null +++ b/nixos/doc/manual/administration/cleaning-store.chapter.md @@ -0,0 +1,62 @@ +# Cleaning the Nix Store {#sec-nix-gc} + +Nix has a purely functional model, meaning that packages are never +upgraded in place. Instead new versions of packages end up in a +different location in the Nix store (`/nix/store`). You should +periodically run Nix's *garbage collector* to remove old, unreferenced +packages. This is easy: + +```ShellSession +$ nix-collect-garbage +``` + +Alternatively, you can use a systemd unit that does the same in the +background: + +```ShellSession +# systemctl start nix-gc.service +``` + +You can tell NixOS in `configuration.nix` to run this unit automatically +at certain points in time, for instance, every night at 03:15: + +```nix +nix.gc.automatic = true; +nix.gc.dates = "03:15"; +``` + +The commands above do not remove garbage collector roots, such as old +system configurations. Thus they do not remove the ability to roll back +to previous configurations. The following command deletes old roots, +removing the ability to roll back to them: + +```ShellSession +$ nix-collect-garbage -d +``` + +You can also do this for specific profiles, e.g. + +```ShellSession +$ nix-env -p /nix/var/nix/profiles/per-user/eelco/profile --delete-generations old +``` + +Note that NixOS system configurations are stored in the profile +`/nix/var/nix/profiles/system`. + +Another way to reclaim disk space (often as much as 40% of the size of +the Nix store) is to run Nix's store optimiser, which seeks out +identical files in the store and replaces them with hard links to a +single copy. + +```ShellSession +$ nix-store --optimise +``` + +Since this command needs to read the entire Nix store, it can take quite +a while to finish. + +## NixOS Boot Entries {#sect-nixos-gc-boot-entries} + +If your `/boot` partition runs out of space, after clearing old profiles +you must rebuild your system with `nixos-rebuild` to update the `/boot` +partition and clear space. diff --git a/nixos/doc/manual/administration/cleaning-store.xml b/nixos/doc/manual/administration/cleaning-store.xml deleted file mode 100644 index 526803e429ba..000000000000 --- a/nixos/doc/manual/administration/cleaning-store.xml +++ /dev/null @@ -1,63 +0,0 @@ - - Cleaning the Nix Store - - Nix has a purely functional model, meaning that packages are never upgraded - in place. Instead new versions of packages end up in a different location in - the Nix store (/nix/store). You should periodically run - Nix’s garbage collector to remove old, unreferenced - packages. This is easy: - -$ nix-collect-garbage - - Alternatively, you can use a systemd unit that does the same in the - background: - -# systemctl start nix-gc.service - - You can tell NixOS in configuration.nix to run this unit - automatically at certain points in time, for instance, every night at 03:15: - - = true; - = "03:15"; - - - - The commands above do not remove garbage collector roots, such as old system - configurations. Thus they do not remove the ability to roll back to previous - configurations. The following command deletes old roots, removing the ability - to roll back to them: - -$ nix-collect-garbage -d - - You can also do this for specific profiles, e.g. - -$ nix-env -p /nix/var/nix/profiles/per-user/eelco/profile --delete-generations old - - Note that NixOS system configurations are stored in the profile - /nix/var/nix/profiles/system. - - - Another way to reclaim disk space (often as much as 40% of the size of the - Nix store) is to run Nix’s store optimiser, which seeks out identical files - in the store and replaces them with hard links to a single copy. - -$ nix-store --optimise - - Since this command needs to read the entire Nix store, it can take quite a - while to finish. - -
- NixOS Boot Entries - - - If your /boot partition runs out of space, after - clearing old profiles you must rebuild your system with - nixos-rebuild to update the /boot - partition and clear space. - -
- diff --git a/nixos/doc/manual/administration/running.xml b/nixos/doc/manual/administration/running.xml index aeccc843792b..24fd864956ff 100644 --- a/nixos/doc/manual/administration/running.xml +++ b/nixos/doc/manual/administration/running.xml @@ -15,7 +15,7 @@ - + diff --git a/nixos/doc/manual/from_md/administration/cleaning-store.chapter.xml b/nixos/doc/manual/from_md/administration/cleaning-store.chapter.xml new file mode 100644 index 000000000000..0ca98dd6e510 --- /dev/null +++ b/nixos/doc/manual/from_md/administration/cleaning-store.chapter.xml @@ -0,0 +1,71 @@ + + Cleaning the Nix Store + + Nix has a purely functional model, meaning that packages are never + upgraded in place. Instead new versions of packages end up in a + different location in the Nix store (/nix/store). + You should periodically run Nix’s garbage + collector to remove old, unreferenced packages. This is + easy: + + +$ nix-collect-garbage + + + Alternatively, you can use a systemd unit that does the same in the + background: + + +# systemctl start nix-gc.service + + + You can tell NixOS in configuration.nix to run + this unit automatically at certain points in time, for instance, + every night at 03:15: + + +nix.gc.automatic = true; +nix.gc.dates = "03:15"; + + + The commands above do not remove garbage collector roots, such as + old system configurations. Thus they do not remove the ability to + roll back to previous configurations. The following command deletes + old roots, removing the ability to roll back to them: + + +$ nix-collect-garbage -d + + + You can also do this for specific profiles, e.g. + + +$ nix-env -p /nix/var/nix/profiles/per-user/eelco/profile --delete-generations old + + + Note that NixOS system configurations are stored in the profile + /nix/var/nix/profiles/system. + + + Another way to reclaim disk space (often as much as 40% of the size + of the Nix store) is to run Nix’s store optimiser, which seeks out + identical files in the store and replaces them with hard links to a + single copy. + + +$ nix-store --optimise + + + Since this command needs to read the entire Nix store, it can take + quite a while to finish. + +
+ NixOS Boot Entries + + If your /boot partition runs out of space, + after clearing old profiles you must rebuild your system with + nixos-rebuild to update the + /boot partition and clear space. + +
+ From a55f0640b037a6d0771367622bd44996b8c74330 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Jul 2021 19:36:14 +0800 Subject: [PATCH 040/167] nixos: nixos/doc/manual/configuration/user-mgmt.xml to CommonMark --- .../manual/configuration/configuration.xml | 2 +- .../manual/configuration/user-mgmt.chapter.md | 92 +++++++++++++++ nixos/doc/manual/configuration/user-mgmt.xml | 88 -------------- .../configuration/user-mgmt.chapter.xml | 107 ++++++++++++++++++ 4 files changed, 200 insertions(+), 89 deletions(-) create mode 100644 nixos/doc/manual/configuration/user-mgmt.chapter.md delete mode 100644 nixos/doc/manual/configuration/user-mgmt.xml create mode 100644 nixos/doc/manual/from_md/configuration/user-mgmt.chapter.xml diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml index 6949189b8883..006205215f6e 100644 --- a/nixos/doc/manual/configuration/configuration.xml +++ b/nixos/doc/manual/configuration/configuration.xml @@ -15,7 +15,7 @@ - + diff --git a/nixos/doc/manual/configuration/user-mgmt.chapter.md b/nixos/doc/manual/configuration/user-mgmt.chapter.md new file mode 100644 index 000000000000..64eacc5f7dd6 --- /dev/null +++ b/nixos/doc/manual/configuration/user-mgmt.chapter.md @@ -0,0 +1,92 @@ +# User Management {#sec-user-management} + +NixOS supports both declarative and imperative styles of user +management. In the declarative style, users are specified in +`configuration.nix`. For instance, the following states that a user +account named `alice` shall exist: + +```nix +users.users.alice = { + isNormalUser = true; + home = "/home/alice"; + description = "Alice Foobar"; + extraGroups = [ "wheel" "networkmanager" ]; + openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ]; +}; +``` + +Note that `alice` is a member of the `wheel` and `networkmanager` +groups, which allows her to use `sudo` to execute commands as `root` and +to configure the network, respectively. Also note the SSH public key +that allows remote logins with the corresponding private key. Users +created in this way do not have a password by default, so they cannot +log in via mechanisms that require a password. However, you can use the +`passwd` program to set a password, which is retained across invocations +of `nixos-rebuild`. + +If you set [`users.mutableUsers`](options.html#opt-users.mutableUsers) to +false, then the contents of `/etc/passwd` and `/etc/group` will be congruent +to your NixOS configuration. For instance, if you remove a user from +[`users.users`](options.html#opt-users.users) and run nixos-rebuild, the user +account will cease to exist. Also, imperative commands for managing users and +groups, such as useradd, are no longer available. Passwords may still be +assigned by setting the user\'s +[hashedPassword](#opt-users.users._name_.hashedPassword) option. A +hashed password can be generated using `mkpasswd -m + sha-512`. + +A user ID (uid) is assigned automatically. You can also specify a uid +manually by adding + +```nix +uid = 1000; +``` + +to the user specification. + +Groups can be specified similarly. The following states that a group +named `students` shall exist: + +```nix +users.groups.students.gid = 1000; +``` + +As with users, the group ID (gid) is optional and will be assigned +automatically if it's missing. + +In the imperative style, users and groups are managed by commands such +as `useradd`, `groupmod` and so on. For instance, to create a user +account named `alice`: + +```ShellSession +# useradd -m alice +``` + +To make all nix tools available to this new user use \`su - USER\` which +opens a login shell (==shell that loads the profile) for given user. +This will create the \~/.nix-defexpr symlink. So run: + +```ShellSession +# su - alice -c "true" +``` + +The flag `-m` causes the creation of a home directory for the new user, +which is generally what you want. The user does not have an initial +password and therefore cannot log in. A password can be set using the +`passwd` utility: + +```ShellSession +# passwd alice +Enter new UNIX password: *** +Retype new UNIX password: *** +``` + +A user can be deleted using `userdel`: + +```ShellSession +# userdel -r alice +``` + +The flag `-r` deletes the user's home directory. Accounts can be +modified using `usermod`. Unix groups can be managed using `groupadd`, +`groupmod` and `groupdel`. diff --git a/nixos/doc/manual/configuration/user-mgmt.xml b/nixos/doc/manual/configuration/user-mgmt.xml deleted file mode 100644 index e83e7b75ef54..000000000000 --- a/nixos/doc/manual/configuration/user-mgmt.xml +++ /dev/null @@ -1,88 +0,0 @@ - - User Management - - NixOS supports both declarative and imperative styles of user management. In - the declarative style, users are specified in - configuration.nix. For instance, the following states - that a user account named alice shall exist: - -.alice = { - isNormalUser = true; - home = "/home/alice"; - description = "Alice Foobar"; - extraGroups = [ "wheel" "networkmanager" ]; - openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ]; -}; - - Note that alice is a member of the - wheel and networkmanager groups, which - allows her to use sudo to execute commands as - root and to configure the network, respectively. Also note - the SSH public key that allows remote logins with the corresponding private - key. Users created in this way do not have a password by default, so they - cannot log in via mechanisms that require a password. However, you can use - the passwd program to set a password, which is retained - across invocations of nixos-rebuild. - - - If you set to false, then the - contents of /etc/passwd and /etc/group - will be congruent to your NixOS configuration. For instance, if you remove a - user from and run nixos-rebuild, the user - account will cease to exist. Also, imperative commands for managing users and - groups, such as useradd, are no longer available. Passwords may still be - assigned by setting the user's - hashedPassword - option. A hashed password can be generated using mkpasswd -m - sha-512. - - - A user ID (uid) is assigned automatically. You can also specify a uid - manually by adding - -uid = 1000; - - to the user specification. - - - Groups can be specified similarly. The following states that a group named - students shall exist: - -.students.gid = 1000; - - As with users, the group ID (gid) is optional and will be assigned - automatically if it’s missing. - - - In the imperative style, users and groups are managed by commands such as - useradd, groupmod and so on. For - instance, to create a user account named alice: - -# useradd -m alice - To make all nix tools available to this new user use `su - USER` which opens - a login shell (==shell that loads the profile) for given user. This will - create the ~/.nix-defexpr symlink. So run: - -# su - alice -c "true" - The flag causes the creation of a home directory for the - new user, which is generally what you want. The user does not have an initial - password and therefore cannot log in. A password can be set using the - passwd utility: - -# passwd alice -Enter new UNIX password: *** -Retype new UNIX password: *** - - A user can be deleted using userdel: - -# userdel -r alice - The flag deletes the user’s home directory. Accounts - can be modified using usermod. Unix groups can be managed - using groupadd, groupmod and - groupdel. - - diff --git a/nixos/doc/manual/from_md/configuration/user-mgmt.chapter.xml b/nixos/doc/manual/from_md/configuration/user-mgmt.chapter.xml new file mode 100644 index 000000000000..b865fabfe3cc --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/user-mgmt.chapter.xml @@ -0,0 +1,107 @@ + + User Management + + NixOS supports both declarative and imperative styles of user + management. In the declarative style, users are specified in + configuration.nix. For instance, the following + states that a user account named alice shall + exist: + + +users.users.alice = { + isNormalUser = true; + home = "/home/alice"; + description = "Alice Foobar"; + extraGroups = [ "wheel" "networkmanager" ]; + openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ]; +}; + + + Note that alice is a member of the + wheel and networkmanager + groups, which allows her to use sudo to execute + commands as root and to configure the network, + respectively. Also note the SSH public key that allows remote logins + with the corresponding private key. Users created in this way do not + have a password by default, so they cannot log in via mechanisms + that require a password. However, you can use the + passwd program to set a password, which is + retained across invocations of nixos-rebuild. + + + If you set + users.mutableUsers + to false, then the contents of /etc/passwd and + /etc/group will be congruent to your NixOS + configuration. For instance, if you remove a user from + users.users + and run nixos-rebuild, the user account will cease to exist. Also, + imperative commands for managing users and groups, such as useradd, + are no longer available. Passwords may still be assigned by setting + the user's + hashedPassword + option. A hashed password can be generated using + mkpasswd -m sha-512. + + + A user ID (uid) is assigned automatically. You can also specify a + uid manually by adding + + +uid = 1000; + + + to the user specification. + + + Groups can be specified similarly. The following states that a group + named students shall exist: + + +users.groups.students.gid = 1000; + + + As with users, the group ID (gid) is optional and will be assigned + automatically if it’s missing. + + + In the imperative style, users and groups are managed by commands + such as useradd, groupmod and + so on. For instance, to create a user account named + alice: + + +# useradd -m alice + + + To make all nix tools available to this new user use `su - USER` + which opens a login shell (==shell that loads the profile) for given + user. This will create the ~/.nix-defexpr symlink. So run: + + +# su - alice -c "true" + + + The flag -m causes the creation of a home + directory for the new user, which is generally what you want. The + user does not have an initial password and therefore cannot log in. + A password can be set using the passwd utility: + + +# passwd alice +Enter new UNIX password: *** +Retype new UNIX password: *** + + + A user can be deleted using userdel: + + +# userdel -r alice + + + The flag -r deletes the user’s home directory. + Accounts can be modified using usermod. Unix + groups can be managed using groupadd, + groupmod and groupdel. + + From 361056334d9ceefb607c6f49068c2d4ead59a6cb Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Jul 2021 19:37:18 +0800 Subject: [PATCH 041/167] nixos: nixos/doc/manual/configuration/x-windows.xml to CommonMark --- .../manual/configuration/configuration.xml | 2 +- .../manual/configuration/x-windows.chapter.md | 337 +++++++++++++++ nixos/doc/manual/configuration/x-windows.xml | 355 ---------------- .../configuration/x-windows.chapter.xml | 383 ++++++++++++++++++ 4 files changed, 721 insertions(+), 356 deletions(-) create mode 100644 nixos/doc/manual/configuration/x-windows.chapter.md delete mode 100644 nixos/doc/manual/configuration/x-windows.xml create mode 100644 nixos/doc/manual/from_md/configuration/x-windows.chapter.xml diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml index 006205215f6e..4598ae4d1399 100644 --- a/nixos/doc/manual/configuration/configuration.xml +++ b/nixos/doc/manual/configuration/configuration.xml @@ -17,7 +17,7 @@ - + diff --git a/nixos/doc/manual/configuration/x-windows.chapter.md b/nixos/doc/manual/configuration/x-windows.chapter.md new file mode 100644 index 000000000000..d9a924d41d7d --- /dev/null +++ b/nixos/doc/manual/configuration/x-windows.chapter.md @@ -0,0 +1,337 @@ +# X Window System {#sec-x11} + +The X Window System (X11) provides the basis of NixOS' graphical user +interface. It can be enabled as follows: + +```nix +services.xserver.enable = true; +``` + +The X server will automatically detect and use the appropriate video +driver from a set of X.org drivers (such as `vesa` and `intel`). You can +also specify a driver manually, e.g. + +```nix +services.xserver.videoDrivers = [ "r128" ]; +``` + +to enable X.org's `xf86-video-r128` driver. + +You also need to enable at least one desktop or window manager. +Otherwise, you can only log into a plain undecorated `xterm` window. +Thus you should pick one or more of the following lines: + +```nix +services.xserver.desktopManager.plasma5.enable = true; +services.xserver.desktopManager.xfce.enable = true; +services.xserver.desktopManager.gnome.enable = true; +services.xserver.desktopManager.mate.enable = true; +services.xserver.windowManager.xmonad.enable = true; +services.xserver.windowManager.twm.enable = true; +services.xserver.windowManager.icewm.enable = true; +services.xserver.windowManager.i3.enable = true; +services.xserver.windowManager.herbstluftwm.enable = true; +``` + +NixOS's default *display manager* (the program that provides a graphical +login prompt and manages the X server) is LightDM. You can select an +alternative one by picking one of the following lines: + +```nix +services.xserver.displayManager.sddm.enable = true; +services.xserver.displayManager.gdm.enable = true; +``` + +You can set the keyboard layout (and optionally the layout variant): + +```nix +services.xserver.layout = "de"; +services.xserver.xkbVariant = "neo"; +``` + +The X server is started automatically at boot time. If you don't want +this to happen, you can set: + +```nix +services.xserver.autorun = false; +``` + +The X server can then be started manually: + +```ShellSession +# systemctl start display-manager.service +``` + +On 64-bit systems, if you want OpenGL for 32-bit programs such as in +Wine, you should also set the following: + +```nix +hardware.opengl.driSupport32Bit = true; +``` + +## Auto-login {#sec-x11-auto-login .unnumbered} + +The x11 login screen can be skipped entirely, automatically logging you +into your window manager and desktop environment when you boot your +computer. + +This is especially helpful if you have disk encryption enabled. Since +you already have to provide a password to decrypt your disk, entering a +second password to login can be redundant. + +To enable auto-login, you need to define your default window manager and +desktop environment. If you wanted no desktop environment and i3 as your +your window manager, you\'d define: + +```nix +services.xserver.displayManager.defaultSession = "none+i3"; +``` + +Every display manager in NixOS supports auto-login, here is an example +using lightdm for a user `alice`: + +```nix +services.xserver.displayManager.lightdm.enable = true; +services.xserver.displayManager.autoLogin.enable = true; +services.xserver.displayManager.autoLogin.user = "alice"; +``` + +## Intel Graphics drivers {#sec-x11--graphics-cards-intel .unnumbered} + +There are two choices for Intel Graphics drivers in X.org: `modesetting` +(included in the xorg-server itself) and `intel` (provided by the +package xf86-video-intel). + +The default and recommended is `modesetting`. It is a generic driver +which uses the kernel [mode +setting](https://en.wikipedia.org/wiki/Mode_setting) (KMS) mechanism. It +supports Glamor (2D graphics acceleration via OpenGL) and is actively +maintained but may perform worse in some cases (like in old chipsets). + +The second driver, `intel`, is specific to Intel GPUs, but not +recommended by most distributions: it lacks several modern features (for +example, it doesn\'t support Glamor) and the package hasn\'t been +officially updated since 2015. + +The results vary depending on the hardware, so you may have to try both +drivers. Use the option +[`services.xserver.videoDrivers`](options.html#opt-services.xserver.videoDrivers) +to set one. The recommended configuration for modern systems is: + +```nix +services.xserver.videoDrivers = [ "modesetting" ]; +services.xserver.useGlamor = true; +``` + +If you experience screen tearing no matter what, this configuration was +reported to resolve the issue: + +```nix +services.xserver.videoDrivers = [ "intel" ]; +services.xserver.deviceSection = '' + Option "DRI" "2" + Option "TearFree" "true" +''; +``` + +Note that this will likely downgrade the performance compared to +`modesetting` or `intel` with DRI 3 (default). + +## Proprietary NVIDIA drivers {#sec-x11-graphics-cards-nvidia .unnumbered} + +NVIDIA provides a proprietary driver for its graphics cards that has +better 3D performance than the X.org drivers. It is not enabled by +default because it's not free software. You can enable it as follows: + +```nix +services.xserver.videoDrivers = [ "nvidia" ]; +``` + +Or if you have an older card, you may have to use one of the legacy +drivers: + +```nix +services.xserver.videoDrivers = [ "nvidiaLegacy390" ]; +services.xserver.videoDrivers = [ "nvidiaLegacy340" ]; +services.xserver.videoDrivers = [ "nvidiaLegacy304" ]; +``` + +You may need to reboot after enabling this driver to prevent a clash +with other kernel modules. + +## Proprietary AMD drivers {#sec-x11--graphics-cards-amd .unnumbered} + +AMD provides a proprietary driver for its graphics cards that is not +enabled by default because it's not Free Software, is often broken in +nixpkgs and as of this writing doesn\'t offer more features or +performance. If you still want to use it anyway, you need to explicitly +set: + +```nix +services.xserver.videoDrivers = [ "amdgpu-pro" ]; +``` + +You will need to reboot after enabling this driver to prevent a clash +with other kernel modules. + +## Touchpads {#sec-x11-touchpads .unnumbered} + +Support for Synaptics touchpads (found in many laptops such as the Dell +Latitude series) can be enabled as follows: + +```nix +services.xserver.libinput.enable = true; +``` + +The driver has many options (see [Appendix A, Configuration Options](options.html)). +For instance, the following disables tap-to-click behavior: + +```nix +services.xserver.libinput.touchpad.tapping = false; +``` + +Note: the use of `services.xserver.synaptics` is deprecated since NixOS +17.09. + +## GTK/Qt themes {#sec-x11-gtk-and-qt-themes .unnumbered} + +GTK themes can be installed either to user profile or system-wide (via +`environment.systemPackages`). To make Qt 5 applications look similar to +GTK ones, you can use the following configuration: + +```nix +qt5.enable = true; +qt5.platformTheme = "gtk2"; +qt5.style = "gtk2"; +``` + +## Custom XKB layouts {#custom-xkb-layouts .unnumbered} + +It is possible to install custom [ XKB +](https://en.wikipedia.org/wiki/X_keyboard_extension) keyboard layouts +using the option `services.xserver.extraLayouts`. + +As a first example, we are going to create a layout based on the basic +US layout, with an additional layer to type some greek symbols by +pressing the right-alt key. + +Create a file called `us-greek` with the following content (under a +directory called `symbols`; it\'s an XKB peculiarity that will help with +testing): + +```nix +xkb_symbols "us-greek" +{ + include "us(basic)" // includes the base US keys + include "level3(ralt_switch)" // configures right alt as a third level switch + + key { [ a, A, Greek_alpha ] }; + key { [ b, B, Greek_beta ] }; + key { [ g, G, Greek_gamma ] }; + key { [ d, D, Greek_delta ] }; + key { [ z, Z, Greek_zeta ] }; +}; +``` + +A minimal layout specification must include the following: + +```nix +services.xserver.extraLayouts.us-greek = { + description = "US layout with alt-gr greek"; + languages = [ "eng" ]; + symbolsFile = /yourpath/symbols/us-greek; +}; +``` + +::: {.note} +The name (after `extraLayouts.`) should match the one given to the +`xkb_symbols` block. +::: + +Applying this customization requires rebuilding several packages, and a +broken XKB file can lead to the X session crashing at login. Therefore, +you\'re strongly advised to **test your layout before applying it**: + +```ShellSession +$ nix-shell -p xorg.xkbcomp +$ setxkbmap -I/yourpath us-greek -print | xkbcomp -I/yourpath - $DISPLAY +``` + +You can inspect the predefined XKB files for examples: + +```ShellSession +$ echo "$(nix-build --no-out-link '' -A xorg.xkeyboardconfig)/etc/X11/xkb/" +``` + +Once the configuration is applied, and you did a logout/login cycle, the +layout should be ready to use. You can try it by e.g. running +`setxkbmap us-greek` and then type `+a` (it may not get applied in +your terminal straight away). To change the default, the usual +`services.xserver.layout` option can still be used. + +A layout can have several other components besides `xkb_symbols`, for +example we will define new keycodes for some multimedia key and bind +these to some symbol. + +Use the *xev* utility from `pkgs.xorg.xev` to find the codes of the keys +of interest, then create a `media-key` file to hold the keycodes +definitions + +```nix +xkb_keycodes "media" +{ + = 123; + = 456; +} +``` + +Now use the newly define keycodes in `media-sym`: + +```nix +xkb_symbols "media" +{ + key.type = "ONE_LEVEL"; + key { [ XF86AudioLowerVolume ] }; + key { [ XF86AudioRaiseVolume ] }; +} +``` + +As before, to install the layout do + +```nix +services.xserver.extraLayouts.media = { + description = "Multimedia keys remapping"; + languages = [ "eng" ]; + symbolsFile = /path/to/media-key; + keycodesFile = /path/to/media-sym; +}; +``` + +::: {.note} +The function `pkgs.writeText ` can be useful if you +prefer to keep the layout definitions inside the NixOS configuration. +::: + +Unfortunately, the Xorg server does not (currently) support setting a +keymap directly but relies instead on XKB rules to select the matching +components (keycodes, types, \...) of a layout. This means that +components other than symbols won\'t be loaded by default. As a +workaround, you can set the keymap using `setxkbmap` at the start of the +session with: + +```nix +services.xserver.displayManager.sessionCommands = "setxkbmap -keycodes media"; +``` + +If you are manually starting the X server, you should set the argument +`-xkbdir /etc/X11/xkb`, otherwise X won\'t find your layout files. For +example with `xinit` run + +```ShellSession +$ xinit -- -xkbdir /etc/X11/xkb +``` + +To learn how to write layouts take a look at the XKB [documentation +](https://www.x.org/releases/current/doc/xorg-docs/input/XKB-Enhancing.html#Defining_New_Layouts). +More example layouts can also be found [here +](https://wiki.archlinux.org/index.php/X_KeyBoard_extension#Basic_examples). diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml deleted file mode 100644 index f9121508d7d4..000000000000 --- a/nixos/doc/manual/configuration/x-windows.xml +++ /dev/null @@ -1,355 +0,0 @@ - - X Window System - - The X Window System (X11) provides the basis of NixOS’ graphical user - interface. It can be enabled as follows: - - = true; - - The X server will automatically detect and use the appropriate video driver - from a set of X.org drivers (such as vesa and - intel). You can also specify a driver manually, e.g. - - = [ "r128" ]; - - to enable X.org’s xf86-video-r128 driver. - - - You also need to enable at least one desktop or window manager. Otherwise, - you can only log into a plain undecorated xterm window. - Thus you should pick one or more of the following lines: - - = true; - = true; - = true; - = true; - = true; - = true; - = true; - = true; - = true; - - - - NixOS’s default display manager (the program that - provides a graphical login prompt and manages the X server) is LightDM. You - can select an alternative one by picking one of the following lines: - - = true; - = true; - - - - You can set the keyboard layout (and optionally the layout variant): - - = "de"; - = "neo"; - - - - The X server is started automatically at boot time. If you don’t want this - to happen, you can set: - - = false; - - The X server can then be started manually: - -# systemctl start display-manager.service - - - - On 64-bit systems, if you want OpenGL for 32-bit programs such as in Wine, - you should also set the following: - - = true; - - - - Auto-login - - The x11 login screen can be skipped entirely, automatically logging you into - your window manager and desktop environment when you boot your computer. - - - This is especially helpful if you have disk encryption enabled. Since you - already have to provide a password to decrypt your disk, entering a second - password to login can be redundant. - - - To enable auto-login, you need to define your default window manager and - desktop environment. If you wanted no desktop environment and i3 as your your - window manager, you'd define: - - = "none+i3"; - - Every display manager in NixOS supports auto-login, here is an example - using lightdm for a user alice: - - = true; - = true; - = "alice"; - - - - - Intel Graphics drivers - - There are two choices for Intel Graphics drivers in X.org: - modesetting (included in the xorg-server itself) - and intel (provided by the package xf86-video-intel). - - - The default and recommended is modesetting. - It is a generic driver which uses the kernel - mode setting - (KMS) mechanism. It supports Glamor (2D graphics acceleration via OpenGL) - and is actively maintained but may perform worse in some cases (like in old chipsets). - - - The second driver, intel, is specific to Intel GPUs, - but not recommended by most distributions: it lacks several modern features - (for example, it doesn't support Glamor) and the package hasn't been officially - updated since 2015. - - - The results vary depending on the hardware, so you may have to try both drivers. - Use the option to set one. - The recommended configuration for modern systems is: - - = [ "modesetting" ]; - = true; - - If you experience screen tearing no matter what, this configuration was - reported to resolve the issue: - - = [ "intel" ]; - = '' - Option "DRI" "2" - Option "TearFree" "true" - ''; - - Note that this will likely downgrade the performance compared to - modesetting or intel with DRI 3 (default). - - - - Proprietary NVIDIA drivers - - NVIDIA provides a proprietary driver for its graphics cards that has better - 3D performance than the X.org drivers. It is not enabled by default because - it’s not free software. You can enable it as follows: - - = [ "nvidia" ]; - - Or if you have an older card, you may have to use one of the legacy drivers: - - = [ "nvidiaLegacy390" ]; - = [ "nvidiaLegacy340" ]; - = [ "nvidiaLegacy304" ]; - - You may need to reboot after enabling this driver to prevent a clash with - other kernel modules. - - - - Proprietary AMD drivers - - AMD provides a proprietary driver for its graphics cards that is not - enabled by default because it’s not Free Software, is often broken - in nixpkgs and as of this writing doesn't offer more features or - performance. If you still want to use it anyway, you need to explicitly set: - - = [ "amdgpu-pro" ]; - - You will need to reboot after enabling this driver to prevent a clash with - other kernel modules. - - - - Touchpads - - Support for Synaptics touchpads (found in many laptops such as the Dell - Latitude series) can be enabled as follows: - - = true; - - The driver has many options (see ). For - instance, the following disables tap-to-click behavior: - - = false; - - Note: the use of services.xserver.synaptics is deprecated - since NixOS 17.09. - - - - GTK/Qt themes - - GTK themes can be installed either to user profile or system-wide (via - environment.systemPackages). To make Qt 5 applications - look similar to GTK ones, you can use the following configuration: - - = true; - = "gtk2"; - = "gtk2"; - - - - - Custom XKB layouts - - It is possible to install custom - - XKB - - keyboard layouts using the option - . - - - As a first example, we are going to create a layout based on the basic US - layout, with an additional layer to type some greek symbols by pressing the - right-alt key. - - - Create a file called us-greek with the following - content (under a directory called symbols; it's - an XKB peculiarity that will help with testing): - - -xkb_symbols "us-greek" -{ - include "us(basic)" // includes the base US keys - include "level3(ralt_switch)" // configures right alt as a third level switch - - key <LatA> { [ a, A, Greek_alpha ] }; - key <LatB> { [ b, B, Greek_beta ] }; - key <LatG> { [ g, G, Greek_gamma ] }; - key <LatD> { [ d, D, Greek_delta ] }; - key <LatZ> { [ z, Z, Greek_zeta ] }; -}; - - - A minimal layout specification must include the following: - - -.us-greek = { - description = "US layout with alt-gr greek"; - languages = [ "eng" ]; - symbolsFile = /yourpath/symbols/us-greek; -}; - - - - The name (after extraLayouts.) should match the one given to the - xkb_symbols block. - - - - Applying this customization requires rebuilding several packages, - and a broken XKB file can lead to the X session crashing at login. - Therefore, you're strongly advised to test - your layout before applying it: - -$ nix-shell -p xorg.xkbcomp -$ setxkbmap -I/yourpath us-greek -print | xkbcomp -I/yourpath - $DISPLAY - - - - You can inspect the predefined XKB files for examples: - -$ echo "$(nix-build --no-out-link '<nixpkgs>' -A xorg.xkeyboardconfig)/etc/X11/xkb/" - - - - Once the configuration is applied, and you did a logout/login - cycle, the layout should be ready to use. You can try it by e.g. - running setxkbmap us-greek and then type - <alt>+a (it may not get applied in your - terminal straight away). To change the default, the usual - - option can still be used. - - - A layout can have several other components besides - xkb_symbols, for example we will define new - keycodes for some multimedia key and bind these to some symbol. - - - Use the xev utility from - pkgs.xorg.xev to find the codes of the keys of - interest, then create a media-key file to hold - the keycodes definitions - - -xkb_keycodes "media" -{ - <volUp> = 123; - <volDown> = 456; -} - - - Now use the newly define keycodes in media-sym: - - -xkb_symbols "media" -{ - key.type = "ONE_LEVEL"; - key <volUp> { [ XF86AudioLowerVolume ] }; - key <volDown> { [ XF86AudioRaiseVolume ] }; -} - - - As before, to install the layout do - - -.media = { - description = "Multimedia keys remapping"; - languages = [ "eng" ]; - symbolsFile = /path/to/media-key; - keycodesFile = /path/to/media-sym; -}; - - - - The function pkgs.writeText <filename> <content> - can be useful if you prefer to keep the layout definitions - inside the NixOS configuration. - - - - Unfortunately, the Xorg server does not (currently) support setting a - keymap directly but relies instead on XKB rules to select the matching - components (keycodes, types, ...) of a layout. This means that components - other than symbols won't be loaded by default. As a workaround, you - can set the keymap using setxkbmap at the start of the - session with: - - - = "setxkbmap -keycodes media"; - - - If you are manually starting the X server, you should set the argument - -xkbdir /etc/X11/xkb, otherwise X won't find your layout files. - For example with xinit run - $ xinit -- -xkbdir /etc/X11/xkb - - - To learn how to write layouts take a look at the XKB - - documentation - . More example layouts can also be found - - here - . - - - diff --git a/nixos/doc/manual/from_md/configuration/x-windows.chapter.xml b/nixos/doc/manual/from_md/configuration/x-windows.chapter.xml new file mode 100644 index 000000000000..8e67c66f1526 --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/x-windows.chapter.xml @@ -0,0 +1,383 @@ + + X Window System + + The X Window System (X11) provides the basis of NixOS’ graphical + user interface. It can be enabled as follows: + + +services.xserver.enable = true; + + + The X server will automatically detect and use the appropriate video + driver from a set of X.org drivers (such as vesa + and intel). You can also specify a driver + manually, e.g. + + +services.xserver.videoDrivers = [ "r128" ]; + + + to enable X.org’s xf86-video-r128 driver. + + + You also need to enable at least one desktop or window manager. + Otherwise, you can only log into a plain undecorated + xterm window. Thus you should pick one or more of + the following lines: + + +services.xserver.desktopManager.plasma5.enable = true; +services.xserver.desktopManager.xfce.enable = true; +services.xserver.desktopManager.gnome.enable = true; +services.xserver.desktopManager.mate.enable = true; +services.xserver.windowManager.xmonad.enable = true; +services.xserver.windowManager.twm.enable = true; +services.xserver.windowManager.icewm.enable = true; +services.xserver.windowManager.i3.enable = true; +services.xserver.windowManager.herbstluftwm.enable = true; + + + NixOS’s default display manager (the program + that provides a graphical login prompt and manages the X server) is + LightDM. You can select an alternative one by picking one of the + following lines: + + +services.xserver.displayManager.sddm.enable = true; +services.xserver.displayManager.gdm.enable = true; + + + You can set the keyboard layout (and optionally the layout variant): + + +services.xserver.layout = "de"; +services.xserver.xkbVariant = "neo"; + + + The X server is started automatically at boot time. If you don’t + want this to happen, you can set: + + +services.xserver.autorun = false; + + + The X server can then be started manually: + + +# systemctl start display-manager.service + + + On 64-bit systems, if you want OpenGL for 32-bit programs such as in + Wine, you should also set the following: + + +hardware.opengl.driSupport32Bit = true; + +
+ Auto-login + + The x11 login screen can be skipped entirely, automatically + logging you into your window manager and desktop environment when + you boot your computer. + + + This is especially helpful if you have disk encryption enabled. + Since you already have to provide a password to decrypt your disk, + entering a second password to login can be redundant. + + + To enable auto-login, you need to define your default window + manager and desktop environment. If you wanted no desktop + environment and i3 as your your window manager, you'd define: + + +services.xserver.displayManager.defaultSession = "none+i3"; + + + Every display manager in NixOS supports auto-login, here is an + example using lightdm for a user alice: + + +services.xserver.displayManager.lightdm.enable = true; +services.xserver.displayManager.autoLogin.enable = true; +services.xserver.displayManager.autoLogin.user = "alice"; + +
+
+ Intel Graphics drivers + + There are two choices for Intel Graphics drivers in X.org: + modesetting (included in the xorg-server + itself) and intel (provided by the package + xf86-video-intel). + + + The default and recommended is modesetting. It + is a generic driver which uses the kernel + mode + setting (KMS) mechanism. It supports Glamor (2D graphics + acceleration via OpenGL) and is actively maintained but may + perform worse in some cases (like in old chipsets). + + + The second driver, intel, is specific to Intel + GPUs, but not recommended by most distributions: it lacks several + modern features (for example, it doesn't support Glamor) and the + package hasn't been officially updated since 2015. + + + The results vary depending on the hardware, so you may have to try + both drivers. Use the option + services.xserver.videoDrivers + to set one. The recommended configuration for modern systems is: + + +services.xserver.videoDrivers = [ "modesetting" ]; +services.xserver.useGlamor = true; + + + If you experience screen tearing no matter what, this + configuration was reported to resolve the issue: + + +services.xserver.videoDrivers = [ "intel" ]; +services.xserver.deviceSection = '' + Option "DRI" "2" + Option "TearFree" "true" +''; + + + Note that this will likely downgrade the performance compared to + modesetting or intel with + DRI 3 (default). + +
+
+ Proprietary NVIDIA drivers + + NVIDIA provides a proprietary driver for its graphics cards that + has better 3D performance than the X.org drivers. It is not + enabled by default because it’s not free software. You can enable + it as follows: + + +services.xserver.videoDrivers = [ "nvidia" ]; + + + Or if you have an older card, you may have to use one of the + legacy drivers: + + +services.xserver.videoDrivers = [ "nvidiaLegacy390" ]; +services.xserver.videoDrivers = [ "nvidiaLegacy340" ]; +services.xserver.videoDrivers = [ "nvidiaLegacy304" ]; + + + You may need to reboot after enabling this driver to prevent a + clash with other kernel modules. + +
+
+ Proprietary AMD drivers + + AMD provides a proprietary driver for its graphics cards that is + not enabled by default because it’s not Free Software, is often + broken in nixpkgs and as of this writing doesn't offer more + features or performance. If you still want to use it anyway, you + need to explicitly set: + + +services.xserver.videoDrivers = [ "amdgpu-pro" ]; + + + You will need to reboot after enabling this driver to prevent a + clash with other kernel modules. + +
+
+ Touchpads + + Support for Synaptics touchpads (found in many laptops such as the + Dell Latitude series) can be enabled as follows: + + +services.xserver.libinput.enable = true; + + + The driver has many options (see + Appendix A, Configuration + Options). For instance, the following disables tap-to-click + behavior: + + +services.xserver.libinput.touchpad.tapping = false; + + + Note: the use of services.xserver.synaptics is + deprecated since NixOS 17.09. + +
+
+ GTK/Qt themes + + GTK themes can be installed either to user profile or system-wide + (via environment.systemPackages). To make Qt 5 + applications look similar to GTK ones, you can use the following + configuration: + + +qt5.enable = true; +qt5.platformTheme = "gtk2"; +qt5.style = "gtk2"; + +
+
+ Custom XKB layouts + + It is possible to install custom + + XKB keyboard layouts using the option + services.xserver.extraLayouts. + + + As a first example, we are going to create a layout based on the + basic US layout, with an additional layer to type some greek + symbols by pressing the right-alt key. + + + Create a file called us-greek with the + following content (under a directory called + symbols; it's an XKB peculiarity that will help + with testing): + + +xkb_symbols "us-greek" +{ + include "us(basic)" // includes the base US keys + include "level3(ralt_switch)" // configures right alt as a third level switch + + key <LatA> { [ a, A, Greek_alpha ] }; + key <LatB> { [ b, B, Greek_beta ] }; + key <LatG> { [ g, G, Greek_gamma ] }; + key <LatD> { [ d, D, Greek_delta ] }; + key <LatZ> { [ z, Z, Greek_zeta ] }; +}; + + + A minimal layout specification must include the following: + + +services.xserver.extraLayouts.us-greek = { + description = "US layout with alt-gr greek"; + languages = [ "eng" ]; + symbolsFile = /yourpath/symbols/us-greek; +}; + + + + The name (after extraLayouts.) should match + the one given to the xkb_symbols block. + + + + Applying this customization requires rebuilding several packages, + and a broken XKB file can lead to the X session crashing at login. + Therefore, you're strongly advised to test + your layout before applying it: + + +$ nix-shell -p xorg.xkbcomp +$ setxkbmap -I/yourpath us-greek -print | xkbcomp -I/yourpath - $DISPLAY + + + You can inspect the predefined XKB files for examples: + + +$ echo "$(nix-build --no-out-link '<nixpkgs>' -A xorg.xkeyboardconfig)/etc/X11/xkb/" + + + Once the configuration is applied, and you did a logout/login + cycle, the layout should be ready to use. You can try it by e.g. + running setxkbmap us-greek and then type + <alt>+a (it may not get applied in your + terminal straight away). To change the default, the usual + services.xserver.layout option can still be + used. + + + A layout can have several other components besides + xkb_symbols, for example we will define new + keycodes for some multimedia key and bind these to some symbol. + + + Use the xev utility from + pkgs.xorg.xev to find the codes of the keys of + interest, then create a media-key file to hold + the keycodes definitions + + +xkb_keycodes "media" +{ + <volUp> = 123; + <volDown> = 456; +} + + + Now use the newly define keycodes in media-sym: + + +xkb_symbols "media" +{ + key.type = "ONE_LEVEL"; + key <volUp> { [ XF86AudioLowerVolume ] }; + key <volDown> { [ XF86AudioRaiseVolume ] }; +} + + + As before, to install the layout do + + +services.xserver.extraLayouts.media = { + description = "Multimedia keys remapping"; + languages = [ "eng" ]; + symbolsFile = /path/to/media-key; + keycodesFile = /path/to/media-sym; +}; + + + + The function + pkgs.writeText <filename> <content> + can be useful if you prefer to keep the layout definitions + inside the NixOS configuration. + + + + Unfortunately, the Xorg server does not (currently) support + setting a keymap directly but relies instead on XKB rules to + select the matching components (keycodes, types, ...) of a layout. + This means that components other than symbols won't be loaded by + default. As a workaround, you can set the keymap using + setxkbmap at the start of the session with: + + +services.xserver.displayManager.sessionCommands = "setxkbmap -keycodes media"; + + + If you are manually starting the X server, you should set the + argument -xkbdir /etc/X11/xkb, otherwise X + won't find your layout files. For example with + xinit run + + +$ xinit -- -xkbdir /etc/X11/xkb + + + To learn how to write layouts take a look at the XKB + documentation + . More example layouts can also be found + here + . + +
+ From f04b9023e36c290f41446240c55e1407ac8e0c9e Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Jul 2021 19:38:06 +0800 Subject: [PATCH 042/167] nixos: nixos/doc/manual/configuration/wayland.xml to CommonMark --- .../manual/configuration/configuration.xml | 2 +- .../manual/configuration/wayland.chapter.md | 27 +++++++++++++++ nixos/doc/manual/configuration/wayland.xml | 33 ------------------- .../from_md/configuration/wayland.chapter.xml | 32 ++++++++++++++++++ 4 files changed, 60 insertions(+), 34 deletions(-) create mode 100644 nixos/doc/manual/configuration/wayland.chapter.md delete mode 100644 nixos/doc/manual/configuration/wayland.xml create mode 100644 nixos/doc/manual/from_md/configuration/wayland.chapter.xml diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml index 4598ae4d1399..adc3a88b3d8f 100644 --- a/nixos/doc/manual/configuration/configuration.xml +++ b/nixos/doc/manual/configuration/configuration.xml @@ -18,7 +18,7 @@ - + diff --git a/nixos/doc/manual/configuration/wayland.chapter.md b/nixos/doc/manual/configuration/wayland.chapter.md new file mode 100644 index 000000000000..49c0cab38e5e --- /dev/null +++ b/nixos/doc/manual/configuration/wayland.chapter.md @@ -0,0 +1,27 @@ +# Wayland {#sec-wayland} + +While X11 (see [](#sec-x11)) is still the primary display technology +on NixOS, Wayland support is steadily improving. Where X11 separates the +X Server and the window manager, on Wayland those are combined: a +Wayland Compositor is like an X11 window manager, but also embeds the +Wayland \'Server\' functionality. This means it is sufficient to install +a Wayland Compositor such as sway without separately enabling a Wayland +server: + +```nix +programs.sway.enable = true; +``` + +This installs the sway compositor along with some essential utilities. +Now you can start sway from the TTY console. + +If you are using a wlroots-based compositor, like sway, and want to be +able to share your screen, you might want to activate this option: + +```nix +xdg.portal.wlr.enable = true; +``` + +and configure Pipewire using +[`services.pipewire.enable`](options.html#opt-services.pipewire.enable) +and related options. diff --git a/nixos/doc/manual/configuration/wayland.xml b/nixos/doc/manual/configuration/wayland.xml deleted file mode 100644 index 2aefda3e22c0..000000000000 --- a/nixos/doc/manual/configuration/wayland.xml +++ /dev/null @@ -1,33 +0,0 @@ - - Wayland - - - While X11 (see ) is still the primary display - technology on NixOS, Wayland support is steadily improving. - Where X11 separates the X Server and the window manager, on Wayland those - are combined: a Wayland Compositor is like an X11 window manager, but also - embeds the Wayland 'Server' functionality. This means it is sufficient to - install a Wayland Compositor such as sway without - separately enabling a Wayland server: - - = true; - - This installs the sway compositor along with some - essential utilities. Now you can start sway from the TTY - console. - - - - If you are using a wlroots-based compositor, like sway, and want to be able to - share your screen, you might want to activate this option: - - = true; - - and configure Pipewire using - and related options. - - diff --git a/nixos/doc/manual/from_md/configuration/wayland.chapter.xml b/nixos/doc/manual/from_md/configuration/wayland.chapter.xml new file mode 100644 index 000000000000..166925f67d22 --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/wayland.chapter.xml @@ -0,0 +1,32 @@ + + Wayland + + While X11 (see ) is still the primary + display technology on NixOS, Wayland support is steadily improving. + Where X11 separates the X Server and the window manager, on Wayland + those are combined: a Wayland Compositor is like an X11 window + manager, but also embeds the Wayland 'Server' functionality. This + means it is sufficient to install a Wayland Compositor such as sway + without separately enabling a Wayland server: + + +programs.sway.enable = true; + + + This installs the sway compositor along with some essential + utilities. Now you can start sway from the TTY console. + + + If you are using a wlroots-based compositor, like sway, and want to + be able to share your screen, you might want to activate this + option: + + +xdg.portal.wlr.enable = true; + + + and configure Pipewire using + services.pipewire.enable + and related options. + + From 5ad28f419704436d1eaa0e82295f15c556fa5dce Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Jul 2021 19:38:53 +0800 Subject: [PATCH 043/167] nixos: nixos/doc/manual/configuration/gpu-accel.xml to CommonMark --- .../manual/configuration/configuration.xml | 2 +- .../manual/configuration/gpu-accel.chapter.md | 204 ++++++++++++++ nixos/doc/manual/configuration/gpu-accel.xml | 262 ------------------ .../configuration/gpu-accel.chapter.xml | 244 ++++++++++++++++ 4 files changed, 449 insertions(+), 263 deletions(-) create mode 100644 nixos/doc/manual/configuration/gpu-accel.chapter.md delete mode 100644 nixos/doc/manual/configuration/gpu-accel.xml create mode 100644 nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml index adc3a88b3d8f..b24399a2f2aa 100644 --- a/nixos/doc/manual/configuration/configuration.xml +++ b/nixos/doc/manual/configuration/configuration.xml @@ -19,7 +19,7 @@ - + diff --git a/nixos/doc/manual/configuration/gpu-accel.chapter.md b/nixos/doc/manual/configuration/gpu-accel.chapter.md new file mode 100644 index 000000000000..5540250e1da7 --- /dev/null +++ b/nixos/doc/manual/configuration/gpu-accel.chapter.md @@ -0,0 +1,204 @@ +# GPU acceleration {#sec-gpu-accel} + +NixOS provides various APIs that benefit from GPU hardware acceleration, +such as VA-API and VDPAU for video playback; OpenGL and Vulkan for 3D +graphics; and OpenCL for general-purpose computing. This chapter +describes how to set up GPU hardware acceleration (as far as this is not +done automatically) and how to verify that hardware acceleration is +indeed used. + +Most of the aforementioned APIs are agnostic with regards to which +display server is used. Consequently, these instructions should apply +both to the X Window System and Wayland compositors. + +## OpenCL {#sec-gpu-accel-opencl} + +[OpenCL](https://en.wikipedia.org/wiki/OpenCL) is a general compute API. +It is used by various applications such as Blender and Darktable to +accelerate certain operations. + +OpenCL applications load drivers through the *Installable Client Driver* +(ICD) mechanism. In this mechanism, an ICD file specifies the path to +the OpenCL driver for a particular GPU family. In NixOS, there are two +ways to make ICD files visible to the ICD loader. The first is through +the `OCL_ICD_VENDORS` environment variable. This variable can contain a +directory which is scanned by the ICL loader for ICD files. For example: + +```ShellSession +$ export \ + OCL_ICD_VENDORS=`nix-build '' --no-out-link -A rocm-opencl-icd`/etc/OpenCL/vendors/ +``` + +The second mechanism is to add the OpenCL driver package to +[`hardware.opengl.extraPackages`](options.html#opt-hardware.opengl.extraPackages). +This links the ICD file under `/run/opengl-driver`, where it will be visible +to the ICD loader. + +The proper installation of OpenCL drivers can be verified through the +`clinfo` command of the clinfo package. This command will report the +number of hardware devices that is found and give detailed information +for each device: + +```ShellSession +$ clinfo | head -n3 +Number of platforms 1 +Platform Name AMD Accelerated Parallel Processing +Platform Vendor Advanced Micro Devices, Inc. +``` + +### AMD {#sec-gpu-accel-opencl-amd} + +Modern AMD [Graphics Core +Next](https://en.wikipedia.org/wiki/Graphics_Core_Next) (GCN) GPUs are +supported through the rocm-opencl-icd package. Adding this package to +[`hardware.opengl.extraPackages`](options.html#opt-hardware.opengl.extraPackages) +enables OpenCL support: + +```nix +hardware.opengl.extraPackages = [ + rocm-opencl-icd + ]; +``` + +### Intel {#sec-gpu-accel-opencl-intel} + +[Intel Gen8 and later +GPUs](https://en.wikipedia.org/wiki/List_of_Intel_graphics_processing_units#Gen8) +are supported by the Intel NEO OpenCL runtime that is provided by the +intel-compute-runtime package. For Gen7 GPUs, the deprecated Beignet +runtime can be used, which is provided by the beignet package. The +proprietary Intel OpenCL runtime, in the intel-ocl package, is an +alternative for Gen7 GPUs. + +The intel-compute-runtime, beignet, or intel-ocl package can be added to +[`hardware.opengl.extraPackages`](options.html#opt-hardware.opengl.extraPackages) +to enable OpenCL support. For example, for Gen8 and later GPUs, the following +configuration can be used: + +```nix +hardware.opengl.extraPackages = [ + intel-compute-runtime + ]; +``` + +## Vulkan {#sec-gpu-accel-vulkan} + +[Vulkan](https://en.wikipedia.org/wiki/Vulkan_(API)) is a graphics and +compute API for GPUs. It is used directly by games or indirectly though +compatibility layers like +[DXVK](https://github.com/doitsujin/dxvk/wiki). + +By default, if [`hardware.opengl.driSupport`](options.html#opt-hardware.opengl.driSupport) +is enabled, mesa is installed and provides Vulkan for supported hardware. + +Similar to OpenCL, Vulkan drivers are loaded through the *Installable +Client Driver* (ICD) mechanism. ICD files for Vulkan are JSON files that +specify the path to the driver library and the supported Vulkan version. +All successfully loaded drivers are exposed to the application as +different GPUs. In NixOS, there are two ways to make ICD files visible +to Vulkan applications: an environment variable and a module option. + +The first option is through the `VK_ICD_FILENAMES` environment variable. +This variable can contain multiple JSON files, separated by `:`. For +example: + +```ShellSession +$ export \ + VK_ICD_FILENAMES=`nix-build '' --no-out-link -A amdvlk`/share/vulkan/icd.d/amd_icd64.json +``` + +The second mechanism is to add the Vulkan driver package to +[`hardware.opengl.extraPackages`](options.html#opt-hardware.opengl.extraPackages). +This links the ICD file under `/run/opengl-driver`, where it will be +visible to the ICD loader. + +The proper installation of Vulkan drivers can be verified through the +`vulkaninfo` command of the vulkan-tools package. This command will +report the hardware devices and drivers found, in this example output +amdvlk and radv: + +```ShellSession +$ vulkaninfo | grep GPU + GPU id : 0 (Unknown AMD GPU) + GPU id : 1 (AMD RADV NAVI10 (LLVM 9.0.1)) + ... +GPU0: + deviceType = PHYSICAL_DEVICE_TYPE_DISCRETE_GPU + deviceName = Unknown AMD GPU +GPU1: + deviceType = PHYSICAL_DEVICE_TYPE_DISCRETE_GPU +``` + +A simple graphical application that uses Vulkan is `vkcube` from the +vulkan-tools package. + +### AMD {#sec-gpu-accel-vulkan-amd} + +Modern AMD [Graphics Core +Next](https://en.wikipedia.org/wiki/Graphics_Core_Next) (GCN) GPUs are +supported through either radv, which is part of mesa, or the amdvlk +package. Adding the amdvlk package to +[`hardware.opengl.extraPackages`](options.html#opt-hardware.opengl.extraPackages) +makes amdvlk the default driver and hides radv and lavapipe from the device list. +A specific driver can be forced as follows: + +```nix +hardware.opengl.extraPackages = [ + pkgs.amdvlk + ]; + + # To enable Vulkan support for 32-bit applications, also add: + hardware.opengl.extraPackages32 = [ + pkgs.driversi686Linux.amdvlk + ]; + + # Force radv + environment.variables.AMD_VULKAN_ICD = "RADV"; + # Or + environment.variables.VK_ICD_FILENAMES = + "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json"; +``` + +## Common issues {#sec-gpu-accel-common-issues} + +### User permissions {#sec-gpu-accel-common-issues-permissions} + +Except where noted explicitly, it should not be necessary to adjust user +permissions to use these acceleration APIs. In the default +configuration, GPU devices have world-read/write permissions +(`/dev/dri/renderD*`) or are tagged as `uaccess` (`/dev/dri/card*`). The +access control lists of devices with the `uaccess` tag will be updated +automatically when a user logs in through `systemd-logind`. For example, +if the user *jane* is logged in, the access control list should look as +follows: + +```ShellSession +$ getfacl /dev/dri/card0 +# file: dev/dri/card0 +# owner: root +# group: video +user::rw- +user:jane:rw- +group::rw- +mask::rw- +other::--- +``` + +If you disabled (this functionality of) `systemd-logind`, you may need +to add the user to the `video` group and log in again. + +### Mixing different versions of nixpkgs {#sec-gpu-accel-common-issues-mixing-nixpkgs} + +The *Installable Client Driver* (ICD) mechanism used by OpenCL and +Vulkan loads runtimes into its address space using `dlopen`. Mixing an +ICD loader mechanism and runtimes from different version of nixpkgs may +not work. For example, if the ICD loader uses an older version of glibc +than the runtime, the runtime may not be loadable due to missing +symbols. Unfortunately, the loader will generally be quiet about such +issues. + +If you suspect that you are running into library version mismatches +between an ICL loader and a runtime, you could run an application with +the `LD_DEBUG` variable set to get more diagnostic information. For +example, OpenCL can be tested with `LD_DEBUG=files clinfo`, which should +report missing symbols. diff --git a/nixos/doc/manual/configuration/gpu-accel.xml b/nixos/doc/manual/configuration/gpu-accel.xml deleted file mode 100644 index 9aa9be86a061..000000000000 --- a/nixos/doc/manual/configuration/gpu-accel.xml +++ /dev/null @@ -1,262 +0,0 @@ - - GPU acceleration - - - NixOS provides various APIs that benefit from GPU hardware - acceleration, such as VA-API and VDPAU for video playback; OpenGL and - Vulkan for 3D graphics; and OpenCL for general-purpose computing. - This chapter describes how to set up GPU hardware acceleration (as far - as this is not done automatically) and how to verify that hardware - acceleration is indeed used. - - - - Most of the aforementioned APIs are agnostic with regards to which - display server is used. Consequently, these instructions should apply - both to the X Window System and Wayland compositors. - - -
- OpenCL - - - OpenCL is a - general compute API. It is used by various applications such as - Blender and Darktable to accelerate certain operations. - - - - OpenCL applications load drivers through the Installable Client - Driver (ICD) mechanism. In this mechanism, an ICD file - specifies the path to the OpenCL driver for a particular GPU family. - In NixOS, there are two ways to make ICD files visible to the ICD - loader. The first is through the OCL_ICD_VENDORS - environment variable. This variable can contain a directory which - is scanned by the ICL loader for ICD files. For example: - - $ export \ - OCL_ICD_VENDORS=`nix-build '<nixpkgs>' --no-out-link -A rocm-opencl-icd`/etc/OpenCL/vendors/ - - - - The second mechanism is to add the OpenCL driver package to - . This links the - ICD file under /run/opengl-driver, where it will - be visible to the ICD loader. - - - - The proper installation of OpenCL drivers can be verified through - the clinfo command of the clinfo - package. This command will report the number of hardware devices - that is found and give detailed information for each device: - - - $ clinfo | head -n3 -Number of platforms 1 -Platform Name AMD Accelerated Parallel Processing -Platform Vendor Advanced Micro Devices, Inc. - -
- AMD - - - Modern AMD Graphics - Core Next (GCN) GPUs are supported through the - rocm-opencl-icd package. Adding this package to - enables OpenCL - support: - - = [ - rocm-opencl-icd - ]; - -
- -
- Intel - - - Intel - Gen8 and later GPUs are supported by the Intel NEO OpenCL - runtime that is provided by the - intel-compute-runtime package. For Gen7 GPUs, - the deprecated Beignet runtime can be used, which is provided - by the beignet package. The proprietary Intel - OpenCL runtime, in the intel-ocl package, is - an alternative for Gen7 GPUs. - - - - The intel-compute-runtime, beignet, - or intel-ocl package can be added to - to enable OpenCL - support. For example, for Gen8 and later GPUs, the following - configuration can be used: - - = [ - intel-compute-runtime - ]; - - -
-
- -
- Vulkan - - - Vulkan is a - graphics and compute API for GPUs. It is used directly by games or indirectly though - compatibility layers like DXVK. - - - - By default, if is enabled, - mesa is installed and provides Vulkan for supported hardware. - - - - Similar to OpenCL, Vulkan drivers are loaded through the Installable Client - Driver (ICD) mechanism. ICD files for Vulkan are JSON files that specify - the path to the driver library and the supported Vulkan version. All successfully - loaded drivers are exposed to the application as different GPUs. - In NixOS, there are two ways to make ICD files visible to Vulkan applications: an - environment variable and a module option. - - - - The first option is through the VK_ICD_FILENAMES - environment variable. This variable can contain multiple JSON files, separated by - :. For example: - - $ export \ - VK_ICD_FILENAMES=`nix-build '<nixpkgs>' --no-out-link -A amdvlk`/share/vulkan/icd.d/amd_icd64.json - - - - The second mechanism is to add the Vulkan driver package to - . This links the - ICD file under /run/opengl-driver, where it will - be visible to the ICD loader. - - - - The proper installation of Vulkan drivers can be verified through - the vulkaninfo command of the vulkan-tools - package. This command will report the hardware devices and drivers found, - in this example output amdvlk and radv: - - - $ vulkaninfo | grep GPU - GPU id : 0 (Unknown AMD GPU) - GPU id : 1 (AMD RADV NAVI10 (LLVM 9.0.1)) - ... -GPU0: - deviceType = PHYSICAL_DEVICE_TYPE_DISCRETE_GPU - deviceName = Unknown AMD GPU -GPU1: - deviceType = PHYSICAL_DEVICE_TYPE_DISCRETE_GPU - - - A simple graphical application that uses Vulkan is vkcube - from the vulkan-tools package. - - -
- AMD - - - Modern AMD Graphics - Core Next (GCN) GPUs are supported through either radv, which is - part of mesa, or the amdvlk package. - Adding the amdvlk package to - makes amdvlk the - default driver and hides radv and lavapipe from the device list. A - specific driver can be forced as follows: - - = [ - pkgs.amdvlk - ]; - - # To enable Vulkan support for 32-bit applications, also add: - = [ - pkgs.driversi686Linux.amdvlk - ]; - - # Force radv - .AMD_VULKAN_ICD = "RADV"; - # Or - .VK_ICD_FILENAMES = - "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json"; - - -
-
- -
- Common issues - -
- User permissions - - - Except where noted explicitly, it should not be necessary to - adjust user permissions to use these acceleration APIs. In the default - configuration, GPU devices have world-read/write permissions - (/dev/dri/renderD*) or are tagged as - uaccess (/dev/dri/card*). The - access control lists of devices with the uaccess - tag will be updated automatically when a user logs in through - systemd-logind. For example, if the user - jane is logged in, the access control list - should look as follows: - - $ getfacl /dev/dri/card0 -# file: dev/dri/card0 -# owner: root -# group: video -user::rw- -user:jane:rw- -group::rw- -mask::rw- -other::--- - - If you disabled (this functionality of) systemd-logind, - you may need to add the user to the video group and - log in again. - -
- -
- Mixing different versions of nixpkgs - - - The Installable Client Driver (ICD) - mechanism used by OpenCL and Vulkan loads runtimes into its address - space using dlopen. Mixing an ICD loader mechanism and - runtimes from different version of nixpkgs may not work. For example, - if the ICD loader uses an older version of glibc - than the runtime, the runtime may not be loadable due to - missing symbols. Unfortunately, the loader will generally be quiet - about such issues. - - - - If you suspect that you are running into library version mismatches - between an ICL loader and a runtime, you could run an application with - the LD_DEBUG variable set to get more diagnostic - information. For example, OpenCL can be tested with - LD_DEBUG=files clinfo, which should report missing - symbols. - -
-
- diff --git a/nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml b/nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml new file mode 100644 index 000000000000..ec6468101849 --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml @@ -0,0 +1,244 @@ + + GPU acceleration + + NixOS provides various APIs that benefit from GPU hardware + acceleration, such as VA-API and VDPAU for video playback; OpenGL + and Vulkan for 3D graphics; and OpenCL for general-purpose + computing. This chapter describes how to set up GPU hardware + acceleration (as far as this is not done automatically) and how to + verify that hardware acceleration is indeed used. + + + Most of the aforementioned APIs are agnostic with regards to which + display server is used. Consequently, these instructions should + apply both to the X Window System and Wayland compositors. + +
+ OpenCL + + OpenCL + is a general compute API. It is used by various applications such + as Blender and Darktable to accelerate certain operations. + + + OpenCL applications load drivers through the Installable + Client Driver (ICD) mechanism. In this mechanism, an + ICD file specifies the path to the OpenCL driver for a particular + GPU family. In NixOS, there are two ways to make ICD files visible + to the ICD loader. The first is through the + OCL_ICD_VENDORS environment variable. This + variable can contain a directory which is scanned by the ICL + loader for ICD files. For example: + + +$ export \ + OCL_ICD_VENDORS=`nix-build '<nixpkgs>' --no-out-link -A rocm-opencl-icd`/etc/OpenCL/vendors/ + + + The second mechanism is to add the OpenCL driver package to + hardware.opengl.extraPackages. + This links the ICD file under + /run/opengl-driver, where it will be visible to + the ICD loader. + + + The proper installation of OpenCL drivers can be verified through + the clinfo command of the clinfo package. This + command will report the number of hardware devices that is found + and give detailed information for each device: + + +$ clinfo | head -n3 +Number of platforms 1 +Platform Name AMD Accelerated Parallel Processing +Platform Vendor Advanced Micro Devices, Inc. + +
+ AMD + + Modern AMD + Graphics + Core Next (GCN) GPUs are supported through the + rocm-opencl-icd package. Adding this package to + hardware.opengl.extraPackages + enables OpenCL support: + + +hardware.opengl.extraPackages = [ + rocm-opencl-icd + ]; + +
+
+ Intel + + Intel + Gen8 and later GPUs are supported by the Intel NEO OpenCL + runtime that is provided by the intel-compute-runtime package. + For Gen7 GPUs, the deprecated Beignet runtime can be used, which + is provided by the beignet package. The proprietary Intel OpenCL + runtime, in the intel-ocl package, is an alternative for Gen7 + GPUs. + + + The intel-compute-runtime, beignet, or intel-ocl package can be + added to + hardware.opengl.extraPackages + to enable OpenCL support. For example, for Gen8 and later GPUs, + the following configuration can be used: + + +hardware.opengl.extraPackages = [ + intel-compute-runtime + ]; + +
+
+
+ Vulkan + + Vulkan + is a graphics and compute API for GPUs. It is used directly by + games or indirectly though compatibility layers like + DXVK. + + + By default, if + hardware.opengl.driSupport + is enabled, mesa is installed and provides Vulkan for supported + hardware. + + + Similar to OpenCL, Vulkan drivers are loaded through the + Installable Client Driver (ICD) mechanism. + ICD files for Vulkan are JSON files that specify the path to the + driver library and the supported Vulkan version. All successfully + loaded drivers are exposed to the application as different GPUs. + In NixOS, there are two ways to make ICD files visible to Vulkan + applications: an environment variable and a module option. + + + The first option is through the + VK_ICD_FILENAMES environment variable. This + variable can contain multiple JSON files, separated by + :. For example: + + +$ export \ + VK_ICD_FILENAMES=`nix-build '<nixpkgs>' --no-out-link -A amdvlk`/share/vulkan/icd.d/amd_icd64.json + + + The second mechanism is to add the Vulkan driver package to + hardware.opengl.extraPackages. + This links the ICD file under + /run/opengl-driver, where it will be visible to + the ICD loader. + + + The proper installation of Vulkan drivers can be verified through + the vulkaninfo command of the vulkan-tools + package. This command will report the hardware devices and drivers + found, in this example output amdvlk and radv: + + +$ vulkaninfo | grep GPU + GPU id : 0 (Unknown AMD GPU) + GPU id : 1 (AMD RADV NAVI10 (LLVM 9.0.1)) + ... +GPU0: + deviceType = PHYSICAL_DEVICE_TYPE_DISCRETE_GPU + deviceName = Unknown AMD GPU +GPU1: + deviceType = PHYSICAL_DEVICE_TYPE_DISCRETE_GPU + + + A simple graphical application that uses Vulkan is + vkcube from the vulkan-tools package. + +
+ AMD + + Modern AMD + Graphics + Core Next (GCN) GPUs are supported through either radv, + which is part of mesa, or the amdvlk package. Adding the amdvlk + package to + hardware.opengl.extraPackages + makes amdvlk the default driver and hides radv and lavapipe from + the device list. A specific driver can be forced as follows: + + +hardware.opengl.extraPackages = [ + pkgs.amdvlk + ]; + + # To enable Vulkan support for 32-bit applications, also add: + hardware.opengl.extraPackages32 = [ + pkgs.driversi686Linux.amdvlk + ]; + + # Force radv + environment.variables.AMD_VULKAN_ICD = "RADV"; + # Or + environment.variables.VK_ICD_FILENAMES = + "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json"; + +
+
+
+ Common issues +
+ User permissions + + Except where noted explicitly, it should not be necessary to + adjust user permissions to use these acceleration APIs. In the + default configuration, GPU devices have world-read/write + permissions (/dev/dri/renderD*) or are tagged + as uaccess + (/dev/dri/card*). The access control lists of + devices with the uaccess tag will be updated + automatically when a user logs in through + systemd-logind. For example, if the user + jane is logged in, the access control list + should look as follows: + + +$ getfacl /dev/dri/card0 +# file: dev/dri/card0 +# owner: root +# group: video +user::rw- +user:jane:rw- +group::rw- +mask::rw- +other::--- + + + If you disabled (this functionality of) + systemd-logind, you may need to add the user + to the video group and log in again. + +
+
+ Mixing different versions of nixpkgs + + The Installable Client Driver (ICD) + mechanism used by OpenCL and Vulkan loads runtimes into its + address space using dlopen. Mixing an ICD + loader mechanism and runtimes from different version of nixpkgs + may not work. For example, if the ICD loader uses an older + version of glibc than the runtime, the runtime may not be + loadable due to missing symbols. Unfortunately, the loader will + generally be quiet about such issues. + + + If you suspect that you are running into library version + mismatches between an ICL loader and a runtime, you could run an + application with the LD_DEBUG variable set to + get more diagnostic information. For example, OpenCL can be + tested with LD_DEBUG=files clinfo, which + should report missing symbols. + +
+
+ From 35f476e8b99cfeca7660665763bfbd1fb179498a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Jul 2021 19:39:37 +0800 Subject: [PATCH 044/167] nixos: nixos/doc/manual/configuration/xfce.xml to CommonMark --- .../manual/configuration/configuration.xml | 2 +- .../doc/manual/configuration/xfce.chapter.md | 52 ++++++++++++++++ nixos/doc/manual/configuration/xfce.xml | 59 ------------------ .../from_md/configuration/xfce.chapter.xml | 62 +++++++++++++++++++ 4 files changed, 115 insertions(+), 60 deletions(-) create mode 100644 nixos/doc/manual/configuration/xfce.chapter.md delete mode 100644 nixos/doc/manual/configuration/xfce.xml create mode 100644 nixos/doc/manual/from_md/configuration/xfce.chapter.xml diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml index b24399a2f2aa..cd56ac774d09 100644 --- a/nixos/doc/manual/configuration/configuration.xml +++ b/nixos/doc/manual/configuration/configuration.xml @@ -20,7 +20,7 @@ - + diff --git a/nixos/doc/manual/configuration/xfce.chapter.md b/nixos/doc/manual/configuration/xfce.chapter.md new file mode 100644 index 000000000000..3c0c5f3a6f38 --- /dev/null +++ b/nixos/doc/manual/configuration/xfce.chapter.md @@ -0,0 +1,52 @@ +# Xfce Desktop Environment {#sec-xfce} + +To enable the Xfce Desktop Environment, set + +```nix +services.xserver.desktopManager.xfce.enable = true; +services.xserver.displayManager.defaultSession = "xfce"; +``` + +Optionally, *picom* can be enabled for nice graphical effects, some +example settings: + +```nix +services.picom = { + enable = true; + fade = true; + inactiveOpacity = 0.9; + shadow = true; + fadeDelta = 4; +}; +``` + +Some Xfce programs are not installed automatically. To install them +manually (system wide), put them into your +[`environment.systemPackages`](options.html#opt-environment.systemPackages) from `pkgs.xfce`. + +## Thunar Plugins {#sec-xfce-thunar-plugins .unnumbered} + +If you\'d like to add extra plugins to Thunar, add them to +[`services.xserver.desktopManager.xfce.thunarPlugins`](options.html#opt-services.xserver.desktopManager.xfce.thunarPlugins). +You shouldn\'t just add them to [`environment.systemPackages`](options.html#opt-environment.systemPackages). + +## Troubleshooting {#sec-xfce-troubleshooting .unnumbered} + +Even after enabling udisks2, volume management might not work. Thunar +and/or the desktop takes time to show up. Thunar will spit out this kind +of message on start (look at `journalctl --user -b`). + +```plain +Thunar:2410): GVFS-RemoteVolumeMonitor-WARNING **: remote volume monitor with dbus name org.gtk.Private.UDisks2VolumeMonitor is not supported +``` + +This is caused by some needed GNOME services not running. This is all +fixed by enabling \"Launch GNOME services on startup\" in the Advanced +tab of the Session and Startup settings panel. Alternatively, you can +run this command to do the same thing. + +```ShellSession +$ xfconf-query -c xfce4-session -p /compat/LaunchGNOME -s true +``` + +A log-out and re-log will be needed for this to take effect. diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml deleted file mode 100644 index abcf5f648a48..000000000000 --- a/nixos/doc/manual/configuration/xfce.xml +++ /dev/null @@ -1,59 +0,0 @@ - - Xfce Desktop Environment - - To enable the Xfce Desktop Environment, set - - = true; - = "xfce"; - - - - Optionally, picom can be enabled for nice graphical - effects, some example settings: - -services.picom = { - enable = true; - fade = true; - inactiveOpacity = 0.9; - shadow = true; - fadeDelta = 4; -}; - - - - Some Xfce programs are not installed automatically. To install them manually - (system wide), put them into your - from pkgs.xfce. - - - Thunar Plugins - - If you'd like to add extra plugins to Thunar, add them to - . - You shouldn't just add them to . - - - - Troubleshooting - - Even after enabling udisks2, volume management might not work. Thunar and/or - the desktop takes time to show up. Thunar will spit out this kind of message - on start (look at journalctl --user -b). - -Thunar:2410): GVFS-RemoteVolumeMonitor-WARNING **: remote volume monitor with dbus name org.gtk.Private.UDisks2VolumeMonitor is not supported - - This is caused by some needed GNOME services not running. This is all fixed - by enabling "Launch GNOME services on startup" in the Advanced tab of the - Session and Startup settings panel. Alternatively, you can run this command - to do the same thing. - -$ xfconf-query -c xfce4-session -p /compat/LaunchGNOME -s true - - A log-out and re-log will be needed for this to take effect. - - - diff --git a/nixos/doc/manual/from_md/configuration/xfce.chapter.xml b/nixos/doc/manual/from_md/configuration/xfce.chapter.xml new file mode 100644 index 000000000000..0066baa2dc70 --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/xfce.chapter.xml @@ -0,0 +1,62 @@ + + Xfce Desktop Environment + + To enable the Xfce Desktop Environment, set + + +services.xserver.desktopManager.xfce.enable = true; +services.xserver.displayManager.defaultSession = "xfce"; + + + Optionally, picom can be enabled for nice + graphical effects, some example settings: + + +services.picom = { + enable = true; + fade = true; + inactiveOpacity = 0.9; + shadow = true; + fadeDelta = 4; +}; + + + Some Xfce programs are not installed automatically. To install them + manually (system wide), put them into your + environment.systemPackages + from pkgs.xfce. + +
+ Thunar Plugins + + If you'd like to add extra plugins to Thunar, add them to + services.xserver.desktopManager.xfce.thunarPlugins. + You shouldn't just add them to + environment.systemPackages. + +
+
+ Troubleshooting + + Even after enabling udisks2, volume management might not work. + Thunar and/or the desktop takes time to show up. Thunar will spit + out this kind of message on start (look at + journalctl --user -b). + + +Thunar:2410): GVFS-RemoteVolumeMonitor-WARNING **: remote volume monitor with dbus name org.gtk.Private.UDisks2VolumeMonitor is not supported + + + This is caused by some needed GNOME services not running. This is + all fixed by enabling "Launch GNOME services on startup" + in the Advanced tab of the Session and Startup settings panel. + Alternatively, you can run this command to do the same thing. + + +$ xfconf-query -c xfce4-session -p /compat/LaunchGNOME -s true + + + A log-out and re-log will be needed for this to take effect. + +
+ From 747c61066c5e204d4523177e7b49d143dfd4ed52 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Jul 2021 19:40:22 +0800 Subject: [PATCH 045/167] nixos: nixos/doc/manual/configuration/linux-kernel.xml to CommonMark --- .../manual/configuration/configuration.xml | 2 +- .../configuration/linux-kernel.chapter.md | 135 ++++++++++++++++ .../doc/manual/configuration/linux-kernel.xml | 138 ---------------- .../configuration/linux-kernel.chapter.xml | 153 ++++++++++++++++++ 4 files changed, 289 insertions(+), 139 deletions(-) create mode 100644 nixos/doc/manual/configuration/linux-kernel.chapter.md delete mode 100644 nixos/doc/manual/configuration/linux-kernel.xml create mode 100644 nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml index cd56ac774d09..56574680f9c3 100644 --- a/nixos/doc/manual/configuration/configuration.xml +++ b/nixos/doc/manual/configuration/configuration.xml @@ -22,7 +22,7 @@ - + diff --git a/nixos/doc/manual/configuration/linux-kernel.chapter.md b/nixos/doc/manual/configuration/linux-kernel.chapter.md new file mode 100644 index 000000000000..95af16663891 --- /dev/null +++ b/nixos/doc/manual/configuration/linux-kernel.chapter.md @@ -0,0 +1,135 @@ +# Linux Kernel {#sec-kernel-config} + +You can override the Linux kernel and associated packages using the +option `boot.kernelPackages`. For instance, this selects the Linux 3.10 +kernel: + +```nix +boot.kernelPackages = pkgs.linuxPackages_3_10; +``` + +Note that this not only replaces the kernel, but also packages that are +specific to the kernel version, such as the NVIDIA video drivers. This +ensures that driver packages are consistent with the kernel. + +The default Linux kernel configuration should be fine for most users. +You can see the configuration of your current kernel with the following +command: + +```ShellSession +zcat /proc/config.gz +``` + +If you want to change the kernel configuration, you can use the +`packageOverrides` feature (see [](#sec-customising-packages)). For +instance, to enable support for the kernel debugger KGDB: + +```nix +nixpkgs.config.packageOverrides = pkgs: + { linux_3_4 = pkgs.linux_3_4.override { + extraConfig = + '' + KGDB y + ''; + }; + }; +``` + +`extraConfig` takes a list of Linux kernel configuration options, one +per line. The name of the option should not include the prefix +`CONFIG_`. The option value is typically `y`, `n` or `m` (to build +something as a kernel module). + +Kernel modules for hardware devices are generally loaded automatically +by `udev`. You can force a module to be loaded via +[`boot.kernelModules`](options.html#opt-boot.kernelModules), e.g. + +```nix +boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ]; +``` + +If the module is required early during the boot (e.g. to mount the root +file system), you can use [`boot.initrd.kernelModules`](options.html#opt-boot.initrd.kernelModules): + +```nix +boot.initrd.kernelModules = [ "cifs" ]; +``` + +This causes the specified modules and their dependencies to be added to +the initial ramdisk. + +Kernel runtime parameters can be set through +[`boot.kernel.sysctl`](options.html#opt-boot.kernel.sysctl), e.g. + +```nix +boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 120; +``` + +sets the kernel's TCP keepalive time to 120 seconds. To see the +available parameters, run `sysctl -a`. + +## Customize your kernel {#sec-linux-config-customizing} + +The first step before compiling the kernel is to generate an appropriate +`.config` configuration. Either you pass your own config via the +`configfile` setting of `linuxManualConfig`: + +```nix +custom-kernel = super.linuxManualConfig { + inherit (super) stdenv hostPlatform; + inherit (linux_4_9) src; + version = "${linux_4_9.version}-custom"; + + configfile = /home/me/my_kernel_config; + allowImportFromDerivation = true; +}; +``` + +You can edit the config with this snippet (by default `make + menuconfig` won\'t work out of the box on nixos): + +```ShellSession +nix-shell -E 'with import {}; kernelToOverride.overrideAttrs (o: {nativeBuildInputs=o.nativeBuildInputs ++ [ pkg-config ncurses ];})' +``` + +or you can let nixpkgs generate the configuration. Nixpkgs generates it +via answering the interactive kernel utility `make config`. The answers +depend on parameters passed to +`pkgs/os-specific/linux/kernel/generic.nix` (which you can influence by +overriding `extraConfig, autoModules, + modDirVersion, preferBuiltin, extraConfig`). + +```nix +mptcp93.override ({ + name="mptcp-local"; + + ignoreConfigErrors = true; + autoModules = false; + kernelPreferBuiltin = true; + + enableParallelBuilding = true; + + extraConfig = '' + DEBUG_KERNEL y + FRAME_POINTER y + KGDB y + KGDB_SERIAL_CONSOLE y + DEBUG_INFO y + ''; +}); +``` + +## Developing kernel modules {#sec-linux-config-developing-modules} + +When developing kernel modules it\'s often convenient to run +edit-compile-run loop as quickly as possible. See below snippet as an +example of developing `mellanox` drivers. + +```ShellSession +$ nix-build '' -A linuxPackages.kernel.dev +$ nix-shell '' -A linuxPackages.kernel +$ unpackPhase +$ cd linux-* +$ make -C $dev/lib/modules/*/build M=$(pwd)/drivers/net/ethernet/mellanox modules +# insmod ./drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.ko +``` diff --git a/nixos/doc/manual/configuration/linux-kernel.xml b/nixos/doc/manual/configuration/linux-kernel.xml deleted file mode 100644 index 529ac1b1cd46..000000000000 --- a/nixos/doc/manual/configuration/linux-kernel.xml +++ /dev/null @@ -1,138 +0,0 @@ - - Linux Kernel - - You can override the Linux kernel and associated packages using the option - . For instance, this selects the Linux - 3.10 kernel: - - = pkgs.linuxPackages_3_10; - - Note that this not only replaces the kernel, but also packages that are - specific to the kernel version, such as the NVIDIA video drivers. This - ensures that driver packages are consistent with the kernel. - - - The default Linux kernel configuration should be fine for most users. You can - see the configuration of your current kernel with the following command: - -zcat /proc/config.gz - - If you want to change the kernel configuration, you can use the - feature (see - ). For instance, to enable support - for the kernel debugger KGDB: - -nixpkgs.config.packageOverrides = pkgs: - { linux_3_4 = pkgs.linux_3_4.override { - extraConfig = - '' - KGDB y - ''; - }; - }; - - extraConfig takes a list of Linux kernel configuration - options, one per line. The name of the option should not include the prefix - CONFIG_. The option value is typically - y, n or m (to build - something as a kernel module). - - - Kernel modules for hardware devices are generally loaded automatically by - udev. You can force a module to be loaded via - , e.g. - - = [ "fuse" "kvm-intel" "coretemp" ]; - - If the module is required early during the boot (e.g. to mount the root file - system), you can use : - - = [ "cifs" ]; - - This causes the specified modules and their dependencies to be added to the - initial ramdisk. - - - Kernel runtime parameters can be set through - , e.g. - -."net.ipv4.tcp_keepalive_time" = 120; - - sets the kernel’s TCP keepalive time to 120 seconds. To see the available - parameters, run sysctl -a. - -
- Customize your kernel - - - The first step before compiling the kernel is to generate an appropriate - .config configuration. Either you pass your own config - via the configfile setting of - linuxManualConfig: - - You can edit the config with this snippet (by default make - menuconfig won't work out of the box on nixos): - {}; kernelToOverride.overrideAttrs (o: {nativeBuildInputs=o.nativeBuildInputs ++ [ pkg-config ncurses ];})' - ]]> - or you can let nixpkgs generate the configuration. Nixpkgs generates it via - answering the interactive kernel utility make config. The - answers depend on parameters passed to - pkgs/os-specific/linux/kernel/generic.nix (which you - can influence by overriding extraConfig, autoModules, - modDirVersion, preferBuiltin, extraConfig). - - -
-
- Developing kernel modules - - - When developing kernel modules it's often convenient to run edit-compile-run - loop as quickly as possible. See below snippet as an example of developing - mellanox drivers. - - - -$ nix-build '<nixpkgs>' -A linuxPackages.kernel.dev -$ nix-shell '<nixpkgs>' -A linuxPackages.kernel -$ unpackPhase -$ cd linux-* -$ make -C $dev/lib/modules/*/build M=$(pwd)/drivers/net/ethernet/mellanox modules -# insmod ./drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.ko - -
- diff --git a/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml b/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml new file mode 100644 index 000000000000..b9be041e59b0 --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml @@ -0,0 +1,153 @@ + + Linux Kernel + + You can override the Linux kernel and associated packages using the + option boot.kernelPackages. For instance, this + selects the Linux 3.10 kernel: + + +boot.kernelPackages = pkgs.linuxPackages_3_10; + + + Note that this not only replaces the kernel, but also packages that + are specific to the kernel version, such as the NVIDIA video + drivers. This ensures that driver packages are consistent with the + kernel. + + + The default Linux kernel configuration should be fine for most + users. You can see the configuration of your current kernel with the + following command: + + +zcat /proc/config.gz + + + If you want to change the kernel configuration, you can use the + packageOverrides feature (see + ). For instance, to + enable support for the kernel debugger KGDB: + + +nixpkgs.config.packageOverrides = pkgs: + { linux_3_4 = pkgs.linux_3_4.override { + extraConfig = + '' + KGDB y + ''; + }; + }; + + + extraConfig takes a list of Linux kernel + configuration options, one per line. The name of the option should + not include the prefix CONFIG_. The option value + is typically y, n or + m (to build something as a kernel module). + + + Kernel modules for hardware devices are generally loaded + automatically by udev. You can force a module to + be loaded via + boot.kernelModules, + e.g. + + +boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ]; + + + If the module is required early during the boot (e.g. to mount the + root file system), you can use + boot.initrd.kernelModules: + + +boot.initrd.kernelModules = [ "cifs" ]; + + + This causes the specified modules and their dependencies to be added + to the initial ramdisk. + + + Kernel runtime parameters can be set through + boot.kernel.sysctl, + e.g. + + +boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 120; + + + sets the kernel’s TCP keepalive time to 120 seconds. To see the + available parameters, run sysctl -a. + +
+ Customize your kernel + + The first step before compiling the kernel is to generate an + appropriate .config configuration. Either you + pass your own config via the configfile setting + of linuxManualConfig: + + +custom-kernel = super.linuxManualConfig { + inherit (super) stdenv hostPlatform; + inherit (linux_4_9) src; + version = "${linux_4_9.version}-custom"; + + configfile = /home/me/my_kernel_config; + allowImportFromDerivation = true; +}; + + + You can edit the config with this snippet (by default + make menuconfig won't work out of the box on + nixos): + + +nix-shell -E 'with import <nixpkgs> {}; kernelToOverride.overrideAttrs (o: {nativeBuildInputs=o.nativeBuildInputs ++ [ pkg-config ncurses ];})' + + + or you can let nixpkgs generate the configuration. Nixpkgs + generates it via answering the interactive kernel utility + make config. The answers depend on parameters + passed to + pkgs/os-specific/linux/kernel/generic.nix + (which you can influence by overriding + extraConfig, autoModules, modDirVersion, preferBuiltin, extraConfig). + + +mptcp93.override ({ + name="mptcp-local"; + + ignoreConfigErrors = true; + autoModules = false; + kernelPreferBuiltin = true; + + enableParallelBuilding = true; + + extraConfig = '' + DEBUG_KERNEL y + FRAME_POINTER y + KGDB y + KGDB_SERIAL_CONSOLE y + DEBUG_INFO y + ''; +}); + +
+
+ Developing kernel modules + + When developing kernel modules it's often convenient to run + edit-compile-run loop as quickly as possible. See below snippet as + an example of developing mellanox drivers. + + +$ nix-build '<nixpkgs>' -A linuxPackages.kernel.dev +$ nix-shell '<nixpkgs>' -A linuxPackages.kernel +$ unpackPhase +$ cd linux-* +$ make -C $dev/lib/modules/*/build M=$(pwd)/drivers/net/ethernet/mellanox modules +# insmod ./drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.ko + +
+ From ee807a30cf093a0d16944350122cf5223c56629f Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Jul 2021 19:40:53 +0800 Subject: [PATCH 046/167] nixos: nixos/doc/manual/configuration/subversion.xml to CommonMark --- .../manual/configuration/configuration.xml | 2 +- .../configuration/subversion.chapter.md | 102 +++++++++++++ nixos/doc/manual/configuration/subversion.xml | 140 ------------------ .../configuration/subversion.chapter.xml | 122 +++++++++++++++ 4 files changed, 225 insertions(+), 141 deletions(-) create mode 100644 nixos/doc/manual/configuration/subversion.chapter.md delete mode 100644 nixos/doc/manual/configuration/subversion.xml create mode 100644 nixos/doc/manual/from_md/configuration/subversion.chapter.xml diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml index 56574680f9c3..a1d0d139aa5f 100644 --- a/nixos/doc/manual/configuration/configuration.xml +++ b/nixos/doc/manual/configuration/configuration.xml @@ -23,7 +23,7 @@ - + diff --git a/nixos/doc/manual/configuration/subversion.chapter.md b/nixos/doc/manual/configuration/subversion.chapter.md new file mode 100644 index 000000000000..72efdb09acbb --- /dev/null +++ b/nixos/doc/manual/configuration/subversion.chapter.md @@ -0,0 +1,102 @@ +# Subversion {#module-services-subversion} + +[Subversion](https://subversion.apache.org/) is a centralized +version-control system. It can use a [variety of +protocols](http://svnbook.red-bean.com/en/1.7/svn-book.html#svn.serverconfig.choosing) +for communication between client and server. + +## Subversion inside Apache HTTP {#module-services-subversion-apache-httpd} + +This section focuses on configuring a web-based server on top of the +Apache HTTP server, which uses +[WebDAV](http://www.webdav.org/)/[DeltaV](http://www.webdav.org/deltav/WWW10/deltav-intro.htm) +for communication. + +For more information on the general setup, please refer to the [the +appropriate section of the Subversion +book](http://svnbook.red-bean.com/en/1.7/svn-book.html#svn.serverconfig.httpd). + +To configure, include in `/etc/nixos/configuration.nix` code to activate +Apache HTTP, setting [`services.httpd.adminAddr`](options.html#opt-services.httpd.adminAddr) +appropriately: + +```nix +services.httpd.enable = true; +services.httpd.adminAddr = ...; +networking.firewall.allowedTCPPorts = [ 80 443 ]; +``` + +For a simple Subversion server with basic authentication, configure the +Subversion module for Apache as follows, setting `hostName` and +`documentRoot` appropriately, and `SVNParentPath` to the parent +directory of the repositories, `AuthzSVNAccessFile` to the location of +the `.authz` file describing access permission, and `AuthUserFile` to +the password file. + +```nix +services.httpd.extraModules = [ + # note that order is *super* important here + { name = "dav_svn"; path = "${pkgs.apacheHttpdPackages.subversion}/modules/mod_dav_svn.so"; } + { name = "authz_svn"; path = "${pkgs.apacheHttpdPackages.subversion}/modules/mod_authz_svn.so"; } + ]; + services.httpd.virtualHosts = { + "svn" = { + hostName = HOSTNAME; + documentRoot = DOCUMENTROOT; + locations."/svn".extraConfig = '' + DAV svn + SVNParentPath REPO_PARENT + AuthzSVNAccessFile ACCESS_FILE + AuthName "SVN Repositories" + AuthType Basic + AuthUserFile PASSWORD_FILE + Require valid-user + ''; + } +``` + +The key `"svn"` is just a symbolic name identifying the virtual host. +The `"/svn"` in `locations."/svn".extraConfig` is the path underneath +which the repositories will be served. + +[This page](https://wiki.archlinux.org/index.php/Subversion) explains +how to set up the Subversion configuration itself. This boils down to +the following: + +Underneath `REPO_PARENT` repositories can be set up as follows: + +```ShellSession +$ svn create REPO_NAME +``` + +Repository files need to be accessible by `wwwrun`: + +```ShellSession +$ chown -R wwwrun:wwwrun REPO_PARENT +``` + +The password file `PASSWORD_FILE` can be created as follows: + +```ShellSession +$ htpasswd -cs PASSWORD_FILE USER_NAME +``` + +Additional users can be set up similarly, omitting the `c` flag: + +```ShellSession +$ htpasswd -s PASSWORD_FILE USER_NAME +``` + +The file describing access permissions `ACCESS_FILE` will look something +like the following: + +```nix +[/] +* = r + +[REPO_NAME:/] +USER_NAME = rw +``` + +The Subversion repositories will be accessible as +`http://HOSTNAME/svn/REPO_NAME`. diff --git a/nixos/doc/manual/configuration/subversion.xml b/nixos/doc/manual/configuration/subversion.xml deleted file mode 100644 index 940d63cc4e6d..000000000000 --- a/nixos/doc/manual/configuration/subversion.xml +++ /dev/null @@ -1,140 +0,0 @@ - - Subversion - - - Subversion - is a centralized version-control system. It can use a variety - of protocols for communication between client and server. - -
- Subversion inside Apache HTTP - - - This section focuses on configuring a web-based server on top of - the Apache HTTP server, which uses - WebDAV/DeltaV - for communication. - - - For more information on the general setup, please refer to - the the - appropriate section of the Subversion book. - - - To configure, include in - /etc/nixos/configuration.nix code to activate - Apache HTTP, setting - appropriately: - - - - - services.httpd.enable = true; - services.httpd.adminAddr = ...; - networking.firewall.allowedTCPPorts = [ 80 443 ]; - - - - For a simple Subversion server with basic authentication, - configure the Subversion module for Apache as follows, setting - hostName and documentRoot - appropriately, and SVNParentPath to the parent - directory of the repositories, - AuthzSVNAccessFile to the location of the - .authz file describing access permission, and - AuthUserFile to the password file. - - - -services.httpd.extraModules = [ - # note that order is *super* important here - { name = "dav_svn"; path = "${pkgs.apacheHttpdPackages.subversion}/modules/mod_dav_svn.so"; } - { name = "authz_svn"; path = "${pkgs.apacheHttpdPackages.subversion}/modules/mod_authz_svn.so"; } - ]; - services.httpd.virtualHosts = { - "svn" = { - hostName = HOSTNAME; - documentRoot = DOCUMENTROOT; - locations."/svn".extraConfig = '' - DAV svn - SVNParentPath REPO_PARENT - AuthzSVNAccessFile ACCESS_FILE - AuthName "SVN Repositories" - AuthType Basic - AuthUserFile PASSWORD_FILE - Require valid-user - ''; - } - - - - - The key "svn" is just a symbolic name identifying the - virtual host. The "/svn" in - locations."/svn".extraConfig is the path underneath - which the repositories will be served. - - - This - page explains how to set up the Subversion configuration - itself. This boils down to the following: - - - Underneath REPO_PARENT repositories can be set up - as follows: - - - -$ svn create REPO_NAME - - - Repository files need to be accessible by - wwwrun: - - - -$ chown -R wwwrun:wwwrun REPO_PARENT - - - - The password file PASSWORD_FILE can be created as follows: - - - -$ htpasswd -cs PASSWORD_FILE USER_NAME - - - - Additional users can be set up similarly, omitting the - c flag: - - - -$ htpasswd -s PASSWORD_FILE USER_NAME - - - - The file describing access permissions - ACCESS_FILE will look something like - the following: - - - -[/] -* = r - -[REPO_NAME:/] -USER_NAME = rw - - - The Subversion repositories will be accessible as http://HOSTNAME/svn/REPO_NAME. -
- diff --git a/nixos/doc/manual/from_md/configuration/subversion.chapter.xml b/nixos/doc/manual/from_md/configuration/subversion.chapter.xml new file mode 100644 index 000000000000..3bea116d498c --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/subversion.chapter.xml @@ -0,0 +1,122 @@ + + Subversion + + Subversion + is a centralized version-control system. It can use a + variety + of protocols for communication between client and server. + +
+ Subversion inside Apache HTTP + + This section focuses on configuring a web-based server on top of + the Apache HTTP server, which uses + WebDAV/DeltaV + for communication. + + + For more information on the general setup, please refer to the + the + appropriate section of the Subversion book. + + + To configure, include in + /etc/nixos/configuration.nix code to activate + Apache HTTP, setting + services.httpd.adminAddr + appropriately: + + +services.httpd.enable = true; +services.httpd.adminAddr = ...; +networking.firewall.allowedTCPPorts = [ 80 443 ]; + + + For a simple Subversion server with basic authentication, + configure the Subversion module for Apache as follows, setting + hostName and documentRoot + appropriately, and SVNParentPath to the parent + directory of the repositories, + AuthzSVNAccessFile to the location of the + .authz file describing access permission, and + AuthUserFile to the password file. + + +services.httpd.extraModules = [ + # note that order is *super* important here + { name = "dav_svn"; path = "${pkgs.apacheHttpdPackages.subversion}/modules/mod_dav_svn.so"; } + { name = "authz_svn"; path = "${pkgs.apacheHttpdPackages.subversion}/modules/mod_authz_svn.so"; } + ]; + services.httpd.virtualHosts = { + "svn" = { + hostName = HOSTNAME; + documentRoot = DOCUMENTROOT; + locations."/svn".extraConfig = '' + DAV svn + SVNParentPath REPO_PARENT + AuthzSVNAccessFile ACCESS_FILE + AuthName "SVN Repositories" + AuthType Basic + AuthUserFile PASSWORD_FILE + Require valid-user + ''; + } + + + The key "svn" is just a symbolic name + identifying the virtual host. The + "/svn" in + locations."/svn".extraConfig is the + path underneath which the repositories will be served. + + + This + page explains how to set up the Subversion configuration + itself. This boils down to the following: + + + Underneath REPO_PARENT repositories can be set + up as follows: + + +$ svn create REPO_NAME + + + Repository files need to be accessible by + wwwrun: + + +$ chown -R wwwrun:wwwrun REPO_PARENT + + + The password file PASSWORD_FILE can be created + as follows: + + +$ htpasswd -cs PASSWORD_FILE USER_NAME + + + Additional users can be set up similarly, omitting the + c flag: + + +$ htpasswd -s PASSWORD_FILE USER_NAME + + + The file describing access permissions + ACCESS_FILE will look something like the + following: + + +[/] +* = r + +[REPO_NAME:/] +USER_NAME = rw + + + The Subversion repositories will be accessible as + http://HOSTNAME/svn/REPO_NAME. + +
+ From f8bdee0054668f1ac7b30679e5ce6f5b95f160ee Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Jul 2021 19:41:27 +0800 Subject: [PATCH 047/167] nixos: nixos/doc/manual/configuration/kubernetes.xml to CommonMark --- .../manual/configuration/configuration.xml | 2 +- .../configuration/kubernetes.chapter.md | 104 ++++++++++++++ nixos/doc/manual/configuration/kubernetes.xml | 112 --------------- .../configuration/kubernetes.chapter.xml | 130 ++++++++++++++++++ 4 files changed, 235 insertions(+), 113 deletions(-) create mode 100644 nixos/doc/manual/configuration/kubernetes.chapter.md delete mode 100644 nixos/doc/manual/configuration/kubernetes.xml create mode 100644 nixos/doc/manual/from_md/configuration/kubernetes.chapter.xml diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml index a1d0d139aa5f..2461a5de73ad 100644 --- a/nixos/doc/manual/configuration/configuration.xml +++ b/nixos/doc/manual/configuration/configuration.xml @@ -26,6 +26,6 @@ - + diff --git a/nixos/doc/manual/configuration/kubernetes.chapter.md b/nixos/doc/manual/configuration/kubernetes.chapter.md new file mode 100644 index 000000000000..09a076a610b1 --- /dev/null +++ b/nixos/doc/manual/configuration/kubernetes.chapter.md @@ -0,0 +1,104 @@ +# Kubernetes {#sec-kubernetes} + +The NixOS Kubernetes module is a collective term for a handful of +individual submodules implementing the Kubernetes cluster components. + +There are generally two ways of enabling Kubernetes on NixOS. One way is +to enable and configure cluster components appropriately by hand: + +```nix +services.kubernetes = { + apiserver.enable = true; + controllerManager.enable = true; + scheduler.enable = true; + addonManager.enable = true; + proxy.enable = true; + flannel.enable = true; +}; +``` + +Another way is to assign cluster roles (\"master\" and/or \"node\") to +the host. This enables apiserver, controllerManager, scheduler, +addonManager, kube-proxy and etcd: + +```nix +services.kubernetes.roles = [ "master" ]; +``` + +While this will enable the kubelet and kube-proxy only: + +```nix +services.kubernetes.roles = [ "node" ]; +``` + +Assigning both the master and node roles is usable if you want a single +node Kubernetes cluster for dev or testing purposes: + +```nix +services.kubernetes.roles = [ "master" "node" ]; +``` + +Note: Assigning either role will also default both +[`services.kubernetes.flannel.enable`](options.html#opt-services.kubernetes.flannel.enable) +and [`services.kubernetes.easyCerts`](options.html#opt-services.kubernetes.easyCerts) +to true. This sets up flannel as CNI and activates automatic PKI bootstrapping. + +As of kubernetes 1.10.X it has been deprecated to open non-tls-enabled +ports on kubernetes components. Thus, from NixOS 19.03 all plain HTTP +ports have been disabled by default. While opening insecure ports is +still possible, it is recommended not to bind these to other interfaces +than loopback. To re-enable the insecure port on the apiserver, see options: +[`services.kubernetes.apiserver.insecurePort`](options.html#opt-services.kubernetes.apiserver.insecurePort) and +[`services.kubernetes.apiserver.insecureBindAddress`](options.html#opt-services.kubernetes.apiserver.insecureBindAddress) + +::: {.note} +As of NixOS 19.03, it is mandatory to configure: +[`services.kubernetes.masterAddress`](options.html#opt-services.kubernetes.masterAddress). +The masterAddress must be resolveable and routeable by all cluster nodes. +In single node clusters, this can be set to `localhost`. +::: + +Role-based access control (RBAC) authorization mode is enabled by +default. This means that anonymous requests to the apiserver secure port +will expectedly cause a permission denied error. All cluster components +must therefore be configured with x509 certificates for two-way tls +communication. The x509 certificate subject section determines the roles +and permissions granted by the apiserver to perform clusterwide or +namespaced operations. See also: [ Using RBAC +Authorization](https://kubernetes.io/docs/reference/access-authn-authz/rbac/). + +The NixOS kubernetes module provides an option for automatic certificate +bootstrapping and configuration, +[`services.kubernetes.easyCerts`](options.html#opt-services.kubernetes.easyCerts). +The PKI bootstrapping process involves setting up a certificate authority (CA) +daemon (cfssl) on the kubernetes master node. cfssl generates a CA-cert +for the cluster, and uses the CA-cert for signing subordinate certs issued +to each of the cluster components. Subsequently, the certmgr daemon monitors +active certificates and renews them when needed. For single node Kubernetes +clusters, setting [`services.kubernetes.easyCerts`](options.html#opt-services.kubernetes.easyCerts) += true is sufficient and no further action is required. For joining extra node +machines to an existing cluster on the other hand, establishing initial +trust is mandatory. + +To add new nodes to the cluster: On any (non-master) cluster node where +[`services.kubernetes.easyCerts`](options.html#opt-services.kubernetes.easyCerts) +is enabled, the helper script `nixos-kubernetes-node-join` is available on PATH. +Given a token on stdin, it will copy the token to the kubernetes secrets directory +and restart the certmgr service. As requested certificates are issued, the +script will restart kubernetes cluster components as needed for them to +pick up new keypairs. + +::: {.note} +Multi-master (HA) clusters are not supported by the easyCerts module. +::: + +In order to interact with an RBAC-enabled cluster as an administrator, +one needs to have cluster-admin privileges. By default, when easyCerts +is enabled, a cluster-admin kubeconfig file is generated and linked into +`/etc/kubernetes/cluster-admin.kubeconfig` as determined by +[`services.kubernetes.pki.etcClusterAdminKubeconfig`](options.html#opt-services.kubernetes.pki.etcClusterAdminKubeconfig). +`export KUBECONFIG=/etc/kubernetes/cluster-admin.kubeconfig` will make +kubectl use this kubeconfig to access and authenticate the cluster. The +cluster-admin kubeconfig references an auto-generated keypair owned by +root. Thus, only root on the kubernetes master may obtain cluster-admin +rights by means of this file. diff --git a/nixos/doc/manual/configuration/kubernetes.xml b/nixos/doc/manual/configuration/kubernetes.xml deleted file mode 100644 index 54a100e44795..000000000000 --- a/nixos/doc/manual/configuration/kubernetes.xml +++ /dev/null @@ -1,112 +0,0 @@ - - Kubernetes - - The NixOS Kubernetes module is a collective term for a handful of individual - submodules implementing the Kubernetes cluster components. - - - There are generally two ways of enabling Kubernetes on NixOS. One way is to - enable and configure cluster components appropriately by hand: - -services.kubernetes = { - apiserver.enable = true; - controllerManager.enable = true; - scheduler.enable = true; - addonManager.enable = true; - proxy.enable = true; - flannel.enable = true; -}; - - Another way is to assign cluster roles ("master" and/or "node") to the host. - This enables apiserver, controllerManager, scheduler, addonManager, - kube-proxy and etcd: - - = [ "master" ]; - - While this will enable the kubelet and kube-proxy only: - - = [ "node" ]; - - Assigning both the master and node roles is usable if you want a single node - Kubernetes cluster for dev or testing purposes: - - = [ "master" "node" ]; - - Note: Assigning either role will also default both - and - to true. This sets up - flannel as CNI and activates automatic PKI bootstrapping. - - - As of kubernetes 1.10.X it has been deprecated to open non-tls-enabled ports - on kubernetes components. Thus, from NixOS 19.03 all plain HTTP ports have - been disabled by default. While opening insecure ports is still possible, it - is recommended not to bind these to other interfaces than loopback. To - re-enable the insecure port on the apiserver, see options: - and - - - - - As of NixOS 19.03, it is mandatory to configure: - . The masterAddress - must be resolveable and routeable by all cluster nodes. In single node - clusters, this can be set to localhost. - - - - Role-based access control (RBAC) authorization mode is enabled by default. - This means that anonymous requests to the apiserver secure port will - expectedly cause a permission denied error. All cluster components must - therefore be configured with x509 certificates for two-way tls communication. - The x509 certificate subject section determines the roles and permissions - granted by the apiserver to perform clusterwide or namespaced operations. See - also: - - Using RBAC Authorization. - - - The NixOS kubernetes module provides an option for automatic certificate - bootstrapping and configuration, - . The PKI bootstrapping - process involves setting up a certificate authority (CA) daemon (cfssl) on - the kubernetes master node. cfssl generates a CA-cert for the cluster, and - uses the CA-cert for signing subordinate certs issued to each of the cluster - components. Subsequently, the certmgr daemon monitors active certificates and - renews them when needed. For single node Kubernetes clusters, setting - = true is sufficient and - no further action is required. For joining extra node machines to an existing - cluster on the other hand, establishing initial trust is mandatory. - - - To add new nodes to the cluster: On any (non-master) cluster node where - is enabled, the helper - script nixos-kubernetes-node-join is available on PATH. - Given a token on stdin, it will copy the token to the kubernetes secrets - directory and restart the certmgr service. As requested certificates are - issued, the script will restart kubernetes cluster components as needed for - them to pick up new keypairs. - - - - Multi-master (HA) clusters are not supported by the easyCerts module. - - - - In order to interact with an RBAC-enabled cluster as an administrator, one - needs to have cluster-admin privileges. By default, when easyCerts is - enabled, a cluster-admin kubeconfig file is generated and linked into - /etc/kubernetes/cluster-admin.kubeconfig as determined by - . - export KUBECONFIG=/etc/kubernetes/cluster-admin.kubeconfig - will make kubectl use this kubeconfig to access and authenticate the cluster. - The cluster-admin kubeconfig references an auto-generated keypair owned by - root. Thus, only root on the kubernetes master may obtain cluster-admin - rights by means of this file. - - diff --git a/nixos/doc/manual/from_md/configuration/kubernetes.chapter.xml b/nixos/doc/manual/from_md/configuration/kubernetes.chapter.xml new file mode 100644 index 000000000000..2707101ccf8c --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/kubernetes.chapter.xml @@ -0,0 +1,130 @@ + + Kubernetes + + The NixOS Kubernetes module is a collective term for a handful of + individual submodules implementing the Kubernetes cluster + components. + + + There are generally two ways of enabling Kubernetes on NixOS. One + way is to enable and configure cluster components appropriately by + hand: + + +services.kubernetes = { + apiserver.enable = true; + controllerManager.enable = true; + scheduler.enable = true; + addonManager.enable = true; + proxy.enable = true; + flannel.enable = true; +}; + + + Another way is to assign cluster roles ("master" and/or + "node") to the host. This enables apiserver, + controllerManager, scheduler, addonManager, kube-proxy and etcd: + + +services.kubernetes.roles = [ "master" ]; + + + While this will enable the kubelet and kube-proxy only: + + +services.kubernetes.roles = [ "node" ]; + + + Assigning both the master and node roles is usable if you want a + single node Kubernetes cluster for dev or testing purposes: + + +services.kubernetes.roles = [ "master" "node" ]; + + + Note: Assigning either role will also default both + services.kubernetes.flannel.enable + and + services.kubernetes.easyCerts + to true. This sets up flannel as CNI and activates automatic PKI + bootstrapping. + + + As of kubernetes 1.10.X it has been deprecated to open + non-tls-enabled ports on kubernetes components. Thus, from NixOS + 19.03 all plain HTTP ports have been disabled by default. While + opening insecure ports is still possible, it is recommended not to + bind these to other interfaces than loopback. To re-enable the + insecure port on the apiserver, see options: + services.kubernetes.apiserver.insecurePort + and + services.kubernetes.apiserver.insecureBindAddress + + + + As of NixOS 19.03, it is mandatory to configure: + services.kubernetes.masterAddress. + The masterAddress must be resolveable and routeable by all cluster + nodes. In single node clusters, this can be set to + localhost. + + + + Role-based access control (RBAC) authorization mode is enabled by + default. This means that anonymous requests to the apiserver secure + port will expectedly cause a permission denied error. All cluster + components must therefore be configured with x509 certificates for + two-way tls communication. The x509 certificate subject section + determines the roles and permissions granted by the apiserver to + perform clusterwide or namespaced operations. See also: + + Using RBAC Authorization. + + + The NixOS kubernetes module provides an option for automatic + certificate bootstrapping and configuration, + services.kubernetes.easyCerts. + The PKI bootstrapping process involves setting up a certificate + authority (CA) daemon (cfssl) on the kubernetes master node. cfssl + generates a CA-cert for the cluster, and uses the CA-cert for + signing subordinate certs issued to each of the cluster components. + Subsequently, the certmgr daemon monitors active certificates and + renews them when needed. For single node Kubernetes clusters, + setting + services.kubernetes.easyCerts + = true is sufficient and no further action is required. For joining + extra node machines to an existing cluster on the other hand, + establishing initial trust is mandatory. + + + To add new nodes to the cluster: On any (non-master) cluster node + where + services.kubernetes.easyCerts + is enabled, the helper script + nixos-kubernetes-node-join is available on PATH. + Given a token on stdin, it will copy the token to the kubernetes + secrets directory and restart the certmgr service. As requested + certificates are issued, the script will restart kubernetes cluster + components as needed for them to pick up new keypairs. + + + + Multi-master (HA) clusters are not supported by the easyCerts + module. + + + + In order to interact with an RBAC-enabled cluster as an + administrator, one needs to have cluster-admin privileges. By + default, when easyCerts is enabled, a cluster-admin kubeconfig file + is generated and linked into + /etc/kubernetes/cluster-admin.kubeconfig as + determined by + services.kubernetes.pki.etcClusterAdminKubeconfig. + export KUBECONFIG=/etc/kubernetes/cluster-admin.kubeconfig + will make kubectl use this kubeconfig to access and authenticate the + cluster. The cluster-admin kubeconfig references an auto-generated + keypair owned by root. Thus, only root on the kubernetes master may + obtain cluster-admin rights by means of this file. + + From 6877012179ebfbbf47451d2bc8d61212981c7940 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Jul 2021 22:14:03 +0800 Subject: [PATCH 048/167] nixos: nixos/doc/manual/development/option-declarations.xml to CommonMark --- .../option-declarations.section.md | 136 ++++++++++++ .../development/option-declarations.xml | 199 ----------------- .../manual/development/writing-modules.xml | 2 +- .../option-declarations.section.xml | 203 ++++++++++++++++++ 4 files changed, 340 insertions(+), 200 deletions(-) create mode 100644 nixos/doc/manual/development/option-declarations.section.md delete mode 100644 nixos/doc/manual/development/option-declarations.xml create mode 100644 nixos/doc/manual/from_md/development/option-declarations.section.xml diff --git a/nixos/doc/manual/development/option-declarations.section.md b/nixos/doc/manual/development/option-declarations.section.md new file mode 100644 index 000000000000..819c23684cdf --- /dev/null +++ b/nixos/doc/manual/development/option-declarations.section.md @@ -0,0 +1,136 @@ +# Option Declarations {#sec-option-declarations} + +An option declaration specifies the name, type and description of a +NixOS configuration option. It is invalid to define an option that +hasn't been declared in any module. An option declaration generally +looks like this: + +```nix +options = { + name = mkOption { + type = type specification; + default = default value; + example = example value; + description = "Description for use in the NixOS manual."; + }; +}; +``` + +The attribute names within the `name` attribute path must be camel +cased in general but should, as an exception, match the [ package +attribute name](https://nixos.org/nixpkgs/manual/#sec-package-naming) +when referencing a Nixpkgs package. For example, the option +`services.nix-serve.bindAddress` references the `nix-serve` Nixpkgs +package. + +The function `mkOption` accepts the following arguments. + +`type` + +: The type of the option (see [](#sec-option-types)). It may be + omitted, but that's not advisable since it may lead to errors that + are hard to diagnose. + +`default` + +: The default value used if no value is defined by any module. A + default is not required; but if a default is not given, then users + of the module will have to define the value of the option, otherwise + an error will be thrown. + +`example` + +: An example value that will be shown in the NixOS manual. + +`description` + +: A textual description of the option, in DocBook format, that will be + included in the NixOS manual. + +## Extensible Option Types {#sec-option-declarations-eot} + +Extensible option types is a feature that allow to extend certain types +declaration through multiple module files. This feature only work with a +restricted set of types, namely `enum` and `submodules` and any composed +forms of them. + +Extensible option types can be used for `enum` options that affects +multiple modules, or as an alternative to related `enable` options. + +As an example, we will take the case of display managers. There is a +central display manager module for generic display manager options and a +module file per display manager backend (sddm, gdm \...). + +There are two approach to this module structure: + +- Managing the display managers independently by adding an enable + option to every display manager module backend. (NixOS) + +- Managing the display managers in the central module by adding an + option to select which display manager backend to use. + +Both approaches have problems. + +Making backends independent can quickly become hard to manage. For +display managers, there can be only one enabled at a time, but the type +system can not enforce this restriction as there is no relation between +each backend `enable` option. As a result, this restriction has to be +done explicitely by adding assertions in each display manager backend +module. + +On the other hand, managing the display managers backends in the central +module will require to change the central module option every time a new +backend is added or removed. + +By using extensible option types, it is possible to create a placeholder +option in the central module +([Example: Extensible type placeholder in the service module](#ex-option-declaration-eot-service)), +and to extend it in each backend module +([Example: Extending `services.xserver.displayManager.enable` in the `gdm` module](#ex-option-declaration-eot-backend-gdm), +[Example: Extending `services.xserver.displayManager.enable` in the `sddm` module](#ex-option-declaration-eot-backend-sddm)). + +As a result, `displayManager.enable` option values can be added without +changing the main service module file and the type system automatically +enforce that there can only be a single display manager enabled. + +::: {#ex-option-declaration-eot-service .example} +::: {.title} +**Example: Extensible type placeholder in the service module** +::: +```nix +services.xserver.displayManager.enable = mkOption { + description = "Display manager to use"; + type = with types; nullOr (enum [ ]); +}; +``` +::: + +::: {#ex-option-declaration-eot-backend-gdm .example} +::: {.title} +**Example: Extending `services.xserver.displayManager.enable` in the `gdm` module** +::: +```nix +services.xserver.displayManager.enable = mkOption { + type = with types; nullOr (enum [ "gdm" ]); +}; +``` +::: + +::: {#ex-option-declaration-eot-backend-sddm .example} +::: {.title} +**Example: Extending `services.xserver.displayManager.enable` in the `sddm` module** +::: +```nix +services.xserver.displayManager.enable = mkOption { + type = with types; nullOr (enum [ "sddm" ]); +}; +``` +::: + +The placeholder declaration is a standard `mkOption` declaration, but it +is important that extensible option declarations only use the `type` +argument. + +Extensible option types work with any of the composed variants of `enum` +such as `with types; nullOr (enum [ "foo" "bar" ])` or `with types; +listOf (enum [ "foo" "bar" ])`. diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml deleted file mode 100644 index 56ebf4816306..000000000000 --- a/nixos/doc/manual/development/option-declarations.xml +++ /dev/null @@ -1,199 +0,0 @@ -
- Option Declarations - - - An option declaration specifies the name, type and description of a NixOS - configuration option. It is invalid to define an option that hasn’t been - declared in any module. An option declaration generally looks like this: - -options = { - name = mkOption { - type = type specification; - default = default value; - example = example value; - description = "Description for use in the NixOS manual."; - }; -}; - - The attribute names within the name attribute path - must be camel cased in general but should, as an exception, match the - - package attribute name when referencing a Nixpkgs package. For - example, the option services.nix-serve.bindAddress - references the nix-serve Nixpkgs package. - - - - The function mkOption accepts the following arguments. - - - - type - - - - The type of the option (see ). It may - be omitted, but that’s not advisable since it may lead to errors that - are hard to diagnose. - - - - - - default - - - - The default value used if no value is defined by any module. A default is - not required; but if a default is not given, then users of the module - will have to define the value of the option, otherwise an error will be - thrown. - - - - - - example - - - - An example value that will be shown in the NixOS manual. - - - - - - description - - - - A textual description of the option, in DocBook format, that will be - included in the NixOS manual. - - - - - - -
- Extensible Option Types - - - Extensible option types is a feature that allow to extend certain types - declaration through multiple module files. This feature only work with a - restricted set of types, namely enum and - submodules and any composed forms of them. - - - - Extensible option types can be used for enum options that - affects multiple modules, or as an alternative to related - enable options. - - - - As an example, we will take the case of display managers. There is a central - display manager module for generic display manager options and a module file - per display manager backend (sddm, gdm ...). - - - - There are two approach to this module structure: - - - - Managing the display managers independently by adding an enable option to - every display manager module backend. (NixOS) - - - - - Managing the display managers in the central module by adding an option - to select which display manager backend to use. - - - - - - - Both approaches have problems. - - - - Making backends independent can quickly become hard to manage. For display - managers, there can be only one enabled at a time, but the type system can - not enforce this restriction as there is no relation between each backend - enable option. As a result, this restriction has to be - done explicitely by adding assertions in each display manager backend - module. - - - - On the other hand, managing the display managers backends in the central - module will require to change the central module option every time a new - backend is added or removed. - - - - By using extensible option types, it is possible to create a placeholder - option in the central module - (), and to extend - it in each backend module - (, - ). - - - - As a result, displayManager.enable option values can be - added without changing the main service module file and the type system - automatically enforce that there can only be a single display manager - enabled. - - - - Extensible type placeholder in the service module - -services.xserver.displayManager.enable = mkOption { - description = "Display manager to use"; - type = with types; nullOr (enum [ ]); -}; - - - - Extending <literal>services.xserver.displayManager.enable</literal> in the <literal>gdm</literal> module - -services.xserver.displayManager.enable = mkOption { - type = with types; nullOr (enum [ "gdm" ]); -}; - - - - Extending <literal>services.xserver.displayManager.enable</literal> in the <literal>sddm</literal> module - -services.xserver.displayManager.enable = mkOption { - type = with types; nullOr (enum [ "sddm" ]); -}; - - - - The placeholder declaration is a standard mkOption - declaration, but it is important that extensible option declarations only - use the type argument. - - - - Extensible option types work with any of the composed variants of - enum such as with types; nullOr (enum [ "foo" - "bar" ]) or with types; listOf (enum [ "foo" "bar" - ]). - -
-
diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml index 04497db77b89..a1efbeac7232 100644 --- a/nixos/doc/manual/development/writing-modules.xml +++ b/nixos/doc/manual/development/writing-modules.xml @@ -179,7 +179,7 @@ in { } - + diff --git a/nixos/doc/manual/from_md/development/option-declarations.section.xml b/nixos/doc/manual/from_md/development/option-declarations.section.xml new file mode 100644 index 000000000000..85a59a543d14 --- /dev/null +++ b/nixos/doc/manual/from_md/development/option-declarations.section.xml @@ -0,0 +1,203 @@ +
+ Option Declarations + + An option declaration specifies the name, type and description of a + NixOS configuration option. It is invalid to define an option that + hasn’t been declared in any module. An option declaration generally + looks like this: + + +options = { + name = mkOption { + type = type specification; + default = default value; + example = example value; + description = "Description for use in the NixOS manual."; + }; +}; + + + The attribute names within the name attribute + path must be camel cased in general but should, as an exception, + match the + + package attribute name when referencing a Nixpkgs package. + For example, the option + services.nix-serve.bindAddress references the + nix-serve Nixpkgs package. + + + The function mkOption accepts the following + arguments. + + + + + type + + + + The type of the option (see + ). It may be omitted, but + that’s not advisable since it may lead to errors that are hard + to diagnose. + + + + + + default + + + + The default value used if no value is defined by any module. A + default is not required; but if a default is not given, then + users of the module will have to define the value of the + option, otherwise an error will be thrown. + + + + + + example + + + + An example value that will be shown in the NixOS manual. + + + + + + description + + + + A textual description of the option, in DocBook format, that + will be included in the NixOS manual. + + + + +
+ Extensible Option Types + + Extensible option types is a feature that allow to extend certain + types declaration through multiple module files. This feature only + work with a restricted set of types, namely + enum and submodules and any + composed forms of them. + + + Extensible option types can be used for enum + options that affects multiple modules, or as an alternative to + related enable options. + + + As an example, we will take the case of display managers. There is + a central display manager module for generic display manager + options and a module file per display manager backend (sddm, gdm + ...). + + + There are two approach to this module structure: + + + + + Managing the display managers independently by adding an + enable option to every display manager module backend. (NixOS) + + + + + Managing the display managers in the central module by adding + an option to select which display manager backend to use. + + + + + Both approaches have problems. + + + Making backends independent can quickly become hard to manage. For + display managers, there can be only one enabled at a time, but the + type system can not enforce this restriction as there is no + relation between each backend enable option. As + a result, this restriction has to be done explicitely by adding + assertions in each display manager backend module. + + + On the other hand, managing the display managers backends in the + central module will require to change the central module option + every time a new backend is added or removed. + + + By using extensible option types, it is possible to create a + placeholder option in the central module + (Example: + Extensible type placeholder in the service module), and to + extend it in each backend module + (Example: + Extending + services.xserver.displayManager.enable in the + gdm module, + Example: + Extending + services.xserver.displayManager.enable in the + sddm module). + + + As a result, displayManager.enable option + values can be added without changing the main service module file + and the type system automatically enforce that there can only be a + single display manager enabled. + + + + Example: Extensible type placeholder in + the service module + + +services.xserver.displayManager.enable = mkOption { + description = "Display manager to use"; + type = with types; nullOr (enum [ ]); +}; + + + + Example: Extending + services.xserver.displayManager.enable in the + gdm module + + +services.xserver.displayManager.enable = mkOption { + type = with types; nullOr (enum [ "gdm" ]); +}; + + + + Example: Extending + services.xserver.displayManager.enable in the + sddm module + + +services.xserver.displayManager.enable = mkOption { + type = with types; nullOr (enum [ "sddm" ]); +}; + + + The placeholder declaration is a standard + mkOption declaration, but it is important that + extensible option declarations only use the + type argument. + + + Extensible option types work with any of the composed variants of + enum such as + with types; nullOr (enum [ "foo" "bar" ]) + or + with types; listOf (enum [ "foo" "bar" ]). + +
+
From bfd21cd2c1492b799facdab2e77308c34edbe9e7 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Jul 2021 22:16:36 +0800 Subject: [PATCH 049/167] nixos: nixos/doc/manual/development/option-types.xml to CommonMark --- .../development/option-types.section.md | 558 ++++++++++ nixos/doc/manual/development/option-types.xml | 914 ---------------- .../manual/development/writing-modules.xml | 2 +- .../development/option-types.section.xml | 987 ++++++++++++++++++ 4 files changed, 1546 insertions(+), 915 deletions(-) create mode 100644 nixos/doc/manual/development/option-types.section.md delete mode 100644 nixos/doc/manual/development/option-types.xml create mode 100644 nixos/doc/manual/from_md/development/option-types.section.xml diff --git a/nixos/doc/manual/development/option-types.section.md b/nixos/doc/manual/development/option-types.section.md new file mode 100644 index 000000000000..ed557206659f --- /dev/null +++ b/nixos/doc/manual/development/option-types.section.md @@ -0,0 +1,558 @@ +# Options Types {#sec-option-types} + +Option types are a way to put constraints on the values a module option +can take. Types are also responsible of how values are merged in case of +multiple value definitions. + +## Basic Types {#sec-option-types-basic} + +Basic types are the simplest available types in the module system. Basic +types include multiple string types that mainly differ in how definition +merging is handled. + +`types.bool` + +: A boolean, its values can be `true` or `false`. + +`types.path` + +: A filesystem path, defined as anything that when coerced to a string + starts with a slash. Even if derivations can be considered as path, + the more specific `types.package` should be preferred. + +`types.package` + +: A derivation or a store path. + +`types.anything` + +: A type that accepts any value and recursively merges attribute sets + together. This type is recommended when the option type is unknown. + + ::: {#ex-types-anything .example} + ::: {.title} + **Example: `types.anything` Example** + ::: + Two definitions of this type like + + ```nix + { + str = lib.mkDefault "foo"; + pkg.hello = pkgs.hello; + fun.fun = x: x + 1; + } + ``` + + ```nix + { + str = lib.mkIf true "bar"; + pkg.gcc = pkgs.gcc; + fun.fun = lib.mkForce (x: x + 2); + } + ``` + + will get merged to + + ```nix + { + str = "bar"; + pkg.gcc = pkgs.gcc; + pkg.hello = pkgs.hello; + fun.fun = x: x + 2; + } + ``` + ::: + +`types.attrs` + +: A free-form attribute set. + + ::: {.warning} + This type will be deprecated in the future because it doesn\'t + recurse into attribute sets, silently drops earlier attribute + definitions, and doesn\'t discharge `lib.mkDefault`, `lib.mkIf` + and co. For allowing arbitrary attribute sets, prefer + `types.attrsOf types.anything` instead which doesn\'t have these + problems. + ::: + +Integer-related types: + +`types.int` + +: A signed integer. + +`types.ints.{s8, s16, s32}` + +: Signed integers with a fixed length (8, 16 or 32 bits). They go from + −2^n/2 to + 2^n/2−1 respectively (e.g. `−128` to + `127` for 8 bits). + +`types.ints.unsigned` + +: An unsigned integer (that is >= 0). + +`types.ints.{u8, u16, u32}` + +: Unsigned integers with a fixed length (8, 16 or 32 bits). They go + from 0 to 2^n−1 respectively (e.g. `0` + to `255` for 8 bits). + +`types.ints.positive` + +: A positive integer (that is > 0). + +`types.port` + +: A port number. This type is an alias to + `types.ints.u16`. + +String-related types: + +`types.str` + +: A string. Multiple definitions cannot be merged. + +`types.lines` + +: A string. Multiple definitions are concatenated with a new line + `"\n"`. + +`types.commas` + +: A string. Multiple definitions are concatenated with a comma `","`. + +`types.envVar` + +: A string. Multiple definitions are concatenated with a collon `":"`. + +`types.strMatching` + +: A string matching a specific regular expression. Multiple + definitions cannot be merged. The regular expression is processed + using `builtins.match`. + +## Value Types {#sec-option-types-value} + +Value types are types that take a value parameter. + +`types.enum` *`l`* + +: One element of the list *`l`*, e.g. `types.enum [ "left" "right" ]`. + Multiple definitions cannot be merged. + +`types.separatedString` *`sep`* + +: A string with a custom separator *`sep`*, e.g. + `types.separatedString "|"`. + +`types.ints.between` *`lowest highest`* + +: An integer between *`lowest`* and *`highest`* (both inclusive). Useful + for creating types like `types.port`. + +`types.submodule` *`o`* + +: A set of sub options *`o`*. *`o`* can be an attribute set, a function + returning an attribute set, or a path to a file containing such a + value. Submodules are used in composed types to create modular + options. This is equivalent to + `types.submoduleWith { modules = toList o; shorthandOnlyDefinesConfig = true; }`. + Submodules are detailed in [Submodule](#section-option-types-submodule). + +`types.submoduleWith` { *`modules`*, *`specialArgs`* ? {}, *`shorthandOnlyDefinesConfig`* ? false } + +: Like `types.submodule`, but more flexible and with better defaults. + It has parameters + + - *`modules`* A list of modules to use by default for this + submodule type. This gets combined with all option definitions + to build the final list of modules that will be included. + + ::: {.note} + Only options defined with this argument are included in rendered + documentation. + ::: + + - *`specialArgs`* An attribute set of extra arguments to be passed + to the module functions. The option `_module.args` should be + used instead for most arguments since it allows overriding. + *`specialArgs`* should only be used for arguments that can\'t go + through the module fixed-point, because of infinite recursion or + other problems. An example is overriding the `lib` argument, + because `lib` itself is used to define `_module.args`, which + makes using `_module.args` to define it impossible. + + - *`shorthandOnlyDefinesConfig`* Whether definitions of this type + should default to the `config` section of a module (see + [Example: Structure of NixOS Modules](#ex-module-syntax)) + if it is an attribute set. Enabling this only has a benefit + when the submodule defines an option named `config` or `options`. + In such a case it would allow the option to be set with + `the-submodule.config = "value"` instead of requiring + `the-submodule.config.config = "value"`. This is because + only when modules *don\'t* set the `config` or `options` + keys, all keys are interpreted as option definitions in the + `config` section. Enabling this option implicitly puts all + attributes in the `config` section. + + With this option enabled, defining a non-`config` section + requires using a function: + `the-submodule = { ... }: { options = { ... }; }`. + +## Composed Types {#sec-option-types-composed} + +Composed types are types that take a type as parameter. `listOf + int` and `either int str` are examples of composed types. + +`types.listOf` *`t`* + +: A list of *`t`* type, e.g. `types.listOf + int`. Multiple definitions are merged with list concatenation. + +`types.attrsOf` *`t`* + +: An attribute set of where all the values are of *`t`* type. Multiple + definitions result in the joined attribute set. + + ::: {.note} + This type is *strict* in its values, which in turn means attributes + cannot depend on other attributes. See ` + types.lazyAttrsOf` for a lazy version. + ::: + +`types.lazyAttrsOf` *`t`* + +: An attribute set of where all the values are of *`t`* type. Multiple + definitions result in the joined attribute set. This is the lazy + version of `types.attrsOf + `, allowing attributes to depend on each other. + + ::: {.warning} + This version does not fully support conditional definitions! With an + option `foo` of this type and a definition + `foo.attr = lib.mkIf false 10`, evaluating `foo ? attr` will return + `true` even though it should be false. Accessing the value will then + throw an error. For types *`t`* that have an `emptyValue` defined, + that value will be returned instead of throwing an error. So if the + type of `foo.attr` was `lazyAttrsOf (nullOr int)`, `null` would be + returned instead for the same `mkIf false` definition. + ::: + +`types.nullOr` *`t`* + +: `null` or type *`t`*. Multiple definitions are merged according to + type *`t`*. + +`types.uniq` *`t`* + +: Ensures that type *`t`* cannot be merged. It is used to ensure option + definitions are declared only once. + +`types.either` *`t1 t2`* + +: Type *`t1`* or type *`t2`*, e.g. `with types; either int str`. + Multiple definitions cannot be merged. + +`types.oneOf` \[ *`t1 t2`* \... \] + +: Type *`t1`* or type *`t2`* and so forth, e.g. + `with types; oneOf [ int str bool ]`. Multiple definitions cannot be + merged. + +`types.coercedTo` *`from f to`* + +: Type *`to`* or type *`from`* which will be coerced to type *`to`* using + function *`f`* which takes an argument of type *`from`* and return a + value of type *`to`*. Can be used to preserve backwards compatibility + of an option if its type was changed. + +## Submodule {#section-option-types-submodule} + +`submodule` is a very powerful type that defines a set of sub-options +that are handled like a separate module. + +It takes a parameter *`o`*, that should be a set, or a function returning +a set with an `options` key defining the sub-options. Submodule option +definitions are type-checked accordingly to the `options` declarations. +Of course, you can nest submodule option definitons for even higher +modularity. + +The option set can be defined directly +([Example: Directly defined submodule](#ex-submodule-direct)) or as reference +([Example: Submodule defined as a reference](#ex-submodule-reference)). + +::: {#ex-submodule-direct .example} +::: {.title} +**Example: Directly defined submodule** +::: +```nix +options.mod = mkOption { + description = "submodule example"; + type = with types; submodule { + options = { + foo = mkOption { + type = int; + }; + bar = mkOption { + type = str; + }; + }; + }; +}; +``` +::: + +::: {#ex-submodule-reference .example} +::: {.title} +**Example: Submodule defined as a reference** +::: +```nix +let + modOptions = { + options = { + foo = mkOption { + type = int; + }; + bar = mkOption { + type = int; + }; + }; + }; +in +options.mod = mkOption { + description = "submodule example"; + type = with types; submodule modOptions; +}; +``` +::: + +The `submodule` type is especially interesting when used with composed +types like `attrsOf` or `listOf`. When composed with `listOf` +([Example: Declaration of a list of submodules](#ex-submodule-listof-declaration)), `submodule` allows +multiple definitions of the submodule option set +([Example: Definition of a list of submodules](#ex-submodule-listof-definition)). + +::: {#ex-submodule-listof-declaration .example} +::: {.title} +**Example: Declaration of a list of submodules** +::: +```nix +options.mod = mkOption { + description = "submodule example"; + type = with types; listOf (submodule { + options = { + foo = mkOption { + type = int; + }; + bar = mkOption { + type = str; + }; + }; + }); +}; +``` +::: + +::: {#ex-submodule-listof-definition .example} +::: {.title} +**Example: Definition of a list of submodules** +::: +```nix +config.mod = [ + { foo = 1; bar = "one"; } + { foo = 2; bar = "two"; } +]; +``` +::: + +When composed with `attrsOf` +([Example: Declaration of attribute sets of submodules](#ex-submodule-attrsof-declaration)), `submodule` allows +multiple named definitions of the submodule option set +([Example: Definition of attribute sets of submodules](#ex-submodule-attrsof-definition)). + +::: {#ex-submodule-attrsof-declaration .example} +::: {.title} +**Example: Declaration of attribute sets of submodules** +::: +```nix +options.mod = mkOption { + description = "submodule example"; + type = with types; attrsOf (submodule { + options = { + foo = mkOption { + type = int; + }; + bar = mkOption { + type = str; + }; + }; + }); +}; +``` +::: + +::: {#ex-submodule-attrsof-definition .example} +::: {.title} +**Example: Definition of attribute sets of submodules** +::: +```nix +config.mod.one = { foo = 1; bar = "one"; }; +config.mod.two = { foo = 2; bar = "two"; }; +``` +::: + +## Extending types {#sec-option-types-extending} + +Types are mainly characterized by their `check` and `merge` functions. + +`check` + +: The function to type check the value. Takes a value as parameter and + return a boolean. It is possible to extend a type check with the + `addCheck` function ([Example: Adding a type check](#ex-extending-type-check-1)), + or to fully override the check function + ([Example: Overriding a type check](#ex-extending-type-check-2)). + + ::: {#ex-extending-type-check-1 .example} + ::: {.title} + **Example: Adding a type check** + ::: + ```nix + byte = mkOption { + description = "An integer between 0 and 255."; + type = types.addCheck types.int (x: x >= 0 && x <= 255); + }; + ``` + ::: + + ::: {#ex-extending-type-check-2 .example} + ::: {.title} + **Example: Overriding a type check** + ::: + ```nix + nixThings = mkOption { + description = "words that start with 'nix'"; + type = types.str // { + check = (x: lib.hasPrefix "nix" x) + }; + }; + ``` + ::: + +`merge` + +: Function to merge the options values when multiple values are set. + The function takes two parameters, `loc` the option path as a list + of strings, and `defs` the list of defined values as a list. It is + possible to override a type merge function for custom needs. + +## Custom Types {#sec-option-types-custom} + +Custom types can be created with the `mkOptionType` function. As type +creation includes some more complex topics such as submodule handling, +it is recommended to get familiar with `types.nix` code before creating +a new type. + +The only required parameter is `name`. + +`name` + +: A string representation of the type function name. + +`definition` + +: Description of the type used in documentation. Give information of + the type and any of its arguments. + +`check` + +: A function to type check the definition value. Takes the definition + value as a parameter and returns a boolean indicating the type check + result, `true` for success and `false` for failure. + +`merge` + +: A function to merge multiple definitions values. Takes two + parameters: + + *`loc`* + + : The option path as a list of strings, e.g. `["boot" "loader + "grub" "enable"]`. + + *`defs`* + + : The list of sets of defined `value` and `file` where the value + was defined, e.g. `[ { + file = "/foo.nix"; value = 1; } { file = "/bar.nix"; value = 2 } + ]`. The `merge` function should return the merged value + or throw an error in case the values are impossible or not meant + to be merged. + +`getSubOptions` + +: For composed types that can take a submodule as type parameter, this + function generate sub-options documentation. It takes the current + option prefix as a list and return the set of sub-options. Usually + defined in a recursive manner by adding a term to the prefix, e.g. + `prefix: + elemType.getSubOptions (prefix ++ + ["prefix"])` where *`"prefix"`* is the newly added prefix. + +`getSubModules` + +: For composed types that can take a submodule as type parameter, this + function should return the type parameters submodules. If the type + parameter is called `elemType`, the function should just recursively + look into submodules by returning `elemType.getSubModules;`. + +`substSubModules` + +: For composed types that can take a submodule as type parameter, this + function can be used to substitute the parameter of a submodule + type. It takes a module as parameter and return the type with the + submodule options substituted. It is usually defined as a type + function call with a recursive call to `substSubModules`, e.g for a + type `composedType` that take an `elemtype` type parameter, this + function should be defined as `m: + composedType (elemType.substSubModules m)`. + +`typeMerge` + +: A function to merge multiple type declarations. Takes the type to + merge `functor` as parameter. A `null` return value means that type + cannot be merged. + + *`f`* + + : The type to merge `functor`. + + Note: There is a generic `defaultTypeMerge` that work with most of + value and composed types. + +`functor` + +: An attribute set representing the type. It is used for type + operations and has the following keys: + + `type` + + : The type function. + + `wrapped` + + : Holds the type parameter for composed types. + + `payload` + + : Holds the value parameter for value types. The types that have a + `payload` are the `enum`, `separatedString` and `submodule` + types. + + `binOp` + + : A binary operation that can merge the payloads of two same + types. Defined as a function that take two payloads as + parameters and return the payloads merged. diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml deleted file mode 100644 index 3d2191e2f3f3..000000000000 --- a/nixos/doc/manual/development/option-types.xml +++ /dev/null @@ -1,914 +0,0 @@ -
- Options Types - - - Option types are a way to put constraints on the values a module option can - take. Types are also responsible of how values are merged in case of multiple - value definitions. - - -
- Basic Types - - - Basic types are the simplest available types in the module system. Basic - types include multiple string types that mainly differ in how definition - merging is handled. - - - - - - types.bool - - - - A boolean, its values can be true or - false. - - - - - - types.path - - - - A filesystem path, defined as anything that when coerced to a string - starts with a slash. Even if derivations can be considered as path, the - more specific types.package should be preferred. - - - - - - types.package - - - - A derivation or a store path. - - - - - - types.anything - - - - A type that accepts any value and recursively merges attribute sets together. - This type is recommended when the option type is unknown. - - <literal>types.anything</literal> Example - - Two definitions of this type like - -{ - str = lib.mkDefault "foo"; - pkg.hello = pkgs.hello; - fun.fun = x: x + 1; -} - - -{ - str = lib.mkIf true "bar"; - pkg.gcc = pkgs.gcc; - fun.fun = lib.mkForce (x: x + 2); -} - - will get merged to - -{ - str = "bar"; - pkg.gcc = pkgs.gcc; - pkg.hello = pkgs.hello; - fun.fun = x: x + 2; -} - - - - - - - - - types.attrs - - - - A free-form attribute set. - - This type will be deprecated in the future because it doesn't recurse - into attribute sets, silently drops earlier attribute definitions, and - doesn't discharge lib.mkDefault, lib.mkIf - and co. For allowing arbitrary attribute sets, prefer - types.attrsOf types.anything instead which doesn't - have these problems. - - - - - - - - Integer-related types: - - - - - - types.int - - - - A signed integer. - - - - - - types.ints.{s8, s16, s32} - - - - Signed integers with a fixed length (8, 16 or 32 bits). They go from - −2n/2 - to - 2n/2−1 - respectively (e.g. −128 to - 127 for 8 bits). - - - - - - types.ints.unsigned - - - - An unsigned integer (that is >= 0). - - - - - - types.ints.{u8, u16, u32} - - - - Unsigned integers with a fixed length (8, 16 or 32 bits). They go from - 0 to - - 2n−1 - respectively (e.g. 0 to - 255 for 8 bits). - - - - - - types.ints.positive - - - - A positive integer (that is > 0). - - - - - - types.port - - - - A port number. This type is an alias to - types.ints.u16. - - - - - - - String-related types: - - - - - - types.str - - - - A string. Multiple definitions cannot be merged. - - - - - - types.lines - - - - A string. Multiple definitions are concatenated with a new line - "\n". - - - - - - types.commas - - - - A string. Multiple definitions are concatenated with a comma - ",". - - - - - - types.envVar - - - - A string. Multiple definitions are concatenated with a collon - ":". - - - - - - types.strMatching - - - - A string matching a specific regular expression. Multiple definitions - cannot be merged. The regular expression is processed using - builtins.match. - - - - -
- -
- Value Types - - - Value types are types that take a value parameter. - - - - - - types.enum l - - - - One element of the list l, e.g. - types.enum [ "left" "right" ]. Multiple definitions - cannot be merged. - - - - - - types.separatedString sep - - - - A string with a custom separator sep, e.g. - types.separatedString "|". - - - - - - types.ints.between lowest highest - - - - An integer between lowest and - highest (both inclusive). Useful for creating - types like types.port. - - - - - - types.submodule o - - - - A set of sub options o. - o can be an attribute set, a function - returning an attribute set, or a path to a file containing such a value. Submodules are used in - composed types to create modular options. This is equivalent to - types.submoduleWith { modules = toList o; shorthandOnlyDefinesConfig = true; }. - Submodules are detailed in - . - - - - - - types.submoduleWith { - modules, - specialArgs ? {}, - shorthandOnlyDefinesConfig ? false } - - - - Like types.submodule, but more flexible and with better defaults. - It has parameters - - - modules - A list of modules to use by default for this submodule type. This gets combined - with all option definitions to build the final list of modules that will be included. - - Only options defined with this argument are included in rendered documentation. - - - - specialArgs - An attribute set of extra arguments to be passed to the module functions. - The option _module.args should be used instead - for most arguments since it allows overriding. specialArgs should only be - used for arguments that can't go through the module fixed-point, because of - infinite recursion or other problems. An example is overriding the - lib argument, because lib itself is used - to define _module.args, which makes using - _module.args to define it impossible. - - - shorthandOnlyDefinesConfig - Whether definitions of this type should default to the config - section of a module (see ) if it is an attribute - set. Enabling this only has a benefit when the submodule defines an option named - config or options. In such a case it would - allow the option to be set with the-submodule.config = "value" - instead of requiring the-submodule.config.config = "value". - This is because only when modules don't set the - config or options keys, all keys are interpreted - as option definitions in the config section. Enabling this option - implicitly puts all attributes in the config section. - - - With this option enabled, defining a non-config section requires - using a function: the-submodule = { ... }: { options = { ... }; }. - - - - - - -
- -
- Composed Types - - - Composed types are types that take a type as parameter. listOf - int and either int str are examples of composed - types. - - - - - - types.listOf t - - - - A list of t type, e.g. types.listOf - int. Multiple definitions are merged with list concatenation. - - - - - - types.attrsOf t - - - - An attribute set of where all the values are of - t type. Multiple definitions result in the - joined attribute set. - - This type is strict in its values, which in turn - means attributes cannot depend on other attributes. See - types.lazyAttrsOf for a lazy version. - - - - - - - types.lazyAttrsOf t - - - - An attribute set of where all the values are of - t type. Multiple definitions result in the - joined attribute set. This is the lazy version of types.attrsOf - , allowing attributes to depend on each other. - - This version does not fully support conditional definitions! With an - option foo of this type and a definition - foo.attr = lib.mkIf false 10, evaluating - foo ? attr will return true - even though it should be false. Accessing the value will then throw - an error. For types t that have an - emptyValue defined, that value will be returned - instead of throwing an error. So if the type of foo.attr - was lazyAttrsOf (nullOr int), null - would be returned instead for the same mkIf false definition. - - - - - - - types.nullOr t - - - - null or type t. Multiple - definitions are merged according to type t. - - - - - - types.uniq t - - - - Ensures that type t cannot be merged. It is - used to ensure option definitions are declared only once. - - - - - - types.either t1 t2 - - - - Type t1 or type t2, - e.g. with types; either int str. Multiple definitions - cannot be merged. - - - - - - types.oneOf [ t1 t2 ... ] - - - - Type t1 or type t2 and so forth, - e.g. with types; oneOf [ int str bool ]. Multiple definitions - cannot be merged. - - - - - - types.coercedTo from f to - - - - Type to or type - from which will be coerced to type - to using function f - which takes an argument of type from and - return a value of type to. Can be used to - preserve backwards compatibility of an option if its type was changed. - - - - -
- -
- Submodule - - - submodule is a very powerful type that defines a set of - sub-options that are handled like a separate module. - - - - It takes a parameter o, that should be a set, or - a function returning a set with an options key defining - the sub-options. Submodule option definitions are type-checked accordingly - to the options declarations. Of course, you can nest - submodule option definitons for even higher modularity. - - - - The option set can be defined directly - () or as reference - (). - - - - Directly defined submodule - -options.mod = mkOption { - description = "submodule example"; - type = with types; submodule { - options = { - foo = mkOption { - type = int; - }; - bar = mkOption { - type = str; - }; - }; - }; -}; - - - - Submodule defined as a reference - -let - modOptions = { - options = { - foo = mkOption { - type = int; - }; - bar = mkOption { - type = int; - }; - }; - }; -in -options.mod = mkOption { - description = "submodule example"; - type = with types; submodule modOptions; -}; - - - - The submodule type is especially interesting when used - with composed types like attrsOf or - listOf. When composed with listOf - (), - submodule allows multiple definitions of the submodule - option set (). - - - - Declaration of a list of submodules - -options.mod = mkOption { - description = "submodule example"; - type = with types; listOf (submodule { - options = { - foo = mkOption { - type = int; - }; - bar = mkOption { - type = str; - }; - }; - }); -}; - - - - Definition of a list of submodules - -config.mod = [ - { foo = 1; bar = "one"; } - { foo = 2; bar = "two"; } -]; - - - - When composed with attrsOf - (), - submodule allows multiple named definitions of the - submodule option set (). - - - - Declaration of attribute sets of submodules - -options.mod = mkOption { - description = "submodule example"; - type = with types; attrsOf (submodule { - options = { - foo = mkOption { - type = int; - }; - bar = mkOption { - type = str; - }; - }; - }); -}; - - - - Declaration of attribute sets of submodules - -config.mod.one = { foo = 1; bar = "one"; }; -config.mod.two = { foo = 2; bar = "two"; }; - -
- -
- Extending types - - - Types are mainly characterized by their check and - merge functions. - - - - - - check - - - - The function to type check the value. Takes a value as parameter and - return a boolean. It is possible to extend a type check with the - addCheck function - (), or to fully - override the check function - (). - - - Adding a type check - -byte = mkOption { - description = "An integer between 0 and 255."; - type = types.addCheck types.int (x: x >= 0 && x <= 255); -}; - - - Overriding a type check - -nixThings = mkOption { - description = "words that start with 'nix'"; - type = types.str // { - check = (x: lib.hasPrefix "nix" x) - }; -}; - - - - - - merge - - - - Function to merge the options values when multiple values are set. The - function takes two parameters, loc the option path as - a list of strings, and defs the list of defined values - as a list. It is possible to override a type merge function for custom - needs. - - - - -
- -
- Custom Types - - - Custom types can be created with the mkOptionType - function. As type creation includes some more complex topics such as - submodule handling, it is recommended to get familiar with - types.nix - code before creating a new type. - - - - The only required parameter is name. - - - - - - name - - - - A string representation of the type function name. - - - - - - definition - - - - Description of the type used in documentation. Give information of the - type and any of its arguments. - - - - - - check - - - - A function to type check the definition value. Takes the definition value - as a parameter and returns a boolean indicating the type check result, - true for success and false for - failure. - - - - - - merge - - - - A function to merge multiple definitions values. Takes two parameters: - - - - - loc - - - - The option path as a list of strings, e.g. ["boot" "loader - "grub" "enable"]. - - - - - - defs - - - - The list of sets of defined value and - file where the value was defined, e.g. [ { - file = "/foo.nix"; value = 1; } { file = "/bar.nix"; value = 2 } - ]. The merge function should return the - merged value or throw an error in case the values are impossible or - not meant to be merged. - - - - - - - - - getSubOptions - - - - For composed types that can take a submodule as type parameter, this - function generate sub-options documentation. It takes the current option - prefix as a list and return the set of sub-options. Usually defined in a - recursive manner by adding a term to the prefix, e.g. prefix: - elemType.getSubOptions (prefix ++ - ["prefix"]) where - "prefix" is the newly added prefix. - - - - - - getSubModules - - - - For composed types that can take a submodule as type parameter, this - function should return the type parameters submodules. If the type - parameter is called elemType, the function should just - recursively look into submodules by returning - elemType.getSubModules;. - - - - - - substSubModules - - - - For composed types that can take a submodule as type parameter, this - function can be used to substitute the parameter of a submodule type. It - takes a module as parameter and return the type with the submodule - options substituted. It is usually defined as a type function call with a - recursive call to substSubModules, e.g for a type - composedType that take an elemtype - type parameter, this function should be defined as m: - composedType (elemType.substSubModules m). - - - - - - typeMerge - - - - A function to merge multiple type declarations. Takes the type to merge - functor as parameter. A null return - value means that type cannot be merged. - - - - - f - - - - The type to merge functor. - - - - - - Note: There is a generic defaultTypeMerge that work - with most of value and composed types. - - - - - - functor - - - - An attribute set representing the type. It is used for type operations - and has the following keys: - - - - - type - - - - The type function. - - - - - - wrapped - - - - Holds the type parameter for composed types. - - - - - - payload - - - - Holds the value parameter for value types. The types that have a - payload are the enum, - separatedString and submodule - types. - - - - - - binOp - - - - A binary operation that can merge the payloads of two same types. - Defined as a function that take two payloads as parameters and return - the payloads merged. - - - - - - - -
-
diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml index a1efbeac7232..245c49dbb7eb 100644 --- a/nixos/doc/manual/development/writing-modules.xml +++ b/nixos/doc/manual/development/writing-modules.xml @@ -180,7 +180,7 @@ in { - + diff --git a/nixos/doc/manual/from_md/development/option-types.section.xml b/nixos/doc/manual/from_md/development/option-types.section.xml new file mode 100644 index 000000000000..c83ffa2add53 --- /dev/null +++ b/nixos/doc/manual/from_md/development/option-types.section.xml @@ -0,0 +1,987 @@ +
+ Options Types + + Option types are a way to put constraints on the values a module + option can take. Types are also responsible of how values are merged + in case of multiple value definitions. + +
+ Basic Types + + Basic types are the simplest available types in the module system. + Basic types include multiple string types that mainly differ in + how definition merging is handled. + + + + + types.bool + + + + A boolean, its values can be true or + false. + + + + + + types.path + + + + A filesystem path, defined as anything that when coerced to + a string starts with a slash. Even if derivations can be + considered as path, the more specific + types.package should be preferred. + + + + + + types.package + + + + A derivation or a store path. + + + + + + types.anything + + + + A type that accepts any value and recursively merges + attribute sets together. This type is recommended when the + option type is unknown. + + + + Example: + types.anything Example + + + Two definitions of this type like + + +{ + str = lib.mkDefault "foo"; + pkg.hello = pkgs.hello; + fun.fun = x: x + 1; +} + + +{ + str = lib.mkIf true "bar"; + pkg.gcc = pkgs.gcc; + fun.fun = lib.mkForce (x: x + 2); +} + + + will get merged to + + +{ + str = "bar"; + pkg.gcc = pkgs.gcc; + pkg.hello = pkgs.hello; + fun.fun = x: x + 2; +} + + + + + + types.attrs + + + + A free-form attribute set. + + + + This type will be deprecated in the future because it + doesn't recurse into attribute sets, silently drops + earlier attribute definitions, and doesn't discharge + lib.mkDefault, + lib.mkIf and co. For allowing arbitrary + attribute sets, prefer + types.attrsOf types.anything instead + which doesn't have these problems. + + + + + + + Integer-related types: + + + + + types.int + + + + A signed integer. + + + + + + types.ints.{s8, s16, s32} + + + + Signed integers with a fixed length (8, 16 or 32 bits). They + go from −2^n/2 to 2^n/2−1 respectively (e.g. + −128 to 127 for 8 + bits). + + + + + + types.ints.unsigned + + + + An unsigned integer (that is >= 0). + + + + + + types.ints.{u8, u16, u32} + + + + Unsigned integers with a fixed length (8, 16 or 32 bits). + They go from 0 to 2^n−1 respectively (e.g. + 0 to 255 for 8 bits). + + + + + + types.ints.positive + + + + A positive integer (that is > 0). + + + + + + types.port + + + + A port number. This type is an alias to + types.ints.u16. + + + + + + String-related types: + + + + + types.str + + + + A string. Multiple definitions cannot be merged. + + + + + + types.lines + + + + A string. Multiple definitions are concatenated with a new + line "\n". + + + + + + types.commas + + + + A string. Multiple definitions are concatenated with a comma + ",". + + + + + + types.envVar + + + + A string. Multiple definitions are concatenated with a + collon ":". + + + + + + types.strMatching + + + + A string matching a specific regular expression. Multiple + definitions cannot be merged. The regular expression is + processed using builtins.match. + + + + +
+
+ Value Types + + Value types are types that take a value parameter. + + + + + types.enum + l + + + + One element of the list + l, e.g. + types.enum [ "left" "right" ]. + Multiple definitions cannot be merged. + + + + + + types.separatedString + sep + + + + A string with a custom separator + sep, e.g. + types.separatedString "|". + + + + + + types.ints.between + lowest highest + + + + An integer between + lowest and + highest (both + inclusive). Useful for creating types like + types.port. + + + + + + types.submodule + o + + + + A set of sub options + o. + o can be an + attribute set, a function returning an attribute set, or a + path to a file containing such a value. Submodules are used + in composed types to create modular options. This is + equivalent to + types.submoduleWith { modules = toList o; shorthandOnlyDefinesConfig = true; }. + Submodules are detailed in + Submodule. + + + + + + types.submoduleWith { + modules, + specialArgs ? {}, + shorthandOnlyDefinesConfig + ? false } + + + + Like types.submodule, but more flexible + and with better defaults. It has parameters + + + + + modules A list + of modules to use by default for this submodule type. + This gets combined with all option definitions to build + the final list of modules that will be included. + + + + Only options defined with this argument are included + in rendered documentation. + + + + + + specialArgs An + attribute set of extra arguments to be passed to the + module functions. The option + _module.args should be used instead + for most arguments since it allows overriding. + specialArgs + should only be used for arguments that can't go through + the module fixed-point, because of infinite recursion or + other problems. An example is overriding the + lib argument, because + lib itself is used to define + _module.args, which makes using + _module.args to define it impossible. + + + + + shorthandOnlyDefinesConfig + Whether definitions of this type should default to the + config section of a module (see + Example: Structure of + NixOS Modules) if it is an attribute set. + Enabling this only has a benefit when the submodule + defines an option named config or + options. In such a case it would + allow the option to be set with + the-submodule.config = "value" + instead of requiring + the-submodule.config.config = "value". + This is because only when modules + don't set the + config or options + keys, all keys are interpreted as option definitions in + the config section. Enabling this + option implicitly puts all attributes in the + config section. + + + With this option enabled, defining a + non-config section requires using a + function: + the-submodule = { ... }: { options = { ... }; }. + + + + + + +
+
+ Composed Types + + Composed types are types that take a type as parameter. + listOf int and + either int str are examples of composed types. + + + + + types.listOf + t + + + + A list of t type, + e.g. types.listOf int. Multiple + definitions are merged with list concatenation. + + + + + + types.attrsOf + t + + + + An attribute set of where all the values are of + t type. Multiple + definitions result in the joined attribute set. + + + + This type is strict in its values, + which in turn means attributes cannot depend on other + attributes. See types.lazyAttrsOf for + a lazy version. + + + + + + + types.lazyAttrsOf + t + + + + An attribute set of where all the values are of + t type. Multiple + definitions result in the joined attribute set. This is the + lazy version of types.attrsOf , allowing + attributes to depend on each other. + + + + This version does not fully support conditional + definitions! With an option foo of this + type and a definition + foo.attr = lib.mkIf false 10, + evaluating foo ? attr will return + true even though it should be false. + Accessing the value will then throw an error. For types + t that have an + emptyValue defined, that value will be + returned instead of throwing an error. So if the type of + foo.attr was + lazyAttrsOf (nullOr int), + null would be returned instead for the + same mkIf false definition. + + + + + + + types.nullOr + t + + + + null or type + t. Multiple + definitions are merged according to type + t. + + + + + + types.uniq + t + + + + Ensures that type t + cannot be merged. It is used to ensure option definitions + are declared only once. + + + + + + types.either + t1 t2 + + + + Type t1 or type + t2, e.g. + with types; either int str. Multiple + definitions cannot be merged. + + + + + + types.oneOf [ + t1 t2 ... ] + + + + Type t1 or type + t2 and so forth, + e.g. with types; oneOf [ int str bool ]. + Multiple definitions cannot be merged. + + + + + + types.coercedTo + from f to + + + + Type to or type + from which will be + coerced to type to + using function f + which takes an argument of type + from and return a + value of type to. + Can be used to preserve backwards compatibility of an option + if its type was changed. + + + + +
+
+ Submodule + + submodule is a very powerful type that defines + a set of sub-options that are handled like a separate module. + + + It takes a parameter o, + that should be a set, or a function returning a set with an + options key defining the sub-options. Submodule + option definitions are type-checked accordingly to the + options declarations. Of course, you can nest + submodule option definitons for even higher modularity. + + + The option set can be defined directly + (Example: Directly defined + submodule) or as reference + (Example: Submodule defined + as a reference). + + + + Example: Directly defined + submodule + + +options.mod = mkOption { + description = "submodule example"; + type = with types; submodule { + options = { + foo = mkOption { + type = int; + }; + bar = mkOption { + type = str; + }; + }; + }; +}; + + + + Example: Submodule defined as a + reference + + +let + modOptions = { + options = { + foo = mkOption { + type = int; + }; + bar = mkOption { + type = int; + }; + }; + }; +in +options.mod = mkOption { + description = "submodule example"; + type = with types; submodule modOptions; +}; + + + The submodule type is especially interesting + when used with composed types like attrsOf or + listOf. When composed with + listOf + (Example: + Declaration of a list of submodules), + submodule allows multiple definitions of the + submodule option set + (Example: + Definition of a list of submodules). + + + + Example: Declaration of a list of + submodules + + +options.mod = mkOption { + description = "submodule example"; + type = with types; listOf (submodule { + options = { + foo = mkOption { + type = int; + }; + bar = mkOption { + type = str; + }; + }; + }); +}; + + + + Example: Definition of a list of + submodules + + +config.mod = [ + { foo = 1; bar = "one"; } + { foo = 2; bar = "two"; } +]; + + + When composed with attrsOf + (Example: + Declaration of attribute sets of submodules), + submodule allows multiple named definitions of + the submodule option set + (Example: + Definition of attribute sets of submodules). + + + + Example: Declaration of attribute sets of + submodules + + +options.mod = mkOption { + description = "submodule example"; + type = with types; attrsOf (submodule { + options = { + foo = mkOption { + type = int; + }; + bar = mkOption { + type = str; + }; + }; + }); +}; + + + + Example: Definition of attribute sets of + submodules + + +config.mod.one = { foo = 1; bar = "one"; }; +config.mod.two = { foo = 2; bar = "two"; }; + +
+
+ Extending types + + Types are mainly characterized by their check + and merge functions. + + + + + check + + + + The function to type check the value. Takes a value as + parameter and return a boolean. It is possible to extend a + type check with the addCheck function + (Example: Adding a + type check), or to fully override the check function + (Example: + Overriding a type check). + + + + Example: Adding a type + check + + +byte = mkOption { + description = "An integer between 0 and 255."; + type = types.addCheck types.int (x: x >= 0 && x <= 255); +}; + + + + Example: Overriding a type + check + + +nixThings = mkOption { + description = "words that start with 'nix'"; + type = types.str // { + check = (x: lib.hasPrefix "nix" x) + }; +}; + + + + + + merge + + + + Function to merge the options values when multiple values + are set. The function takes two parameters, + loc the option path as a list of strings, + and defs the list of defined values as a + list. It is possible to override a type merge function for + custom needs. + + + + +
+
+ Custom Types + + Custom types can be created with the + mkOptionType function. As type creation + includes some more complex topics such as submodule handling, it + is recommended to get familiar with types.nix + code before creating a new type. + + + The only required parameter is name. + + + + + name + + + + A string representation of the type function name. + + + + + + definition + + + + Description of the type used in documentation. Give + information of the type and any of its arguments. + + + + + + check + + + + A function to type check the definition value. Takes the + definition value as a parameter and returns a boolean + indicating the type check result, true + for success and false for failure. + + + + + + merge + + + + A function to merge multiple definitions values. Takes two + parameters: + + + + + loc + + + + The option path as a list of strings, e.g. + ["boot" "loader "grub" "enable"]. + + + + + + defs + + + + The list of sets of defined value + and file where the value was + defined, e.g. + [ { file = "/foo.nix"; value = 1; } { file = "/bar.nix"; value = 2 } ]. + The merge function should return + the merged value or throw an error in case the values + are impossible or not meant to be merged. + + + + + + + + + getSubOptions + + + + For composed types that can take a submodule as type + parameter, this function generate sub-options documentation. + It takes the current option prefix as a list and return the + set of sub-options. Usually defined in a recursive manner by + adding a term to the prefix, e.g. + prefix: elemType.getSubOptions (prefix ++ ["prefix"]) + where + "prefix" + is the newly added prefix. + + + + + + getSubModules + + + + For composed types that can take a submodule as type + parameter, this function should return the type parameters + submodules. If the type parameter is called + elemType, the function should just + recursively look into submodules by returning + elemType.getSubModules;. + + + + + + substSubModules + + + + For composed types that can take a submodule as type + parameter, this function can be used to substitute the + parameter of a submodule type. It takes a module as + parameter and return the type with the submodule options + substituted. It is usually defined as a type function call + with a recursive call to substSubModules, + e.g for a type composedType that take an + elemtype type parameter, this function + should be defined as + m: composedType (elemType.substSubModules m). + + + + + + typeMerge + + + + A function to merge multiple type declarations. Takes the + type to merge functor as parameter. A + null return value means that type cannot + be merged. + + + + + f + + + + The type to merge functor. + + + + + + Note: There is a generic defaultTypeMerge + that work with most of value and composed types. + + + + + + functor + + + + An attribute set representing the type. It is used for type + operations and has the following keys: + + + + + type + + + + The type function. + + + + + + wrapped + + + + Holds the type parameter for composed types. + + + + + + payload + + + + Holds the value parameter for value types. The types + that have a payload are the + enum, + separatedString and + submodule types. + + + + + + binOp + + + + A binary operation that can merge the payloads of two + same types. Defined as a function that take two + payloads as parameters and return the payloads merged. + + + + + + + +
+
From d48cfce2bf295ef125c94c41b6edacc284e06529 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Jul 2021 22:17:15 +0800 Subject: [PATCH 050/167] nixos: nixos/doc/manual/development/option-def.xml to CommonMark --- .../manual/development/option-def.section.md | 91 +++++++++++++++ nixos/doc/manual/development/option-def.xml | 99 ----------------- .../manual/development/writing-modules.xml | 2 +- .../development/option-def.section.xml | 104 ++++++++++++++++++ 4 files changed, 196 insertions(+), 100 deletions(-) create mode 100644 nixos/doc/manual/development/option-def.section.md delete mode 100644 nixos/doc/manual/development/option-def.xml create mode 100644 nixos/doc/manual/from_md/development/option-def.section.xml diff --git a/nixos/doc/manual/development/option-def.section.md b/nixos/doc/manual/development/option-def.section.md new file mode 100644 index 000000000000..91b24cd4a3a1 --- /dev/null +++ b/nixos/doc/manual/development/option-def.section.md @@ -0,0 +1,91 @@ +# Option Definitions {#sec-option-definitions} + +Option definitions are generally straight-forward bindings of values to +option names, like + +```nix +config = { + services.httpd.enable = true; +}; +``` + +However, sometimes you need to wrap an option definition or set of +option definitions in a *property* to achieve certain effects: + +## Delaying Conditionals {#sec-option-definitions-delaying-conditionals .unnumbered} + +If a set of option definitions is conditional on the value of another +option, you may need to use `mkIf`. Consider, for instance: + +```nix +config = if config.services.httpd.enable then { + environment.systemPackages = [ ... ]; + ... +} else {}; +``` + +This definition will cause Nix to fail with an "infinite recursion" +error. Why? Because the value of `config.services.httpd.enable` depends +on the value being constructed here. After all, you could also write the +clearly circular and contradictory: + +```nix +config = if config.services.httpd.enable then { + services.httpd.enable = false; +} else { + services.httpd.enable = true; +}; +``` + +The solution is to write: + +```nix +config = mkIf config.services.httpd.enable { + environment.systemPackages = [ ... ]; + ... +}; +``` + +The special function `mkIf` causes the evaluation of the conditional to +be "pushed down" into the individual definitions, as if you had written: + +```nix +config = { + environment.systemPackages = if config.services.httpd.enable then [ ... ] else []; + ... +}; +``` + +## Setting Priorities {#sec-option-definitions-setting-priorities .unnumbered} + +A module can override the definitions of an option in other modules by +setting a *priority*. All option definitions that do not have the lowest +priority value are discarded. By default, option definitions have +priority 1000. You can specify an explicit priority by using +`mkOverride`, e.g. + +```nix +services.openssh.enable = mkOverride 10 false; +``` + +This definition causes all other definitions with priorities above 10 to +be discarded. The function `mkForce` is equal to `mkOverride 50`. + +## Merging Configurations {#sec-option-definitions-merging .unnumbered} + +In conjunction with `mkIf`, it is sometimes useful for a module to +return multiple sets of option definitions, to be merged together as if +they were declared in separate modules. This can be done using +`mkMerge`: + +```nix +config = mkMerge + [ # Unconditional stuff. + { environment.systemPackages = [ ... ]; + } + # Conditional stuff. + (mkIf config.services.bla.enable { + environment.systemPackages = [ ... ]; + }) + ]; +``` diff --git a/nixos/doc/manual/development/option-def.xml b/nixos/doc/manual/development/option-def.xml deleted file mode 100644 index 50a705d0cb8e..000000000000 --- a/nixos/doc/manual/development/option-def.xml +++ /dev/null @@ -1,99 +0,0 @@ -
- Option Definitions - - - Option definitions are generally straight-forward bindings of values to - option names, like - -config = { - services.httpd.enable = true; -}; - - However, sometimes you need to wrap an option definition or set of option - definitions in a property to achieve certain effects: - - - - Delaying Conditionals - - If a set of option definitions is conditional on the value of another - option, you may need to use mkIf. Consider, for instance: - -config = if config.services.httpd.enable then { - environment.systemPackages = [ ... ]; - ... -} else {}; - - This definition will cause Nix to fail with an “infinite recursion” - error. Why? Because the value of - depends on the value being - constructed here. After all, you could also write the clearly circular and - contradictory: - -config = if config.services.httpd.enable then { - services.httpd.enable = false; -} else { - services.httpd.enable = true; -}; - - The solution is to write: - -config = mkIf config.services.httpd.enable { - environment.systemPackages = [ ... ]; - ... -}; - - The special function mkIf causes the evaluation of the - conditional to be “pushed down” into the individual definitions, as if - you had written: - -config = { - environment.systemPackages = if config.services.httpd.enable then [ ... ] else []; - ... -}; - - - - - - Setting Priorities - - A module can override the definitions of an option in other modules by - setting a priority. All option definitions that do not - have the lowest priority value are discarded. By default, option definitions - have priority 1000. You can specify an explicit priority by using - mkOverride, e.g. - -services.openssh.enable = mkOverride 10 false; - - This definition causes all other definitions with priorities above 10 to be - discarded. The function mkForce is equal to - mkOverride 50. - - - - - Merging Configurations - - In conjunction with mkIf, it is sometimes useful for a - module to return multiple sets of option definitions, to be merged together - as if they were declared in separate modules. This can be done using - mkMerge: - -config = mkMerge - [ # Unconditional stuff. - { environment.systemPackages = [ ... ]; - } - # Conditional stuff. - (mkIf config.services.bla.enable { - environment.systemPackages = [ ... ]; - }) - ]; - - - -
diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml index 245c49dbb7eb..ac9617f4ea04 100644 --- a/nixos/doc/manual/development/writing-modules.xml +++ b/nixos/doc/manual/development/writing-modules.xml @@ -181,7 +181,7 @@ in { - + diff --git a/nixos/doc/manual/from_md/development/option-def.section.xml b/nixos/doc/manual/from_md/development/option-def.section.xml new file mode 100644 index 000000000000..8c9ef181affd --- /dev/null +++ b/nixos/doc/manual/from_md/development/option-def.section.xml @@ -0,0 +1,104 @@ +
+ Option Definitions + + Option definitions are generally straight-forward bindings of values + to option names, like + + +config = { + services.httpd.enable = true; +}; + + + However, sometimes you need to wrap an option definition or set of + option definitions in a property to achieve + certain effects: + +
+ Delaying Conditionals + + If a set of option definitions is conditional on the value of + another option, you may need to use mkIf. + Consider, for instance: + + +config = if config.services.httpd.enable then { + environment.systemPackages = [ ... ]; + ... +} else {}; + + + This definition will cause Nix to fail with an infinite + recursion error. Why? Because the value of + config.services.httpd.enable depends on the + value being constructed here. After all, you could also write the + clearly circular and contradictory: + + +config = if config.services.httpd.enable then { + services.httpd.enable = false; +} else { + services.httpd.enable = true; +}; + + + The solution is to write: + + +config = mkIf config.services.httpd.enable { + environment.systemPackages = [ ... ]; + ... +}; + + + The special function mkIf causes the evaluation + of the conditional to be pushed down into the + individual definitions, as if you had written: + + +config = { + environment.systemPackages = if config.services.httpd.enable then [ ... ] else []; + ... +}; + +
+
+ Setting Priorities + + A module can override the definitions of an option in other + modules by setting a priority. All option + definitions that do not have the lowest priority value are + discarded. By default, option definitions have priority 1000. You + can specify an explicit priority by using + mkOverride, e.g. + + +services.openssh.enable = mkOverride 10 false; + + + This definition causes all other definitions with priorities above + 10 to be discarded. The function mkForce is + equal to mkOverride 50. + +
+
+ Merging Configurations + + In conjunction with mkIf, it is sometimes + useful for a module to return multiple sets of option definitions, + to be merged together as if they were declared in separate + modules. This can be done using mkMerge: + + +config = mkMerge + [ # Unconditional stuff. + { environment.systemPackages = [ ... ]; + } + # Conditional stuff. + (mkIf config.services.bla.enable { + environment.systemPackages = [ ... ]; + }) + ]; + +
+
From c0853101833136590811a8c3cf30a989dd40a586 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Jul 2021 22:18:11 +0800 Subject: [PATCH 051/167] nixos: nixos/doc/manual/development/meta-attributes.xml to CommonMark --- .../development/meta-attributes.section.md | 40 ++++++++++++ .../manual/development/meta-attributes.xml | 63 ------------------- .../manual/development/writing-modules.xml | 2 +- .../development/meta-attributes.section.xml | 55 ++++++++++++++++ 4 files changed, 96 insertions(+), 64 deletions(-) create mode 100644 nixos/doc/manual/development/meta-attributes.section.md delete mode 100644 nixos/doc/manual/development/meta-attributes.xml create mode 100644 nixos/doc/manual/from_md/development/meta-attributes.section.xml diff --git a/nixos/doc/manual/development/meta-attributes.section.md b/nixos/doc/manual/development/meta-attributes.section.md new file mode 100644 index 000000000000..ca4ba007f7dc --- /dev/null +++ b/nixos/doc/manual/development/meta-attributes.section.md @@ -0,0 +1,40 @@ +# Meta Attributes {#sec-meta-attributes} + +Like Nix packages, NixOS modules can declare meta-attributes to provide +extra information. Module meta attributes are defined in the `meta.nix` +special module. + +`meta` is a top level attribute like `options` and `config`. Available +meta-attributes are `maintainers` and `doc`. + +Each of the meta-attributes must be defined at most once per module +file. + +```nix +{ config, lib, pkgs, ... }: +{ + options = { + ... + }; + + config = { + ... + }; + + meta = { + maintainers = with lib.maintainers; [ ericsagnes ]; + doc = ./default.xml; + }; +} +``` + +- `maintainers` contains a list of the module maintainers. + +- `doc` points to a valid DocBook file containing the module + documentation. Its contents is automatically added to + [](#ch-configuration). Changes to a module documentation have to + be checked to not break building the NixOS manual: + + ```ShellSession + $ nix-build nixos/release.nix -A manual.x86_64-linux + ``` diff --git a/nixos/doc/manual/development/meta-attributes.xml b/nixos/doc/manual/development/meta-attributes.xml deleted file mode 100644 index c40be0a50c36..000000000000 --- a/nixos/doc/manual/development/meta-attributes.xml +++ /dev/null @@ -1,63 +0,0 @@ -
- Meta Attributes - - - Like Nix packages, NixOS modules can declare meta-attributes to provide extra - information. Module meta attributes are defined in the - meta.nix - special module. - - - - meta is a top level attribute like - options and config. Available - meta-attributes are maintainers and - doc. - - - - Each of the meta-attributes must be defined at most once per module file. - - - -{ config, lib, pkgs, ... }: -{ - options = { - ... - }; - - config = { - ... - }; - - meta = { - maintainers = with lib.maintainers; [ ericsagnes ]; - doc = ./default.xml; - }; -} - - - - - - maintainers contains a list of the module maintainers. - - - - - doc points to a valid DocBook file containing the module - documentation. Its contents is automatically added to - . Changes to a module documentation - have to be checked to not break building the NixOS manual: - -$ nix-build nixos/release.nix -A manual.x86_64-linux - - -
diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml index ac9617f4ea04..ff59dd074db7 100644 --- a/nixos/doc/manual/development/writing-modules.xml +++ b/nixos/doc/manual/development/writing-modules.xml @@ -183,7 +183,7 @@ in { - + diff --git a/nixos/doc/manual/from_md/development/meta-attributes.section.xml b/nixos/doc/manual/from_md/development/meta-attributes.section.xml new file mode 100644 index 000000000000..f535d94602bd --- /dev/null +++ b/nixos/doc/manual/from_md/development/meta-attributes.section.xml @@ -0,0 +1,55 @@ +
+ Meta Attributes + + Like Nix packages, NixOS modules can declare meta-attributes to + provide extra information. Module meta attributes are defined in the + meta.nix special module. + + + meta is a top level attribute like + options and config. Available + meta-attributes are maintainers and + doc. + + + Each of the meta-attributes must be defined at most once per module + file. + + +{ config, lib, pkgs, ... }: +{ + options = { + ... + }; + + config = { + ... + }; + + meta = { + maintainers = with lib.maintainers; [ ericsagnes ]; + doc = ./default.xml; + }; +} + + + + + maintainers contains a list of the module + maintainers. + + + + + doc points to a valid DocBook file containing + the module documentation. Its contents is automatically added to + . Changes to a module + documentation have to be checked to not break building the NixOS + manual: + + +$ nix-build nixos/release.nix -A manual.x86_64-linux + + + +
From 9afb04f765bba1015314efb723a58ed68c393021 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Jul 2021 22:18:41 +0800 Subject: [PATCH 052/167] nixos: nixos/doc/manual/development/importing-modules.xml to CommonMark --- .../development/importing-modules.section.md | 46 +++++++++++++++ .../manual/development/importing-modules.xml | 56 ------------------- .../manual/development/writing-modules.xml | 2 +- .../development/importing-modules.section.xml | 47 ++++++++++++++++ 4 files changed, 94 insertions(+), 57 deletions(-) create mode 100644 nixos/doc/manual/development/importing-modules.section.md delete mode 100644 nixos/doc/manual/development/importing-modules.xml create mode 100644 nixos/doc/manual/from_md/development/importing-modules.section.xml diff --git a/nixos/doc/manual/development/importing-modules.section.md b/nixos/doc/manual/development/importing-modules.section.md new file mode 100644 index 000000000000..65d78959b8e0 --- /dev/null +++ b/nixos/doc/manual/development/importing-modules.section.md @@ -0,0 +1,46 @@ +# Importing Modules {#sec-importing-modules} + +Sometimes NixOS modules need to be used in configuration but exist +outside of Nixpkgs. These modules can be imported: + +```nix +{ config, lib, pkgs, ... }: + +{ + imports = + [ # Use a locally-available module definition in + # ./example-module/default.nix + ./example-module + ]; + + services.exampleModule.enable = true; +} +``` + +The environment variable `NIXOS_EXTRA_MODULE_PATH` is an absolute path +to a NixOS module that is included alongside the Nixpkgs NixOS modules. +Like any NixOS module, this module can import additional modules: + +```nix +# ./module-list/default.nix +[ + ./example-module1 + ./example-module2 +] +``` + +```nix +# ./extra-module/default.nix +{ imports = import ./module-list.nix; } +``` + +```nix +# NIXOS_EXTRA_MODULE_PATH=/absolute/path/to/extra-module +{ config, lib, pkgs, ... }: + +{ + # No `imports` needed + + services.exampleModule1.enable = true; +} +``` diff --git a/nixos/doc/manual/development/importing-modules.xml b/nixos/doc/manual/development/importing-modules.xml deleted file mode 100644 index 1c6a5671eda8..000000000000 --- a/nixos/doc/manual/development/importing-modules.xml +++ /dev/null @@ -1,56 +0,0 @@ -
- Importing Modules - - - Sometimes NixOS modules need to be used in configuration but exist outside of - Nixpkgs. These modules can be imported: - - - -{ config, lib, pkgs, ... }: - -{ - imports = - [ # Use a locally-available module definition in - # ./example-module/default.nix - ./example-module - ]; - - services.exampleModule.enable = true; -} - - - - The environment variable NIXOS_EXTRA_MODULE_PATH is an - absolute path to a NixOS module that is included alongside the Nixpkgs NixOS - modules. Like any NixOS module, this module can import additional modules: - - - -# ./module-list/default.nix -[ - ./example-module1 - ./example-module2 -] - - - -# ./extra-module/default.nix -{ imports = import ./module-list.nix; } - - - -# NIXOS_EXTRA_MODULE_PATH=/absolute/path/to/extra-module -{ config, lib, pkgs, ... }: - -{ - # No `imports` needed - - services.exampleModule1.enable = true; -} - -
diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml index ff59dd074db7..bb108d183750 100644 --- a/nixos/doc/manual/development/writing-modules.xml +++ b/nixos/doc/manual/development/writing-modules.xml @@ -184,7 +184,7 @@ in { - + diff --git a/nixos/doc/manual/from_md/development/importing-modules.section.xml b/nixos/doc/manual/from_md/development/importing-modules.section.xml new file mode 100644 index 000000000000..cb04dde67c83 --- /dev/null +++ b/nixos/doc/manual/from_md/development/importing-modules.section.xml @@ -0,0 +1,47 @@ +
+ Importing Modules + + Sometimes NixOS modules need to be used in configuration but exist + outside of Nixpkgs. These modules can be imported: + + +{ config, lib, pkgs, ... }: + +{ + imports = + [ # Use a locally-available module definition in + # ./example-module/default.nix + ./example-module + ]; + + services.exampleModule.enable = true; +} + + + The environment variable NIXOS_EXTRA_MODULE_PATH + is an absolute path to a NixOS module that is included alongside the + Nixpkgs NixOS modules. Like any NixOS module, this module can import + additional modules: + + +# ./module-list/default.nix +[ + ./example-module1 + ./example-module2 +] + + +# ./extra-module/default.nix +{ imports = import ./module-list.nix; } + + +# NIXOS_EXTRA_MODULE_PATH=/absolute/path/to/extra-module +{ config, lib, pkgs, ... }: + +{ + # No `imports` needed + + services.exampleModule1.enable = true; +} + +
From a743c6d35a8e59aa8d0d92494c8e00a525a384f8 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Jul 2021 22:19:26 +0800 Subject: [PATCH 053/167] nixos: nixos/doc/manual/development/replace-modules.xml to CommonMark --- .../development/replace-modules.section.md | 64 +++++++++++++++ .../manual/development/replace-modules.xml | 79 ------------------- .../manual/development/writing-modules.xml | 2 +- .../development/replace-modules.section.xml | 70 ++++++++++++++++ 4 files changed, 135 insertions(+), 80 deletions(-) create mode 100644 nixos/doc/manual/development/replace-modules.section.md delete mode 100644 nixos/doc/manual/development/replace-modules.xml create mode 100644 nixos/doc/manual/from_md/development/replace-modules.section.xml diff --git a/nixos/doc/manual/development/replace-modules.section.md b/nixos/doc/manual/development/replace-modules.section.md new file mode 100644 index 000000000000..0700a82004c1 --- /dev/null +++ b/nixos/doc/manual/development/replace-modules.section.md @@ -0,0 +1,64 @@ +# Replace Modules {#sec-replace-modules} + +Modules that are imported can also be disabled. The option declarations, +config implementation and the imports of a disabled module will be +ignored, allowing another to take it\'s place. This can be used to +import a set of modules from another channel while keeping the rest of +the system on a stable release. + +`disabledModules` is a top level attribute like `imports`, `options` and +`config`. It contains a list of modules that will be disabled. This can +either be the full path to the module or a string with the filename +relative to the modules path (eg. \ for nixos). + +This example will replace the existing postgresql module with the +version defined in the nixos-unstable channel while keeping the rest of +the modules and packages from the original nixos channel. This only +overrides the module definition, this won\'t use postgresql from +nixos-unstable unless explicitly configured to do so. + +```nix +{ config, lib, pkgs, ... }: + +{ + disabledModules = [ "services/databases/postgresql.nix" ]; + + imports = + [ # Use postgresql service from nixos-unstable channel. + # sudo nix-channel --add https://nixos.org/channels/nixos-unstable nixos-unstable + + ]; + + services.postgresql.enable = true; +} +``` + +This example shows how to define a custom module as a replacement for an +existing module. Importing this module will disable the original module +without having to know it\'s implementation details. + +```nix +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.man; +in + +{ + disabledModules = [ "services/programs/man.nix" ]; + + options = { + programs.man.enable = mkOption { + type = types.bool; + default = true; + description = "Whether to enable manual pages."; + }; + }; + + config = mkIf cfg.enabled { + warnings = [ "disabled manpages for production deployments." ]; + }; +} +``` diff --git a/nixos/doc/manual/development/replace-modules.xml b/nixos/doc/manual/development/replace-modules.xml deleted file mode 100644 index 9fc5678ca1b3..000000000000 --- a/nixos/doc/manual/development/replace-modules.xml +++ /dev/null @@ -1,79 +0,0 @@ -
- Replace Modules - - - Modules that are imported can also be disabled. The option declarations, - config implementation and the imports of a disabled module will be ignored, allowing another - to take it's place. This can be used to import a set of modules from another - channel while keeping the rest of the system on a stable release. - - - - disabledModules is a top level attribute like - imports, options and - config. It contains a list of modules that will be - disabled. This can either be the full path to the module or a string with the - filename relative to the modules path (eg. <nixpkgs/nixos/modules> for - nixos). - - - - This example will replace the existing postgresql module with the version - defined in the nixos-unstable channel while keeping the rest of the modules - and packages from the original nixos channel. This only overrides the module - definition, this won't use postgresql from nixos-unstable unless explicitly - configured to do so. - - - -{ config, lib, pkgs, ... }: - -{ - disabledModules = [ "services/databases/postgresql.nix" ]; - - imports = - [ # Use postgresql service from nixos-unstable channel. - # sudo nix-channel --add https://nixos.org/channels/nixos-unstable nixos-unstable - <nixos-unstable/nixos/modules/services/databases/postgresql.nix> - ]; - - services.postgresql.enable = true; -} - - - - This example shows how to define a custom module as a replacement for an - existing module. Importing this module will disable the original module - without having to know it's implementation details. - - - -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.programs.man; -in - -{ - disabledModules = [ "services/programs/man.nix" ]; - - options = { - programs.man.enable = mkOption { - type = types.bool; - default = true; - description = "Whether to enable manual pages."; - }; - }; - - config = mkIf cfg.enabled { - warnings = [ "disabled manpages for production deployments." ]; - }; -} - -
diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml index bb108d183750..7cf7c9b62994 100644 --- a/nixos/doc/manual/development/writing-modules.xml +++ b/nixos/doc/manual/development/writing-modules.xml @@ -185,7 +185,7 @@ in { - + diff --git a/nixos/doc/manual/from_md/development/replace-modules.section.xml b/nixos/doc/manual/from_md/development/replace-modules.section.xml new file mode 100644 index 000000000000..cf8a39ba844f --- /dev/null +++ b/nixos/doc/manual/from_md/development/replace-modules.section.xml @@ -0,0 +1,70 @@ +
+ Replace Modules + + Modules that are imported can also be disabled. The option + declarations, config implementation and the imports of a disabled + module will be ignored, allowing another to take it's place. This + can be used to import a set of modules from another channel while + keeping the rest of the system on a stable release. + + + disabledModules is a top level attribute like + imports, options and + config. It contains a list of modules that will + be disabled. This can either be the full path to the module or a + string with the filename relative to the modules path (eg. + <nixpkgs/nixos/modules> for nixos). + + + This example will replace the existing postgresql module with the + version defined in the nixos-unstable channel while keeping the rest + of the modules and packages from the original nixos channel. This + only overrides the module definition, this won't use postgresql from + nixos-unstable unless explicitly configured to do so. + + +{ config, lib, pkgs, ... }: + +{ + disabledModules = [ "services/databases/postgresql.nix" ]; + + imports = + [ # Use postgresql service from nixos-unstable channel. + # sudo nix-channel --add https://nixos.org/channels/nixos-unstable nixos-unstable + <nixos-unstable/nixos/modules/services/databases/postgresql.nix> + ]; + + services.postgresql.enable = true; +} + + + This example shows how to define a custom module as a replacement + for an existing module. Importing this module will disable the + original module without having to know it's implementation details. + + +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.man; +in + +{ + disabledModules = [ "services/programs/man.nix" ]; + + options = { + programs.man.enable = mkOption { + type = types.bool; + default = true; + description = "Whether to enable manual pages."; + }; + }; + + config = mkIf cfg.enabled { + warnings = [ "disabled manpages for production deployments." ]; + }; +} + +
From 31be0b922d921fee8b7f81d8de2fb9f0c9ccbc3d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Jul 2021 22:19:55 +0800 Subject: [PATCH 054/167] nixos: nixos/doc/manual/development/freeform-modules.xml to CommonMark --- .../development/freeform-modules.section.md | 79 +++++++++++++++++ .../manual/development/freeform-modules.xml | 68 --------------- .../development/freeform-modules.section.xml | 87 +++++++++++++++++++ 3 files changed, 166 insertions(+), 68 deletions(-) create mode 100644 nixos/doc/manual/development/freeform-modules.section.md delete mode 100644 nixos/doc/manual/development/freeform-modules.xml create mode 100644 nixos/doc/manual/from_md/development/freeform-modules.section.xml diff --git a/nixos/doc/manual/development/freeform-modules.section.md b/nixos/doc/manual/development/freeform-modules.section.md new file mode 100644 index 000000000000..10e876b96d59 --- /dev/null +++ b/nixos/doc/manual/development/freeform-modules.section.md @@ -0,0 +1,79 @@ +# Freeform modules {#sec-freeform-modules} + +Freeform modules allow you to define values for option paths that have +not been declared explicitly. This can be used to add attribute-specific +types to what would otherwise have to be `attrsOf` options in order to +accept all attribute names. + +This feature can be enabled by using the attribute `freeformType` to +define a freeform type. By doing this, all assignments without an +associated option will be merged using the freeform type and combined +into the resulting `config` set. Since this feature nullifies name +checking for entire option trees, it is only recommended for use in +submodules. + +::: {#ex-freeform-module .example} +::: {.title} +**Example: Freeform submodule** +::: +The following shows a submodule assigning a freeform type that allows +arbitrary attributes with `str` values below `settings`, but also +declares an option for the `settings.port` attribute to have it +type-checked and assign a default value. See +[Example: Declaring a type-checked `settings` attribute](#ex-settings-typed-attrs) +for a more complete example. + +```nix +{ lib, config, ... }: { + + options.settings = lib.mkOption { + type = lib.types.submodule { + + freeformType = with lib.types; attrsOf str; + + # We want this attribute to be checked for the correct type + options.port = lib.mkOption { + type = lib.types.port; + # Declaring the option also allows defining a default value + default = 8080; + }; + + }; + }; +} +``` + +And the following shows what such a module then allows + +```nix +{ + # Not a declared option, but the freeform type allows this + settings.logLevel = "debug"; + + # Not allowed because the the freeform type only allows strings + # settings.enable = true; + + # Allowed because there is a port option declared + settings.port = 80; + + # Not allowed because the port option doesn't allow strings + # settings.port = "443"; +} +``` +::: + +::: {.note} +Freeform attributes cannot depend on other attributes of the same set +without infinite recursion: + +```nix +{ + # This throws infinite recursion encountered + settings.logLevel = lib.mkIf (config.settings.port == 80) "debug"; +} +``` + +To prevent this, declare options for all attributes that need to depend +on others. For above example this means to declare `logLevel` to be an +option. +::: diff --git a/nixos/doc/manual/development/freeform-modules.xml b/nixos/doc/manual/development/freeform-modules.xml deleted file mode 100644 index 257e6b11bf01..000000000000 --- a/nixos/doc/manual/development/freeform-modules.xml +++ /dev/null @@ -1,68 +0,0 @@ -
- Freeform modules - - Freeform modules allow you to define values for option paths that have not been declared explicitly. This can be used to add attribute-specific types to what would otherwise have to be attrsOf options in order to accept all attribute names. - - - This feature can be enabled by using the attribute freeformType to define a freeform type. By doing this, all assignments without an associated option will be merged using the freeform type and combined into the resulting config set. Since this feature nullifies name checking for entire option trees, it is only recommended for use in submodules. - - - Freeform submodule - - The following shows a submodule assigning a freeform type that allows arbitrary attributes with str values below settings, but also declares an option for the settings.port attribute to have it type-checked and assign a default value. See for a more complete example. - - -{ lib, config, ... }: { - - options.settings = lib.mkOption { - type = lib.types.submodule { - - freeformType = with lib.types; attrsOf str; - - # We want this attribute to be checked for the correct type - options.port = lib.mkOption { - type = lib.types.port; - # Declaring the option also allows defining a default value - default = 8080; - }; - - }; - }; -} - - - And the following shows what such a module then allows - - -{ - # Not a declared option, but the freeform type allows this - settings.logLevel = "debug"; - - # Not allowed because the the freeform type only allows strings - # settings.enable = true; - - # Allowed because there is a port option declared - settings.port = 80; - - # Not allowed because the port option doesn't allow strings - # settings.port = "443"; -} - - - - - Freeform attributes cannot depend on other attributes of the same set without infinite recursion: - -{ - # This throws infinite recursion encountered - settings.logLevel = lib.mkIf (config.settings.port == 80) "debug"; -} - - To prevent this, declare options for all attributes that need to depend on others. For above example this means to declare logLevel to be an option. - - -
diff --git a/nixos/doc/manual/from_md/development/freeform-modules.section.xml b/nixos/doc/manual/from_md/development/freeform-modules.section.xml new file mode 100644 index 000000000000..86a9cf3140d8 --- /dev/null +++ b/nixos/doc/manual/from_md/development/freeform-modules.section.xml @@ -0,0 +1,87 @@ +
+ Freeform modules + + Freeform modules allow you to define values for option paths that + have not been declared explicitly. This can be used to add + attribute-specific types to what would otherwise have to be + attrsOf options in order to accept all attribute + names. + + + This feature can be enabled by using the attribute + freeformType to define a freeform type. By doing + this, all assignments without an associated option will be merged + using the freeform type and combined into the resulting + config set. Since this feature nullifies name + checking for entire option trees, it is only recommended for use in + submodules. + + + + Example: Freeform submodule + + + The following shows a submodule assigning a freeform type that + allows arbitrary attributes with str values below + settings, but also declares an option for the + settings.port attribute to have it type-checked + and assign a default value. See + Example: Declaring a + type-checked settings attribute for a more + complete example. + + +{ lib, config, ... }: { + + options.settings = lib.mkOption { + type = lib.types.submodule { + + freeformType = with lib.types; attrsOf str; + + # We want this attribute to be checked for the correct type + options.port = lib.mkOption { + type = lib.types.port; + # Declaring the option also allows defining a default value + default = 8080; + }; + + }; + }; +} + + + And the following shows what such a module then allows + + +{ + # Not a declared option, but the freeform type allows this + settings.logLevel = "debug"; + + # Not allowed because the the freeform type only allows strings + # settings.enable = true; + + # Allowed because there is a port option declared + settings.port = 80; + + # Not allowed because the port option doesn't allow strings + # settings.port = "443"; +} + + + + Freeform attributes cannot depend on other attributes of the same + set without infinite recursion: + + +{ + # This throws infinite recursion encountered + settings.logLevel = lib.mkIf (config.settings.port == 80) "debug"; +} + + + To prevent this, declare options for all attributes that need to + depend on others. For above example this means to declare + logLevel to be an option. + + +
From 165d6bd20c478c8c4f201c26eaa4c62e3c1b87ce Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Jul 2021 22:20:26 +0800 Subject: [PATCH 055/167] nixos: nixos/doc/manual/development/settings-options.xml to CommonMark --- .../development/settings-options.section.md | 192 ++++++++++++ .../manual/development/settings-options.xml | 226 -------------- .../manual/development/writing-modules.xml | 4 +- .../development/settings-options.section.xml | 285 ++++++++++++++++++ 4 files changed, 479 insertions(+), 228 deletions(-) create mode 100644 nixos/doc/manual/development/settings-options.section.md delete mode 100644 nixos/doc/manual/development/settings-options.xml create mode 100644 nixos/doc/manual/from_md/development/settings-options.section.xml diff --git a/nixos/doc/manual/development/settings-options.section.md b/nixos/doc/manual/development/settings-options.section.md new file mode 100644 index 000000000000..58a3d8448af5 --- /dev/null +++ b/nixos/doc/manual/development/settings-options.section.md @@ -0,0 +1,192 @@ +# Options for Program Settings {#sec-settings-options} + +Many programs have configuration files where program-specific settings +can be declared. File formats can be separated into two categories: + +- Nix-representable ones: These can trivially be mapped to a subset of + Nix syntax. E.g. JSON is an example, since its values like + `{"foo":{"bar":10}}` can be mapped directly to Nix: + `{ foo = { bar = 10; }; }`. Other examples are INI, YAML and TOML. + The following section explains the convention for these settings. + +- Non-nix-representable ones: These can\'t be trivially mapped to a + subset of Nix syntax. Most generic programming languages are in this + group, e.g. bash, since the statement `if true; then echo hi; fi` + doesn\'t have a trivial representation in Nix. + + Currently there are no fixed conventions for these, but it is common + to have a `configFile` option for setting the configuration file + path directly. The default value of `configFile` can be an + auto-generated file, with convenient options for controlling the + contents. For example an option of type `attrsOf str` can be used + for representing environment variables which generates a section + like `export FOO="foo"`. Often it can also be useful to also include + an `extraConfig` option of type `lines` to allow arbitrary text + after the autogenerated part of the file. + +## Nix-representable Formats (JSON, YAML, TOML, INI, \...) {#sec-settings-nix-representable} + +By convention, formats like this are handled with a generic `settings` +option, representing the full program configuration as a Nix value. The +type of this option should represent the format. The most common formats +have a predefined type and string generator already declared under +`pkgs.formats`: + +`pkgs.formats.json` { } + +: A function taking an empty attribute set (for future extensibility) + and returning a set with JSON-specific attributes `type` and + `generate` as specified [below](#pkgs-formats-result). + +`pkgs.formats.yaml` { } + +: A function taking an empty attribute set (for future extensibility) + and returning a set with YAML-specific attributes `type` and + `generate` as specified [below](#pkgs-formats-result). + +`pkgs.formats.ini` { *`listsAsDuplicateKeys`* ? false, *`listToValue`* ? null, \... } + +: A function taking an attribute set with values + + `listsAsDuplicateKeys` + + : A boolean for controlling whether list values can be used to + represent duplicate INI keys + + `listToValue` + + : A function for turning a list of values into a single value. + + It returns a set with INI-specific attributes `type` and `generate` + as specified [below](#pkgs-formats-result). + +`pkgs.formats.toml` { } + +: A function taking an empty attribute set (for future extensibility) + and returning a set with TOML-specific attributes `type` and + `generate` as specified [below](#pkgs-formats-result). + +::: {#pkgs-formats-result} +These functions all return an attribute set with these values: +::: + +`type` + +: A module system type representing a value of the format + +`generate` *`filename jsonValue`* + +: A function that can render a value of the format to a file. Returns + a file path. + + ::: {.note} + This function puts the value contents in the Nix store. So this + should be avoided for secrets. + ::: + +::: {#ex-settings-nix-representable .example} +::: {.title} +**Example: Module with conventional `settings` option** +::: +The following shows a module for an example program that uses a JSON +configuration file. It demonstrates how above values can be used, along +with some other related best practices. See the comments for +explanations. + +```nix +{ options, config, lib, pkgs, ... }: +let + cfg = config.services.foo; + # Define the settings format used for this program + settingsFormat = pkgs.formats.json {}; +in { + + options.services.foo = { + enable = lib.mkEnableOption "foo service"; + + settings = lib.mkOption { + # Setting this type allows for correct merging behavior + type = settingsFormat.type; + default = {}; + description = '' + Configuration for foo, see + + for supported settings. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + # We can assign some default settings here to make the service work by just + # enabling it. We use `mkDefault` for values that can be changed without + # problems + services.foo.settings = { + # Fails at runtime without any value set + log_level = lib.mkDefault "WARN"; + + # We assume systemd's `StateDirectory` is used, so we require this value, + # therefore no mkDefault + data_path = "/var/lib/foo"; + + # Since we use this to create a user we need to know the default value at + # eval time + user = lib.mkDefault "foo"; + }; + + environment.etc."foo.json".source = + # The formats generator function takes a filename and the Nix value + # representing the format value and produces a filepath with that value + # rendered in the format + settingsFormat.generate "foo-config.json" cfg.settings; + + # We know that the `user` attribute exists because we set a default value + # for it above, allowing us to use it without worries here + users.users.${cfg.settings.user} = { isSystemUser = true; }; + + # ... + }; +} +``` +::: + +### Option declarations for attributes {#sec-settings-attrs-options} + +Some `settings` attributes may deserve some extra care. They may need a +different type, default or merging behavior, or they are essential +options that should show their documentation in the manual. This can be +done using [](#sec-freeform-modules). + +We extend above example using freeform modules to declare an option for +the port, which will enforce it to be a valid integer and make it show +up in the manual. + +::: {#ex-settings-typed-attrs .example} +::: {.title} +**Example: Declaring a type-checked `settings` attribute** +::: +```nix +settings = lib.mkOption { + type = lib.types.submodule { + + freeformType = settingsFormat.type; + + # Declare an option for the port such that the type is checked and this option + # is shown in the manual. + options.port = lib.mkOption { + type = lib.types.port; + default = 8080; + description = '' + Which port this service should listen on. + ''; + }; + + }; + default = {}; + description = '' + Configuration for Foo, see + + for supported values. + ''; +}; +``` +::: diff --git a/nixos/doc/manual/development/settings-options.xml b/nixos/doc/manual/development/settings-options.xml deleted file mode 100644 index 7292cac62b70..000000000000 --- a/nixos/doc/manual/development/settings-options.xml +++ /dev/null @@ -1,226 +0,0 @@ -
- Options for Program Settings - - - Many programs have configuration files where program-specific settings can be declared. File formats can be separated into two categories: - - - - Nix-representable ones: These can trivially be mapped to a subset of Nix syntax. E.g. JSON is an example, since its values like {"foo":{"bar":10}} can be mapped directly to Nix: { foo = { bar = 10; }; }. Other examples are INI, YAML and TOML. The following section explains the convention for these settings. - - - - - Non-nix-representable ones: These can't be trivially mapped to a subset of Nix syntax. Most generic programming languages are in this group, e.g. bash, since the statement if true; then echo hi; fi doesn't have a trivial representation in Nix. - - - Currently there are no fixed conventions for these, but it is common to have a configFile option for setting the configuration file path directly. The default value of configFile can be an auto-generated file, with convenient options for controlling the contents. For example an option of type attrsOf str can be used for representing environment variables which generates a section like export FOO="foo". Often it can also be useful to also include an extraConfig option of type lines to allow arbitrary text after the autogenerated part of the file. - - - - -
- Nix-representable Formats (JSON, YAML, TOML, INI, ...) - - By convention, formats like this are handled with a generic settings option, representing the full program configuration as a Nix value. The type of this option should represent the format. The most common formats have a predefined type and string generator already declared under pkgs.formats: - - - - pkgs.formats.json { } - - - - A function taking an empty attribute set (for future extensibility) and returning a set with JSON-specific attributes type and generate as specified below. - - - - - - pkgs.formats.yaml { } - - - - A function taking an empty attribute set (for future extensibility) and returning a set with YAML-specific attributes type and generate as specified below. - - - - - - pkgs.formats.ini { listsAsDuplicateKeys ? false, listToValue ? null, ... } - - - - A function taking an attribute set with values - - - - listsAsDuplicateKeys - - - - A boolean for controlling whether list values can be used to represent duplicate INI keys - - - - - - listToValue - - - - A function for turning a list of values into a single value. - - - - - It returns a set with INI-specific attributes type and generate as specified below. - - - - - - pkgs.formats.toml { } - - - - A function taking an empty attribute set (for future extensibility) and returning a set with TOML-specific attributes type and generate as specified below. - - - - - - - - These functions all return an attribute set with these values: - - - - type - - - - A module system type representing a value of the format - - - - - - generate filename jsonValue - - - - A function that can render a value of the format to a file. Returns a file path. - - - This function puts the value contents in the Nix store. So this should be avoided for secrets. - - - - - - - - - Module with conventional <literal>settings</literal> option - - The following shows a module for an example program that uses a JSON configuration file. It demonstrates how above values can be used, along with some other related best practices. See the comments for explanations. - - -{ options, config, lib, pkgs, ... }: -let - cfg = config.services.foo; - # Define the settings format used for this program - settingsFormat = pkgs.formats.json {}; -in { - - options.services.foo = { - enable = lib.mkEnableOption "foo service"; - - settings = lib.mkOption { - # Setting this type allows for correct merging behavior - type = settingsFormat.type; - default = {}; - description = '' - Configuration for foo, see - <link xlink:href="https://example.com/docs/foo"/> - for supported settings. - ''; - }; - }; - - config = lib.mkIf cfg.enable { - # We can assign some default settings here to make the service work by just - # enabling it. We use `mkDefault` for values that can be changed without - # problems - services.foo.settings = { - # Fails at runtime without any value set - log_level = lib.mkDefault "WARN"; - - # We assume systemd's `StateDirectory` is used, so we require this value, - # therefore no mkDefault - data_path = "/var/lib/foo"; - - # Since we use this to create a user we need to know the default value at - # eval time - user = lib.mkDefault "foo"; - }; - - environment.etc."foo.json".source = - # The formats generator function takes a filename and the Nix value - # representing the format value and produces a filepath with that value - # rendered in the format - settingsFormat.generate "foo-config.json" cfg.settings; - - # We know that the `user` attribute exists because we set a default value - # for it above, allowing us to use it without worries here - users.users.${cfg.settings.user} = { isSystemUser = true; }; - - # ... - }; -} - - -
- Option declarations for attributes - - Some settings attributes may deserve some extra care. They may need a different type, default or merging behavior, or they are essential options that should show their documentation in the manual. This can be done using . - - Declaring a type-checked <literal>settings</literal> attribute - - We extend above example using freeform modules to declare an option for the port, which will enforce it to be a valid integer and make it show up in the manual. - - -settings = lib.mkOption { - type = lib.types.submodule { - - freeformType = settingsFormat.type; - - # Declare an option for the port such that the type is checked and this option - # is shown in the manual. - options.port = lib.mkOption { - type = lib.types.port; - default = 8080; - description = '' - Which port this service should listen on. - ''; - }; - - }; - default = {}; - description = '' - Configuration for Foo, see - <link xlink:href="https://example.com/docs/foo"/> - for supported values. - ''; -}; - - - -
-
- -
diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml index 7cf7c9b62994..167976247091 100644 --- a/nixos/doc/manual/development/writing-modules.xml +++ b/nixos/doc/manual/development/writing-modules.xml @@ -186,6 +186,6 @@ in { - - + + diff --git a/nixos/doc/manual/from_md/development/settings-options.section.xml b/nixos/doc/manual/from_md/development/settings-options.section.xml new file mode 100644 index 000000000000..c9430b77579c --- /dev/null +++ b/nixos/doc/manual/from_md/development/settings-options.section.xml @@ -0,0 +1,285 @@ +
+ Options for Program Settings + + Many programs have configuration files where program-specific + settings can be declared. File formats can be separated into two + categories: + + + + + Nix-representable ones: These can trivially be mapped to a + subset of Nix syntax. E.g. JSON is an example, since its values + like {"foo":{"bar":10}} + can be mapped directly to Nix: + { foo = { bar = 10; }; }. Other examples are + INI, YAML and TOML. The following section explains the + convention for these settings. + + + + + Non-nix-representable ones: These can't be trivially mapped to a + subset of Nix syntax. Most generic programming languages are in + this group, e.g. bash, since the statement + if true; then echo hi; fi doesn't have a + trivial representation in Nix. + + + Currently there are no fixed conventions for these, but it is + common to have a configFile option for + setting the configuration file path directly. The default value + of configFile can be an auto-generated file, + with convenient options for controlling the contents. For + example an option of type attrsOf str can be + used for representing environment variables which generates a + section like export FOO="foo". + Often it can also be useful to also include an + extraConfig option of type + lines to allow arbitrary text after the + autogenerated part of the file. + + + +
+ Nix-representable Formats (JSON, YAML, TOML, INI, + ...) + + By convention, formats like this are handled with a generic + settings option, representing the full program + configuration as a Nix value. The type of this option should + represent the format. The most common formats have a predefined + type and string generator already declared under + pkgs.formats: + + + + + pkgs.formats.json { } + + + + A function taking an empty attribute set (for future + extensibility) and returning a set with JSON-specific + attributes type and + generate as specified + below. + + + + + + pkgs.formats.yaml { } + + + + A function taking an empty attribute set (for future + extensibility) and returning a set with YAML-specific + attributes type and + generate as specified + below. + + + + + + pkgs.formats.ini { + listsAsDuplicateKeys ? + false, listToValue ? + null, ... } + + + + A function taking an attribute set with values + + + + + listsAsDuplicateKeys + + + + A boolean for controlling whether list values can be + used to represent duplicate INI keys + + + + + + listToValue + + + + A function for turning a list of values into a single + value. + + + + + + It returns a set with INI-specific attributes + type and generate as + specified below. + + + + + + pkgs.formats.toml { } + + + + A function taking an empty attribute set (for future + extensibility) and returning a set with TOML-specific + attributes type and + generate as specified + below. + + + + + + These functions all return an attribute set with these values: + + + + + type + + + + A module system type representing a value of the format + + + + + + generate + filename jsonValue + + + + A function that can render a value of the format to a file. + Returns a file path. + + + + This function puts the value contents in the Nix store. So + this should be avoided for secrets. + + + + + + + + Example: Module with conventional + settings option + + + The following shows a module for an example program that uses a + JSON configuration file. It demonstrates how above values can be + used, along with some other related best practices. See the + comments for explanations. + + +{ options, config, lib, pkgs, ... }: +let + cfg = config.services.foo; + # Define the settings format used for this program + settingsFormat = pkgs.formats.json {}; +in { + + options.services.foo = { + enable = lib.mkEnableOption "foo service"; + + settings = lib.mkOption { + # Setting this type allows for correct merging behavior + type = settingsFormat.type; + default = {}; + description = '' + Configuration for foo, see + <link xlink:href="https://example.com/docs/foo"/> + for supported settings. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + # We can assign some default settings here to make the service work by just + # enabling it. We use `mkDefault` for values that can be changed without + # problems + services.foo.settings = { + # Fails at runtime without any value set + log_level = lib.mkDefault "WARN"; + + # We assume systemd's `StateDirectory` is used, so we require this value, + # therefore no mkDefault + data_path = "/var/lib/foo"; + + # Since we use this to create a user we need to know the default value at + # eval time + user = lib.mkDefault "foo"; + }; + + environment.etc."foo.json".source = + # The formats generator function takes a filename and the Nix value + # representing the format value and produces a filepath with that value + # rendered in the format + settingsFormat.generate "foo-config.json" cfg.settings; + + # We know that the `user` attribute exists because we set a default value + # for it above, allowing us to use it without worries here + users.users.${cfg.settings.user} = { isSystemUser = true; }; + + # ... + }; +} + +
+ Option declarations for attributes + + Some settings attributes may deserve some + extra care. They may need a different type, default or merging + behavior, or they are essential options that should show their + documentation in the manual. This can be done using + . + + + We extend above example using freeform modules to declare an + option for the port, which will enforce it to be a valid integer + and make it show up in the manual. + + + + Example: Declaring a type-checked + settings attribute + + +settings = lib.mkOption { + type = lib.types.submodule { + + freeformType = settingsFormat.type; + + # Declare an option for the port such that the type is checked and this option + # is shown in the manual. + options.port = lib.mkOption { + type = lib.types.port; + default = 8080; + description = '' + Which port this service should listen on. + ''; + }; + + }; + default = {}; + description = '' + Configuration for Foo, see + <link xlink:href="https://example.com/docs/foo"/> + for supported values. + ''; +}; + +
+
+
From 9f7f6d225672bf05e714498dc6eaa68bd0800b69 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Jul 2021 23:15:08 +0800 Subject: [PATCH 056/167] nixos: nixos/doc/manual/administration typo fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jörg Thalheim --- .../manual/administration/rebooting.chapter.md | 5 ++--- .../manual/administration/service-mgmt.chapter.md | 11 ++++++----- .../administration/service-mgmt.chapter.xml | 15 ++++++++------- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/nixos/doc/manual/administration/rebooting.chapter.md b/nixos/doc/manual/administration/rebooting.chapter.md index 7a16a3a4ce5c..ec4b889b1648 100644 --- a/nixos/doc/manual/administration/rebooting.chapter.md +++ b/nixos/doc/manual/administration/rebooting.chapter.md @@ -22,9 +22,8 @@ directly loading the new kernel into memory: # systemctl kexec ``` -The machine can be suspended to RAM (if supported) using `systemctl - suspend`, and suspended to disk using `systemctl - hibernate`. +The machine can be suspended to RAM (if supported) using `systemctl suspend`, +and suspended to disk using `systemctl hibernate`. These commands can be run by any user who is logged in locally, i.e. on a virtual console or in X11; otherwise, the user is asked for diff --git a/nixos/doc/manual/administration/service-mgmt.chapter.md b/nixos/doc/manual/administration/service-mgmt.chapter.md index ba5c4cf15d54..ccf61c929ed1 100644 --- a/nixos/doc/manual/administration/service-mgmt.chapter.md +++ b/nixos/doc/manual/administration/service-mgmt.chapter.md @@ -20,7 +20,7 @@ systemd as init system. NixOS is of no exception. The [next section ](#sect-nixos-systemd-nixos) explains NixOS specific things worth knowing. -Without any arguments, `systmctl` the status of active units: +Without any arguments, `systemctl` the status of active units: ```ShellSession $ systemctl @@ -96,12 +96,13 @@ the service on boot. *User* systemd services on the other hand, should be treated differently. Given a package that has a systemd unit file at -`#pkg-out#/lib/systemd/user/`, using [](#opt-systemd.packages) will +`#pkg-out#/lib/systemd/user/`, using +[`systemd.packages`](options.html#opt-systemd.packages) will make you able to start the service via `systemctl --user start`, but it won\'t start automatically on login. However, You can imperatively -enable it by adding the package\'s attribute to [ -`systemd.packages`](#opt-environment.systemPackages) and then do this -(e.g): +enable it by adding the package\'s attribute to +[`systemd.packages`](options.html#opt-systemd.packages) +and then do this (e.g): ```ShellSession $ mkdir -p ~/.config/systemd/user/default.target.wants diff --git a/nixos/doc/manual/from_md/administration/service-mgmt.chapter.xml b/nixos/doc/manual/from_md/administration/service-mgmt.chapter.xml index 0e1fceb50d07..68dc45f3f88a 100644 --- a/nixos/doc/manual/from_md/administration/service-mgmt.chapter.xml +++ b/nixos/doc/manual/from_md/administration/service-mgmt.chapter.xml @@ -25,7 +25,7 @@ explains NixOS specific things worth knowing. - Without any arguments, systmctl the status of + Without any arguments, systemctl the status of active units: @@ -109,12 +109,13 @@ systemd.packages = [ pkgs.packagekit ]; User systemd services on the other hand, should be treated differently. Given a package that has a systemd unit file at #pkg-out#/lib/systemd/user/, using - will make you able to - start the service via systemctl --user start, - but it won't start automatically on login. However, You can - imperatively enable it by adding the package's attribute to - - systemd.packages and then do this (e.g): + systemd.packages + will make you able to start the service via + systemctl --user start, but it won't start + automatically on login. However, You can imperatively enable it by + adding the package's attribute to + systemd.packages + and then do this (e.g): $ mkdir -p ~/.config/systemd/user/default.target.wants From e7c482f78974407d0a110959ef4bc89a4bcc2e50 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 4 Jul 2021 00:09:05 +0800 Subject: [PATCH 057/167] nixos: nixos/doc/manual/installation/obtaining.xml to CommonMark --- .../installation/obtaining.chapter.xml | 48 +++++++++++++++++ .../doc/manual/installation/installation.xml | 2 +- .../manual/installation/obtaining.chapter.md | 26 +++++++++ nixos/doc/manual/installation/obtaining.xml | 54 ------------------- 4 files changed, 75 insertions(+), 55 deletions(-) create mode 100644 nixos/doc/manual/from_md/installation/obtaining.chapter.xml create mode 100644 nixos/doc/manual/installation/obtaining.chapter.md delete mode 100644 nixos/doc/manual/installation/obtaining.xml diff --git a/nixos/doc/manual/from_md/installation/obtaining.chapter.xml b/nixos/doc/manual/from_md/installation/obtaining.chapter.xml new file mode 100644 index 000000000000..a922feda2536 --- /dev/null +++ b/nixos/doc/manual/from_md/installation/obtaining.chapter.xml @@ -0,0 +1,48 @@ + + 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. + + + 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. + + + + + 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 NixOps, the NixOS-based cloud deployment tool, which + allows you to provision VirtualBox and EC2 NixOS instances from + declarative specifications. Check out the + NixOps + homepage for details. + + + + diff --git a/nixos/doc/manual/installation/installation.xml b/nixos/doc/manual/installation/installation.xml index 2901f462dee0..98dbc6d74fdc 100644 --- a/nixos/doc/manual/installation/installation.xml +++ b/nixos/doc/manual/installation/installation.xml @@ -10,7 +10,7 @@ first-time use. - + diff --git a/nixos/doc/manual/installation/obtaining.chapter.md b/nixos/doc/manual/installation/obtaining.chapter.md new file mode 100644 index 000000000000..832ec6146a9d --- /dev/null +++ b/nixos/doc/manual/installation/obtaining.chapter.md @@ -0,0 +1,26 @@ +# 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). + +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). + +- 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 NixOps, the NixOS-based cloud deployment tool, which allows + you to provision VirtualBox and EC2 NixOS instances from declarative + specifications. Check out the [NixOps + homepage](https://nixos.org/nixops) for details. diff --git a/nixos/doc/manual/installation/obtaining.xml b/nixos/doc/manual/installation/obtaining.xml deleted file mode 100644 index 3b8671782ded..000000000000 --- a/nixos/doc/manual/installation/obtaining.xml +++ /dev/null @@ -1,54 +0,0 @@ - - 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. - - - 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. - - - - - 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 NixOps, the NixOS-based cloud deployment tool, which allows you to - provision VirtualBox and EC2 NixOS instances from declarative - specifications. Check out the - NixOps homepage for - details. - - - - - From b85403368f4a27416961a443bf39fd41871c55c9 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 4 Jul 2021 00:09:43 +0800 Subject: [PATCH 058/167] nixos: nixos/doc/manual/installation/changing-config.xml to CommonMark --- .../installation/changing-config.chapter.xml | 117 ++++++++++++++++++ .../installation/changing-config.chapter.md | 100 +++++++++++++++ .../manual/installation/changing-config.xml | 97 --------------- .../doc/manual/installation/installation.xml | 2 +- 4 files changed, 218 insertions(+), 98 deletions(-) create mode 100644 nixos/doc/manual/from_md/installation/changing-config.chapter.xml create mode 100644 nixos/doc/manual/installation/changing-config.chapter.md delete mode 100644 nixos/doc/manual/installation/changing-config.xml diff --git a/nixos/doc/manual/from_md/installation/changing-config.chapter.xml b/nixos/doc/manual/from_md/installation/changing-config.chapter.xml new file mode 100644 index 000000000000..c88fc6bbdafb --- /dev/null +++ b/nixos/doc/manual/from_md/installation/changing-config.chapter.xml @@ -0,0 +1,117 @@ + + Changing the Configuration + + The file /etc/nixos/configuration.nix contains + the current configuration of your machine. Whenever you’ve + changed something in that + file, you should do + + +# nixos-rebuild switch + + + to build the new configuration, make it the default configuration + for booting, and try to realise the configuration in the running + system (e.g., by restarting system services). + + + + This command doesn't start/stop + user + services automatically. nixos-rebuild + only runs a daemon-reload for each user with + running user services. + + + + + These commands must be executed as root, so you should either run + them from a root shell or by prefixing them with + sudo -i. + + + + You can also do + + +# nixos-rebuild test + + + to build the configuration and switch the running system to it, but + without making it the boot default. So if (say) the configuration + locks up your machine, you can just reboot to get back to a working + configuration. + + + There is also + + +# nixos-rebuild boot + + + to build the configuration and make it the boot default, but not + switch to it now (so it will only take effect after the next + reboot). + + + You can make your configuration show up in a different submenu of + the GRUB 2 boot screen by giving it a different profile + name, e.g. + + +# nixos-rebuild switch -p test + + + which causes the new configuration (and previous ones created using + -p test) to show up in the GRUB submenu + NixOS - Profile 'test'. This can be useful to + separate test configurations from stable + configurations. + + + Finally, you can do + + +$ nixos-rebuild build + + + to build the configuration but nothing more. This is useful to see + whether everything compiles cleanly. + + + If you have a machine that supports hardware virtualisation, you can + also test the new configuration in a sandbox by building and running + a QEMU virtual machine that contains the + desired configuration. Just do + + +$ nixos-rebuild build-vm +$ ./result/bin/run-*-vm + + + The VM does not have any data from your host system, so your + existing user accounts and home directories will not be available + unless you have set mutableUsers = false. Another + way is to temporarily add the following to your configuration: + + +users.users.your-user.initialHashedPassword = "test"; + + + Important: delete the $hostname.qcow2 file if + you have started the virtual machine at least once without the right + users, otherwise the changes will not get picked up. You can forward + ports on the host to the guest. For instance, the following will + forward host port 2222 to guest port 22 (SSH): + + +$ QEMU_NET_OPTS="hostfwd=tcp::2222-:22" ./result/bin/run-*-vm + + + allowing you to log in via SSH (assuming you have set the + appropriate passwords or SSH authorized keys): + + +$ ssh -p 2222 localhost + + diff --git a/nixos/doc/manual/installation/changing-config.chapter.md b/nixos/doc/manual/installation/changing-config.chapter.md new file mode 100644 index 000000000000..4ed6859ce246 --- /dev/null +++ b/nixos/doc/manual/installation/changing-config.chapter.md @@ -0,0 +1,100 @@ +# Changing the Configuration {#sec-changing-config} + +The file `/etc/nixos/configuration.nix` contains the current +configuration of your machine. Whenever you've [changed +something](#ch-configuration) in that file, you should do + +```ShellSession +# nixos-rebuild switch +``` + +to build the new configuration, make it the default configuration for +booting, and try to realise the configuration in the running system +(e.g., by restarting system services). + +::: {.warning} +This command doesn\'t start/stop [user services](options.html#opt-systemd.user.services) +automatically. `nixos-rebuild` only runs a `daemon-reload` for each user with running +user services. +::: + +::: {.warning} +These commands must be executed as root, so you should either run them +from a root shell or by prefixing them with `sudo -i`. +::: + +You can also do + +```ShellSession +# nixos-rebuild test +``` + +to build the configuration and switch the running system to it, but +without making it the boot default. So if (say) the configuration locks +up your machine, you can just reboot to get back to a working +configuration. + +There is also + +```ShellSession +# nixos-rebuild boot +``` + +to build the configuration and make it the boot default, but not switch +to it now (so it will only take effect after the next reboot). + +You can make your configuration show up in a different submenu of the +GRUB 2 boot screen by giving it a different *profile name*, e.g. + +```ShellSession +# nixos-rebuild switch -p test +``` + +which causes the new configuration (and previous ones created using +`-p test`) to show up in the GRUB submenu "NixOS - Profile \'test\'". +This can be useful to separate test configurations from "stable" +configurations. + +Finally, you can do + +```ShellSession +$ nixos-rebuild build +``` + +to build the configuration but nothing more. This is useful to see +whether everything compiles cleanly. + +If you have a machine that supports hardware virtualisation, you can +also test the new configuration in a sandbox by building and running a +QEMU *virtual machine* that contains the desired configuration. Just do + +```ShellSession +$ nixos-rebuild build-vm +$ ./result/bin/run-*-vm +``` + +The VM does not have any data from your host system, so your existing +user accounts and home directories will not be available unless you have +set `mutableUsers = false`. Another way is to temporarily add the +following to your configuration: + +```nix +users.users.your-user.initialHashedPassword = "test"; +``` + +*Important:* delete the \$hostname.qcow2 file if you have started the +virtual machine at least once without the right users, otherwise the +changes will not get picked up. You can forward ports on the host to the +guest. For instance, the following will forward host port 2222 to guest +port 22 (SSH): + +```ShellSession +$ QEMU_NET_OPTS="hostfwd=tcp::2222-:22" ./result/bin/run-*-vm +``` + +allowing you to log in via SSH (assuming you have set the appropriate +passwords or SSH authorized keys): + +```ShellSession +$ ssh -p 2222 localhost +``` diff --git a/nixos/doc/manual/installation/changing-config.xml b/nixos/doc/manual/installation/changing-config.xml deleted file mode 100644 index 4288806d5eb2..000000000000 --- a/nixos/doc/manual/installation/changing-config.xml +++ /dev/null @@ -1,97 +0,0 @@ - - Changing the Configuration - - The file /etc/nixos/configuration.nix contains the - current configuration of your machine. Whenever you’ve - changed something in that file, you - should do - -# nixos-rebuild switch - - to build the new configuration, make it the default configuration for - booting, and try to realise the configuration in the running system (e.g., by - restarting system services). - - - This command doesn't start/stop user - services automatically. nixos-rebuild only runs a - daemon-reload for each user with running user services. - - - - - - These commands must be executed as root, so you should either run them from - a root shell or by prefixing them with sudo -i. - - - - You can also do - -# nixos-rebuild test - - to build the configuration and switch the running system to it, but without - making it the boot default. So if (say) the configuration locks up your - machine, you can just reboot to get back to a working configuration. - - - There is also - -# nixos-rebuild boot - - to build the configuration and make it the boot default, but not switch to it - now (so it will only take effect after the next reboot). - - - You can make your configuration show up in a different submenu of the GRUB 2 - boot screen by giving it a different profile name, e.g. - -# nixos-rebuild switch -p test - - which causes the new configuration (and previous ones created using - -p test) to show up in the GRUB submenu “NixOS - Profile - 'test'”. This can be useful to separate test configurations from - “stable” configurations. - - - Finally, you can do - -$ nixos-rebuild build - - to build the configuration but nothing more. This is useful to see whether - everything compiles cleanly. - - - If you have a machine that supports hardware virtualisation, you can also - test the new configuration in a sandbox by building and running a QEMU - virtual machine that contains the desired configuration. - Just do - -$ nixos-rebuild build-vm -$ ./result/bin/run-*-vm - - The VM does not have any data from your host system, so your existing user - accounts and home directories will not be available unless you have set - mutableUsers = false. Another way is to temporarily add - the following to your configuration: - -users.users.your-user.initialHashedPassword = "test"; - - Important: delete the $hostname.qcow2 file if you have - started the virtual machine at least once without the right users, otherwise - the changes will not get picked up. You can forward ports on the host to the - guest. For instance, the following will forward host port 2222 to guest port - 22 (SSH): - -$ QEMU_NET_OPTS="hostfwd=tcp::2222-:22" ./result/bin/run-*-vm - - allowing you to log in via SSH (assuming you have set the appropriate - passwords or SSH authorized keys): - -$ ssh -p 2222 localhost - - - diff --git a/nixos/doc/manual/installation/installation.xml b/nixos/doc/manual/installation/installation.xml index 98dbc6d74fdc..65564e8b1e30 100644 --- a/nixos/doc/manual/installation/installation.xml +++ b/nixos/doc/manual/installation/installation.xml @@ -12,6 +12,6 @@ - + From f6911a020e7e7be42d9d4f71baf5eb856efd0757 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 4 Jul 2021 00:10:18 +0800 Subject: [PATCH 059/167] nixos: nixos/doc/manual/installation/upgrading.xml to CommonMark --- .../installation/upgrading.chapter.xml | 152 ++++++++++++++++++ .../doc/manual/installation/installation.xml | 2 +- .../manual/installation/upgrading.chapter.md | 118 ++++++++++++++ nixos/doc/manual/installation/upgrading.xml | 139 ---------------- 4 files changed, 271 insertions(+), 140 deletions(-) create mode 100644 nixos/doc/manual/from_md/installation/upgrading.chapter.xml create mode 100644 nixos/doc/manual/installation/upgrading.chapter.md delete mode 100644 nixos/doc/manual/installation/upgrading.xml diff --git a/nixos/doc/manual/from_md/installation/upgrading.chapter.xml b/nixos/doc/manual/from_md/installation/upgrading.chapter.xml new file mode 100644 index 000000000000..c0c5a2190fb2 --- /dev/null +++ b/nixos/doc/manual/from_md/installation/upgrading.chapter.xml @@ -0,0 +1,152 @@ + + Upgrading NixOS + + The best way to keep your NixOS installation up to date is to use + one of the NixOS channels. A channel is a Nix + mechanism for distributing Nix expressions and associated binaries. + The NixOS channels are updated automatically from NixOS’s Git + repository after certain tests have passed and all packages have + been built. These channels are: + + + + + Stable channels, such as + nixos-21.05. + These only get conservative bug fixes and package upgrades. For + instance, a channel update may cause the Linux kernel on your + system to be upgraded from 4.19.34 to 4.19.38 (a minor bug fix), + but not from 4.19.x to 4.20.x (a major change that has the + potential to break things). Stable channels are generally + maintained until the next stable branch is created. + + + + + The unstable channel, + nixos-unstable. + This corresponds to NixOS’s main development branch, and may + thus see radical changes between channel updates. It’s not + recommended for production systems. + + + + + Small channels, such as + nixos-21.05-small + or + nixos-unstable-small. + These are identical to the stable and unstable channels + described above, except that they contain fewer binary packages. + This means they get updated faster than the regular channels + (for instance, when a critical security patch is committed to + NixOS’s source tree), but may require more packages to be built + from source than usual. They’re mostly intended for server + environments and as such contain few GUI applications. + + + + + To see what channels are available, go to + https://nixos.org/channels. + (Note that the URIs of the various channels redirect to a directory + that contains the channel’s latest version and includes ISO images + and VirtualBox appliances.) Please note that during the release + process, channels that are not yet released will be present here as + well. See the Getting NixOS page + https://nixos.org/nixos/download.html + to find the newest supported stable release. + + + When you first install NixOS, you’re automatically subscribed to the + NixOS channel that corresponds to your installation source. For + instance, if you installed from a 21.05 ISO, you will be subscribed + to the nixos-21.05 channel. To see which NixOS + channel you’re subscribed to, run the following as root: + + +# nix-channel --list | grep nixos +nixos https://nixos.org/channels/nixos-unstable + + + To switch to a different NixOS channel, do + + +# nix-channel --add https://nixos.org/channels/channel-name nixos + + + (Be sure to include the nixos parameter at the + end.) For instance, to use the NixOS 21.05 stable channel: + + +# nix-channel --add https://nixos.org/channels/nixos-21.05 nixos + + + If you have a server, you may want to use the small + channel instead: + + +# nix-channel --add https://nixos.org/channels/nixos-21.05-small nixos + + + And if you want to live on the bleeding edge: + + +# nix-channel --add https://nixos.org/channels/nixos-unstable nixos + + + You can then upgrade NixOS to the latest version in your chosen + channel by running + + +# nixos-rebuild switch --upgrade + + + which is equivalent to the more verbose + nix-channel --update nixos; nixos-rebuild switch. + + + + Channels are set per user. This means that running + nix-channel --add as a non root user (or + without sudo) will not affect configuration in + /etc/nixos/configuration.nix + + + + + It is generally safe to switch back and forth between channels. + The only exception is that a newer NixOS may also have a newer Nix + version, which may involve an upgrade of Nix’s database schema. + This cannot be undone easily, so in that case you will not be able + to go back to your original channel. + + +
+ Automatic Upgrades + + You can keep a NixOS system up-to-date automatically by adding the + following to configuration.nix: + + +system.autoUpgrade.enable = true; +system.autoUpgrade.allowReboot = true; + + + This enables a periodically executed systemd service named + nixos-upgrade.service. If the + allowReboot option is false, + it runs nixos-rebuild switch --upgrade to + upgrade NixOS to the latest version in the current channel. (To + see when the service runs, see + systemctl list-timers.) If + allowReboot is true, then + the system will automatically reboot if the new generation + contains a different kernel, initrd or kernel modules. You can + also specify a channel explicitly, e.g. + + +system.autoUpgrade.channel = https://nixos.org/channels/nixos-21.05; + +
+ diff --git a/nixos/doc/manual/installation/installation.xml b/nixos/doc/manual/installation/installation.xml index 65564e8b1e30..cc18a9c6e9ff 100644 --- a/nixos/doc/manual/installation/installation.xml +++ b/nixos/doc/manual/installation/installation.xml @@ -13,5 +13,5 @@ - + diff --git a/nixos/doc/manual/installation/upgrading.chapter.md b/nixos/doc/manual/installation/upgrading.chapter.md new file mode 100644 index 000000000000..b7903b9d3cbb --- /dev/null +++ b/nixos/doc/manual/installation/upgrading.chapter.md @@ -0,0 +1,118 @@ +# Upgrading NixOS {#sec-upgrading} + +The best way to keep your NixOS installation up to date is to use one of +the NixOS *channels*. A channel is a Nix mechanism for distributing Nix +expressions and associated binaries. The NixOS channels are updated +automatically from NixOS's Git repository after certain tests have +passed and all packages have been built. These channels are: + +- *Stable channels*, such as [`nixos-21.05`](https://nixos.org/channels/nixos-21.05). + These only get conservative bug fixes and package upgrades. For + instance, a channel update may cause the Linux kernel on your system + to be upgraded from 4.19.34 to 4.19.38 (a minor bug fix), but not + from 4.19.x to 4.20.x (a major change that has the potential to break things). + Stable channels are generally maintained until the next stable + branch is created. + +- The *unstable channel*, [`nixos-unstable`](https://nixos.org/channels/nixos-unstable). + This corresponds to NixOS's main development branch, and may thus see + radical changes between channel updates. It's not recommended for + production systems. + +- *Small channels*, such as [`nixos-21.05-small`](https://nixos.org/channels/nixos-21.05-small) + or [`nixos-unstable-small`](https://nixos.org/channels/nixos-unstable-small). + These are identical to the stable and unstable channels described above, + except that they contain fewer binary packages. This means they get updated + faster than the regular channels (for instance, when a critical security patch + is committed to NixOS's source tree), but may require more packages to be + built from source than usual. They're mostly intended for server environments + and as such contain few GUI applications. + +To see what channels are available, go to . +(Note that the URIs of the various channels redirect to a directory that +contains the channel's latest version and includes ISO images and +VirtualBox appliances.) Please note that during the release process, +channels that are not yet released will be present here as well. See the +Getting NixOS page to find the +newest supported stable release. + +When you first install NixOS, you're automatically subscribed to the +NixOS channel that corresponds to your installation source. For +instance, if you installed from a 21.05 ISO, you will be subscribed to +the `nixos-21.05` channel. To see which NixOS channel you're subscribed +to, run the following as root: + +```ShellSession +# nix-channel --list | grep nixos +nixos https://nixos.org/channels/nixos-unstable +``` + +To switch to a different NixOS channel, do + +```ShellSession +# nix-channel --add https://nixos.org/channels/channel-name nixos +``` + +(Be sure to include the `nixos` parameter at the end.) For instance, to +use the NixOS 21.05 stable channel: + +```ShellSession +# nix-channel --add https://nixos.org/channels/nixos-21.05 nixos +``` + +If you have a server, you may want to use the "small" channel instead: + +```ShellSession +# nix-channel --add https://nixos.org/channels/nixos-21.05-small nixos +``` + +And if you want to live on the bleeding edge: + +```ShellSession +# nix-channel --add https://nixos.org/channels/nixos-unstable nixos +``` + +You can then upgrade NixOS to the latest version in your chosen channel +by running + +```ShellSession +# nixos-rebuild switch --upgrade +``` + +which is equivalent to the more verbose `nix-channel --update nixos; nixos-rebuild switch`. + +::: {.note} +Channels are set per user. This means that running `nix-channel --add` +as a non root user (or without sudo) will not affect +configuration in `/etc/nixos/configuration.nix` +::: + +::: {.warning} +It is generally safe to switch back and forth between channels. The only +exception is that a newer NixOS may also have a newer Nix version, which +may involve an upgrade of Nix's database schema. This cannot be undone +easily, so in that case you will not be able to go back to your original +channel. +::: + +## Automatic Upgrades {#sec-upgrading-automatic} + +You can keep a NixOS system up-to-date automatically by adding the +following to `configuration.nix`: + +```nix +system.autoUpgrade.enable = true; +system.autoUpgrade.allowReboot = true; +``` + +This enables a periodically executed systemd service named +`nixos-upgrade.service`. If the `allowReboot` option is `false`, it runs +`nixos-rebuild switch --upgrade` to upgrade NixOS to the latest version +in the current channel. (To see when the service runs, see `systemctl list-timers`.) +If `allowReboot` is `true`, then the system will automatically reboot if +the new generation contains a different kernel, initrd or kernel +modules. You can also specify a channel explicitly, e.g. + +```nix +system.autoUpgrade.channel = https://nixos.org/channels/nixos-21.05; +``` diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml deleted file mode 100644 index 960d4fa9a436..000000000000 --- a/nixos/doc/manual/installation/upgrading.xml +++ /dev/null @@ -1,139 +0,0 @@ - - Upgrading NixOS - - The best way to keep your NixOS installation up to date is to use one of the - NixOS channels. A channel is a Nix mechanism for - distributing Nix expressions and associated binaries. The NixOS channels are - updated automatically from NixOS’s Git repository after certain tests have - passed and all packages have been built. These channels are: - - - - Stable channels, such as - nixos-21.05. - These only get conservative bug fixes and package upgrades. For instance, - a channel update may cause the Linux kernel on your system to be upgraded - from 4.19.34 to 4.19.38 (a minor bug fix), but not from - 4.19.x to 4.20.x (a - major change that has the potential to break things). Stable channels are - generally maintained until the next stable branch is created. - - - - - - The unstable channel, - nixos-unstable. - This corresponds to NixOS’s main development branch, and may thus see - radical changes between channel updates. It’s not recommended for - production systems. - - - - - Small channels, such as - nixos-21.05-small - or - nixos-unstable-small. - These are identical to the stable and unstable channels described above, - except that they contain fewer binary packages. This means they get - updated faster than the regular channels (for instance, when a critical - security patch is committed to NixOS’s source tree), but may require - more packages to be built from source than usual. They’re mostly - intended for server environments and as such contain few GUI applications. - - - - To see what channels are available, go to - . (Note that the URIs of the - various channels redirect to a directory that contains the channel’s latest - version and includes ISO images and VirtualBox appliances.) Please note that - during the release process, channels that are not yet released will be - present here as well. See the Getting NixOS page - to find the newest - supported stable release. - - - When you first install NixOS, you’re automatically subscribed to the NixOS - channel that corresponds to your installation source. For instance, if you - installed from a 21.05 ISO, you will be subscribed to the - nixos-21.05 channel. To see which NixOS channel you’re - subscribed to, run the following as root: - -# nix-channel --list | grep nixos -nixos https://nixos.org/channels/nixos-unstable - - To switch to a different NixOS channel, do - -# nix-channel --add https://nixos.org/channels/channel-name nixos - - (Be sure to include the nixos parameter at the end.) For - instance, to use the NixOS 21.05 stable channel: - -# nix-channel --add https://nixos.org/channels/nixos-21.05 nixos - - If you have a server, you may want to use the “small” channel instead: - -# nix-channel --add https://nixos.org/channels/nixos-21.05-small nixos - - And if you want to live on the bleeding edge: - -# nix-channel --add https://nixos.org/channels/nixos-unstable nixos - - - - You can then upgrade NixOS to the latest version in your chosen channel by - running - -# nixos-rebuild switch --upgrade - - which is equivalent to the more verbose nix-channel --update nixos; - nixos-rebuild switch. - - - - Channels are set per user. This means that running nix-channel - --add as a non root user (or without sudo) will not affect - configuration in /etc/nixos/configuration.nix - - - - - It is generally safe to switch back and forth between channels. The only - exception is that a newer NixOS may also have a newer Nix version, which may - involve an upgrade of Nix’s database schema. This cannot be undone easily, - so in that case you will not be able to go back to your original channel. - - -
- Automatic Upgrades - - - You can keep a NixOS system up-to-date automatically by adding the following - to configuration.nix: - - = true; - = true; - - This enables a periodically executed systemd service named - nixos-upgrade.service. If the allowReboot - option is false, it runs nixos-rebuild switch - --upgrade to upgrade NixOS to the latest version in the current - channel. (To see when the service runs, see systemctl list-timers.) - If allowReboot is true, then the - system will automatically reboot if the new generation contains a different - kernel, initrd or kernel modules. - You can also specify a channel explicitly, e.g. - - = https://nixos.org/channels/nixos-21.05; - - -
- From ad393d5f63ebbf52b9c3977041910632ea30699c Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 4 Jul 2021 08:24:44 +0800 Subject: [PATCH 060/167] nixos: use only URI fragment in manual options links --- .../manual/configuration/gpu-accel.chapter.md | 12 +++--- .../configuration/kubernetes.chapter.md | 18 ++++---- .../configuration/linux-kernel.chapter.md | 6 +-- .../sshfs-file-systems.section.md | 2 +- .../configuration/subversion.chapter.md | 2 +- .../manual/configuration/user-mgmt.chapter.md | 4 +- .../manual/configuration/wayland.chapter.md | 2 +- .../manual/configuration/x-windows.chapter.md | 4 +- .../doc/manual/configuration/xfce.chapter.md | 6 +-- .../configuration/gpu-accel.chapter.xml | 31 ++++++-------- .../configuration/kubernetes.chapter.xml | 42 +++++++++---------- .../configuration/linux-kernel.chapter.xml | 9 ++-- .../sshfs-file-systems.section.xml | 4 +- .../configuration/subversion.chapter.xml | 3 +- .../configuration/user-mgmt.chapter.xml | 14 +++---- .../from_md/configuration/wayland.chapter.xml | 3 +- .../configuration/x-windows.chapter.xml | 10 ++--- .../from_md/configuration/xfce.chapter.xml | 8 ++-- 18 files changed, 81 insertions(+), 99 deletions(-) diff --git a/nixos/doc/manual/configuration/gpu-accel.chapter.md b/nixos/doc/manual/configuration/gpu-accel.chapter.md index 5540250e1da7..fd7b772c452b 100644 --- a/nixos/doc/manual/configuration/gpu-accel.chapter.md +++ b/nixos/doc/manual/configuration/gpu-accel.chapter.md @@ -30,7 +30,7 @@ $ export \ ``` The second mechanism is to add the OpenCL driver package to -[`hardware.opengl.extraPackages`](options.html#opt-hardware.opengl.extraPackages). +[](#opt-hardware.opengl.extraPackages). This links the ICD file under `/run/opengl-driver`, where it will be visible to the ICD loader. @@ -51,7 +51,7 @@ Platform Vendor Advanced Micro Devices, Inc. Modern AMD [Graphics Core Next](https://en.wikipedia.org/wiki/Graphics_Core_Next) (GCN) GPUs are supported through the rocm-opencl-icd package. Adding this package to -[`hardware.opengl.extraPackages`](options.html#opt-hardware.opengl.extraPackages) +[](#opt-hardware.opengl.extraPackages) enables OpenCL support: ```nix @@ -71,7 +71,7 @@ proprietary Intel OpenCL runtime, in the intel-ocl package, is an alternative for Gen7 GPUs. The intel-compute-runtime, beignet, or intel-ocl package can be added to -[`hardware.opengl.extraPackages`](options.html#opt-hardware.opengl.extraPackages) +[](#opt-hardware.opengl.extraPackages) to enable OpenCL support. For example, for Gen8 and later GPUs, the following configuration can be used: @@ -88,7 +88,7 @@ compute API for GPUs. It is used directly by games or indirectly though compatibility layers like [DXVK](https://github.com/doitsujin/dxvk/wiki). -By default, if [`hardware.opengl.driSupport`](options.html#opt-hardware.opengl.driSupport) +By default, if [](#opt-hardware.opengl.driSupport) is enabled, mesa is installed and provides Vulkan for supported hardware. Similar to OpenCL, Vulkan drivers are loaded through the *Installable @@ -108,7 +108,7 @@ $ export \ ``` The second mechanism is to add the Vulkan driver package to -[`hardware.opengl.extraPackages`](options.html#opt-hardware.opengl.extraPackages). +[](#opt-hardware.opengl.extraPackages). This links the ICD file under `/run/opengl-driver`, where it will be visible to the ICD loader. @@ -138,7 +138,7 @@ Modern AMD [Graphics Core Next](https://en.wikipedia.org/wiki/Graphics_Core_Next) (GCN) GPUs are supported through either radv, which is part of mesa, or the amdvlk package. Adding the amdvlk package to -[`hardware.opengl.extraPackages`](options.html#opt-hardware.opengl.extraPackages) +[](#opt-hardware.opengl.extraPackages) makes amdvlk the default driver and hides radv and lavapipe from the device list. A specific driver can be forced as follows: diff --git a/nixos/doc/manual/configuration/kubernetes.chapter.md b/nixos/doc/manual/configuration/kubernetes.chapter.md index 09a076a610b1..93787577be9b 100644 --- a/nixos/doc/manual/configuration/kubernetes.chapter.md +++ b/nixos/doc/manual/configuration/kubernetes.chapter.md @@ -39,8 +39,8 @@ services.kubernetes.roles = [ "master" "node" ]; ``` Note: Assigning either role will also default both -[`services.kubernetes.flannel.enable`](options.html#opt-services.kubernetes.flannel.enable) -and [`services.kubernetes.easyCerts`](options.html#opt-services.kubernetes.easyCerts) +[](#opt-services.kubernetes.flannel.enable) +and [](#opt-services.kubernetes.easyCerts) to true. This sets up flannel as CNI and activates automatic PKI bootstrapping. As of kubernetes 1.10.X it has been deprecated to open non-tls-enabled @@ -48,12 +48,12 @@ ports on kubernetes components. Thus, from NixOS 19.03 all plain HTTP ports have been disabled by default. While opening insecure ports is still possible, it is recommended not to bind these to other interfaces than loopback. To re-enable the insecure port on the apiserver, see options: -[`services.kubernetes.apiserver.insecurePort`](options.html#opt-services.kubernetes.apiserver.insecurePort) and -[`services.kubernetes.apiserver.insecureBindAddress`](options.html#opt-services.kubernetes.apiserver.insecureBindAddress) +[](#opt-services.kubernetes.apiserver.insecurePort) and +[](#opt-services.kubernetes.apiserver.insecureBindAddress) ::: {.note} As of NixOS 19.03, it is mandatory to configure: -[`services.kubernetes.masterAddress`](options.html#opt-services.kubernetes.masterAddress). +[](#opt-services.kubernetes.masterAddress). The masterAddress must be resolveable and routeable by all cluster nodes. In single node clusters, this can be set to `localhost`. ::: @@ -69,19 +69,19 @@ Authorization](https://kubernetes.io/docs/reference/access-authn-authz/rbac/). The NixOS kubernetes module provides an option for automatic certificate bootstrapping and configuration, -[`services.kubernetes.easyCerts`](options.html#opt-services.kubernetes.easyCerts). +[](#opt-services.kubernetes.easyCerts). The PKI bootstrapping process involves setting up a certificate authority (CA) daemon (cfssl) on the kubernetes master node. cfssl generates a CA-cert for the cluster, and uses the CA-cert for signing subordinate certs issued to each of the cluster components. Subsequently, the certmgr daemon monitors active certificates and renews them when needed. For single node Kubernetes -clusters, setting [`services.kubernetes.easyCerts`](options.html#opt-services.kubernetes.easyCerts) +clusters, setting [](#opt-services.kubernetes.easyCerts) = true is sufficient and no further action is required. For joining extra node machines to an existing cluster on the other hand, establishing initial trust is mandatory. To add new nodes to the cluster: On any (non-master) cluster node where -[`services.kubernetes.easyCerts`](options.html#opt-services.kubernetes.easyCerts) +[](#opt-services.kubernetes.easyCerts) is enabled, the helper script `nixos-kubernetes-node-join` is available on PATH. Given a token on stdin, it will copy the token to the kubernetes secrets directory and restart the certmgr service. As requested certificates are issued, the @@ -96,7 +96,7 @@ In order to interact with an RBAC-enabled cluster as an administrator, one needs to have cluster-admin privileges. By default, when easyCerts is enabled, a cluster-admin kubeconfig file is generated and linked into `/etc/kubernetes/cluster-admin.kubeconfig` as determined by -[`services.kubernetes.pki.etcClusterAdminKubeconfig`](options.html#opt-services.kubernetes.pki.etcClusterAdminKubeconfig). +[](#opt-services.kubernetes.pki.etcClusterAdminKubeconfig). `export KUBECONFIG=/etc/kubernetes/cluster-admin.kubeconfig` will make kubectl use this kubeconfig to access and authenticate the cluster. The cluster-admin kubeconfig references an auto-generated keypair owned by diff --git a/nixos/doc/manual/configuration/linux-kernel.chapter.md b/nixos/doc/manual/configuration/linux-kernel.chapter.md index 95af16663891..aad6d49c72c3 100644 --- a/nixos/doc/manual/configuration/linux-kernel.chapter.md +++ b/nixos/doc/manual/configuration/linux-kernel.chapter.md @@ -42,14 +42,14 @@ something as a kernel module). Kernel modules for hardware devices are generally loaded automatically by `udev`. You can force a module to be loaded via -[`boot.kernelModules`](options.html#opt-boot.kernelModules), e.g. +[](#opt-boot.kernelModules), e.g. ```nix boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ]; ``` If the module is required early during the boot (e.g. to mount the root -file system), you can use [`boot.initrd.kernelModules`](options.html#opt-boot.initrd.kernelModules): +file system), you can use [](#opt-boot.initrd.kernelModules): ```nix boot.initrd.kernelModules = [ "cifs" ]; @@ -59,7 +59,7 @@ This causes the specified modules and their dependencies to be added to the initial ramdisk. Kernel runtime parameters can be set through -[`boot.kernel.sysctl`](options.html#opt-boot.kernel.sysctl), e.g. +[](#opt-boot.kernel.sysctl), e.g. ```nix boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 120; diff --git a/nixos/doc/manual/configuration/sshfs-file-systems.section.md b/nixos/doc/manual/configuration/sshfs-file-systems.section.md index 4625fce03d58..4dd1b203a249 100644 --- a/nixos/doc/manual/configuration/sshfs-file-systems.section.md +++ b/nixos/doc/manual/configuration/sshfs-file-systems.section.md @@ -34,7 +34,7 @@ SHA256:yjxl3UbTn31fLWeyLYTAKYJPRmzknjQZoyG8gSNEoIE my-user@workstation To keep the key safe, change the ownership to `root:root` and make sure the permissions are `600`: OpenSSH normally refuses to use the key if it's not well-protected. -The file system can be configured in NixOS via the usual [fileSystems](options.html#opt-fileSystems) option. +The file system can be configured in NixOS via the usual [fileSystems](#opt-fileSystems) option. Here's a typical setup: ```nix { diff --git a/nixos/doc/manual/configuration/subversion.chapter.md b/nixos/doc/manual/configuration/subversion.chapter.md index 72efdb09acbb..84f9c2703378 100644 --- a/nixos/doc/manual/configuration/subversion.chapter.md +++ b/nixos/doc/manual/configuration/subversion.chapter.md @@ -17,7 +17,7 @@ appropriate section of the Subversion book](http://svnbook.red-bean.com/en/1.7/svn-book.html#svn.serverconfig.httpd). To configure, include in `/etc/nixos/configuration.nix` code to activate -Apache HTTP, setting [`services.httpd.adminAddr`](options.html#opt-services.httpd.adminAddr) +Apache HTTP, setting [](#opt-services.httpd.adminAddr) appropriately: ```nix diff --git a/nixos/doc/manual/configuration/user-mgmt.chapter.md b/nixos/doc/manual/configuration/user-mgmt.chapter.md index 64eacc5f7dd6..37990664a8f1 100644 --- a/nixos/doc/manual/configuration/user-mgmt.chapter.md +++ b/nixos/doc/manual/configuration/user-mgmt.chapter.md @@ -24,10 +24,10 @@ log in via mechanisms that require a password. However, you can use the `passwd` program to set a password, which is retained across invocations of `nixos-rebuild`. -If you set [`users.mutableUsers`](options.html#opt-users.mutableUsers) to +If you set [](#opt-users.mutableUsers) to false, then the contents of `/etc/passwd` and `/etc/group` will be congruent to your NixOS configuration. For instance, if you remove a user from -[`users.users`](options.html#opt-users.users) and run nixos-rebuild, the user +[](#opt-users.users) and run nixos-rebuild, the user account will cease to exist. Also, imperative commands for managing users and groups, such as useradd, are no longer available. Passwords may still be assigned by setting the user\'s diff --git a/nixos/doc/manual/configuration/wayland.chapter.md b/nixos/doc/manual/configuration/wayland.chapter.md index 49c0cab38e5e..a3a46aa3da6f 100644 --- a/nixos/doc/manual/configuration/wayland.chapter.md +++ b/nixos/doc/manual/configuration/wayland.chapter.md @@ -23,5 +23,5 @@ xdg.portal.wlr.enable = true; ``` and configure Pipewire using -[`services.pipewire.enable`](options.html#opt-services.pipewire.enable) +[](#opt-services.pipewire.enable) and related options. diff --git a/nixos/doc/manual/configuration/x-windows.chapter.md b/nixos/doc/manual/configuration/x-windows.chapter.md index d9a924d41d7d..2c80b786b267 100644 --- a/nixos/doc/manual/configuration/x-windows.chapter.md +++ b/nixos/doc/manual/configuration/x-windows.chapter.md @@ -115,7 +115,7 @@ officially updated since 2015. The results vary depending on the hardware, so you may have to try both drivers. Use the option -[`services.xserver.videoDrivers`](options.html#opt-services.xserver.videoDrivers) +[](#opt-services.xserver.videoDrivers) to set one. The recommended configuration for modern systems is: ```nix @@ -183,7 +183,7 @@ Latitude series) can be enabled as follows: services.xserver.libinput.enable = true; ``` -The driver has many options (see [Appendix A, Configuration Options](options.html)). +The driver has many options (see [](#ch-options)). For instance, the following disables tap-to-click behavior: ```nix diff --git a/nixos/doc/manual/configuration/xfce.chapter.md b/nixos/doc/manual/configuration/xfce.chapter.md index 3c0c5f3a6f38..b0ef6682aae8 100644 --- a/nixos/doc/manual/configuration/xfce.chapter.md +++ b/nixos/doc/manual/configuration/xfce.chapter.md @@ -22,13 +22,13 @@ services.picom = { Some Xfce programs are not installed automatically. To install them manually (system wide), put them into your -[`environment.systemPackages`](options.html#opt-environment.systemPackages) from `pkgs.xfce`. +[](#opt-environment.systemPackages) from `pkgs.xfce`. ## Thunar Plugins {#sec-xfce-thunar-plugins .unnumbered} If you\'d like to add extra plugins to Thunar, add them to -[`services.xserver.desktopManager.xfce.thunarPlugins`](options.html#opt-services.xserver.desktopManager.xfce.thunarPlugins). -You shouldn\'t just add them to [`environment.systemPackages`](options.html#opt-environment.systemPackages). +[](#opt-services.xserver.desktopManager.xfce.thunarPlugins). +You shouldn\'t just add them to [](#opt-environment.systemPackages). ## Troubleshooting {#sec-xfce-troubleshooting .unnumbered} diff --git a/nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml b/nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml index ec6468101849..28fb86d57a50 100644 --- a/nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml +++ b/nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml @@ -36,10 +36,9 @@ $ export \ The second mechanism is to add the OpenCL driver package to - hardware.opengl.extraPackages. - This links the ICD file under - /run/opengl-driver, where it will be visible to - the ICD loader. + . This links + the ICD file under /run/opengl-driver, where it + will be visible to the ICD loader. The proper installation of OpenCL drivers can be verified through @@ -60,8 +59,8 @@ Platform Vendor Advanced Micro Devices, Inc. Graphics Core Next (GCN) GPUs are supported through the rocm-opencl-icd package. Adding this package to - hardware.opengl.extraPackages - enables OpenCL support: + enables + OpenCL support: hardware.opengl.extraPackages = [ @@ -82,10 +81,9 @@ hardware.opengl.extraPackages = [ The intel-compute-runtime, beignet, or intel-ocl package can be - added to - hardware.opengl.extraPackages - to enable OpenCL support. For example, for Gen8 and later GPUs, - the following configuration can be used: + added to to + enable OpenCL support. For example, for Gen8 and later GPUs, the + following configuration can be used: hardware.opengl.extraPackages = [ @@ -103,8 +101,7 @@ hardware.opengl.extraPackages = [ DXVK. - By default, if - hardware.opengl.driSupport + By default, if is enabled, mesa is installed and provides Vulkan for supported hardware. @@ -129,10 +126,9 @@ $ export \ The second mechanism is to add the Vulkan driver package to - hardware.opengl.extraPackages. - This links the ICD file under - /run/opengl-driver, where it will be visible to - the ICD loader. + . This links + the ICD file under /run/opengl-driver, where it + will be visible to the ICD loader. The proper installation of Vulkan drivers can be verified through @@ -162,8 +158,7 @@ GPU1: Graphics Core Next (GCN) GPUs are supported through either radv, which is part of mesa, or the amdvlk package. Adding the amdvlk - package to - hardware.opengl.extraPackages + package to makes amdvlk the default driver and hides radv and lavapipe from the device list. A specific driver can be forced as follows: diff --git a/nixos/doc/manual/from_md/configuration/kubernetes.chapter.xml b/nixos/doc/manual/from_md/configuration/kubernetes.chapter.xml index 2707101ccf8c..83a50d7c49d1 100644 --- a/nixos/doc/manual/from_md/configuration/kubernetes.chapter.xml +++ b/nixos/doc/manual/from_md/configuration/kubernetes.chapter.xml @@ -43,11 +43,9 @@ services.kubernetes.roles = [ "master" "node" ]; Note: Assigning either role will also default both - services.kubernetes.flannel.enable - and - services.kubernetes.easyCerts - to true. This sets up flannel as CNI and activates automatic PKI - bootstrapping. + and + to true. This + sets up flannel as CNI and activates automatic PKI bootstrapping. As of kubernetes 1.10.X it has been deprecated to open @@ -56,15 +54,15 @@ services.kubernetes.roles = [ "master" "node" ]; opening insecure ports is still possible, it is recommended not to bind these to other interfaces than loopback. To re-enable the insecure port on the apiserver, see options: - services.kubernetes.apiserver.insecurePort + and - services.kubernetes.apiserver.insecureBindAddress + As of NixOS 19.03, it is mandatory to configure: - services.kubernetes.masterAddress. - The masterAddress must be resolveable and routeable by all cluster + . The + masterAddress must be resolveable and routeable by all cluster nodes. In single node clusters, this can be set to localhost. @@ -83,24 +81,22 @@ services.kubernetes.roles = [ "master" "node" ]; The NixOS kubernetes module provides an option for automatic certificate bootstrapping and configuration, - services.kubernetes.easyCerts. - The PKI bootstrapping process involves setting up a certificate - authority (CA) daemon (cfssl) on the kubernetes master node. cfssl - generates a CA-cert for the cluster, and uses the CA-cert for - signing subordinate certs issued to each of the cluster components. + . The PKI + bootstrapping process involves setting up a certificate authority + (CA) daemon (cfssl) on the kubernetes master node. cfssl generates a + CA-cert for the cluster, and uses the CA-cert for signing + subordinate certs issued to each of the cluster components. Subsequently, the certmgr daemon monitors active certificates and renews them when needed. For single node Kubernetes clusters, - setting - services.kubernetes.easyCerts - = true is sufficient and no further action is required. For joining - extra node machines to an existing cluster on the other hand, - establishing initial trust is mandatory. + setting = true + is sufficient and no further action is required. For joining extra + node machines to an existing cluster on the other hand, establishing + initial trust is mandatory. To add new nodes to the cluster: On any (non-master) cluster node - where - services.kubernetes.easyCerts - is enabled, the helper script + where is + enabled, the helper script nixos-kubernetes-node-join is available on PATH. Given a token on stdin, it will copy the token to the kubernetes secrets directory and restart the certmgr service. As requested @@ -120,7 +116,7 @@ services.kubernetes.roles = [ "master" "node" ]; is generated and linked into /etc/kubernetes/cluster-admin.kubeconfig as determined by - services.kubernetes.pki.etcClusterAdminKubeconfig. + . export KUBECONFIG=/etc/kubernetes/cluster-admin.kubeconfig will make kubectl use this kubeconfig to access and authenticate the cluster. The cluster-admin kubeconfig references an auto-generated diff --git a/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml b/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml index b9be041e59b0..f804d0a3b8c2 100644 --- a/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml +++ b/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml @@ -48,9 +48,7 @@ nixpkgs.config.packageOverrides = pkgs: Kernel modules for hardware devices are generally loaded automatically by udev. You can force a module to - be loaded via - boot.kernelModules, - e.g. + be loaded via , e.g. boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ]; @@ -58,7 +56,7 @@ boot.kernelModules = [ "fuse" "kvm-intel" "coretemp&quo If the module is required early during the boot (e.g. to mount the root file system), you can use - boot.initrd.kernelModules: + : boot.initrd.kernelModules = [ "cifs" ]; @@ -69,8 +67,7 @@ boot.initrd.kernelModules = [ "cifs" ]; Kernel runtime parameters can be set through - boot.kernel.sysctl, - e.g. + , e.g. boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 120; diff --git a/nixos/doc/manual/from_md/configuration/sshfs-file-systems.section.xml b/nixos/doc/manual/from_md/configuration/sshfs-file-systems.section.xml index 6b317aa63e9a..5d74712f35dc 100644 --- a/nixos/doc/manual/from_md/configuration/sshfs-file-systems.section.xml +++ b/nixos/doc/manual/from_md/configuration/sshfs-file-systems.section.xml @@ -51,8 +51,8 @@ SHA256:yjxl3UbTn31fLWeyLYTAKYJPRmzknjQZoyG8gSNEoIE my-user@workstation The file system can be configured in NixOS via the usual - fileSystems - option. Here’s a typical setup: + fileSystems option. Here’s + a typical setup: { diff --git a/nixos/doc/manual/from_md/configuration/subversion.chapter.xml b/nixos/doc/manual/from_md/configuration/subversion.chapter.xml index 3bea116d498c..794c2c34e399 100644 --- a/nixos/doc/manual/from_md/configuration/subversion.chapter.xml +++ b/nixos/doc/manual/from_md/configuration/subversion.chapter.xml @@ -23,8 +23,7 @@ To configure, include in /etc/nixos/configuration.nix code to activate Apache HTTP, setting - services.httpd.adminAddr - appropriately: + appropriately: services.httpd.enable = true; diff --git a/nixos/doc/manual/from_md/configuration/user-mgmt.chapter.xml b/nixos/doc/manual/from_md/configuration/user-mgmt.chapter.xml index b865fabfe3cc..06492d5c2512 100644 --- a/nixos/doc/manual/from_md/configuration/user-mgmt.chapter.xml +++ b/nixos/doc/manual/from_md/configuration/user-mgmt.chapter.xml @@ -29,16 +29,14 @@ users.users.alice = { retained across invocations of nixos-rebuild. - If you set - users.mutableUsers - to false, then the contents of /etc/passwd and + If you set to false, then + the contents of /etc/passwd and /etc/group will be congruent to your NixOS configuration. For instance, if you remove a user from - users.users - and run nixos-rebuild, the user account will cease to exist. Also, - imperative commands for managing users and groups, such as useradd, - are no longer available. Passwords may still be assigned by setting - the user's + and run nixos-rebuild, the user + account will cease to exist. Also, imperative commands for managing + users and groups, such as useradd, are no longer available. + Passwords may still be assigned by setting the user's hashedPassword option. A hashed password can be generated using mkpasswd -m sha-512. diff --git a/nixos/doc/manual/from_md/configuration/wayland.chapter.xml b/nixos/doc/manual/from_md/configuration/wayland.chapter.xml index 166925f67d22..1e90d4f31177 100644 --- a/nixos/doc/manual/from_md/configuration/wayland.chapter.xml +++ b/nixos/doc/manual/from_md/configuration/wayland.chapter.xml @@ -26,7 +26,6 @@ xdg.portal.wlr.enable = true; and configure Pipewire using - services.pipewire.enable - and related options. + and related options. diff --git a/nixos/doc/manual/from_md/configuration/x-windows.chapter.xml b/nixos/doc/manual/from_md/configuration/x-windows.chapter.xml index 8e67c66f1526..274d0d817bc1 100644 --- a/nixos/doc/manual/from_md/configuration/x-windows.chapter.xml +++ b/nixos/doc/manual/from_md/configuration/x-windows.chapter.xml @@ -128,8 +128,8 @@ services.xserver.displayManager.autoLogin.user = "alice"; The results vary depending on the hardware, so you may have to try both drivers. Use the option - services.xserver.videoDrivers - to set one. The recommended configuration for modern systems is: + to set one. + The recommended configuration for modern systems is: services.xserver.videoDrivers = [ "modesetting" ]; @@ -204,10 +204,8 @@ services.xserver.videoDrivers = [ "amdgpu-pro" ]; services.xserver.libinput.enable = true; - The driver has many options (see - Appendix A, Configuration - Options). For instance, the following disables tap-to-click - behavior: + The driver has many options (see ). + For instance, the following disables tap-to-click behavior: services.xserver.libinput.touchpad.tapping = false; diff --git a/nixos/doc/manual/from_md/configuration/xfce.chapter.xml b/nixos/doc/manual/from_md/configuration/xfce.chapter.xml index 0066baa2dc70..f96ef2e8c483 100644 --- a/nixos/doc/manual/from_md/configuration/xfce.chapter.xml +++ b/nixos/doc/manual/from_md/configuration/xfce.chapter.xml @@ -23,16 +23,16 @@ services.picom = { Some Xfce programs are not installed automatically. To install them manually (system wide), put them into your - environment.systemPackages - from pkgs.xfce. + from + pkgs.xfce.
Thunar Plugins If you'd like to add extra plugins to Thunar, add them to - services.xserver.desktopManager.xfce.thunarPlugins. + . You shouldn't just add them to - environment.systemPackages. + .
From 2d466c7adc2daa950290467f245b2d24a36231f6 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 4 Jul 2021 08:29:41 +0800 Subject: [PATCH 061/167] nixos: improve indentation in nixos/doc/manual/configuration/gpu-accel.chapter.md --- .../manual/configuration/gpu-accel.chapter.md | 30 +++++++++---------- .../configuration/gpu-accel.chapter.xml | 30 +++++++++---------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/nixos/doc/manual/configuration/gpu-accel.chapter.md b/nixos/doc/manual/configuration/gpu-accel.chapter.md index fd7b772c452b..08b6af5d98ae 100644 --- a/nixos/doc/manual/configuration/gpu-accel.chapter.md +++ b/nixos/doc/manual/configuration/gpu-accel.chapter.md @@ -56,8 +56,8 @@ enables OpenCL support: ```nix hardware.opengl.extraPackages = [ - rocm-opencl-icd - ]; + rocm-opencl-icd +]; ``` ### Intel {#sec-gpu-accel-opencl-intel} @@ -77,8 +77,8 @@ configuration can be used: ```nix hardware.opengl.extraPackages = [ - intel-compute-runtime - ]; + intel-compute-runtime +]; ``` ## Vulkan {#sec-gpu-accel-vulkan} @@ -144,19 +144,19 @@ A specific driver can be forced as follows: ```nix hardware.opengl.extraPackages = [ - pkgs.amdvlk - ]; + pkgs.amdvlk +]; - # To enable Vulkan support for 32-bit applications, also add: - hardware.opengl.extraPackages32 = [ - pkgs.driversi686Linux.amdvlk - ]; +# To enable Vulkan support for 32-bit applications, also add: +hardware.opengl.extraPackages32 = [ + pkgs.driversi686Linux.amdvlk +]; - # Force radv - environment.variables.AMD_VULKAN_ICD = "RADV"; - # Or - environment.variables.VK_ICD_FILENAMES = - "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json"; +# Force radv +environment.variables.AMD_VULKAN_ICD = "RADV"; +# Or +environment.variables.VK_ICD_FILENAMES = + "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json"; ``` ## Common issues {#sec-gpu-accel-common-issues} diff --git a/nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml b/nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml index 28fb86d57a50..8e780c5dee95 100644 --- a/nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml +++ b/nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml @@ -64,8 +64,8 @@ Platform Vendor Advanced Micro Devices, Inc. hardware.opengl.extraPackages = [ - rocm-opencl-icd - ]; + rocm-opencl-icd +];
@@ -87,8 +87,8 @@ hardware.opengl.extraPackages = [ hardware.opengl.extraPackages = [ - intel-compute-runtime - ]; + intel-compute-runtime +];
@@ -164,19 +164,19 @@ GPU1: hardware.opengl.extraPackages = [ - pkgs.amdvlk - ]; + pkgs.amdvlk +]; - # To enable Vulkan support for 32-bit applications, also add: - hardware.opengl.extraPackages32 = [ - pkgs.driversi686Linux.amdvlk - ]; +# To enable Vulkan support for 32-bit applications, also add: +hardware.opengl.extraPackages32 = [ + pkgs.driversi686Linux.amdvlk +]; - # Force radv - environment.variables.AMD_VULKAN_ICD = "RADV"; - # Or - environment.variables.VK_ICD_FILENAMES = - "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json"; +# Force radv +environment.variables.AMD_VULKAN_ICD = "RADV"; +# Or +environment.variables.VK_ICD_FILENAMES = + "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json"; From 227811ac97db3e1b158a91815d0c521e4f56ae20 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 4 Jul 2021 08:42:44 +0800 Subject: [PATCH 062/167] nixos: use only URI fragment in manual options links --- .../configuration/profiles/all-hardware.section.md | 2 +- .../manual/configuration/profiles/demo.section.md | 2 +- .../profiles/docker-container.section.md | 2 +- .../configuration/profiles/graphical.section.md | 8 ++++---- .../configuration/profiles/hardened.section.md | 2 +- .../configuration/profiles/headless.section.md | 8 ++++---- .../profiles/installation-device.section.md | 6 +++--- .../configuration/profiles/minimal.section.md | 8 ++++---- .../configuration/profiles/all-hardware.section.xml | 5 ++--- .../from_md/configuration/profiles/demo.section.xml | 2 +- .../profiles/docker-container.section.xml | 2 +- .../configuration/profiles/graphical.section.xml | 13 +++++-------- .../configuration/profiles/hardened.section.xml | 3 +-- .../configuration/profiles/headless.section.xml | 11 ++++------- .../profiles/installation-device.section.xml | 9 ++++----- .../configuration/profiles/minimal.section.xml | 12 +++++------- 16 files changed, 42 insertions(+), 53 deletions(-) diff --git a/nixos/doc/manual/configuration/profiles/all-hardware.section.md b/nixos/doc/manual/configuration/profiles/all-hardware.section.md index 0344b32c52f9..e2dd7c76089c 100644 --- a/nixos/doc/manual/configuration/profiles/all-hardware.section.md +++ b/nixos/doc/manual/configuration/profiles/all-hardware.section.md @@ -6,6 +6,6 @@ use is in the NixOS installation CDs. The enabled kernel modules include support for SATA and PATA, SCSI (partially), USB, Firewire (untested), Virtio (QEMU, KVM, etc.), VMware, and -Hyper-V. Additionally, [`hardware.enableAllFirmware`](options.html#opt-hardware.enableAllFirmware) is +Hyper-V. Additionally, [](#opt-hardware.enableAllFirmware) is enabled, and the firmware for the ZyDAS ZD1211 chipset is specifically installed. diff --git a/nixos/doc/manual/configuration/profiles/demo.section.md b/nixos/doc/manual/configuration/profiles/demo.section.md index a50f5a00adad..0a0df483c123 100644 --- a/nixos/doc/manual/configuration/profiles/demo.section.md +++ b/nixos/doc/manual/configuration/profiles/demo.section.md @@ -1,4 +1,4 @@ # Demo {#sec-profile-demo} This profile just enables a `demo` user, with password `demo`, uid `1000`, `wheel` group and -[autologin in the SDDM display manager](options.html#opt-services.xserver.displayManager.autoLogin). +[autologin in the SDDM display manager](#opt-services.xserver.displayManager.autoLogin). diff --git a/nixos/doc/manual/configuration/profiles/docker-container.section.md b/nixos/doc/manual/configuration/profiles/docker-container.section.md index 59954112c30e..f3e29b92f5e6 100644 --- a/nixos/doc/manual/configuration/profiles/docker-container.section.md +++ b/nixos/doc/manual/configuration/profiles/docker-container.section.md @@ -4,4 +4,4 @@ This is the profile from which the Docker images are generated. It prepares a working system by importing the [Minimal](#sec-profile-minimal) and [Clone Config](#sec-profile-clone-config) profiles, and setting appropriate configuration options that are useful inside a container -context, like [`boot.isContainer`](options.html#opt-boot.isContainer). +context, like [](#opt-boot.isContainer). diff --git a/nixos/doc/manual/configuration/profiles/graphical.section.md b/nixos/doc/manual/configuration/profiles/graphical.section.md index 767cde9b79e6..aaea5c8c0288 100644 --- a/nixos/doc/manual/configuration/profiles/graphical.section.md +++ b/nixos/doc/manual/configuration/profiles/graphical.section.md @@ -3,8 +3,8 @@ Defines a NixOS configuration with the Plasma 5 desktop. It's used by the graphical installation CD. -It sets [`services.xserver.enable`](options.html#opt-services.xserver.enable), -[`services.xserver.displayManager.sddm.enable`](options.html#opt-services.xserver.displayManager.sddm.enable), -[`services.xserver.desktopManager.plasma5.enable`](options.html#opt-services.xserver.desktopManager.plasma5.enable), -and [`services.xserver.libinput.enable`](options.html#opt-services.xserver.libinput.enable) to true. It also +It sets [](#opt-services.xserver.enable), +[](#opt-services.xserver.displayManager.sddm.enable), +[](#opt-services.xserver.desktopManager.plasma5.enable), +and [](#opt-services.xserver.libinput.enable) to true. It also includes glxinfo and firefox in the system packages list. diff --git a/nixos/doc/manual/configuration/profiles/hardened.section.md b/nixos/doc/manual/configuration/profiles/hardened.section.md index 958da94d261b..9fb5e18c384a 100644 --- a/nixos/doc/manual/configuration/profiles/hardened.section.md +++ b/nixos/doc/manual/configuration/profiles/hardened.section.md @@ -8,7 +8,7 @@ available to processes through the `/sys` and `/proc` filesystems. It also disables the User Namespaces feature of the kernel, which stops Nix from being able to build anything (this particular setting can be overriden via -[`security.allowUserNamespaces`](options.html#opt-security.allowUserNamespaces)). See the +[](#opt-security.allowUserNamespaces)). See the [profile source](https://github.com/nixos/nixpkgs/tree/master/nixos/modules/profiles/hardened.nix) for further detail on which settings are altered. diff --git a/nixos/doc/manual/configuration/profiles/headless.section.md b/nixos/doc/manual/configuration/profiles/headless.section.md index 1db4a82a4dea..d185a9a774b7 100644 --- a/nixos/doc/manual/configuration/profiles/headless.section.md +++ b/nixos/doc/manual/configuration/profiles/headless.section.md @@ -2,8 +2,8 @@ Common configuration for headless machines (e.g., Amazon EC2 instances). -Disables [sound](options.html#opt-sound.enable), -[vesa](options.html#opt-boot.vesa), serial consoles, -[emergency mode](options.html#opt-systemd.enableEmergencyMode), -[grub splash images](options.html#opt-boot.loader.grub.splashImage) +Disables [sound](#opt-sound.enable), +[vesa](#opt-boot.vesa), serial consoles, +[emergency mode](#opt-systemd.enableEmergencyMode), +[grub splash images](#opt-boot.loader.grub.splashImage) and configures the kernel to reboot automatically on panic. diff --git a/nixos/doc/manual/configuration/profiles/installation-device.section.md b/nixos/doc/manual/configuration/profiles/installation-device.section.md index aa5678c031a3..ae9f8fa7757f 100644 --- a/nixos/doc/manual/configuration/profiles/installation-device.section.md +++ b/nixos/doc/manual/configuration/profiles/installation-device.section.md @@ -6,15 +6,15 @@ This enables redistributable firmware, includes the and a copy of the Nixpkgs channel, so `nixos-install` works out of the box. -Documentation for [Nixpkgs](options.html#opt-documentation.enable) -and [NixOS](options.html#opt-documentation.nixos.enable) are +Documentation for [Nixpkgs](#opt-documentation.enable) +and [NixOS](#opt-documentation.nixos.enable) are forcefully enabled (to override the [Minimal profile](#sec-profile-minimal) preference); the NixOS manual is shown automatically on TTY 8, udisks is disabled. Autologin is enabled as `nixos` user, while passwordless login as both `root` and `nixos` is possible. Passwordless `sudo` is enabled too. -[wpa_supplicant](options.html#opt-networking.wireless.enable) is +[wpa_supplicant](#opt-networking.wireless.enable) is enabled, but configured to not autostart. It is explained how to login, start the ssh server, and if available, diff --git a/nixos/doc/manual/configuration/profiles/minimal.section.md b/nixos/doc/manual/configuration/profiles/minimal.section.md index d5a569d66209..02a3b65ae422 100644 --- a/nixos/doc/manual/configuration/profiles/minimal.section.md +++ b/nixos/doc/manual/configuration/profiles/minimal.section.md @@ -2,8 +2,8 @@ This profile defines a small NixOS configuration. It does not contain any graphical stuff. It's a very short file that enables -[noXlibs](options.html#opt-environment.noXlibs), sets -[`i18n.supportedLocales`](options.html#opt-i18n.supportedLocales) to +[noXlibs](#opt-environment.noXlibs), sets +[](#opt-i18n.supportedLocales) to only support the user-selected locale, -[disables packages' documentation](options.html#opt-documentation.enable), -and [disables sound](options.html#opt-sound.enable). +[disables packages' documentation](#opt-documentation.enable), +and [disables sound](#opt-sound.enable). diff --git a/nixos/doc/manual/from_md/configuration/profiles/all-hardware.section.xml b/nixos/doc/manual/from_md/configuration/profiles/all-hardware.section.xml index e355ffb752d5..43ac5edea7f8 100644 --- a/nixos/doc/manual/from_md/configuration/profiles/all-hardware.section.xml +++ b/nixos/doc/manual/from_md/configuration/profiles/all-hardware.section.xml @@ -9,8 +9,7 @@ The enabled kernel modules include support for SATA and PATA, SCSI (partially), USB, Firewire (untested), Virtio (QEMU, KVM, etc.), VMware, and Hyper-V. Additionally, - hardware.enableAllFirmware - is enabled, and the firmware for the ZyDAS ZD1211 chipset is - specifically installed. + is enabled, and + the firmware for the ZyDAS ZD1211 chipset is specifically installed. diff --git a/nixos/doc/manual/from_md/configuration/profiles/demo.section.xml b/nixos/doc/manual/from_md/configuration/profiles/demo.section.xml index 8b8c09118d92..09c2680a1067 100644 --- a/nixos/doc/manual/from_md/configuration/profiles/demo.section.xml +++ b/nixos/doc/manual/from_md/configuration/profiles/demo.section.xml @@ -4,7 +4,7 @@ This profile just enables a demo user, with password demo, uid 1000, wheel group and - autologin + autologin in the SDDM display manager. diff --git a/nixos/doc/manual/from_md/configuration/profiles/docker-container.section.xml b/nixos/doc/manual/from_md/configuration/profiles/docker-container.section.xml index 28dcd2b1a2d4..97c2a92dcab5 100644 --- a/nixos/doc/manual/from_md/configuration/profiles/docker-container.section.xml +++ b/nixos/doc/manual/from_md/configuration/profiles/docker-container.section.xml @@ -7,6 +7,6 @@ Clone Config profiles, and setting appropriate configuration options that are useful inside a container context, like - boot.isContainer. + . diff --git a/nixos/doc/manual/from_md/configuration/profiles/graphical.section.xml b/nixos/doc/manual/from_md/configuration/profiles/graphical.section.xml index 644a8ea590bb..1b109519d436 100644 --- a/nixos/doc/manual/from_md/configuration/profiles/graphical.section.xml +++ b/nixos/doc/manual/from_md/configuration/profiles/graphical.section.xml @@ -5,13 +5,10 @@ by the graphical installation CD. - It sets - services.xserver.enable, - services.xserver.displayManager.sddm.enable, - services.xserver.desktopManager.plasma5.enable, - and - services.xserver.libinput.enable - to true. It also includes glxinfo and firefox in the system packages - list. + It sets , + , + , + and to true. + It also includes glxinfo and firefox in the system packages list. diff --git a/nixos/doc/manual/from_md/configuration/profiles/hardened.section.xml b/nixos/doc/manual/from_md/configuration/profiles/hardened.section.xml index a08bc8432306..44c11786d940 100644 --- a/nixos/doc/manual/from_md/configuration/profiles/hardened.section.xml +++ b/nixos/doc/manual/from_md/configuration/profiles/hardened.section.xml @@ -10,8 +10,7 @@ /proc filesystems. It also disables the User Namespaces feature of the kernel, which stops Nix from being able to build anything (this particular setting can be overriden via - security.allowUserNamespaces). - See the + ). See the profile source for further detail on which settings are altered. diff --git a/nixos/doc/manual/from_md/configuration/profiles/headless.section.xml b/nixos/doc/manual/from_md/configuration/profiles/headless.section.xml index a89551abd411..0910b9ffaad2 100644 --- a/nixos/doc/manual/from_md/configuration/profiles/headless.section.xml +++ b/nixos/doc/manual/from_md/configuration/profiles/headless.section.xml @@ -5,13 +5,10 @@ instances). - Disables - sound, - vesa, serial - consoles, - emergency - mode, - grub + Disables sound, + vesa, serial consoles, + emergency + mode, grub splash images and configures the kernel to reboot automatically on panic. diff --git a/nixos/doc/manual/from_md/configuration/profiles/installation-device.section.xml b/nixos/doc/manual/from_md/configuration/profiles/installation-device.section.xml index 8a8265c03c03..837e69df06e1 100644 --- a/nixos/doc/manual/from_md/configuration/profiles/installation-device.section.xml +++ b/nixos/doc/manual/from_md/configuration/profiles/installation-device.section.xml @@ -9,17 +9,16 @@ Documentation for - Nixpkgs - and - NixOS - are forcefully enabled (to override the + Nixpkgs and + NixOS are + forcefully enabled (to override the Minimal profile preference); the NixOS manual is shown automatically on TTY 8, udisks is disabled. Autologin is enabled as nixos user, while passwordless login as both root and nixos is possible. Passwordless sudo is enabled too. - wpa_supplicant + wpa_supplicant is enabled, but configured to not autostart. diff --git a/nixos/doc/manual/from_md/configuration/profiles/minimal.section.xml b/nixos/doc/manual/from_md/configuration/profiles/minimal.section.xml index 5653b3f01c3f..a3fe30357dff 100644 --- a/nixos/doc/manual/from_md/configuration/profiles/minimal.section.xml +++ b/nixos/doc/manual/from_md/configuration/profiles/minimal.section.xml @@ -3,13 +3,11 @@ This profile defines a small NixOS configuration. It does not contain any graphical stuff. It’s a very short file that enables - noXlibs, - sets - i18n.supportedLocales - to only support the user-selected locale, - disables - packages’ documentation, and - disables + noXlibs, sets + to only support the + user-selected locale, + disables packages’ + documentation, and disables sound. From b69b26c1a11ec79c2a5b5c6a189f54deda5f4673 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 4 Jul 2021 08:56:20 +0800 Subject: [PATCH 063/167] nixos: use only URI fragment in manual options links --- .../manual/administration/boot-problems.section.md | 2 +- .../manual/administration/service-mgmt.chapter.md | 6 ++---- .../from_md/administration/boot-problems.section.xml | 2 +- .../from_md/administration/service-mgmt.chapter.xml | 12 +++++------- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/nixos/doc/manual/administration/boot-problems.section.md b/nixos/doc/manual/administration/boot-problems.section.md index eb9209602a32..d7843327c19e 100644 --- a/nixos/doc/manual/administration/boot-problems.section.md +++ b/nixos/doc/manual/administration/boot-problems.section.md @@ -16,7 +16,7 @@ If NixOS fails to boot, there are a number of kernel command line parameters tha `boot.debug1mounts` -: Like `boot.debug1` or `boot.debug1devices`, but runs stage1 until all filesystems that are mounted during initrd are mounted (see [neededForBoot](#opt-fileSystems._name_.neededForBoot)). As a motivating example, this could be useful if you've forgotten to set [neededForBoot](options.html#opt-fileSystems._name_.neededForBoot) on a file system. +: Like `boot.debug1` or `boot.debug1devices`, but runs stage1 until all filesystems that are mounted during initrd are mounted (see [neededForBoot](#opt-fileSystems._name_.neededForBoot)). As a motivating example, this could be useful if you've forgotten to set [neededForBoot](#opt-fileSystems._name_.neededForBoot) on a file system. `boot.trace` diff --git a/nixos/doc/manual/administration/service-mgmt.chapter.md b/nixos/doc/manual/administration/service-mgmt.chapter.md index ccf61c929ed1..bb0f9b62e913 100644 --- a/nixos/doc/manual/administration/service-mgmt.chapter.md +++ b/nixos/doc/manual/administration/service-mgmt.chapter.md @@ -96,13 +96,11 @@ the service on boot. *User* systemd services on the other hand, should be treated differently. Given a package that has a systemd unit file at -`#pkg-out#/lib/systemd/user/`, using -[`systemd.packages`](options.html#opt-systemd.packages) will +`#pkg-out#/lib/systemd/user/`, using [](#opt-systemd.packages) will make you able to start the service via `systemctl --user start`, but it won\'t start automatically on login. However, You can imperatively enable it by adding the package\'s attribute to -[`systemd.packages`](options.html#opt-systemd.packages) -and then do this (e.g): +[](#opt-systemd.packages) and then do this (e.g): ```ShellSession $ mkdir -p ~/.config/systemd/user/default.target.wants diff --git a/nixos/doc/manual/from_md/administration/boot-problems.section.xml b/nixos/doc/manual/from_md/administration/boot-problems.section.xml index b484d075818a..d169baad7474 100644 --- a/nixos/doc/manual/from_md/administration/boot-problems.section.xml +++ b/nixos/doc/manual/from_md/administration/boot-problems.section.xml @@ -61,7 +61,7 @@ neededForBoot). As a motivating example, this could be useful if you’ve forgotten to set - neededForBoot + neededForBoot on a file system. diff --git a/nixos/doc/manual/from_md/administration/service-mgmt.chapter.xml b/nixos/doc/manual/from_md/administration/service-mgmt.chapter.xml index 68dc45f3f88a..8b01b8f896a4 100644 --- a/nixos/doc/manual/from_md/administration/service-mgmt.chapter.xml +++ b/nixos/doc/manual/from_md/administration/service-mgmt.chapter.xml @@ -109,13 +109,11 @@ systemd.packages = [ pkgs.packagekit ]; User systemd services on the other hand, should be treated differently. Given a package that has a systemd unit file at #pkg-out#/lib/systemd/user/, using - systemd.packages - will make you able to start the service via - systemctl --user start, but it won't start - automatically on login. However, You can imperatively enable it by - adding the package's attribute to - systemd.packages - and then do this (e.g): + will make you able to + start the service via systemctl --user start, + but it won't start automatically on login. However, You can + imperatively enable it by adding the package's attribute to + and then do this (e.g): $ mkdir -p ~/.config/systemd/user/default.target.wants From ef37170c6dee5ce3c98126e12d09541fdf1e82ea Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 4 Jul 2021 09:11:53 +0800 Subject: [PATCH 064/167] nixos: use only URI fragment in manual options links --- .../configuration/config-file.section.md | 2 +- .../configuration/modularity.section.md | 10 +++++----- .../configuration/config-file.section.xml | 6 +++--- .../configuration/modularity.section.xml | 20 +++++++++---------- 4 files changed, 18 insertions(+), 20 deletions(-) diff --git a/nixos/doc/manual/configuration/config-file.section.md b/nixos/doc/manual/configuration/config-file.section.md index 9254544177cc..f21ba113bf8c 100644 --- a/nixos/doc/manual/configuration/config-file.section.md +++ b/nixos/doc/manual/configuration/config-file.section.md @@ -30,7 +30,7 @@ enable the Apache HTTP Server with `/webroot` as the document root. Sets can be nested, and in fact dots in option names are shorthand for defining a set containing another set. For instance, -[`services.httpd.enable`](options.html#opt-services.httpd.enable) defines a set named +[](#opt-services.httpd.enable) defines a set named `services` that contains a set named `httpd`, which in turn contains an option definition named `enable` with value `true`. This means that the example above can also be written as: diff --git a/nixos/doc/manual/configuration/modularity.section.md b/nixos/doc/manual/configuration/modularity.section.md index 23854cb503e0..3395ace20c4f 100644 --- a/nixos/doc/manual/configuration/modularity.section.md +++ b/nixos/doc/manual/configuration/modularity.section.md @@ -34,9 +34,9 @@ Here, we include two modules from the same directory, `vpn.nix` and ``` Note that both `configuration.nix` and `kde.nix` define the option -[`environment.systemPackages`](options.html#opt-environment.systemPackages). When multiple modules define an +[](#opt-environment.systemPackages). When multiple modules define an option, NixOS will try to *merge* the definitions. In the case of -[`environment.systemPackages`](options.html#opt-environment.systemPackages), that's easy: the lists of +[](#opt-environment.systemPackages), that's easy: the lists of packages can simply be concatenated. The value in `configuration.nix` is merged last, so for list-type options, it will appear at the end of the merged list. If you want it to appear first, you can use `mkBefore`: @@ -49,7 +49,7 @@ This causes the `kvm-intel` kernel module to be loaded before any other kernel modules. For other types of options, a merge may not be possible. For instance, -if two modules define [`services.httpd.adminAddr`](options.html#opt-services.httpd.adminAddr), +if two modules define [](#opt-services.httpd.adminAddr), `nixos-rebuild` will give an error: ```plain @@ -68,8 +68,8 @@ defined in other modules. This is what the `config` function argument is for: it contains the complete, merged system configuration. That is, `config` is the result of combining the configurations returned by every module [^1] . For example, here is a module that adds some packages to -[`environment.systemPackages`](options.html#opt-environment.systemPackages) only if -[`services.xserver.enable`](options.html#opt-services.xserver.enable) is set to `true` somewhere else: +[](#opt-environment.systemPackages) only if +[](#opt-services.xserver.enable) is set to `true` somewhere else: ```nix { config, pkgs, ... }: diff --git a/nixos/doc/manual/from_md/configuration/config-file.section.xml b/nixos/doc/manual/from_md/configuration/config-file.section.xml index b7ba17b8ceec..952c6e600302 100644 --- a/nixos/doc/manual/from_md/configuration/config-file.section.xml +++ b/nixos/doc/manual/from_md/configuration/config-file.section.xml @@ -37,9 +37,9 @@ Sets can be nested, and in fact dots in option names are shorthand for defining a set containing another set. For instance, - services.httpd.enable - defines a set named services that contains a set - named httpd, which in turn contains an option + defines a set named + services that contains a set named + httpd, which in turn contains an option definition named enable with value true. This means that the example above can also be written as: diff --git a/nixos/doc/manual/from_md/configuration/modularity.section.xml b/nixos/doc/manual/from_md/configuration/modularity.section.xml index d5db37c13cfb..a7688090fcc5 100644 --- a/nixos/doc/manual/from_md/configuration/modularity.section.xml +++ b/nixos/doc/manual/from_md/configuration/modularity.section.xml @@ -40,12 +40,12 @@ Note that both configuration.nix and kde.nix define the option - environment.systemPackages. - When multiple modules define an option, NixOS will try to + . When multiple + modules define an option, NixOS will try to merge the definitions. In the case of - environment.systemPackages, - that’s easy: the lists of packages can simply be concatenated. The - value in configuration.nix is merged last, so for + , that’s easy: the + lists of packages can simply be concatenated. The value in + configuration.nix is merged last, so for list-type options, it will appear at the end of the merged list. If you want it to appear first, you can use mkBefore: @@ -60,7 +60,7 @@ boot.kernelModules = mkBefore [ "kvm-intel" ]; For other types of options, a merge may not be possible. For instance, if two modules define - services.httpd.adminAddr, + , nixos-rebuild will give an error: @@ -89,11 +89,9 @@ services.httpd.adminAddr = pkgs.lib.mkForce "bob@example.org"; configuration value depends on itself. . For example, here is a module that adds some packages - to - environment.systemPackages - only if - services.xserver.enable - is set to true somewhere else: + to only if + is set to + true somewhere else: { config, pkgs, ... }: From a3480a0e6959f69bdbafe31c4cce2c731a929934 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 4 Jul 2021 09:18:03 +0800 Subject: [PATCH 065/167] nixos: use only URI fragment in manual options links --- .../from_md/installation/changing-config.chapter.xml | 8 ++++---- nixos/doc/manual/installation/changing-config.chapter.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/doc/manual/from_md/installation/changing-config.chapter.xml b/nixos/doc/manual/from_md/installation/changing-config.chapter.xml index c88fc6bbdafb..86f0b15b41c5 100644 --- a/nixos/doc/manual/from_md/installation/changing-config.chapter.xml +++ b/nixos/doc/manual/from_md/installation/changing-config.chapter.xml @@ -17,10 +17,10 @@ This command doesn't start/stop - user - services automatically. nixos-rebuild - only runs a daemon-reload for each user with - running user services. + user services + automatically. nixos-rebuild only runs a + daemon-reload for each user with running user + services. diff --git a/nixos/doc/manual/installation/changing-config.chapter.md b/nixos/doc/manual/installation/changing-config.chapter.md index 4ed6859ce246..8a404f085d7c 100644 --- a/nixos/doc/manual/installation/changing-config.chapter.md +++ b/nixos/doc/manual/installation/changing-config.chapter.md @@ -13,7 +13,7 @@ booting, and try to realise the configuration in the running system (e.g., by restarting system services). ::: {.warning} -This command doesn\'t start/stop [user services](options.html#opt-systemd.user.services) +This command doesn\'t start/stop [user services](#opt-systemd.user.services) automatically. `nixos-rebuild` only runs a `daemon-reload` for each user with running user services. ::: From 69bf2d1ed5e4d933cc395a5a25d2b5181d26ffd6 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 4 Jul 2021 09:56:26 +0800 Subject: [PATCH 066/167] nixos: use only URI fragment in manual options links --- .../manual/configuration/ad-hoc-network-config.section.md | 2 +- nixos/doc/manual/configuration/firewall.section.md | 4 ++-- nixos/doc/manual/configuration/ipv4-config.section.md | 2 +- nixos/doc/manual/configuration/ipv6-config.section.md | 4 ++-- nixos/doc/manual/configuration/network-manager.section.md | 2 +- .../manual/configuration/renaming-interfaces.section.md | 2 +- nixos/doc/manual/configuration/ssh.section.md | 2 +- .../configuration/ad-hoc-network-config.section.xml | 5 ++--- .../doc/manual/from_md/configuration/firewall.section.xml | 4 ++-- .../manual/from_md/configuration/ipv4-config.section.xml | 2 +- .../manual/from_md/configuration/ipv6-config.section.xml | 8 ++++---- .../from_md/configuration/network-manager.section.xml | 6 +++--- .../from_md/configuration/renaming-interfaces.section.xml | 4 ++-- nixos/doc/manual/from_md/configuration/ssh.section.xml | 4 ++-- 14 files changed, 25 insertions(+), 26 deletions(-) diff --git a/nixos/doc/manual/configuration/ad-hoc-network-config.section.md b/nixos/doc/manual/configuration/ad-hoc-network-config.section.md index 9131f42842b7..4478d77f361d 100644 --- a/nixos/doc/manual/configuration/ad-hoc-network-config.section.md +++ b/nixos/doc/manual/configuration/ad-hoc-network-config.section.md @@ -1,6 +1,6 @@ # Ad-Hoc Configuration {#ad-hoc-network-config} -You can use [`networking.localCommands`](options.html#opt-networking.localCommands) to +You can use [](#opt-networking.localCommands) to specify shell commands to be run at the end of `network-setup.service`. This is useful for doing network configuration not covered by the existing NixOS modules. For instance, to statically configure an IPv6 address: diff --git a/nixos/doc/manual/configuration/firewall.section.md b/nixos/doc/manual/configuration/firewall.section.md index 40f7fb7c6d51..dbf0ffb9273e 100644 --- a/nixos/doc/manual/configuration/firewall.section.md +++ b/nixos/doc/manual/configuration/firewall.section.md @@ -17,7 +17,7 @@ networking.firewall.allowedTCPPorts = [ 80 443 ]; Note that TCP port 22 (ssh) is opened automatically if the SSH daemon is enabled (`services.openssh.enable = true`). UDP ports can be opened through -[`networking.firewall.allowedUDPPorts`](options.html#opt-networking.firewall.allowedUDPPorts). +[](#opt-networking.firewall.allowedUDPPorts). To open ranges of TCP ports: @@ -29,4 +29,4 @@ networking.firewall.allowedTCPPortRanges = [ ``` Similarly, UDP port ranges can be opened through -[`networking.firewall.allowedUDPPortRanges`](options.html#opt-networking.firewall.allowedUDPPortRanges). +[](#opt-networking.firewall.allowedUDPPortRanges). diff --git a/nixos/doc/manual/configuration/ipv4-config.section.md b/nixos/doc/manual/configuration/ipv4-config.section.md index 8a870df60945..c73024b856d7 100644 --- a/nixos/doc/manual/configuration/ipv4-config.section.md +++ b/nixos/doc/manual/configuration/ipv4-config.section.md @@ -25,7 +25,7 @@ Statically configured interfaces are set up by the systemd service configuration is performed by `network-setup.service`. ::: -The host name is set using [`networking.hostName`](options.html#opt-networking.hostName): +The host name is set using [](#opt-networking.hostName): ```nix networking.hostName = "cartman"; diff --git a/nixos/doc/manual/configuration/ipv6-config.section.md b/nixos/doc/manual/configuration/ipv6-config.section.md index 6d51a21aa64a..ce66f53ed472 100644 --- a/nixos/doc/manual/configuration/ipv6-config.section.md +++ b/nixos/doc/manual/configuration/ipv6-config.section.md @@ -3,9 +3,9 @@ IPv6 is enabled by default. Stateless address autoconfiguration is used to automatically assign IPv6 addresses to all interfaces, and Privacy Extensions (RFC 4946) are enabled by default. You can adjust the default -for this by setting [`networking.tempAddresses`](options.html#opt-networking.tempAddresses). This option +for this by setting [](#opt-networking.tempAddresses). This option may be overridden on a per-interface basis by -[`networking.interfaces..tempAddress`](options.html#opt-networking.interfaces._name_.tempAddress). You can disable +[](#opt-networking.interfaces._name_.tempAddress). You can disable IPv6 support globally by setting: ```nix diff --git a/nixos/doc/manual/configuration/network-manager.section.md b/nixos/doc/manual/configuration/network-manager.section.md index f269d5bbd170..4bda21d34a10 100644 --- a/nixos/doc/manual/configuration/network-manager.section.md +++ b/nixos/doc/manual/configuration/network-manager.section.md @@ -22,7 +22,7 @@ NetworkManager is controlled using either `nmcli` or `nmtui` details on their usage. Some desktop environments (GNOME, KDE) have their own configuration tools for NetworkManager. On XFCE, there is no configuration tool for NetworkManager by default: by enabling -[`programs.nm-applet.enable`](options.html#opt-programs.nm-applet.enable), the graphical applet will be +[](#opt-programs.nm-applet.enable), the graphical applet will be installed and will launch automatically when the graphical session is started. diff --git a/nixos/doc/manual/configuration/renaming-interfaces.section.md b/nixos/doc/manual/configuration/renaming-interfaces.section.md index affa1e0147da..b124e8303fee 100644 --- a/nixos/doc/manual/configuration/renaming-interfaces.section.md +++ b/nixos/doc/manual/configuration/renaming-interfaces.section.md @@ -14,7 +14,7 @@ settings can result in a [name change](https://github.com/systemd/systemd/issues/3715#issue-165347602). If this is undesirable, for example if you have a single ethernet card, you can revert to the traditional scheme by setting -[`networking.usePredictableInterfaceNames`](options.html#opt-networking.usePredictableInterfaceNames) +[](#opt-networking.usePredictableInterfaceNames) to `false`. ## Assigning custom names {#sec-custom-ifnames} diff --git a/nixos/doc/manual/configuration/ssh.section.md b/nixos/doc/manual/configuration/ssh.section.md index 9390108ad8b2..cba81eb43f49 100644 --- a/nixos/doc/manual/configuration/ssh.section.md +++ b/nixos/doc/manual/configuration/ssh.section.md @@ -8,7 +8,7 @@ services.openssh.enable = true; By default, root logins using a password are disallowed. They can be disabled entirely by setting -[`services.openssh.permitRootLogin`](options.html#opt-services.openssh.permitRootLogin) to `"no"`. +[](#opt-services.openssh.permitRootLogin) to `"no"`. You can declaratively specify authorised RSA/DSA public keys for a user as follows: diff --git a/nixos/doc/manual/from_md/configuration/ad-hoc-network-config.section.xml b/nixos/doc/manual/from_md/configuration/ad-hoc-network-config.section.xml index 0424642b978c..035ee3122e15 100644 --- a/nixos/doc/manual/from_md/configuration/ad-hoc-network-config.section.xml +++ b/nixos/doc/manual/from_md/configuration/ad-hoc-network-config.section.xml @@ -1,9 +1,8 @@
Ad-Hoc Configuration - You can use - networking.localCommands - to specify shell commands to be run at the end of + You can use to + specify shell commands to be run at the end of network-setup.service. This is useful for doing network configuration not covered by the existing NixOS modules. For instance, to statically configure an IPv6 address: diff --git a/nixos/doc/manual/from_md/configuration/firewall.section.xml b/nixos/doc/manual/from_md/configuration/firewall.section.xml index ebb121f75ffb..24c19bb1c66d 100644 --- a/nixos/doc/manual/from_md/configuration/firewall.section.xml +++ b/nixos/doc/manual/from_md/configuration/firewall.section.xml @@ -21,7 +21,7 @@ networking.firewall.allowedTCPPorts = [ 80 443 ]; daemon is enabled (services.openssh.enable = true). UDP ports can be opened through - networking.firewall.allowedUDPPorts. + . To open ranges of TCP ports: @@ -34,6 +34,6 @@ networking.firewall.allowedTCPPortRanges = [ Similarly, UDP port ranges can be opened through - networking.firewall.allowedUDPPortRanges. + .
diff --git a/nixos/doc/manual/from_md/configuration/ipv4-config.section.xml b/nixos/doc/manual/from_md/configuration/ipv4-config.section.xml index 06a70b65cfbc..047ba2165f07 100644 --- a/nixos/doc/manual/from_md/configuration/ipv4-config.section.xml +++ b/nixos/doc/manual/from_md/configuration/ipv4-config.section.xml @@ -30,7 +30,7 @@ networking.nameservers = [ "8.8.8.8" ]; The host name is set using - networking.hostName: + : networking.hostName = "cartman"; diff --git a/nixos/doc/manual/from_md/configuration/ipv6-config.section.xml b/nixos/doc/manual/from_md/configuration/ipv6-config.section.xml index ac3c2cd4b21c..137c3d772a86 100644 --- a/nixos/doc/manual/from_md/configuration/ipv6-config.section.xml +++ b/nixos/doc/manual/from_md/configuration/ipv6-config.section.xml @@ -5,10 +5,10 @@ used to automatically assign IPv6 addresses to all interfaces, and Privacy Extensions (RFC 4946) are enabled by default. You can adjust the default for this by setting - networking.tempAddresses. - This option may be overridden on a per-interface basis by - networking.interfaces.<name>.tempAddress. - You can disable IPv6 support globally by setting: + . This option may be + overridden on a per-interface basis by + . You + can disable IPv6 support globally by setting: networking.enableIPv6 = false; diff --git a/nixos/doc/manual/from_md/configuration/network-manager.section.xml b/nixos/doc/manual/from_md/configuration/network-manager.section.xml index fd3f26ab621c..8f0d6d680ae0 100644 --- a/nixos/doc/manual/from_md/configuration/network-manager.section.xml +++ b/nixos/doc/manual/from_md/configuration/network-manager.section.xml @@ -25,9 +25,9 @@ users.users.alice.extraGroups = [ "networkmanager" ]; environments (GNOME, KDE) have their own configuration tools for NetworkManager. On XFCE, there is no configuration tool for NetworkManager by default: by enabling - programs.nm-applet.enable, - the graphical applet will be installed and will launch automatically - when the graphical session is started. + , the graphical + applet will be installed and will launch automatically when the + graphical session is started. diff --git a/nixos/doc/manual/from_md/configuration/renaming-interfaces.section.xml b/nixos/doc/manual/from_md/configuration/renaming-interfaces.section.xml index 80c162ca85e0..1c32e30b3f85 100644 --- a/nixos/doc/manual/from_md/configuration/renaming-interfaces.section.xml +++ b/nixos/doc/manual/from_md/configuration/renaming-interfaces.section.xml @@ -18,8 +18,8 @@ change. If this is undesirable, for example if you have a single ethernet card, you can revert to the traditional scheme by setting - networking.usePredictableInterfaceNames - to false. + to + false.
Assigning custom names diff --git a/nixos/doc/manual/from_md/configuration/ssh.section.xml b/nixos/doc/manual/from_md/configuration/ssh.section.xml index 46046064535e..037418d8ea4d 100644 --- a/nixos/doc/manual/from_md/configuration/ssh.section.xml +++ b/nixos/doc/manual/from_md/configuration/ssh.section.xml @@ -9,8 +9,8 @@ services.openssh.enable = true; By default, root logins using a password are disallowed. They can be disabled entirely by setting - services.openssh.permitRootLogin - to "no". + to + "no". You can declaratively specify authorised RSA/DSA public keys for a From 45a5a6815c90cddd21b358a6bd314f777b01821f Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 4 Jul 2021 10:12:05 +0800 Subject: [PATCH 067/167] nixos: use only URI fragment in manual options links --- .../manual/configuration/adding-custom-packages.section.md | 2 +- .../doc/manual/configuration/customizing-packages.section.md | 2 +- .../from_md/configuration/adding-custom-packages.section.xml | 3 +-- .../from_md/configuration/customizing-packages.section.xml | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/nixos/doc/manual/configuration/adding-custom-packages.section.md b/nixos/doc/manual/configuration/adding-custom-packages.section.md index 14370c891260..5d1198fb0f41 100644 --- a/nixos/doc/manual/configuration/adding-custom-packages.section.md +++ b/nixos/doc/manual/configuration/adding-custom-packages.section.md @@ -13,7 +13,7 @@ $ cd nixpkgs ``` Then you write and test the package as described in the Nixpkgs manual. -Finally, you add it to [`environment.systemPackages`](options.html#opt-environment.systemPackages), e.g. +Finally, you add it to [](#opt-environment.systemPackages), e.g. ```nix environment.systemPackages = [ pkgs.my-package ]; diff --git a/nixos/doc/manual/configuration/customizing-packages.section.md b/nixos/doc/manual/configuration/customizing-packages.section.md index 480aed61211e..bceeeb2d7a16 100644 --- a/nixos/doc/manual/configuration/customizing-packages.section.md +++ b/nixos/doc/manual/configuration/customizing-packages.section.md @@ -28,7 +28,7 @@ arguments specified by you. So here the function argument `gtk` gets the value `pkgs.gtk3`, causing Emacs to depend on GTK 3. (The parentheses are necessary because in Nix, function application binds more weakly than list construction, so without them, -[`environment.systemPackages`](options.html#opt-environment.systemPackages) +[](#opt-environment.systemPackages) would be a list with two elements.) Even greater customisation is possible using the function diff --git a/nixos/doc/manual/from_md/configuration/adding-custom-packages.section.xml b/nixos/doc/manual/from_md/configuration/adding-custom-packages.section.xml index 80e3aa692128..4fa40d61966e 100644 --- a/nixos/doc/manual/from_md/configuration/adding-custom-packages.section.xml +++ b/nixos/doc/manual/from_md/configuration/adding-custom-packages.section.xml @@ -16,8 +16,7 @@ $ cd nixpkgs Then you write and test the package as described in the Nixpkgs manual. Finally, you add it to - environment.systemPackages, - e.g. + , e.g. environment.systemPackages = [ pkgs.my-package ]; diff --git a/nixos/doc/manual/from_md/configuration/customizing-packages.section.xml b/nixos/doc/manual/from_md/configuration/customizing-packages.section.xml index 661fb8475b38..f78b5dc5460c 100644 --- a/nixos/doc/manual/from_md/configuration/customizing-packages.section.xml +++ b/nixos/doc/manual/from_md/configuration/customizing-packages.section.xml @@ -33,8 +33,8 @@ environment.systemPackages = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ]; pkgs.gtk3, causing Emacs to depend on GTK 3. (The parentheses are necessary because in Nix, function application binds more weakly than list construction, so without them, - environment.systemPackages - would be a list with two elements.) + would be a list + with two elements.) Even greater customisation is possible using the function From a49d36b979104205d016bb67d5ad6391df43e9ed Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 12 Jul 2021 04:38:41 +0200 Subject: [PATCH 068/167] doc: Move lua filters to subdirectory --- doc/Makefile | 2 +- .../pandoc-filters/docbook-writer}/labelless-link-is-xref.lua | 0 nixos/doc/manual/md-to-db.sh | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename doc/{ => build-aux/pandoc-filters/docbook-writer}/labelless-link-is-xref.lua (100%) diff --git a/doc/Makefile b/doc/Makefile index 1d3a0e7ccbdf..6eeaeca303c7 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -8,7 +8,7 @@ pandoc_media_dir = media pandoc_commonmark_enabled_extensions = +attributes+fenced_divs+footnotes+bracketed_spans+definition_lists+pipe_tables+raw_attribute pandoc_flags = --extract-media=$(pandoc_media_dir) \ --lua-filter=$(PANDOC_LUA_FILTERS_DIR)/diagram-generator.lua \ - --lua-filter=labelless-link-is-xref.lua \ + --lua-filter=build-aux/pandoc-filters/docbook-writer/labelless-link-is-xref.lua \ -f commonmark$(pandoc_commonmark_enabled_extensions)+smart .PHONY: all diff --git a/doc/labelless-link-is-xref.lua b/doc/build-aux/pandoc-filters/docbook-writer/labelless-link-is-xref.lua similarity index 100% rename from doc/labelless-link-is-xref.lua rename to doc/build-aux/pandoc-filters/docbook-writer/labelless-link-is-xref.lua diff --git a/nixos/doc/manual/md-to-db.sh b/nixos/doc/manual/md-to-db.sh index 7949b42e8d81..dee92fc57fa0 100755 --- a/nixos/doc/manual/md-to-db.sh +++ b/nixos/doc/manual/md-to-db.sh @@ -13,7 +13,7 @@ pushd $DIR pandoc_commonmark_enabled_extensions=+attributes+fenced_divs+footnotes+bracketed_spans+definition_lists+pipe_tables+raw_attribute pandoc_flags=( # media extraction and diagram-generator.lua not needed - "--lua-filter=$DIR/../../../doc/labelless-link-is-xref.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 ) From df55fbb62aea05fa3e48c4f7c2021bba49485ed5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 12 Jul 2021 04:44:46 +0200 Subject: [PATCH 069/167] doc: comment lua scripts --- .../docbook-writer/labelless-link-is-xref.lua | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/doc/build-aux/pandoc-filters/docbook-writer/labelless-link-is-xref.lua b/doc/build-aux/pandoc-filters/docbook-writer/labelless-link-is-xref.lua index 67569b020916..fa97729a28bc 100644 --- a/doc/build-aux/pandoc-filters/docbook-writer/labelless-link-is-xref.lua +++ b/doc/build-aux/pandoc-filters/docbook-writer/labelless-link-is-xref.lua @@ -1,3 +1,13 @@ +--[[ +Converts Link AST nodes with empty label to DocBook xref elements. + +This is a temporary script to be able use cross-references conveniently +using syntax taken from MyST, while we still use docbook-xsl +for generating the documentation. + +Reference: https://myst-parser.readthedocs.io/en/latest/using/syntax.html#targets-and-cross-referencing +]] + local function starts_with(start, str) return str:sub(1, #start) == start end From c9139dfa1a001e32baa6fea9c9373d80c83e39e9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 12 Jul 2021 15:54:14 +0200 Subject: [PATCH 070/167] doc: Add support for MyST roles Officially, only the manpage role is supported at the moment. Unlike in rST, the syntax uses braces instead of colons: {manpage}`nix.conf(5)` --- doc/Makefile | 4 +++ .../citerefentry-to-rst-role.lua | 23 ++++++++++++ .../docbook-writer/rst-roles.lua | 36 +++++++++++++++++++ .../pandoc-filters/myst-reader/roles.lua | 29 +++++++++++++++ .../pandoc-filters/myst-writer/roles.lua | 25 +++++++++++++ .../contributing-to-documentation.chapter.md | 5 +++ nixos/doc/manual/md-to-db.sh | 7 +++- 7 files changed, 128 insertions(+), 1 deletion(-) create mode 100644 doc/build-aux/pandoc-filters/docbook-reader/citerefentry-to-rst-role.lua create mode 100644 doc/build-aux/pandoc-filters/docbook-writer/rst-roles.lua create mode 100644 doc/build-aux/pandoc-filters/myst-reader/roles.lua create mode 100644 doc/build-aux/pandoc-filters/myst-writer/roles.lua diff --git a/doc/Makefile b/doc/Makefile index 6eeaeca303c7..9bcd30c150a2 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -6,8 +6,12 @@ pandoc_media_dir = media # NOTE: Keep in sync with NixOS manual (/nixos/doc/manual/md-to-db.sh). # TODO: Remove raw-attribute when we can get rid of DocBook altogether. pandoc_commonmark_enabled_extensions = +attributes+fenced_divs+footnotes+bracketed_spans+definition_lists+pipe_tables+raw_attribute +# Not needed: +# - docbook-reader/citerefentry-to-rst-role.lua (only relevant for DocBook → MarkDown/rST/MyST) pandoc_flags = --extract-media=$(pandoc_media_dir) \ --lua-filter=$(PANDOC_LUA_FILTERS_DIR)/diagram-generator.lua \ + --lua-filter=build-aux/pandoc-filters/myst-reader/roles.lua \ + --lua-filter=build-aux/pandoc-filters/docbook-writer/rst-roles.lua \ --lua-filter=build-aux/pandoc-filters/docbook-writer/labelless-link-is-xref.lua \ -f commonmark$(pandoc_commonmark_enabled_extensions)+smart diff --git a/doc/build-aux/pandoc-filters/docbook-reader/citerefentry-to-rst-role.lua b/doc/build-aux/pandoc-filters/docbook-reader/citerefentry-to-rst-role.lua new file mode 100644 index 000000000000..281e85af2717 --- /dev/null +++ b/doc/build-aux/pandoc-filters/docbook-reader/citerefentry-to-rst-role.lua @@ -0,0 +1,23 @@ +--[[ +Converts Code AST nodes produced by pandoc’s DocBook reader +from citerefentry elements into AST for corresponding role +for reStructuredText. + +We use subset of MyST syntax (CommonMark with features from rST) +so let’s use the rST AST for rST features. + +Reference: https://www.sphinx-doc.org/en/master/usage/restructuredtext/roles.html#role-manpage +]] + +function Code(elem) + elem.classes = elem.classes:map(function (x) + if x == 'citerefentry' then + elem.attributes['role'] = 'manpage' + return 'interpreted-text' + else + return x + end + end) + + return elem +end diff --git a/doc/build-aux/pandoc-filters/docbook-writer/rst-roles.lua b/doc/build-aux/pandoc-filters/docbook-writer/rst-roles.lua new file mode 100644 index 000000000000..92dc6895750f --- /dev/null +++ b/doc/build-aux/pandoc-filters/docbook-writer/rst-roles.lua @@ -0,0 +1,36 @@ +--[[ +Converts AST for reStructuredText roles into corresponding +DocBook elements. + +Currently, only a subset of roles is supported. + +Reference: + List of roles: + https://www.sphinx-doc.org/en/master/usage/restructuredtext/roles.html + manpage: + https://tdg.docbook.org/tdg/5.1/citerefentry.html + file: + https://tdg.docbook.org/tdg/5.1/filename.html +]] + +function Code(elem) + if elem.classes:includes('interpreted-text') then + local tag = nil + local content = elem.text + if elem.attributes['role'] == 'manpage' then + tag = 'citerefentry' + local title, volnum = content:match('^(.+)%((%w+)%)$') + if title == nil then + -- No volnum in parentheses. + title = content + end + content = '' .. title .. '' .. (volnum ~= nil and ('' .. volnum .. '') or '') + elseif elem.attributes['role'] == 'file' then + tag = 'filename' + end + + if tag ~= nil then + return pandoc.RawInline('docbook', '<' .. tag .. '>' .. content .. '') + end + end +end diff --git a/doc/build-aux/pandoc-filters/myst-reader/roles.lua b/doc/build-aux/pandoc-filters/myst-reader/roles.lua new file mode 100644 index 000000000000..c33a688eeba7 --- /dev/null +++ b/doc/build-aux/pandoc-filters/myst-reader/roles.lua @@ -0,0 +1,29 @@ +--[[ +Replaces Str AST nodes containing {role}, followed by a Code node +by a Code node with attrs that would be produced by rST reader +from the role syntax. + +This is to emulate MyST syntax in Pandoc. +(MyST is a CommonMark flavour with rST features mixed in.) + +Reference: https://myst-parser.readthedocs.io/en/latest/syntax/syntax.html#roles-an-in-line-extension-point +]] + +function Inlines(inlines) + for i = #inlines-1,1,-1 do + local first = inlines[i] + local second = inlines[i+1] + local correct_tags = first.tag == 'Str' and second.tag == 'Code' + if correct_tags then + -- docutils supports alphanumeric strings separated by [-._:] + -- We are slightly more liberal for simplicity. + local role = first.text:match('^{([-._+:%w]+)}$') + if role ~= nil then + inlines:remove(i) + second.attributes['role'] = role + second.classes:insert('interpreted-text') + end + end + end + return inlines +end diff --git a/doc/build-aux/pandoc-filters/myst-writer/roles.lua b/doc/build-aux/pandoc-filters/myst-writer/roles.lua new file mode 100644 index 000000000000..0136bc550652 --- /dev/null +++ b/doc/build-aux/pandoc-filters/myst-writer/roles.lua @@ -0,0 +1,25 @@ +--[[ +Replaces Code nodes with attrs that would be produced by rST reader +from the role syntax by a Str AST node containing {role}, followed by a Code node. + +This is to emulate MyST syntax in Pandoc. +(MyST is a CommonMark flavour with rST features mixed in.) + +Reference: https://myst-parser.readthedocs.io/en/latest/syntax/syntax.html#roles-an-in-line-extension-point +]] + +function Code(elem) + local role = elem.attributes['role'] + + if elem.classes:includes('interpreted-text') and role ~= nil then + elem.classes = elem.classes:filter(function (c) + return c ~= 'interpreted-text' + end) + elem.attributes['role'] = nil + + return { + pandoc.Str('{' .. role .. '}'), + elem, + } + end +end diff --git a/doc/contributing/contributing-to-documentation.chapter.md b/doc/contributing/contributing-to-documentation.chapter.md index 2f7ae32259c4..bf73a340bcef 100644 --- a/doc/contributing/contributing-to-documentation.chapter.md +++ b/doc/contributing/contributing-to-documentation.chapter.md @@ -52,6 +52,11 @@ Additionally, the following syntax extensions are currently used: This syntax is taken from [MyST](https://myst-parser.readthedocs.io/en/latest/using/syntax.html#targets-and-cross-referencing). +- []{#ssec-contributing-markup-inline-roles} + If you want to link to a man page, you can use ``{manpage}`nix.conf(5)```, which will turn into {manpage}`nix.conf(5)`. + + This syntax is taken from [MyST](https://myst-parser.readthedocs.io/en/latest/syntax/syntax.html#roles-an-in-line-extension-point). Though, the feature originates from [reStructuredText](https://www.sphinx-doc.org/en/master/usage/restructuredtext/roles.html#role-manpage) with slightly different syntax. + - []{#ssec-contributing-markup-admonitions} **Admonitions**, set off from the text to bring attention to something. diff --git a/nixos/doc/manual/md-to-db.sh b/nixos/doc/manual/md-to-db.sh index dee92fc57fa0..e5a1919baa28 100755 --- a/nixos/doc/manual/md-to-db.sh +++ b/nixos/doc/manual/md-to-db.sh @@ -12,7 +12,12 @@ pushd $DIR # TODO: Remove raw-attribute when we can get rid of DocBook altogether. pandoc_commonmark_enabled_extensions=+attributes+fenced_divs+footnotes+bracketed_spans+definition_lists+pipe_tables+raw_attribute pandoc_flags=( - # media extraction and diagram-generator.lua not needed + # Not needed: + # - diagram-generator.lua (we do not support that in NixOS manual to limit dependencies) + # - media extraction (was only required for diagram generator) + # - docbook-reader/citerefentry-to-rst-role.lua (only relevant for DocBook → MarkDown/rST/MyST) + "--lua-filter=$DIR/../../../doc/build-aux/pandoc-filters/myst-reader/roles.lua" + "--lua-filter=$DIR/../../../doc/build-aux/pandoc-filters/docbook-writer/rst-roles.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 From 04b59b0328daaa2e11f5e387ad3ec475cf2d2028 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 12 Jul 2021 18:40:33 +0200 Subject: [PATCH 071/167] doc: Linkify man page references --- doc/Makefile | 1 + .../link-unix-man-references.lua | 18 ++++++++++++++++++ .../contributing-to-documentation.chapter.md | 4 +++- nixos/doc/manual/md-to-db.sh | 1 + 4 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 doc/build-aux/pandoc-filters/link-unix-man-references.lua diff --git a/doc/Makefile b/doc/Makefile index 9bcd30c150a2..027a8b9e7bb2 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -11,6 +11,7 @@ pandoc_commonmark_enabled_extensions = +attributes+fenced_divs+footnotes+bracket pandoc_flags = --extract-media=$(pandoc_media_dir) \ --lua-filter=$(PANDOC_LUA_FILTERS_DIR)/diagram-generator.lua \ --lua-filter=build-aux/pandoc-filters/myst-reader/roles.lua \ + --lua-filter=build-aux/pandoc-filters/link-unix-man-references.lua \ --lua-filter=build-aux/pandoc-filters/docbook-writer/rst-roles.lua \ --lua-filter=build-aux/pandoc-filters/docbook-writer/labelless-link-is-xref.lua \ -f commonmark$(pandoc_commonmark_enabled_extensions)+smart diff --git a/doc/build-aux/pandoc-filters/link-unix-man-references.lua b/doc/build-aux/pandoc-filters/link-unix-man-references.lua new file mode 100644 index 000000000000..12431f140fed --- /dev/null +++ b/doc/build-aux/pandoc-filters/link-unix-man-references.lua @@ -0,0 +1,18 @@ +--[[ +Turns a manpage reference into a link, when a mapping is defined +in the unix-man-urls.lua file. +]] + +local man_urls = { + ["tmpfiles.d(5)"] = "https://www.freedesktop.org/software/systemd/man/tmpfiles.d.html", + ["nix.conf(5)"] = "https://nixos.org/manual/nix/stable/#sec-conf-file", + ["systemd.time(7)"] = "https://www.freedesktop.org/software/systemd/man/systemd.time.html", + ["systemd.timer(5)"] = "https://www.freedesktop.org/software/systemd/man/systemd.timer.html", +} + +function Code(elem) + local is_man_role = elem.classes:includes('interpreted-text') and elem.attributes['role'] == 'manpage' + if is_man_role and man_urls[elem.text] ~= nil then + return pandoc.Link(elem, man_urls[elem.text]) + end +end diff --git a/doc/contributing/contributing-to-documentation.chapter.md b/doc/contributing/contributing-to-documentation.chapter.md index bf73a340bcef..178fdb36262b 100644 --- a/doc/contributing/contributing-to-documentation.chapter.md +++ b/doc/contributing/contributing-to-documentation.chapter.md @@ -53,7 +53,9 @@ Additionally, the following syntax extensions are currently used: This syntax is taken from [MyST](https://myst-parser.readthedocs.io/en/latest/using/syntax.html#targets-and-cross-referencing). - []{#ssec-contributing-markup-inline-roles} - If you want to link to a man page, you can use ``{manpage}`nix.conf(5)```, which will turn into {manpage}`nix.conf(5)`. + If you want to link to a man page, you can use `` {manpage}`nix.conf(5)` ``, which will turn into {manpage}`nix.conf(5)`. + + The references will turn into links when a mapping exists in {file}`doc/build-aux/pandoc-filters/unix-man-urls.lua`. This syntax is taken from [MyST](https://myst-parser.readthedocs.io/en/latest/syntax/syntax.html#roles-an-in-line-extension-point). Though, the feature originates from [reStructuredText](https://www.sphinx-doc.org/en/master/usage/restructuredtext/roles.html#role-manpage) with slightly different syntax. diff --git a/nixos/doc/manual/md-to-db.sh b/nixos/doc/manual/md-to-db.sh index e5a1919baa28..f3c851db6c93 100755 --- a/nixos/doc/manual/md-to-db.sh +++ b/nixos/doc/manual/md-to-db.sh @@ -17,6 +17,7 @@ pandoc_flags=( # - media extraction (was only required for diagram generator) # - docbook-reader/citerefentry-to-rst-role.lua (only relevant for DocBook → MarkDown/rST/MyST) "--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/labelless-link-is-xref.lua" -f "commonmark${pandoc_commonmark_enabled_extensions}+smart" From da95ab11b41eec733dca5212ce16d16a15dc55d4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 12 Jul 2021 22:32:21 +0200 Subject: [PATCH 072/167] doc: Add helper for converting DocBook files to Markdown --- doc/Makefile | 2 +- maintainers/scripts/db-to-md.sh | 88 +++++++++++++++++ maintainers/scripts/doc/escape-code-markup.py | 97 +++++++++++++++++++ .../doc/replace-xrefs-by-empty-links.py | 32 ++++++ .../scripts/doc/unknown-code-language.lua | 12 +++ 5 files changed, 230 insertions(+), 1 deletion(-) create mode 100755 maintainers/scripts/db-to-md.sh create mode 100755 maintainers/scripts/doc/escape-code-markup.py create mode 100755 maintainers/scripts/doc/replace-xrefs-by-empty-links.py create mode 100644 maintainers/scripts/doc/unknown-code-language.lua diff --git a/doc/Makefile b/doc/Makefile index 027a8b9e7bb2..f8d2d7248fab 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -3,7 +3,7 @@ MD_TARGETS=$(addsuffix .xml, $(basename $(shell find . -type f -regex '.*\.md$$' PANDOC ?= pandoc pandoc_media_dir = media -# NOTE: Keep in sync with NixOS manual (/nixos/doc/manual/md-to-db.sh). +# NOTE: Keep in sync with NixOS manual (/nixos/doc/manual/md-to-db.sh) and conversion script (/maintainers/scripts/db-to-md.sh). # TODO: Remove raw-attribute when we can get rid of DocBook altogether. pandoc_commonmark_enabled_extensions = +attributes+fenced_divs+footnotes+bracketed_spans+definition_lists+pipe_tables+raw_attribute # Not needed: diff --git a/maintainers/scripts/db-to-md.sh b/maintainers/scripts/db-to-md.sh new file mode 100755 index 000000000000..01357d1e2412 --- /dev/null +++ b/maintainers/scripts/db-to-md.sh @@ -0,0 +1,88 @@ +#! /usr/bin/env nix-shell +#! nix-shell -I nixpkgs=. -i bash -p pandoc + +# This script is temporarily needed while we transition the manual to +# CommonMark. It converts DocBook files into our CommonMark flavour. + +debug= +files=() + +while [ "$#" -gt 0 ]; do + i="$1"; shift 1 + case "$i" in + --debug) + debug=1 + ;; + *) + files+=("$i") + ;; + esac +done + +echo "WARNING: This is an experimental script and might not preserve all formatting." > /dev/stderr +echo "Please report any issues you discover." > /dev/stderr + +outExtension="md" +if [[ $debug ]]; then + outExtension="json" +fi + +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" + +# NOTE: Keep in sync with Nixpkgs manual (/doc/Makefile). +# TODO: Remove raw-attribute when we can get rid of DocBook altogether. +pandoc_commonmark_enabled_extensions=+attributes+fenced_divs+footnotes+bracketed_spans+definition_lists+pipe_tables+raw_attribute +targetLang="commonmark${pandoc_commonmark_enabled_extensions}+smart" +if [[ $debug ]]; then + targetLang=json +fi +pandoc_flags=( + # Not needed: + # - diagram-generator.lua (we do not support that in NixOS manual to limit dependencies) + # - media extraction (was only required for diagram generator) + # - myst-reader/roles.lua (only relevant for MyST → DocBook) + # - link-unix-man-references.lua (links should only be added to display output) + # - docbook-writer/rst-roles.lua (only relevant for → DocBook) + # - docbook-writer/labelless-link-is-xref.lua (only relevant for → DocBook) + "--lua-filter=$DIR/../../doc/build-aux/pandoc-filters/docbook-reader/citerefentry-to-rst-role.lua" + "--lua-filter=$DIR/../../doc/build-aux/pandoc-filters/myst-writer/roles.lua" + "--lua-filter=$DIR/doc/unknown-code-language.lua" + -f docbook + -t "$targetLang" + --tab-stop=2 + --wrap=none +) + +for file in "${files[@]}"; do + if [[ ! -f "$file" ]]; then + echo "db-to-md.sh: $file does not exist" > /dev/stderr + exit 1 + else + rootElement=$(xmllint --xpath 'name(//*)' "$file") + + if [[ $rootElement = chapter ]]; then + extension=".chapter.$outExtension" + elif [[ $rootElement = section ]]; then + extension=".section.$outExtension" + else + echo "db-to-md.sh: $file contains an unsupported root element $rootElement" > /dev/stderr + exit 1 + fi + + outFile="${file%".section.xml"}" + outFile="${outFile%".chapter.xml"}" + outFile="${outFile%".xml"}$extension" + temp1=$(mktemp) + $DIR/doc/escape-code-markup.py "$file" "$temp1" + if [[ $debug ]]; then + echo "Converted $file to $temp1" > /dev/stderr + fi + temp2=$(mktemp) + $DIR/doc/replace-xrefs-by-empty-links.py "$temp1" "$temp2" + if [[ $debug ]]; then + echo "Converted $temp1 to $temp2" > /dev/stderr + fi + pandoc "$temp2" -o "$outFile" "${pandoc_flags[@]}" + echo "Converted $file to $outFile" > /dev/stderr + fi +done diff --git a/maintainers/scripts/doc/escape-code-markup.py b/maintainers/scripts/doc/escape-code-markup.py new file mode 100755 index 000000000000..015435b698e6 --- /dev/null +++ b/maintainers/scripts/doc/escape-code-markup.py @@ -0,0 +1,97 @@ +#! /usr/bin/env nix-shell +#! nix-shell -I nixpkgs=channel:nixos-unstable -i python3 -p python3 -p python3.pkgs.lxml + +""" +Pandoc will strip any markup within code elements so +let’s escape them so that they can be handled manually. +""" + +import lxml.etree as ET +import re +import sys + +def replace_element_by_text(el: ET.Element, text: str) -> None: + """ + Author: bernulf + Source: https://stackoverflow.com/a/10520552/160386 + SPDX-License-Identifier: CC-BY-SA-3.0 + """ + text = text + (el.tail or "") + parent = el.getparent() + if parent is not None: + previous = el.getprevious() + if previous is not None: + previous.tail = (previous.tail or "") + text + else: + parent.text = (parent.text or "") + text + parent.remove(el) + +DOCBOOK_NS = "http://docbook.org/ns/docbook" + +# List of elements that pandoc’s DocBook reader strips markup from. +# https://github.com/jgm/pandoc/blob/master/src/Text/Pandoc/Readers/DocBook.hs +code_elements = [ + # CodeBlock + "literallayout", + "screen", + "programlisting", + # Code (inline) + "classname", + "code", + "filename", + "envar", + "literal", + "computeroutput", + "prompt", + "parameter", + "option", + "markup", + "wordasword", + "command", + "varname", + "function", + "type", + "symbol", + "constant", + "userinput", + "systemitem", +] + +XMLNS_REGEX = re.compile(r'\s+xmlns(?::[^=]+)?="[^"]*"') +ROOT_ELEMENT_REGEX = re.compile(r'^\s*<[^>]+>') + +def remove_xmlns(match: re.Match) -> str: + """ + Removes xmlns attributes. + + Expects a match containing an opening tag. + """ + return XMLNS_REGEX.sub('', match.group(0)) + +if __name__ == '__main__': + assert len(sys.argv) >= 3, "usage: escape-code-markup.py " + + tree = ET.parse(sys.argv[1]) + name_predicate = " or ".join([f"local-name()='{el}'" for el in code_elements]) + + for markup in tree.xpath(f"//*[({name_predicate}) and namespace-uri()='{DOCBOOK_NS}']/*"): + text = ET.tostring(markup, encoding=str) + + # tostring adds xmlns attributes to the element we want to stringify + # as if it was supposed to be usable standalone. + # We are just converting it to CDATA so we do not care. + # Let’s strip the namespace declarations to keep the code clean. + # + # Note that this removes even namespaces that were potentially + # in the original file. Though, that should be very rare – + # most of the time, we will stringify empty DocBook elements + # like or or, at worst, with xlink:href attribute. + # + # Also note that the regex expects the root element to be first + # thing in the string. But that should be fine, the tostring method + # does not produce XML declaration or doctype by default. + text = ROOT_ELEMENT_REGEX.sub(remove_xmlns, text) + + replace_element_by_text(markup, text) + + tree.write(sys.argv[2]) diff --git a/maintainers/scripts/doc/replace-xrefs-by-empty-links.py b/maintainers/scripts/doc/replace-xrefs-by-empty-links.py new file mode 100755 index 000000000000..2006ef897f7a --- /dev/null +++ b/maintainers/scripts/doc/replace-xrefs-by-empty-links.py @@ -0,0 +1,32 @@ +#! /usr/bin/env nix-shell +#! nix-shell -I nixpkgs=channel:nixos-unstable -i python3 -p python3 -p python3.pkgs.lxml + +""" +Pandoc will try to resolve xrefs and replace them with regular links. +let’s replace them with links with empty labels which MyST +and our pandoc filters recognize as cross-references. +""" + +import lxml.etree as ET +import sys + +XLINK_NS = "http://www.w3.org/1999/xlink" + +ns = { + "db": "http://docbook.org/ns/docbook", +} + + +if __name__ == '__main__': + assert len(sys.argv) >= 3, "usage: replace-xrefs-by-empty-links.py " + + tree = ET.parse(sys.argv[1]) + for xref in tree.findall(".//db:xref", ns): + text = ET.tostring(xref, encoding=str) + parent = xref.getparent() + link = parent.makeelement('link') + target_name = xref.get("linkend") + link.set(f"{{{XLINK_NS}}}href", f"#{target_name}") + parent.replace(xref, link) + + tree.write(sys.argv[2]) diff --git a/maintainers/scripts/doc/unknown-code-language.lua b/maintainers/scripts/doc/unknown-code-language.lua new file mode 100644 index 000000000000..85d8df4690ba --- /dev/null +++ b/maintainers/scripts/doc/unknown-code-language.lua @@ -0,0 +1,12 @@ +--[[ +Adds “unknown” class to CodeBlock AST nodes without any classes. + +This will cause Pandoc to use fenced code block, which we prefer. +]] + +function CodeBlock(elem) + if #elem.classes == 0 then + elem.classes:insert('unknown') + return elem + end +end From 7baf180128a8422629b5178354ffd5961afd3702 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 12 Jul 2021 22:36:22 +0200 Subject: [PATCH 073/167] codeowners: Add Nixpkgs Markdown docs tooling --- .github/CODEOWNERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 64719a7bc3a8..0522144a5120 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -42,6 +42,12 @@ # Nixpkgs build-support /pkgs/build-support/writers @lassulus @Profpatsch +# Nixpkgs documentation +/maintainers/scripts/db-to-md.sh @jtojnar @ryantm +/maintainers/scripts/doc @jtojnar @ryantm +/doc/build-aux/pandoc-filters @jtojnar +/doc/contributing/contributing-to-documentation.chapter.md @jtojnar + # NixOS Internals /nixos/default.nix @nbp @infinisil /nixos/lib/from-env.nix @nbp @infinisil From 0d8df51c23fa29584a4618fefd9ba5c5c546c034 Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Mon, 9 Aug 2021 22:56:38 +0000 Subject: [PATCH 074/167] tpm2-tss: fix support for abrmd When introduced in #114080, the full path dlopen lookup patch introduced a regression which made it impossible to load tabrmd modules see https://github.com/NixOS/nixpkgs/issues/133248 https://github.com/NixOS/nixpkgs/pull/114080 Fixes #133248 Signed-off-by: Arthur Gautier --- .../libraries/tpm2-tss/default.nix | 4 +- .../tpm2-tss/no-dynamic-loader-path.patch | 234 ++++++++++++++++-- 2 files changed, 211 insertions(+), 27 deletions(-) diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix index a272cf8b9340..d367a56010ba 100644 --- a/pkgs/development/libraries/tpm2-tss/default.nix +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -38,9 +38,7 @@ stdenv.mkDerivation rec { substituteInPlace src/tss2-tcti/tctildr-dl.c \ --replace '@PREFIX@' $out/lib/ substituteInPlace ./test/unit/tctildr-dl.c \ - --replace ', "libtss2' ", \"$out/lib/libtss2" \ - --replace ', "foo' ", \"$out/lib/foo" \ - --replace ', TEST_TCTI_NAME' ", \"$out/lib/\"TEST_TCTI_NAME" + --replace '@PREFIX@' $out/lib ''; configureFlags = [ diff --git a/pkgs/development/libraries/tpm2-tss/no-dynamic-loader-path.patch b/pkgs/development/libraries/tpm2-tss/no-dynamic-loader-path.patch index 86cdcd1541e6..fc905885f506 100644 --- a/pkgs/development/libraries/tpm2-tss/no-dynamic-loader-path.patch +++ b/pkgs/development/libraries/tpm2-tss/no-dynamic-loader-path.patch @@ -1,12 +1,16 @@ diff --git a/src/tss2-tcti/tctildr-dl.c b/src/tss2-tcti/tctildr-dl.c -index b364695c..b13be3ef 100644 +index b364695c..d026de71 100644 --- a/src/tss2-tcti/tctildr-dl.c +++ b/src/tss2-tcti/tctildr-dl.c -@@ -85,7 +85,15 @@ handle_from_name(const char *file, - if (handle == NULL) { - return TSS2_TCTI_RC_BAD_REFERENCE; +@@ -116,6 +116,50 @@ handle_from_name(const char *file, + return TSS2_TCTI_RC_BAD_VALUE; } -- *handle = dlopen(file, RTLD_NOW); + *handle = dlopen(file_xfrm, RTLD_NOW); ++ if (*handle != NULL) { ++ return TSS2_RC_SUCCESS; ++ } else { ++ LOG_DEBUG("Failed to load TCTI for name \"%s\": %s", file, dlerror()); ++ } + size = snprintf(file_xfrm, + sizeof (file_xfrm), + "@PREFIX@%s", @@ -16,24 +20,206 @@ index b364695c..b13be3ef 100644 + return TSS2_TCTI_RC_BAD_VALUE; + } + *handle = dlopen(file_xfrm, RTLD_NOW); - if (*handle != NULL) { - return TSS2_RC_SUCCESS; - } else { -@@ -94,7 +102,7 @@ handle_from_name(const char *file, - /* 'name' alone didn't work, try libtss2-tcti-.so.0 */ - size = snprintf(file_xfrm, - sizeof (file_xfrm), -- TCTI_NAME_TEMPLATE_0, ++ if (*handle != NULL) { ++ return TSS2_RC_SUCCESS; ++ } else { ++ LOG_DEBUG("Could not load TCTI file: \"%s\": %s", file, dlerror()); ++ } ++ /* 'name' alone didn't work, try libtss2-tcti-.so.0 */ ++ size = snprintf(file_xfrm, ++ sizeof (file_xfrm), + "@PREFIX@" TCTI_NAME_TEMPLATE_0, - file); - if (size >= sizeof (file_xfrm)) { - LOG_ERROR("TCTI name truncated in transform."); -@@ -109,7 +117,7 @@ handle_from_name(const char *file, - /* libtss2-tcti-.so.0 didn't work, try libtss2-tcti-.so */ - size = snprintf(file_xfrm, - sizeof (file_xfrm), -- TCTI_NAME_TEMPLATE, ++ file); ++ if (size >= sizeof (file_xfrm)) { ++ LOG_ERROR("TCTI name truncated in transform."); ++ return TSS2_TCTI_RC_BAD_VALUE; ++ } ++ *handle = dlopen(file_xfrm, RTLD_NOW); ++ if (*handle != NULL) { ++ return TSS2_RC_SUCCESS; ++ } else { ++ LOG_DEBUG("Could not load TCTI file \"%s\": %s", file, dlerror()); ++ } ++ /* libtss2-tcti-.so.0 didn't work, try libtss2-tcti-.so */ ++ size = snprintf(file_xfrm, ++ sizeof (file_xfrm), + "@PREFIX@" TCTI_NAME_TEMPLATE, - file); - if (size >= sizeof (file_xfrm)) { - LOG_ERROR("TCTI name truncated in transform."); ++ file); ++ if (size >= sizeof (file_xfrm)) { ++ LOG_ERROR("TCTI name truncated in transform."); ++ return TSS2_TCTI_RC_BAD_VALUE; ++ } ++ *handle = dlopen(file_xfrm, RTLD_NOW); + if (*handle == NULL) { + LOG_DEBUG("Failed to load TCTI for name \"%s\": %s", file, dlerror()); + return TSS2_TCTI_RC_NOT_SUPPORTED; +diff --git a/test/unit/tctildr-dl.c b/test/unit/tctildr-dl.c +index 873a4531..c17b939e 100644 +--- a/test/unit/tctildr-dl.c ++++ b/test/unit/tctildr-dl.c +@@ -223,6 +223,18 @@ test_get_info_default_success (void **state) + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); + ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-default.so"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-default.so.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-default.so.so"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ + expect_string(__wrap_dlopen, filename, "libtss2-tcti-tabrmd.so.0"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, HANDLE); +@@ -255,6 +267,18 @@ test_get_info_default_info_fail (void **state) + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); + ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-default.so"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-default.so.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-default.so.so"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ + expect_string(__wrap_dlopen, filename, "libtss2-tcti-tabrmd.so.0"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, HANDLE); +@@ -407,6 +431,15 @@ test_tcti_fail_all (void **state) + expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-default.so.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-default.so"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-default.so.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-default.so.so"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); + + /* Skip over libtss2-tcti-tabrmd.so */ + expect_string(__wrap_dlopen, filename, "libtss2-tcti-tabrmd.so.0"); +@@ -418,6 +451,15 @@ test_tcti_fail_all (void **state) + expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-tabrmd.so.0.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-tabrmd.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-tabrmd.so.0.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-tabrmd.so.0.so"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); + + /* Skip over libtss2-tcti-device.so, /dev/tpmrm0 */ + expect_string(__wrap_dlopen, filename, "libtss2-tcti-device.so.0"); +@@ -429,6 +471,15 @@ test_tcti_fail_all (void **state) + expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-device.so.0.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-device.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-device.so.0.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-device.so.0.so"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); + + /* Skip over libtss2-tcti-device.so, /dev/tpm0 */ + expect_string(__wrap_dlopen, filename, "libtss2-tcti-device.so.0"); +@@ -440,6 +491,15 @@ test_tcti_fail_all (void **state) + expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-device.so.0.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-device.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-device.so.0.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-device.so.0.so"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); + + /* Skip over libtss2-tcti-swtpm.so */ + expect_string(__wrap_dlopen, filename, "libtss2-tcti-swtpm.so.0"); +@@ -451,6 +511,15 @@ test_tcti_fail_all (void **state) + expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-swtpm.so.0.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-swtpm.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-swtpm.so.0.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-swtpm.so.0.so"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); + + /* Skip over libtss2-tcti-mssim.so */ + expect_string(__wrap_dlopen, filename, "libtss2-tcti-mssim.so.0"); +@@ -462,6 +531,15 @@ test_tcti_fail_all (void **state) + expect_string(__wrap_dlopen, filename, "libtss2-tcti-libtss2-tcti-mssim.so.0.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-mssim.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-mssim.so.0.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-libtss2-tcti-mssim.so.0.so"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); + + TSS2_RC r; + TSS2_TCTI_CONTEXT *tcti; +@@ -490,6 +568,15 @@ test_info_from_name_handle_fail (void **state) + expect_string(__wrap_dlopen, filename, "libtss2-tcti-foo.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/foo"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-foo.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-foo.so"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); + + TSS2_RC rc = info_from_name ("foo", &info, &data); + assert_int_equal (rc, TSS2_TCTI_RC_NOT_SUPPORTED); +@@ -606,6 +693,15 @@ test_tctildr_get_info_from_name (void **state) + expect_string(__wrap_dlopen, filename, "libtss2-tcti-foo.so"); + expect_value(__wrap_dlopen, flags, RTLD_NOW); + will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/foo"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-foo.so.0"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); ++ expect_string(__wrap_dlopen, filename, "@PREFIX@/libtss2-tcti-foo.so"); ++ expect_value(__wrap_dlopen, flags, RTLD_NOW); ++ will_return(__wrap_dlopen, NULL); + + TSS2_RC rc = tctildr_get_info ("foo", &info, &data); + assert_int_equal (rc, TSS2_TCTI_RC_NOT_SUPPORTED); From 21cdf18de97ff61fad28baac5897fed531cdb944 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Aug 2021 22:41:26 +0000 Subject: [PATCH 075/167] drone-cli: 1.3.0 -> 1.3.1 --- .../tools/continuous-integration/drone-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/development/tools/continuous-integration/drone-cli/default.nix index 4534298d395e..0f98a51c6e17 100644 --- a/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -1,11 +1,11 @@ { lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { - version = "1.3.0"; + version = "1.3.1"; pname = "drone-cli"; revision = "v${version}"; - vendorSha256 = "sha256-I+UBa6gqkPRXNV72iyJcCBLYShZxMtHFHSK77mhDv+U="; + vendorSha256 = "sha256-IlQ83lhRiobjvXa4FvavwLAXe7Bi7oLXRAr+1kvIHhc="; doCheck = false; @@ -17,7 +17,7 @@ buildGoModule rec { owner = "drone"; repo = "drone-cli"; rev = revision; - sha256 = "sha256-j6drDMxvAVfQ1aCFooc9g9HhMRMlFZXGZPiuJZKBbY4="; + sha256 = "sha256-EUvwKQgQTX8wX9h/rMlCYuB0S/OhPo4Ynlz5QQOWJlU="; }; meta = with lib; { From d88c26b413a3b13c78b83a642d2c551900b5123f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 00:29:55 +0000 Subject: [PATCH 076/167] fluxctl: 1.23.2 -> 1.24.0 --- pkgs/applications/networking/cluster/fluxctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix index 003f6722d1da..b0ba47c0b9de 100644 --- a/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fluxctl"; - version = "1.23.2"; + version = "1.24.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = "flux"; rev = version; - sha256 = "sha256-Ypy462QYmRiQrnOYjBA4BrtPKMT7sNpWb4St3KMVqbI="; + sha256 = "sha256-YjZ73Qc1lXosHopW+ZsrIyv16YupgB6ZpdcSGaZuafQ="; }; - vendorSha256 = "sha256-GUeLbngahbjEXetCfFbwWhn7jtyqKu7I2dyfjKalUM0="; + vendorSha256 = "sha256-OlM0HXFLTLYOZuVCud3k8K5X89zdZVlNkhXZzh0eKXc="; nativeBuildInputs = [ installShellFiles ]; From 2c603aef1b52baf3b87ad27301da1a8c39c36f96 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 00:35:10 +0000 Subject: [PATCH 077/167] flyctl: 0.0.232 -> 0.0.233 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 71db0f89cd73..12cc519c3386 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.232"; + version = "0.0.233"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-VpHHkcN7VTMLBFMOTJcO6b2JIOZVcubJDKN04xXQIzA="; + sha256 = "sha256-qDFO9QV6ItYv/QsnXFCViWo2CQj7hGZftVMD22QL+uQ="; }; preBuild = '' @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "." ]; - vendorSha256 = "sha256-6t2aLSr78pEhrYI53OMQpfJqa65wQAxlz6+ksUtxzmI="; + vendorSha256 = "sha256-+g0VzgdArxUTT5wDw6ddZn9YDNOXHqysye6cIrCc3Iw="; doCheck = false; From 59d7d726f11b8c759ab1b804fa71c15cc1b25627 Mon Sep 17 00:00:00 2001 From: Malte Voos Date: Sat, 14 Aug 2021 22:16:58 +0200 Subject: [PATCH 078/167] nixos/gnunet: improve service configuration Co-authored-by: Michele Guerini Rocco Co-authored-by: Aaron Andersen --- nixos/modules/services/networking/gnunet.nix | 22 ++++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/networking/gnunet.nix b/nixos/modules/services/networking/gnunet.nix index 69d4ed047756..cf3d1841a979 100644 --- a/nixos/modules/services/networking/gnunet.nix +++ b/nixos/modules/services/networking/gnunet.nix @@ -6,12 +6,15 @@ let cfg = config.services.gnunet; - homeDir = "/var/lib/gnunet"; + stateDir = "/var/lib/gnunet"; - configFile = with cfg; pkgs.writeText "gnunetd.conf" + configFile = with cfg; '' [PATHS] - SERVICEHOME = ${homeDir} + GNUNET_HOME = ${stateDir} + GNUNET_RUNTIME_DIR = /run/gnunet + GNUNET_USER_RUNTIME_DIR = /run/gnunet + GNUNET_DATA_HOME = ${stateDir}/data [ats] WAN_QUOTA_IN = ${toString load.maxNetDownBandwidth} b @@ -137,8 +140,6 @@ in users.users.gnunet = { group = "gnunet"; description = "GNUnet User"; - home = homeDir; - createHome = true; uid = config.ids.uids.gnunet; }; @@ -148,17 +149,20 @@ in # so install them globally. environment.systemPackages = [ cfg.package ]; + environment.etc."gnunet.conf".text = configFile; + systemd.services.gnunet = { description = "GNUnet"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; + restartTriggers = [ configFile ]; path = [ cfg.package pkgs.miniupnpc ]; - environment.TMPDIR = "/tmp"; - serviceConfig.PrivateTmp = true; - serviceConfig.ExecStart = "${cfg.package}/lib/gnunet/libexec/gnunet-service-arm -c ${configFile}"; + serviceConfig.ExecStart = "${cfg.package}/lib/gnunet/libexec/gnunet-service-arm -c /etc/gnunet.conf"; serviceConfig.User = "gnunet"; serviceConfig.UMask = "0007"; - serviceConfig.WorkingDirectory = homeDir; + serviceConfig.WorkingDirectory = stateDir; + serviceConfig.RuntimeDirectory = "gnunet"; + serviceConfig.StateDirectory = "gnunet"; }; }; From c82ceee2edce72419959eaf1b980f12251ed008c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 1 Sep 2021 16:26:46 +0200 Subject: [PATCH 079/167] vtk_9: fix Qt support Passing enableQt to the package does not build QVTK and CMake warns: Manually-specified variables were not used by the project: VTK_Group_Qt --- pkgs/development/libraries/vtk/generic.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index 482e6be7bbcf..fb2b11511b99 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -73,8 +73,9 @@ in stdenv.mkDerivation rec { "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" "-DCMAKE_INSTALL_BINDIR=bin" + ] ++ optionals enableQt [ + "-D${if lib.versionOlder version "9.0" then "VTK_Group_Qt:BOOL=ON" else "VTK_GROUP_ENABLE_Qt:STRING=YES"}" ] - ++ optionals enableQt [ "-DVTK_Group_Qt:BOOL=ON" ] ++ optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ] ++ optionals enablePython [ "-DVTK_WRAP_PYTHON:BOOL=ON" From e6caf52f64d5a6347913a0d75c68edf63a66a302 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 1 Sep 2021 17:04:55 +0200 Subject: [PATCH 080/167] vtk_9: do not vendor libpng and libtiff Previously ldd did not show the dependencies so presumably, VTK 9 started linking them statically after build system changes, as hinted by the following CMake warning: Manually-specified variables were not used by the project: VTK_USE_SYSTEM_PNG VTK_USE_SYSTEM_TIFF --- pkgs/development/libraries/vtk/generic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index fb2b11511b99..a3d3824a5410 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -67,8 +67,8 @@ in stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" - "-DVTK_USE_SYSTEM_PNG=ON" - "-DVTK_USE_SYSTEM_TIFF=1" + "-D${if lib.versionOlder version "9.0" then "VTK_USE_SYSTEM_PNG" else "VTK_MODULE_USE_EXTERNAL_vtkpng"}=ON" + "-D${if lib.versionOlder version "9.0" then "VTK_USE_SYSTEM_TIFF" else "VTK_MODULE_USE_EXTERNAL_vtktiff"}=1" "-DOPENGL_INCLUDE_DIR=${libGL}/include" "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" From e6f94dea3ea3df9d84c6c1870779b8867ab16290 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 1 Sep 2021 17:17:59 +0200 Subject: [PATCH 081/167] vtk_7: Fix enableQt build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit VTK 7 builds with Qt 4 by default but we only support Qt 5, so let’s switch to that. Also Qt changed some headers so let’s backport the VTK patch to fix the build. --- pkgs/development/libraries/vtk/7.x.nix | 24 ++++++++++++++-------- pkgs/development/libraries/vtk/generic.nix | 2 ++ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/vtk/7.x.nix b/pkgs/development/libraries/vtk/7.x.nix index 860f17639454..615553f80f22 100644 --- a/pkgs/development/libraries/vtk/7.x.nix +++ b/pkgs/development/libraries/vtk/7.x.nix @@ -2,13 +2,21 @@ import ./generic.nix { majorVersion = "7.1"; minorVersion = "1"; sourceSha256 = "0nm7xwwj7rnsxjdv2ssviys8nhci4n9iiiqm2y14s520hl2dsp1d"; - patchesToFetch = [{ - url = "https://gitlab.kitware.com/vtk/vtk/-/commit/706f1b397df09a27ab8981ab9464547028d0c322.diff"; - sha256 = "1q3pi5h40g05pzpbqp75xlgzvbfvyw8raza51svmi7d8dlslqybx"; - } - { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch?id=c4256f68d3589570443075eccbbafacf661f785f"; - sha256 = "sha256:0bpwrdfmi15grsg4jy7bzj2z6511a0c160cmw5lsi65aabyh7cl5"; - } + patchesToFetch = [ + { + url = "https://gitlab.kitware.com/vtk/vtk/-/commit/706f1b397df09a27ab8981ab9464547028d0c322.diff"; + sha256 = "1q3pi5h40g05pzpbqp75xlgzvbfvyw8raza51svmi7d8dlslqybx"; + } + + { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch?id=c4256f68d3589570443075eccbbafacf661f785f"; + sha256 = "sha256:0bpwrdfmi15grsg4jy7bzj2z6511a0c160cmw5lsi65aabyh7cl5"; + } + + # Add missing include required with recent Qt. + { + url = "https://gitlab.kitware.com/vtk/vtk/-/commit/797f28697d5ba50c1fa2bc5596af626a3c277826.diff"; + sha256 = "BFjoKws1hVD3Ly9RS4lGN62J6RTyI1E8ATHrZdzg7ds="; + } ]; } diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index a3d3824a5410..c180b05e9521 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -75,6 +75,8 @@ in stdenv.mkDerivation rec { "-DCMAKE_INSTALL_BINDIR=bin" ] ++ optionals enableQt [ "-D${if lib.versionOlder version "9.0" then "VTK_Group_Qt:BOOL=ON" else "VTK_GROUP_ENABLE_Qt:STRING=YES"}" + ] ++ optionals (enableQt && lib.versionOlder version "8.0") [ + "-DVTK_QT_VERSION=5" ] ++ optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ] ++ optionals enablePython [ From 4991aadefc9bee858ab9d49d5dbcc81c2b2ba6ed Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Thu, 2 Sep 2021 12:52:55 -0700 Subject: [PATCH 082/167] mylvmbackup: init at 0.16 --- pkgs/tools/backup/mylvmbackup/default.nix | 50 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/tools/backup/mylvmbackup/default.nix diff --git a/pkgs/tools/backup/mylvmbackup/default.nix b/pkgs/tools/backup/mylvmbackup/default.nix new file mode 100644 index 000000000000..ba25c56c28fe --- /dev/null +++ b/pkgs/tools/backup/mylvmbackup/default.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, fetchurl +, perlPackages +, makeWrapper +}: + +stdenv.mkDerivation rec { + pname = "mylvmbackup"; + version = "0.16"; + + src = fetchurl { + url = "${meta.homepage}/${pname}-${version}.tar.gz"; + sha256 = "sha256-vb7M3EPIrxIz6jUwm241fzaEz2czqdCObrFgSOSgJRU="; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perlPackages.perl ]; + + dontConfigure = true; + + postPatch = '' + patchShebangs mylvmbackup + substituteInPlace Makefile \ + --replace "prefix = /usr/local" "prefix = ${builtins.placeholder "out"}" \ + --replace "sysconfdir = /etc" "sysconfdir = ${builtins.placeholder "out"}/etc" \ + --replace "/usr/bin/install" "install" + ''; + + postInstall = '' + wrapProgram "$out/bin/mylvmbackup" \ + --prefix PERL5LIB : "${perlPackages.makePerlPath ( + with perlPackages; [ + ConfigIniFiles + DBDmysql + DBI + TimeDate + FileCopyRecursive + ] + )}" + ''; + + meta = { + homepage = "https://www.lenzg.net/mylvmbackup/"; + description = "a tool for quickly creating full physical backups of a MySQL server's data files"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ ryantm ]; + platforms = with lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c62858ae99a3..5559bf7d4824 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7319,6 +7319,8 @@ with pkgs; mydumper = callPackage ../tools/backup/mydumper { }; + mylvmbackup = callPackage ../tools/backup/mylvmbackup { }; + mysql2pgsql = callPackage ../tools/misc/mysql2pgsql { }; mysqltuner = callPackage ../tools/misc/mysqltuner { }; From 151f3b03e56e6359c2ad2cb7fb52dd7fa24288f7 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Fri, 3 Sep 2021 15:33:01 +0300 Subject: [PATCH 083/167] nextcloud-client: 3.3.2 -> 3.3.3 --- pkgs/applications/networking/nextcloud-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 53168307ea7a..1781d37e6c9b 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -21,13 +21,13 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.3.2"; + version = "3.3.3"; src = fetchFromGitHub { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-sqoOppq0QdLcA2IFZYnixMNnFWb3x83tqTp6hqqVU14="; + sha256 = "sha256-QE6F+L1uy2Tmsf/DI8eUF5Ck+oE8CXDTpZS3xg2tiSs="; }; patches = [ From 513a3ae36c593ebba8a44bbe1e312d7611a12b00 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 4 Sep 2021 22:39:47 +0200 Subject: [PATCH 084/167] step-ca: re-enable tests on darwin by enabling local networking --- pkgs/tools/security/step-ca/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/step-ca/default.nix b/pkgs/tools/security/step-ca/default.nix index 9b645dcba927..85501ff18e6e 100644 --- a/pkgs/tools/security/step-ca/default.nix +++ b/pkgs/tools/security/step-ca/default.nix @@ -42,10 +42,9 @@ buildGoModule rec { install -Dm444 -t $out/lib/systemd/system systemd/step-ca.service ''; - # Tests fail on darwin with - # panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: bind: operation not permitted [recovered] - # probably some sandboxing issue - doCheck = stdenv.isLinux; + # Tests start http servers which need to bind to local addresses: + # panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: bind: operation not permitted + __darwinAllowLocalNetworking = true; meta = with lib; { description = "A private certificate authority (X.509 & SSH) & ACME server for secure automated certificate management, so you can use TLS everywhere & SSO for SSH"; From d26f8c444f868278b1dfe764daa049b40a986694 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 4 Sep 2021 18:43:33 -0300 Subject: [PATCH 085/167] st: small cosmetic rewrite --- .../terminal-emulators/st/default.nix | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/terminal-emulators/st/default.nix b/pkgs/applications/terminal-emulators/st/default.nix index 591b68b49ab0..3a2180ce8d82 100644 --- a/pkgs/applications/terminal-emulators/st/default.nix +++ b/pkgs/applications/terminal-emulators/st/default.nix @@ -2,34 +2,33 @@ , stdenv , fetchurl , pkg-config -, writeText -, libX11 -, ncurses , fontconfig , freetype +, libX11 , libXft +, ncurses +, writeText , conf ? null , patches ? [ ] , extraLibs ? [ ] }: -with lib; - stdenv.mkDerivation rec { pname = "st"; version = "0.8.4"; src = fetchurl { url = "https://dl.suckless.org/st/${pname}-${version}.tar.gz"; - sha256 = "19j66fhckihbg30ypngvqc9bcva47mp379ch5vinasjdxgn3qbfl"; + hash = "sha256-1C087OtNamXjLpClM249RG22EsP72evBeAvGyaAzRqY="; }; inherit patches; - configFile = optionalString (conf != null) (writeText "config.def.h" conf); + configFile = lib.optionalString (conf != null) + (writeText "config.def.h" conf); - postPatch = optionalString (conf != null) "cp ${configFile} config.def.h" - + optionalString stdenv.isDarwin '' + postPatch = lib.optionalString (conf != null) "cp ${configFile} config.def.h" + + lib.optionalString stdenv.isDarwin '' substituteInPlace config.mk --replace "-lrt" "" ''; @@ -52,11 +51,13 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall + TERMINFO=$out/share/terminfo make install PREFIX=$out + runHook postInstall ''; - meta = { + meta = with lib; { homepage = "https://st.suckless.org/"; description = "Simple Terminal for X from Suckless.org Community"; license = licenses.mit; From 72dfd9f635c1d1f702e05445865f076ca3d0565b Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 4 Sep 2021 19:07:29 -0300 Subject: [PATCH 086/167] xst: small cosmetic rewrite --- .../terminal-emulators/st/xst.nix | 27 ++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/terminal-emulators/st/xst.nix b/pkgs/applications/terminal-emulators/st/xst.nix index baa71a09b9eb..b8bceda50dcd 100644 --- a/pkgs/applications/terminal-emulators/st/xst.nix +++ b/pkgs/applications/terminal-emulators/st/xst.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, libX11, ncurses, libXext, libXft, fontconfig }: +{ lib +, stdenv +, fetchFromGitHub +, fontconfig +, libX11 +, libXext +, libXft +, ncurses +, pkg-config +}: stdenv.mkDerivation rec { pname = "xst"; @@ -11,11 +20,23 @@ stdenv.mkDerivation rec { sha256 = "nOJcOghtzFkl7B/4XeXptn2TdrGQ4QTKBo+t+9npxOA="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 ncurses libXext libXft fontconfig ]; + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + fontconfig + libX11 + libXext + libXft + ncurses + ]; installPhase = '' + runHook preInstall + TERMINFO=$out/share/terminfo make install PREFIX=$out + + runHook postInstall ''; meta = with lib; { From bf95b9a77053ec40b190759833e52bc5ba0d805d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Sep 2021 03:50:28 +0000 Subject: [PATCH 087/167] xdotool: 3.20210804.2 -> 3.20210903.1 --- pkgs/tools/X11/xdotool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/xdotool/default.nix b/pkgs/tools/X11/xdotool/default.nix index d917e54ec3fb..b9eca0d893a5 100644 --- a/pkgs/tools/X11/xdotool/default.nix +++ b/pkgs/tools/X11/xdotool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xdotool"; - version = "3.20210804.2"; + version = "3.20210903.1"; src = fetchFromGitHub { owner = "jordansissel"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7N5f/BFtq/m5MsXe7ZCTUTc1yp+JDJNRF1P9qB2l554="; + sha256 = "sha256-fmz/CJm1GgNOYjOfC6uNwDa8jV+GczPw8m6Qb2jw3rE="; }; nativeBuildInputs = [ pkg-config perl ]; From 6a57a78ec0b696a5382f9c91397d397f9efc574e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Sep 2021 04:19:29 +0000 Subject: [PATCH 088/167] worker: 4.8.1 -> 4.9.0 --- pkgs/applications/misc/worker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix index aaadc0cd4b70..21dc4a576952 100644 --- a/pkgs/applications/misc/worker/default.nix +++ b/pkgs/applications/misc/worker/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "worker"; - version = "4.8.1"; + version = "4.9.0"; src = fetchurl { url = "http://www.boomerangsworld.de/cms/worker/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-Cf4vx1f4GgjlhNtGUuXf8174v8PGJapm5L30XUdqbro="; + sha256 = "sha256-l9kWYswQ27erxmZIb+otPzeKFZNwP+d8QIqGuvMMM/k="; }; buildInputs = [ libX11 ]; From 9829823acb1871f9f49ec2ad5180a42f9efd880f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Sep 2021 04:27:46 +0000 Subject: [PATCH 089/167] xlockmore: 5.66 -> 5.67 --- pkgs/misc/screensavers/xlockmore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index 680f9c0a5bcb..7a1de8731d03 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "xlockmore"; - version = "5.66"; + version = "5.67"; src = fetchurl { url = "http://sillycycle.com/xlock/xlockmore-${version}.tar.xz"; - sha256 = "sha256-WXalw2YoKNFFIskOBvKN3PyOV3iP3gjri3pw6e87q3E="; + sha256 = "sha256-qGB+Fw4N9K+PcH07OPfOsNDhKHc9fhdeICCSaV9/I0w="; curlOpts = "--user-agent 'Mozilla/5.0'"; }; From 780956e7cf9545c334da188501b99f9d0f8fe75f Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Sun, 5 Sep 2021 10:47:17 +0200 Subject: [PATCH 090/167] sysklogd: support cross-compilation --- pkgs/os-specific/linux/sysklogd/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/os-specific/linux/sysklogd/default.nix b/pkgs/os-specific/linux/sysklogd/default.nix index af180b5e5241..78992a0f870a 100644 --- a/pkgs/os-specific/linux/sysklogd/default.nix +++ b/pkgs/os-specific/linux/sysklogd/default.nix @@ -14,6 +14,17 @@ stdenv.mkDerivation { installFlags = [ "BINDIR=$(out)/sbin" "MANDIR=$(out)/share/man" "INSTALL=install" ]; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + ]; + + postPatch = '' + # Disable stripping during installation, stripping will be done anyway. + # Fixes cross-compilation. + substituteInPlace Makefile \ + --replace "-m 500 -s" "-m 500" + ''; + preConfigure = '' sed -e 's@-o \''${MAN_USER} -g \''${MAN_GROUP} -m \''${MAN_PERMS} @@' -i Makefile From e4cbd7d9b5a0153d21f3055c2d754b0eb06e9255 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Sun, 5 Sep 2021 11:21:16 +0200 Subject: [PATCH 091/167] cabextract: support cross-compilation --- pkgs/tools/archivers/cabextract/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/archivers/cabextract/default.nix b/pkgs/tools/archivers/cabextract/default.nix index 4dddc4a5a6ae..c0c60aa1cde8 100644 --- a/pkgs/tools/archivers/cabextract/default.nix +++ b/pkgs/tools/archivers/cabextract/default.nix @@ -9,6 +9,12 @@ stdenv.mkDerivation rec { sha256 = "19qwhl2r8ip95q4vxzxg2kp4p125hjmc9762sns1dwwf7ikm7hmg"; }; + # Let's assume that fnmatch works for cross-compilation, otherwise it gives an error: + # undefined reference to `rpl_fnmatch'. + configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "ac_cv_func_fnmatch_works=yes" + ]; + meta = with lib; { homepage = "https://www.cabextract.org.uk/"; description = "Free Software for extracting Microsoft cabinet files"; From f91cbe80e4363726e5021e95c4b899030f3aea55 Mon Sep 17 00:00:00 2001 From: Leo Maroni Date: Sun, 5 Sep 2021 21:05:25 +0200 Subject: [PATCH 092/167] vouch-proxy: 0.32.0 -> 0.34.0 --- pkgs/servers/vouch-proxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/vouch-proxy/default.nix b/pkgs/servers/vouch-proxy/default.nix index 8badb4f8fdd9..3c0551a2de87 100644 --- a/pkgs/servers/vouch-proxy/default.nix +++ b/pkgs/servers/vouch-proxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vouch-proxy"; - version = "0.32.0"; + version = "0.34.0"; src = fetchFromGitHub { owner = "vouch"; repo = "vouch-proxy"; rev = "v${version}"; - sha256 = "sha256-thA3hsGNDifUc0XFsOB8cjJTrz4NY+NtK05a20AFzJ8="; + sha256 = "sha256-xkCnBRGSryFf90dOeoZKQhugX66zkF/gYF1v6N9yjTQ="; }; vendorSha256 = "sha256-ifH+420FIrib+zQtzzHtMMYd84BED+vgnRw4xToYIl4="; From 8c60eaa66a7b2bde36d39e1f295219162947ba25 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 5 Sep 2021 22:09:29 +0200 Subject: [PATCH 093/167] gocryptfs: build documentation on aarch64-darwin again because pandoc is now available --- pkgs/tools/filesystems/gocryptfs/default.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/tools/filesystems/gocryptfs/default.nix b/pkgs/tools/filesystems/gocryptfs/default.nix index 29750531db20..59b65d4e72ed 100644 --- a/pkgs/tools/filesystems/gocryptfs/default.nix +++ b/pkgs/tools/filesystems/gocryptfs/default.nix @@ -8,12 +8,6 @@ , libfido2 }: -let - # pandoc is currently broken on aarch64-darwin - # because of missing ghc - brokenPandoc = stdenv.isDarwin && stdenv.isAarch64; -in - buildGoModule rec { pname = "gocryptfs"; version = "2.1"; @@ -29,7 +23,6 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config - ] ++ lib.optionals (!brokenPandoc) [ pandoc ]; @@ -45,7 +38,7 @@ buildGoModule rec { subPackages = [ "." "gocryptfs-xray" "contrib/statfs" ]; - postBuild = lib.optionalString (!brokenPandoc) '' + postBuild = '' pushd Documentation/ mkdir -p $out/share/man/man1 # taken from Documentation/MANPAGE-render.bash From 69e85c1bf91d25c783cdbfa602139950074871e9 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sun, 5 Sep 2021 16:38:45 -0400 Subject: [PATCH 094/167] go-migrate: add meta.mainProgram --- pkgs/development/tools/go-migrate/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/go-migrate/default.nix b/pkgs/development/tools/go-migrate/default.nix index d07e3cd80d32..261da1ddbdf7 100644 --- a/pkgs/development/tools/go-migrate/default.nix +++ b/pkgs/development/tools/go-migrate/default.nix @@ -20,5 +20,6 @@ buildGoModule rec { description = "Database migrations. CLI and Golang library"; maintainers = with maintainers; [ offline ]; license = licenses.mit; + mainProgram = "migrate"; }; } From ac461b815edf7060e2570cf0fc4d9299831d0141 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Sep 2021 01:39:58 +0000 Subject: [PATCH 095/167] bibletime: 3.0.1 -> 3.0.2 --- pkgs/applications/misc/bibletime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index 3a0cc8ce44f6..176172236201 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -4,11 +4,11 @@ mkDerivation rec { pname = "bibletime"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { url = "https://github.com/bibletime/bibletime/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ay4o8mfgj/m3BBoBMXVgw0NTlaFgJQvLlNYvEZRXSiA="; + sha256 = "sha256-/JNjnU/DGD4YRtrKzX7t6MgNCZYihdgTJc+Jbr9IYJ4="; }; nativeBuildInputs = [ cmake pkg-config docbook_xml_dtd_45 ]; From 0b31008a5205cf266a9d2efd0c1d7ea304d04d51 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Sep 2021 02:02:51 +0000 Subject: [PATCH 096/167] brave: 1.28.106 -> 1.29.77 --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index fe7cfb6c7b36..f15abbd0d003 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.28.106"; + version = "1.29.77"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "gr8d5Dh6ZHb2kThVOA61BoGo64MB77qF7ualUY2RRq0="; + sha256 = "LJykdig44ACpvlaGogbwrbY9hCJT3CB4ZKDZ/IzaBOU="; }; dontConfigure = true; From bf7f16485bf13bd88c35d25338348935407f50bc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Sep 2021 02:28:24 +0000 Subject: [PATCH 097/167] cargo-tarpaulin: 0.18.0 -> 0.18.2 --- pkgs/development/tools/analysis/cargo-tarpaulin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index 338c711e5274..bb06e269aeb1 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; - version = "0.18.0"; + version = "0.18.2"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; rev = version; - sha256 = "sha256-j5VLxtu8Xg1fwDYWYJXGFUkfpgauG/5NauSniSZ7G2w="; + sha256 = "sha256-3ep90G6LW83XGyS9b465u8/SznJRZBhEV/YQU8fua1s="; }; nativeBuildInputs = [ @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl Security ]; - cargoSha256 = "sha256-1lFGczzcN4QPsIpEVQiSmNS7L+9rlSfxi+gopt2E7Ec="; + cargoSha256 = "sha256-UtFGuJ6HEUtonH43iuum1hrhnYesQpkyqPTVcqWAoiA="; #checkFlags = [ "--test-threads" "1" ]; doCheck = false; From ba3631c05593813a1bd30519c10a6d1e8c3ffd21 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Sep 2021 02:35:13 +0000 Subject: [PATCH 098/167] cfssl: 1.6.0 -> 1.6.1 --- pkgs/tools/security/cfssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix index 1e95d1d6f2f9..4b4e6cedc5cd 100644 --- a/pkgs/tools/security/cfssl/default.nix +++ b/pkgs/tools/security/cfssl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cfssl"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cfssl"; rev = "v${version}"; - sha256 = "sha256-29HEaW5LCoHcuJrfVUN2hnsRtaSTrvIBo8ok2UJbfuQ="; + sha256 = "sha256-QY04MecjQTmrkPkWcLkXJWErtaw7esb6GnPIKGTJL34="; }; subPackages = [ From 2312cef179544db7bedf6c9464a12ad41cd7eea6 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 5 Sep 2021 00:01:54 -0300 Subject: [PATCH 099/167] lukesmithxyz-st: init at 0.0.0+unstable=2021-08-10 --- .../0000-makefile-fix-install.diff | 14 +++++ .../st/lukesmithxyz-st/default.nix | 56 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 + 3 files changed, 73 insertions(+) create mode 100644 pkgs/applications/terminal-emulators/st/lukesmithxyz-st/0000-makefile-fix-install.diff create mode 100644 pkgs/applications/terminal-emulators/st/lukesmithxyz-st/default.nix diff --git a/pkgs/applications/terminal-emulators/st/lukesmithxyz-st/0000-makefile-fix-install.diff b/pkgs/applications/terminal-emulators/st/lukesmithxyz-st/0000-makefile-fix-install.diff new file mode 100644 index 000000000000..f451297dffa9 --- /dev/null +++ b/pkgs/applications/terminal-emulators/st/lukesmithxyz-st/0000-makefile-fix-install.diff @@ -0,0 +1,14 @@ +diff -Naur old/Makefile new/Makefile +--- old/Makefile 1969-12-31 21:00:01.000000000 -0300 ++++ new/Makefile 2021-09-06 00:10:26.972466947 -0300 +@@ -40,8 +40,8 @@ + rm -rf st-$(VERSION) + + install: st +- git submodule init +- git submodule update ++# git submodule init ++# git submodule update + mkdir -p $(DESTDIR)$(PREFIX)/bin + cp -f st $(DESTDIR)$(PREFIX)/bin + cp -f st-copyout $(DESTDIR)$(PREFIX)/bin diff --git a/pkgs/applications/terminal-emulators/st/lukesmithxyz-st/default.nix b/pkgs/applications/terminal-emulators/st/lukesmithxyz-st/default.nix new file mode 100644 index 000000000000..f285d0fc73b9 --- /dev/null +++ b/pkgs/applications/terminal-emulators/st/lukesmithxyz-st/default.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, fetchFromGitHub +, fontconfig +, harfbuzz +, libX11 +, libXext +, libXft +, ncurses +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "lukesmithxyz-st"; + version = "0.0.0+unstable=2021-08-10"; + + src = fetchFromGitHub { + owner = "LukeSmithxyz"; + repo = "st"; + rev = "e053bd6036331cc7d14f155614aebc20f5371d3a"; + hash = "sha256-WwjuNxWoeR/ppJxJgqD20kzrn1kIfgDarkTOedX/W4k="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + fontconfig + harfbuzz + libX11 + libXext + libXft + ncurses + ]; + + patches = [ + # eliminate useless calls to git inside Makefile + ./0000-makefile-fix-install.diff + ]; + + installPhase = '' + runHook preInstall + + TERMINFO=$out/share/terminfo make install PREFIX=$out + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/LukeSmithxyz/st"; + description = "Luke Smith's fork of st"; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4c0ca19eade..57d9409e02b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1015,6 +1015,9 @@ with pkgs; extraLibs = config.st.extraLibs or []; }; xst = callPackage ../applications/terminal-emulators/st/xst.nix { }; + lukesmithxyz-st = callPackage ../applications/terminal-emulators/st/lukesmithxyz-st { }; + mcaimi-st = callPackage ../applications/terminal-emulators/st/mcaimi-st.nix { }; + siduck76-st = callPackage ../applications/terminal-emulators/st/siduck76-st.nix { }; stupidterm = callPackage ../applications/terminal-emulators/stupidterm { gtk = gtk3; From ba2821244fd62899355797ca7a5c17d414d96ccf Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 6 Sep 2021 00:18:06 -0300 Subject: [PATCH 100/167] mcaimi-st: init at 0.0.0+unstable=2021-08-30 --- .../terminal-emulators/st/mcaimi-st.nix | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 pkgs/applications/terminal-emulators/st/mcaimi-st.nix diff --git a/pkgs/applications/terminal-emulators/st/mcaimi-st.nix b/pkgs/applications/terminal-emulators/st/mcaimi-st.nix new file mode 100644 index 000000000000..847638f304f3 --- /dev/null +++ b/pkgs/applications/terminal-emulators/st/mcaimi-st.nix @@ -0,0 +1,49 @@ +{ lib +, stdenv +, fetchFromGitHub +, fontconfig +, libX11 +, libXext +, libXft +, ncurses +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "mcaimi-st"; + version = "0.0.0+unstable=2021-08-30"; + + src = fetchFromGitHub { + owner = "mcaimi"; + repo = "st"; + rev = "1a8cad03692ee6d32c03a136cdc76bdb169e15d8"; + hash = "sha256-xyVEvD8s1J9Wj9NB4Gg+0ldvde7M8IVpzCOTttC1IY0="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + fontconfig + libX11 + libXext + libXft + ncurses + ]; + + installPhase = '' + runHook preInstall + + TERMINFO=$out/share/terminfo make install PREFIX=$out + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/gnotclub/xst"; + description = "Suckless Terminal fork"; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.linux; + }; +} From 53d26fbfba153b4d4e01dfdc1c3bc93558c13c93 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 5 Sep 2021 00:55:38 -0300 Subject: [PATCH 101/167] siduck76-st: init at 0.0.0+unstable=2021-08-20 --- .../terminal-emulators/st/siduck76-st.nix | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 pkgs/applications/terminal-emulators/st/siduck76-st.nix diff --git a/pkgs/applications/terminal-emulators/st/siduck76-st.nix b/pkgs/applications/terminal-emulators/st/siduck76-st.nix new file mode 100644 index 000000000000..55fcebff0e3d --- /dev/null +++ b/pkgs/applications/terminal-emulators/st/siduck76-st.nix @@ -0,0 +1,51 @@ +{ lib +, stdenv +, fetchFromGitHub +, fontconfig +, harfbuzz +, libX11 +, libXext +, libXft +, ncurses +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "siduck76-st"; + version = "0.0.0+unstable=2021-08-20"; + + src = fetchFromGitHub { + owner = "siduck76"; + repo = "st"; + rev = "c9bda1de1f3f94ba507fa0eacc96d6a4f338637f"; + hash = "sha256-5n+QkSlVhhku7adtl7TuWhDl3zdwFaXc7Ot1RaIN54A="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + fontconfig + harfbuzz + libX11 + libXext + libXft + ncurses + ]; + + installPhase = '' + runHook preInstall + + TERMINFO=$out/share/terminfo make install PREFIX=$out + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/siduck76/st"; + description = "A fork of st with many add-ons"; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.linux; + }; +} From 10a959149e77b09bd350b112bfa70ef3db2fb926 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Sep 2021 03:50:29 +0000 Subject: [PATCH 102/167] cppzmq: 4.7.1 -> 4.8.0 --- pkgs/development/libraries/cppzmq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix index 9237c3bd3071..7ac6918ef73e 100644 --- a/pkgs/development/libraries/cppzmq/default.nix +++ b/pkgs/development/libraries/cppzmq/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cppzmq"; - version = "4.7.1"; + version = "4.8.0"; src = fetchFromGitHub { owner = "zeromq"; repo = "cppzmq"; rev = "v${version}"; - sha256 = "00lb3pv923nbpaf7ric2cv6lbpspknj0pxj6yj5jyah7r3zw692m"; + sha256 = "sha256-4ZyTp0TOKqDbziqBTkeUs3J+f3stFyUVpkzk4Jx6CDc="; }; nativeBuildInputs = [ cmake ]; From d06f8fcc394cd8363c6cd2423d3fed9f6e297845 Mon Sep 17 00:00:00 2001 From: Enno Richter Date: Mon, 6 Sep 2021 07:11:31 +0200 Subject: [PATCH 103/167] liblinear: fix static build --- pkgs/top-level/static.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index 73d8d9e53032..449f825be0b6 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -93,6 +93,12 @@ in { gssSupport = false; }; + liblinear = super.liblinear.override { + # Don’t use new stdenv zlib because + # it doesn’t like the --disable-shared flag + stdenv = super.stdenv; + }; + ocaml-ng = self.lib.mapAttrs (_: set: if set ? overrideScope' then set.overrideScope' ocamlStaticAdapter else set ) super.ocaml-ng; From 6b1374ebbdd4444457454b360810c32f697001ca Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Sep 2021 06:24:45 +0000 Subject: [PATCH 104/167] faudio: 21.08 -> 21.09 --- pkgs/development/libraries/faudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index a4f19678f240..4082ccfb1d0e 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "21.08"; + version = "21.09"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "sha256-zgXIho1jmoOCVcjvDwiq+J1jOzsPgxvvaWN8NfszEdA="; + sha256 = "sha256-/hc++LEqH7vg2IK/x6sVP5864QF+3xd++HK/tIp0IRA="; }; nativeBuildInputs = [cmake]; From 36790b2c242500b70b201ca2f43ddddf2bb76af4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Sep 2021 07:16:28 +0000 Subject: [PATCH 105/167] fbcat: 0.5.1 -> 0.5.2 --- pkgs/tools/misc/fbcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fbcat/default.nix b/pkgs/tools/misc/fbcat/default.nix index 8769f65f68c4..532d87de669f 100644 --- a/pkgs/tools/misc/fbcat/default.nix +++ b/pkgs/tools/misc/fbcat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fbcat"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "jwilk"; repo = pname; rev = version; - sha256 = "08y79br4a4cgkjnslw0hw57441ybsapaw7wjdbak19mv9lnl5ll9"; + sha256 = "sha256-ORzcd8XGy2BfwuPK5UX+K5Z+FYkb+tdg/gHl3zHjvbk="; }; # hardcoded because makefile target "install" depends on libxslt dependencies from network From 07557e3b49e77c42fc3e51e9e95451187dcd2d33 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Thu, 2 Sep 2021 12:37:01 +0300 Subject: [PATCH 106/167] =?UTF-8?q?lua-cassowary:=202.3.1-1=20=E2=86=92=20?= =?UTF-8?q?2.3.1-2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit lua-cassowary: Avoid circular check deps with Busted/Penlight --- pkgs/development/lua-modules/generated-packages.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index c5a1a41cbd3c..6f5ffbce9c5b 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -160,10 +160,10 @@ busted = buildLuarocksPackage { cassowary = buildLuarocksPackage { pname = "cassowary"; - version = "2.3.1-1"; + version = "2.3.1-2"; knownRockspec = (fetchurl { - url = "https://luarocks.org/cassowary-2.3.1-1.rockspec"; - sha256 = "1rgs0rmlmhghml0gi4dn0rg2iq7rqnn8w8dcy9r3qsbkpyylbajc"; + url = "https://luarocks.org/cassowary-2.3.1-2.rockspec"; + sha256 = "04y882f9ai1jhk0zwla2g0fvl56a75rwnxhsl9r3m0qa5i0ia1i5"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/sile-typesetter/cassowary.lua", @@ -171,7 +171,7 @@ cassowary = buildLuarocksPackage { "date": "2021-07-19T14:37:34+03:00", "path": "/nix/store/rzsbr6gqg8vhchl24ma3p1h4slhk0xp7-cassowary.lua", "sha256": "1r668qcvd2a1rx17xp7ajp5wjhyvh2fwn0c60xmw0mnarjb5w1pq", - "fetchSubmodules": true, + "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false } @@ -179,6 +179,10 @@ cassowary = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua penlight ]; + checkInputs = [ busted ]; + # Avoid circular dependency issue with busted / penlight, see: + # https://github.com/NixOS/nixpkgs/pull/136453/files#r700982255 + doCheck = false; meta = { homepage = "https://github.com/sile-typesetter/cassowary.lua"; From 074ef76e99b3d54ef4804bbc1f37122721cd2b18 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Tue, 2 Mar 2021 18:31:11 +0300 Subject: [PATCH 107/167] =?UTF-8?q?vcsh:=201.20170915=20=E2=86=92=202.0.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Bobby Rong --- .../version-management/vcsh/default.nix | 36 ++++++++++++------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/version-management/vcsh/default.nix b/pkgs/applications/version-management/vcsh/default.nix index e272342fe95d..84716e760817 100644 --- a/pkgs/applications/version-management/vcsh/default.nix +++ b/pkgs/applications/version-management/vcsh/default.nix @@ -1,26 +1,38 @@ -{ lib, stdenv, fetchFromGitHub, which, git, ronn, perlPackages }: +{ lib, stdenv +, fetchurl +, makeWrapper +, pkg-config +, git +, perlPackages +}: -stdenv.mkDerivation { - version = "1.20170915"; # date of commit we're pulling +stdenv.mkDerivation rec { pname = "vcsh"; + version = "2.0.2"; - src = fetchFromGitHub { - owner = "RichiH"; - repo = "vcsh"; - rev = "eadb8df6aa71a76e5be36492edcadb118bd862ac"; - sha256 = "1wfzp8167lcq6akdpbi8fikjv0z3h1i5minh3423dljc04q0klm1"; + src = fetchurl { + url = "https://github.com/RichiH/vcsh/releases/download/v${version}/${pname}-${version}.tar.xz"; + sha256 = "0qdd4f6rm5rhnym9f114pcj9vafhjjpg962c4g420rn78fxhpz1z"; }; - buildInputs = [ which git ronn ] - ++ (with perlPackages; [ perl ShellCommand TestMost TestDifferences TestDeep TestException TestWarn ]); + nativeBuildInputs = [ + pkg-config + makeWrapper + ]; - installPhase = "make install PREFIX=$out"; + buildInputs = [ git ]; + + checkInputs = [] + ++ (with perlPackages; [ perl ShellCommand TestMost ]); + + outputs = [ "out" "doc" "man" ]; meta = with lib; { description = "Version Control System for $HOME"; homepage = "https://github.com/RichiH/vcsh"; + changelog = "https://github.com/RichiH/vcsh/blob/v${version}/changelog"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ttuegel ]; + maintainers = with maintainers; [ ttuegel alerque ]; platforms = platforms.unix; }; } From b597dcf1bcc12ef51f92cd9cfde59e91d0a7ca61 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Sep 2021 10:32:18 +0000 Subject: [PATCH 108/167] hydrogen: 1.0.2 -> 1.1.0 --- pkgs/applications/audio/hydrogen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix index 319ee7a5f984..842d2ad93fa4 100644 --- a/pkgs/applications/audio/hydrogen/default.nix +++ b/pkgs/applications/audio/hydrogen/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "hydrogen"; - version = "1.0.2"; + version = "1.1.0"; src = fetchFromGitHub { owner = "hydrogen-music"; repo = pname; rev = version; - sha256 = "sha256-t3f+T1QTNbuJnWmD+q0yPgQxXPXvl91lZN17pKUVFlo="; + sha256 = "sha256-G+7vTUxYiPNKJ0Qxf/E/t0d6vC/lDs9vNfSbvUXTQgI="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; From 416dcd451bbddab83feda367dc41a194fb2a8e66 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Sep 2021 11:08:03 +0000 Subject: [PATCH 109/167] jbang: 0.78.0 -> 0.79.0 --- pkgs/development/tools/jbang/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/jbang/default.nix b/pkgs/development/tools/jbang/default.nix index c09344d8d53d..48e349abd849 100644 --- a/pkgs/development/tools/jbang/default.nix +++ b/pkgs/development/tools/jbang/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.78.0"; + version = "0.79.0"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-03CuKNQtKdhD6fFYfsmeNR18oRGL5vWG7Lb+srNw8XU="; + sha256 = "sha256-ZlFjG6zlS/VLZjU4SXuDviFh6lsKeuNpIXYnHi2QB7s="; }; nativeBuildInputs = [ makeWrapper ]; From a58a90aaa472bb4509d1dcc00c535a62f9461bf7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Sep 2021 11:26:18 +0000 Subject: [PATCH 110/167] python38Packages.pybullet: 3.1.7 -> 3.1.8 --- pkgs/development/python-modules/pybullet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pybullet/default.nix b/pkgs/development/python-modules/pybullet/default.nix index f2afba4d2d52..4d97b535606f 100644 --- a/pkgs/development/python-modules/pybullet/default.nix +++ b/pkgs/development/python-modules/pybullet/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pybullet"; - version = "3.1.7"; + version = "3.1.8"; src = fetchPypi { inherit pname version; - sha256 = "c343b90c4f3d529a0fbee8bec2b3e35d444f32e92d5ce974fe590544360fe310"; + sha256 = "a7e6c7c77cab39e1559c98e4290c5138247b15d3a26a76a23b2737c159f3f905"; }; buildInputs = [ From b54f3e1e6f7294665bba1d7d3a8a6c586bef5672 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Sep 2021 12:49:13 +0000 Subject: [PATCH 111/167] liblouis: 3.18.0 -> 3.19.0 --- pkgs/development/libraries/liblouis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix index dd2738b1774d..dba0b3956616 100644 --- a/pkgs/development/libraries/liblouis/default.nix +++ b/pkgs/development/libraries/liblouis/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "liblouis"; - version = "3.18.0"; + version = "3.19.0"; src = fetchFromGitHub { owner = "liblouis"; repo = "liblouis"; rev = "v${version}"; - sha256 = "sha256-STAfA2QgSrCZaT/tcoj0BVnFfO3jbe6W2FgVOfxjpJc="; + sha256 = "sha256-vuD+afTOzldhfCRG5ghnWulNhip7BaTE7GfPhxXSMFw="; }; outputs = [ "out" "dev" "man" "info" "doc" ]; From 8f91e36ee8f5d8fc6e815498a2d7840775f36e0f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Sep 2021 12:57:21 +0000 Subject: [PATCH 112/167] libplctag: 2.3.6 -> 2.3.7 --- pkgs/development/libraries/libplctag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libplctag/default.nix b/pkgs/development/libraries/libplctag/default.nix index 41283ed7ccd0..6ca637a5b515 100644 --- a/pkgs/development/libraries/libplctag/default.nix +++ b/pkgs/development/libraries/libplctag/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libplctag"; - version = "2.3.6"; + version = "2.3.7"; src = fetchFromGitHub { owner = "libplctag"; repo = "libplctag"; rev = "v${version}"; - sha256 = "sha256-mrNEUNYxnRyKhUCz+exp6Upf2g/L6WnYJ8alcIx5wMc="; + sha256 = "sha256-AGU1/56OO96njWLSS91HBSe2tFXBwKzJMSh2/m6Fv0E="; }; nativeBuildInputs = [ cmake ]; From 2df0c2aae5a7ad685fa21da91007d1a89538f722 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Mon, 6 Sep 2021 10:37:35 -0400 Subject: [PATCH 113/167] =?UTF-8?q?protontricks:=201.5.2=20=E2=86=92=201.6?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../protontricks/default.nix | 31 +++-- .../protontricks/steam-run.patch | 118 +++++++++--------- pkgs/top-level/all-packages.nix | 10 +- 3 files changed, 89 insertions(+), 70 deletions(-) diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix index cbe10e85f667..99751c00d99c 100644 --- a/pkgs/tools/package-management/protontricks/default.nix +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -2,23 +2,24 @@ , buildPythonApplication , fetchFromGitHub , setuptools-scm +, setuptools , vdf , bash , steam-run , winetricks -, zenity +, yad , pytestCheckHook }: buildPythonApplication rec { pname = "protontricks"; - version = "1.5.2"; + version = "1.6.0"; src = fetchFromGitHub { owner = "Matoking"; repo = pname; rev = version; - hash = "sha256-Vmxb8SjPhcSqFzykHRPsLtAoSwomN+se+icwHkucbX8="; + hash = "sha256-sbYIqVsuDZ2Htb6SVIe/gBA1UIvUzu4fjTjWQ7k1WFs="; }; patches = [ @@ -27,23 +28,31 @@ buildPythonApplication rec { ]; SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ vdf ]; + + propagatedBuildInputs = [ + setuptools # implicit dependency, used to find data/icon_placeholder.png + vdf + ]; makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ bash steam-run - (winetricks.override { - # Remove default build of wine to reduce closure size. - # Falls back to wine in PATH when --no-runtime is passed. - wine = null; - }) - zenity + winetricks + yad ]}" ]; checkInputs = [ pytestCheckHook ]; + + # From 1.6.0 release notes (https://github.com/Matoking/protontricks/releases/tag/1.6.0): + # In most cases the script is unnecessary and should be removed as part of the packaging process. + postInstall = '' + rm "$out/bin/protontricks-desktop-install" + ''; + pythonImportsCheck = [ "protontricks" ]; meta = with lib; { @@ -51,6 +60,6 @@ buildPythonApplication rec { homepage = "https://github.com/Matoking/protontricks"; license = licenses.gpl3Only; maintainers = with maintainers; [ kira-bruneau ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/tools/package-management/protontricks/steam-run.patch b/pkgs/tools/package-management/protontricks/steam-run.patch index 82ddec1abb89..0144160c5af8 100644 --- a/pkgs/tools/package-management/protontricks/steam-run.patch +++ b/pkgs/tools/package-management/protontricks/steam-run.patch @@ -1,31 +1,31 @@ -diff --git a/src/protontricks/cli.py b/src/protontricks/cli.py -index cc65a03..5c3fc7a 100755 ---- a/src/protontricks/cli.py -+++ b/src/protontricks/cli.py -@@ -15,8 +15,8 @@ import sys +diff --git a/src/protontricks/cli/main.py b/src/protontricks/cli/main.py +index 535ec9b..690c1f9 100755 +--- a/src/protontricks/cli/main.py ++++ b/src/protontricks/cli/main.py +@@ -14,8 +14,8 @@ import sys - from . import __version__ - from .gui import select_steam_app_with_gui --from .steam import (find_legacy_steam_runtime_path, find_proton_app, -- find_steam_path, get_steam_apps, get_steam_lib_paths) -+from .steam import (find_proton_app, find_steam_path, get_steam_apps, -+ get_steam_lib_paths) - from .util import run_command, is_flatpak_sandbox - from .winetricks import get_winetricks_path - -@@ -77,8 +77,7 @@ def main(args=None): + from .. import __version__ + from ..gui import select_steam_app_with_gui +-from ..steam import (find_legacy_steam_runtime_path, find_proton_app, +- find_steam_path, get_steam_apps, get_steam_lib_paths) ++from ..steam import (find_proton_app, find_steam_path, get_steam_apps, ++ get_steam_lib_paths) + from ..util import is_flatpak_sandbox, run_command + from ..winetricks import get_winetricks_path + from .util import (CustomArgumentParser, cli_error_handler, enable_logging, +@@ -60,8 +60,7 @@ def main(args=None): "WINE: path to a custom 'wine' executable\n" "WINESERVER: path to a custom 'wineserver' executable\n" "STEAM_RUNTIME: 1 = enable Steam Runtime, 0 = disable Steam " - "Runtime, valid path = custom Steam Runtime path, " -- "empty = enable automatically (default)" -+ "Runtime, empty = enable automatically (default)" +- "empty = enable automatically (default)\n" ++ "Runtime, empty = enable automatically (default)\n" + "PROTONTRICKS_GUI: GUI provider to use, accepts either 'yad' " + "or 'zenity'" ), - formatter_class=argparse.RawTextHelpFormatter - ) -@@ -148,18 +147,9 @@ def main(args=None): - ) - sys.exit(-1) +@@ -147,17 +146,9 @@ def main(args=None): + if not steam_path: + exit_("Steam installation directory could not be found.") - # 2. Find the pre-installed legacy Steam Runtime if enabled - legacy_steam_runtime_path = None @@ -38,13 +38,12 @@ index cc65a03..5c3fc7a 100755 - ) - - if not legacy_steam_runtime_path: -- print("Steam Runtime was enabled but couldn't be found!") -- sys.exit(-1) +- exit_("Steam Runtime was enabled but couldn't be found!") + use_steam_runtime = True else: use_steam_runtime = False logger.info("Steam Runtime disabled.") -@@ -222,7 +212,6 @@ def main(args=None): +@@ -218,7 +209,6 @@ def main(args=None): proton_app=proton_app, steam_app=steam_app, use_steam_runtime=use_steam_runtime, @@ -52,7 +51,7 @@ index cc65a03..5c3fc7a 100755 command=[winetricks_path, "--gui"], use_bwrap=use_bwrap ) -@@ -292,7 +281,6 @@ def main(args=None): +@@ -286,7 +276,6 @@ def main(args=None): proton_app=proton_app, steam_app=steam_app, use_steam_runtime=use_steam_runtime, @@ -60,7 +59,7 @@ index cc65a03..5c3fc7a 100755 use_bwrap=use_bwrap, command=[winetricks_path] + args.winetricks_command) elif args.command: -@@ -302,7 +290,6 @@ def main(args=None): +@@ -296,7 +285,6 @@ def main(args=None): steam_app=steam_app, command=args.command, use_steam_runtime=use_steam_runtime, @@ -69,7 +68,7 @@ index cc65a03..5c3fc7a 100755 # Pass the command directly into the shell *without* # escaping it diff --git a/src/protontricks/steam.py b/src/protontricks/steam.py -index 4ab778b..f3f5f99 100644 +index e898caf..7448d11 100644 --- a/src/protontricks/steam.py +++ b/src/protontricks/steam.py @@ -12,8 +12,8 @@ from .util import lower_dict @@ -77,13 +76,13 @@ index 4ab778b..f3f5f99 100644 __all__ = ( "COMMON_STEAM_DIRS", "SteamApp", "find_steam_path", - "find_legacy_steam_runtime_path", "get_appinfo_sections", -- "get_proton_appid", "find_steam_proton_app", "find_appid_proton_prefix", -+ "get_appinfo_sections", "get_proton_appid", -+ "find_steam_proton_app", "find_appid_proton_prefix", +- "get_tool_appid", "find_steam_compat_tool_app", "find_appid_proton_prefix", ++ "get_appinfo_sections", "get_tool_appid", ++ "find_steam_compat_tool_app", "find_appid_proton_prefix", "find_proton_app", "get_steam_lib_paths", "get_compat_tool_dirs", - "get_custom_proton_installations_in_dir", "get_custom_proton_installations", + "get_custom_compat_tool_installations_in_dir", "get_custom_compat_tool_installations", "find_current_steamid3", "get_appid_from_shortcut", -@@ -300,37 +300,6 @@ def find_steam_path(): +@@ -311,37 +311,6 @@ def find_steam_path(): return None, None @@ -122,12 +121,12 @@ index 4ab778b..f3f5f99 100644 APPINFO_STRUCT_SECTION = " Date: Mon, 6 Sep 2021 13:05:17 -0400 Subject: [PATCH 114/167] kaidan: add long description Adding a long description based on the about section at https://www.kaidan.im/ --- .../networking/instant-messengers/kaidan/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/kaidan/default.nix b/pkgs/applications/networking/instant-messengers/kaidan/default.nix index 74449ae705e3..fc14f77198b5 100644 --- a/pkgs/applications/networking/instant-messengers/kaidan/default.nix +++ b/pkgs/applications/networking/instant-messengers/kaidan/default.nix @@ -49,6 +49,15 @@ mkDerivation rec { meta = with lib; { description = "User-friendly and modern chat app, using XMPP"; + longDescription = '' + Kaidan is a user-friendly and modern chat app for every device. It uses + the open communication protocol XMPP (Jabber). Unlike other chat apps, + you are not dependent on one specific service provider. + + Kaidan does not have all basic features yet and has still some + stability issues. Current features include audio messages, video + messages, and file sharing. + ''; homepage = "https://www.kaidan.im"; license = with licenses; [ gpl3Plus From fabddcd7b6a43f47c3fcfbcd890407b31e6eaa0d Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Mon, 6 Sep 2021 19:35:06 +0200 Subject: [PATCH 115/167] age: 1.0.0-rc.3 -> 1.0.0 --- pkgs/tools/security/age/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/age/default.nix b/pkgs/tools/security/age/default.nix index 20735c6e5782..695d4a732893 100644 --- a/pkgs/tools/security/age/default.nix +++ b/pkgs/tools/security/age/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "age"; - version = "1.0.0-rc.3"; - vendorSha256 = "sha256-sXUbfxhPmJXO+KgV/dmWmsyV49Pb6CoJLbt50yVgEvI="; + version = "1.0.0"; + vendorSha256 = "sha256-cnFDs5Qos1KHn7TqaEgmt4sSzpjZor615euwxka14mY="; src = fetchFromGitHub { owner = "FiloSottile"; repo = "age"; rev = "v${version}"; - sha256 = "sha256-YXdCTK9/eMvcHWg7gQQiPlLWYx2OjbOJDDNdSYO09HU="; + sha256 = "sha256-MfyW8Yv8swKqA7Hl45l5Zn4wZrQmE661eHsKIywy36U="; }; meta = with lib; { From d4ab63cc2a624184718c6be9492ecb55839e36ee Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sun, 5 Sep 2021 11:42:38 -0400 Subject: [PATCH 116/167] pathspec: 0.8.1 -> 0.9.0 --- pkgs/development/python-modules/pathspec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pathspec/default.nix b/pkgs/development/python-modules/pathspec/default.nix index cd51747d5678..1ad8a7564dd0 100644 --- a/pkgs/development/python-modules/pathspec/default.nix +++ b/pkgs/development/python-modules/pathspec/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pathspec"; - version = "0.8.1"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "86379d6b86d75816baba717e64b1a3a3469deb93bb76d613c9ce79edc5cb68fd"; + sha256 = "sha256-5WRJlDWiZz1Yb2shMLtblfBKO6Bvgbj4lbZRo8dqq7E="; }; meta = { From 469c02a52b4ac58c231d36686a28b2a1c3587373 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sun, 5 Sep 2021 11:42:51 -0400 Subject: [PATCH 117/167] black: 21.7b0 -> 21.8b0 --- pkgs/development/python-modules/black/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index 2b968fb991a7..775e42e1ed72 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -10,6 +10,7 @@ , mypy-extensions , pathspec , parameterized +, platformdirs , regex , tomli , typed-ast @@ -20,13 +21,13 @@ buildPythonPackage rec { pname = "black"; - version = "21.7b0"; + version = "21.8b0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "06d27adq6v6p8wspi0wwqz2pnq34p5jhnqvijbin54yyj5j3qdy8"; + sha256 = "sha256-VwYI0oqjrxeSuYxKM326xjZ4d7R7EriKtCCVz8GmJ8I="; }; nativeBuildInputs = [ setuptools-scm ]; @@ -65,6 +66,7 @@ buildPythonPackage rec { colorama mypy-extensions pathspec + platformdirs regex tomli typed-ast # required for tests and python2 extra From 05cb210e9fa637a3926caa230b3b2800489d630a Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Mon, 6 Sep 2021 14:39:26 -0400 Subject: [PATCH 118/167] black: remove appdirs dependency --- pkgs/development/python-modules/black/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index 775e42e1ed72..772ad57e7fe3 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage, fetchPypi, pythonOlder, setuptools-scm, pytestCheckHook , aiohttp , aiohttp-cors -, appdirs , attrs , click , colorama @@ -60,7 +59,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp aiohttp-cors - appdirs attrs click colorama From 7a6bddc19d9f6c93b1fb70305a8633da5215d9a7 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Tue, 17 Aug 2021 12:54:44 +0200 Subject: [PATCH 119/167] lispPackages: sort quicklisp packages alphabetically --- .../lisp-modules/quicklisp-to-nix-systems.txt | 32 +- .../lisp-modules/quicklisp-to-nix.nix | 470 +++++++++--------- 2 files changed, 251 insertions(+), 251 deletions(-) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index 6cbd7f4115a9..15532c42fd69 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -11,7 +11,6 @@ blackbird bordeaux-threads calispel caveman -cl-custom-hash-table cffi cffi-grovel cffi-uffi-compat @@ -19,8 +18,7 @@ chanl chipz chunga circular-streams -clack -clack-v1-compat +cl+ssl cl-annot cl-ansi-text cl-async @@ -35,6 +33,7 @@ cl-containers cl-cookie cl-css cl-csv +cl-custom-hash-table cl-dbi cl-dot cl-emb @@ -44,8 +43,8 @@ cl-fuse-meta-fs cl-gobject-introspection cl-hooks cl-html-diff -cl-html5-parser cl-html-parse +cl-html5-parser cl-interpol cl-jpeg cl-json @@ -54,9 +53,6 @@ cl-libuv cl-locale cl-markup cl-mysql -closer-mop -closure-common -closure-html cl-paths-ttf cl-pdf cl-ppcre @@ -67,30 +63,34 @@ cl-protobufs cl-qprint cl-reexport cl-slice -cl-speedy-queue cl-smtp -cl-syslog -clsql -clsql-postgresql -clsql-postgresql-socket -clsql-sqlite3 -clss -cl+ssl +cl-speedy-queue cl-store cl-syntax cl-syntax-annot cl-syntax-anonfun cl-syntax-markup +cl-syslog cl-test-more cl-typesetting -clump cl-unicode cl-unification cl-utilities cl-vectors cl-webkit2 cl-who +clack +clack-v1-compat clfswm +closer-mop +closure-common +closure-html +clsql +clsql-postgresql +clsql-postgresql-socket +clsql-sqlite3 +clss +clump clx collectors command-line-arguments diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index ed8e87162c84..b2d68b2ba92f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -709,14 +709,6 @@ let quicklisp-to-nix-packages = rec { })); - "cl-aa" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-aa" or (x: {})) - (import ./quicklisp-to-nix-output/cl-aa.nix { - inherit fetchurl; - })); - - "clump-binary-tree" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."clump-binary-tree" or (x: {})) @@ -735,14 +727,6 @@ let quicklisp-to-nix-packages = rec { })); - "cl-anonfun" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-anonfun" or (x: {})) - (import ./quicklisp-to-nix-output/cl-anonfun.nix { - inherit fetchurl; - })); - - "clsql-uffi" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."clsql-uffi" or (x: {})) @@ -753,6 +737,14 @@ let quicklisp-to-nix-packages = rec { })); + "cl-aa" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-aa" or (x: {})) + (import ./quicklisp-to-nix-output/cl-aa.nix { + inherit fetchurl; + })); + + "global-vars" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."global-vars" or (x: {})) @@ -761,6 +753,14 @@ let quicklisp-to-nix-packages = rec { })); + "cl-anonfun" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-anonfun" or (x: {})) + (import ./quicklisp-to-nix-output/cl-anonfun.nix { + inherit fetchurl; + })); + + "clunit" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."clunit" or (x: {})) @@ -3060,6 +3060,105 @@ let quicklisp-to-nix-packages = rec { })); + "clump" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clump" or (x: {})) + (import ./quicklisp-to-nix-output/clump.nix { + inherit fetchurl; + "acclimation" = quicklisp-to-nix-packages."acclimation"; + "clump-2-3-tree" = quicklisp-to-nix-packages."clump-2-3-tree"; + "clump-binary-tree" = quicklisp-to-nix-packages."clump-binary-tree"; + })); + + + "clss" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clss" or (x: {})) + (import ./quicklisp-to-nix-output/clss.nix { + inherit fetchurl; + "array-utils" = quicklisp-to-nix-packages."array-utils"; + "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; + "plump" = quicklisp-to-nix-packages."plump"; + "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; + })); + + + "clsql-sqlite3" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clsql-sqlite3" or (x: {})) + (import ./quicklisp-to-nix-output/clsql-sqlite3.nix { + inherit fetchurl; + "clsql" = quicklisp-to-nix-packages."clsql"; + "clsql-uffi" = quicklisp-to-nix-packages."clsql-uffi"; + "uffi" = quicklisp-to-nix-packages."uffi"; + })); + + + "clsql-postgresql-socket" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clsql-postgresql-socket" or (x: {})) + (import ./quicklisp-to-nix-output/clsql-postgresql-socket.nix { + inherit fetchurl; + "clsql" = quicklisp-to-nix-packages."clsql"; + "md5" = quicklisp-to-nix-packages."md5"; + "uffi" = quicklisp-to-nix-packages."uffi"; + })); + + + "clsql-postgresql" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clsql-postgresql" or (x: {})) + (import ./quicklisp-to-nix-output/clsql-postgresql.nix { + inherit fetchurl; + "clsql" = quicklisp-to-nix-packages."clsql"; + "clsql-uffi" = quicklisp-to-nix-packages."clsql-uffi"; + "uffi" = quicklisp-to-nix-packages."uffi"; + })); + + + "clsql" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clsql" or (x: {})) + (import ./quicklisp-to-nix-output/clsql.nix { + inherit fetchurl; + "uffi" = quicklisp-to-nix-packages."uffi"; + })); + + + "closure-html" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."closure-html" or (x: {})) + (import ./quicklisp-to-nix-output/closure-html.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "closure-common" = quicklisp-to-nix-packages."closure-common"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + })); + + + "closure-common" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."closure-common" or (x: {})) + (import ./quicklisp-to-nix-output/closure-common.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + })); + + + "closer-mop" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."closer-mop" or (x: {})) + (import ./quicklisp-to-nix-output/closer-mop.nix { + inherit fetchurl; + })); + + "clfswm" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."clfswm" or (x: {})) @@ -3069,6 +3168,88 @@ let quicklisp-to-nix-packages = rec { })); + "clack-v1-compat" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clack-v1-compat" or (x: {})) + (import ./quicklisp-to-nix-output/clack-v1-compat.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; + "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain"; + "chipz" = quicklisp-to-nix-packages."chipz"; + "chunga" = quicklisp-to-nix-packages."chunga"; + "circular-streams" = quicklisp-to-nix-packages."circular-streams"; + "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl"; + "cl-annot" = quicklisp-to-nix-packages."cl-annot"; + "cl-base64" = quicklisp-to-nix-packages."cl-base64"; + "cl-cookie" = quicklisp-to-nix-packages."cl-cookie"; + "cl-fad" = quicklisp-to-nix-packages."cl-fad"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-reexport" = quicklisp-to-nix-packages."cl-reexport"; + "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; + "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; + "cl-utilities" = quicklisp-to-nix-packages."cl-utilities"; + "clack" = quicklisp-to-nix-packages."clack"; + "clack-handler-hunchentoot" = quicklisp-to-nix-packages."clack-handler-hunchentoot"; + "clack-socket" = quicklisp-to-nix-packages."clack-socket"; + "clack-test" = quicklisp-to-nix-packages."clack-test"; + "dexador" = quicklisp-to-nix-packages."dexador"; + "dissect" = quicklisp-to-nix-packages."dissect"; + "fast-http" = quicklisp-to-nix-packages."fast-http"; + "fast-io" = quicklisp-to-nix-packages."fast-io"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "http-body" = quicklisp-to-nix-packages."http-body"; + "hunchentoot" = quicklisp-to-nix-packages."hunchentoot"; + "ironclad" = quicklisp-to-nix-packages."ironclad"; + "jonathan" = quicklisp-to-nix-packages."jonathan"; + "lack" = quicklisp-to-nix-packages."lack"; + "lack-component" = quicklisp-to-nix-packages."lack-component"; + "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace"; + "lack-util" = quicklisp-to-nix-packages."lack-util"; + "local-time" = quicklisp-to-nix-packages."local-time"; + "marshal" = quicklisp-to-nix-packages."marshal"; + "md5" = quicklisp-to-nix-packages."md5"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "proc-parse" = quicklisp-to-nix-packages."proc-parse"; + "quri" = quicklisp-to-nix-packages."quri"; + "rfc2388" = quicklisp-to-nix-packages."rfc2388"; + "rove" = quicklisp-to-nix-packages."rove"; + "smart-buffer" = quicklisp-to-nix-packages."smart-buffer"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "static-vectors" = quicklisp-to-nix-packages."static-vectors"; + "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes"; + "trivial-types" = quicklisp-to-nix-packages."trivial-types"; + "uiop" = quicklisp-to-nix-packages."uiop"; + "usocket" = quicklisp-to-nix-packages."usocket"; + "xsubseq" = quicklisp-to-nix-packages."xsubseq"; + })); + + + "clack" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clack" or (x: {})) + (import ./quicklisp-to-nix-output/clack.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "ironclad" = quicklisp-to-nix-packages."ironclad"; + "lack" = quicklisp-to-nix-packages."lack"; + "lack-component" = quicklisp-to-nix-packages."lack-component"; + "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace"; + "lack-util" = quicklisp-to-nix-packages."lack-util"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "uiop" = quicklisp-to-nix-packages."uiop"; + "usocket" = quicklisp-to-nix-packages."usocket"; + })); + + "cl-who" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-who" or (x: {})) @@ -3138,17 +3319,6 @@ let quicklisp-to-nix-packages = rec { })); - "clump" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."clump" or (x: {})) - (import ./quicklisp-to-nix-output/clump.nix { - inherit fetchurl; - "acclimation" = quicklisp-to-nix-packages."acclimation"; - "clump-2-3-tree" = quicklisp-to-nix-packages."clump-2-3-tree"; - "clump-binary-tree" = quicklisp-to-nix-packages."clump-binary-tree"; - })); - - "cl-typesetting" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-typesetting" or (x: {})) @@ -3176,6 +3346,22 @@ let quicklisp-to-nix-packages = rec { })); + "cl-syslog" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-syslog" or (x: {})) + (import ./quicklisp-to-nix-output/cl-syslog.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "global-vars" = quicklisp-to-nix-packages."global-vars"; + "local-time" = quicklisp-to-nix-packages."local-time"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "usocket" = quicklisp-to-nix-packages."usocket"; + })); + + "cl-syntax-markup" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-syntax-markup" or (x: {})) @@ -3232,92 +3418,11 @@ let quicklisp-to-nix-packages = rec { })); - "cl_plus_ssl" = buildLispPackage + "cl-speedy-queue" = buildLispPackage ((f: x: (x // (f x))) - (qlOverrides."cl_plus_ssl" or (x: {})) - (import ./quicklisp-to-nix-output/cl_plus_ssl.nix { + (qlOverrides."cl-speedy-queue" or (x: {})) + (import ./quicklisp-to-nix-output/cl-speedy-queue.nix { inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "babel" = quicklisp-to-nix-packages."babel"; - "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; - "cffi" = quicklisp-to-nix-packages."cffi"; - "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; - "split-sequence" = quicklisp-to-nix-packages."split-sequence"; - "trivial-features" = quicklisp-to-nix-packages."trivial-features"; - "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; - "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; - "uiop" = quicklisp-to-nix-packages."uiop"; - "usocket" = quicklisp-to-nix-packages."usocket"; - })); - - - "clss" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."clss" or (x: {})) - (import ./quicklisp-to-nix-output/clss.nix { - inherit fetchurl; - "array-utils" = quicklisp-to-nix-packages."array-utils"; - "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; - "plump" = quicklisp-to-nix-packages."plump"; - "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; - })); - - - "clsql-sqlite3" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."clsql-sqlite3" or (x: {})) - (import ./quicklisp-to-nix-output/clsql-sqlite3.nix { - inherit fetchurl; - "clsql" = quicklisp-to-nix-packages."clsql"; - "clsql-uffi" = quicklisp-to-nix-packages."clsql-uffi"; - "uffi" = quicklisp-to-nix-packages."uffi"; - })); - - - "clsql-postgresql-socket" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."clsql-postgresql-socket" or (x: {})) - (import ./quicklisp-to-nix-output/clsql-postgresql-socket.nix { - inherit fetchurl; - "clsql" = quicklisp-to-nix-packages."clsql"; - "md5" = quicklisp-to-nix-packages."md5"; - "uffi" = quicklisp-to-nix-packages."uffi"; - })); - - - "clsql-postgresql" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."clsql-postgresql" or (x: {})) - (import ./quicklisp-to-nix-output/clsql-postgresql.nix { - inherit fetchurl; - "clsql" = quicklisp-to-nix-packages."clsql"; - "clsql-uffi" = quicklisp-to-nix-packages."clsql-uffi"; - "uffi" = quicklisp-to-nix-packages."uffi"; - })); - - - "clsql" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."clsql" or (x: {})) - (import ./quicklisp-to-nix-output/clsql.nix { - inherit fetchurl; - "uffi" = quicklisp-to-nix-packages."uffi"; - })); - - - "cl-syslog" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-syslog" or (x: {})) - (import ./quicklisp-to-nix-output/cl-syslog.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "babel" = quicklisp-to-nix-packages."babel"; - "cffi" = quicklisp-to-nix-packages."cffi"; - "global-vars" = quicklisp-to-nix-packages."global-vars"; - "local-time" = quicklisp-to-nix-packages."local-time"; - "split-sequence" = quicklisp-to-nix-packages."split-sequence"; - "trivial-features" = quicklisp-to-nix-packages."trivial-features"; - "usocket" = quicklisp-to-nix-packages."usocket"; })); @@ -3341,14 +3446,6 @@ let quicklisp-to-nix-packages = rec { })); - "cl-speedy-queue" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-speedy-queue" or (x: {})) - (import ./quicklisp-to-nix-output/cl-speedy-queue.nix { - inherit fetchurl; - })); - - "cl-slice" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-slice" or (x: {})) @@ -3460,40 +3557,6 @@ let quicklisp-to-nix-packages = rec { })); - "closure-html" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."closure-html" or (x: {})) - (import ./quicklisp-to-nix-output/closure-html.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "babel" = quicklisp-to-nix-packages."babel"; - "closure-common" = quicklisp-to-nix-packages."closure-common"; - "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; - "trivial-features" = quicklisp-to-nix-packages."trivial-features"; - "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; - })); - - - "closure-common" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."closure-common" or (x: {})) - (import ./quicklisp-to-nix-output/closure-common.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "babel" = quicklisp-to-nix-packages."babel"; - "trivial-features" = quicklisp-to-nix-packages."trivial-features"; - "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; - })); - - - "closer-mop" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."closer-mop" or (x: {})) - (import ./quicklisp-to-nix-output/closer-mop.nix { - inherit fetchurl; - })); - - "cl-mysql" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-mysql" or (x: {})) @@ -3603,14 +3666,6 @@ let quicklisp-to-nix-packages = rec { })); - "cl-html-parse" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-html-parse" or (x: {})) - (import ./quicklisp-to-nix-output/cl-html-parse.nix { - inherit fetchurl; - })); - - "cl-html5-parser" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-html5-parser" or (x: {})) @@ -3623,6 +3678,14 @@ let quicklisp-to-nix-packages = rec { })); + "cl-html-parse" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-html-parse" or (x: {})) + (import ./quicklisp-to-nix-output/cl-html-parse.nix { + inherit fetchurl; + })); + + "cl-html-diff" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-html-diff" or (x: {})) @@ -3744,6 +3807,14 @@ let quicklisp-to-nix-packages = rec { })); + "cl-custom-hash-table" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-custom-hash-table" or (x: {})) + (import ./quicklisp-to-nix-output/cl-custom-hash-table.nix { + inherit fetchurl; + })); + + "cl-csv" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-csv" or (x: {})) @@ -3943,83 +4014,20 @@ let quicklisp-to-nix-packages = rec { })); - "clack-v1-compat" = buildLispPackage + "cl_plus_ssl" = buildLispPackage ((f: x: (x // (f x))) - (qlOverrides."clack-v1-compat" or (x: {})) - (import ./quicklisp-to-nix-output/clack-v1-compat.nix { + (qlOverrides."cl_plus_ssl" or (x: {})) + (import ./quicklisp-to-nix-output/cl_plus_ssl.nix { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; "babel" = quicklisp-to-nix-packages."babel"; "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cffi" = quicklisp-to-nix-packages."cffi"; - "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; - "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain"; - "chipz" = quicklisp-to-nix-packages."chipz"; - "chunga" = quicklisp-to-nix-packages."chunga"; - "circular-streams" = quicklisp-to-nix-packages."circular-streams"; - "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl"; - "cl-annot" = quicklisp-to-nix-packages."cl-annot"; - "cl-base64" = quicklisp-to-nix-packages."cl-base64"; - "cl-cookie" = quicklisp-to-nix-packages."cl-cookie"; - "cl-fad" = quicklisp-to-nix-packages."cl-fad"; - "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; - "cl-reexport" = quicklisp-to-nix-packages."cl-reexport"; - "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; - "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; - "cl-utilities" = quicklisp-to-nix-packages."cl-utilities"; - "clack" = quicklisp-to-nix-packages."clack"; - "clack-handler-hunchentoot" = quicklisp-to-nix-packages."clack-handler-hunchentoot"; - "clack-socket" = quicklisp-to-nix-packages."clack-socket"; - "clack-test" = quicklisp-to-nix-packages."clack-test"; - "dexador" = quicklisp-to-nix-packages."dexador"; - "dissect" = quicklisp-to-nix-packages."dissect"; - "fast-http" = quicklisp-to-nix-packages."fast-http"; - "fast-io" = quicklisp-to-nix-packages."fast-io"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; - "http-body" = quicklisp-to-nix-packages."http-body"; - "hunchentoot" = quicklisp-to-nix-packages."hunchentoot"; - "ironclad" = quicklisp-to-nix-packages."ironclad"; - "jonathan" = quicklisp-to-nix-packages."jonathan"; - "lack" = quicklisp-to-nix-packages."lack"; - "lack-component" = quicklisp-to-nix-packages."lack-component"; - "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace"; - "lack-util" = quicklisp-to-nix-packages."lack-util"; - "local-time" = quicklisp-to-nix-packages."local-time"; - "marshal" = quicklisp-to-nix-packages."marshal"; - "md5" = quicklisp-to-nix-packages."md5"; - "named-readtables" = quicklisp-to-nix-packages."named-readtables"; - "proc-parse" = quicklisp-to-nix-packages."proc-parse"; - "quri" = quicklisp-to-nix-packages."quri"; - "rfc2388" = quicklisp-to-nix-packages."rfc2388"; - "rove" = quicklisp-to-nix-packages."rove"; - "smart-buffer" = quicklisp-to-nix-packages."smart-buffer"; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; - "static-vectors" = quicklisp-to-nix-packages."static-vectors"; - "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace"; "trivial-features" = quicklisp-to-nix-packages."trivial-features"; "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; - "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes"; - "trivial-types" = quicklisp-to-nix-packages."trivial-types"; - "uiop" = quicklisp-to-nix-packages."uiop"; - "usocket" = quicklisp-to-nix-packages."usocket"; - "xsubseq" = quicklisp-to-nix-packages."xsubseq"; - })); - - - "clack" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."clack" or (x: {})) - (import ./quicklisp-to-nix-output/clack.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; - "ironclad" = quicklisp-to-nix-packages."ironclad"; - "lack" = quicklisp-to-nix-packages."lack"; - "lack-component" = quicklisp-to-nix-packages."lack-component"; - "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace"; - "lack-util" = quicklisp-to-nix-packages."lack-util"; - "split-sequence" = quicklisp-to-nix-packages."split-sequence"; "uiop" = quicklisp-to-nix-packages."uiop"; "usocket" = quicklisp-to-nix-packages."usocket"; })); @@ -4109,14 +4117,6 @@ let quicklisp-to-nix-packages = rec { })); - "cl-custom-hash-table" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-custom-hash-table" or (x: {})) - (import ./quicklisp-to-nix-output/cl-custom-hash-table.nix { - inherit fetchurl; - })); - - "caveman" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."caveman" or (x: {})) From fec3f49bfe9d5dfa50803e19a3ee6dd3d4acdb25 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Tue, 17 Aug 2021 12:56:08 +0200 Subject: [PATCH 120/167] lispPackages: add varjo package and dependencies --- .../quicklisp-to-nix-output/fn.nix | 26 ++++++ .../quicklisp-to-nix-output/glsl-docs.nix | 28 +++++++ .../quicklisp-to-nix-output/glsl-spec.nix | 26 ++++++ .../quicklisp-to-nix-output/glsl-symbols.nix | 27 +++++++ .../quicklisp-to-nix-output/lisp-unit.nix | 26 ++++++ .../quicklisp-to-nix-output/parse-float.nix | 30 +++++++ .../quicklisp-to-nix-output/varjo.nix | 39 +++++++++ .../vas-string-metrics.nix | 27 +++++++ .../lisp-modules/quicklisp-to-nix-systems.txt | 1 + .../lisp-modules/quicklisp-to-nix.nix | 80 +++++++++++++++++++ 10 files changed, 310 insertions(+) create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/fn.nix create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/glsl-docs.nix create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/glsl-spec.nix create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/glsl-symbols.nix create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit.nix create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-float.nix create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/varjo.nix create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/vas-string-metrics.nix diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fn.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fn.nix new file mode 100644 index 000000000000..02e054b2f2c0 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fn.nix @@ -0,0 +1,26 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "fn"; + version = "20171019-git"; + + description = "Some macros for lambda brevity"; + + deps = [ args."named-readtables" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/fn/2017-10-19/fn-20171019-git.tgz"; + sha256 = "0r062ffn31sc7313xlfaa9pwnf2wdkiq4spqlr1lk5r8isvdnzz8"; + }; + + packageName = "fn"; + + asdFilesToKeep = ["fn.asd"]; + overrides = x: x; +} +/* (SYSTEM fn DESCRIPTION Some macros for lambda brevity SHA256 + 0r062ffn31sc7313xlfaa9pwnf2wdkiq4spqlr1lk5r8isvdnzz8 URL + http://beta.quicklisp.org/archive/fn/2017-10-19/fn-20171019-git.tgz MD5 + 0e1cfe5f19ceec8966baa3037772d31e NAME fn FILENAME fn DEPS + ((NAME named-readtables FILENAME named-readtables)) DEPENDENCIES + (named-readtables) VERSION 20171019-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/glsl-docs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/glsl-docs.nix new file mode 100644 index 000000000000..4679a62c0679 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/glsl-docs.nix @@ -0,0 +1,28 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "glsl-docs"; + version = "glsl-spec-release-quicklisp-f04476f7-git"; + + description = "The official docs for all the symbols in glsl-symbols"; + + deps = [ args."glsl-symbols" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/glsl-spec/2019-10-07/glsl-spec-release-quicklisp-f04476f7-git.tgz"; + sha256 = "0vdxx5asra0r58qpk35ncmyh418szzzvby8bpkrb052g00nzqgj7"; + }; + + packageName = "glsl-docs"; + + asdFilesToKeep = ["glsl-docs.asd"]; + overrides = x: x; +} +/* (SYSTEM glsl-docs DESCRIPTION + The official docs for all the symbols in glsl-symbols SHA256 + 0vdxx5asra0r58qpk35ncmyh418szzzvby8bpkrb052g00nzqgj7 URL + http://beta.quicklisp.org/archive/glsl-spec/2019-10-07/glsl-spec-release-quicklisp-f04476f7-git.tgz + MD5 52760939a269acce6b2cba8dbde81ef7 NAME glsl-docs FILENAME glsl-docs DEPS + ((NAME glsl-symbols FILENAME glsl-symbols)) DEPENDENCIES (glsl-symbols) + VERSION glsl-spec-release-quicklisp-f04476f7-git SIBLINGS + (glsl-spec glsl-symbols) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/glsl-spec.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/glsl-spec.nix new file mode 100644 index 000000000000..08150c645f6f --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/glsl-spec.nix @@ -0,0 +1,26 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "glsl-spec"; + version = "release-quicklisp-f04476f7-git"; + + description = "The GLSL Spec as a datastructure"; + + deps = [ ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/glsl-spec/2019-10-07/glsl-spec-release-quicklisp-f04476f7-git.tgz"; + sha256 = "0vdxx5asra0r58qpk35ncmyh418szzzvby8bpkrb052g00nzqgj7"; + }; + + packageName = "glsl-spec"; + + asdFilesToKeep = ["glsl-spec.asd"]; + overrides = x: x; +} +/* (SYSTEM glsl-spec DESCRIPTION The GLSL Spec as a datastructure SHA256 + 0vdxx5asra0r58qpk35ncmyh418szzzvby8bpkrb052g00nzqgj7 URL + http://beta.quicklisp.org/archive/glsl-spec/2019-10-07/glsl-spec-release-quicklisp-f04476f7-git.tgz + MD5 52760939a269acce6b2cba8dbde81ef7 NAME glsl-spec FILENAME glsl-spec DEPS + NIL DEPENDENCIES NIL VERSION release-quicklisp-f04476f7-git SIBLINGS + (glsl-docs glsl-symbols) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/glsl-symbols.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/glsl-symbols.nix new file mode 100644 index 000000000000..fd22bfb6adf8 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/glsl-symbols.nix @@ -0,0 +1,27 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "glsl-symbols"; + version = "glsl-spec-release-quicklisp-f04476f7-git"; + + description = "Lispy versions of all glsl names as symbols"; + + deps = [ ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/glsl-spec/2019-10-07/glsl-spec-release-quicklisp-f04476f7-git.tgz"; + sha256 = "0vdxx5asra0r58qpk35ncmyh418szzzvby8bpkrb052g00nzqgj7"; + }; + + packageName = "glsl-symbols"; + + asdFilesToKeep = ["glsl-symbols.asd"]; + overrides = x: x; +} +/* (SYSTEM glsl-symbols DESCRIPTION Lispy versions of all glsl names as symbols + SHA256 0vdxx5asra0r58qpk35ncmyh418szzzvby8bpkrb052g00nzqgj7 URL + http://beta.quicklisp.org/archive/glsl-spec/2019-10-07/glsl-spec-release-quicklisp-f04476f7-git.tgz + MD5 52760939a269acce6b2cba8dbde81ef7 NAME glsl-symbols FILENAME + glsl-symbols DEPS NIL DEPENDENCIES NIL VERSION + glsl-spec-release-quicklisp-f04476f7-git SIBLINGS (glsl-docs glsl-spec) + PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit.nix new file mode 100644 index 000000000000..673ef0ee6342 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit.nix @@ -0,0 +1,26 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "lisp-unit"; + version = "20170124-git"; + + description = "Common Lisp library that supports unit testing."; + + deps = [ ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/lisp-unit/2017-01-24/lisp-unit-20170124-git.tgz"; + sha256 = "00bc19r7vr76rpk8lh8z7qln0glpf66mzqxw215488zwz3nwcq4m"; + }; + + packageName = "lisp-unit"; + + asdFilesToKeep = ["lisp-unit.asd"]; + overrides = x: x; +} +/* (SYSTEM lisp-unit DESCRIPTION + Common Lisp library that supports unit testing. SHA256 + 00bc19r7vr76rpk8lh8z7qln0glpf66mzqxw215488zwz3nwcq4m URL + http://beta.quicklisp.org/archive/lisp-unit/2017-01-24/lisp-unit-20170124-git.tgz + MD5 2c55342cb8af18b290bb6a28c75deac5 NAME lisp-unit FILENAME lisp-unit DEPS + NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-float.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-float.nix new file mode 100644 index 000000000000..0ad2062417c9 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-float.nix @@ -0,0 +1,30 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "parse-float"; + version = "20200218-git"; + + parasites = [ "parse-float-tests" ]; + + description = "Parse floating point values in strings."; + + deps = [ args."alexandria" args."lisp-unit" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/parse-float/2020-02-18/parse-float-20200218-git.tgz"; + sha256 = "02rhgn79hhv0p5ysj4gwk5bhmr2sj6cvkacbqzzw24qrzgcpdnfw"; + }; + + packageName = "parse-float"; + + asdFilesToKeep = ["parse-float.asd"]; + overrides = x: x; +} +/* (SYSTEM parse-float DESCRIPTION Parse floating point values in strings. + SHA256 02rhgn79hhv0p5ysj4gwk5bhmr2sj6cvkacbqzzw24qrzgcpdnfw URL + http://beta.quicklisp.org/archive/parse-float/2020-02-18/parse-float-20200218-git.tgz + MD5 149e40a8c5fd6ab0e43242cb898d66bf NAME parse-float FILENAME parse-float + DEPS + ((NAME alexandria FILENAME alexandria) (NAME lisp-unit FILENAME lisp-unit)) + DEPENDENCIES (alexandria lisp-unit) VERSION 20200218-git SIBLINGS NIL + PARASITES (parse-float-tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/varjo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/varjo.nix new file mode 100644 index 000000000000..c69acab7ba20 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/varjo.nix @@ -0,0 +1,39 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "varjo"; + version = "release-quicklisp-92f9c75b-git"; + + description = "Common Lisp -> GLSL Compiler"; + + deps = [ args."alexandria" args."cl-ppcre" args."documentation-utils" args."fn" args."glsl-docs" args."glsl-spec" args."glsl-symbols" args."named-readtables" args."parse-float" args."trivial-indent" args."uiop" args."vas-string-metrics" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/varjo/2021-01-24/varjo-release-quicklisp-92f9c75b-git.tgz"; + sha256 = "0xxi2ivjz3fqgw2nxzshf9m7ppvzv7wdg20lr0krq14i8j5gf5jy"; + }; + + packageName = "varjo"; + + asdFilesToKeep = ["varjo.asd"]; + overrides = x: x; +} +/* (SYSTEM varjo DESCRIPTION Common Lisp -> GLSL Compiler SHA256 + 0xxi2ivjz3fqgw2nxzshf9m7ppvzv7wdg20lr0krq14i8j5gf5jy URL + http://beta.quicklisp.org/archive/varjo/2021-01-24/varjo-release-quicklisp-92f9c75b-git.tgz + MD5 78a3b8021885ebfab4015e20b885cdcf NAME varjo FILENAME varjo DEPS + ((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME documentation-utils FILENAME documentation-utils) + (NAME fn FILENAME fn) (NAME glsl-docs FILENAME glsl-docs) + (NAME glsl-spec FILENAME glsl-spec) + (NAME glsl-symbols FILENAME glsl-symbols) + (NAME named-readtables FILENAME named-readtables) + (NAME parse-float FILENAME parse-float) + (NAME trivial-indent FILENAME trivial-indent) (NAME uiop FILENAME uiop) + (NAME vas-string-metrics FILENAME vas-string-metrics)) + DEPENDENCIES + (alexandria cl-ppcre documentation-utils fn glsl-docs glsl-spec + glsl-symbols named-readtables parse-float trivial-indent uiop + vas-string-metrics) + VERSION release-quicklisp-92f9c75b-git SIBLINGS (varjo.import varjo.tests) + PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vas-string-metrics.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vas-string-metrics.nix new file mode 100644 index 000000000000..122bab4b3b3a --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vas-string-metrics.nix @@ -0,0 +1,27 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "vas-string-metrics"; + version = "20160208-git"; + + description = "Jaro-Winkler and Levenshtein string distance algorithms."; + + deps = [ ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/vas-string-metrics/2016-02-08/vas-string-metrics-20160208-git.tgz"; + sha256 = "1s9a9bgc2ibknjr6mlbr4gsxcwpjivz5hbl1wz57fsh4n0w8h7ch"; + }; + + packageName = "vas-string-metrics"; + + asdFilesToKeep = ["vas-string-metrics.asd"]; + overrides = x: x; +} +/* (SYSTEM vas-string-metrics DESCRIPTION + Jaro-Winkler and Levenshtein string distance algorithms. SHA256 + 1s9a9bgc2ibknjr6mlbr4gsxcwpjivz5hbl1wz57fsh4n0w8h7ch URL + http://beta.quicklisp.org/archive/vas-string-metrics/2016-02-08/vas-string-metrics-20160208-git.tgz + MD5 5f38d4ee241c11286be6147f481e7fd0 NAME vas-string-metrics FILENAME + vas-string-metrics DEPS NIL DEPENDENCIES NIL VERSION 20160208-git SIBLINGS + (test.vas-string-metrics) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index 15532c42fd69..99ba08527072 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -209,6 +209,7 @@ usocket utilities.print-items utilities.print-tree uuid +varjo woo wookie xembed diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index b2d68b2ba92f..820d589140a5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -6,6 +6,14 @@ let quicklisp-to-nix-packages = rec { buildLispPackage = callPackage ./define-package.nix; qlOverrides = callPackage ./quicklisp-to-nix-overrides.nix {}; + "lisp-unit" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."lisp-unit" or (x: {})) + (import ./quicklisp-to-nix-output/lisp-unit.nix { + inherit fetchurl; + })); + + "pythonic-string-reader" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."pythonic-string-reader" or (x: {})) @@ -74,6 +82,58 @@ let quicklisp-to-nix-packages = rec { })); + "vas-string-metrics" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."vas-string-metrics" or (x: {})) + (import ./quicklisp-to-nix-output/vas-string-metrics.nix { + inherit fetchurl; + })); + + + "parse-float" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."parse-float" or (x: {})) + (import ./quicklisp-to-nix-output/parse-float.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "lisp-unit" = quicklisp-to-nix-packages."lisp-unit"; + })); + + + "glsl-symbols" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."glsl-symbols" or (x: {})) + (import ./quicklisp-to-nix-output/glsl-symbols.nix { + inherit fetchurl; + })); + + + "glsl-spec" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."glsl-spec" or (x: {})) + (import ./quicklisp-to-nix-output/glsl-spec.nix { + inherit fetchurl; + })); + + + "glsl-docs" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."glsl-docs" or (x: {})) + (import ./quicklisp-to-nix-output/glsl-docs.nix { + inherit fetchurl; + "glsl-symbols" = quicklisp-to-nix-packages."glsl-symbols"; + })); + + + "fn" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."fn" or (x: {})) + (import ./quicklisp-to-nix-output/fn.nix { + inherit fetchurl; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + })); + + "mgl-pax" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."mgl-pax" or (x: {})) @@ -1476,6 +1536,26 @@ let quicklisp-to-nix-packages = rec { })); + "varjo" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."varjo" or (x: {})) + (import ./quicklisp-to-nix-output/varjo.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; + "fn" = quicklisp-to-nix-packages."fn"; + "glsl-docs" = quicklisp-to-nix-packages."glsl-docs"; + "glsl-spec" = quicklisp-to-nix-packages."glsl-spec"; + "glsl-symbols" = quicklisp-to-nix-packages."glsl-symbols"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "parse-float" = quicklisp-to-nix-packages."parse-float"; + "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; + "uiop" = quicklisp-to-nix-packages."uiop"; + "vas-string-metrics" = quicklisp-to-nix-packages."vas-string-metrics"; + })); + + "uuid" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."uuid" or (x: {})) From 43ff4fde4385e5d438f0502215a8f3a28476efd0 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Sun, 5 Sep 2021 22:24:43 +0200 Subject: [PATCH 121/167] reckon: 0.7.1 -> 0.8.0 --- pkgs/tools/text/reckon/Gemfile.lock | 4 ++-- pkgs/tools/text/reckon/default.nix | 1 + pkgs/tools/text/reckon/gemset.nix | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/text/reckon/Gemfile.lock b/pkgs/tools/text/reckon/Gemfile.lock index b1bfe4aaa8bd..18dc624c3da1 100644 --- a/pkgs/tools/text/reckon/Gemfile.lock +++ b/pkgs/tools/text/reckon/Gemfile.lock @@ -4,7 +4,7 @@ GEM chronic (0.10.2) highline (2.0.3) rchardet (1.8.0) - reckon (0.7.1) + reckon (0.8.0) chronic (>= 0.3.0) highline (>= 1.5.2) rchardet (>= 1.8.0) @@ -16,4 +16,4 @@ DEPENDENCIES reckon BUNDLED WITH - 1.17.2 + 2.2.20 diff --git a/pkgs/tools/text/reckon/default.nix b/pkgs/tools/text/reckon/default.nix index 3af64e39ed17..91233dfe97b4 100644 --- a/pkgs/tools/text/reckon/default.nix +++ b/pkgs/tools/text/reckon/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ nicknovitski ]; platforms = platforms.unix; + changelog = "https://github.com/cantino/reckon/blob/v${version}/CHANGELOG.md"; }; } diff --git a/pkgs/tools/text/reckon/gemset.nix b/pkgs/tools/text/reckon/gemset.nix index 09a4e704d08e..0e2cc48886a4 100644 --- a/pkgs/tools/text/reckon/gemset.nix +++ b/pkgs/tools/text/reckon/gemset.nix @@ -35,9 +35,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hsmzjxj1f5ma816gag1b3bdjbynhj2szgar955fcs3gbbzv4sk7"; + sha256 = "0qnghypb9pj7888096xwyrx7myhzk85x69ympxkxki3kxcgcrdfn"; type = "gem"; }; - version = "0.7.1"; + version = "0.8.0"; }; } From a9fe9e8a327d0a7bd8d3ab81c21533200fa10679 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Mon, 6 Sep 2021 19:56:04 +0200 Subject: [PATCH 122/167] age: set and check version --- pkgs/tools/security/age/default.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/tools/security/age/default.nix b/pkgs/tools/security/age/default.nix index 695d4a732893..cff4630dd5db 100644 --- a/pkgs/tools/security/age/default.nix +++ b/pkgs/tools/security/age/default.nix @@ -12,6 +12,20 @@ buildGoModule rec { sha256 = "sha256-MfyW8Yv8swKqA7Hl45l5Zn4wZrQmE661eHsKIywy36U="; }; + ldflags = [ + "-X main.Version=${version}" + ]; + + doInstallCheck = true; + installCheckPhase = '' + if [[ "$("$out/bin/${pname}" --version)" == "${version}" ]]; then + echo '${pname} smoke check passed' + else + echo '${pname} smoke check failed' + return 1 + fi + ''; + meta = with lib; { homepage = "https://age-encryption.org/"; description = "Modern encryption tool with small explicit keys"; From f5a0c96b9a50a40a77f955a699802e27585384e1 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 6 Sep 2021 23:00:55 +0200 Subject: [PATCH 123/167] fuse3: 3.10.4 -> 3.10.5 --- pkgs/os-specific/linux/fuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index b060b908284b..b1d9d3dc41ef 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -11,7 +11,7 @@ in { }; fuse_3 = mkFuse { - version = "3.10.4"; - sha256Hash = "1ml4bs4wx5dbz5xpnd5g8b9avmn7g7jvf16fbdlk0da8il0qd2rx"; + version = "3.10.5"; + sha256Hash = "1yxh85m8fnn3w21f6g6vza7k2giizmyhcbkms4rmkcd2dd2rzk3y"; }; } From 4334e1cd8746a0f46a6fe4faefaec31a17beb4b9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Sep 2021 23:07:17 +0200 Subject: [PATCH 124/167] python3Packages.boschshcpy: 0.2.19 -> 0.2.20 --- pkgs/development/python-modules/boschshcpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix index 4e480514bca9..5d169058136d 100644 --- a/pkgs/development/python-modules/boschshcpy/default.nix +++ b/pkgs/development/python-modules/boschshcpy/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "boschshcpy"; - version = "0.2.19"; + version = "0.2.20"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "tschamm"; repo = pname; rev = version; - sha256 = "sha256-HxLy3tGMn2KDfD37yKLoImpfXGoaoGB6VEanNu/WMnk="; + sha256 = "sha256-5VbvsmTxAfL4XR8FJGzeDdS3Pe5Yf7yNDSZInotMRbw="; }; propagatedBuildInputs = [ From d697b79dcec9636466e01665341e57a063d944ea Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Sep 2021 23:56:08 +0200 Subject: [PATCH 125/167] python3Packages.youless-api: init at 0.12 --- .../python-modules/youless-api/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/youless-api/default.nix diff --git a/pkgs/development/python-modules/youless-api/default.nix b/pkgs/development/python-modules/youless-api/default.nix new file mode 100644 index 000000000000..bce08bddf2b9 --- /dev/null +++ b/pkgs/development/python-modules/youless-api/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromBitbucket +, pythonOlder +, certifi +, chardet +, idna +, nose +, requests +, six +, urllib3 +}: + +buildPythonPackage rec { + pname = "youless-api"; + version = "0.12"; + + disabled = pythonOlder "3.7"; + + src = fetchFromBitbucket { + owner = "jongsoftdev"; + repo = "youless-python-bridge"; + rev = version; + sha256 = "18hymahpblq87i7lv479sizj8mgxawjhj31g4j1lyna1mds3887k"; + }; + + propagatedBuildInputs = [ + certifi + chardet + idna + requests + six + urllib3 + ]; + + checkInputs = [ + nose + ]; + + pythonImportsCheck = [ "youless_api" ]; + + meta = with lib; { + description = "Python library for YouLess sensors"; + homepage = "https://pypi.org/project/youless-api/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 70c1760da3cf..9463ac2ec0ee 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9610,6 +9610,8 @@ in { yoda = toPythonModule (pkgs.yoda.override { inherit python; }); + youless-api = callPackage ../development/python-modules/youless-api { }; + youtube-dl = callPackage ../tools/misc/youtube-dl { }; youtube-dl-light = callPackage ../tools/misc/youtube-dl { From 688e7ade2cce7df57c363d2199cce19e9a3d23c4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Sep 2021 00:00:36 +0200 Subject: [PATCH 126/167] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index da88c09c5b61..28285fa2ee37 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -993,7 +993,7 @@ "yeelight" = ps: with ps; [ yeelight ]; "yeelightsunflower" = ps: with ps; [ ]; # missing inputs: yeelightsunflower "yi" = ps: with ps; [ aioftp ha-ffmpeg ]; - "youless" = ps: with ps; [ ]; # missing inputs: youless-api + "youless" = ps: with ps; [ youless-api ]; "zabbix" = ps: with ps; [ ]; # missing inputs: py-zabbix "zamg" = ps: with ps; [ ]; "zengge" = ps: with ps; [ ]; # missing inputs: zengge From bccb933206a2b10bdacfc481b1f48c60878ec3af Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Sep 2021 00:02:36 +0200 Subject: [PATCH 127/167] home-assistant: enable youless tests --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 7bf04b65c723..cc10491ffff2 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -722,6 +722,7 @@ in with py.pkgs; buildPythonApplication rec { "yandex_transport" "yandextts" "yeelight" + "youless" # disabled, because it tries to join a multicast group and fails to find a usable network interface # "zeroconf" "zerproc" From e864d443befc09b25816629c81758ee997f4bc83 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Sep 2021 00:35:22 +0200 Subject: [PATCH 128/167] python3Packages.pontos: init at 21.7.4 --- .../python-modules/pontos/default.nix | 57 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/development/python-modules/pontos/default.nix diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix new file mode 100644 index 000000000000..8ee1e6d784e3 --- /dev/null +++ b/pkgs/development/python-modules/pontos/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry +, pytestCheckHook +, pythonOlder +, colorful +, tomlkit +, git +, requests +}: + +buildPythonPackage rec { + pname = "pontos"; + version = "21.7.4"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "greenbone"; + repo = pname; + rev = "v${version}"; + sha256 = "12z74fp21kv6jf4cwc4hd5xvl5lilhmpprcqimdg85pcddc4zwc2"; + }; + + nativeBuildInputs = [ + poetry + ]; + + propagatedBuildInputs = [ + colorful + tomlkit + requests + ]; + + checkInputs = [ + git + pytestCheckHook + ]; + + disabledTests = [ + # Signing fails + "test_find_no_signing_key" + "test_find_signing_key" + "test_find_unreleased_information" + ]; + + pythonImportsCheck = [ "pontos" ]; + + meta = with lib; { + description = "Collection of Python utilities, tools, classes and functions"; + homepage = "https://github.com/greenbone/pontos"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 70c1760da3cf..b70fbb20a5e3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5582,6 +5582,8 @@ in { pomegranate = callPackage ../development/python-modules/pomegranate { }; + pontos = callPackage ../development/python-modules/pontos { }; + pony = callPackage ../development/python-modules/pony { }; ponywhoosh = callPackage ../development/python-modules/ponywhoosh { }; From 1823f8f0cd3f1ef0e9a3ff38f9ca3ed57670d5da Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 7 Sep 2021 02:41:01 +0200 Subject: [PATCH 129/167] tts: 0.2.1 -> 0.2.2 --- pkgs/tools/audio/tts/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index eb1ea2aa5923..2f8a9ac82a67 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -16,13 +16,13 @@ python3.pkgs.buildPythonApplication rec { pname = "tts"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "coqui-ai"; repo = "TTS"; rev = "v${version}"; - sha256 = "sha256-7YMNxZ15qQowEE0tE6x/LbtirNGp7h9OLyS1JSl9x2A="; + sha256 = "sha256-hhL6/hBs2umR8/VEumr2LzuCAOkroK8vBfDuNVY0ygw="; }; postPatch = '' @@ -55,6 +55,7 @@ python3.pkgs.buildPythonApplication rec { pypinyin pysbd pytorch + pyworld scipy soundfile tensorboardx From 6af74c9ff8b03dd885246e46c01447adea529424 Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Tue, 7 Sep 2021 11:32:15 +1000 Subject: [PATCH 130/167] rPackages.ssh: include missing libssh buildInput --- pkgs/development/r-modules/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 4341e659bed0..40ffae5e80fd 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -456,6 +456,7 @@ let mvtnorm = [ pkgs.libiconv ]; statmod = [ pkgs.libiconv ]; rsvg = [ pkgs.librsvg.dev ]; + ssh = with pkgs; [ libssh ]; }; packagesRequireingX = [ From 1195d52ad7587390f26447302924473b7a11996c Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 6 Sep 2021 16:45:27 -0300 Subject: [PATCH 131/167] Update comments about automatic generation of elisp packages --- .../editors/emacs/elisp-packages/elpa-packages.nix | 2 +- .../editors/emacs/elisp-packages/nongnu-packages.nix | 5 +++-- .../editors/emacs/elisp-packages/org-packages.nix | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 495a3cbfd0f5..b7f861a4cd7a 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -6,7 +6,7 @@ To update the list of packages from MELPA, 1. Run `./update-elpa`. 2. Check for evaluation errors: - `nix-instantiate ../../../../../ -A emacs.pkgs.elpaPackages`. + env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate ../../../../../ -A emacs.pkgs.elpaPackages 3. Run `git commit -m "elpa-packages $(date -Idate)" -- elpa-generated.nix` ## Update from overlay diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix index 66ca61499d96..dcd7e92c642d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix @@ -5,8 +5,9 @@ To update the list of packages from nongnu (ELPA), 1. Run `./update-nongnu`. -2. Check for evaluation errors: `nix-instantiate ../../../../.. -A emacs.pkgs.nongnuPackages`. -3. Run `git commit -m "org-packages $(date -Idate)" -- nongnu-generated.nix` +2. Check for evaluation errors: + env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate ../../../../.. -A emacs.pkgs.nongnuPackages +3. Run `git commit -m "nongnu-packages $(date -Idate)" -- nongnu-generated.nix` */ diff --git a/pkgs/applications/editors/emacs/elisp-packages/org-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/org-packages.nix index dcddbe71af8b..12680336e0e8 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/org-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/org-packages.nix @@ -5,7 +5,8 @@ To update the list of packages from Org (ELPA), 1. Run `./update-org`. -2. Check for evaluation errors: `nix-instantiate ../../../../.. -A emacs.pkgs.orgPackages`. +2. Check for evaluation errors: + env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate ../../../../.. -A emacs.pkgs.orgPackages 3. Run `git commit -m "org-packages $(date -Idate)" -- org-generated.nix` */ From 45f2cb502b6f476d4dc86df22fa0e218cd4e41f4 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 6 Sep 2021 15:14:12 -0300 Subject: [PATCH 132/167] org-packages 2021-09-06 --- .../editors/emacs/elisp-packages/org-generated.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix index 10c63bc0b887..3eae4bc52ce9 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix @@ -4,10 +4,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "20210823"; + version = "20210906"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20210823.tar"; - sha256 = "0yd2ydkkfy9lmlnb0lpsm8ywbk88sq9n4i7dasfzslv7czgccyh7"; + url = "https://orgmode.org/elpa/org-20210906.tar"; + sha256 = "04aqniwix4w0iap38dsdskndknhw9k6apkmkrc79yfs3c4jcsszq"; }; packageRequires = []; meta = { @@ -19,10 +19,10 @@ elpaBuild { pname = "org-plus-contrib"; ename = "org-plus-contrib"; - version = "20210823"; + version = "20210906"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20210823.tar"; - sha256 = "17lyhsi22wg3l3j4k67glvq9p12r3nlc7fs6ka5jr2xrvfypb5aj"; + url = "https://orgmode.org/elpa/org-plus-contrib-20210906.tar"; + sha256 = "1v0yy92x8shwp36qfyzmvk8ayz9amkdis967gqacq5jxcyq7mhbn"; }; packageRequires = []; meta = { From 11690420086874e479002a04ffba6faae37b432f Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 6 Sep 2021 15:17:52 -0300 Subject: [PATCH 133/167] nongnu-packages 2021-09-06 --- .../emacs/elisp-packages/nongnu-generated.nix | 894 +++++++++++++++++- 1 file changed, 888 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index 0ab44fccc8e5..1804188cdbb7 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -1,20 +1,598 @@ { callPackage }: { - caml = callPackage ({ elpaBuild, fetchurl, lib }: + apache-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { - pname = "caml"; - ename = "caml"; - version = "4.7.1"; + pname = "apache-mode"; + ename = "apache-mode"; + version = "2.2.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/caml-4.7.1.tar"; - sha256 = "1bv2fscy7zg7r1hyg4rpvh3991vmhy4zid7bv1qbhxa95m9c49j3"; + url = "https://elpa.nongnu.org/nongnu/apache-mode-2.2.0.tar"; + sha256 = "022s7rw7ary1cx3riszzvb7wi0y078vixkcyggjdg5j2ckjpc8gb"; }; packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/apache-mode.html"; + license = lib.licenses.free; + }; + }) {}; + arduino-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib, spinner }: + elpaBuild { + pname = "arduino-mode"; + ename = "arduino-mode"; + version = "1.3.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/arduino-mode-1.3.0.tar"; + sha256 = "1270mbjgj0kmmjqqblwaipmd2667yp31mgspib3c5d7d6acs1bfx"; + }; + packageRequires = [ emacs spinner ]; + meta = { + homepage = "https://elpa.gnu.org/packages/arduino-mode.html"; + license = lib.licenses.free; + }; + }) {}; + bison-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "bison-mode"; + ename = "bison-mode"; + version = "0.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/bison-mode-0.4.tar"; + sha256 = "19n9kz1ycjpxngd3clzr8lzrnnw19l8sfvlx1yqn35hk7017z7ab"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/bison-mode.html"; + license = lib.licenses.free; + }; + }) {}; + caml = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "caml"; + ename = "caml"; + version = "4.8"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/caml-4.8.tar"; + sha256 = "02wzjdd1ig8ajy65rf87zaysfddjbhyswifwlcs52ly7p84q72wk"; + }; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/caml.html"; license = lib.licenses.free; }; }) {}; + clojure-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "clojure-mode"; + ename = "clojure-mode"; + version = "5.13.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.13.0.tar"; + sha256 = "16xll0sp7mqzwldfsihp7j3dlm6ps1l1awi122ff8w7xph7b0wfh"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/clojure-mode.html"; + license = lib.licenses.free; + }; + }) {}; + crux = callPackage ({ elpaBuild, fetchurl, lib, seq }: + elpaBuild { + pname = "crux"; + ename = "crux"; + version = "0.4.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/crux-0.4.0.tar"; + sha256 = "01yg54s2l3zr4h7h3nw408bqzrr4yds9rfgc575b76006v5d3ciy"; + }; + packageRequires = [ seq ]; + meta = { + homepage = "https://elpa.gnu.org/packages/crux.html"; + license = lib.licenses.free; + }; + }) {}; + d-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "d-mode"; + ename = "d-mode"; + version = "202003130913"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/d-mode-202003130913.tar"; + sha256 = "1pad0ib8l1zkjmh97n1pkwph1xdbcqidnicm3nwmcbmbi61lddsx"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/d-mode.html"; + license = lib.licenses.free; + }; + }) {}; + dart-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "dart-mode"; + ename = "dart-mode"; + version = "1.0.7"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/dart-mode-1.0.7.tar"; + sha256 = "13n0fmnxgnq8vjw0n5vwgdgfm5lznvrm3xkak4snkdw7w3rd3a20"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/dart-mode.html"; + license = lib.licenses.free; + }; + }) {}; + editorconfig = callPackage ({ cl-lib ? null + , elpaBuild + , emacs + , fetchurl + , lib + , nadvice }: + elpaBuild { + pname = "editorconfig"; + ename = "editorconfig"; + version = "0.8.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/editorconfig-0.8.2.tar"; + sha256 = "1ff8hwyzb249lf78j023sbibgfmimmk6mxkjmcnqqnk1jafprk02"; + }; + packageRequires = [ cl-lib emacs nadvice ]; + meta = { + homepage = "https://elpa.gnu.org/packages/editorconfig.html"; + license = lib.licenses.free; + }; + }) {}; + evil = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "evil"; + ename = "evil"; + version = "1.14.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/evil-1.14.0.tar"; + sha256 = "11hzx3ya1119kr8dwlg264biixiqgvi7zwxxksql0a9hqp57rdpx"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/evil.html"; + license = lib.licenses.free; + }; + }) {}; + geiser = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "geiser"; + ename = "geiser"; + version = "0.16"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/geiser-0.16.tar"; + sha256 = "1mhngb1ik3qsc3w466cs61rbz3nn08ag29m5vfbd6adk60xmhnfk"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/geiser.html"; + license = lib.licenses.free; + }; + }) {}; + geiser-chez = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }: + elpaBuild { + pname = "geiser-chez"; + ename = "geiser-chez"; + version = "0.16"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/geiser-chez-0.16.tar"; + sha256 = "016b7n5rv7fyrw4lqcprhhf2rai5vvmmc8a13l4w3a30rwcgm7cd"; + }; + packageRequires = [ emacs geiser ]; + meta = { + homepage = "https://elpa.gnu.org/packages/geiser-chez.html"; + license = lib.licenses.free; + }; + }) {}; + geiser-chibi = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }: + elpaBuild { + pname = "geiser-chibi"; + ename = "geiser-chibi"; + version = "0.16"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/geiser-chibi-0.16.tar"; + sha256 = "0j9dgg2q01ya6yawpfc15ywrfykd5gzbh118k1x4mghfkfnqn1zi"; + }; + packageRequires = [ emacs geiser ]; + meta = { + homepage = "https://elpa.gnu.org/packages/geiser-chibi.html"; + license = lib.licenses.free; + }; + }) {}; + geiser-chicken = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }: + elpaBuild { + pname = "geiser-chicken"; + ename = "geiser-chicken"; + version = "0.16"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/geiser-chicken-0.16.tar"; + sha256 = "1zmb8c86akrd5f1v59s4xkbpgsqbdcbc6d5f9h6kxa55ylc4dn6a"; + }; + packageRequires = [ emacs geiser ]; + meta = { + homepage = "https://elpa.gnu.org/packages/geiser-chicken.html"; + license = lib.licenses.free; + }; + }) {}; + geiser-gambit = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }: + elpaBuild { + pname = "geiser-gambit"; + ename = "geiser-gambit"; + version = "0.16"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/geiser-gambit-0.16.tar"; + sha256 = "0bc38qlqj7a3cnrcnqrb6m3jvjh2ia5iby9i50vcn0jbs52rfsnz"; + }; + packageRequires = [ emacs geiser ]; + meta = { + homepage = "https://elpa.gnu.org/packages/geiser-gambit.html"; + license = lib.licenses.free; + }; + }) {}; + geiser-gauche = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }: + elpaBuild { + pname = "geiser-gauche"; + ename = "geiser-gauche"; + version = "0.0.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/geiser-gauche-0.0.2.tar"; + sha256 = "0wd0yddasryy36ms5ghf0gs8wf80sgdxci2hd8k0fvnyi7c3wnj5"; + }; + packageRequires = [ emacs geiser ]; + meta = { + homepage = "https://elpa.gnu.org/packages/geiser-gauche.html"; + license = lib.licenses.free; + }; + }) {}; + geiser-guile = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }: + elpaBuild { + pname = "geiser-guile"; + ename = "geiser-guile"; + version = "0.17"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.17.tar"; + sha256 = "0g4982rfxjp08qi6nxz73lsbdwf388fx511394yw4s7ml6v1m4kd"; + }; + packageRequires = [ emacs geiser ]; + meta = { + homepage = "https://elpa.gnu.org/packages/geiser-guile.html"; + license = lib.licenses.free; + }; + }) {}; + geiser-kawa = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }: + elpaBuild { + pname = "geiser-kawa"; + ename = "geiser-kawa"; + version = "0.0.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/geiser-kawa-0.0.1.tar"; + sha256 = "1qh4qr406ahk4k8g46nzkiic1fidhni0a5zv4i84cdypv1c4473p"; + }; + packageRequires = [ emacs geiser ]; + meta = { + homepage = "https://elpa.gnu.org/packages/geiser-kawa.html"; + license = lib.licenses.free; + }; + }) {}; + geiser-mit = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }: + elpaBuild { + pname = "geiser-mit"; + ename = "geiser-mit"; + version = "0.13"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/geiser-mit-0.13.tar"; + sha256 = "1y2cgrcvdp358x7lpcz8x8nw5g1y4h03d9gbkbd6k85643cwrkbi"; + }; + packageRequires = [ emacs geiser ]; + meta = { + homepage = "https://elpa.gnu.org/packages/geiser-mit.html"; + license = lib.licenses.free; + }; + }) {}; + geiser-racket = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }: + elpaBuild { + pname = "geiser-racket"; + ename = "geiser-racket"; + version = "0.16"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/geiser-racket-0.16.tar"; + sha256 = "0lf2lbgpl8pvx7yhiydb7j5hk3kdx34zvhva4zqnzya6zf30w257"; + }; + packageRequires = [ emacs geiser ]; + meta = { + homepage = "https://elpa.gnu.org/packages/geiser-racket.html"; + license = lib.licenses.free; + }; + }) {}; + geiser-stklos = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }: + elpaBuild { + pname = "geiser-stklos"; + ename = "geiser-stklos"; + version = "1.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/geiser-stklos-1.3.tar"; + sha256 = "1wkhnkdhdrhrh0vipgnlmyimi859za6jhf2ldpwfmk8r2aj8ywan"; + }; + packageRequires = [ emacs geiser ]; + meta = { + homepage = "https://elpa.gnu.org/packages/geiser-stklos.html"; + license = lib.licenses.free; + }; + }) {}; + git-commit = callPackage ({ dash + , elpaBuild + , emacs + , fetchurl + , lib + , transient + , with-editor }: + elpaBuild { + pname = "git-commit"; + ename = "git-commit"; + version = "3.2.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/git-commit-3.2.1.tar"; + sha256 = "1jndc8ppj4r2s62idabygj4q0qbpk4gwifn8jrd6pa61d7dlvp28"; + }; + packageRequires = [ dash emacs transient with-editor ]; + meta = { + homepage = "https://elpa.gnu.org/packages/git-commit.html"; + license = lib.licenses.free; + }; + }) {}; + gnuplot = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "gnuplot"; + ename = "gnuplot"; + version = "0.8.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/gnuplot-0.8.0.tar"; + sha256 = "1f27y18ivcdwlkgr3ql4qcbgzdp6vk1bkw2wlryrclpydbb1nya3"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/gnuplot.html"; + license = lib.licenses.free; + }; + }) {}; + go-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "go-mode"; + ename = "go-mode"; + version = "1.5.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/go-mode-1.5.0.tar"; + sha256 = "0v4lw5dkijajpxyigin4cd5q4ldrabljaz65zr5f7mgqn5sizj3q"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/go-mode.html"; + license = lib.licenses.free; + }; + }) {}; + goto-chg = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "goto-chg"; + ename = "goto-chg"; + version = "1.7.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/goto-chg-1.7.4.tar"; + sha256 = "1sg2gp48b83gq0j821lk241lwyxkhqr6w5d1apbnkm3qf08qjwba"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/goto-chg.html"; + license = lib.licenses.free; + }; + }) {}; + guru-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "guru-mode"; + ename = "guru-mode"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/guru-mode-1.0.tar"; + sha256 = "18vz80yc7nv6dgyyxmlxslwim7qpb1dx2y5382c2wbdqp0icg41g"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/guru-mode.html"; + license = lib.licenses.free; + }; + }) {}; + haskell-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "haskell-mode"; + ename = "haskell-mode"; + version = "4.7.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/haskell-mode-4.7.1.tar"; + sha256 = "07x7440xi8dkv1zpzwi7p96jy3zd6pdv1mhs066l8bp325516wyb"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/haskell-mode.html"; + license = lib.licenses.free; + }; + }) {}; + highlight-parentheses = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib }: + elpaBuild { + pname = "highlight-parentheses"; + ename = "highlight-parentheses"; + version = "2.1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/highlight-parentheses-2.1.0.tar"; + sha256 = "1rsixbvglar0k0x24xkxw80sx9i85q48jdzx6wbyjz2clz974ja5"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/highlight-parentheses.html"; + license = lib.licenses.free; + }; + }) {}; + htmlize = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "htmlize"; + ename = "htmlize"; + version = "1.57"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/htmlize-1.57.tar"; + sha256 = "1k4maqkcicvpl4yxkx6ha98x36ppcfdp2clcdg4fjx945yamx80s"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/htmlize.html"; + license = lib.licenses.free; + }; + }) {}; + idris-mode = callPackage ({ cl-lib ? null + , elpaBuild + , emacs + , fetchurl + , lib + , prop-menu }: + elpaBuild { + pname = "idris-mode"; + ename = "idris-mode"; + version = "0.9.18"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/idris-mode-0.9.18.tar"; + sha256 = "1z4wsqzxsmn1vdqp44b32m4wzs4bbnsyzv09v9ggr4l4h2j4c3x5"; + }; + packageRequires = [ cl-lib emacs prop-menu ]; + meta = { + homepage = "https://elpa.gnu.org/packages/idris-mode.html"; + license = lib.licenses.free; + }; + }) {}; + inf-clojure = callPackage ({ clojure-mode + , elpaBuild + , emacs + , fetchurl + , lib }: + elpaBuild { + pname = "inf-clojure"; + ename = "inf-clojure"; + version = "3.1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/inf-clojure-3.1.0.tar"; + sha256 = "0jw6rzplicbv2l7si46naspzp5lqwj20b1nmfs9zal58z1gx6zjk"; + }; + packageRequires = [ clojure-mode emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/inf-clojure.html"; + license = lib.licenses.free; + }; + }) {}; + j-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "j-mode"; + ename = "j-mode"; + version = "1.1.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/j-mode-1.1.1.tar"; + sha256 = "0l0l71z5i725dnw4l9w2cfjhrijwx9z8mgyf2dfcbly1cl2nvnx2"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/j-mode.html"; + license = lib.licenses.free; + }; + }) {}; + julia-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "julia-mode"; + ename = "julia-mode"; + version = "0.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/julia-mode-0.4.tar"; + sha256 = "1qi6z6007q2jgcb96iy34m87jsg9ss3jhzlnl2cl8dn26yqmdky4"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/julia-mode.html"; + license = lib.licenses.free; + }; + }) {}; + lua-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "lua-mode"; + ename = "lua-mode"; + version = "20210802"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/lua-mode-20210802.tar"; + sha256 = "1yarwai9a0w4yywd0ajdkif4g26z98zw91lg1z78qw0k61qjmnh6"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/lua-mode.html"; + license = lib.licenses.free; + }; + }) {}; + macrostep = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "macrostep"; + ename = "macrostep"; + version = "0.9"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/macrostep-0.9.tar"; + sha256 = "10crvq9xww4nvrswqq888y9ah3fl4prj0ha865aqbyrhhbpg18gd"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/macrostep.html"; + license = lib.licenses.free; + }; + }) {}; + magit = callPackage ({ dash + , elpaBuild + , emacs + , fetchurl + , git-commit + , lib + , magit-section + , transient + , with-editor }: + elpaBuild { + pname = "magit"; + ename = "magit"; + version = "3.2.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/magit-3.2.1.tar"; + sha256 = "0yyf16605bp5q8jl2vbljxx04ja0ljvs775dnnawlc3mvn13zd9n"; + }; + packageRequires = [ + dash + emacs + git-commit + magit-section + transient + with-editor + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/magit.html"; + license = lib.licenses.free; + }; + }) {}; + magit-section = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "magit-section"; + ename = "magit-section"; + version = "3.2.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/magit-section-3.2.1.tar"; + sha256 = "1ppinys8rfa38ac8grcx16hlaw33p03pif4ya6bbw280kq8c73rv"; + }; + packageRequires = [ dash emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/magit-section.html"; + license = lib.licenses.free; + }; + }) {}; markdown-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "markdown-mode"; @@ -30,6 +608,51 @@ license = lib.licenses.free; }; }) {}; + multiple-cursors = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "multiple-cursors"; + ename = "multiple-cursors"; + version = "1.4.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/multiple-cursors-1.4.0.tar"; + sha256 = "0f7rk8vw42bgdf5yb4qpnrc3bxvbaafmdqd7kiiqnj5m029yr14f"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/multiple-cursors.html"; + license = lib.licenses.free; + }; + }) {}; + nasm-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "nasm-mode"; + ename = "nasm-mode"; + version = "1.1.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/nasm-mode-1.1.1.tar"; + sha256 = "1smndl3mbiaaphy173zc405zg4wv0mv041vzy11fr74r5w4p232j"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/nasm-mode.html"; + license = lib.licenses.free; + }; + }) {}; + nginx-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "nginx-mode"; + ename = "nginx-mode"; + version = "1.1.9"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/nginx-mode-1.1.9.tar"; + sha256 = "04jy0zx058hj37ab2n6wwbbwyycsbsb2fj8s4a5f1is2in35nqy0"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/nginx-mode.html"; + license = lib.licenses.free; + }; + }) {}; org-contrib = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }: elpaBuild { pname = "org-contrib"; @@ -45,6 +668,51 @@ license = lib.licenses.free; }; }) {}; + php-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "php-mode"; + ename = "php-mode"; + version = "1.24.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/php-mode-1.24.0.tar"; + sha256 = "158850zdmz5irjy6cjai1i8j7qs1vwp95a2dli9f341lbpv2jvzp"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/php-mode.html"; + license = lib.licenses.free; + }; + }) {}; + projectile = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "projectile"; + ename = "projectile"; + version = "2.5.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/projectile-2.5.0.tar"; + sha256 = "09gsm6xbqj3357vlshs1w7ygfm004gpgs0pqrvwl6xmccxpqzmi0"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/projectile.html"; + license = lib.licenses.free; + }; + }) {}; + prop-menu = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "prop-menu"; + ename = "prop-menu"; + version = "0.1.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/prop-menu-0.1.2.tar"; + sha256 = "1csx5aycl478v4hia6lyrdb32hs1haf9n39ngfrbx9ysp7gkj0va"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/prop-menu.html"; + license = lib.licenses.free; + }; + }) {}; request = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "request"; @@ -60,6 +728,85 @@ license = lib.licenses.free; }; }) {}; + rubocop = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "rubocop"; + ename = "rubocop"; + version = "0.6.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/rubocop-0.6.0.tar"; + sha256 = "1gw30ya6xyi359k9fihjx75h7ahs067i9bvkyla0rbhmc5xdz6ww"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/rubocop.html"; + license = lib.licenses.free; + }; + }) {}; + rust-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "rust-mode"; + ename = "rust-mode"; + version = "0.5.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/rust-mode-0.5.0.tar"; + sha256 = "03z1nsq1s3awaczirlxixq4gwhz9bf1x5zwd5xfb88ay4kzcmjwc"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/rust-mode.html"; + license = lib.licenses.free; + }; + }) {}; + sass-mode = callPackage ({ cl-lib ? null + , elpaBuild + , fetchurl + , haml-mode + , lib }: + elpaBuild { + pname = "sass-mode"; + ename = "sass-mode"; + version = "3.0.16"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/sass-mode-3.0.16.tar"; + sha256 = "1nkp7cvsc2dbxkfv346hwsly34nhv1hhc8lgcs470xzdxi908p61"; + }; + packageRequires = [ cl-lib haml-mode ]; + meta = { + homepage = "https://elpa.gnu.org/packages/sass-mode.html"; + license = lib.licenses.free; + }; + }) {}; + scala-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "scala-mode"; + ename = "scala-mode"; + version = "0.23"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/scala-mode-0.23.tar"; + sha256 = "0dmyh5x519f5b9h034a1yjgmr1ai8pd22a032x31zgdkwl2xyrfd"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/scala-mode.html"; + license = lib.licenses.free; + }; + }) {}; + slime = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, macrostep }: + elpaBuild { + pname = "slime"; + ename = "slime"; + version = "2.26.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/slime-2.26.1.tar"; + sha256 = "0f7absmq0nnhhq0i8nfgn2862ydvwlqyzhcq4s6m91mn72d7dw5i"; + }; + packageRequires = [ cl-lib macrostep ]; + meta = { + homepage = "https://elpa.gnu.org/packages/slime.html"; + license = lib.licenses.free; + }; + }) {}; sly = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "sly"; @@ -75,6 +822,51 @@ license = lib.licenses.free; }; }) {}; + smartparens = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "smartparens"; + ename = "smartparens"; + version = "4.7.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/smartparens-4.7.1.tar"; + sha256 = "0si9wb7j760c4vdv7p049bgppppw5crrh50038bsh8sghq2gdld8"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/smartparens.html"; + license = lib.licenses.free; + }; + }) {}; + swift-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib, seq }: + elpaBuild { + pname = "swift-mode"; + ename = "swift-mode"; + version = "8.3.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/swift-mode-8.3.0.tar"; + sha256 = "1bsyv0dl7c2m3f690g7fij7g4937skxjin456vfrgbzb219pdkcs"; + }; + packageRequires = [ emacs seq ]; + meta = { + homepage = "https://elpa.gnu.org/packages/swift-mode.html"; + license = lib.licenses.free; + }; + }) {}; + systemd = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "systemd"; + ename = "systemd"; + version = "1.6"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/systemd-1.6.tar"; + sha256 = "1khfnx2qmg1i4m6axyya0xbzr3c9j136b8pzmqdnd6jamxh43wcg"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/systemd.html"; + license = lib.licenses.free; + }; + }) {}; tuareg = callPackage ({ caml, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "tuareg"; @@ -90,4 +882,94 @@ license = lib.licenses.free; }; }) {}; + web-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "web-mode"; + ename = "web-mode"; + version = "17.0.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/web-mode-17.0.4.tar"; + sha256 = "0ji40fcw3y2n4dw0cklbvsybv04wmfqfnqnykgp05aai388rp3j1"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/web-mode.html"; + license = lib.licenses.free; + }; + }) {}; + wgrep = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "wgrep"; + ename = "wgrep"; + version = "2.3.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/wgrep-2.3.3.tar"; + sha256 = "12w9vsawqnd0rvsahx8vdiabds8rl1zkpmspmcqn28jprbql734r"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/wgrep.html"; + license = lib.licenses.free; + }; + }) {}; + with-editor = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "with-editor"; + ename = "with-editor"; + version = "3.0.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/with-editor-3.0.4.tar"; + sha256 = "032i954rzn8sg1qp6vjhz6j8j1fl6mpvhfnmd3va8k9q9m27k4an"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/with-editor.html"; + license = lib.licenses.free; + }; + }) {}; + yaml-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "yaml-mode"; + ename = "yaml-mode"; + version = "0.0.15"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/yaml-mode-0.0.15.tar"; + sha256 = "19r2kc894dd59f0r3q4gx52iw5cwj5gi1jjkmi8r9y0dya50rzfx"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/yaml-mode.html"; + license = lib.licenses.free; + }; + }) {}; + yasnippet-snippets = callPackage ({ elpaBuild, fetchurl, lib, yasnippet }: + elpaBuild { + pname = "yasnippet-snippets"; + ename = "yasnippet-snippets"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/yasnippet-snippets-0.2.tar"; + sha256 = "1xhlx2n2sdpcc82cba9r7nbd0gwi7m821p7vk0vnw84dhwy863ic"; + }; + packageRequires = [ yasnippet ]; + meta = { + homepage = "https://elpa.gnu.org/packages/yasnippet-snippets.html"; + license = lib.licenses.free; + }; + }) {}; + zig-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "zig-mode"; + ename = "zig-mode"; + version = "0.0.8"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/zig-mode-0.0.8.tar"; + sha256 = "1v9qpc86n9zg765cy93365hj942z0gndkz6grjl2pk31087n3axy"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/zig-mode.html"; + license = lib.licenses.free; + }; + }) {}; } From 474298bb9b17051b37e3cec86b932a5cc24282c0 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 6 Sep 2021 16:20:40 -0300 Subject: [PATCH 134/167] melpa-packages 2021-09-06 --- .../elisp-packages/recipes-archive-melpa.json | 2563 +++++++++-------- 1 file changed, 1355 insertions(+), 1208 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index 2d2044ded8d4..2b89f5466d56 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -213,11 +213,11 @@ "repo": "ymarco/auto-activating-snippets", "unstable": { "version": [ - 20210605, - 1143 + 20210903, + 1912 ], - "commit": "118ed7fc948b6d91eea727df35a1639521bf5fdb", - "sha256": "0qnsyvvb0knarvd4lvnzazf8y756iwx435zswym5lwsw5v847l8d" + "commit": "1699bec4d244a1f62af29fe4eb8b79b6d2fccf7d", + "sha256": "1mr0qpw7cfy1hwd2fxki01570cw8n0ix1ix27s3yzc2r8cqv6cri" }, "stable": { "version": [ @@ -1051,15 +1051,15 @@ "version": [ 2, 4, - 1 + 2 ], "deps": [ "ac-php-core", "auto-complete", "yasnippet" ], - "commit": "9770c95bf2df93d9cb0f200723b03b3d9a480640", - "sha256": "188z1i209z61nwfcgffgp90rdcsnl75izxpqv4x1vbaay5fvg33f" + "commit": "e29075f810af73f6bf7803eebf15d96bffee7154", + "sha256": "08vfdp7q6x5fk2nn5dl884cyysxrl2gw8f16g7wqvf7v24jmx71d" } }, { @@ -1088,7 +1088,7 @@ "version": [ 2, 4, - 1 + 2 ], "deps": [ "dash", @@ -1098,8 +1098,8 @@ "s", "xcscope" ], - "commit": "9770c95bf2df93d9cb0f200723b03b3d9a480640", - "sha256": "188z1i209z61nwfcgffgp90rdcsnl75izxpqv4x1vbaay5fvg33f" + "commit": "e29075f810af73f6bf7803eebf15d96bffee7154", + "sha256": "08vfdp7q6x5fk2nn5dl884cyysxrl2gw8f16g7wqvf7v24jmx71d" } }, { @@ -1296,11 +1296,11 @@ "repo": "tam17aki/ace-isearch", "unstable": { "version": [ - 20200912, - 754 + 20210830, + 746 ], - "commit": "422aaa50b6452c2399682782cbf23168ed4357c6", - "sha256": "1gx106znzb6wq72yixq3z8arj1hhh215yy3324shvjwgqkyc3xi8" + "commit": "8439136206a42e41ef95af923e0dc3bbd4fa306c", + "sha256": "00mqd02l3fx5jicjwm27xwmr98l3f8v08q4jfxdzh1cjqpi8c5pp" }, "stable": { "version": [ @@ -1489,15 +1489,15 @@ "repo": "cute-jumper/ace-pinyin", "unstable": { "version": [ - 20210806, - 316 + 20210827, + 355 ], "deps": [ "avy", "pinyinlib" ], - "commit": "4dc565807a9b74ba637122f746d1614c60f92af8", - "sha256": "1q1s2xwa4wb0h3r255j9wy37yzim6fa1kl42gnxlg5zwgcb2la9w" + "commit": "47662c0b05775ba353464b44c0f1a037c85e746e", + "sha256": "0qidfljvjqwyi5xvgr6hli45k1d4w8g5zn2mssyv9xzrslcigdzv" }, "stable": { "version": [ @@ -1955,15 +1955,15 @@ "repo": "agda/agda", "unstable": { "version": [ - 20210809, - 721 + 20210903, + 1114 ], "deps": [ "annotation", "eri" ], - "commit": "2bab72d99ae3330cbf3a94450a647158838a1d1b", - "sha256": "1xb1rawj2hl12xmpn9xk2zw69wpvx2ssd3wj4k32dhgi2vcg2rck" + "commit": "731f300deac14e10792a0bbf22c86cbe0c9c7e4b", + "sha256": "1fgqk0xvfxaqj737b62ngnqivd8fhp5pakwbh2zvvdl76frkbsmv" }, "stable": { "version": [ @@ -2344,8 +2344,8 @@ "deps": [ "flycheck" ], - "commit": "95a31c4232e71047a64956976622969df9226381", - "sha256": "09rhs337cnb24blf9qcxc3hgg8s9h4rsyiwpnkqd2by4kkhdyign" + "commit": "59aac2167ca623358ddbb800abe5912194137f74", + "sha256": "17vn4hxkvd1nkn7gjjg867rjd5r0qsb7qlf2fh75pikk806x5sa8" }, "stable": { "version": [ @@ -2452,11 +2452,11 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20210817, - 2252 + 20210831, + 1317 ], - "commit": "b43d2b32f6de83c0dc7792a957f64e8444e59beb", - "sha256": "066kldj7wz6s1qdvkxifv2zx0wimxncgh11r0pchfrji4b0h6pyh" + "commit": "c0d288a41faea2ecb7e8dd947486764a2ee17ec9", + "sha256": "1r1905irz9rh05qzmzk1cbdnk4667ax8wm71r1prv8dnx8nq05kp" }, "stable": { "version": [ @@ -3246,8 +3246,8 @@ 20200914, 644 ], - "commit": "2bab72d99ae3330cbf3a94450a647158838a1d1b", - "sha256": "1xb1rawj2hl12xmpn9xk2zw69wpvx2ssd3wj4k32dhgi2vcg2rck" + "commit": "731f300deac14e10792a0bbf22c86cbe0c9c7e4b", + "sha256": "1fgqk0xvfxaqj737b62ngnqivd8fhp5pakwbh2zvvdl76frkbsmv" }, "stable": { "version": [ @@ -3567,11 +3567,11 @@ "repo": "dieter-wilhelm/apdl-mode", "unstable": { "version": [ - 20210819, - 2136 + 20210828, + 1913 ], - "commit": "9e80feb61a173d776495f8a36545b966acac21f2", - "sha256": "00wihhzn779rqmhb41n1f2wd69cfcqq5z86l5hmcyx7lhn0nykyj" + "commit": "f1d4bef95c3be736c15f0d9b41037ba02933acf1", + "sha256": "1a6s7zcz176845fp38n1ilpqkgzzpq3miwg7cpymrcdnp3kxvc0n" }, "stable": { "version": [ @@ -4133,8 +4133,8 @@ 20210823, 528 ], - "commit": "d834cd90fe6f1d87dab86b637d23958241cadac3", - "sha256": "00n9w9qh84fp60swcpccimch4lq0rcwqm7aqjym5hqmkc1ncz2bp" + "commit": "5d365ffc6a2c2041657eaa5d762c395ea748c8d7", + "sha256": "0fn2dyj43ag7abh7x2m4qcn7ij1kp65d3vqlkcri780fv4wp7mc4" }, "stable": { "version": [ @@ -5561,8 +5561,8 @@ "avy", "embark" ], - "commit": "ca517fdabd182b0b905d0ef0cb380facb6697670", - "sha256": "1pb6rarb86x9bl064jqick3d7znl0a7ibx27yx30nivi5plrkb3j" + "commit": "d21277a638827623ab84e9e6341312a2da5062ab", + "sha256": "12kl6a4y46vldxc25s7npm0748j4hj8g0vvnhfnxy8iq8q2m2i3j" }, "stable": { "version": [ @@ -6711,38 +6711,6 @@ "sha256": "0dgwh3z1ni619kxpdxv8r2k0jhgj5h6ssxp6l8s26mhpmy1bkm6c" } }, - { - "ename": "bento", - "commit": "aad104fd26adb419c5da1e3472807244794e8949", - "sha256": "0a7yaikvaxxk8wmr7f9darpwb4r17rkzxcxaagfypn8n5kswddj4", - "fetcher": "github", - "repo": "returntocorp/bento-emacs", - "unstable": { - "version": [ - 20191024, - 2123 - ], - "deps": [ - "f", - "flycheck" - ], - "commit": "31546a03475fc2b3ffd3159fe1beda55f7762224", - "sha256": "0ny0bably9h4ak2fr01z4a80mp9kjalzhw232a92n8dvmz4b7mq7" - }, - "stable": { - "version": [ - 0, - 1, - 0 - ], - "deps": [ - "f", - "flycheck" - ], - "commit": "116839c7d50342e62a2832715ba850d8bf04362e", - "sha256": "0gxqy2l1a4pddh4pdci2nyflmv76rhl8wx3zmh5j0aqk5ahh1ln5" - } - }, { "ename": "berrys-theme", "commit": "d7043d5fcdf995a6278c8a92aa451ce4b58694b3", @@ -7067,15 +7035,15 @@ "repo": "bdarcus/bibtex-actions", "unstable": { "version": [ - 20210825, - 1743 + 20210903, + 1125 ], "deps": [ "bibtex-completion", "parsebib" ], - "commit": "f4d9af720d3854ce0e746312061372ae30e2cc97", - "sha256": "0lynllvkyy9svi9c5gsqs5vyp0fgyq43a83drf67x0x14lfhdr1a" + "commit": "3af0fd5f4255e8c6ffd104cdfa6ab56f522fecc6", + "sha256": "0x7q3rp92w2698pllnjbn1x7bai8jmnrk72f02i4wjkdm1jwb2jk" }, "stable": { "version": [ @@ -7961,30 +7929,29 @@ "repo": "jyp/boon", "unstable": { "version": [ - 20210518, - 1244 - ], - "deps": [ - "dash", - "expand-region", - "multiple-cursors", - "pcre2el" - ], - "commit": "db1cbdcdfb3ea246d0d0090534d998f7c9c19f4f", - "sha256": "1saij86j2br814lp7yl4qpy2kaywdxlv08wxph464npx1rykykk3" - }, - "stable": { - "version": [ - 1, - 1 + 20210831, + 1634 ], "deps": [ "dash", "expand-region", "multiple-cursors" ], - "commit": "270ae67b3136ac355d2aed5b4690ae28edaf7c29", - "sha256": "1ss9bjs34q41pa0g0nbdzd8fwpjcbd2239rdlx5aykfv9v0b8j77" + "commit": "05ccaad63d01688b86b7e44955815f97fc011ec1", + "sha256": "03fy4kwy6vka4w2hmfb6h68hxcm4gslknpdlxq4s8szww7a19cc8" + }, + "stable": { + "version": [ + 1, + 2 + ], + "deps": [ + "dash", + "expand-region", + "multiple-cursors" + ], + "commit": "d31550b3336d706b57df0e43bedf3e95a615ce0d", + "sha256": "18il2licf8pgfcrpx2bk55gpf8f537kb9cxqz83jldkhiyry74il" } }, { @@ -8002,8 +7969,8 @@ "epkg", "magit" ], - "commit": "018d5334b4c9af297799f0644e09946a13d55edd", - "sha256": "03h5cgsk3wxpw6g946ia0dbzazlbpip93zhirjh7vxcqp4wwyvcf" + "commit": "0ff7d7e469d75c26caed8d50ca80299cc4a77b88", + "sha256": "0jsk7dqminrx5l4npxv6ssyll07287ffzbpsim8d76phv279hdc9" }, "stable": { "version": [ @@ -8602,16 +8569,16 @@ "repo": "countvajhula/buffer-ring", "unstable": { "version": [ - 20210707, - 1745 + 20210904, + 211 ], "deps": [ "dynaring", "ht", "s" ], - "commit": "25c44a39742b21122e1e2adf1f6c5828148cd3ee", - "sha256": "130304bmlz46z6g56bsr745zfb8mxw5kzkslb8vdz7hvcp75wfc4" + "commit": "7bc51345993ee83dc721a1e00cd0b998782b16da", + "sha256": "1ybdpz8cqfklia0m23c4l0dk6ng8jadxdji7z4ms8nkb35y2ykbn" }, "stable": { "version": [ @@ -9790,8 +9757,8 @@ 20210707, 2310 ], - "commit": "86ae7e69e2d07d5dfe9eac66c2b359d098c682a3", - "sha256": "0kvadcjrrj60p3ijbz6f51f2ziapig06zzmkycaahailhf9v1s0b" + "commit": "7cce94fc97d042134e5c7f96a3b9a509340fae1f", + "sha256": "0rq26qic7w8gninvg7jdkxpn8jv0ih215bijai2vsd66ca1ic6w1" }, "stable": { "version": [ @@ -9950,8 +9917,8 @@ "repo": "cask/cask", "unstable": { "version": [ - 20210801, - 1509 + 20210903, + 1216 ], "deps": [ "ansi", @@ -9962,8 +9929,8 @@ "s", "shut-up" ], - "commit": "09c3851c118d2e850314e7f3b9efa786932a145b", - "sha256": "1fdnphlg9ip9cwvl1cxjhvlvgd9hxd5c466r79hrzq81vzn076cg" + "commit": "7b637efa35148dca5e6de10d0beba72168762f1c", + "sha256": "0sv08984k5lpcb56hs09pjwi54nzq232a6gwzikqxs2mylqdaic5" }, "stable": { "version": [ @@ -10351,8 +10318,8 @@ "cl-lib", "powerline" ], - "commit": "9c7c936e4e1de6f4f4095d70e43c9ae738d05086", - "sha256": "0h0v3yiz9qis99l83x588b94va13jzanfwacmgvq29ygp0a87n65" + "commit": "8b4249c40581368faf7bb8e06f86b9eee199c3c6", + "sha256": "185q3iplgycmq6zyyjn3aqq1gylvbb7r8zd1q9km2xl1fzg94jxi" }, "stable": { "version": [ @@ -10479,8 +10446,8 @@ 20171115, 2108 ], - "commit": "90bf324af47e6c607a4d7312a1c69701c2b180fb", - "sha256": "0s3sdvv3r93bz62sk7bk6bdrj5gx6qb9mqd7fd1gkcrryhwb05np" + "commit": "8c6b2b326ce7b454b31450d093776b9d0bfbcb19", + "sha256": "1pc5szlb06y27ivwgk76im72x0gq8gcn1p14gw0r3qx9krnj1vla" }, "stable": { "version": [ @@ -11126,16 +11093,16 @@ "url": "https://tildegit.org/contrapunctus/chronometrist.git", "unstable": { "version": [ - 20210707, - 2147 + 20210905, + 1942 ], "deps": [ "dash", "seq", "ts" ], - "commit": "524ba9592fc7095209e380392915b376f75bec00", - "sha256": "07fclq7dllz4nsrx51j4vrds1ciylxhkp9g945vc7xk6bi8syl4d" + "commit": "d673f00e5a43f8ac276b89c85622dcdf4cbd8148", + "sha256": "0cppwh15wb4kkhmqpi5cndvvyqlb6jjfj634cxlhkkvwbr0rmnjv" }, "stable": { "version": [ @@ -11192,14 +11159,14 @@ "url": "https://tildegit.org/contrapunctus/chronometrist.git", "unstable": { "version": [ - 20210617, - 1707 + 20210904, + 1359 ], "deps": [ "chronometrist" ], - "commit": "524ba9592fc7095209e380392915b376f75bec00", - "sha256": "07fclq7dllz4nsrx51j4vrds1ciylxhkp9g945vc7xk6bi8syl4d" + "commit": "d673f00e5a43f8ac276b89c85622dcdf4cbd8148", + "sha256": "0cppwh15wb4kkhmqpi5cndvvyqlb6jjfj634cxlhkkvwbr0rmnjv" }, "stable": { "version": [ @@ -11270,8 +11237,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20210825, - 1937 + 20210902, + 1412 ], "deps": [ "clojure-mode", @@ -11282,8 +11249,8 @@ "sesman", "spinner" ], - "commit": "fd5232d03f62c2304daebbdbdf99f6ad860fa702", - "sha256": "1aj289145kza226xlg2zqi8m9wfrpr05xx6b6dvv1g9508jhxvw6" + "commit": "76dea32c7757949a708d27d1f8707782edad5650", + "sha256": "080kcbqiiikna4r6c9a1q0hnrlkpmzz4xixgrp54ld7nzp59ls48" }, "stable": { "version": [ @@ -11552,8 +11519,8 @@ "repo": "andras-simonyi/citeproc-el", "unstable": { "version": [ - 20210822, - 1949 + 20210904, + 1235 ], "deps": [ "dash", @@ -11564,8 +11531,8 @@ "s", "string-inflection" ], - "commit": "299e52b2dda37960d609efa78c40e255001d163a", - "sha256": "0dqnyff2vfncw3ais2ml7k7lsdsrwjvw3kpynw9mb5si88sxh24b" + "commit": "7908e48a82dc615cc643d03e63107dcbf499caf8", + "sha256": "05900z5j1px6rnm1xby5krhz1j6rb4fqfhdzra31zs3zj063bq8j" }, "stable": { "version": [ @@ -11631,11 +11598,11 @@ "repo": "universal-ctags/citre", "unstable": { "version": [ - 20210823, - 1603 + 20210902, + 751 ], - "commit": "9a0dcc5dad0b0796c8febba1470db49b3e845f2b", - "sha256": "13zl0bxnxqm6cq71lj02d906mpmmd1xpwji3d23fvy80nkxzrm86" + "commit": "09b618f73c47abebcd26c8fc8484a5816c36ab6f", + "sha256": "1ib748is5983fzgjpbdnki9x3s232gdw58af93jhw34kmakrlgac" }, "stable": { "version": [ @@ -11649,25 +11616,25 @@ }, { "ename": "cl-format", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "09jwy0fgaz2f04dvcdns6w859s6izvrkp8ib4lws3x8kx8z918fy", - "fetcher": "github", - "repo": "alvinfrancis/cl-format", + "commit": "f62ceac846a4fb4ff380a799fb3aa7e52a097025", + "sha256": "14xpzp8jiaqdqybkijcm78gq298n32qf4lglq0i23sqfj68yw87j", + "fetcher": "gitlab", + "repo": "akater/elisp-cl-format", "unstable": { "version": [ - 20210824, - 2016 + 20210831, + 530 ], - "commit": "a391d7696bea972ad9a968426e712feddc284ef4", - "sha256": "191jkjka1pv2ssggk138gni38ckbndjlk344px3r1p0mnv3gmfaq" + "commit": "ad1a4fb6bc91e65ea90bcf6792cc5a1be5380f9d", + "sha256": "10z53j111wvgy0fbnxm3mpc9an75dblvy5zkq9733vjliycbbgv4" }, "stable": { "version": [ 1, - 1 + 2 ], - "commit": "4380cb8009c47cc6d9098b383082b93b1aefa460", - "sha256": "108s96viral3s62a77jfgvjam08hdk97frfmxjg3xpp2ifccjs7h" + "commit": "ad1a4fb6bc91e65ea90bcf6792cc5a1be5380f9d", + "sha256": "10z53j111wvgy0fbnxm3mpc9an75dblvy5zkq9733vjliycbbgv4" } }, { @@ -12580,8 +12547,8 @@ 20210104, 1831 ], - "commit": "e0a34750f8b7a014d021fbde0e860de5a5073473", - "sha256": "16nmp6arjdgd9s1jj2cnj5dak0sf5ass2w894d6xdqhk9mz8g1gi" + "commit": "86ee38d75678d68bb1a79b9fa443b42723b09f23", + "sha256": "1lqkaar17d4jvabhfwir6s47a618a3bhh18m3xvv08ryjw0nc3d2" }, "stable": { "version": [ @@ -12742,11 +12709,11 @@ "repo": "astoff/code-cells.el", "unstable": { "version": [ - 20210612, - 755 + 20210902, + 740 ], - "commit": "1bd650391a6fe84eb267f2534a0750ea1b5549f4", - "sha256": "0r0gp0i0mkfw035qrhpbjw3vdlyiffc5b9zmsmq93wcqvn459154" + "commit": "4e973e01220ad7a3e2d0d50a9c5192a9385e0ede", + "sha256": "0vqradjcflvajd5i069vlkynd6kyyfvmip39xr5bhrb4my07z1wb" } }, { @@ -12921,24 +12888,6 @@ "sha256": "0xnrh6v4s2s3fgvw0v9fl48dlk4r2p6axp7xf41gzb1ai81yczhv" } }, - { - "ename": "colemak-evil", - "commit": "0f0750a3f9537782ee61d6e56c51ce7b86def12e", - "sha256": "1bfzs5px1k6g3cnwjdaq2m78bbnfy3lxhjzkcch7zdv3nyacwl5z", - "fetcher": "github", - "repo": "patbl/colemak-evil", - "unstable": { - "version": [ - 20200326, - 2359 - ], - "deps": [ - "evil" - ], - "commit": "981bdcb1a48c6d9139493abe7e25fabe126e43c3", - "sha256": "0dqyqaqr71z4mipb4g5jxdw96lzb108fd5w4wi27023hfll3j1hc" - } - }, { "ename": "colonoscopy-theme", "commit": "641d1959bd31598fcdacd39a3d1bb077dcccfa5c", @@ -13501,14 +13450,14 @@ "repo": "ddoherty03/commify", "unstable": { "version": [ - 20200921, - 2002 + 20210904, + 1106 ], "deps": [ "s" ], - "commit": "b1c1a06e488208ef653e0d86c97b746fd6d2bbc2", - "sha256": "1q843ay7zkci2xdavia6wkj06acn83a198ykpxl0xbl5wihdd6w2" + "commit": "d6656bd3a909917a51ba033a11d4ab5f5fe55f83", + "sha256": "1zbk2nc1qnryapsj68hlqmkn0ab7llzpmnls6y3s2656lxcn2b0k" } }, { @@ -13549,11 +13498,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20210825, - 1508 + 20210826, + 2148 ], - "commit": "c7234a9df0b1a624ae0633d3a7d08f92109ff85a", - "sha256": "0i5xvi21gmqk2abpll761cz6g0g2i7s2gy63hvi2y3ac611fww2z" + "commit": "faf897296faed0b3342e1c325fc05727029ce7fe", + "sha256": "11qxc7gq97z9k1j63zrf4fh485qnapcz4qzjzyffwk8svl48gh0g" }, "stable": { "version": [ @@ -14659,15 +14608,15 @@ "version": [ 2, 4, - 1 + 2 ], "deps": [ "ac-php-core", "cl-lib", "company" ], - "commit": "9770c95bf2df93d9cb0f200723b03b3d9a480640", - "sha256": "188z1i209z61nwfcgffgp90rdcsnl75izxpqv4x1vbaay5fvg33f" + "commit": "e29075f810af73f6bf7803eebf15d96bffee7154", + "sha256": "08vfdp7q6x5fk2nn5dl884cyysxrl2gw8f16g7wqvf7v24jmx71d" } }, { @@ -15779,11 +15728,11 @@ "repo": "minad/consult", "unstable": { "version": [ - 20210818, - 1128 + 20210905, + 1657 ], - "commit": "105a1ac50169382368a36ed53d7af908d02ffa07", - "sha256": "01kx3zg858bqyajglamxn319qabycnabzj73kl4x7sd55p2yi179" + "commit": "c89fd0a1299f8bd6a123427c6ce48239702dfe84", + "sha256": "0425syvnw592kwmci87lwqvgxf9bvl8v6cmzdf4g3kkhva2y0sym" }, "stable": { "version": [ @@ -15821,15 +15770,15 @@ "repo": "mohkale/consult-eglot", "unstable": { "version": [ - 20210822, - 1829 + 20210905, + 1830 ], "deps": [ "consult", "eglot" ], - "commit": "a6aeb6fa078cc7ea6537793868f606b55ac63088", - "sha256": "11cwz2259i6fj4xckcvx8q8h3sgwxddjkddgiv7406d88m6ma72m" + "commit": "28a09cc839a9010df1a00a55528697ab34e1b259", + "sha256": "0vfr9cj2xzkpias7p25bl1yjbykg1lpphmn4a3p3sdmyh32zjy2s" }, "stable": { "version": [ @@ -16329,8 +16278,8 @@ "ivy", "swiper" ], - "commit": "7cdde66c95d5205287e88010bc7a3a978c931db0", - "sha256": "0pvgh4krym43vcyiq4bsjl63gg795jlqh6kaa6llsv1awvywfqww" + "commit": "6a8e5611f32cf7cc77c2c6974dc2d3a18f32d5a5", + "sha256": "0mwrvcnpl7cr8ynhx8ilmlbjqmggxccwa6w8k15j5i640chl19xh" }, "stable": { "version": [ @@ -17499,20 +17448,20 @@ "repo": "emacs-csharp/csharp-mode", "unstable": { "version": [ - 20210821, - 1939 + 20210826, + 421 ], - "commit": "45fee1a8ae2595a57ecdfbd7ba708c488652173f", - "sha256": "0nl3jsrp7b280h8mw54gcxc8jbn4jgbsp5qc05d41k20akfskwx8" + "commit": "fe8a68e9849fc7617e0c870cacd6599b8a797638", + "sha256": "1pry7p51qc0q4jpcsi60nxb9q7pkkc2gh1340mvbk62jj5f4qbbj" }, "stable": { "version": [ 1, 0, - 1 + 2 ], - "commit": "45fee1a8ae2595a57ecdfbd7ba708c488652173f", - "sha256": "0nl3jsrp7b280h8mw54gcxc8jbn4jgbsp5qc05d41k20akfskwx8" + "commit": "723a4ab2581b11f84d23f421faa06103864d2bc8", + "sha256": "1gdr1y8q93xr5vlx6jj95js6rmmsspq2bn870igbaijwwsn0sf7g" } }, { @@ -18195,8 +18144,8 @@ 20190111, 2150 ], - "commit": "8af0271186cc642436306274564986888d5e64c8", - "sha256": "0mffl15acpqv3n2hi73nav8jidr74lbps5mhl8vg5c6h3qm2y54l" + "commit": "2b52df4d75d185f7ac8b4230529e7fc2428a3605", + "sha256": "0ykzj10pcn3yfwxl8ydl2vj6mvk5gbwzs2zzagsn3zv29y7wqj0a" }, "stable": { "version": [ @@ -18403,8 +18352,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20210812, - 619 + 20210904, + 2033 ], "deps": [ "bui", @@ -18416,26 +18365,26 @@ "posframe", "s" ], - "commit": "8ec7e98986ea46e3c36b7ecbdf9a6562c90c7632", - "sha256": "01lh0yy3zi87cjma2m1wch0ks45b0v6d05anxqsrpn4bladp8plg" + "commit": "3c4bb901bbcd4f8f58178075dc2422550a7f2834", + "sha256": "1zczmcv8562lachkvcwy6njn7zkgny08iznpmrx821wr8mh52wnn" }, "stable": { "version": [ 0, - 6 + 7 ], "deps": [ "bui", "dash", - "dash-functional", "f", + "ht", "lsp-mode", "lsp-treemacs", "posframe", "s" ], - "commit": "35db94e81c592246675f300aaca4a70966b8a5fc", - "sha256": "1d4hdydfk86d4slibigyhwng8wx3vzyap8hp5iv0h7wr6868m4iv" + "commit": "3c4bb901bbcd4f8f58178075dc2422550a7f2834", + "sha256": "1zczmcv8562lachkvcwy6njn7zkgny08iznpmrx821wr8mh52wnn" } }, { @@ -18604,26 +18553,20 @@ "repo": "bradyt/dart-mode", "unstable": { "version": [ - 20210301, + 20210830, 0 ], - "commit": "43975c92080e307c4bc14a4773a61195d2062fd9", - "sha256": "0zpjrq3cra6q6pd52skm11wj0j75v8cnamv504hlq4rgd87vkz2p" + "commit": "3bac14200f9f8f8fcebc383087572da5c3823c34", + "sha256": "1vql8m4nj0brmv58b6lkbhykik8n6j4i7d3nylcls78y7ihc2cz8" }, "stable": { "version": [ 1, 0, - 5 + 7 ], - "deps": [ - "cl-lib", - "dash", - "flycheck", - "s" - ], - "commit": "d414a5faf22f7fafbb0a8208b88cecd6324704bf", - "sha256": "1qmdlwjmmqyyb65sqvfpygifai5m0llc815vp0jqwp8ldd8ls172" + "commit": "3bac14200f9f8f8fcebc383087572da5c3823c34", + "sha256": "1vql8m4nj0brmv58b6lkbhykik8n6j4i7d3nylcls78y7ihc2cz8" } }, { @@ -18670,20 +18613,20 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20210708, - 2009 + 20210826, + 1149 ], - "commit": "2675596b9ac1c4b9d47b93e227f06f8ec6755ec6", - "sha256": "0wycrcl79mv253vzf2y92qz9i52mi5xa82f9i4rgnqa02f2m633h" + "commit": "39d067b9fbb2db65fc7a6938bfb21489ad990cb4", + "sha256": "0z6f8y1m9amhg427iz1d4xcyr6n0kj5w7kmiz134p320ixsdnzd8" }, "stable": { "version": [ 2, 19, - 0 + 1 ], - "commit": "2675596b9ac1c4b9d47b93e227f06f8ec6755ec6", - "sha256": "0wycrcl79mv253vzf2y92qz9i52mi5xa82f9i4rgnqa02f2m633h" + "commit": "39d067b9fbb2db65fc7a6938bfb21489ad990cb4", + "sha256": "0z6f8y1m9amhg427iz1d4xcyr6n0kj5w7kmiz134p320ixsdnzd8" } }, { @@ -18724,15 +18667,15 @@ "repo": "dash-docs-el/dash-docs", "unstable": { "version": [ - 20200516, - 1943 + 20210830, + 926 ], "deps": [ "async", "cl-lib" ], - "commit": "dafc8fc9f1ddb2e4e39e0b8d066c42d5d7ce8d06", - "sha256": "0n6d3mm43gj16v8kjjradcfik93wb89dsqnfcbskb28bvcamafid" + "commit": "29848b6b347ac520f7646c200ed2ec36cea3feda", + "sha256": "06yp1p0ir67vb2rpva6wvk3vyfxzl0bmrixikawwk6l2bph2z1x3" } }, { @@ -18749,20 +18692,20 @@ "deps": [ "dash" ], - "commit": "2675596b9ac1c4b9d47b93e227f06f8ec6755ec6", - "sha256": "0wycrcl79mv253vzf2y92qz9i52mi5xa82f9i4rgnqa02f2m633h" + "commit": "39d067b9fbb2db65fc7a6938bfb21489ad990cb4", + "sha256": "0z6f8y1m9amhg427iz1d4xcyr6n0kj5w7kmiz134p320ixsdnzd8" }, "stable": { "version": [ 2, 19, - 0 + 1 ], "deps": [ "dash" ], - "commit": "2675596b9ac1c4b9d47b93e227f06f8ec6755ec6", - "sha256": "0wycrcl79mv253vzf2y92qz9i52mi5xa82f9i4rgnqa02f2m633h" + "commit": "39d067b9fbb2db65fc7a6938bfb21489ad990cb4", + "sha256": "0z6f8y1m9amhg427iz1d4xcyr6n0kj5w7kmiz134p320ixsdnzd8" } }, { @@ -18773,11 +18716,11 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20210815, - 445 + 20210827, + 239 ], - "commit": "3926b1b756fb0be5f84776f578a05d31a244d5d4", - "sha256": "146bddpj6w70i1579bh3qdx0lphyfq2zhlhal5mmbcalrd6c785h" + "commit": "f7287f026103a44cf290fe737b6b9d841eddcaca", + "sha256": "184pa120is5jk71174bna61yii2pmdkj1m6r7v16pzvqg5zqbsgj" }, "stable": { "version": [ @@ -19159,16 +19102,16 @@ "repo": "Wilfred/deadgrep", "unstable": { "version": [ - 20210510, - 416 + 20210830, + 656 ], "deps": [ "dash", "s", "spinner" ], - "commit": "341331918cc83b6cabf7ae91e8dba5b0de57b285", - "sha256": "15x0v6s67wz7bql5z57xy2wbklc8b6nb166yswdzfdvrv5301ri1" + "commit": "4ec21e644ef482a913c64f068ec8d602eedac1c6", + "sha256": "1ipjdwnf6c9qdwg4klkf6g06jj4lgap75ms5yq6a0gg2075d84jk" }, "stable": { "version": [ @@ -19777,11 +19720,11 @@ "repo": "astoff/devdocs.el", "unstable": { "version": [ - 20210818, - 1622 + 20210904, + 1759 ], - "commit": "19f897f03296fba882a7697d438f0e13529718ad", - "sha256": "0vygmqb7xwlmsl9in0qxnfrl0gjkjaxxg9xnxg55y55k1sf4wlbc" + "commit": "df9cec79ed6e7147a71fcad84835b928375047a7", + "sha256": "08zl01vchv6vdixqk021iwjvfbk125vh2ww59mr36cs8ibd887va" } }, { @@ -20009,14 +19952,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20210811, - 28 + 20210831, + 118 ], "deps": [ "cl-lib" ], - "commit": "dbd46bf23c2efc466a640a7e398ca39a51c1145e", - "sha256": "003ks20f0n1w5h8vzsqknzbddrfih036is6q1n43zgqdnh3mlzld" + "commit": "a682de60187763128d2d0a85f1d168d89877691f", + "sha256": "1bcswy1mkpp0ly36l65amq4f8gyarm2gmzv8v8h6s96vg433nwkb" }, "stable": { "version": [ @@ -22018,8 +21961,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20210804, - 1308 + 20210829, + 911 ], "deps": [ "dash", @@ -22029,8 +21972,8 @@ "tablist", "transient" ], - "commit": "a13ff981746fc69b0b0607e55346ef85207d6ea7", - "sha256": "12b1ha8rk8fs3234qvpbc0sp7qa6lbfpf78fvrv7yb1213kxs133" + "commit": "f050d64c81575429c3c5562a1c8efddfb1ac22b4", + "sha256": "1izy99and0jm7dmmgv9zjy4586xzi15dpa789fl2yw6xc7609khy" }, "stable": { "version": [ @@ -22163,19 +22106,19 @@ "repo": "spotify/dockerfile-mode", "unstable": { "version": [ - 20210404, - 2224 + 20210828, + 1805 ], - "commit": "ad06a41259ff2961d603bf23a3a8fbd22dde2161", - "sha256": "0p6byqjfzlq3g5ql77zghljj9vmnm9q2ffkjls1rv6q5rdj7p8c1" + "commit": "628315e2e4ab2f269548126444234caa057b2c75", + "sha256": "09pd8mfa45fy95mdg52fsafj3d1d5l52rskmw6q5np59dyzwch1b" }, "stable": { "version": [ 1, - 4 + 5 ], - "commit": "ed1d04c89cd8b53963f2dcae7cb3a46967e0abbf", - "sha256": "1ypkihd9si769r6k0lfrv8jq8mjv4gyhiwyi820sayfppvma5rj0" + "commit": "628315e2e4ab2f269548126444234caa057b2c75", + "sha256": "09pd8mfa45fy95mdg52fsafj3d1d5l52rskmw6q5np59dyzwch1b" } }, { @@ -22269,14 +22212,14 @@ "repo": "alphapapa/dogears.el", "unstable": { "version": [ - 20210819, - 59 + 20210903, + 514 ], "deps": [ "map" ], - "commit": "c0fa3f6318c660234e77b108f8486dfc39869071", - "sha256": "0bafs58xrlwk2f8swykwhvs1wilvbm2593gjmvdrwhy4hwg0n6f2" + "commit": "00dd88cc53d3a7d6ddeb3c6eea2c2a37d9b610d6", + "sha256": "196gh32l18laawqypc9l08pmqrs48lj5g4wj2m1vl4c13mff5giz" } }, { @@ -22425,15 +22368,15 @@ "repo": "elken/doom-modeline-now-playing", "unstable": { "version": [ - 20210202, - 1948 + 20210831, + 1442 ], "deps": [ "async", "doom-modeline" ], - "commit": "bed9e4da626ede148c7d362188b2e7729e2a8a4f", - "sha256": "1rz50wyinj9nmz37wam4rsdi5igmvdfp6pwn3rmzqsrdp3j81smv" + "commit": "ef9158dfdf32e8eb789b69e7394d0bddaa68f42c", + "sha256": "1namv6qfmf5xxwbhsl5887cp41y8krr7g9vf3dzvi5n924ixlm2l" } }, { @@ -22937,8 +22880,8 @@ "repo": "dtk01/dtk", "unstable": { "version": [ - 20210227, - 2121 + 20210906, + 46 ], "deps": [ "cl-lib", @@ -22946,8 +22889,8 @@ "s", "seq" ], - "commit": "2a2a635e2b1d8243a41df0450e45fc8c75c6674b", - "sha256": "0kd8lkvaxqaz4ns8mwyczbbjyi68r3gicngnrichwlbl27am1zvm" + "commit": "1e871c7675e7617ccd1bc7186a15ebe577dac46e", + "sha256": "0chaffjwbqlrbhf0if817d5ril7xhyzwf72ik3yldyrymwknnbfh" } }, { @@ -23108,8 +23051,8 @@ 20210715, 548 ], - "commit": "d6e490c24dfb4607080b6a41930bb9d378bc2a43", - "sha256": "1kq8griallh81wkn91j6kr0gi9y417gakhhfrzzby5gi998lijyb" + "commit": "fd81ea25790c7134032f1d43df0fc84cbaea979d", + "sha256": "0qv1pybkx22m5vdf499sl7wrwx6c97wwdl1cxv4ld6cnsjbrx1r6" }, "stable": { "version": [ @@ -23643,6 +23586,21 @@ "sha256": "0n1vlzvq5mv7z1yffjjqm9ixd3r0cljr60kg55l9pj9kp72a4iv8" } }, + { + "ename": "earthfile-mode", + "commit": "3df5031b52e919ace5b07c588eec343ed35cb416", + "sha256": "1gcdbfzd0v5rs6wfssh8dgby9rmgyar2zqphh2whjvzqp95axh5g", + "fetcher": "github", + "repo": "earthly/earthly-emacs", + "unstable": { + "version": [ + 20210903, + 230 + ], + "commit": "16f262dbeec1e0b9f7f3a6a7cbafbed76e39d8d8", + "sha256": "0j359dvmgkwrwcx24ncg34sfyxmkharpsniszmd7gjl2cq8sjja2" + } + }, { "ename": "easy-after-load", "commit": "384ffc463cc6edb4806f8da68bd251e662718e65", @@ -23859,14 +23817,14 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20210809, - 1349 + 20210902, + 2151 ], "deps": [ "parsebib" ], - "commit": "831ffcca35601e169c0778035688c5d17d138b58", - "sha256": "04kw0akp35r2ibrcav4kaf34d1xs8pckjiygv7h1nqpv6dmrgfq7" + "commit": "85da632406297f7289b9bdd3803684575cfae886", + "sha256": "0hbpchpmby54jp5xflj8ckdcpjj9chyhl6fkk7ng6l0rgzxi1z30" }, "stable": { "version": [ @@ -24348,15 +24306,15 @@ "repo": "editorconfig/editorconfig-emacs", "unstable": { "version": [ - 20210813, - 1301 + 20210830, + 1025 ], "deps": [ "cl-lib", "nadvice" ], - "commit": "375418d1d63f6ec780876593181b6d39054919da", - "sha256": "1lqxgc24gr67yhi64i9v4w2dcjhpx99jg1kr25gr2byqkkdldkz0" + "commit": "2ab86dc9a8ed7a669ca348252d4af46522b5c411", + "sha256": "1ii93vw55vqik765sm79gvlhlnp9xgqzml2ibwwkrfgz7gip9i0m" }, "stable": { "version": [ @@ -24723,8 +24681,8 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20210817, - 912 + 20210905, + 1905 ], "deps": [ "eldoc", @@ -24733,8 +24691,8 @@ "project", "xref" ], - "commit": "a697084d8dfe29783985f298d38863ea5d59c632", - "sha256": "10x0jnhdn7565nkp134jmadcdgq36436rvd5zbc8187hc9j90396" + "commit": "c17bdf6c98d6bf0f1a85f1175556e1038654402f", + "sha256": "10liic4skqd5qr1zw18k0kx50i2m5pa90vc4yypli5c6bpadsyq4" }, "stable": { "version": [ @@ -25045,8 +25003,8 @@ 20210613, 1418 ], - "commit": "ec47ecf257bf010cf1f3061e2061c26f78e61540", - "sha256": "0l7z9dn5gpscvpizj0pvqcn36jhjcr7s1xr4x6fg72alw2bg71dk" + "commit": "b5a5a405d04f61ec9c5fcb19357a50a4b9e36a25", + "sha256": "1w6ps78saxdvx64a2y1vvzn11mvb6bw9657zfin0yibh2s91hqrk" }, "stable": { "version": [ @@ -25560,14 +25518,14 @@ "repo": "davidshepherd7/electric-operator", "unstable": { "version": [ - 20210320, - 1511 + 20210906, + 1235 ], "deps": [ "dash" ], - "commit": "ecc59d313dd9ddfc4d6a2a3c7a9374aaf214e653", - "sha256": "0qy8s0vqaxkksplasang3n9bqnq7q43lfyd0jl39nynlrg8avhpc" + "commit": "14def81d88bf4344a335e68007324e3f3ef5c435", + "sha256": "1p4kpxq8fvdcs5za79c4pzw1g8108kyfl9rcybs0g75fjxk1f2jb" }, "stable": { "version": [ @@ -25850,26 +25808,26 @@ "repo": "sp1ff/elfeed-score", "unstable": { "version": [ - 20210805, - 1535 + 20210831, + 1423 ], "deps": [ "elfeed" ], - "commit": "53d4154c7d993ea5424535b3f0c4e9e75388e36e", - "sha256": "0ffv2adqnnyvwc6axxi1j32l36q35iddmcazpczh2js2hzp2gw51" + "commit": "2c8093e83491b9191115276e649dd87438726348", + "sha256": "1r77b5vj4klqww7q7flw8h5i9w6y36zv2n7hx36pp1sav6s3a4r9" }, "stable": { "version": [ 0, 8, - 4 + 6 ], "deps": [ "elfeed" ], - "commit": "1842f26d7ab520acbc6f491bc8e064af67be7a6b", - "sha256": "1whf7nxfpb003wk9v15ib4xy1a7dfygdkg7jf3ly5z5l81607ap8" + "commit": "2c8093e83491b9191115276e649dd87438726348", + "sha256": "1r77b5vj4klqww7q7flw8h5i9w6y36zv2n7hx36pp1sav6s3a4r9" } }, { @@ -25927,14 +25885,14 @@ "repo": "TobiasZawada/elgrep", "unstable": { "version": [ - 20210205, - 733 + 20210829, + 1619 ], "deps": [ "async" ], - "commit": "b627cc0f307161e580e9450ad5334687b9406a16", - "sha256": "17nbjr5dll5n0m52p3isw8gkkza5iqxlhamhv7x61vjd8w72gl3d" + "commit": "ed1ddf377447a82d643b46f3a72cbf5ecb21fb4b", + "sha256": "0na0s42ifv260mbv1djn7yqalcsyahsgyqrqf8lvxc1qbiisrzxv" }, "stable": { "version": [ @@ -26406,20 +26364,20 @@ "repo": "sp1ff/elmpd", "unstable": { "version": [ - 20201107, - 428 + 20210904, + 7 ], - "commit": "0d0456f2b9bfffbe452b6d94b9cd8798c52fc80e", - "sha256": "00qkkjd397y0mlank1hwqvfhp4m53rs5jpd8gfcyjl53ka9dg587" + "commit": "c9e413fcb6c526c86e1a64d45c7ea94aceca4e6e", + "sha256": "1vxdavimnd34ivkx40xnnr472b94yz5l12g9xi4i21p1x0kqqhwp" }, "stable": { "version": [ 0, - 1, - 8 + 2, + 3 ], - "commit": "1356343300140a77f462e690045584c85bd05c94", - "sha256": "0iwmn54v78fgch6cx9qp3cpdfqifqs6g36203xwqmkb4kgvwsg7m" + "commit": "4b42a90610fdb05ac1a2811da5acd55493715795", + "sha256": "1nj310mnckf5mpqici67jzdydbby50la6g6vq7qdaji0c98c335b" } }, { @@ -27275,11 +27233,11 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20210823, - 1719 + 20210905, + 1435 ], - "commit": "ca517fdabd182b0b905d0ef0cb380facb6697670", - "sha256": "1pb6rarb86x9bl064jqick3d7znl0a7ibx27yx30nivi5plrkb3j" + "commit": "d21277a638827623ab84e9e6341312a2da5062ab", + "sha256": "12kl6a4y46vldxc25s7npm0748j4hj8g0vvnhfnxy8iq8q2m2i3j" }, "stable": { "version": [ @@ -27298,15 +27256,15 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20210816, - 1819 + 20210829, + 1334 ], "deps": [ "consult", "embark" ], - "commit": "ca517fdabd182b0b905d0ef0cb380facb6697670", - "sha256": "1pb6rarb86x9bl064jqick3d7znl0a7ibx27yx30nivi5plrkb3j" + "commit": "d21277a638827623ab84e9e6341312a2da5062ab", + "sha256": "12kl6a4y46vldxc25s7npm0748j4hj8g0vvnhfnxy8iq8q2m2i3j" }, "stable": { "version": [ @@ -28388,8 +28346,8 @@ "deps": [ "dash" ], - "commit": "831fcaced262a9dd650bc80241c8214d57de4cdc", - "sha256": "1rgkczdz4ppi0h87vbx10h574xfqn1ba09j3cswhvkxm6w1hram4" + "commit": "f9d741baf42232125663c1d27e01ec04ab0ca85f", + "sha256": "0cxax1dgznzvfzwy00spqi609q93gxkabcy6jm6009029gmsdhdr" } }, { @@ -28879,8 +28837,8 @@ 20200914, 644 ], - "commit": "2bab72d99ae3330cbf3a94450a647158838a1d1b", - "sha256": "1xb1rawj2hl12xmpn9xk2zw69wpvx2ssd3wj4k32dhgi2vcg2rck" + "commit": "731f300deac14e10792a0bbf22c86cbe0c9c7e4b", + "sha256": "1fgqk0xvfxaqj737b62ngnqivd8fhp5pakwbh2zvvdl76frkbsmv" }, "stable": { "version": [ @@ -28903,17 +28861,17 @@ 20210315, 1640 ], - "commit": "988e8112a6db6f5e16380df30f1aa52b1b233662", - "sha256": "0j3b9cd2hzf2i8lzi2xy39bj2q2fqgcsrsim4viknqsv6awqw04y" + "commit": "2ef0ca21ddf75c28b6a1ca07d20c33cbdc24e853", + "sha256": "1dzj8frv80lx34chv94ksm83749l7f8195iy337vcpbvgpzf4arf" }, "stable": { "version": [ 24, 0, - 5 + 6 ], - "commit": "a29aeb16660f2a91aaa24c474d57c6ee7754ee0a", - "sha256": "153kg6351yrkilr4gwg1jh7ifxpz9ar664mz7vdax9sy31q9i771" + "commit": "163593593441984f8446f513bdc7684ac5fe067e", + "sha256": "0z01hkzf2y6lz20s2vkn4q874lb6n6j00jkbgk4gg60rhrmq904z" } }, { @@ -29219,14 +29177,14 @@ "repo": "dieggsy/esh-autosuggest", "unstable": { "version": [ - 20210224, - 2242 + 20210906, + 1446 ], "deps": [ "company" ], - "commit": "30203fc7b8b63a489f34f74ca8b041bf61f4358f", - "sha256": "0w34m9va83grw5j566i5sdgkz475fhf3hibx9p1m0a92p1mg9v8s" + "commit": "bf676b137d35553debe32ff134dbec25f3978ae7", + "sha256": "1m255pgi2zlkjrjr3l8gk76qc5543qnaxqrwgcpb2z9gq51ivfw2" }, "stable": { "version": [ @@ -30360,15 +30318,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20210810, - 844 + 20210902, + 2016 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "dceb73603d397f7e42a541976d8ec0711248d38c", - "sha256": "1jwah95cnlgsdqkk56d0jhshcxydz5w3x5dsxnxckipddrs3ncfm" + "commit": "82e5becae21b7768ffbb4728bce83dab8751d610", + "sha256": "1jkijmfr5bvvp7yl3rdyg9yqp2za855hiymbrpy0cvqljddjs0zv" }, "stable": { "version": [ @@ -30562,15 +30520,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20210823, - 2212 + 20210904, + 830 ], "deps": [ "annalist", "evil" ], - "commit": "0a836facbc1f917c863699eea3eaecc78ac81686", - "sha256": "0zrg4yj62vfpkffz0219ibwqi1yyadj9aaa6qlyz8z6bjg0d7vjz" + "commit": "869d056dcab5eb9781824bcd591bf946969b8b41", + "sha256": "0vm5xncxvnys957pxq6ih6bz65v65aglpjavbf5lypycwjq55iqn" }, "stable": { "version": [ @@ -31888,8 +31846,8 @@ "deps": [ "evil" ], - "commit": "dceb73603d397f7e42a541976d8ec0711248d38c", - "sha256": "1jwah95cnlgsdqkk56d0jhshcxydz5w3x5dsxnxckipddrs3ncfm" + "commit": "82e5becae21b7768ffbb4728bce83dab8751d610", + "sha256": "1jkijmfr5bvvp7yl3rdyg9yqp2za855hiymbrpy0cvqljddjs0zv" }, "stable": { "version": [ @@ -32073,22 +32031,22 @@ } }, { - "ename": "evil-textobj-treesitter", - "commit": "949eb5d82e26e37685c3155b22b329e387f0fd59", - "sha256": "1mxx6fcj7k1k9gnjgcs316x92jdicsrx6l584vkzx09h7fz2p4da", + "ename": "evil-textobj-tree-sitter", + "commit": "fcddf8865ace77c50846d55ac77c615bd8f3af63", + "sha256": "1zns7rr449m186h8br4xv77n26qjdq4whc2nyil8lmkhixr3q4ny", "fetcher": "github", - "repo": "meain/evil-textobj-treesitter", + "repo": "meain/evil-textobj-tree-sitter", "unstable": { "version": [ - 20210816, - 355 + 20210904, + 1350 ], "deps": [ "evil", "tree-sitter" ], - "commit": "461195b882b2179a0e6f8efcd37835ab2a0ed5e2", - "sha256": "1yndxnxx842mhfjqs39i5wz1khm1sha2dr1nhzhi60mz4ywyqyl3" + "commit": "a315a8832fc170c163be01c31b625b19641ce20a", + "sha256": "0msg9kpj4sajcszjamb8gqbi9hdhybsg1gdajprzg0p5z09sv863" } }, { @@ -33214,21 +33172,6 @@ "sha256": "0slvrgw508388il24wlx9g0bf32anpk6rbhmb2r99anq2vhn4b4g" } }, - { - "ename": "fakespace", - "commit": "778dbe1fd1d2ecebb499ad66bc950e586f231c52", - "sha256": "09dsmrqax4wfcw8fd5jf07bjxm5dizpc2qvjkqwg74j2n352wv27", - "fetcher": "github", - "repo": "skeeto/elisp-fakespace", - "unstable": { - "version": [ - 20120818, - 6 - ], - "commit": "d1bd1f4b14b2690d7a67f9a52622ec51ed84813a", - "sha256": "11fm0h9rily5731s137mgv8rdbfqi99s6f36bgr0arwbq3f2j3fs" - } - }, { "ename": "fakir", "commit": "d0a8abd5fd77a14b957f53b5bc8474403cc1e18f", @@ -33280,14 +33223,14 @@ "repo": "jrosdahl/fancy-dabbrev", "unstable": { "version": [ - 20210823, - 1838 + 20210901, + 637 ], "deps": [ "popup" ], - "commit": "f3b05ad56688f2ca13db053e090a1273cf2deed0", - "sha256": "1hj15wi9jxwjamz345jssx9gd4m9cbdisvmq7mg5vhk89k4h0mvd" + "commit": "a2e8449e4ceda45adc5ab7b7d2225c2cc3765371", + "sha256": "165mv9v18fyyha4b27yhardb1k8i30qjchz1lgrfnzv15qv0d7yg" } }, { @@ -33345,14 +33288,14 @@ "repo": "condy0919/fanyi.el", "unstable": { "version": [ - 20210820, - 423 + 20210905, + 1203 ], "deps": [ "s" ], - "commit": "5f4fd0dbee514bada012ab3ecc9c767b8910828e", - "sha256": "1lzmhn0bn6qjyq441bp39gq4wd1xvrcygzrfm6v6srywb6s34dm1" + "commit": "352fc9ae3230e87470fcbb638d623169c2e582f9", + "sha256": "06w54klzl9781bxmxhx0vhj1yj6ym8i68fb1bry9yhy8r3qamyip" } }, { @@ -34147,6 +34090,48 @@ "sha256": "1mx05zfdrkwb50l7f0iycsqw23b1gxzacfnssclb42xdjxxmyhdj" } }, + { + "ename": "finito", + "commit": "4b6af066aedc1cc3116d6efe2aeb9ffa375edaae", + "sha256": "0451nqkz7riqaz5apzxn2ff0mr3484srx9y54hj9vpdmmvp1bfd0", + "fetcher": "github", + "repo": "LaurenceWarne/finito.el", + "unstable": { + "version": [ + 20210904, + 1352 + ], + "deps": [ + "async", + "dash", + "f", + "graphql", + "request", + "s", + "transient" + ], + "commit": "0895002dfacdaab9010a35c190139384935cb4d0", + "sha256": "0cg6axjv41da3ryxq2vszhn8f7jslc8ipf8izh1h7ldg2li5kz9c" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "deps": [ + "async", + "dash", + "f", + "graphql", + "request", + "s", + "transient" + ], + "commit": "bf720fec1fcd46664dce66a667ef77a1c80ef89a", + "sha256": "0q55ny88rpc2xrnkbpmifb9nnshjlx69mwf6kvxqryljvcjbk69y" + } + }, { "ename": "fiplr", "commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44", @@ -34208,39 +34193,6 @@ "sha256": "1vrpnv7555mbsksflgdkg7hc65fjcyzvzv2261y043rlh2qrn0sy" } }, - { - "ename": "firefox-controller", - "commit": "70a69c20f8dcf73c878f2172dcc9f1796fdc0408", - "sha256": "03y96b3l75w9al8ylijnlb8pcfkwddyfnh8xwig1b6k08zxfgal6", - "fetcher": "github", - "repo": "cute-jumper/emacs-firefox-controller", - "unstable": { - "version": [ - 20160320, - 1847 - ], - "deps": [ - "cl-lib", - "moz", - "popwin" - ], - "commit": "a8af8cbf70afaf6b89a26d6ac69af8e92afc181f", - "sha256": "0icgl88pwizwzkdqsxbwhnc6pdyqsfd7wgjnkvg3206i7hcqwpsp" - }, - "stable": { - "version": [ - 2, - 1 - ], - "deps": [ - "cl-lib", - "moz", - "popwin" - ], - "commit": "a8af8cbf70afaf6b89a26d6ac69af8e92afc181f", - "sha256": "0icgl88pwizwzkdqsxbwhnc6pdyqsfd7wgjnkvg3206i7hcqwpsp" - } - }, { "ename": "fireplace", "commit": "4c1ac52c1cfe7ccf46092c2d299ebbffdc1b7609", @@ -36090,8 +36042,8 @@ "repo": "flycheck/flycheck-haskell", "unstable": { "version": [ - 20200927, - 1603 + 20210829, + 1143 ], "deps": [ "dash", @@ -36100,8 +36052,8 @@ "let-alist", "seq" ], - "commit": "f04842252babd37c0ac60e069272a3477b538332", - "sha256": "1icvbc3f8mfpm1p4s7qcvkl5q5p021jjinmbc5js46xgsl3bjkr6" + "commit": "16b748c033e30216259fa8c9c23616db36750a58", + "sha256": "08agklr9mw4rxr5mq9c5ynhqsjp5knc7571rnr19iziq33r8srl9" }, "stable": { "version": [ @@ -39334,8 +39286,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20210822, - 840 + 20210906, + 1234 ], "deps": [ "closql", @@ -39348,8 +39300,8 @@ "transient", "yaml" ], - "commit": "a3e6f8aab16a8213cd389fe79d8c02300d26cab7", - "sha256": "0n6p63kfibpz4161wb2f6516ncv3h9algxlgdgrd5lsnn0ympr26" + "commit": "86e18914eac706928e66705418c765f34d077703", + "sha256": "01i8vb120vn8wmiscyjhk3zl7qk0zrnydkq4d282w9b5sqzrgjpp" }, "stable": { "version": [ @@ -39488,11 +39440,11 @@ "repo": "larsbrinkhoff/forth-mode", "unstable": { "version": [ - 20210123, - 900 + 20210829, + 1824 ], - "commit": "f44fa6481ffe2b4321d462c3fab78a858f2a8ae9", - "sha256": "08p9ddxs3ya7an2p485wrw5ywimbgnqrihriyc4aaq963zpssk2c" + "commit": "38d5152011ee67e0cff9d4a5ddfb1f908e5be013", + "sha256": "09irbi8z1p2006abl4fnkyfj3c16nzzf55wqighlc2ri2v8bbisb" } }, { @@ -39554,8 +39506,8 @@ "deps": [ "seq" ], - "commit": "7de7159a58e0594c0120d66af78f65264f61ea5f", - "sha256": "0y7dd6qq4b95scj7fay4zzhkf0g0x89npylc4v1hz59b1yyylfqy" + "commit": "60f4dc4f02a8ea222abcd51556163e7861f0fbe8", + "sha256": "09i4ilwgrnw8ymlzd4rzwnbhwz0c7axrlr2pn0nmzp3v60lhxnl2" }, "stable": { "version": [ @@ -40391,11 +40343,11 @@ "repo": "10sr/fuzzy-finder-el", "unstable": { "version": [ - 20200909, - 907 + 20210906, + 217 ], - "commit": "c19235a35db076eebb5ad31fb42daf6520620f6d", - "sha256": "0nwbvgj2z15g88d9mgbc408xhsf3wx8r1ky70cgn7kqfv4wvd25n" + "commit": "915a281fc8e50df84dcc205f9357e8314d60fa54", + "sha256": "15b6nbkv8xpvin8i1443s1mnpag5p33asgwpxijrmwp3xm2xkyl6" }, "stable": { "version": [ @@ -40507,11 +40459,11 @@ "repo": "bling/fzf.el", "unstable": { "version": [ - 20210619, - 1421 + 20210826, + 140 ], - "commit": "c975001725e4b7f58dd9379a64c170f07734af59", - "sha256": "01d303vbn7vvhl1g1wpmpy90h5vaj3yimzgmhnmswc2qc2s3cnhq" + "commit": "e045e7ede6a3d5f792cd11efe5e83cf60d8081bb", + "sha256": "0y4abgwcb28dpnzqcl2dylymnkg1v91nrnpsrly0dp8bf0aiafrq" }, "stable": { "version": [ @@ -40695,14 +40647,14 @@ "repo": "ahungry/geben", "unstable": { "version": [ - 20170801, - 1251 + 20210830, + 422 ], "deps": [ "cl-lib" ], - "commit": "ec3f5e9376cf1ea5615990bd8c212543d57f033b", - "sha256": "0860nnarbm76jp40v7p5d2wdnq12p03paiw17g3h5p27wnaj611d" + "commit": "d3706387ed25b3037338572f3968b4cc2d8825a0", + "sha256": "05kvg13mknn4xgzik637kgg5qa7qhz3626v2ny2p86lga1pzm3yq" }, "stable": { "version": [ @@ -40775,8 +40727,8 @@ 20210808, 16 ], - "commit": "77d4c3a91c0acdb16cefa8a3e0efac3435aebdc0", - "sha256": "07g1zlf9kmfish2wa6m376xba0nv6n4spw8wbmr90a56xj0qpswc" + "commit": "327ff01e5b9c6e019fdd0cb710a4c19082249345", + "sha256": "0vis470dhk7adpxr335wq33jv1035sd3vj1cxdq3jsx8biqas4c1" }, "stable": { "version": [ @@ -41082,11 +41034,11 @@ "url": "https://git.carcosa.net/jmcbray/gemini.el.git", "unstable": { "version": [ - 20210611, - 1833 + 20210901, + 1406 ], - "commit": "97e096ab2400bbe3c0f6d19fb49bd952f2f14e03", - "sha256": "1l092mhpv8dg00ln4yv040kmha7556klm5bqfdvc9ysjnfiwprkd" + "commit": "0a02e97cc2ce2ddd97c7624187c7e7b6ab2e9fe7", + "sha256": "18vd78ya03d3x7aib2x7d3snripi7r5xrkyi7vm2xxzx91fan4rf" }, "stable": { "version": [ @@ -41223,6 +41175,21 @@ "sha256": "0344w4sbd6wlgl13j163v0hzjw9nwhvpr5s7658xsdd90wp4i701" } }, + { + "ename": "germanium", + "commit": "6cc59833eeabaa1bb4347f158e8794683dc3a15e", + "sha256": "0g5lqdgnv720l0s41ql5jx3gvzckw0fhgdmn3f46hckwpvvhrmah", + "fetcher": "github", + "repo": "matsuyoshi30/germanium-el", + "unstable": { + "version": [ + 20210821, + 1813 + ], + "commit": "88a14826695b60ac218c2b3beadba0dbd89bcd60", + "sha256": "1h85zpli5ysbfx6j0ajmkyngmj1nq6qwkx94kl0risamz8lxvk7r" + } + }, { "ename": "gerrit", "commit": "3b966a2476cf10234686e49d808bcbabe0686891", @@ -41873,8 +41840,8 @@ "transient", "with-editor" ], - "commit": "5a0cf9aaa9acf53c68c0fe98883c081aa5e29dd3", - "sha256": "16ihqh9aqjgjs14p5i17bw0wrcc1kpzvj62fn7bk8almdy6ph4dn" + "commit": "d173de73e96e207d4ba3821e1d720c8d81f6bafb", + "sha256": "1yq077j2fvmgpji6arlliq00bcs08bhl877fsklhq6j0yif1vz9s" }, "stable": { "version": [ @@ -42085,30 +42052,30 @@ "repo": "akirak/git-identity.el", "unstable": { "version": [ - 20210730, - 1037 + 20210905, + 1208 ], "deps": [ "dash", "f", "hydra" ], - "commit": "07f0846fcc92b6c2fdd61db8aa959effd0e23d9d", - "sha256": "1bk1cvll02348d7dwq6dzdm0ykbxf63p16jq8j07q148qm07yf0h" + "commit": "e2620767694d8cd2860b632c47fbe92e20a9ef14", + "sha256": "1wyfszd9jzg6c7lbl2rw7xpbr6fr4rj70h0jyqnwz081j9w92bb1" }, "stable": { "version": [ 0, - 1, - 1 + 2, + 0 ], "deps": [ "dash", "f", "hydra" ], - "commit": "d5b8dcfc9f93aecfcd9c6fb212742c165d48173f", - "sha256": "1dblc0vlnkm1b16pgi40yr21wh45larb7818l9q8p9nbpxcjinh2" + "commit": "e2620767694d8cd2860b632c47fbe92e20a9ef14", + "sha256": "1wyfszd9jzg6c7lbl2rw7xpbr6fr4rj70h0jyqnwz081j9w92bb1" } }, { @@ -43282,11 +43249,11 @@ "repo": "lokedhs/gnu-apl-mode", "unstable": { "version": [ - 20200108, - 1633 + 20210904, + 509 ], - "commit": "7f84eb307e9765fadcd1e0a9201ae562724ef1c9", - "sha256": "0aqlgsl19p2vlagdvahxxhqdcvmr8g7wlziwjvm2pina3lqfw4wc" + "commit": "c1203e8ff655ba776ecdc49b3420aaed4bd37952", + "sha256": "1hicrnwn4z0q0v39qdhfwgailgy6fw433gvk70pm779npp2zv90s" } }, { @@ -44776,8 +44743,8 @@ "magit-popup", "s" ], - "commit": "ec5a4a7c63275875655d0fb57962ccefd68d39e5", - "sha256": "0zmam6s2vpdl88qd3h863gzy25m0g6bkmzrgib00807sj2i42704" + "commit": "e49ad93a11f6e0528d1dc2b6d6d4ec2a131636e0", + "sha256": "0hs2vk9fp860y2fldr6d85hlpizccj0v5a7bjmkirvfnk2w086mv" }, "stable": { "version": [ @@ -44951,16 +44918,16 @@ 20160504, 911 ], - "commit": "99eaf70720e4a6337fbd5acb68ae45cc1779bdc4", - "sha256": "1jpfyqnqd8nj0g8xbiw4ar2qzxx3pvhwibr6hdzhyy9mmc4yzdgk" + "commit": "84f89b68ec8f79bce0b3f5b29af155a85124e3a6", + "sha256": "1pfaan0chvxpvf1zp3inpx47smm7rb22q4cklhw27n70cqh6qix5" }, "stable": { "version": [ 2, - 0 + 1 ], - "commit": "d7b362e6186d263ec3eefc141dbb5b27a8773f24", - "sha256": "0c1d4cbnlny8gpcd20zr1wxx6ggf28jgh7sgd5r1skpsvjpbfqx2" + "commit": "99eaf70720e4a6337fbd5acb68ae45cc1779bdc4", + "sha256": "1jpfyqnqd8nj0g8xbiw4ar2qzxx3pvhwibr6hdzhyy9mmc4yzdgk" } }, { @@ -45504,8 +45471,20 @@ "repo": "Groovy-Emacs-Modes/groovy-emacs-modes", "unstable": { "version": [ - 20210510, - 317 + 20210831, + 1601 + ], + "deps": [ + "dash", + "s" + ], + "commit": "84f89b68ec8f79bce0b3f5b29af155a85124e3a6", + "sha256": "1pfaan0chvxpvf1zp3inpx47smm7rb22q4cklhw27n70cqh6qix5" + }, + "stable": { + "version": [ + 2, + 1 ], "deps": [ "dash", @@ -45513,17 +45492,6 @@ ], "commit": "99eaf70720e4a6337fbd5acb68ae45cc1779bdc4", "sha256": "1jpfyqnqd8nj0g8xbiw4ar2qzxx3pvhwibr6hdzhyy9mmc4yzdgk" - }, - "stable": { - "version": [ - 2, - 0 - ], - "deps": [ - "s" - ], - "commit": "d7b362e6186d263ec3eefc141dbb5b27a8773f24", - "sha256": "0c1d4cbnlny8gpcd20zr1wxx6ggf28jgh7sgd5r1skpsvjpbfqx2" } }, { @@ -46061,25 +46029,25 @@ "repo": "hhvm/hack-mode", "unstable": { "version": [ - 20210519, - 108 + 20210901, + 2129 ], "deps": [ "s" ], - "commit": "f9315be69954b95b6a3ceaa37f31a88f8369a59f", - "sha256": "060cp88snnp9059b382nkfbj8b5p5wm360vjrcrpny08d0dfj7pj" + "commit": "4c1c2b093970b92f8589b061759288c0deb228c9", + "sha256": "1lyp42d6j623v78sw9k5awj6188wgbsmpbj1izknisp0cnih90av" }, "stable": { "version": [ 1, - 1 + 2 ], "deps": [ "s" ], - "commit": "4e50d9f46b044c0d885af3a486bf6275c121f29e", - "sha256": "1s06m8bam7wlhqw0gbc443lfrz51mj05pzvbmjzqadqn4240v4jw" + "commit": "28b6d43bbd8bb81f101ea4e95be2e40260c02ae8", + "sha256": "0vcv66413i93mi1w7jszkxb47dfjw1ngdwysjlpw5wzl8xkwrcm1" } }, { @@ -46843,16 +46811,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20210822, - 1700 + 20210906, + 651 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "64b8def85cab9550db0cff3eebaec09d80793a8c", - "sha256": "0bv0mb2dmw84jgmjr79r60276xcxw5lszw3k4a70d1fshmsc0sds" + "commit": "3fe4076076eea8d244793b80a0274de0d685bd9d", + "sha256": "0kwa2aabbvkr5wyp339ajrkwn4rk6gwq52ly86fskyq0n7263n7b" }, "stable": { "version": [ @@ -47751,14 +47719,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20210822, - 952 + 20210906, + 557 ], "deps": [ "async" ], - "commit": "64b8def85cab9550db0cff3eebaec09d80793a8c", - "sha256": "0bv0mb2dmw84jgmjr79r60276xcxw5lszw3k4a70d1fshmsc0sds" + "commit": "3fe4076076eea8d244793b80a0274de0d685bd9d", + "sha256": "0kwa2aabbvkr5wyp339ajrkwn4rk6gwq52ly86fskyq0n7263n7b" }, "stable": { "version": [ @@ -48059,8 +48027,8 @@ "dogears", "helm" ], - "commit": "c0fa3f6318c660234e77b108f8486dfc39869071", - "sha256": "0bafs58xrlwk2f8swykwhvs1wilvbm2593gjmvdrwhy4hwg0n6f2" + "commit": "00dd88cc53d3a7d6ddeb3c6eea2c2a37d9b610d6", + "sha256": "196gh32l18laawqypc9l08pmqrs48lj5g4wj2m1vl4c13mff5giz" } }, { @@ -49381,14 +49349,14 @@ "repo": "emacs-helm/helm-ls-git", "unstable": { "version": [ - 20210729, - 911 + 20210906, + 738 ], "deps": [ "helm" ], - "commit": "d861fb407d72470db41ac458447b92c6d9b00206", - "sha256": "13hxglh5w70w5y7x4r7rqpa7npj4lfrajjjic8vizn71752cndkg" + "commit": "178192296acd59c53d933dfa55e8a27b8ce802cb", + "sha256": "1wrnjzj53n78bll3jlqr7gwlx4x2awxh2zr34y9q02izlgvwwq4z" }, "stable": { "version": [ @@ -51518,14 +51486,14 @@ "repo": "duncanburke/help-find", "unstable": { "version": [ - 20210822, - 1704 + 20210826, + 928 ], "deps": [ "dash" ], - "commit": "b1d15676c5bc348821256ffa5aaea308f6f28ad4", - "sha256": "0pz6wxw0p4d5zfz2mb9f7mg6k25iqhik428yia3n77ra80jx8ncr" + "commit": "576d6505b9e42f50f121b1a6a675f17f03a04406", + "sha256": "064asvq6hfmrh3fnkm8dnarwmdgfm8f97mjng1bkf13wmnzglhck" } }, { @@ -52587,11 +52555,11 @@ "repo": "tarsius/hl-todo", "unstable": { "version": [ - 20210615, - 1505 + 20210828, + 1225 ], - "commit": "5ac0076cfeaea57f7c7a59d9d41a34c1bdc4b22e", - "sha256": "1h3h62rglgwir3jfy6wq9hkwlx6z28cs9dz8jv8xgpk1jsj89whw" + "commit": "d13a0892645536b970ce130a01ebe5f62e04689f", + "sha256": "0fw0qwxrc05paq17vdhvvwlzwrl351js8wf4mc5crkhahry9608a" }, "stable": { "version": [ @@ -52981,8 +52949,8 @@ "deps": [ "dash" ], - "commit": "c9c0593b2bffd6a494f570d707fe8d4e97718da4", - "sha256": "16baysl5qpcl48gd64g7sq0bpdhjw21az7r7w21gfj12s2njqydf" + "commit": "d0f03552c30e31193d3dcce7e927ce24b207cbf6", + "sha256": "0ynf26gaj7n6cg0vgykq80hg21lxlwffwcssk9ppin0rqmc74m06" }, "stable": { "version": [ @@ -53020,16 +52988,16 @@ "repo": "thanhvg/emacs-howdoyou", "unstable": { "version": [ - 20210816, - 507 + 20210903, + 201 ], "deps": [ "org", "promise", "request" ], - "commit": "4f3d70009c1368174355ca7a5eb1259f18ec5f34", - "sha256": "0j8i6c21jzdc88bvdsbshxgv62wvl95kham5w6kfkrlj0ld8i8yg" + "commit": "61489045a1b1982d9bcd307fcc5bbd9195133c06", + "sha256": "0crzd0qyq751rlljs31vxblyvjcyjzfnj2x78rmqp7vj6hyr7xfg" } }, { @@ -53346,11 +53314,11 @@ "repo": "pnor/huecycle", "unstable": { "version": [ - 20210706, - 205 + 20210830, + 340 ], - "commit": "c343b2085dea11b820d4da6c6183e1102ec08698", - "sha256": "1bdhm9j2dammw5dzr8gh4wg5pkl7c706jqdwd43my7zsn2ipar24" + "commit": "a05e32351dcff3e61b5f15800556adfe1939c112", + "sha256": "1qnid40hmz3yw5jr1i9xr91d57hjh90s98js48nk6m0sjbkkbb4r" }, "stable": { "version": [ @@ -56233,14 +56201,14 @@ "repo": "dotemacs/ipcalc.el", "unstable": { "version": [ - 20200809, - 1444 + 20210903, + 958 ], "deps": [ "cl-lib" ], - "commit": "58b2b6c90af93ae46c5445b33ee4d1ef4bac1efb", - "sha256": "0v6ahhixp57p94m0sagidvq95m45bf4lfwszjzsn7a2wcrvap7r9" + "commit": "8d5af5b8e075f204c1e265174c96587886831996", + "sha256": "0a7rw26ibhmlnf9jjs6kf610k566mqzjvbd9rlmpwpi8awlfflky" } }, { @@ -56690,11 +56658,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210730, - 1743 + 20210903, + 1814 ], - "commit": "7cdde66c95d5205287e88010bc7a3a978c931db0", - "sha256": "0pvgh4krym43vcyiq4bsjl63gg795jlqh6kaa6llsv1awvywfqww" + "commit": "6a8e5611f32cf7cc77c2c6974dc2d3a18f32d5a5", + "sha256": "0mwrvcnpl7cr8ynhx8ilmlbjqmggxccwa6w8k15j5i640chl19xh" }, "stable": { "version": [ @@ -56721,8 +56689,8 @@ "avy", "ivy" ], - "commit": "7cdde66c95d5205287e88010bc7a3a978c931db0", - "sha256": "0pvgh4krym43vcyiq4bsjl63gg795jlqh6kaa6llsv1awvywfqww" + "commit": "6a8e5611f32cf7cc77c2c6974dc2d3a18f32d5a5", + "sha256": "0mwrvcnpl7cr8ynhx8ilmlbjqmggxccwa6w8k15j5i640chl19xh" }, "stable": { "version": [ @@ -57089,8 +57057,8 @@ "hydra", "ivy" ], - "commit": "7cdde66c95d5205287e88010bc7a3a978c931db0", - "sha256": "0pvgh4krym43vcyiq4bsjl63gg795jlqh6kaa6llsv1awvywfqww" + "commit": "6a8e5611f32cf7cc77c2c6974dc2d3a18f32d5a5", + "sha256": "0mwrvcnpl7cr8ynhx8ilmlbjqmggxccwa6w8k15j5i640chl19xh" }, "stable": { "version": [ @@ -58257,8 +58225,8 @@ 20210615, 41 ], - "commit": "d7660096e7d49f9b2ebc8924c0f5b39c5ffa8c86", - "sha256": "1sw1cgykq9i6wdjjlqlw6jrdxnic615k96lbqyir84fizn55qcja" + "commit": "73aebe62e8adf8e737c9a94361cce45063d05ae4", + "sha256": "1zagxpz598ssn88mch1mzc2aqa7sx29q7y1ifw4mrglsicgrxlv7" } }, { @@ -58559,8 +58527,8 @@ 20200604, 833 ], - "commit": "42ad0a99f0114233e2cb317585cb9af494d18a2f", - "sha256": "1n4w45yv1k7979j42dahhp9356p9bmk6ldybqa0z65k9gz4abkxl" + "commit": "1af31ba701cf844f938f840ed78867c9a28174b6", + "sha256": "0zxqvy1vya0f0yrfp622hhf400cm5ygwl7mjdj5scwfk2y852xw1" }, "stable": { "version": [ @@ -58808,14 +58776,14 @@ "repo": "mooz/js2-mode", "unstable": { "version": [ - 20210712, - 202 + 20210830, + 12 ], "deps": [ "cl-lib" ], - "commit": "6f313c9566d9c8453a91c5ccaa25760978cb9f6d", - "sha256": "09fxg0ljv2g9rv7n67km7q64w49fcl0gngm68m252nyvk2x28b08" + "commit": "b913961e410dbfdc52a80d62eb4cfe7a305b4e3e", + "sha256": "0xxb25a6vixzfxsndyy2mgwbpr4h5pm76fq9ibw7434yc8zjwmrj" }, "stable": { "version": [ @@ -59258,11 +59226,11 @@ "repo": "JuliaEditorSupport/julia-emacs", "unstable": { "version": [ - 20210824, - 747 + 20210904, + 908 ], - "commit": "a1ba9a03a4b18a0d9536753efee623ab7afca596", - "sha256": "0czmvm7nm91n9kg5cv6rc5wcw6vwyqfq2fr8lrm4dfzrwvf99204" + "commit": "06f6fdb94cdd88db7bb40b8f511a386605711408", + "sha256": "0153zh3vl6qmaw40v0b2kf81x6wfyxwgmc9iwvz4rximra9xxmyg" }, "stable": { "version": [ @@ -59840,8 +59808,8 @@ 20170418, 810 ], - "commit": "dd11d722b20ae720f29b8aa93a3b1cad87650b33", - "sha256": "07g0spi9jf48vap76f9rgl61sg3jqy03qdxnmchzwlia8wvcsscb" + "commit": "fcf0173ce0144e59de97ba8a7808192620e5f8f4", + "sha256": "1a2s19h4xgss8849lv5yl6g28hazz8k9vgzxyns2wzwc85pnbrhr" } }, { @@ -60710,8 +60678,8 @@ 20210318, 2106 ], - "commit": "49ef9ff24bf8f545243a30b1e49192d73c1b41f7", - "sha256": "0hs4d5fw1ic8vvzqiq7skb8ag2rdshmz71m2swl38s1bkhnbjbac" + "commit": "92ff508dc17831a57a4bb900d7bc218b577e066e", + "sha256": "1gmkf00mka99griysazipph27xfx42s5jfrrcy3mxwmlzs6zgfd3" }, "stable": { "version": [ @@ -60897,11 +60865,11 @@ "repo": "Emacs-Kotlin-Mode-Maintainers/kotlin-mode", "unstable": { "version": [ - 20200925, - 1541 + 20210831, + 1802 ], - "commit": "0e4bafb31d1fc2a0a420a521c2723d5526646c0b", - "sha256": "09inpgwmnnqaakyn4r4xs8kax8b89dw94kvl521x6d43h9zl5i70" + "commit": "876cc27dc105979a0b59782141785f8e172891e8", + "sha256": "1vyls3ilypxskhng96z1m8byripmbsghgfalsg4qnmn8lakaq68d" } }, { @@ -61061,8 +61029,8 @@ "repo": "kubernetes-el/kubernetes-el", "unstable": { "version": [ - 20210825, - 1458 + 20210830, + 2219 ], "deps": [ "dash", @@ -61071,22 +61039,24 @@ "transient", "with-editor" ], - "commit": "96d9a6f1ab673a014fa9d84763ab6568ef2b9849", - "sha256": "06smpnwv5jj335fx2acgh28dlpa2h631l9qwmd3gi47q5x6yyshq" + "commit": "6cd0e63d302197bed03f1ac74afcd92b6115c9f5", + "sha256": "02aqkfklm6zxclaw9gdip38qri10iwvnhy9xcby7f6x61m3x26j2" }, "stable": { "version": [ 0, - 15, + 17, 0 ], "deps": [ "dash", - "magit", - "magit-popup" + "magit-popup", + "magit-section", + "transient", + "with-editor" ], - "commit": "ea81874f0490cea310b09c57718aa0e5c83d578b", - "sha256": "13kra8y8laqk949phxwlw5q0lmv4yc9knql12srdys1hyvhczwx3" + "commit": "da188a441079b91a66a3fce9bf200e880bc82abd", + "sha256": "0xxxiqqn8n2a2fa49fijpbg2j7cc92s7vj70dz6hiw0782ql2078" } }, { @@ -61097,28 +61067,28 @@ "repo": "kubernetes-el/kubernetes-el", "unstable": { "version": [ - 20210825, - 258 + 20210830, + 2219 ], "deps": [ "evil", "kubernetes" ], - "commit": "96d9a6f1ab673a014fa9d84763ab6568ef2b9849", - "sha256": "06smpnwv5jj335fx2acgh28dlpa2h631l9qwmd3gi47q5x6yyshq" + "commit": "6cd0e63d302197bed03f1ac74afcd92b6115c9f5", + "sha256": "02aqkfklm6zxclaw9gdip38qri10iwvnhy9xcby7f6x61m3x26j2" }, "stable": { "version": [ 0, - 15, + 17, 0 ], "deps": [ "evil", "kubernetes" ], - "commit": "ea81874f0490cea310b09c57718aa0e5c83d578b", - "sha256": "13kra8y8laqk949phxwlw5q0lmv4yc9knql12srdys1hyvhczwx3" + "commit": "da188a441079b91a66a3fce9bf200e880bc82abd", + "sha256": "0xxxiqqn8n2a2fa49fijpbg2j7cc92s7vj70dz6hiw0782ql2078" } }, { @@ -61129,14 +61099,14 @@ "repo": "abrochard/kubernetes-helm", "unstable": { "version": [ - 20190201, - 320 + 20210902, + 2232 ], "deps": [ "yaml-mode" ], - "commit": "bdf9280899b5efab6d55ffd96bad716c5f8e75bc", - "sha256": "05fsxknp2jpmchvz49hpvh8xvkwl70ksar6ccjqrp7nqcn7cvz2j" + "commit": "95cf92600436f67bd7bfe650763e68635f5ecc8e", + "sha256": "0k1kk472yianf5sn05hxqfpza5yxm9lmr917wmw3mca17758hsgm" } }, { @@ -61255,16 +61225,16 @@ "repo": "tecosaur/LaTeX-auto-activating-snippets", "unstable": { "version": [ - 20210819, - 1935 + 20210826, + 1017 ], "deps": [ "aas", "auctex", "yasnippet" ], - "commit": "af78f6a6eec6f2f1096ed9b72fc0570458365423", - "sha256": "1aw534hw7s0iijsyzzf4k496xjrx983whxvy13n7yqdmzqp728fz" + "commit": "a992e92bf80f5d9e401f916a9e74acce05af4a8e", + "sha256": "0di6p1wapm714vd8d85d1wwzlh68ikfjw3qpjninbmjrzw2bwqp4" }, "stable": { "version": [ @@ -62087,11 +62057,11 @@ "repo": "pfitaxel/learn-ocaml.el", "unstable": { "version": [ - 20210820, - 2243 + 20210831, + 1906 ], - "commit": "bcc48c818e34d518a0513e9d2c26fd92b3989c27", - "sha256": "1bv57ymdfs848347ckcl0c7jxdjzs12hpg7mcdih04yrlbvxrhq1" + "commit": "db13769ffc821dbcf6daa37f9add46de21ed1a3f", + "sha256": "1xxhbgyki8nkkjnfzqxllrcfmqlj6sqgvwxvqz7v4j6m40c745m6" } }, { @@ -62541,11 +62511,11 @@ "repo": "merrickluo/liberime", "unstable": { "version": [ - 20210526, - 623 + 20210906, + 626 ], - "commit": "4a6da0f6ab9b43651f3fcc73412e3480b9403caa", - "sha256": "04ag7icqqdhz40fi91fx4bxx8j6vw2774gw1fbppbks3sasimyy0" + "commit": "8291e22cd0990a99cb2f88ca67a9065a157f39af", + "sha256": "1zr34fsh4l4apdm1jpd9c8863wji5f0g8nwvzgf7bfi6q58bcwzn" }, "stable": { "version": [ @@ -62619,14 +62589,14 @@ "repo": "jumper047/librera-sync", "unstable": { "version": [ - 20210810, - 529 + 20210827, + 2300 ], "deps": [ "f" ], - "commit": "b36ab4f3d8c9df1ed28d78b7d517e90195c97244", - "sha256": "0qmpk52j4fq5rp2kmsm9z8i97x6p458h2xvb53kv03r69ncxc595" + "commit": "b6b97adc08c26b1595249e1c129793100f4ca26e", + "sha256": "0795vbq794clynxcpqrzjsk8d3qisk71bpambcrbiwikpg051fv3" } }, { @@ -62726,17 +62696,17 @@ 20210303, 1751 ], - "commit": "c66377f83a7b178b6e6d8bef5c844420c47ecbdd", - "sha256": "083a97h9ir3qqc39z7dg03k75rg3knza1lzarp6fagxbxl25cprg" + "commit": "edd5c702a7b94440bd76f7ef16ca58f028d06ef6", + "sha256": "1ahmrhm2ym4qv26cf6gvfnnkx3h311v4lwdna3bzv2mw3rzfrlq6" }, "stable": { "version": [ 0, - 23, + 24, 0 ], - "commit": "f3a1d941a08443d034a6c2e090b82ca5c28bdd86", - "sha256": "083a97h9ir3qqc39z7dg03k75rg3knza1lzarp6fagxbxl25cprg" + "commit": "c351737acfdd778b81a64065d8d20ebb10a006f0", + "sha256": "1ahmrhm2ym4qv26cf6gvfnnkx3h311v4lwdna3bzv2mw3rzfrlq6" } }, { @@ -62782,8 +62752,8 @@ 20180219, 1024 ], - "commit": "a52bd2bce9d6fb73dc7fe1e867e3ea804b5abd07", - "sha256": "18fl0f3j6bfv85pjcf0fggd0k6l6gxwvi19jrp3slzf0mhrlxd8k" + "commit": "7f51793fa6c037a90a90e47b433cc8a773a3b552", + "sha256": "0wd493d678587zc10y6hjlmjiacmj3xzw20zzfnvg2qr5nlqpl2g" }, "stable": { "version": [ @@ -63014,8 +62984,8 @@ 20210215, 2206 ], - "commit": "2b719baf0ccba79e28fcb3c2633c4849d976ac23", - "sha256": "0rxqam6cgi404m8n45mw73j3jdd2gb3iwpmyyixbv3cxfb7y1b0l" + "commit": "7330f08dd85ee715096f3596df516877894c6c2f", + "sha256": "1hlqairbjlrcbzb4r5fjm80znr9hdgny3vgm27dwwxxa340m0r6i" }, "stable": { "version": [ @@ -63091,8 +63061,8 @@ "repo": "abo-abo/lispy", "unstable": { "version": [ - 20210809, - 1001 + 20210906, + 1503 ], "deps": [ "ace-window", @@ -63101,8 +63071,8 @@ "iedit", "zoutline" ], - "commit": "5ef2e8967f1015e3936ee7a5bf3d3c4b93d5c3a7", - "sha256": "0a5gj6sa49lbn753r6b3xvxxjy2f2c2jv53y79g7mqgr7w6dcx40" + "commit": "e5d0f949f76df23245e3904463c433d0908e9b7f", + "sha256": "05qagghksg1m7dd0dijw0xjzn1yqpfb6n7vr759injpa39lswcrh" }, "stable": { "version": [ @@ -64151,8 +64121,8 @@ 20210825, 1323 ], - "commit": "9127dd0876567c8db306793e9c5e8151b9ab392c", - "sha256": "00mvvxrbz0qd73a5jqdlfd1s1mxkw63lcyy5mklp5amfrznwp6m6" + "commit": "71f0b40cdcffdbae84214d3d82c0a8aae154a69f", + "sha256": "19s5617vx5xm932anyplwcjld0p589lplkvsi4p2g69ximjlmih1" }, "stable": { "version": [ @@ -64172,14 +64142,28 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20210811, - 244 + 20210906, + 1614 ], "deps": [ - "map" + "map", + "seq" ], - "commit": "c37b669a12337fa04c3dad96bd52e9ae961f14e8", - "sha256": "038440d1ki353nkkiphp46z19y9n8q3l4f4fw01wgi21mdai2y7w" + "commit": "74840299407b23a75bd415903a2157e71e68bd7f", + "sha256": "0fl8wxv84h9y7vp4rgfa9qarsdhh42qmx7d8mpk3fqmgz8a6fm7m" + }, + "stable": { + "version": [ + 0, + 9, + 1 + ], + "deps": [ + "map", + "seq" + ], + "commit": "f75f906397fb95a20ecdb61589d02712de0264fb", + "sha256": "02za26xsivayqmdbs2fy36vp1jvlvr5zanb19ayglbpakmg8ply2" } }, { @@ -64190,15 +64174,28 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20210810, - 307 + 20210906, + 1539 ], "deps": [ "dash", "loopy" ], - "commit": "c37b669a12337fa04c3dad96bd52e9ae961f14e8", - "sha256": "038440d1ki353nkkiphp46z19y9n8q3l4f4fw01wgi21mdai2y7w" + "commit": "74840299407b23a75bd415903a2157e71e68bd7f", + "sha256": "0fl8wxv84h9y7vp4rgfa9qarsdhh42qmx7d8mpk3fqmgz8a6fm7m" + }, + "stable": { + "version": [ + 0, + 9, + 1 + ], + "deps": [ + "dash", + "loopy" + ], + "commit": "f75f906397fb95a20ecdb61589d02712de0264fb", + "sha256": "02za26xsivayqmdbs2fy36vp1jvlvr5zanb19ayglbpakmg8ply2" } }, { @@ -64265,8 +64262,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20210819, - 106 + 20210829, + 27 ], "deps": [ "dap-mode", @@ -64274,17 +64271,16 @@ "dash", "f", "lsp-mode", - "lsp-treemacs", - "pkg-info" + "lsp-treemacs" ], - "commit": "ac52f45742fa5862611b3af04ac679076f100144", - "sha256": "13h2qmhlva5i64n2ybgar71mxnrvxzybh6gwb8xv02zjbbdy9im7" + "commit": "64fb5d93038483abab59751200749ad81698a845", + "sha256": "19b1y5fd0ik3s96qzma4ym3m2x1720x9z0hjpxx61s4y8wgngnyy" }, "stable": { "version": [ 1, - 19, - 2 + 20, + 0 ], "deps": [ "dap-mode", @@ -64292,11 +64288,10 @@ "dash", "f", "lsp-mode", - "lsp-treemacs", - "pkg-info" + "lsp-treemacs" ], - "commit": "ac52f45742fa5862611b3af04ac679076f100144", - "sha256": "13h2qmhlva5i64n2ybgar71mxnrvxzybh6gwb8xv02zjbbdy9im7" + "commit": "1a839dcdedac47c90b4f82f456fea0a7cacf2940", + "sha256": "0m1bccpamxvasimdg6pq28lnbwy2v2xnzjradbl93x7c2drsvnik" } }, { @@ -64433,29 +64428,29 @@ "repo": "emacs-lsp/lsp-ivy", "unstable": { "version": [ - 20210518, - 2034 + 20210904, + 2043 ], "deps": [ "dash", "ivy", "lsp-mode" ], - "commit": "bccd86028e669f5a1cad78364775fe7a0741ff93", - "sha256": "0c1vpriamxnlb8hfnp4cfdkwd4y4gq6zdvhb93gvlf4mh3qmjcd6" + "commit": "3e87441a625d65ced5a208a0b0442d573596ffa3", + "sha256": "0nb9ypa8hyx7i38rbywh8hn2i5f9l2l567hvdr9767fk279yr97n" }, "stable": { "version": [ 0, - 4 + 5 ], "deps": [ "dash", "ivy", "lsp-mode" ], - "commit": "4cdb739fc2bc47f7d4dcad824f9240c70c4cb37d", - "sha256": "08dpn0vcfdwwysijwdpnnj91m69yw0q464i0wmp51zpj3dyd4kb1" + "commit": "3e87441a625d65ced5a208a0b0442d573596ffa3", + "sha256": "0nb9ypa8hyx7i38rbywh8hn2i5f9l2l567hvdr9767fk279yr97n" } }, { @@ -64566,8 +64561,8 @@ "julia-mode", "lsp-mode" ], - "commit": "d4a7a27d6ac7c6831b4f493dd89f82fa0c75bdf5", - "sha256": "1rkf2ibjilf023fv68ql4bray8bdnl2biq5zmn1qk5pdp988iq4j" + "commit": "809da95c05fe668acbae5a35e03082d9b9577728", + "sha256": "1v3f9hwbnd4vji6say5k9110ac4qbc3gd7hb62pvsbfa7vqd06gi" }, "stable": { "version": [ @@ -64621,27 +64616,30 @@ "repo": "emacs-languagetool/lsp-ltex", "unstable": { "version": [ - 20210813, - 916 + 20210826, + 1034 ], "deps": [ "f", - "lsp-mode" + "lsp-mode", + "s" ], - "commit": "d9148a65961432b6ea8a4cd20c225f8c188e6dbe", - "sha256": "0v5q51jxkxmm6pipvq9jf2s33mnrf8679ymx5fg51pk1hv0svcih" + "commit": "59ecc6db3bcf80568241be2d99bb7ef60c58e502", + "sha256": "0avl1ifkc106gaznpwli0gqwfbfsxj8zij3sc4vy2d00ppr4173r" }, "stable": { "version": [ 0, - 1, + 2, 0 ], "deps": [ - "lsp-mode" + "f", + "lsp-mode", + "s" ], - "commit": "5546970c7949d498947e4b6a281707feb2aee928", - "sha256": "0s7v43jmpbjjxvfp9s51kc5d9mk3kf5mwvc4iwbvrzpi0ar4vfdy" + "commit": "5d25bfdc80da46b4839289164d1c4c3699c8908f", + "sha256": "1xf1pxbgjql9badcb1wayzv7j117syh488y82m5q061nnpq4lz06" } }, { @@ -64696,8 +64694,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20210825, - 1531 + 20210905, + 1124 ], "deps": [ "dash", @@ -64707,26 +64705,25 @@ "markdown-mode", "spinner" ], - "commit": "0b4bfd43474b5e317e617834261a2b528e3f8ed4", - "sha256": "1flzknh7mls1fg4w72iv36k77lrpkaysxdd0z922xqsg6x48znb9" + "commit": "d9c8ed3a932b568614d9bbf682271cf43bb8ec73", + "sha256": "0bj87sfadry03lsnlmy4d75za5a2q5p8i981pnz8gvhi154fhz93" }, "stable": { "version": [ - 7, + 8, 0, - 1 + 0 ], "deps": [ "dash", - "dash-functional", "f", "ht", "lv", "markdown-mode", "spinner" ], - "commit": "4db1151dbf1fe84769433d841e90803448b0b354", - "sha256": "1z8zm7qr21hvhl6rnbznv2l9drh1pp5y4zkjrx5ac4x77b8i4aaz" + "commit": "5e0524cc9a4e21c4fe5b35153ad33e7b8a4f9117", + "sha256": "1a6jc9sxf9b8fj9h8xlv5k546bkzsy8j5nj19cfama389z0bzcsl" } }, { @@ -64959,14 +64956,14 @@ "repo": "emacs-lsp/lsp-sourcekit", "unstable": { "version": [ - 20210404, - 1624 + 20210905, + 2017 ], "deps": [ "lsp-mode" ], - "commit": "ae4aa8705cc3a27ed86f1e7ee04d5c8f0522d8c0", - "sha256": "0q3dji9qy0aj7ai43xjcpb4hy6kvscrpr8r5cb9137g34zc0pd9x" + "commit": "97ff36b228a61e69734c7180f33cc6951b1a600f", + "sha256": "1pal3mga7nwfcvri1cffsjgcbbhk7wd1icd622qspqgq0zkfs8jd" } }, { @@ -64977,14 +64974,25 @@ "repo": "merrickluo/lsp-tailwindcss", "unstable": { "version": [ - 20210605, - 315 + 20210826, + 1046 ], "deps": [ "lsp-mode" ], - "commit": "77ebadcb7decd953c069b421a7ab18188295e4b6", - "sha256": "0s34djc945zbzykazrd7k8gizbfws3xp8rjdbnplg4996k1c71n1" + "commit": "5250c4305f2334796d65779c7b61442e17d7c69b", + "sha256": "10xlb3gqlsx9k716mmrvpwlsdn086vr0jiqakcj2f5vixpxj1sxy" + }, + "stable": { + "version": [ + 0, + 2 + ], + "deps": [ + "lsp-mode" + ], + "commit": "5250c4305f2334796d65779c7b61442e17d7c69b", + "sha256": "10xlb3gqlsx9k716mmrvpwlsdn086vr0jiqakcj2f5vixpxj1sxy" } }, { @@ -64995,8 +65003,8 @@ "repo": "emacs-lsp/lsp-treemacs", "unstable": { "version": [ - 20210618, - 1722 + 20210904, + 2039 ], "deps": [ "dash", @@ -65005,24 +65013,23 @@ "lsp-mode", "treemacs" ], - "commit": "905cc74726438cf06d8ad7cabb2efae75aeb2359", - "sha256": "0kh8yn80x1fgpcvrgj9bqmlhpnkxqsy57w8m06gws8lhlnrh4yk9" + "commit": "d82df44d632f331a46eaf1f7a37eb6b1ada0c69b", + "sha256": "05ivqa5900139jzjhwc3nggwznhm8564dz4ydcxym2ddd63571k0" }, "stable": { "version": [ 0, - 3 + 4 ], "deps": [ "dash", - "dash-functional", "f", "ht", "lsp-mode", "treemacs" ], - "commit": "08e256c45d2e95b510a98a8b88b0531e8785e519", - "sha256": "1z9cb7i546pbzvxii6lsj31jq8m70xrzscphl5z71vh93sydyhkb" + "commit": "d82df44d632f331a46eaf1f7a37eb6b1ada0c69b", + "sha256": "05ivqa5900139jzjhwc3nggwznhm8564dz4ydcxym2ddd63571k0" } }, { @@ -65033,31 +65040,30 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20210820, - 1331 + 20210904, + 2037 ], "deps": [ "dash", "lsp-mode", "markdown-mode" ], - "commit": "5d643fbb0c4ef5fc4ee93d9894bf68388095160a", - "sha256": "0005kcj9kr76d5cgviyyfjm9mm13ncra08p8s903b50sm2hsxpp8" + "commit": "b625f3cb5e88559ab99bec58f7a14272edb296bc", + "sha256": "00yirx6qzlb8fv8rd53zaw93nw72z3br40rb16scdqj1v20qsp47" }, "stable": { "version": [ - 7, + 8, 0, - 1 + 0 ], "deps": [ "dash", - "dash-functional", "lsp-mode", "markdown-mode" ], - "commit": "449f3a6b80a60d88c4ed300e69d64eb8e875f1c7", - "sha256": "09dmhhxmfjnzdc5kygwsjf8nwqlnq9rbgrca679s2wy93miqj7vc" + "commit": "b625f3cb5e88559ab99bec58f7a14272edb296bc", + "sha256": "00yirx6qzlb8fv8rd53zaw93nw72z3br40rb16scdqj1v20qsp47" } }, { @@ -65259,6 +65265,40 @@ "sha256": "0926avnlxi8qkr1faplk1aj4lji0ixa4lv81badi5zsmpyyrwmm7" } }, + { + "ename": "lyrics-fetcher", + "commit": "56073782eb8ef6a9e1391c03473b245be2aff0df", + "sha256": "1hji68ig1zldry6xrs2p62pcmfa5px9381ic84zhs02c0hsh1piv", + "fetcher": "github", + "repo": "SqrtMinusOne/lyrics-fetcher.el", + "unstable": { + "version": [ + 20210828, + 813 + ], + "deps": [ + "emms", + "f", + "request" + ], + "commit": "4545f5c5609166198b5f6f2e12de7309d294b629", + "sha256": "135qiprw4r03s1cjkq2hr8i4a6p2aapiz07cw697mhkr3rvvvbam" + }, + "stable": { + "version": [ + 0, + 1, + 4 + ], + "deps": [ + "emms", + "f", + "request" + ], + "commit": "4545f5c5609166198b5f6f2e12de7309d294b629", + "sha256": "135qiprw4r03s1cjkq2hr8i4a6p2aapiz07cw697mhkr3rvvvbam" + } + }, { "ename": "m-buffer", "commit": "c34d02682e87c9978a3583bd903dcac5da5b41d5", @@ -65496,11 +65536,11 @@ "repo": "roadrunner1776/magik", "unstable": { "version": [ - 20210728, - 1354 + 20210903, + 1345 ], - "commit": "d221002128b7954fb5705c37b974223514a9c4f0", - "sha256": "0h04i2xif8iqlrp85kp3p34snzhfcgqcf65asd1qblh0qlhp37gn" + "commit": "d5da43b6a49b7b6a0b6b9ed19c13ac5a076b79b2", + "sha256": "15d4vzr4cww25ic6im9372nl43pdsn8bm9hnpyqjfg3c3axnfp4l" }, "stable": { "version": [ @@ -65520,8 +65560,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210822, - 529 + 20210906, + 1023 ], "deps": [ "dash", @@ -65530,8 +65570,8 @@ "transient", "with-editor" ], - "commit": "5a0cf9aaa9acf53c68c0fe98883c081aa5e29dd3", - "sha256": "16ihqh9aqjgjs14p5i17bw0wrcc1kpzvj62fn7bk8almdy6ph4dn" + "commit": "d173de73e96e207d4ba3821e1d720c8d81f6bafb", + "sha256": "1yq077j2fvmgpji6arlliq00bcs08bhl877fsklhq6j0yif1vz9s" }, "stable": { "version": [ @@ -65710,15 +65750,15 @@ "repo": "emacsorphanage/magit-gerrit", "unstable": { "version": [ - 20210817, - 1949 + 20210831, + 1453 ], "deps": [ "magit", "transient" ], - "commit": "45ed8559171a6392d305f6626d0a8228341f88b2", - "sha256": "0ghcxhi7zwk44lyckbs8n4g7ip9ab8n5bgv45r3xv49snnv5glpx" + "commit": "9104713f6ea918e9faaf25f2cc182c65029db936", + "sha256": "0sasd9q8a3cisys979djdzidxiwcf6n612gajhrhd6fpssdc3rr1" }, "stable": { "version": [ @@ -65878,8 +65918,8 @@ "libgit", "magit" ], - "commit": "5a0cf9aaa9acf53c68c0fe98883c081aa5e29dd3", - "sha256": "16ihqh9aqjgjs14p5i17bw0wrcc1kpzvj62fn7bk8almdy6ph4dn" + "commit": "d173de73e96e207d4ba3821e1d720c8d81f6bafb", + "sha256": "1yq077j2fvmgpji6arlliq00bcs08bhl877fsklhq6j0yif1vz9s" }, "stable": { "version": [ @@ -66040,14 +66080,14 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210819, - 1119 + 20210829, + 1849 ], "deps": [ "dash" ], - "commit": "5a0cf9aaa9acf53c68c0fe98883c081aa5e29dd3", - "sha256": "16ihqh9aqjgjs14p5i17bw0wrcc1kpzvj62fn7bk8almdy6ph4dn" + "commit": "d173de73e96e207d4ba3821e1d720c8d81f6bafb", + "sha256": "1yq077j2fvmgpji6arlliq00bcs08bhl877fsklhq6j0yif1vz9s" }, "stable": { "version": [ @@ -66842,11 +66882,11 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20210823, - 1004 + 20210905, + 1700 ], - "commit": "207eb405706f5415dd0daf490925648fd058cc42", - "sha256": "0sgb4682kz6qyrj4il551yvcz7kbnblh8yxbysjw4psn3aayyam0" + "commit": "cb1d3ba604dda17d8d44e7355ad76a1651830a30", + "sha256": "1lvw0vvb7zmpxlvrvzis6j558n00rlg9jkcnnhzsqqjwfvglhqp8" }, "stable": { "version": [ @@ -66962,11 +67002,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20210819, - 57 + 20210904, + 733 ], - "commit": "0839d0709e116584bd070305e4a0d28bd03bc547", - "sha256": "04xsls7lffvhxif9c5z3ycq80yf0l31z9znmj9m3z132k7rz3bs4" + "commit": "4810cac10355310ec76cd0946d0af92d595b3b81", + "sha256": "0yl98mk1qbgwk3qhnkq73njfkrb7hxydk66lax9r2900dnrifhlg" }, "stable": { "version": [ @@ -67036,16 +67076,16 @@ "repo": "ardumont/markdown-toc", "unstable": { "version": [ - 20210629, - 931 + 20210905, + 738 ], "deps": [ "dash", "markdown-mode", "s" ], - "commit": "f78cba9b5761c91058fed3a781bd3fed7f996e1f", - "sha256": "12dddxa14ppa7gaayify67w4sc6ncbc68wdg4madfqj7s71lnm45" + "commit": "3d724e518a897343b5ede0b976d6fb46c46bcc01", + "sha256": "01l48njg0x7gkssvw9nv3yq97866r945izbggx9y3z5ckr1w4hlc" }, "stable": { "version": [ @@ -67282,11 +67322,11 @@ "repo": "cpaulik/emacs-material-theme", "unstable": { "version": [ - 20201224, - 916 + 20210904, + 1226 ], - "commit": "67a496c937542f6ee7c4a2164d23f0296ef3a645", - "sha256": "14n0s4yn76b7a0qifabp1lp9g0zq82xwahz1wb5wfyfc3d0px9ck" + "commit": "6823009bc92f82aa3a90e27e1009f7da8e87b648", + "sha256": "1c0z2dxfwzgl71xwli3dmyn96xadm5wnhnp5inv5f01mp7iwhf8a" }, "stable": { "version": [ @@ -67906,8 +67946,8 @@ 20210720, 950 ], - "commit": "5ca4857302c2d2d329fd01d0db6a22fa5922b42a", - "sha256": "1007z1dr45b588sifb77a7q5g6l0q8mxr4p5scbrbb9f75cpsy9g" + "commit": "e4791e22986993c36c3f5c91e8dff93494cc232e", + "sha256": "16hkwzsw3igb9ybcjmbmxhrhgy78m8465fv3vys7w3783w6bzkxx" }, "stable": { "version": [ @@ -67936,8 +67976,8 @@ "auto-complete", "merlin" ], - "commit": "5ca4857302c2d2d329fd01d0db6a22fa5922b42a", - "sha256": "1007z1dr45b588sifb77a7q5g6l0q8mxr4p5scbrbb9f75cpsy9g" + "commit": "e4791e22986993c36c3f5c91e8dff93494cc232e", + "sha256": "16hkwzsw3igb9ybcjmbmxhrhgy78m8465fv3vys7w3783w6bzkxx" }, "stable": { "version": [ @@ -67970,8 +68010,8 @@ "company", "merlin" ], - "commit": "5ca4857302c2d2d329fd01d0db6a22fa5922b42a", - "sha256": "1007z1dr45b588sifb77a7q5g6l0q8mxr4p5scbrbb9f75cpsy9g" + "commit": "e4791e22986993c36c3f5c91e8dff93494cc232e", + "sha256": "16hkwzsw3igb9ybcjmbmxhrhgy78m8465fv3vys7w3783w6bzkxx" }, "stable": { "version": [ @@ -68033,8 +68073,8 @@ "iedit", "merlin" ], - "commit": "5ca4857302c2d2d329fd01d0db6a22fa5922b42a", - "sha256": "1007z1dr45b588sifb77a7q5g6l0q8mxr4p5scbrbb9f75cpsy9g" + "commit": "e4791e22986993c36c3f5c91e8dff93494cc232e", + "sha256": "16hkwzsw3igb9ybcjmbmxhrhgy78m8465fv3vys7w3783w6bzkxx" }, "stable": { "version": [ @@ -68108,6 +68148,24 @@ "sha256": "0wpj3ich8wisq0jy304fngj0nkkvdqzfkfcx0s8ib6l04v29ypa5" } }, + { + "ename": "message-view-patch", + "commit": "93cf8649172e3b4d552e20f4ea27c439a891dfbd", + "sha256": "1vik1hkv30a379c9lyjw032iing54ykq9pkqyy5zkwk92dkr5mhm", + "fetcher": "github", + "repo": "seanfarley/message-view-patch", + "unstable": { + "version": [ + 20210904, + 2227 + ], + "deps": [ + "magit" + ], + "commit": "50dd3d92a1794f24b7e375b74e5199c63b54a2d8", + "sha256": "0l2wpapm0gng4jwicwi6w2sz71v4f2j99faakyh07acyvry1wdbi" + } + }, { "ename": "messages-are-flowing", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -68580,8 +68638,8 @@ 20210710, 1941 ], - "commit": "b07faabfec1b5ba545dc1cb961545cc1e9d78db0", - "sha256": "0b7znsgvycfx2brk782mi0n8i779n1r7pqwfq7s256rgi4fcyzap" + "commit": "57a049b9e1ea4a9b65e82fc10c8c7e70a042f636", + "sha256": "0bhsicy4van5xml8s9if2q7b36fbnzqg7kbg41zknf7nyhzl8pxi" } }, { @@ -68691,6 +68749,21 @@ "sha256": "07nbn2pwlp33kr136xsm6lzddhjs538xkz0fbays89psblmy4kwj" } }, + { + "ename": "minibuffer-modifier-keys", + "commit": "589d2ad3a1d509eda5ba0b04025b6472e8e7cd0b", + "sha256": "0ijniq92bfsbk68y6g9l9f4aykwydm990mjy5lhkr1dwpn8z7fpy", + "fetcher": "github", + "repo": "SpringHan/minibuffer-modifier-keys", + "unstable": { + "version": [ + 20210823, + 713 + ], + "commit": "38da548225f51ca7bca22d3e9b0de78e3b9e6cdd", + "sha256": "14xv0v1j1p67hlccw9a137d7hi62pwzllirdx5ixnd2lc7xfg402" + } + }, { "ename": "miniedit", "commit": "5f2a50f62475639af011c99c6cc38928b74b3b0a", @@ -69425,11 +69498,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20210804, - 1453 + 20210906, + 1104 ], - "commit": "52532a1ac2f3b707e79ba67ada8bf36846e45048", - "sha256": "1y12c9xjs6liwgwbfvy5w8sm9kn6ww8imqgkji8nncpjy3vp81vs" + "commit": "a30b42395cdfd8759b71193e2f0804c8e54926ad", + "sha256": "12d6mg6nx7lirj0cb4r90rcnnzrlmk3165lcmcmxrjj6v7g523yr" }, "stable": { "version": [ @@ -69724,11 +69797,11 @@ "repo": "jessieh/mood-line", "unstable": { "version": [ - 20200722, - 2327 + 20210903, + 1142 ], - "commit": "64cbd61c3d9ebf8eb7e1b6366279e32382405f90", - "sha256": "0fh9j9fkgl433nykfzjnzap5labi4sdndfk1nv4f904ij69pmvxb" + "commit": "34a1304edeb5a71ab22132bef8b4251f41cd1cda", + "sha256": "1xzyij1knr0z5mihakq17mnhh994jd035g48xvq7qgk4f0r09pih" }, "stable": { "version": [ @@ -69977,24 +70050,6 @@ "sha256": "17570labnwdnwca2cg4ga0mrrm00n0h3wlxry823k5yn3k93rnj1" } }, - { - "ename": "mouse-slider-mode", - "commit": "8fa747999bb928c3836400a43d8ab63939381673", - "sha256": "0aqxjm78k7i8c59w6mw9wsfw3rail1pg40ac1dbcjkm62fjbh5hy", - "fetcher": "github", - "repo": "skeeto/mouse-slider-mode", - "unstable": { - "version": [ - 20161021, - 1914 - ], - "deps": [ - "cl-lib" - ], - "commit": "b3c19cd231edecce76787c5a9bbe5e4046d91f88", - "sha256": "1qkbrwicp3gaknnmfrajf1qdyhj5s0c09cx62869rp2721p8rqaw" - } - }, { "ename": "move-dup", "commit": "3ea1f7f015a366192492981ff75672fc363c6c18", @@ -70067,59 +70122,6 @@ "sha256": "1k3b018xq2qqq30v0ik13imy9c84241kyavj5ascxhywx956v18g" } }, - { - "ename": "moz", - "commit": "6839c5e52364fb32f6d8a351e5c2f21fbd6669a1", - "sha256": "0ar2xgsi7csjj6fgiamrjwjc58j942dm32j3f3lz21yn2c4pnyxi", - "fetcher": "github", - "repo": "bard/mozrepl", - "unstable": { - "version": [ - 20150805, - 1706 - ], - "commit": "ab3e79914445039ceb62f7f2dc342358fec3492e", - "sha256": "1c7dsip5wmlf7x2hziwil5n3igvpnh17d7yg8lsg001y5sjl3mjv" - }, - "stable": { - "version": [ - 1, - 1, - 0 - ], - "commit": "646208b67e6c9c56d188db1eba999846d518935f", - "sha256": "13bf5jn1kgqg59j5czlzvajq2fw1rz4h5jqfc7x8w1a067nymf2c" - } - }, - { - "ename": "moz-controller", - "commit": "fcc20337594a76a547f696adece121ae592c6917", - "sha256": "18gca1csl9dfi9995mky8cbgi3xzf1if8pzdjiz5404gzcqk0rfd", - "fetcher": "github", - "repo": "RenWenshan/emacs-moz-controller", - "unstable": { - "version": [ - 20151209, - 206 - ], - "deps": [ - "moz" - ], - "commit": "46f665c03574fa922de767fc29795e0db4a7c5c6", - "sha256": "0fssn33ld6xhjlwg1dbrjg8sa0pjmglq0dw792yrmvm4fj0zjph8" - }, - "stable": { - "version": [ - 1, - 0 - ], - "deps": [ - "moz" - ], - "commit": "42fd842039620de7fb122f7e4ffc1ab802ee97c5", - "sha256": "1w1i1clkjg9mj1g4i2y3xw3hyj8s7h9gr04qgyb9c1q8vh11z8d0" - } - }, { "ename": "mozc", "commit": "30fef77e1d7194ee3c3c1d4775c349a4a9f6af2c", @@ -70131,8 +70133,8 @@ 20210306, 1053 ], - "commit": "fed70bc909ef2a67d907d1ac89bbcd042d277da5", - "sha256": "05jw43ajq404dq62kykw9ryh5kl0lhl9alxyqq3gixpyds3r2205" + "commit": "7e8beed3ddad4f8d1065cbab52f24c16d31f5898", + "sha256": "16ahy9myimsjg0csff5b6gpj4vvy1pz6y5rpvhwwg4c6id5wz1fi" }, "stable": { "version": [ @@ -70289,26 +70291,26 @@ "repo": "sp1ff/mpdmacs", "unstable": { "version": [ - 20201118, - 350 + 20210904, + 35 ], "deps": [ "elmpd" ], - "commit": "174ffbc1e8ef31339867e3d9b29fe8468b636a7c", - "sha256": "0djpvhgvbijk40p3131nrf87nrsfd02lm1gc4i65l6sl66xxszv8" + "commit": "334b066dc5bb82d9ccb6cc30d63afed0f7610fe8", + "sha256": "0pkw79sccsvx845xgd2a2rql6ic7jkzki90xj268czvcgvfy4kn1" }, "stable": { "version": [ 0, 2, - 0 + 2 ], "deps": [ "elmpd" ], - "commit": "b81d9464c04bd42509b62d4a3c23f50aed728fc3", - "sha256": "0kjhkj77x25cvx27gqwpsfn64cf9bi5hv0a2sqp8xzzxaxz2l2hd" + "commit": "66031a8993a2a704bdfaa9c63ec590dd0c5a2eea", + "sha256": "0n4b1klaf1jwd8bj9gqjy5p9yabgkgj9zai1cmsbnb4174h0719q" } }, { @@ -71414,11 +71416,14 @@ "repo": "myTerminal/myterminal-controls", "unstable": { "version": [ - 20190426, - 421 + 20210904, + 516 ], - "commit": "733cdd7ab4f172b6dca09720fc5ae7dbc248c822", - "sha256": "1z89d3dx77c4v1zz4ngn689ay6m2x04jznnbc6bdqsaanz9znwlz" + "deps": [ + "cl-lib" + ], + "commit": "c635868e13ee898ec77925d98b36421640e22aa4", + "sha256": "1y7kkb12m94z8ypnfc02xsbsv30lm6qbk3cri1fd63wjshv7wil2" }, "stable": { "version": [ @@ -72274,11 +72279,11 @@ "repo": "juergenhoetzel/emacs-nexus", "unstable": { "version": [ - 20140114, - 1305 + 20210903, + 1743 ], - "commit": "c46f499951b90839aa8683779fe43d8f01672a60", - "sha256": "1xnx6v49i6abzbhq4fl4bp9d0pp9gby40splpcj211xsb8yiry27" + "commit": "9603fd3d8ef34d4b3dcad3292c4ac743500d4946", + "sha256": "07bp6vb2d4sf0csnrc52xiib3lzxpd0mzlpjbikpcn17xjm6xjcb" } }, { @@ -72488,11 +72493,11 @@ "repo": "m-cat/nimbus-theme", "unstable": { "version": [ - 20210318, - 1654 + 20210830, + 1619 ], - "commit": "7e9ad5a617a26641988445503e235c68fa21b611", - "sha256": "1wy06kphgljlcnl55qx5g8hzcv9bnfrrp22pfsxpyawlrmmgxp1j" + "commit": "09085ce2b1b7a7c1c9986e6e86b7cf94610fbfb0", + "sha256": "0aw2pqqfnwcbyh3b8q0lbwl27ilc1w281v78ha9316bvrydhkrdm" } }, { @@ -72605,14 +72610,14 @@ "repo": "NixOS/nix-mode", "unstable": { "version": [ - 20210809, - 1724 + 20210830, + 1610 ], "deps": [ - "f" + "magit-section" ], - "commit": "56748ac556d0406cc6c574f7347fe37decd8381e", - "sha256": "1lgakfj8dar3517rl6k6vxjijkdywq05wg7fjjmnv3a0h8ppjjz4" + "commit": "8e20de5ba7061d810b08df5557b1fdb60c94b639", + "sha256": "18kh6sb8rn391krg5a2xsk03am6ni739pw2ash81asnh112zsxzi" }, "stable": { "version": [ @@ -73221,20 +73226,19 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20210822, - 1412 + 20210830, + 2334 ], - "commit": "84347ffcad24b48390c622e5a96c31c97c094daa", - "sha256": "1zn9j0sc49g7gj1fx2n1lvgcixcvjcc3kg9jlvzwniygqnncwcw2" + "commit": "49aa44bb012e8c2412b5447119b78b61842740b8", + "sha256": "008f86pb2zn3xi9d862c2bz0yzavyrypf6bzc3q275il876x4c9z" }, "stable": { "version": [ 0, - 32, - 3 + 33 ], - "commit": "3f30ee65efec7c35e56af36eaa49af5c2e220d8f", - "sha256": "005nc800cr7f32w7vdpr1bqh65ffflsm8ss6x010i5c79ndfli4n" + "commit": "676fcd70ff5aa5d88943a5982a4187cc5699aa4b", + "sha256": "0wpczv0s0sbdd0p4qhhkw50f5pz5jpx41gaf4c7afc88lwgqr8lv" } }, { @@ -73830,16 +73834,16 @@ "repo": "rejeep/nvm.el", "unstable": { "version": [ - 20210217, - 744 + 20210826, + 1000 ], "deps": [ "dash", "f", "s" ], - "commit": "6f47fac1bc42526a7474488f560d064c08f8dd6e", - "sha256": "01rfgxkahpx17q8k72hxibysysv8pgx6bfy5gbc6finm3f7ak6ia" + "commit": "c214762fd6f539ec3e1fd8198cefbdb4b428b19c", + "sha256": "0xcb2k98ka7lks7k0mk9inmjpyz03v8aq64a24pj635xp54x3iah" }, "stable": { "version": [ @@ -75101,8 +75105,8 @@ 20210617, 1726 ], - "commit": "25ac57f10acae37f21ab3b0959d8c9b3125c4e3e", - "sha256": "0c4cvny8anx4p1i136vl881g6dsy0mrd02xzbgv860g9ix5nzvsx" + "commit": "b78f73f9c3a689be73dd6061f3898c8b998048cb", + "sha256": "0ma9ysizvnwlzb4d1dzfd8n5948gq6zy897526dwwfdj105fsmdi" }, "stable": { "version": [ @@ -75295,26 +75299,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20210819, - 850 + 20210827, + 934 ], "deps": [ "org-re-reveal" ], - "commit": "aa1db964a25f99df945c308fba983de6f044aa8e", - "sha256": "05b3sc2kmmqc82ahky09ilkf6gj2alanpki7ixfa06lydhfg5iby" + "commit": "7d29876e3385ad0477e95d9863b868e9d0aafcc7", + "sha256": "049k35xlv0ilpnjf1la452npv77f0sbx69pmzgkrcg85pql3az6k" }, "stable": { "version": [ 3, - 21, - 2 + 23, + 0 ], "deps": [ "org-re-reveal" ], - "commit": "aa1db964a25f99df945c308fba983de6f044aa8e", - "sha256": "05b3sc2kmmqc82ahky09ilkf6gj2alanpki7ixfa06lydhfg5iby" + "commit": "7d29876e3385ad0477e95d9863b868e9d0aafcc7", + "sha256": "049k35xlv0ilpnjf1la452npv77f0sbx69pmzgkrcg85pql3az6k" } }, { @@ -75451,20 +75455,20 @@ "repo": "rnkn/olivetti", "unstable": { "version": [ - 20210823, - 1054 + 20210902, + 1202 ], - "commit": "08611268bb19509ec087ec416f4a7f76ebae0518", - "sha256": "0nx16w2d1wrqa5cgpbwqfy2al49b9nx2pr9zygiz5qa8jdlzw86l" + "commit": "95479d5178fc5017060c963a45de0d2095c00e0f", + "sha256": "0bliylh02lcga84jysf1jr80bgrn8m7cy4n047fr06cjqdqr4sp4" }, "stable": { "version": [ 2, 0, - 2 + 3 ], - "commit": "08611268bb19509ec087ec416f4a7f76ebae0518", - "sha256": "0nx16w2d1wrqa5cgpbwqfy2al49b9nx2pr9zygiz5qa8jdlzw86l" + "commit": "bfb221845c2e26f923ab80fdcd8f80b70b6adee1", + "sha256": "0qhv4ah9bn1mjvivgxp7z1gf91d0cdr2ma5cy5xaja97ispa4l3z" } }, { @@ -76024,14 +76028,14 @@ "repo": "abo-abo/orca", "unstable": { "version": [ - 20210809, - 1401 + 20210828, + 1639 ], "deps": [ "zoutline" ], - "commit": "1eaf09e31d440f781ba87d0aaa4defa5568a8f48", - "sha256": "0nh3aivgjzcb8vqbwdvvhkk0lww3x1ry52ac8h9cw2k9hdr37ks1" + "commit": "47c03af0c1df2b679d800f3708d675a4c2a3e722", + "sha256": "0dah1wb9fyixwza8h2bc2vzps4zd9y9g97yhrm2vjvddabzsyq3a" } }, { @@ -76147,16 +76151,15 @@ "repo": "spegoraro/org-alert", "unstable": { "version": [ - 20180524, - 133 + 20210828, + 1822 ], "deps": [ "alert", - "dash", - "s" + "org" ], - "commit": "f87bff4acbd839acb4d2245b56b2c3d21f950911", - "sha256": "05xhp1ggpcgd48vcrxf9l43aasxfjw1ypgzpq3gp7031x83m9rr6" + "commit": "67b2e241d9eafcabcbd7de48cca031044ebc8221", + "sha256": "1bglyry80sbsj0x4w20ncvdsnn8lw7j2ry0rnfsb866fhq03zkrn" }, "stable": { "version": [ @@ -76584,14 +76587,14 @@ "repo": "Chobbes/org-chef", "unstable": { "version": [ - 20210508, - 110 + 20210829, + 2145 ], "deps": [ "org" ], - "commit": "a97232b4706869ecae16a1352487a99bc3cf97af", - "sha256": "1j4zjp0w7f17y0vddi39fj13iga0pfh5bgi66lwwghb18w0isgng" + "commit": "a9acf45aaa174aacca248272fb30a5698b5163ae", + "sha256": "0wfq0gpv89sqdzi3acw9b4697lnnpjqvf11mjdlq69y20vfm1qsv" } }, { @@ -77151,11 +77154,11 @@ "repo": "harrybournis/org-fancy-priorities", "unstable": { "version": [ - 20210427, - 900 + 20210830, + 1657 ], - "commit": "44532ab8c25eb2c0028eecca7acd9e8ea8e2ff30", - "sha256": "1cvlyq5p505vx9gcqgvhj7qan1qhq859c2fv7a44kfs0093cb9fz" + "commit": "7f677c6c14ecf05eab8e0efbfe7f1b00ae68eb1d", + "sha256": "1sd7ndr1f07r4832kfi88q9il9v6slzghs1nc1aa81g7y8gb1q8l" } }, { @@ -77506,8 +77509,8 @@ "dash", "request" ], - "commit": "9de4310c3e853f76aa47bc5bf2dc404d4cf3226b", - "sha256": "1vd49wxdj8r228xk9hpqig1f68m0iv5rsrj24ya4rdlf3z4671p4" + "commit": "f64e5da352193d8e8bc4d9f5678c8e971265e6d1", + "sha256": "0wrnkpx7ypjfajbfq2dnqxaq18rlvl7fgajsk6a6fsb2sbhfkb97" }, "stable": { "version": [ @@ -77651,14 +77654,14 @@ "repo": "stardiviner/org-link-beautify", "unstable": { "version": [ - 20210822, - 322 + 20210830, + 1447 ], "deps": [ "all-the-icons" ], - "commit": "c26ea28e6093d23621b9ec20e811986f604c192e", - "sha256": "05zjjsmavpj7klb814xyd58nszladc9wfkybzr8pqfk304bdv0yx" + "commit": "19deeb8f212791cf4698a7cd844df5b3e1b5952f", + "sha256": "0p3iy23nr2saznjz94j0f55qswzmr96x39awd9r8fpvpsm02j14m" } }, { @@ -77780,20 +77783,20 @@ "repo": "org-mime/org-mime", "unstable": { "version": [ - 20210821, - 341 + 20210901, + 244 ], - "commit": "21692f16ce436d9d2a546230f1e124beec0be7ee", - "sha256": "0gvir8c8b2m5z784ml5h957f7mxgp3vn7v91p6igaq5bjf5xcfpp" + "commit": "23cc52bb539c898de228fc438cd24ed10213bea3", + "sha256": "1g32chan6rhlp3kvzd2lvf104i3p37q1sm0d89pq6sya0ia2as1n" }, "stable": { "version": [ 0, 2, - 2 + 3 ], - "commit": "21692f16ce436d9d2a546230f1e124beec0be7ee", - "sha256": "0gvir8c8b2m5z784ml5h957f7mxgp3vn7v91p6igaq5bjf5xcfpp" + "commit": "23cc52bb539c898de228fc438cd24ed10213bea3", + "sha256": "1g32chan6rhlp3kvzd2lvf104i3p37q1sm0d89pq6sya0ia2as1n" } }, { @@ -77899,14 +77902,14 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20210729, - 2144 + 20210901, + 1630 ], "deps": [ "htmlize" ], - "commit": "eb01f60b1ddc132f616d2c1f4038c23f42fc3847", - "sha256": "01xhhq0r36hkfhhacvwm7nwajvl7j8v3qbpn1xhi3vyy3zabhpzp" + "commit": "599e8b056c30e84d584aa54dd7c85339cdb9dc43", + "sha256": "07mjxzip1n3j8lksfq00mfy4s015n28wxiczczqvd6cdhgynshpg" } }, { @@ -78056,8 +78059,8 @@ "repo": "doppelc/org-notifications", "unstable": { "version": [ - 20210310, - 1149 + 20210826, + 1721 ], "deps": [ "alert", @@ -78065,8 +78068,8 @@ "seq", "sound-wav" ], - "commit": "41a8a6b57e11a5b676b03925d473066655364808", - "sha256": "1fb4jm1zhfllzzrdbasgp1r3ggjs3xa4pfd5papi6mfcz9ypxqsh" + "commit": "04d648ab5f5f65b600a3af1c9e8ce4e07800d995", + "sha256": "0xi1shrm3a091fa8zv7nr1425f23z8cb1d6qb2xl1b772q9n7bkf" } }, { @@ -78360,20 +78363,20 @@ }, { "ename": "org-preview-html", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "1dnr046mk5ngmic2yqcmrnn7pzrrx3sg22rk2pc3vgdxs8bhvhf9", + "commit": "cf5b192e7d31850f979d48b7c79dcc6a34bdd923", + "sha256": "0slqn2vp01lyg003icx9h31z560pwhcsqjhg7jv7jdl008saacyc", "fetcher": "github", - "repo": "lujun9972/org-preview-html", + "repo": "jakebox/org-preview-html", "unstable": { "version": [ - 20210623, - 1523 + 20210905, + 1559 ], "deps": [ "org" ], - "commit": "3fe7dd85b8a7dc4ead7495095a3abaad28e2f809", - "sha256": "1vih94z3k8qz2vkzvcqbxpipijsxyfn2kvimylfwjrfbkrmvigsp" + "commit": "04487392d977258351d06ff693a591d8e77617b7", + "sha256": "11f8ffwjllzqpqp0s0610cakh1j8028lvknibajqid4ljidm0mcj" } }, { @@ -78872,8 +78875,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20210825, - 1600 + 20210901, + 1143 ], "deps": [ "dash", @@ -78883,8 +78886,8 @@ "magit-section", "org" ], - "commit": "74a6fd598a03d8d981c21267e9aa25e73d125bcd", - "sha256": "0mm3d8zbnamscnbqmdkqqsj6qy30j83gqdlgwacw1r8n1ncwx8sa" + "commit": "1795039ab93ef19611dbb3fca21c4211c4e655a9", + "sha256": "1hrb4l7b31f9glrdhn30lldqkzbyw0rhw03d5ij49pygfma2qwl0" }, "stable": { "version": [ @@ -78912,16 +78915,16 @@ "repo": "org-roam/org-roam-bibtex", "unstable": { "version": [ - 20210810, - 1626 + 20210903, + 2120 ], "deps": [ "bibtex-completion", "org-ref", "org-roam" ], - "commit": "c13a05b2c855ba1516241d8a1de33bf2c689d6e4", - "sha256": "0m1mr0c6wmiw54qiqz6dm74l1cn0khywndyqfdmss3l52sipzc9x" + "commit": "9675eee4183301b16eb27776dae93e8c0b99eb07", + "sha256": "1n4nfs9ifzdmzj60adbam4qfw6vkm8z4yh5mp23gvi0j9wfx99s1" }, "stable": { "version": [ @@ -79829,8 +79832,8 @@ "request-deferred", "s" ], - "commit": "9c1c94dff1a46631669023286078b887d077c305", - "sha256": "0s3amkc193b3csffa6gqi6kyr7x6fmc3sviirqwnygjfl42788ck" + "commit": "fc63ed580101e6160edfb6f43215fb3200ce1ea7", + "sha256": "1kg3q8bhyydmd9jb41kyg8xcn5dbwpy2y0fnq7avkaypdn1q27w0" }, "stable": { "version": [ @@ -80032,6 +80035,38 @@ "sha256": "05kd8d0687dlmy8a4qvxa3bdcsvxd10hxkl5i4654w88pg07qm8g" } }, + { + "ename": "org-zettelkasten", + "commit": "ed12df24029a4154fe55588f3e8ca0670af3f5f3", + "sha256": "1fhjbg3jjcinnja96fzcsxnjxg0x4vnsw84g1q63c325sv4xv2mw", + "fetcher": "github", + "repo": "ymherklotz/emacs-zettelkasten", + "unstable": { + "version": [ + 20210830, + 1025 + ], + "deps": [ + "counsel", + "org" + ], + "commit": "748e14b5a0dc2200d10b946d0111bd286e2c1c71", + "sha256": "1s9nhqbw5jxkqsvy40dd80l5wjw1407vk9qmdfiva8hj0ymcigr6" + }, + "stable": { + "version": [ + 0, + 3, + 0 + ], + "deps": [ + "counsel", + "org" + ], + "commit": "dd4feae2111357d99dcde1919c1d72523cc5b68c", + "sha256": "16hqk9hdfmbjmhb6bb0xk6silgx85ji0q1dpncwgida6958rq79r" + } + }, { "ename": "org2blog", "commit": "08b47bf72bff18efb3281509fd9f1688d8bb0349", @@ -80130,15 +80165,15 @@ "repo": "ardumont/org2jekyll", "unstable": { "version": [ - 20210220, - 1845 + 20210829, + 1113 ], "deps": [ "dash", "s" ], - "commit": "e469373e0c656cec475c145037be1902d2622f09", - "sha256": "1pqrvrs54ggm2hr7b7m9n4wglbmakw0q9651mwxylz6bwm66kcc1" + "commit": "a228ebcf408de7096e5cd3a62b14087432e0afb1", + "sha256": "146xp2jsk7a973g0dn8in1sad6lp1ks7s5ma6jld4h26anprvj1g" }, "stable": { "version": [ @@ -80431,8 +80466,8 @@ 20210722, 737 ], - "commit": "6bb7deaea9ca01137e7cbd74ff23559e6a4d85e7", - "sha256": "0kq5fa3dkz6a8y8zyf588032hlmpvjl7mn7y6m2mjsamf7fxnh3h" + "commit": "3a6bd917c524c73542315f7c2b0d68161fd5c228", + "sha256": "0kjyg2vif12whfjdj7d4byjw9a4y6q9s40552v6i8b7f1yc7rz0k" }, "stable": { "version": [ @@ -80452,11 +80487,11 @@ "repo": "tbanel/orgaggregate", "unstable": { "version": [ - 20210819, - 1739 + 20210830, + 829 ], - "commit": "141577373600e7be16a5b67284165f54e8743505", - "sha256": "0nhaigi53nygw0fvmj335sd2kin3rlhh501sx4asdvdlhm28n2hr" + "commit": "5e826d36402f822c5981593cd106ce06420638a3", + "sha256": "0jhjm28ypqrvvxdpjqpvwrlsg0gbrnkz4hlfvivlf7wd58852r86" } }, { @@ -80482,14 +80517,14 @@ "repo": "tbanel/orgtbljoin", "unstable": { "version": [ - 20210225, - 923 + 20210828, + 715 ], "deps": [ "cl-lib" ], - "commit": "f411d38de5e36f65336a37e43cfe9a5125b6543a", - "sha256": "05m6xq1c3cc2vpwfgknjx6rad8lr2hd6prbziq04qxp8x8qcs3sj" + "commit": "f09ba7fd304b36773a337323a0749cc681ce5049", + "sha256": "0li0zks7n8kj30z2a71xyaa6qpp5kgrrikrz1562cymp5r3ddbxv" } }, { @@ -80591,20 +80626,20 @@ "repo": "cmchittom/orthodox-christian-new-calendar-holidays", "unstable": { "version": [ - 20210507, - 1619 + 20210830, + 1657 ], - "commit": "c0ba49bb01d037ce8800aa04db06f454ef043cb6", - "sha256": "07ck6slz0z484lywdymh719pfmxhvfsb1cvk2bdbrx4xq89sqwq6" + "commit": "6869024ecd45eefd0ec648979c6a59d7c79770e0", + "sha256": "1hw76k90bgvbdispcgmfbskhnk7cjai0bv75nmmk2b6kcj9hmx97" }, "stable": { "version": [ 1, 3, - 2 + 3 ], - "commit": "c0ba49bb01d037ce8800aa04db06f454ef043cb6", - "sha256": "07ck6slz0z484lywdymh719pfmxhvfsb1cvk2bdbrx4xq89sqwq6" + "commit": "6869024ecd45eefd0ec648979c6a59d7c79770e0", + "sha256": "1hw76k90bgvbdispcgmfbskhnk7cjai0bv75nmmk2b6kcj9hmx97" } }, { @@ -81714,14 +81749,11 @@ "repo": "0x60df/ox-qmd", "unstable": { "version": [ - 20210529, - 1012 + 20210826, + 1425 ], - "deps": [ - "org" - ], - "commit": "7e69c04626f8d35756f3b049bd7836fb751f7734", - "sha256": "14hdjkyyh4714vsc4amkdfhdda94gpaz7hy702ygmyfx0il1v92a" + "commit": "ccabf6bd79ed87dd3bd57993321ee6d93c1818be", + "sha256": "0hww5b2d0yc8g9hhk4sqsnr091nbrmpna1v5yc6pn1g24rngh3dk" } }, { @@ -81761,14 +81793,14 @@ "repo": "yjwen/org-reveal", "unstable": { "version": [ - 20210815, - 907 + 20210902, + 1452 ], "deps": [ "org" ], - "commit": "8eae719acc18592a916715e74984e9222bb6d5fa", - "sha256": "12r4s8xkmyiyv8pcf0zy2jh2dp582rx41pggnfh44cd27skafd30" + "commit": "fe9148b670d144124d9697fcf5d0528f19025104", + "sha256": "034gkbc03z9jzj7ad34mmqgmvj4f14ap7iixh3zx4wp2ipw5xb7c" } }, { @@ -84691,8 +84723,8 @@ 20210808, 1745 ], - "commit": "8212f415fc5de2dedfc74d797b3951b2cbfb6f58", - "sha256": "1r9arl0v33rqgvi98xz63pf56kb7d8j1j1p74ky89g5zk8zzivd3" + "commit": "535aec81739e8e766e0420fda616efc8846f2911", + "sha256": "1z4fds5priq8dsr8gm845ykk8blghm5kz5sspnpzclgk3prwkx26" }, "stable": { "version": [ @@ -86492,6 +86524,25 @@ "sha256": "0bihvkkq4v7wadwbsrgi7a0zmhqn2lp76pnq7vwwsvs1rm36pbvy" } }, + { + "ename": "polybar-sesman", + "commit": "15e30c5c96f94c4ae05c25af45a2f08a9c0520af", + "sha256": "0rm3mjwgp7i7hbwx8qw8snaipa7yl1haffr91rd9d31yc5pd170f", + "fetcher": "github", + "repo": "markgdawson/polybar-sesman.el", + "unstable": { + "version": [ + 20210901, + 1336 + ], + "deps": [ + "dash", + "sesman" + ], + "commit": "5175b8d641aad9576519717f69f858621892d5c7", + "sha256": "101ymzis94sdlhk173my108g2s3fpi4ibc514isizfxvb4cn9gs9" + } + }, { "ename": "polymode", "commit": "3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d", @@ -87894,11 +87945,11 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20210825, - 649 + 20210905, + 629 ], - "commit": "db5748ea4a6428136769e7e50c6d0a12aa7acd8f", - "sha256": "0zfvv7iyb0n61hd3q1jk0bldpfwhw49kd61c5wd44g437vr7jm6x" + "commit": "6516a9ce574a9cd8903d0148fe06fa49f954972d", + "sha256": "0pgrpdgpx7c55csrznhydfpsx5mfi8dy2g7p5mkhz7xmrqqw9ipl" }, "stable": { "version": [ @@ -88304,8 +88355,8 @@ 20210820, 2321 ], - "commit": "f84e634c99d0c6bad17e8840baf7b6173563188f", - "sha256": "07gr1czqh23kz0nw29vdg60vrc5yj9p4rymlplb6xbkq91lncnrd" + "commit": "51696277a4dc30acd61e9ebb400d99934955e450", + "sha256": "1y9bnylzml5ijczac210cs3fpy3qdx01c1wqghdvnr3a1p71w71r" }, "stable": { "version": [ @@ -88408,8 +88459,8 @@ 20200619, 1742 ], - "commit": "38f6e15e77a4e33a669d5d37efd87edfa15c7c04", - "sha256": "1n6xp8yk7vkvgigy46ybvzd3a9597c6qg0zyc9bbhqk93vhwxqkk" + "commit": "10d0faef6de038960ec825c003c85581800fba1c", + "sha256": "1lynx4vj7w8mlf9mbwz5gwxfvr6iqp99sj89zr88bz5vynl6l43j" }, "stable": { "version": [ @@ -88417,10 +88468,10 @@ 18, 0, -1, - 1 + 2 ], - "commit": "1a1710b19de57c6f68ebe599a6a22de2392e6018", - "sha256": "0v006kvgmy1m4fpkg15pa1pdf1c2xwn4vbr952jrk1z24sfyljdy" + "commit": "32461877b77f61ed8926b1f12641cbe7ea7af713", + "sha256": "0kyg8j3f94n2f2qfsgdijyqmaxp0hq9mzj9ss3dm5kg4skgdq8pk" } }, { @@ -88813,6 +88864,21 @@ "sha256": "012lv7hrwlhvins81vw3yjkhdwbpi6g1dx55i101qyrpzv5ifngm" } }, + { + "ename": "puni", + "commit": "546f7f793fb95657f67a61070b20e11d73342dad", + "sha256": "05h7hjl5sfj6ki7ndpz1mh0hsc7l86vaskmp8r1l5xxnq5sig0cd", + "fetcher": "github", + "repo": "AmaiKinono/puni", + "unstable": { + "version": [ + 20210824, + 1555 + ], + "commit": "3a3272c881945f0dfb4467f7f053d0853f612186", + "sha256": "1m2z4sif8558qyjzp33kfbjr1laz3nh79qbpzbnykk0j73q5zb9z" + } + }, { "ename": "punpun-theme", "commit": "20b2cc78b41a26e434b984943681fea774fd3c50", @@ -89264,8 +89330,8 @@ "repo": "dwcoates/pygn-mode", "unstable": { "version": [ - 20210824, - 1323 + 20210828, + 1848 ], "deps": [ "ivy", @@ -89274,8 +89340,8 @@ "tree-sitter-langs", "uci-mode" ], - "commit": "f3d6b5c6c8f74d7c54808759f71ff26c91c0b7e6", - "sha256": "1v5gisi22d2syb5vd9plydncjlz3hqyx9fhzamxjcmpybdzss80m" + "commit": "bbc532a85b7a5555cbf1f0b4cd91214cf9fa6751", + "sha256": "01c52vl8ynlj6awlqja461q75hz9d87l84phgdfsfngs6grvayzf" }, "stable": { "version": [ @@ -89391,14 +89457,14 @@ "repo": "tumashu/pyim-wbdict", "unstable": { "version": [ - 20210719, - 38 + 20210902, + 1714 ], "deps": [ "pyim" ], - "commit": "4812f93ee00196b8fee9f434aa5cd77fabcf90d1", - "sha256": "1wvzgyf3mq3wy0sdnx5jhscr5x28pgbvw8dmfyn18741xnsn26fb" + "commit": "4db1ca7fee75bd3aa394d620e5af2f42b3caf3c4", + "sha256": "141rzf15334r4sdqy791n3kspad8jcz4iig55mvcqabii4bqx9p1" }, "stable": { "version": [ @@ -89470,8 +89536,8 @@ 20210411, 1931 ], - "commit": "23488352bc0dbdfa519abb527af3d676244b7106", - "sha256": "0gfig5fnmsvqbfcxd973v31zhvrdldma9grxliy83p7jzphs5kgp" + "commit": "97f7933d9838853cfff901db37545b9b8478296e", + "sha256": "1zjp3h8k6a16b03zn7k1s0lar83ps9ndqqsgbnsn06h29gfzl3h6" }, "stable": { "version": [ @@ -90210,11 +90276,11 @@ "repo": "emacsorphanage/quickrun", "unstable": { "version": [ - 20210330, - 654 + 20210904, + 1553 ], - "commit": "35e91f4b6cfbb8dd2adea4d8cf53ae76db7d00d9", - "sha256": "15xlcnimaaqgchjcs5jv8g3l36fga7zp11fj901x9nziwwis4jx1" + "commit": "78317951cd3db986d811de616b7035559831749b", + "sha256": "0z7zpsmhfhnzvf1vqpsj5wsnlxmyxgc1z6599xsbvl30fw589y1r" }, "stable": { "version": [ @@ -90372,15 +90438,15 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20210727, - 1545 + 20210831, + 2045 ], "deps": [ "faceup", "pos-tip" ], - "commit": "ef9a3fed943495ec2b0c8258f8e00307d6434b17", - "sha256": "0rkhkhpjpnp4h3c60ms9637737sfz6nfjlvlgvw0wfa51bvmzimd" + "commit": "a879a8d67b062c9aa0c6e60602eedba80a2069c5", + "sha256": "1cf104yb8qbq6dwjk0kplz2snpb565mnpirjdsrhi0hrndd6ryh9" } }, { @@ -90955,21 +91021,6 @@ "sha256": "0ky81w36dn6c69x4v4b46j8ixqqws9dc8adi4q19149xkiijx1kl" } }, - { - "ename": "rdp", - "commit": "e2dd8ef80d344c9801f7d0a26b0e3ea33a53bf89", - "sha256": "0lj3idwv4fxz8pi8mnxkbhwhzaa1gs6ib4nzly3fc6yiix9ampkz", - "fetcher": "github", - "repo": "skeeto/rdp", - "unstable": { - "version": [ - 20120929, - 154 - ], - "commit": "b620192afada04aec33b38cc130fef0765f41ca9", - "sha256": "08l96bhghmnckar4i6afj9csqglasmpmby1r7j38ic9bp37z2yqd" - } - }, { "ename": "rdxmk", "commit": "db54339795e0519f154328e54d47a7a0c80afc71", @@ -91409,19 +91460,19 @@ "repo": "nickdrozd/reazon", "unstable": { "version": [ - 20210815, - 1519 + 20210831, + 1208 ], - "commit": "1bfce512612eb679d06356b5c070e6f8743fd0dc", - "sha256": "1059dqsj19k7yb2lw2vy1s6pdhbl0l4vmsfd2lscwsa6kw42kjp0" + "commit": "d697c0dfe38ac7483e453e8ce8056acf95c89ba2", + "sha256": "12s2h4wd7cz9x078698wwjjpy874rk8cm2d17p6ksb10y3cmrqsn" }, "stable": { "version": [ 0, - 3 + 4 ], - "commit": "020be6467a83957adcbdcb192b61f2c76a94079b", - "sha256": "18la2g0srybr10vm1dajgbxi67j1l0cs08mr696hxb6m558yxdv5" + "commit": "d697c0dfe38ac7483e453e8ce8056acf95c89ba2", + "sha256": "12s2h4wd7cz9x078698wwjjpy874rk8cm2d17p6ksb10y3cmrqsn" } }, { @@ -91856,11 +91907,11 @@ "repo": "purcell/emacs-reformatter", "unstable": { "version": [ - 20210510, - 522 + 20210831, + 1405 ], - "commit": "e02a9ea94287f4195edeeab3033e017a56872f5b", - "sha256": "1dlm24gjplfdx3cv2j6jslwgfryh0mvcyccljrwq8rzw8svgs8ac" + "commit": "b57f5d480003ab7b0880e0059dcc51747fb2e088", + "sha256": "16ajp4p26aaswxcxpqgh43p3dk699gab1xc3l3aj7x1sjf3ag3zq" }, "stable": { "version": [ @@ -92450,11 +92501,11 @@ "repo": "jjlee/rescript-mode", "unstable": { "version": [ - 20210506, - 2101 + 20210902, + 2140 ], - "commit": "964a62f907bf786cec6a60719d17244b2958ac62", - "sha256": "16r1bp6dv6s1k8pkxpf1wpk2rh7qd059z97naik60qa26rdwpa4w" + "commit": "b9a151168aa5feeedc823640e4d3863e03eef8cc", + "sha256": "11pn3c61lj3n4nf6h21kmp5j5qs9jfn1s45pnn4i8mc7m1kdznw6" } }, { @@ -93999,8 +94050,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20210805, - 1755 + 20210830, + 1944 ], "deps": [ "dash", @@ -94013,8 +94064,8 @@ "spinner", "xterm-color" ], - "commit": "1941f52d34e7e4752e1e465e5636b21ef7ad42b9", - "sha256": "16vis13axbk9d4pnr7588wx527hsr6kcbjxnppc23wpd54j7sgh2" + "commit": "804ebfe0295a6bf37870e06f84a8d35f55c9f1a6", + "sha256": "0ya7l8yfbax74lrwvcr3lxaffb238m3yk8y37msvsk1pvwcjfkr7" } }, { @@ -94503,8 +94554,8 @@ 20200830, 301 ], - "commit": "4a02387d997b0b4d20b24e9a17a68270692219ad", - "sha256": "1k2382v1srcx7qc4rqxghqd87lx7c6jrls7wxgqq1warvklxfx87" + "commit": "f673cf6ab9d13e376d5c71230a693a6b88730e76", + "sha256": "0paflmwafmhk2lcsh74vixids7xkmgacnzn0pm1i7jhkp3a4mn1d" } }, { @@ -95003,11 +95054,20 @@ "repo": "t-e-r-m/sculpture-themes", "unstable": { "version": [ - 20210530, - 624 + 20210828, + 1634 ], - "commit": "1da2b3501f3732b4a58d28b502e356226a43a96f", - "sha256": "198rjkyv876h7mbs73h8dq4lx5xhl66p7xrpvb23v0vk4vw0q5vz" + "commit": "cce59d2bcc48d622f3978c583108cf853f21789c", + "sha256": "0f8aqq026j0wxkgs0p3yjq3r1jd30lk79199wrdk58x9120pp6z6" + }, + "stable": { + "version": [ + 1, + 2, + 2 + ], + "commit": "57fb0022daf5ca753dc77ee9178267c710c318db", + "sha256": "01xw04v22dh60w49i8h72wa2hvhwpqgriv0chy90m8vmn2fz40wz" } }, { @@ -95530,15 +95590,15 @@ "repo": "twlz0ne/separedit.el", "unstable": { "version": [ - 20210630, - 1805 + 20210823, + 321 ], "deps": [ "dash", "edit-indirect" ], - "commit": "4fbbd85c0f809593f6d26edf1388ff059f77e82f", - "sha256": "0jyz0cz1c6bimkd48iv09lgmzgbb63v5dybcgrjcmcg630c8yh87" + "commit": "721ff6abea500d11a23d9c70c522c5010b1939aa", + "sha256": "0fd8dibzzdp07ljw0qp0z6qflf67bs11ain2h1kv2qsz0scbsc3x" }, "stable": { "version": [ @@ -95735,11 +95795,11 @@ "repo": "vspinu/sesman", "unstable": { "version": [ - 20190909, - 1754 + 20210901, + 1134 ], - "commit": "edee869c209c016e5f0c5cbb8abb9f3ccd2d1e05", - "sha256": "16d4kkfmrzc4d0smk9m759mv11bvicixrvwh1za7c6avscg9lym2" + "commit": "e0f555f963c9f02f8e4a50e06fc353eb4c15ee77", + "sha256": "1xczx6yavpqjx6sjhfnaw7ls5rh54zq8m7y4jidgx4rdz8y28b0a" }, "stable": { "version": [ @@ -95783,14 +95843,14 @@ "url": "https://codeberg.org/FelipeLema/session-async.el.git", "unstable": { "version": [ - 20210817, - 2218 + 20210902, + 1533 ], "deps": [ "jsonrpc" ], - "commit": "e2ff39bdd60da67214d07900582b1049f74d03fc", - "sha256": "0b05smmgcxn5144wcsxlhi4bpliv9ffk21m02fh3l32mc5h24b30" + "commit": "32a36841fbb3c864776a3a1ac08bb94d44ca10b3", + "sha256": "1r5b05dvyayj1165w5n7vshkgh3nvfga6xv61bdpvrfpy2xs6y6b" } }, { @@ -96385,8 +96445,8 @@ 20210825, 707 ], - "commit": "d7166799bd93cf90f77cb9e4c59cb691bb3a1b8c", - "sha256": "1ins9lykfycv5nrm4lz66cfm2ny6mc338pblyw6jbxmnx7q300xv" + "commit": "ef34cf7f806a726a53fcffa183280a325defbc54", + "sha256": "0mga7i1n0s4m2iqqyw7lg0qcdhcfvvfrg3rwqgds3ssmvf096lz6" } }, { @@ -96572,15 +96632,15 @@ "repo": "chenyanming/shrface", "unstable": { "version": [ - 20210506, - 358 + 20210829, + 1013 ], "deps": [ "language-detection", "org" ], - "commit": "935cfc793c7380732915c88302c06271d9fc5cee", - "sha256": "0i4qsz59598cd707fm7cjqvczwa6fmgi6fjyknn2wm58hh3yjldi" + "commit": "b8a23e097b25d6c7754f9aaf4de89259f8a0b17d", + "sha256": "0krd112xglcvkgjl0dj6z4h9gwzh99avh10hlp4idcsm8b7hgdc9" }, "stable": { "version": [ @@ -96827,6 +96887,21 @@ "sha256": "0jsfa5dfs0kl9c7pjxi1niq1mknsxnqm9gs18l0lb9ipbzb949sr" } }, + { + "ename": "sidecar-locals", + "commit": "223bf20a37b48516b6ec9886c67660151ab37da6", + "sha256": "1lw4s749ril3mfbjdvns2myd5d8jf5dhzyywmk18bp7wb5cnmjbg", + "fetcher": "gitlab", + "repo": "ideasman42/emacs-sidecar-locals", + "unstable": { + "version": [ + 20210829, + 2323 + ], + "commit": "bc41cab4b1765e48096006465c95f62f66fcaf2b", + "sha256": "18i7c0knhl8gvwr1hhlnnfl08sh9h48f7vl31cw8jrx817kzgf2y" + } + }, { "ename": "sift", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -97240,11 +97315,11 @@ "repo": "dawranliou/sketch-themes", "unstable": { "version": [ - 20210719, - 2212 + 20210826, + 1816 ], - "commit": "8c4b4ef49fbb059ad00ab9fb76f22c2cdd780e7c", - "sha256": "0lvjdcsx3gvg7lk22l5c8jmdqk9s38figlr5zcbbk7fgjpf4q0p2" + "commit": "50fd9fe9caf24f42dc481560e1f41addc3a06dbb", + "sha256": "0j26a9q271cd8b6vcxs6iyn3a3xz210lgyszxb39715x8lvwhvvy" }, "stable": { "version": [ @@ -98207,15 +98282,15 @@ "repo": "Fuco1/smartparens", "unstable": { "version": [ - 20210817, - 1912 + 20210904, + 1621 ], "deps": [ "cl-lib", "dash" ], - "commit": "22794b5b3773504610127c5f011629402dfec20c", - "sha256": "14b65bfsh4fglm65cvzgp412na8ykqkcwaqg84hvw6j6lqrvpg6v" + "commit": "2834c66c4f09778d0c57e99886c329188eed591a", + "sha256": "0zy5jamid6qkx8rml9ccqv85f2sr10j1rp3j77acggkf6zf3c096" }, "stable": { "version": [ @@ -98719,15 +98794,15 @@ "repo": "SpringHan/sniem", "unstable": { "version": [ - 20210825, - 1510 + 20210826, + 832 ], "deps": [ "dash", "s" ], - "commit": "212e7c1492a9d208ece2a85e64bd352e9cd53c89", - "sha256": "13afcxy5vs38xzx2mi5xpszwiabyc5hiwq1r9vy6jx6pgsb7pkhc" + "commit": "4d921b6e9c98fa208578b2b409e627580d1ab8c2", + "sha256": "0bh9brzqsvm6dj961smp4592bgjrhhq600qbqbgps8rnbbcjnl3r" } }, { @@ -98933,11 +99008,11 @@ "repo": "bbatsov/solarized-emacs", "unstable": { "version": [ - 20210823, - 609 + 20210827, + 859 ], - "commit": "48158887c0a605b7cc1ffdbeb937f182b299f4db", - "sha256": "1l9ylidix4l8979d4wzvd9fpsxvjxb6nii09s1g90rsli4av8ps2" + "commit": "874694ed8569ae98959262cfb0c66a6528a60367", + "sha256": "1j6728229rrpamh4nn2v5mmlbb111i6ar7zh0g9d922k7vqr2nam" }, "stable": { "version": [ @@ -100333,11 +100408,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20210825, - 1823 + 20210902, + 626 ], - "commit": "a6bbe36afa229b88aa5b406b9ef6e6393d9b2d5d", - "sha256": "102fhdhr3xa9jvdl5i715p07x0lgd3wxkhkh3li91p7gncxhrvyd" + "commit": "021239f0e2bcc60257b72916db9cdd110588ec28", + "sha256": "0v79z2d9l824j6chsviffdsfb4m9w93kgwcwdaksdb5rsfmryigp" }, "stable": { "version": [ @@ -100617,8 +100692,8 @@ 20210810, 1814 ], - "commit": "c78a04c5cf00320c0e1e6646295e20425537bf9e", - "sha256": "01ifxzzrn31d1gaq7yr88dciwylhy5q6lz4kvwkq6smqmvp3x80w" + "commit": "aa5bac257ebefd91f4b5dd787a835407bddd6fb2", + "sha256": "1zpvbsrmcz9zhlchfsbsfbi3g9z1wxhkhbpg2zp2dpk4czqy76lk" } }, { @@ -100761,8 +100836,8 @@ 20200606, 1308 ], - "commit": "c9761ab0439ed1430b635c97cbf7fae7d3019a15", - "sha256": "07g40r27s7qv68qzrplsvjdkrli7jibmak1a7fnbhsgngq9q9ily" + "commit": "ed1651792509ddbd1e139a884d26e6cd818160cb", + "sha256": "1kk5f1i3dl86svvnl845ya2vgc0xhhfp1lgns2bl6glpf5qy8bxb" }, "stable": { "version": [ @@ -100871,11 +100946,26 @@ } }, { - "ename": "streamlink", - "commit": "e6674aefa0082fc5754c888538e447037f3618f8", - "sha256": "17r4dkpap72yz62nk9pr3l48qgpm5hidffmdfnbx7bwl07wzk6cb", + "ename": "streak", + "commit": "deb209280c77f135fc2f2544c35220160c516f72", + "sha256": "0941kfch25qn2579zjbcrhp6s92p3sh447hzswa53w8yz95hgjy5", "fetcher": "github", - "repo": "benediktbroich/streamlink", + "repo": "fosskers/streak", + "unstable": { + "version": [ + 20210901, + 1646 + ], + "commit": "ac05a0d74ceaccff15f1f7128fbb976be53db549", + "sha256": "0wffyf382d2mgs4asfbljvlzz3sr1mrs0analkj1ywqblv0z8xhh" + } + }, + { + "ename": "streamlink", + "commit": "9d776fb6dfb17d55235b6d7fefed894756fde794", + "sha256": "1zz05mhp48i3q3ai0925b7sbrriyfqrr73bngiargydx3753kizv", + "fetcher": "github", + "repo": "BenediktBroich/streamlink", "unstable": { "version": [ 20210811, @@ -101251,14 +101341,26 @@ "url": "https://git.sr.ht/~amk/subsonic.el", "unstable": { "version": [ - 20210808, - 1328 + 20210902, + 2047 ], "deps": [ "transient" ], - "commit": "42c2e0b5b81c78741c069c8cfdb9e5d494157dc8", - "sha256": "08q6sccdkad4y3vv9h8bxkdn66dc4b2wxzhf7z87i70v7bw1xnwa" + "commit": "5740a2b96c827c499f3ac506f98ec5f9ed31ea37", + "sha256": "0qr96a86zj6kipix6p831hj0nkcyj3kvaggyy2zsmvhx7wjavadf" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "deps": [ + "transient" + ], + "commit": "5740a2b96c827c499f3ac506f98ec5f9ed31ea37", + "sha256": "0qr96a86zj6kipix6p831hj0nkcyj3kvaggyy2zsmvhx7wjavadf" } }, { @@ -101892,8 +101994,8 @@ "deps": [ "ivy" ], - "commit": "7cdde66c95d5205287e88010bc7a3a978c931db0", - "sha256": "0pvgh4krym43vcyiq4bsjl63gg795jlqh6kaa6llsv1awvywfqww" + "commit": "6a8e5611f32cf7cc77c2c6974dc2d3a18f32d5a5", + "sha256": "0mwrvcnpl7cr8ynhx8ilmlbjqmggxccwa6w8k15j5i640chl19xh" }, "stable": { "version": [ @@ -102153,14 +102255,14 @@ "repo": "wolray/symbol-overlay", "unstable": { "version": [ - 20210422, - 2110 + 20210906, + 614 ], "deps": [ "seq" ], - "commit": "4231a36e39b7393d639e9cdef19f311d780deeab", - "sha256": "0q2x39s3g5kmjf5q47qpqcnzdscnj112dfd7qqb2z0iq0sh2nbrd" + "commit": "8629a4ddbe95d42c39ce817d724877deb1984ba1", + "sha256": "1g8zi7qky5vfrl2c2wvdcr0mrm8xkkxl3cbhrkh95bhq1vypz5p8" }, "stable": { "version": [ @@ -102223,8 +102325,8 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20210820, - 2202 + 20210829, + 2036 ], "deps": [ "evil", @@ -102236,8 +102338,8 @@ "seq", "undo-tree" ], - "commit": "4561214b453e551253e9a273ef57c84c12c7cd8b", - "sha256": "1adzvdp54l1d6awcbfrbqx41kh40lqk5009h1gpj315l3zq3vhpx" + "commit": "cd80cfbff832b64de65fc4ecb50a53956dac760f", + "sha256": "1nh6fncm46lml9df9vlj3s21qxai43fgsvl3b8mzr7rp3c0f40l5" }, "stable": { "version": [ @@ -102470,16 +102572,16 @@ "repo": "vapniks/syslog-mode", "unstable": { "version": [ - 20210825, - 116 + 20210906, + 1438 ], "deps": [ "hide-lines", "hsluv", "ov" ], - "commit": "7773a8488db88424e5e86cf4268c9bbe0b94085a", - "sha256": "0cph14cc3dzv3dp8aq6ifs3m92rq8jr4b2rpdjgc8pbcjrs9hvyb" + "commit": "f0d25da654d0666c6084fcb0d075326e13ec06c0", + "sha256": "1baa9n85vq77xha89j09n32zmwppgrwxg3z30vrbbjqaiwlb6nr3" }, "stable": { "version": [ @@ -102912,8 +103014,8 @@ 20210415, 1322 ], - "commit": "daf9920a8ecb230045f4b07834b3a6f45676f1ce", - "sha256": "0lh90x5hqxm3pyqiy4qb10nxs5ga7w4hc7k6xkax41yhi41bgd58" + "commit": "5eacb6c1c879038c4448c10b3df9a73d95a48fc3", + "sha256": "0k7y7lxdgj73mmrs228l7m9b9fdzjjw8knqzwhkvqb5bb93ii6fm" }, "stable": { "version": [ @@ -103100,15 +103202,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20210825, - 2144 + 20210903, + 2313 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "08d652fd85fdb799e5b68caddc64bbbdcb08205b", - "sha256": "1f5vhxw34qbgxc99zz7m3lml18xw59qdrgdfmxa79nxfrqczabcd" + "commit": "5450160db7ab7661ec2519d53bb26429ea90a1fe", + "sha256": "1yzqlnw1vmbk2dn790ljirp253k4h5j12r0pm2zpp4iachl1z2kw" }, "stable": { "version": [ @@ -103239,11 +103341,11 @@ "repo": "clarete/templatel", "unstable": { "version": [ - 20210802, - 249 + 20210902, + 228 ], - "commit": "23c9bce8c1e3866e7cdbe9a69777648e13707357", - "sha256": "0rn8d0zn3dlqfvr5m5v687bw96mnv02v6ngq5jvljgykyawh3h58" + "commit": "e1ccb88cdc4b482b078276960f810b82ba3b7847", + "sha256": "0wy53y7p6i0m9az0ca4zqrqfq40cgn202pilsawdy8rlpj9y619p" }, "stable": { "version": [ @@ -104048,14 +104150,14 @@ "repo": "myTerminal/theme-looper", "unstable": { "version": [ - 20210727, - 249 + 20210827, + 424 ], "deps": [ "cl-lib" ], - "commit": "32ca76dfa8100a2069ca735e28e19ae87c74f956", - "sha256": "184n2r33d99wmzrnscpl0rqqivmvm17k60gfbrw5yjppq5fl55m3" + "commit": "e6e8efd740df0b68db89805ba72492818dba61ab", + "sha256": "1cy1s9iyv2c4c2kld42aricar4s5d0irdhsqb8rsbbriif50vpvd" }, "stable": { "version": [ @@ -104191,18 +104293,18 @@ 20200212, 1903 ], - "commit": "876f7c33782aaac147e88d9063fd286f7a8a46e1", - "sha256": "1b2kfqkr9ss9lb5133zpp8sz9w7c77mydv1lvb56fi03lms94a5r" + "commit": "3569010b61baefb4324d4b28f1ae60799283a4b5", + "sha256": "10y5h8qfcbgxnihnm61ab9xs74128jni5gha9k3m7afa5wg8j84b" }, "stable": { "version": [ 2021, 8, - 23, + 30, 0 ], - "commit": "a70658fff6a7cc01e323dd7a4a5b7305906796cc", - "sha256": "04r195apvbp4b0nk4j45pxhyl5dl6hr7x35zji548v0q8dgiv5lm" + "commit": "9dabbd58640cfe95ddb7f30d497693f4ba6d9f01", + "sha256": "0mw7vhs78m0zk7mz8icd6zr4bzsjn82jcdgrb13bw76xw6i88161" } }, { @@ -104258,8 +104360,8 @@ "deps": [ "haskell-mode" ], - "commit": "7142775c2039cae4cde9bdd6f68b3e0cbae2de9d", - "sha256": "02913lhc08kwx4m0x6hm40bg1yym449y160bndmpfv4n19d92z44" + "commit": "638a1079a0ba8cd757bc74f99a58d5724b3314f5", + "sha256": "1ki0i9f1fvvhkac1ivd7smg5c3vnbdrfyxr6v9q4fms4mczj4jc9" }, "stable": { "version": [ @@ -104507,11 +104609,11 @@ "repo": "aimebertrand/timu-spacegrey-theme", "unstable": { "version": [ - 20210819, + 20210828, 2241 ], - "commit": "facb4da1a2ee333a3c66f56009c8dec8e9652dab", - "sha256": "0wpam6kjg53j00g4k4ar0zhf0v0nbpp00klk0cbpv06yr4lvswpc" + "commit": "07fa0c6287612693a4d9b571d6a9a72e498e41c2", + "sha256": "0fswhfn0qjpb94dlbl3rivgkbz3vdly4hk5hgl017zgj3nfb06vn" }, "stable": { "version": [ @@ -104717,16 +104819,16 @@ "repo": "abrochard/emacs-todoist", "unstable": { "version": [ - 20200517, - 1825 + 20210905, + 2024 ], "deps": [ "dash", "org", "transient" ], - "commit": "b3f003603111b7e31b94c354cf4c83c8208c01c3", - "sha256": "0srk3chc45fl6zjwymzqwmxm22w9pcjxg7968c7fkvbqr21wk6p7" + "commit": "cd934e50d6a226c8718957877aedc4d2d947ac59", + "sha256": "12v9alrkvzwihkldn2wbn3xc3yc408kmp155j9pn9vjy53fypvg1" } }, { @@ -104930,6 +105032,21 @@ "sha256": "05pg1qddsl0m4r73smrxpcvyiwa18d9jl6i8nfanlydwmmjqblb9" } }, + { + "ename": "topsy", + "commit": "89d455ee48c4567e098bb733396fa2729bec58c6", + "sha256": "0nxgfixly4rnvn83kz8lgc7pjdvzhm0px2w711zkx9rp55d5g86z", + "fetcher": "github", + "repo": "alphapapa/topsy.el", + "unstable": { + "version": [ + 20210831, + 133 + ], + "commit": "8ae0976dfdbe4461c33ed44cf1dedc2c903b0bb0", + "sha256": "032i1prl2v5w4l37zjlqam7063s56nk61nj5l3ypmxp98yz9nrq8" + } + }, { "ename": "tornado-template-mode", "commit": "f329baae028fd17618824128f312a49aa0a0807e", @@ -105511,14 +105628,14 @@ "repo": "emacs-tree-sitter/elisp-tree-sitter", "unstable": { "version": [ - 20210811, - 1609 + 20210904, + 216 ], "deps": [ "tsc" ], - "commit": "a0f259c024fa15587d225e1d5440d71109d7e3f3", - "sha256": "1x2p7x7f71kxvayvlg418vr6pa36044fla58saknb9p651hy9rjh" + "commit": "dbab35d5fc2fd5cb6ba08f31478446706e65282f", + "sha256": "0jv31399968ig4yys4jvkjzpkj1kszskil9aiba6hc0p6sips91f" }, "stable": { "version": [ @@ -105572,14 +105689,14 @@ "repo": "emacs-tree-sitter/tree-sitter-langs", "unstable": { "version": [ - 20210825, - 1205 + 20210831, + 1555 ], "deps": [ "tree-sitter" ], - "commit": "81adcdc06a9700ecf9659171da275b1c9dcfdfb6", - "sha256": "0k067rkzdnxs5h5yf5l7pppbnwc0x6c41d97kygi1z03124s77s6" + "commit": "ef42920bb573b40e64b35e43968dac355f87e959", + "sha256": "03257nqxz11g4qivmq2h7gs98ssrmpvdyaghrfxpaizagbk7clmd" }, "stable": { "version": [ @@ -105638,8 +105755,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210823, - 1524 + 20210906, + 1653 ], "deps": [ "ace-window", @@ -105651,8 +105768,8 @@ "pfuture", "s" ], - "commit": "f30a2151aec195026bd55affc05259b629fd9006", - "sha256": "0qndkwfnqjdkddhrs0gzn9rg2a7fwwrrnya0iz2hjvxpmcdxr37c" + "commit": "90088cee342fe3418b4b6435094e51ff78f37efc", + "sha256": "09h9ryxb840nbw6ph8wiak4ila5h5whm5sh1fj56fzh164vp7ih4" }, "stable": { "version": [ @@ -105688,8 +105805,8 @@ "all-the-icons", "treemacs" ], - "commit": "f30a2151aec195026bd55affc05259b629fd9006", - "sha256": "0qndkwfnqjdkddhrs0gzn9rg2a7fwwrrnya0iz2hjvxpmcdxr37c" + "commit": "90088cee342fe3418b4b6435094e51ff78f37efc", + "sha256": "09h9ryxb840nbw6ph8wiak4ila5h5whm5sh1fj56fzh164vp7ih4" } }, { @@ -105707,8 +105824,8 @@ "evil", "treemacs" ], - "commit": "f30a2151aec195026bd55affc05259b629fd9006", - "sha256": "0qndkwfnqjdkddhrs0gzn9rg2a7fwwrrnya0iz2hjvxpmcdxr37c" + "commit": "90088cee342fe3418b4b6435094e51ff78f37efc", + "sha256": "09h9ryxb840nbw6ph8wiak4ila5h5whm5sh1fj56fzh164vp7ih4" }, "stable": { "version": [ @@ -105737,8 +105854,8 @@ "deps": [ "treemacs" ], - "commit": "f30a2151aec195026bd55affc05259b629fd9006", - "sha256": "0qndkwfnqjdkddhrs0gzn9rg2a7fwwrrnya0iz2hjvxpmcdxr37c" + "commit": "90088cee342fe3418b4b6435094e51ff78f37efc", + "sha256": "09h9ryxb840nbw6ph8wiak4ila5h5whm5sh1fj56fzh164vp7ih4" }, "stable": { "version": [ @@ -105761,16 +105878,16 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210107, - 1251 + 20210906, + 1653 ], "deps": [ "magit", "pfuture", "treemacs" ], - "commit": "f30a2151aec195026bd55affc05259b629fd9006", - "sha256": "0qndkwfnqjdkddhrs0gzn9rg2a7fwwrrnya0iz2hjvxpmcdxr37c" + "commit": "90088cee342fe3418b4b6435094e51ff78f37efc", + "sha256": "09h9ryxb840nbw6ph8wiak4ila5h5whm5sh1fj56fzh164vp7ih4" }, "stable": { "version": [ @@ -105802,8 +105919,8 @@ "persp-mode", "treemacs" ], - "commit": "f30a2151aec195026bd55affc05259b629fd9006", - "sha256": "0qndkwfnqjdkddhrs0gzn9rg2a7fwwrrnya0iz2hjvxpmcdxr37c" + "commit": "90088cee342fe3418b4b6435094e51ff78f37efc", + "sha256": "09h9ryxb840nbw6ph8wiak4ila5h5whm5sh1fj56fzh164vp7ih4" }, "stable": { "version": [ @@ -105835,8 +105952,8 @@ "perspective", "treemacs" ], - "commit": "f30a2151aec195026bd55affc05259b629fd9006", - "sha256": "0qndkwfnqjdkddhrs0gzn9rg2a7fwwrrnya0iz2hjvxpmcdxr37c" + "commit": "90088cee342fe3418b4b6435094e51ff78f37efc", + "sha256": "09h9ryxb840nbw6ph8wiak4ila5h5whm5sh1fj56fzh164vp7ih4" } }, { @@ -105854,8 +105971,8 @@ "projectile", "treemacs" ], - "commit": "f30a2151aec195026bd55affc05259b629fd9006", - "sha256": "0qndkwfnqjdkddhrs0gzn9rg2a7fwwrrnya0iz2hjvxpmcdxr37c" + "commit": "90088cee342fe3418b4b6435094e51ff78f37efc", + "sha256": "09h9ryxb840nbw6ph8wiak4ila5h5whm5sh1fj56fzh164vp7ih4" }, "stable": { "version": [ @@ -106113,8 +106230,8 @@ 20210825, 1402 ], - "commit": "a0f259c024fa15587d225e1d5440d71109d7e3f3", - "sha256": "1x2p7x7f71kxvayvlg418vr6pa36044fla58saknb9p651hy9rjh" + "commit": "dbab35d5fc2fd5cb6ba08f31478446706e65282f", + "sha256": "0jv31399968ig4yys4jvkjzpkj1kszskil9aiba6hc0p6sips91f" }, "stable": { "version": [ @@ -106193,14 +106310,14 @@ "repo": "ocaml/tuareg", "unstable": { "version": [ - 20210825, - 1946 + 20210904, + 917 ], "deps": [ "caml" ], - "commit": "d2b38f0249e3db467e9708985571f06ae191edbb", - "sha256": "1gaind3zfj1adl6dhk5yrx2fajqhxb8ch38vk66077s81qqzzw7k" + "commit": "eb0bff8d7bdf229322aa28ff0a8f44ba5e162202", + "sha256": "1y2dpc2hndqwk8gc6lp6f1c4px3kak514hk120sjxpb3133g3ivf" }, "stable": { "version": [ @@ -106457,19 +106574,19 @@ "repo": "emacs-typescript/typescript.el", "unstable": { "version": [ - 20201002, - 1109 + 20210830, + 1858 ], - "commit": "b369d7d2518fa11760ac3908a383405350cd51d2", - "sha256": "186bpvqxx87kp3857mq0mzn1ddsvzmpijix810k6bdz8522x7zdw" + "commit": "2a58631230fe2d176352af262a0efdecc21f90ac", + "sha256": "0fjgw71sgyrygzk9s6hfrqky06lqfwzz75bjxkxhb7yl5mdj8ccv" }, "stable": { "version": [ 0, - 3 + 4 ], - "commit": "7a5c74d88e3c5513cc4431a837003736f905a75e", - "sha256": "002f1xfhq43fjaqliwrgxspryfahpa82va5dw3p8kwil2xwvc6mh" + "commit": "b369d7d2518fa11760ac3908a383405350cd51d2", + "sha256": "186bpvqxx87kp3857mq0mzn1ddsvzmpijix810k6bdz8522x7zdw" } }, { @@ -109336,11 +109453,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20210824, - 1453 + 20210905, + 903 ], - "commit": "9e5a208d8871293a23a2734591fac97a584a41c2", - "sha256": "13r9zxivgml610d0hk9cagpyv982596knad6jwq48cpncckwxrvl" + "commit": "db9f47f62391e9ac02fff6f0c63528bd8e5658de", + "sha256": "19fvxyqcrhim6p06krsh4zaqkl49vcdpkd6i9xqldsmm4lzmcqj8" } }, { @@ -109351,14 +109468,14 @@ "repo": "jixiuf/vterm-toggle", "unstable": { "version": [ - 20210629, - 927 + 20210902, + 828 ], "deps": [ "vterm" ], - "commit": "2258eb19e8bde75f79505c4306f3476bcedce56c", - "sha256": "0k5hmn2wnag6hirnk2ch3xviymbxha5pcb3p1j1lj2likbhwizw8" + "commit": "ea0bfeaa200d9ed02b51bbbd83222657b02637e7", + "sha256": "0bwgzpf2wyzdj9smwys06zx4yha72pw50wzdh4zld45ph40pb6qw" } }, { @@ -109572,11 +109689,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20210817, - 327 + 20210906, + 347 ], - "commit": "d7166799bd93cf90f77cb9e4c59cb691bb3a1b8c", - "sha256": "1ins9lykfycv5nrm4lz66cfm2ny6mc338pblyw6jbxmnx7q300xv" + "commit": "ef34cf7f806a726a53fcffa183280a325defbc54", + "sha256": "0mga7i1n0s4m2iqqyw7lg0qcdhcfvvfrg3rwqgds3ssmvf096lz6" } }, { @@ -109664,11 +109781,11 @@ "repo": "darkstego/wakib-keys", "unstable": { "version": [ - 20201001, - 1448 + 20210903, + 1619 ], - "commit": "b803fcaef31539e070a08202b9039bbeb29e8f66", - "sha256": "1bjl9h8p63334dxbbcdz6rmmskslrlbbvakhklzica9al7gr92w5" + "commit": "8fa54f3cf7921e961e46d20e1afc51eec8286003", + "sha256": "196y13zjbp4j1fjsgcaqri9bplzj5445g8i8l4plv4ff9nkyyc2p" } }, { @@ -110043,11 +110160,11 @@ "repo": "fxbois/web-mode", "unstable": { "version": [ - 20210131, - 1758 + 20210902, + 1615 ], - "commit": "8ef47935d638902ba35a557cae5edd6ab6ab1346", - "sha256": "1csskh7wyyjjpn81if2ss29vaz8vqzszb9yg99ffkgkyx2fr57y1" + "commit": "61f057a6baeba6b3595e412ba79b3080dca17dcc", + "sha256": "0qmsczsx867h97yqifn9rv5d3gsy7mgwjl9radbf63wfdd89zgcb" }, "stable": { "version": [ @@ -110220,14 +110337,14 @@ "repo": "emacs-love/weblorg", "unstable": { "version": [ - 20210822, - 1937 + 20210906, + 1254 ], "deps": [ "templatel" ], - "commit": "cc095820669c7c2e77b06a86a887ecec70ae4853", - "sha256": "0ma5shksdha84yf18ay7a6ss4aacjh94827a5wmyv9bc5za5yvq1" + "commit": "e49a901223b9f5db390adf01e3928f134aa66f25", + "sha256": "1h1k54p5sfd5bxqg40w62nprii28g0pjkfy0ayf0vyxsyhdj6d9y" }, "stable": { "version": [ @@ -111653,8 +111770,8 @@ "repo": "abo-abo/worf", "unstable": { "version": [ - 20210809, - 1409 + 20210826, + 1000 ], "deps": [ "ace-link", @@ -111662,8 +111779,8 @@ "swiper", "zoutline" ], - "commit": "e31759db6aae8a951c0843a4c855bccb626348c4", - "sha256": "1aziil5gmiyk0qb89ydc7h72zdyr2n71z3ybrqji9ypx3vrrdwdx" + "commit": "aab516cd0cae65796cce89b29691e95d18bec3ef", + "sha256": "1kiy00r01h05p5i2g0z5kv9dhk3hcbfhjc3gibcx7bspsjsnmn7q" }, "stable": { "version": [ @@ -112082,11 +112199,11 @@ "repo": "xahlee/xah-css-mode", "unstable": { "version": [ - 20210824, - 120 + 20210905, + 1756 ], - "commit": "20737b65529ca185db663e709cca412e8d03cb1e", - "sha256": "0621vah5xm5zz6mhlgjlbqiccpbq4nssckm3wyqmw30mk2zr29mb" + "commit": "b1316dbf6b8b381a6d9149e1b09c645b748cab78", + "sha256": "1jwgw5s1midak6f15d7azvqa48nljmdbn36sjcm39xfq55m9rfj6" } }, { @@ -112097,11 +112214,11 @@ "repo": "xahlee/xah-elisp-mode", "unstable": { "version": [ - 20210824, - 730 + 20210904, + 716 ], - "commit": "4bd7858dadff5c5320f169ebabde379e29bb7559", - "sha256": "0ygqzyc398asczryyr4qz5sljzz0a4l87l1vys32vv49g4z1szih" + "commit": "2c39feb58415d5163e821bf83d0fa2b6d1a235c6", + "sha256": "062mxc8zbhjing13anx3hd4wnj0702r6ppwbj6glbrvvrjx44ly8" } }, { @@ -112112,11 +112229,11 @@ "repo": "xahlee/xah-find", "unstable": { "version": [ - 20210815, - 201 + 20210902, + 518 ], - "commit": "88e390e1f7ccee30cd4d5ac112acdf9b4c72780d", - "sha256": "1rhivz291580s0wn0syqhhaqdv7p3df0a7vk8zmx6485nm1hy4mh" + "commit": "a4cb60fb893b62d39ebeb79e5c322d1192c7cf4b", + "sha256": "051m6697fxkff7jh8nhzxl9dh6vjw75ndgfz1cf743i79gdgj8nk" } }, { @@ -112127,11 +112244,11 @@ "repo": "xahlee/xah-fly-keys", "unstable": { "version": [ - 20210823, - 302 + 20210828, + 1914 ], - "commit": "c5a510db6aa15de78c809490571a5b2e9d765202", - "sha256": "05xzhrbn3y0wkan6cpk290cvb5gn4gdjkh64s0q466hbybm4lnj5" + "commit": "0258ce1969ea4766a2b1a89d3c091cc96ea7ae16", + "sha256": "1vfnx4p2361pzr3lf4bj09xqbp93g1s7a7fjmgfz4f7agaph77zj" } }, { @@ -112142,11 +112259,11 @@ "repo": "xahlee/xah-get-thing-or-selection", "unstable": { "version": [ - 20210813, - 834 + 20210828, + 1913 ], - "commit": "ba818dc7fd90b49b780709be5266733ede86a556", - "sha256": "15bjib9n7qakdc70x4xdjaw1q1rm9yz8k55l24mfm848fz62bq30" + "commit": "849683fa055afc982af4811f89998281ffe99315", + "sha256": "0zcjb8glb28q1vskyp4mwqpysx1nphyciw8jszfhxqgsbr7nq3fv" } }, { @@ -112157,11 +112274,11 @@ "repo": "xahlee/lookup-word-on-internet", "unstable": { "version": [ - 20210801, - 102 + 20210902, + 519 ], - "commit": "d69eb2b66eff70ef311967bf774195bf3331cfff", - "sha256": "12ssjraw8ymphkiyvzpnmh90k9m2sskvklkjcl2ni7qmjc5774v7" + "commit": "a8ef9b5597ab176015c185a9da435b2d5e5d5b71", + "sha256": "0hsy7y1vdc8warh4h0yanckm5b0jh6kpmwhyh035j7xvkg6lzf4w" } }, { @@ -112172,11 +112289,11 @@ "repo": "xahlee/xah-math-input", "unstable": { "version": [ - 20210815, - 211 + 20210901, + 207 ], - "commit": "1685bb8652c28a32c6d55fe61bbf4b5cb3f3dcca", - "sha256": "11akmsmynrbzadyw502czrvaw0mly06mzlj4zg5adgvy52mpb0ip" + "commit": "e7aefa49d6335cac5c08c7aeb4f4837e2706ae9d", + "sha256": "0rkrz324l0gr1lm4nbwzlfl5cs8xh6dr2hh00shbkjby9fshy8b1" } }, { @@ -112202,11 +112319,11 @@ "repo": "xahlee/xah-replace-pairs", "unstable": { "version": [ - 20210815, - 207 + 20210906, + 1001 ], - "commit": "b5e4f9ebc9e17916e736af9935bf4e17032edde9", - "sha256": "1dy3y27xyprmxymnm43d7vsmsfhdrr1nbbdpvfflqxs9q6hll2xn" + "commit": "2ae97f13ced5a25881c7d7bca1804259403c1f80", + "sha256": "0akyld9fpzw5smgqnqsv7cbqpqah262y2cwpka1di4wdmz8sijdb" } }, { @@ -112522,19 +112639,19 @@ "repo": "ndw/xmlunicode", "unstable": { "version": [ - 20210717, - 1246 + 20210829, + 1631 ], - "commit": "7e4c71c30f0d5214c45d4d4d48b149029ddb6b77", - "sha256": "0gc9fg95ihqz7lkn3vxc0qaslbxbj5jkhm2ddh41c3v9ym79mblp" + "commit": "6e91a39114ae6ec98b26c9670db916a02c721b1f", + "sha256": "07qkp4igbsdxffcm1hlprf0jgvq1mc714q85pbpby5kfir9f2lbd" }, "stable": { "version": [ 1, - 24 + 25 ], - "commit": "7e4c71c30f0d5214c45d4d4d48b149029ddb6b77", - "sha256": "0gc9fg95ihqz7lkn3vxc0qaslbxbj5jkhm2ddh41c3v9ym79mblp" + "commit": "6e91a39114ae6ec98b26c9670db916a02c721b1f", + "sha256": "07qkp4igbsdxffcm1hlprf0jgvq1mc714q85pbpby5kfir9f2lbd" } }, { @@ -113996,6 +114113,36 @@ "sha256": "0y709x03har1sm30vbja3k3vw4p1nfck5zii7cigl4vg0scpcri6" } }, + { + "ename": "zettelkasten", + "commit": "ed12df24029a4154fe55588f3e8ca0670af3f5f3", + "sha256": "07gbkpanzs4rk066gg3nm95mfv3ng1f0si17mv2qax2dfx5k0lzd", + "fetcher": "github", + "repo": "ymherklotz/emacs-zettelkasten", + "unstable": { + "version": [ + 20210830, + 1025 + ], + "deps": [ + "s" + ], + "commit": "748e14b5a0dc2200d10b946d0111bd286e2c1c71", + "sha256": "1s9nhqbw5jxkqsvy40dd80l5wjw1407vk9qmdfiva8hj0ymcigr6" + }, + "stable": { + "version": [ + 0, + 3, + 0 + ], + "deps": [ + "s" + ], + "commit": "dd4feae2111357d99dcde1919c1d72523cc5b68c", + "sha256": "16hqk9hdfmbjmhb6bb0xk6silgx85ji0q1dpncwgida6958rq79r" + } + }, { "ename": "zetz-mode", "commit": "ad2add185cf31a92ca1fcd3a9efcbcdb0aa9e583", @@ -114036,11 +114183,11 @@ "repo": "ziglang/zig-mode", "unstable": { "version": [ - 20210605, - 513 + 20210831, + 719 ], - "commit": "acf3ee8bbf6b7e49dbfaa8bc82a4c1b9b1f2b531", - "sha256": "0wc65hr9y1yvyb5ywswiwhk8jjxswzd0qzr92b7pkfwghmf0z1yp" + "commit": "aba01b6199b7697692e5e9217f602477dd5ebd9b", + "sha256": "1qlvsm4736wr3gw54jvjq3yilf3d7564yydhid4ka1wswvl3sbq3" } }, { @@ -114458,11 +114605,11 @@ "repo": "abo-abo/zoutline", "unstable": { "version": [ - 20190520, - 1819 + 20210901, + 1100 ], - "commit": "63756846f8540b6faf89d885438186e4fe1c7d8a", - "sha256": "1w0zh6vs7klgivq5r030a82mcfg1zwic4x3fimyiqyg5n8p67hyx" + "commit": "3c0b5072a2f19a35d92dde6377ae7c1ac0d3bfe7", + "sha256": "0ickivsq8zn0b50mqfa94c63id3fki94wd1w9br84dbd6kjiy1s7" }, "stable": { "version": [ From 1f369b3fe3f6571c9680054a08ac56b79be4c9aa Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 6 Sep 2021 16:31:14 -0300 Subject: [PATCH 135/167] elpa-packages 2021-09-06 --- .../emacs/elisp-packages/elpa-generated.nix | 111 +++++++++++++++--- 1 file changed, 93 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 31ef6a3e4f03..eb7c52cdd3d4 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -234,10 +234,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "13.0.13"; + version = "13.0.14"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-13.0.13.tar"; - sha256 = "06cb9jphqd0nysc60b4x24zmdryljb168cw66adl7b2x7sdzpkmn"; + url = "https://elpa.gnu.org/packages/auctex-13.0.14.tar"; + sha256 = "1gmqdcg9s6xf8kvzh1j27nbimakd5cy8pwsn0il19l026kxjimr8"; }; packageRequires = [ emacs ]; meta = { @@ -707,6 +707,21 @@ license = lib.licenses.free; }; }) {}; + crdt = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "crdt"; + ename = "crdt"; + version = "0.1.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/crdt-0.1.4.tar"; + sha256 = "1qqfjvkajwhdhz0jhqixdn68l1rl02pn2fmxizzsv0as20v0ay0r"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/crdt.html"; + license = lib.licenses.free; + }; + }) {}; crisp = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "crisp"; @@ -726,10 +741,10 @@ elpaBuild { pname = "csharp-mode"; ename = "csharp-mode"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/csharp-mode-1.0.0.tar"; - sha256 = "0vhm443fkcjsj95r4rs9r0mz9vzfk92883nxhyi35d3jaf112gm1"; + url = "https://elpa.gnu.org/packages/csharp-mode-1.0.2.tar"; + sha256 = "1xddnd6g6qz3xnzl6dmd38qvzvm32acdyhmm27hfdpqcbg6isfad"; }; packageRequires = [ emacs ]; meta = { @@ -786,10 +801,10 @@ elpaBuild { pname = "dash"; ename = "dash"; - version = "2.19.0"; + version = "2.19.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dash-2.19.0.tar"; - sha256 = "0qszjs60xxqjiqf5f2bgmnbx5jiqii4ghcydwg500za0n2j0f5sx"; + url = "https://elpa.gnu.org/packages/dash-2.19.1.tar"; + sha256 = "0c11lm7wpgmqk8zbdcpmyas12ylml5yhp99mj9h1wqqw0p33xaiw"; }; packageRequires = [ emacs ]; meta = { @@ -1026,10 +1041,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.8.2"; + version = "0.8.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.8.2.tar"; - sha256 = "1idwih5v287q9vdhsnr1bsibdv4h61vmy3b82svf2x9aik1a7vir"; + url = "https://elpa.gnu.org/packages/ebdb-0.8.4.tar"; + sha256 = "0n811af83fqpzq9513gf240gnz7qkwrjw07qs4sra4069q0pwnjr"; }; packageRequires = [ emacs seq ]; meta = { @@ -1220,6 +1235,21 @@ license = lib.licenses.free; }; }) {}; + engrave-faces = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "engrave-faces"; + ename = "engrave-faces"; + version = "0.2.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/engrave-faces-0.2.0.tar"; + sha256 = "1d0hsfg3wvwbs82gjyvfjvy1sszcm7qa50bch1b6jy05kbc543ip"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/engrave-faces.html"; + license = lib.licenses.free; + }; + }) {}; enwc = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "enwc"; @@ -3437,6 +3467,21 @@ license = lib.licenses.free; }; }) {}; + shell-command-plus = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "shell-command-plus"; + ename = "shell-command+"; + version = "2.2.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/shell-command+-2.2.1.tar"; + sha256 = "1dmi7fn4g55va5ljpyswr3dpgj471747kkdixfyp8zpsbhvr5yf6"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/shell-command+.html"; + license = lib.licenses.free; + }; + }) {}; shen-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "shen-mode"; @@ -3752,6 +3797,21 @@ license = lib.licenses.free; }; }) {}; + taxy = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "taxy"; + ename = "taxy"; + version = "0.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/taxy-0.4.tar"; + sha256 = "1iy1761v2q0i020x8ch4z3vljx2v62pcy5bifxq8gw5qx0115576"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/taxy.html"; + license = lib.licenses.free; + }; + }) {}; temp-buffer-browse = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "temp-buffer-browse"; @@ -3820,10 +3880,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.5.1.1"; + version = "2.5.1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.5.1.1.tar"; - sha256 = "0v3rvvhjcnyvg6l4vyxz6513mxzvv9n0skkmr62ry8yi5x9wnqp1"; + url = "https://elpa.gnu.org/packages/tramp-2.5.1.2.tar"; + sha256 = "0p8m8prxrvrr455ahb626c1dry04m80y017h16ngr4i5ais0r85g"; }; packageRequires = [ emacs ]; meta = { @@ -3990,6 +4050,21 @@ license = lib.licenses.free; }; }) {}; + vc-backup = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "vc-backup"; + ename = "vc-backup"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/vc-backup-1.0.0.tar"; + sha256 = "0vcrbb4s1rzar9q882kfcslycxvycp61923sg82i29b7yd0yrgdr"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/vc-backup.html"; + license = lib.licenses.free; + }; + }) {}; vc-hgcmd = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "vc-hgcmd"; @@ -4379,10 +4454,10 @@ elpaBuild { pname = "xref"; ename = "xref"; - version = "1.1.0"; + version = "1.2.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xref-1.1.0.tar"; - sha256 = "1s7pwk09bry4nqr4bc78a3mbwyrxagai2gpsd49x47czy2x7m3ax"; + url = "https://elpa.gnu.org/packages/xref-1.2.2.tar"; + sha256 = "14kdy8blhs6lwg349l9lmv0bbpybgi9nsg2iic3v87j4jyi41ljm"; }; packageRequires = [ emacs ]; meta = { From ebd5774d272fc52a7ca0da667014f8fec90f6cd8 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 6 Sep 2021 16:36:02 -0300 Subject: [PATCH 136/167] Duplicated shell-command-plus - manual fixup --- .../emacs/elisp-packages/elpa-generated.nix | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index eb7c52cdd3d4..753428f9cc82 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -3467,21 +3467,6 @@ license = lib.licenses.free; }; }) {}; - shell-command-plus = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "shell-command-plus"; - ename = "shell-command+"; - version = "2.2.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/shell-command+-2.2.1.tar"; - sha256 = "1dmi7fn4g55va5ljpyswr3dpgj471747kkdixfyp8zpsbhvr5yf6"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/shell-command+.html"; - license = lib.licenses.free; - }; - }) {}; shen-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "shen-mode"; From f4b40d572ce50503136896bdd0501f35584b7da0 Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 6 Sep 2021 22:28:10 +0900 Subject: [PATCH 137/167] elasticsearch: update configuration - transport.tcp.port -> transport.port https://www.elastic.co/guide/en/elasticsearch/reference/current/breaking-changes-7.1.html - default to start a single-node cluster https://stackoverflow.com/questions/59350069/elasticsearch-start-up-error-the-default-discovery-settings-are-unsuitable-for --- nixos/modules/services/search/elasticsearch.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index 440f34b3dc5c..8cf881d47ad2 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -8,9 +8,10 @@ let esConfig = '' network.host: ${cfg.listenAddress} cluster.name: ${cfg.cluster_name} + ${lib.optionalString cfg.single_node "discovery.type: single-node"} http.port: ${toString cfg.port} - transport.tcp.port: ${toString cfg.tcp_port} + transport.port: ${toString cfg.tcp_port} ${cfg.extraConf} ''; @@ -77,6 +78,12 @@ in type = types.str; }; + single_node = mkOption { + description = "Start a single-node cluster"; + default = true; + type = types.bool; + }; + extraConf = mkOption { description = "Extra configuration for elasticsearch."; default = ""; From 9cbdd2655c340363f00fdb784015d495aac007d6 Mon Sep 17 00:00:00 2001 From: happysalada Date: Tue, 7 Sep 2021 11:29:23 +0900 Subject: [PATCH 138/167] elasticsearch: auto_import_dangling_indices in single-node mode --- nixos/modules/services/search/elasticsearch.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index 8cf881d47ad2..1d7a28d5d245 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -8,7 +8,10 @@ let esConfig = '' network.host: ${cfg.listenAddress} cluster.name: ${cfg.cluster_name} - ${lib.optionalString cfg.single_node "discovery.type: single-node"} + ${lib.optionalString cfg.single_node '' + discovery.type: single-node + gateway.auto_import_dangling_indices: true + ''} http.port: ${toString cfg.port} transport.port: ${toString cfg.tcp_port} From 21a7695b8afb29c17ff47fbc0f4798b5a56ac23a Mon Sep 17 00:00:00 2001 From: midchildan Date: Mon, 6 Sep 2021 00:15:31 +0900 Subject: [PATCH 139/167] mirakurun: build with yarn2nix --- nixos/modules/services/video/mirakurun.nix | 2 +- pkgs/applications/video/mirakurun/default.nix | 95 + .../video/mirakurun/nix-filesystem.patch | 46 + .../applications/video/mirakurun/package.json | 129 + pkgs/applications/video/mirakurun/update.nix | 55 + pkgs/applications/video/mirakurun/yarn.lock | 3232 ++++++++++++++ pkgs/applications/video/mirakurun/yarn.nix | 3765 +++++++++++++++++ pkgs/development/node-packages/default.nix | 30 - .../node-packages/node-packages.json | 1 - pkgs/top-level/all-packages.nix | 2 +- 10 files changed, 7324 insertions(+), 33 deletions(-) create mode 100644 pkgs/applications/video/mirakurun/default.nix create mode 100644 pkgs/applications/video/mirakurun/nix-filesystem.patch create mode 100644 pkgs/applications/video/mirakurun/package.json create mode 100644 pkgs/applications/video/mirakurun/update.nix create mode 100644 pkgs/applications/video/mirakurun/yarn.lock create mode 100644 pkgs/applications/video/mirakurun/yarn.nix diff --git a/nixos/modules/services/video/mirakurun.nix b/nixos/modules/services/video/mirakurun.nix index 6ea73fa5c679..1a99d1c97692 100644 --- a/nixos/modules/services/video/mirakurun.nix +++ b/nixos/modules/services/video/mirakurun.nix @@ -173,7 +173,7 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; serviceConfig = { - ExecStart = "${mirakurun}/bin/mirakurun"; + ExecStart = "${mirakurun}/bin/mirakurun-start"; User = username; Group = groupname; RuntimeDirectory="mirakurun"; diff --git a/pkgs/applications/video/mirakurun/default.nix b/pkgs/applications/video/mirakurun/default.nix new file mode 100644 index 000000000000..3987e1252844 --- /dev/null +++ b/pkgs/applications/video/mirakurun/default.nix @@ -0,0 +1,95 @@ +# NOTE: Mirakurun is packaged outside of nodePackages because Node2nix can't +# handle one of its subdependencies. See below link for details. +# +# https://github.com/Chinachu/node-aribts/blob/af84dbbbd81ea80b946e538083b64b5b2dc7e8f2/package.json#L26 + +{ lib +, stdenvNoCC +, bash +, common-updater-scripts +, fetchFromGitHub +, genericUpdater +, jq +, makeWrapper +, mkYarnPackage +, which +, writers +, v4l-utils +, yarn +, yarn2nix +}: + +stdenvNoCC.mkDerivation rec { + pname = "mirakurun"; + version = "3.8.0"; + + src = fetchFromGitHub { + owner = "Chinachu"; + repo = "Mirakurun"; + rev = version; + sha256 = "1fmzi3jc3havvpc1kz5z16k52lnrsmc3b5yqyxc7i911gqyjsxzr"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + mirakurun = mkYarnPackage rec { + name = "${pname}-${version}"; + inherit version src; + + yarnNix = ./yarn.nix; + yarnLock = ./yarn.lock; + packageJSON = ./package.json; + + patches = [ + # NOTE: fixes for hardcoded paths and assumptions about filesystem + # permissions + ./nix-filesystem.patch + ]; + + buildPhase = '' + yarn --offline build + ''; + + distPhase = "true"; + }; + + installPhase = + let + runtimeDeps = [ bash which v4l-utils ]; + in + '' + mkdir -p $out/bin + + makeWrapper ${mirakurun}/bin/mirakurun-epgdump $out/bin/mirakurun-epgdump \ + --run "cd ${mirakurun}/libexec/mirakurun/node_modules/mirakurun" \ + --prefix PATH : ${lib.makeBinPath runtimeDeps} + + # XXX: The original mirakurun command uses PM2 to manage the Mirakurun + # server. However, we invoke the server directly and let systemd + # manage it to avoid complication. This is okay since no features + # unique to PM2 is currently being used. + makeWrapper ${yarn}/bin/yarn $out/bin/mirakurun-start \ + --add-flags "start" \ + --run "cd ${mirakurun}/libexec/mirakurun/node_modules/mirakurun" \ + --prefix PATH : ${lib.makeBinPath runtimeDeps} + ''; + + passthru.updateScript = import ./update.nix { + inherit lib; + inherit (src.meta) homepage; + inherit + pname + version + common-updater-scripts + genericUpdater + writers + jq + yarn + yarn2nix; + }; + + meta = { + inherit (mirakurun.meta) description platforms; + maintainers = with lib.maintainers; [ midchildan ]; + }; +} diff --git a/pkgs/applications/video/mirakurun/nix-filesystem.patch b/pkgs/applications/video/mirakurun/nix-filesystem.patch new file mode 100644 index 000000000000..f7f06e2a6dba --- /dev/null +++ b/pkgs/applications/video/mirakurun/nix-filesystem.patch @@ -0,0 +1,46 @@ +diff --git a/processes.json b/processes.json +index b54d404..a40dfab 100644 +--- a/processes.json ++++ b/processes.json +@@ -4,10 +4,10 @@ + "name": "mirakurun-server", + "script": "lib/server.js", + "node_args" : "-r source-map-support/register", +- "error_file": "/usr/local/var/log/mirakurun.stderr.log", +- "out_file": "/usr/local/var/log/mirakurun.stdout.log", ++ "error_file": "/var/log/mirakurun.stderr.log", ++ "out_file": "/var/log/mirakurun.stdout.log", + "merge_logs": true, +- "pid_file": "/usr/local/var/run/mirakurun.pid", ++ "pid_file": "/var/run/mirakurun.pid", + "exec_mode": "fork", + "autorestart": true, + "env": { +diff --git a/src/Mirakurun/config.ts b/src/Mirakurun/config.ts +index 0b8a1a2..ff02fda 100644 +--- a/src/Mirakurun/config.ts ++++ b/src/Mirakurun/config.ts +@@ -146,6 +146,7 @@ export function loadServer(): Server { + fs.copyFileSync("config/server.win32.yml", path); + } else { + fs.copyFileSync("config/server.yml", path); ++ fs.chmodSync(path, 0o644); + } + } catch (e) { + log.fatal("failed to copy server config to `%s`", path); +@@ -300,6 +301,7 @@ export function loadTuners(): Tuner[] { + fs.copyFileSync("config/tuners.win32.yml", path); + } else { + fs.copyFileSync("config/tuners.yml", path); ++ fs.chmodSync(path, 0o644); + } + } catch (e) { + log.fatal("failed to copy tuners config to `%s`", path); +@@ -342,6 +344,7 @@ export function loadChannels(): Channel[] { + fs.copyFileSync("config/channels.win32.yml", path); + } else { + fs.copyFileSync("config/channels.yml", path); ++ fs.chmodSync(path, 0o644); + } + } catch (e) { + log.fatal("failed to copy channels config to `%s`", path); diff --git a/pkgs/applications/video/mirakurun/package.json b/pkgs/applications/video/mirakurun/package.json new file mode 100644 index 000000000000..5188a7559c5c --- /dev/null +++ b/pkgs/applications/video/mirakurun/package.json @@ -0,0 +1,129 @@ +{ + "name": "mirakurun", + "preferGlobal": true, + "description": "Japanese DTV Tuner Server Service.", + "version": "3.8.0", + "homepage": "https://github.com/Chinachu/Mirakurun", + "keywords": [ + "mirakurun", + "chinachu", + "rivarun", + "arib", + "isdb", + "dvb", + "dvr", + "dtv", + "tv" + ], + "author": { + "name": "kanreisa", + "url": "https://github.com/kanreisa" + }, + "contributors": [ + "rndomhack" + ], + "repository": { + "type": "git", + "url": "https://github.com/Chinachu/Mirakurun.git" + }, + "bugs": { + "url": "https://github.com/Chinachu/Mirakurun/issues" + }, + "license": "Apache-2.0", + "bin": { + "mirakurun": "bin/cli.sh", + "mirakurun-epgdump": "bin/epgdump.js" + }, + "main": "lib/client.js", + "scripts": { + "start": "node -r source-map-support/register lib/server.js", + "debug": "node -r source-map-support/register --inspect=0.0.0.0:9229 lib/server.js", + "start.win32": "node.exe -r source-map-support/register bin/init.win32.js", + "debug.win32": "node.exe -r source-map-support/register --inspect bin/init.win32.js", + "build": "tslint --project . && tsc --declaration && webpack", + "watch": "tsc -w --declaration", + "watch-webpack": "webpack -w", + "test": "tslint --project . && mocha --exit test/*.spec.js", + "clean": "rimraf lib/*", + "prepublishOnly": "npm run clean && npm run build", + "preinstall": "node bin/preinstall.js", + "postinstall": "node bin/postinstall.js && opencollective-postinstall", + "preuninstall": "node bin/preuninstall.js", + "docker-build": "docker-compose -f docker/docker-compose.yml build", + "docker-run": "docker-compose -f docker/docker-compose.yml run --rm --service-ports mirakurun", + "docker-debug": "docker-compose -f docker/docker-compose.yml run --rm --service-ports -e DEBUG=true mirakurun" + }, + "directories": { + "doc": "doc", + "lib": "lib" + }, + "dependencies": { + "@fluentui/react": "8.27.0", + "aribts": "^1.3.5", + "colors": "^1.4.0", + "cors": "^2.8.5", + "dotenv": "^8.6.0", + "eventemitter3": "^4.0.7", + "express": "^4.17.1", + "express-openapi": "^8.0.0", + "glob": "^7.1.7", + "ip": "^1.1.4", + "js-yaml": "^4.1.0", + "latest-version": "^5.1.0", + "morgan": "^1.10.0", + "openapi-types": "^7.2.3", + "opencollective": "^1.0.3", + "opencollective-postinstall": "^2.0.3", + "promise-queue": "^2.2.3", + "react": "^17.0.2", + "react-dom": "^17.0.2", + "semver": "^7.3.5", + "sift": "^7.0.1", + "source-map-support": "^0.5.19", + "stream-http": "^3.2.0", + "swagger-ui-dist": "3.51.2", + "tail": "^2.2.3" + }, + "devDependencies": { + "@types/cors": "^2.8.12", + "@types/express": "^4.17.13", + "@types/ip": "^1.1.0", + "@types/js-yaml": "^4.0.2", + "@types/morgan": "^1.9.3", + "@types/node": "^12.20.17", + "@types/promise-queue": "^2.2.0", + "@types/react": "^17.0.14", + "@types/react-dom": "^17.0.9", + "buffer": "^6.0.3", + "copy-webpack-plugin": "^9.0.1", + "css-loader": "5.2.7", + "mocha": "^8.4.0", + "process": "^0.11.10", + "rimraf": "^3.0.2", + "style-loader": "^2.0.0", + "ts-loader": "^9.2.3", + "tslint": "^6.1.3", + "tslint-config-prettier": "^1.18.0", + "typescript": "^4.3.5", + "url": "^0.11.0", + "webpack": "5.48.0", + "webpack-cli": "^4.7.2" + }, + "engines": { + "node": "^12 || ^14 || ^16" + }, + "engineStrict": true, + "os": [ + "linux", + "darwin", + "win32" + ], + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/Mirakurun" + }, + "collective": { + "type": "opencollective", + "url": "https://opencollective.com/Mirakurun" + } +} diff --git a/pkgs/applications/video/mirakurun/update.nix b/pkgs/applications/video/mirakurun/update.nix new file mode 100644 index 000000000000..ccea2279783b --- /dev/null +++ b/pkgs/applications/video/mirakurun/update.nix @@ -0,0 +1,55 @@ +{ pname +, version +, homepage +, lib +, common-updater-scripts +, genericUpdater +, writers +, jq +, yarn +, yarn2nix +}: + +let + updater = genericUpdater { + inherit pname version; + attrPath = lib.toLower pname; + + # exclude prerelease versions + versionLister = writers.writeBash "list-mirakurun-versions" '' + ${common-updater-scripts}/bin/list-git-tags ${homepage} \ + | grep '^[0-9]\+\.[0-9]\+\.[0-9]\+$' + ''; + }; + updateScript = builtins.elemAt updater 0; + updateArgs = map (lib.escapeShellArg) (builtins.tail updater); +in writers.writeBash "update-mirakurun" '' + set -euxo pipefail + + WORKDIR="$(mktemp -d)" + cleanup() { + rm -rf "$WORKDIR" + } + trap cleanup EXIT + + # bump the version + ${updateScript} ${lib.concatStringsSep " " updateArgs} + + # Get the path to the latest source. Note that we can't just pass the value + # of mirakurun.src directly because it'd be evaluated before we can run + # updateScript. + SRC="$(nix-build "${toString ../../../..}" --no-out-link -A mirakurun.src)" + if [[ "${version}" == "$(${jq}/bin/jq -r .version "$SRC/package.json")" ]]; then + echo "[INFO] Already using the latest version of ${pname}" >&2 + exit + fi + + cd "$WORKDIR" + + cp "$SRC/package.json" package.json + "${yarn}/bin/yarn" install --ignore-scripts + + "${yarn2nix}/bin/yarn2nix" > "${toString ./.}/yarn.nix" + cp yarn.lock "${toString ./.}/yarn.lock" + cp package.json "${toString ./.}/package.json" +'' diff --git a/pkgs/applications/video/mirakurun/yarn.lock b/pkgs/applications/video/mirakurun/yarn.lock new file mode 100644 index 000000000000..1ec1c4184451 --- /dev/null +++ b/pkgs/applications/video/mirakurun/yarn.lock @@ -0,0 +1,3232 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@babel/code-frame@^7.0.0": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb" + integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw== + dependencies: + "@babel/highlight" "^7.14.5" + +"@babel/helper-validator-identifier@^7.14.5": + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz#6654d171b2024f6d8ee151bf2509699919131d48" + integrity sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g== + +"@babel/highlight@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9" + integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg== + dependencies: + "@babel/helper-validator-identifier" "^7.14.5" + chalk "^2.0.0" + js-tokens "^4.0.0" + +"@discoveryjs/json-ext@^0.5.0": + version "0.5.3" + resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz#90420f9f9c6d3987f176a19a7d8e764271a2f55d" + integrity sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g== + +"@fluentui/date-time-utilities@^8.2.2": + version "8.2.2" + resolved "https://registry.yarnpkg.com/@fluentui/date-time-utilities/-/date-time-utilities-8.2.2.tgz#535d5bb6ee7ccfa8cc774c790e31d3d5d4edbad6" + integrity sha512-djHrX/38ty+F93qLQjzmRzPzK598CW9g/RPhQH6GyrFBLPSWM1swYKB5TP6E7FrIf+fT4pVqrNUSYZhgi2rrOQ== + dependencies: + "@fluentui/set-version" "^8.1.4" + tslib "^2.1.0" + +"@fluentui/dom-utilities@^2.1.4": + version "2.1.4" + resolved "https://registry.yarnpkg.com/@fluentui/dom-utilities/-/dom-utilities-2.1.4.tgz#a8eeaf906cc19f547ae40c662d2776cb2540ea11" + integrity sha512-+gsAnEjgoKB37o+tsMdSLtgqZ9z2PzpvnHx/2IqhRWjQQd7Xc7MbQsbZaQ5qfkioFHLnWGc/+WORpqKPy/sWrg== + dependencies: + "@fluentui/set-version" "^8.1.4" + tslib "^2.1.0" + +"@fluentui/font-icons-mdl2@^8.1.8": + version "8.1.11" + resolved "https://registry.yarnpkg.com/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.1.11.tgz#ba974aa5e1fd219a96f3b664d3b9a18956d39bab" + integrity sha512-R9ZBsoacKe91VcB+5D3u+AG9Au1snJ9jUItbWjTVJ+fIYXSZ01XB4Rmj/P0H+giUwFxYVpjOy0ybF2JLA6MddA== + dependencies: + "@fluentui/set-version" "^8.1.4" + "@fluentui/style-utilities" "^8.3.2" + tslib "^2.1.0" + +"@fluentui/foundation-legacy@^8.1.8": + version "8.1.11" + resolved "https://registry.yarnpkg.com/@fluentui/foundation-legacy/-/foundation-legacy-8.1.11.tgz#a7c51037af8bb58894bc769db16663b991084f8b" + integrity sha512-1Yyvk9gk4SoVuhmYi4tjRnEK6edz6juNw1mVi9mTacPB460KrtCbRswcE+IhVQJZCYAljlv4GQcob7J3CwCoyA== + dependencies: + "@fluentui/merge-styles" "^8.1.5" + "@fluentui/set-version" "^8.1.4" + "@fluentui/style-utilities" "^8.3.2" + "@fluentui/utilities" "^8.3.2" + tslib "^2.1.0" + +"@fluentui/keyboard-key@^0.3.4": + version "0.3.4" + resolved "https://registry.yarnpkg.com/@fluentui/keyboard-key/-/keyboard-key-0.3.4.tgz#27c95ea9d43d91cc9c64c318feb10986250584cd" + integrity sha512-pVY2m3IC5+LLmMzsaPApX9eKTzpOzdgQwrR3FNTE6mGx3N/+QWYM7fdF+T1ldZQt87dCRSeQnmAo5kqjtxeA/w== + dependencies: + tslib "^2.1.0" + +"@fluentui/merge-styles@^8.1.4", "@fluentui/merge-styles@^8.1.5": + version "8.1.5" + resolved "https://registry.yarnpkg.com/@fluentui/merge-styles/-/merge-styles-8.1.5.tgz#f5d5c4bd547aa41311f970e652a512a1c5a5bfb3" + integrity sha512-hmEb5LnOxCTpM/6oJQJI0w5AlYzwrceozPgsMdOF5BuT5MkXPlXLK3L2auzXGNYHkoGiouH61ImsS/TSM0mV/g== + dependencies: + "@fluentui/set-version" "^8.1.4" + tslib "^2.1.0" + +"@fluentui/react-focus@^8.1.10": + version "8.2.2" + resolved "https://registry.yarnpkg.com/@fluentui/react-focus/-/react-focus-8.2.2.tgz#74231170eeb02ce1798ed8ceb72a0fcdcf89a337" + integrity sha512-cmWPphKuFFPqvxyjmhH4r1v5lw8D3HytSgn/LaMQEHhT6RGuLLnx17QDZBUYCrZ0vyBf3nGnO1lsw+EGGsc1SQ== + dependencies: + "@fluentui/keyboard-key" "^0.3.4" + "@fluentui/merge-styles" "^8.1.5" + "@fluentui/set-version" "^8.1.4" + "@fluentui/style-utilities" "^8.3.2" + "@fluentui/utilities" "^8.3.2" + tslib "^2.1.0" + +"@fluentui/react-hooks@^8.2.6": + version "8.3.2" + resolved "https://registry.yarnpkg.com/@fluentui/react-hooks/-/react-hooks-8.3.2.tgz#fb6e900a0ecbada116f52cc2df8628e7c54a9fa9" + integrity sha512-mGmDCaUjavYj4Bv/IPoNix4HMXX2ZPnPMfyH5X0QjiFEeSuOFlIM6By0sV6Vf30dsjoHNdUUsU461axtFTRVsg== + dependencies: + "@fluentui/react-window-provider" "^2.1.4" + "@fluentui/set-version" "^8.1.4" + "@fluentui/utilities" "^8.3.2" + tslib "^2.1.0" + +"@fluentui/react-window-provider@^2.1.4": + version "2.1.4" + resolved "https://registry.yarnpkg.com/@fluentui/react-window-provider/-/react-window-provider-2.1.4.tgz#2e8368fd85f9e10062c726b060b146ffc1f916b3" + integrity sha512-RztmJ7ol2eMDr3NCs2OcAA1cQjZdPPUEa4aurgh4Aq+JM/BiY0aK6S4SeFtVD7F8Q7PBOz/xwOG4HlnSMQtlsg== + dependencies: + "@fluentui/set-version" "^8.1.4" + tslib "^2.1.0" + +"@fluentui/react@8.27.0": + version "8.27.0" + resolved "https://registry.yarnpkg.com/@fluentui/react/-/react-8.27.0.tgz#dc41d11eed9b217ff0d3ad5ace85e92281f855e3" + integrity sha512-5LSh5XVU3qy6nY949jxS3BwF7UZA6jGjcH9JOTosgtxuHZUIXkzfZlT7fyt5xp+27B1B5ro9K9u2pDjItDHVHg== + dependencies: + "@fluentui/date-time-utilities" "^8.2.2" + "@fluentui/font-icons-mdl2" "^8.1.8" + "@fluentui/foundation-legacy" "^8.1.8" + "@fluentui/merge-styles" "^8.1.4" + "@fluentui/react-focus" "^8.1.10" + "@fluentui/react-hooks" "^8.2.6" + "@fluentui/react-window-provider" "^2.1.4" + "@fluentui/set-version" "^8.1.4" + "@fluentui/style-utilities" "^8.2.2" + "@fluentui/theme" "^2.2.1" + "@fluentui/utilities" "^8.2.2" + "@microsoft/load-themed-styles" "^1.10.26" + tslib "^2.1.0" + +"@fluentui/set-version@^8.1.4": + version "8.1.4" + resolved "https://registry.yarnpkg.com/@fluentui/set-version/-/set-version-8.1.4.tgz#89fa88223f421981427dfd5372d46210045354e8" + integrity sha512-2otMyJ+s+W+hjBD4BKjwYKKinJUDeIKYKz93qKrrJS0i3fKfftNroy9dHFlIblZ7n747L334plLi3bzQO1bnvA== + dependencies: + tslib "^2.1.0" + +"@fluentui/style-utilities@^8.2.2", "@fluentui/style-utilities@^8.3.2": + version "8.3.2" + resolved "https://registry.yarnpkg.com/@fluentui/style-utilities/-/style-utilities-8.3.2.tgz#721a975e41996db24256064b02def921e201e323" + integrity sha512-AuP3IlnANCDfECAkcpP3bQaTaG8ZsS7yphPmA2zpLEyHHDS2QS1OWDyh2WvajwGkvjOCdWjo+eLEq6rE29JY6g== + dependencies: + "@fluentui/merge-styles" "^8.1.5" + "@fluentui/set-version" "^8.1.4" + "@fluentui/theme" "^2.3.2" + "@fluentui/utilities" "^8.3.2" + "@microsoft/load-themed-styles" "^1.10.26" + tslib "^2.1.0" + +"@fluentui/theme@^2.2.1", "@fluentui/theme@^2.3.2": + version "2.3.2" + resolved "https://registry.yarnpkg.com/@fluentui/theme/-/theme-2.3.2.tgz#9094fc8e52758c34a5f396be91a0219bb85111a7" + integrity sha512-ND6hOONR4wYNccdnvXre8i9cvd9ZZkfihIAGd7X+3+TobN6pMroFDfhygoU/ShaeX2Uy1BrKIpWHnIiokzuCBw== + dependencies: + "@fluentui/merge-styles" "^8.1.5" + "@fluentui/set-version" "^8.1.4" + "@fluentui/utilities" "^8.3.2" + tslib "^2.1.0" + +"@fluentui/utilities@^8.2.2", "@fluentui/utilities@^8.3.2": + version "8.3.2" + resolved "https://registry.yarnpkg.com/@fluentui/utilities/-/utilities-8.3.2.tgz#3378c17523d1833d6ba829bcd5d091aab03f59e5" + integrity sha512-XP/NG3jg8LqLzU139SuNzO01nu7IAizlnC9KWNkYxrV5Hc9pGrW/seKloc7F7RVK36Vr5l4gl3DXX9lhUZUP/Q== + dependencies: + "@fluentui/dom-utilities" "^2.1.4" + "@fluentui/merge-styles" "^8.1.5" + "@fluentui/set-version" "^8.1.4" + tslib "^2.1.0" + +"@microsoft/load-themed-styles@^1.10.26": + version "1.10.206" + resolved "https://registry.yarnpkg.com/@microsoft/load-themed-styles/-/load-themed-styles-1.10.206.tgz#9b18bb4cb5bcfd92e07d4323889731574ba6eb06" + integrity sha512-Q+oO5n0bZqrfC4SFD3b4oAE9RIC9QEncBmLTbFB0saen3xfvMpCKfcPwcGYGh3/hT6035Nmryur7ONthqh83ag== + +"@nodelib/fs.scandir@2.1.5": + version "2.1.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" + integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== + dependencies: + "@nodelib/fs.stat" "2.0.5" + run-parallel "^1.1.9" + +"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" + integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== + +"@nodelib/fs.walk@^1.2.3": + version "1.2.8" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" + integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== + dependencies: + "@nodelib/fs.scandir" "2.1.5" + fastq "^1.6.0" + +"@sindresorhus/is@^0.14.0": + version "0.14.0" + resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" + integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== + +"@szmarczak/http-timer@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" + integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA== + dependencies: + defer-to-connect "^1.0.1" + +"@types/body-parser@*": + version "1.19.1" + resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.1.tgz#0c0174c42a7d017b818303d4b5d969cb0b75929c" + integrity sha512-a6bTJ21vFOGIkwM0kzh9Yr89ziVxq4vYH2fQ6N8AeipEzai/cFK6aGMArIkUeIdRIgpwQa+2bXiLuUJCpSf2Cg== + dependencies: + "@types/connect" "*" + "@types/node" "*" + +"@types/connect@*": + version "3.4.35" + resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1" + integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ== + dependencies: + "@types/node" "*" + +"@types/cors@^2.8.12": + version "2.8.12" + resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz#6b2c510a7ad7039e98e7b8d3d6598f4359e5c080" + integrity sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw== + +"@types/eslint-scope@^3.7.0": + version "3.7.1" + resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.1.tgz#8dc390a7b4f9dd9f1284629efce982e41612116e" + integrity sha512-SCFeogqiptms4Fg29WpOTk5nHIzfpKCemSN63ksBQYKTcXoJEmJagV+DhVmbapZzY4/5YaOV1nZwrsU79fFm1g== + dependencies: + "@types/eslint" "*" + "@types/estree" "*" + +"@types/eslint@*": + version "7.28.0" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.28.0.tgz#7e41f2481d301c68e14f483fe10b017753ce8d5a" + integrity sha512-07XlgzX0YJUn4iG1ocY4IX9DzKSmMGUs6ESKlxWhZRaa0fatIWaHWUVapcuGa8r5HFnTqzj+4OCjd5f7EZ/i/A== + dependencies: + "@types/estree" "*" + "@types/json-schema" "*" + +"@types/estree@*", "@types/estree@^0.0.50": + version "0.0.50" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83" + integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw== + +"@types/express-serve-static-core@^4.17.18": + version "4.17.24" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.24.tgz#ea41f93bf7e0d59cd5a76665068ed6aab6815c07" + integrity sha512-3UJuW+Qxhzwjq3xhwXm2onQcFHn76frIYVbTu+kn24LFxI+dEhdfISDFovPB8VpEgW8oQCTpRuCe+0zJxB7NEA== + dependencies: + "@types/node" "*" + "@types/qs" "*" + "@types/range-parser" "*" + +"@types/express@^4.17.13": + version "4.17.13" + resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034" + integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA== + dependencies: + "@types/body-parser" "*" + "@types/express-serve-static-core" "^4.17.18" + "@types/qs" "*" + "@types/serve-static" "*" + +"@types/ip@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@types/ip/-/ip-1.1.0.tgz#aec4f5bfd49e4a4c53b590d88c36eb078827a7c0" + integrity sha512-dwNe8gOoF70VdL6WJBwVHtQmAX4RMd62M+mAB9HQFjG1/qiCLM/meRy95Pd14FYBbEDwCq7jgJs89cHpLBu4HQ== + dependencies: + "@types/node" "*" + +"@types/js-yaml@^4.0.2": + version "4.0.3" + resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.3.tgz#9f33cd6fbf0d5ec575dc8c8fc69c7fec1b4eb200" + integrity sha512-5t9BhoORasuF5uCPr+d5/hdB++zRFUTMIZOzbNkr+jZh3yQht4HYbRDyj9fY8n2TZT30iW9huzav73x4NikqWg== + +"@types/json-schema@*", "@types/json-schema@^7.0.8": + version "7.0.9" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" + integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ== + +"@types/mime@^1": + version "1.3.2" + resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" + integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw== + +"@types/morgan@^1.9.3": + version "1.9.3" + resolved "https://registry.yarnpkg.com/@types/morgan/-/morgan-1.9.3.tgz#ae04180dff02c437312bc0cfb1e2960086b2f540" + integrity sha512-BiLcfVqGBZCyNCnCH3F4o2GmDLrpy0HeBVnNlyZG4fo88ZiE9SoiBe3C+2ezuwbjlEyT+PDZ17//TAlRxAn75Q== + dependencies: + "@types/node" "*" + +"@types/node@*": + version "16.7.10" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.7.10.tgz#7aa732cc47341c12a16b7d562f519c2383b6d4fc" + integrity sha512-S63Dlv4zIPb8x6MMTgDq5WWRJQe56iBEY0O3SOFA9JrRienkOVDXSXBjjJw6HTNQYSE2JI6GMCR6LVbIMHJVvA== + +"@types/node@^12.20.17": + version "12.20.23" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.23.tgz#d0d5885bb885ee9b1ed114a04ea586540a1b2e2a" + integrity sha512-FW0q7NI8UnjbKrJK8NGr6QXY69ATw9IFe6ItIo5yozPwA9DU/xkhiPddctUVyrmFXvyFYerYgQak/qu200UBDw== + +"@types/promise-queue@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@types/promise-queue/-/promise-queue-2.2.0.tgz#cdba35f1b2c0bd8aa2bf925c2b1ed02958067a0a" + integrity sha512-9QLtid6GxEWqpF+QImxBRG6bSVOHtpAm2kXuIyEvZBbSOupLvqhhJv8uaHbS8kUL8FDjzH3RWcSyC/52WOVtGw== + +"@types/prop-types@*": + version "15.7.4" + resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11" + integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ== + +"@types/qs@*": + version "6.9.7" + resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb" + integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw== + +"@types/range-parser@*": + version "1.2.4" + resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" + integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== + +"@types/react-dom@^17.0.9": + version "17.0.9" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.9.tgz#441a981da9d7be117042e1a6fd3dac4b30f55add" + integrity sha512-wIvGxLfgpVDSAMH5utdL9Ngm5Owu0VsGmldro3ORLXV8CShrL8awVj06NuEXFQ5xyaYfdca7Sgbk/50Ri1GdPg== + dependencies: + "@types/react" "*" + +"@types/react@*", "@types/react@^17.0.14": + version "17.0.20" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.20.tgz#a4284b184d47975c71658cd69e759b6bd37c3b8c" + integrity sha512-wWZrPlihslrPpcKyCSlmIlruakxr57/buQN1RjlIeaaTWDLtJkTtRW429MoQJergvVKc4IWBpRhWw7YNh/7GVA== + dependencies: + "@types/prop-types" "*" + "@types/scheduler" "*" + csstype "^3.0.2" + +"@types/scheduler@*": + version "0.16.2" + resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" + integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew== + +"@types/serve-static@*": + version "1.13.10" + resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9" + integrity sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ== + dependencies: + "@types/mime" "^1" + "@types/node" "*" + +"@ungap/promise-all-settled@1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44" + integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q== + +"@webassemblyjs/ast@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" + integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw== + dependencies: + "@webassemblyjs/helper-numbers" "1.11.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.1" + +"@webassemblyjs/floating-point-hex-parser@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f" + integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ== + +"@webassemblyjs/helper-api-error@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" + integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg== + +"@webassemblyjs/helper-buffer@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5" + integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA== + +"@webassemblyjs/helper-numbers@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae" + integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ== + dependencies: + "@webassemblyjs/floating-point-hex-parser" "1.11.1" + "@webassemblyjs/helper-api-error" "1.11.1" + "@xtuc/long" "4.2.2" + +"@webassemblyjs/helper-wasm-bytecode@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1" + integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q== + +"@webassemblyjs/helper-wasm-section@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a" + integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg== + dependencies: + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/helper-buffer" "1.11.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.1" + "@webassemblyjs/wasm-gen" "1.11.1" + +"@webassemblyjs/ieee754@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614" + integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ== + dependencies: + "@xtuc/ieee754" "^1.2.0" + +"@webassemblyjs/leb128@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5" + integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw== + dependencies: + "@xtuc/long" "4.2.2" + +"@webassemblyjs/utf8@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" + integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ== + +"@webassemblyjs/wasm-edit@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6" + integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA== + dependencies: + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/helper-buffer" "1.11.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.1" + "@webassemblyjs/helper-wasm-section" "1.11.1" + "@webassemblyjs/wasm-gen" "1.11.1" + "@webassemblyjs/wasm-opt" "1.11.1" + "@webassemblyjs/wasm-parser" "1.11.1" + "@webassemblyjs/wast-printer" "1.11.1" + +"@webassemblyjs/wasm-gen@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76" + integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA== + dependencies: + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.1" + "@webassemblyjs/ieee754" "1.11.1" + "@webassemblyjs/leb128" "1.11.1" + "@webassemblyjs/utf8" "1.11.1" + +"@webassemblyjs/wasm-opt@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2" + integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw== + dependencies: + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/helper-buffer" "1.11.1" + "@webassemblyjs/wasm-gen" "1.11.1" + "@webassemblyjs/wasm-parser" "1.11.1" + +"@webassemblyjs/wasm-parser@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199" + integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA== + dependencies: + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/helper-api-error" "1.11.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.1" + "@webassemblyjs/ieee754" "1.11.1" + "@webassemblyjs/leb128" "1.11.1" + "@webassemblyjs/utf8" "1.11.1" + +"@webassemblyjs/wast-printer@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0" + integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg== + dependencies: + "@webassemblyjs/ast" "1.11.1" + "@xtuc/long" "4.2.2" + +"@webpack-cli/configtest@^1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.4.tgz#f03ce6311c0883a83d04569e2c03c6238316d2aa" + integrity sha512-cs3XLy+UcxiP6bj0A6u7MLLuwdXJ1c3Dtc0RkKg+wiI1g/Ti1om8+/2hc2A2B60NbBNAbMgyBMHvyymWm/j4wQ== + +"@webpack-cli/info@^1.3.0": + version "1.3.0" + resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.3.0.tgz#9d78a31101a960997a4acd41ffd9b9300627fe2b" + integrity sha512-ASiVB3t9LOKHs5DyVUcxpraBXDOKubYu/ihHhU+t1UPpxsivg6Od2E2qU4gJCekfEddzRBzHhzA/Acyw/mlK/w== + dependencies: + envinfo "^7.7.3" + +"@webpack-cli/serve@^1.5.2": + version "1.5.2" + resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.5.2.tgz#ea584b637ff63c5a477f6f21604b5a205b72c9ec" + integrity sha512-vgJ5OLWadI8aKjDlOH3rb+dYyPd2GTZuQC/Tihjct6F9GpXGZINo3Y/IVuZVTM1eDQB+/AOsjPUWH/WySDaXvw== + +"@xtuc/ieee754@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" + integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA== + +"@xtuc/long@4.2.2": + version "4.2.2" + resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" + integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== + +accepts@~1.3.7: + version "1.3.7" + resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" + integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== + dependencies: + mime-types "~2.1.24" + negotiator "0.6.2" + +acorn-import-assertions@^1.7.6: + version "1.7.6" + resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.7.6.tgz#580e3ffcae6770eebeec76c3b9723201e9d01f78" + integrity sha512-FlVvVFA1TX6l3lp8VjDnYYq7R1nyW6x3svAt4nDgrWQ9SBaSh9CnbwgSUTasgfNfOG5HlM1ehugCvM+hjo56LA== + +acorn@^8.4.1: + version "8.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz#56c36251fc7cabc7096adc18f05afe814321a28c" + integrity sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA== + +ajv-keywords@^3.5.2: + version "3.5.2" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" + integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== + +ajv@^6.12.5, ajv@^6.5.2, ajv@^6.5.4: + version "6.12.6" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + +ansi-colors@4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" + integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== + +ansi-escapes@^1.1.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e" + integrity sha1-06ioOzGapneTZisT52HHkRQiMG4= + +ansi-regex@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" + integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= + +ansi-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" + integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= + +ansi-regex@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" + integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== + +ansi-styles@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" + integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= + +ansi-styles@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== + dependencies: + color-convert "^1.9.0" + +ansi-styles@^4.0.0, ansi-styles@^4.1.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" + integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== + dependencies: + color-convert "^2.0.1" + +anymatch@~3.1.1: + version "3.1.2" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" + integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== + dependencies: + normalize-path "^3.0.0" + picomatch "^2.0.4" + +argparse@^1.0.7: + version "1.0.10" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" + integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== + dependencies: + sprintf-js "~1.0.2" + +argparse@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" + integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== + +aribts@^1.3.5: + version "1.3.5" + resolved "https://registry.yarnpkg.com/aribts/-/aribts-1.3.5.tgz#f986ba5afb1a8ff202435101544299fc9397baf5" + integrity sha512-fvDR4iYpZkbMqMbTfKynPGfpXDhFTxzZWSS7C3c70xQ8ElmFkjwVrg/NLcEA+R3s4Jz6mVrz/1vOLEAI+ycrSQ== + dependencies: + crc "^3.4.0" + iconv-lite "^0.4.13" + +array-flatten@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" + integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= + +array-union@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" + integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== + +babel-polyfill@6.23.0: + version "6.23.0" + resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.23.0.tgz#8364ca62df8eafb830499f699177466c3b03499d" + integrity sha1-g2TKYt+Or7gwSZ9pkXdGbDsDSZ0= + dependencies: + babel-runtime "^6.22.0" + core-js "^2.4.0" + regenerator-runtime "^0.10.0" + +babel-runtime@^6.22.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" + integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4= + dependencies: + core-js "^2.4.0" + regenerator-runtime "^0.11.0" + +balanced-match@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== + +base64-js@^1.3.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" + integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== + +basic-auth@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a" + integrity sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg== + dependencies: + safe-buffer "5.1.2" + +big.js@^5.2.2: + version "5.2.2" + resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" + integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== + +binary-extensions@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" + integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== + +body-parser@1.19.0: + version "1.19.0" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" + integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw== + dependencies: + bytes "3.1.0" + content-type "~1.0.4" + debug "2.6.9" + depd "~1.1.2" + http-errors "1.7.2" + iconv-lite "0.4.24" + on-finished "~2.3.0" + qs "6.7.0" + raw-body "2.4.0" + type-is "~1.6.17" + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +braces@^3.0.1, braces@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + dependencies: + fill-range "^7.0.1" + +browser-stdout@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60" + integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw== + +browserslist@^4.14.5: + version "4.17.0" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.17.0.tgz#1fcd81ec75b41d6d4994fb0831b92ac18c01649c" + integrity sha512-g2BJ2a0nEYvEFQC208q8mVAhfNwpZ5Mu8BwgtCdZKO3qx98HChmeg448fPdUzld8aFmfLgVh7yymqV+q1lJZ5g== + dependencies: + caniuse-lite "^1.0.30001254" + colorette "^1.3.0" + electron-to-chromium "^1.3.830" + escalade "^3.1.1" + node-releases "^1.1.75" + +buffer-from@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== + +buffer@^5.1.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" + integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.1.13" + +buffer@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6" + integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.2.1" + +builtin-modules@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" + integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8= + +builtin-status-codes@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" + integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug= + +bytes@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" + integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== + +cacheable-request@^6.0.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" + integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg== + dependencies: + clone-response "^1.0.2" + get-stream "^5.1.0" + http-cache-semantics "^4.0.0" + keyv "^3.0.0" + lowercase-keys "^2.0.0" + normalize-url "^4.1.0" + responselike "^1.0.2" + +camelcase@^6.0.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809" + integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== + +caniuse-lite@^1.0.30001254: + version "1.0.30001254" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001254.tgz#974d45e8b7f6e3b63d4b1435e97752717612d4b9" + integrity sha512-GxeHOvR0LFMYPmFGA+NiTOt9uwYDxB3h154tW2yBYwfz2EMX3i1IBgr6gmJGfU0K8KQsqPa5XqLD8zVdP5lUzA== + +chalk@1.1.3, chalk@^1.0.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" + integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= + dependencies: + ansi-styles "^2.2.1" + escape-string-regexp "^1.0.2" + has-ansi "^2.0.0" + strip-ansi "^3.0.0" + supports-color "^2.0.0" + +chalk@^2.0.0, chalk@^2.3.0: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + +chalk@^4.0.0, chalk@^4.1.0: + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + +chardet@^0.4.0: + version "0.4.2" + resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2" + integrity sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I= + +chokidar@3.5.1: + version "3.5.1" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a" + integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw== + dependencies: + anymatch "~3.1.1" + braces "~3.0.2" + glob-parent "~5.1.0" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.5.0" + optionalDependencies: + fsevents "~2.3.1" + +chrome-trace-event@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" + integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== + +cli-cursor@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5" + integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU= + dependencies: + restore-cursor "^2.0.0" + +cli-width@^2.0.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48" + integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw== + +cliui@^7.0.2: + version "7.0.4" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" + integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.0" + wrap-ansi "^7.0.0" + +clone-deep@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" + integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ== + dependencies: + is-plain-object "^2.0.4" + kind-of "^6.0.2" + shallow-clone "^3.0.0" + +clone-response@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b" + integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws= + dependencies: + mimic-response "^1.0.0" + +color-convert@^1.9.0: + version "1.9.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== + dependencies: + color-name "1.1.3" + +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= + +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + +colorette@^1.2.1, colorette@^1.2.2, colorette@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.3.0.tgz#ff45d2f0edb244069d3b772adeb04fed38d0a0af" + integrity sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w== + +colors@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" + integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== + +commander@^2.12.1, commander@^2.20.0: + version "2.20.3" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== + +commander@^7.0.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" + integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + +content-disposition@0.5.3: + version "0.5.3" + resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" + integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g== + dependencies: + safe-buffer "5.1.2" + +content-type@^1.0.4, content-type@~1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" + integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== + +cookie-signature@1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" + integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= + +cookie@0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" + integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== + +copy-webpack-plugin@^9.0.1: + version "9.0.1" + resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-9.0.1.tgz#b71d21991599f61a4ee00ba79087b8ba279bbb59" + integrity sha512-14gHKKdYIxF84jCEgPgYXCPpldbwpxxLbCmA7LReY7gvbaT555DgeBWBgBZM116tv/fO6RRJrsivBqRyRlukhw== + dependencies: + fast-glob "^3.2.5" + glob-parent "^6.0.0" + globby "^11.0.3" + normalize-path "^3.0.0" + p-limit "^3.1.0" + schema-utils "^3.0.0" + serialize-javascript "^6.0.0" + +core-js@^2.4.0: + version "2.6.12" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" + integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== + +cors@^2.8.5: + version "2.8.5" + resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29" + integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g== + dependencies: + object-assign "^4" + vary "^1" + +crc@^3.4.0: + version "3.8.0" + resolved "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6" + integrity sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ== + dependencies: + buffer "^5.1.0" + +cross-spawn@^7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" + integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== + dependencies: + path-key "^3.1.0" + shebang-command "^2.0.0" + which "^2.0.1" + +css-loader@5.2.7: + version "5.2.7" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-5.2.7.tgz#9b9f111edf6fb2be5dc62525644cbc9c232064ae" + integrity sha512-Q7mOvpBNBG7YrVGMxRxcBJZFL75o+cH2abNASdibkj/fffYD8qWbInZrD0S9ccI6vZclF3DsHE7njGlLtaHbhg== + dependencies: + icss-utils "^5.1.0" + loader-utils "^2.0.0" + postcss "^8.2.15" + postcss-modules-extract-imports "^3.0.0" + postcss-modules-local-by-default "^4.0.0" + postcss-modules-scope "^3.0.0" + postcss-modules-values "^4.0.0" + postcss-value-parser "^4.1.0" + schema-utils "^3.0.0" + semver "^7.3.5" + +cssesc@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" + integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== + +csstype@^3.0.2: + version "3.0.8" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.8.tgz#d2266a792729fb227cd216fb572f43728e1ad340" + integrity sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw== + +debug@2.6.9: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + dependencies: + ms "2.0.0" + +debug@4.3.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" + integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== + dependencies: + ms "2.1.2" + +decamelize@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz#aa472d7bf660eb15f3494efd531cab7f2a709837" + integrity sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ== + +decompress-response@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" + integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M= + dependencies: + mimic-response "^1.0.0" + +deep-extend@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== + +defer-to-connect@^1.0.1: + version "1.1.3" + resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591" + integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ== + +depd@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" + integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= + +depd@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" + integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== + +destroy@~1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" + integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= + +diff@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b" + integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w== + +diff@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" + integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== + +difunc@0.0.4: + version "0.0.4" + resolved "https://registry.yarnpkg.com/difunc/-/difunc-0.0.4.tgz#09322073e67f82effd2f22881985e7d3e441b3ac" + integrity sha512-zBiL4ALDmviHdoLC0g0G6wVme5bwAow9WfhcZLLopXCAWgg3AEf7RYTs2xugszIGulRHzEVDF/SHl9oyQU07Pw== + dependencies: + esprima "^4.0.0" + +dir-glob@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" + integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== + dependencies: + path-type "^4.0.0" + +dotenv@^8.6.0: + version "8.6.0" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b" + integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g== + +duplexer3@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" + integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= + +ee-first@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" + integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= + +electron-to-chromium@^1.3.830: + version "1.3.830" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.830.tgz#40e3144204f8ca11b2cebec83cf14c20d3499236" + integrity sha512-gBN7wNAxV5vl1430dG+XRcQhD4pIeYeak6p6rjdCtlz5wWNwDad8jwvphe5oi1chL5MV6RNRikfffBBiFuj+rQ== + +emoji-regex@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== + +emojis-list@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" + integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== + +encodeurl@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" + integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= + +encoding@^0.1.11: + version "0.1.13" + resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" + integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== + dependencies: + iconv-lite "^0.6.2" + +end-of-stream@^1.1.0: + version "1.4.4" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" + integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== + dependencies: + once "^1.4.0" + +enhanced-resolve@^5.0.0, enhanced-resolve@^5.8.0: + version "5.8.2" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz#15ddc779345cbb73e97c611cd00c01c1e7bf4d8b" + integrity sha512-F27oB3WuHDzvR2DOGNTaYy0D5o0cnrv8TeI482VM4kYgQd/FT9lUQwuNsJ0oOHtBUq7eiW5ytqzp7nBFknL+GA== + dependencies: + graceful-fs "^4.2.4" + tapable "^2.2.0" + +envinfo@^7.7.3: + version "7.8.1" + resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475" + integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw== + +es-module-lexer@^0.7.1: + version "0.7.1" + resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.7.1.tgz#c2c8e0f46f2df06274cdaf0dd3f3b33e0a0b267d" + integrity sha512-MgtWFl5No+4S3TmhDmCz2ObFGm6lEpTnzbQi+Dd+pw4mlTIZTmM2iAs5gRlmx5zS9luzobCSBSI90JM/1/JgOw== + +escalade@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" + integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== + +escape-html@~1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" + integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= + +escape-string-regexp@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== + +escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + +eslint-scope@5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== + dependencies: + esrecurse "^4.3.0" + estraverse "^4.1.1" + +esprima@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" + integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== + +esrecurse@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" + integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== + dependencies: + estraverse "^5.2.0" + +estraverse@^4.1.1: + version "4.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" + integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== + +estraverse@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" + integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== + +etag@~1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" + integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= + +eventemitter3@^4.0.7: + version "4.0.7" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" + integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== + +events@^3.2.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" + integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== + +execa@^5.0.0: + version "5.1.1" + resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" + integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== + dependencies: + cross-spawn "^7.0.3" + get-stream "^6.0.0" + human-signals "^2.1.0" + is-stream "^2.0.0" + merge-stream "^2.0.0" + npm-run-path "^4.0.1" + onetime "^5.1.2" + signal-exit "^3.0.3" + strip-final-newline "^2.0.0" + +express-normalize-query-params-middleware@^0.5.0: + version "0.5.1" + resolved "https://registry.yarnpkg.com/express-normalize-query-params-middleware/-/express-normalize-query-params-middleware-0.5.1.tgz#dbe1e8139aecb234fb6adb5c0059c75db9733d2a" + integrity sha1-2+HoE5rssjT7attcAFnHXblzPSo= + +express-openapi@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/express-openapi/-/express-openapi-8.0.0.tgz#ea35ca9afd3619d423f2336d4df2bdf70abb1d46" + integrity sha512-MUntG3qQKdU5eRG51WLglaUfIXrVagQHNmStwl44lzu6XKiMj4TBDm/cIbubO49HAMCqNkX5BaiKCOK6pvP5Wg== + dependencies: + express-normalize-query-params-middleware "^0.5.0" + openapi-framework "^8.0.0" + openapi-types "^8.0.0" + +express@^4.17.1: + version "4.17.1" + resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" + integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g== + dependencies: + accepts "~1.3.7" + array-flatten "1.1.1" + body-parser "1.19.0" + content-disposition "0.5.3" + content-type "~1.0.4" + cookie "0.4.0" + cookie-signature "1.0.6" + debug "2.6.9" + depd "~1.1.2" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + finalhandler "~1.1.2" + fresh "0.5.2" + merge-descriptors "1.0.1" + methods "~1.1.2" + on-finished "~2.3.0" + parseurl "~1.3.3" + path-to-regexp "0.1.7" + proxy-addr "~2.0.5" + qs "6.7.0" + range-parser "~1.2.1" + safe-buffer "5.1.2" + send "0.17.1" + serve-static "1.14.1" + setprototypeof "1.1.1" + statuses "~1.5.0" + type-is "~1.6.18" + utils-merge "1.0.1" + vary "~1.1.2" + +external-editor@^2.0.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5" + integrity sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A== + dependencies: + chardet "^0.4.0" + iconv-lite "^0.4.17" + tmp "^0.0.33" + +fast-deep-equal@^3.1.1: + version "3.1.3" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== + +fast-glob@^3.1.1, fast-glob@^3.2.5: + version "3.2.7" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1" + integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q== + dependencies: + "@nodelib/fs.stat" "^2.0.2" + "@nodelib/fs.walk" "^1.2.3" + glob-parent "^5.1.2" + merge2 "^1.3.0" + micromatch "^4.0.4" + +fast-json-stable-stringify@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== + +fastest-levenshtein@^1.0.12: + version "1.0.12" + resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz#9990f7d3a88cc5a9ffd1f1745745251700d497e2" + integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow== + +fastq@^1.6.0: + version "1.12.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.12.0.tgz#ed7b6ab5d62393fb2cc591c853652a5c318bf794" + integrity sha512-VNX0QkHK3RsXVKr9KrlUv/FoTa0NdbYoHHl7uXHv2rzyHSlxjdNAKug2twd9luJxpcyNeAgf5iPPMutJO67Dfg== + dependencies: + reusify "^1.0.4" + +figures@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962" + integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI= + dependencies: + escape-string-regexp "^1.0.5" + +fill-range@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== + dependencies: + to-regex-range "^5.0.1" + +finalhandler@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" + integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== + dependencies: + debug "2.6.9" + encodeurl "~1.0.2" + escape-html "~1.0.3" + on-finished "~2.3.0" + parseurl "~1.3.3" + statuses "~1.5.0" + unpipe "~1.0.0" + +find-up@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" + integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== + dependencies: + locate-path "^6.0.0" + path-exists "^4.0.0" + +find-up@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== + dependencies: + locate-path "^5.0.0" + path-exists "^4.0.0" + +flat@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241" + integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ== + +forwarded@0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" + integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== + +fresh@0.5.2: + version "0.5.2" + resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" + integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= + +fs-routes@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/fs-routes/-/fs-routes-8.0.0.tgz#98100abe1810aa0374ca7c9f439b4c1dec8232e7" + integrity sha512-EezW71GPu+VK2ZOnX0Aljaref63+mvhkkz55DqUp5xryV/mJraA2t/XFmBxNMwgRq6tFUOYuQOlr+RQh4nq5kQ== + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + +fsevents@~2.3.1: + version "2.3.2" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" + integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== + +function-bind@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== + +get-caller-file@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" + integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== + +get-stream@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" + integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== + dependencies: + pump "^3.0.0" + +get-stream@^5.1.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" + integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== + dependencies: + pump "^3.0.0" + +get-stream@^6.0.0: + version "6.0.1" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" + integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== + +glob-parent@^5.1.2, glob-parent@~5.1.0: + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== + dependencies: + is-glob "^4.0.1" + +glob-parent@^6.0.0: + version "6.0.1" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.1.tgz#42054f685eb6a44e7a7d189a96efa40a54971aa7" + integrity sha512-kEVjS71mQazDBHKcsq4E9u/vUzaLcw1A8EtUeydawvIWQCJM0qQ08G1H7/XTjFUulla6XQiDOG6MXSaG0HDKog== + dependencies: + is-glob "^4.0.1" + +glob-to-regexp@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" + integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== + +glob@*, glob@^7.1.1, glob@^7.1.3, glob@^7.1.7: + version "7.1.7" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" + integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +glob@7.1.6: + version "7.1.6" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" + integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +globby@^11.0.3: + version "11.0.4" + resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5" + integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg== + dependencies: + array-union "^2.1.0" + dir-glob "^3.0.1" + fast-glob "^3.1.1" + ignore "^5.1.4" + merge2 "^1.3.0" + slash "^3.0.0" + +got@^9.6.0: + version "9.6.0" + resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" + integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q== + dependencies: + "@sindresorhus/is" "^0.14.0" + "@szmarczak/http-timer" "^1.1.2" + cacheable-request "^6.0.0" + decompress-response "^3.3.0" + duplexer3 "^0.1.4" + get-stream "^4.1.0" + lowercase-keys "^1.0.1" + mimic-response "^1.0.1" + p-cancelable "^1.0.0" + to-readable-stream "^1.0.0" + url-parse-lax "^3.0.0" + +graceful-fs@^4.1.2, graceful-fs@^4.2.4: + version "4.2.8" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" + integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== + +growl@1.10.5: + version "1.10.5" + resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e" + integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA== + +has-ansi@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" + integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= + dependencies: + ansi-regex "^2.0.0" + +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= + +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + +has@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== + dependencies: + function-bind "^1.1.1" + +he@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" + integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== + +http-cache-semantics@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" + integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== + +http-errors@1.7.2: + version "1.7.2" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" + integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg== + dependencies: + depd "~1.1.2" + inherits "2.0.3" + setprototypeof "1.1.1" + statuses ">= 1.5.0 < 2" + toidentifier "1.0.0" + +http-errors@~1.7.2: + version "1.7.3" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" + integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw== + dependencies: + depd "~1.1.2" + inherits "2.0.4" + setprototypeof "1.1.1" + statuses ">= 1.5.0 < 2" + toidentifier "1.0.0" + +human-signals@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" + integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== + +iconv-lite@0.4.24, iconv-lite@^0.4.13, iconv-lite@^0.4.17: + version "0.4.24" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" + integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== + dependencies: + safer-buffer ">= 2.1.2 < 3" + +iconv-lite@^0.6.2: + version "0.6.3" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" + integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== + dependencies: + safer-buffer ">= 2.1.2 < 3.0.0" + +icss-utils@^5.0.0, icss-utils@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" + integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA== + +ieee754@^1.1.13, ieee754@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" + integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== + +ignore@^5.1.4: + version "5.1.8" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" + integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw== + +import-local@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6" + integrity sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA== + dependencies: + pkg-dir "^4.2.0" + resolve-cwd "^3.0.0" + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@2.0.4, inherits@^2.0.3, inherits@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +inherits@2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" + integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= + +ini@~1.3.0: + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== + +inquirer@3.0.6: + version "3.0.6" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.0.6.tgz#e04aaa9d05b7a3cb9b0f407d04375f0447190347" + integrity sha1-4EqqnQW3o8ubD0B9BDdfBEcZA0c= + dependencies: + ansi-escapes "^1.1.0" + chalk "^1.0.0" + cli-cursor "^2.1.0" + cli-width "^2.0.0" + external-editor "^2.0.1" + figures "^2.0.0" + lodash "^4.3.0" + mute-stream "0.0.7" + run-async "^2.2.0" + rx "^4.1.0" + string-width "^2.0.0" + strip-ansi "^3.0.0" + through "^2.3.6" + +interpret@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9" + integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw== + +ip@^1.1.4: + version "1.1.5" + resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" + integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= + +ipaddr.js@1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" + integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== + +is-binary-path@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" + integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== + dependencies: + binary-extensions "^2.0.0" + +is-core-module@^2.2.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.6.0.tgz#d7553b2526fe59b92ba3e40c8df757ec8a709e19" + integrity sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ== + dependencies: + has "^1.0.3" + +is-dir@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-dir/-/is-dir-1.0.0.tgz#41d37f495fccacc05a4778d66e83024c292ba3ff" + integrity sha1-QdN/SV/MrMBaR3jWboMCTCkro/8= + +is-extglob@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= + +is-fullwidth-code-point@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" + integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= + +is-fullwidth-code-point@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== + +is-glob@^4.0.1, is-glob@~4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" + integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== + dependencies: + is-extglob "^2.1.1" + +is-number@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== + +is-plain-obj@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" + integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA== + +is-plain-object@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" + integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== + dependencies: + isobject "^3.0.1" + +is-stream@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" + integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= + +is-stream@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" + integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== + +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= + +isobject@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" + integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= + +jest-worker@^27.0.6: + version "27.1.0" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.1.0.tgz#65f4a88e37148ed984ba8ca8492d6b376938c0aa" + integrity sha512-mO4PHb2QWLn9yRXGp7rkvXLAYuxwhq1ZYUo0LoDhg8wqvv4QizP1ZWEJOeolgbEgAWZLIEU0wsku8J+lGWfBhg== + dependencies: + "@types/node" "*" + merge-stream "^2.0.0" + supports-color "^8.0.0" + +"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== + +js-yaml@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz#f426bc0ff4b4051926cd588c71113183409a121f" + integrity sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q== + dependencies: + argparse "^2.0.1" + +js-yaml@^3.10.0, js-yaml@^3.13.1: + version "3.14.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" + integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + +js-yaml@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" + integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== + dependencies: + argparse "^2.0.1" + +json-buffer@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" + integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg= + +json-parse-better-errors@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" + integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== + +json-schema-traverse@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" + integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== + +json5@^2.1.2: + version "2.2.0" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" + integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== + dependencies: + minimist "^1.2.5" + +keyv@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9" + integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA== + dependencies: + json-buffer "3.0.0" + +kind-of@^6.0.2: + version "6.0.3" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" + integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== + +latest-version@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" + integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA== + dependencies: + package-json "^6.3.0" + +loader-runner@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384" + integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw== + +loader-utils@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0" + integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ== + dependencies: + big.js "^5.2.2" + emojis-list "^3.0.0" + json5 "^2.1.2" + +locate-path@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" + integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== + dependencies: + p-locate "^4.1.0" + +locate-path@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" + integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== + dependencies: + p-locate "^5.0.0" + +lodash.merge@^4.6.1: + version "4.6.2" + resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" + integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== + +lodash@^4.3.0: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== + +log-symbols@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz#69b3cc46d20f448eccdb75ea1fa733d9e821c920" + integrity sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA== + dependencies: + chalk "^4.0.0" + +loose-envify@^1.1.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" + integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== + dependencies: + js-tokens "^3.0.0 || ^4.0.0" + +lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" + integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA== + +lowercase-keys@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" + integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA== + +lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== + dependencies: + yallist "^4.0.0" + +media-typer@0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" + integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= + +merge-descriptors@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" + integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= + +merge-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" + integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== + +merge2@^1.3.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" + integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== + +methods@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" + integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= + +micromatch@^4.0.0, micromatch@^4.0.4: + version "4.0.4" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" + integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== + dependencies: + braces "^3.0.1" + picomatch "^2.2.3" + +mime-db@1.49.0: + version "1.49.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.49.0.tgz#f3dfde60c99e9cf3bc9701d687778f537001cbed" + integrity sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA== + +mime-types@^2.1.27, mime-types@~2.1.24: + version "2.1.32" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.32.tgz#1d00e89e7de7fe02008db61001d9e02852670fd5" + integrity sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A== + dependencies: + mime-db "1.49.0" + +mime@1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" + integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== + +mimic-fn@^1.0.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" + integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ== + +mimic-fn@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" + integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== + +mimic-response@^1.0.0, mimic-response@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" + integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== + +minimatch@3.0.4, minimatch@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== + dependencies: + brace-expansion "^1.1.7" + +minimist@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" + integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= + +minimist@^1.2.0, minimist@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + +mkdirp@^0.5.3: + version "0.5.5" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" + integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== + dependencies: + minimist "^1.2.5" + +mocha@^8.4.0: + version "8.4.0" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-8.4.0.tgz#677be88bf15980a3cae03a73e10a0fc3997f0cff" + integrity sha512-hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ== + dependencies: + "@ungap/promise-all-settled" "1.1.2" + ansi-colors "4.1.1" + browser-stdout "1.3.1" + chokidar "3.5.1" + debug "4.3.1" + diff "5.0.0" + escape-string-regexp "4.0.0" + find-up "5.0.0" + glob "7.1.6" + growl "1.10.5" + he "1.2.0" + js-yaml "4.0.0" + log-symbols "4.0.0" + minimatch "3.0.4" + ms "2.1.3" + nanoid "3.1.20" + serialize-javascript "5.0.1" + strip-json-comments "3.1.1" + supports-color "8.1.1" + which "2.0.2" + wide-align "1.1.3" + workerpool "6.1.0" + yargs "16.2.0" + yargs-parser "20.2.4" + yargs-unparser "2.0.0" + +morgan@^1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz#091778abc1fc47cd3509824653dae1faab6b17d7" + integrity sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ== + dependencies: + basic-auth "~2.0.1" + debug "2.6.9" + depd "~2.0.0" + on-finished "~2.3.0" + on-headers "~1.0.2" + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= + +ms@2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" + integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== + +ms@2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + +ms@2.1.3: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + +mute-stream@0.0.7: + version "0.0.7" + resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" + integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s= + +nanoid@3.1.20: + version "3.1.20" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.20.tgz#badc263c6b1dcf14b71efaa85f6ab4c1d6cfc788" + integrity sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw== + +nanoid@^3.1.23: + version "3.1.25" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.25.tgz#09ca32747c0e543f0e1814b7d3793477f9c8e152" + integrity sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q== + +negotiator@0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" + integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== + +neo-async@^2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" + integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== + +node-fetch@1.6.3: + version "1.6.3" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.6.3.tgz#dc234edd6489982d58e8f0db4f695029abcd8c04" + integrity sha1-3CNO3WSJmC1Y6PDbT2lQKavNjAQ= + dependencies: + encoding "^0.1.11" + is-stream "^1.0.1" + +node-releases@^1.1.75: + version "1.1.75" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.75.tgz#6dd8c876b9897a1b8e5a02de26afa79bb54ebbfe" + integrity sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw== + +normalize-path@^3.0.0, normalize-path@~3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== + +normalize-url@^4.1.0: + version "4.5.1" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" + integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA== + +npm-run-path@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" + integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== + dependencies: + path-key "^3.0.0" + +object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + +on-finished@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" + integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= + dependencies: + ee-first "1.1.1" + +on-headers@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" + integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== + +once@^1.3.0, once@^1.3.1, once@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + dependencies: + wrappy "1" + +onetime@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4" + integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ= + dependencies: + mimic-fn "^1.0.0" + +onetime@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" + integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== + dependencies: + mimic-fn "^2.1.0" + +openapi-default-setter@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/openapi-default-setter/-/openapi-default-setter-8.0.0.tgz#17caf5c58f2c8d11609d270847952a3fc295f95b" + integrity sha512-Ro0hg8w+lTPe18r5noVUjHgYMXZ3mPe5evW6fA0hdahqLns444wR/Cuvcykb/FHteqaq0WooQrsoKObO4lIHWA== + dependencies: + openapi-types "^8.0.0" + +openapi-framework@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/openapi-framework/-/openapi-framework-8.0.0.tgz#5bdaaca75cd1344ff71f622948a0f89d55b6a716" + integrity sha512-T9rP8onTa5xU+7+FCiiBO/p0DLjbHlcfhu+8yUEWFlmlCyihqjbsH0YiH7cCQYNOLgKZUCQZOaxJDiYBlVIaQQ== + dependencies: + difunc "0.0.4" + fs-routes "^8.0.0" + glob "*" + is-dir "^1.0.0" + js-yaml "^3.10.0" + openapi-default-setter "^8.0.0" + openapi-request-coercer "^8.0.0" + openapi-request-validator "^8.0.0" + openapi-response-validator "^8.0.0" + openapi-schema-validator "^8.0.0" + openapi-security-handler "^8.0.0" + openapi-types "^8.0.0" + ts-log "^2.1.4" + +openapi-jsonschema-parameters@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/openapi-jsonschema-parameters/-/openapi-jsonschema-parameters-8.0.0.tgz#1aae51fe0c8312672ef3e20ef97f4456b3f33e59" + integrity sha512-yBBShgxPyo1M33q6RHNAvhTH6AydMDyDl7e89YUA/VkAf1wrU2HO/7Nok65R0vGbZFF43yml4i8sIak3GGnqVA== + dependencies: + openapi-types "^8.0.0" + +openapi-request-coercer@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/openapi-request-coercer/-/openapi-request-coercer-8.0.0.tgz#5767c12da1a40f509fa55147210b09d66a854ee0" + integrity sha512-CTWZJT6rAPiLO7kvBpN9CJ7TXbCTlZzE7Z/Id/gegK/5FlxYIoB+ybx4tYC4IwJEjfm/lxY7Xv2CRp6RLJfKPw== + dependencies: + openapi-types "^8.0.0" + ts-log "^2.1.4" + +openapi-request-validator@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/openapi-request-validator/-/openapi-request-validator-8.0.0.tgz#b22acecc73952ccc132fd3710e79e319eb8f20cc" + integrity sha512-7gqNp4MvYu+pbdbq8Pw0qMsKqlhWQeYdKCHiu1OeOgBG8YkjlNGGeTuX028TsBEB/jGw7PgMCggaHuMl/W3bmQ== + dependencies: + ajv "^6.5.4" + content-type "^1.0.4" + openapi-jsonschema-parameters "^8.0.0" + openapi-types "^8.0.0" + ts-log "^2.1.4" + +openapi-response-validator@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/openapi-response-validator/-/openapi-response-validator-8.0.0.tgz#ea4f3a43bcf9e151c1e90046f8a2d10c98607368" + integrity sha512-h41hcEIgT7ldowLafcWlaE2m3+ss9IgRRrBfEzTtdBab2SyefYeXBV5keicL/muC1msmhT2p2rftjQnvfQN2jA== + dependencies: + ajv "^6.5.4" + openapi-types "^8.0.0" + +openapi-schema-validator@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/openapi-schema-validator/-/openapi-schema-validator-8.0.0.tgz#6a0eb06bec103e057ea1f1051883bb8c465684a4" + integrity sha512-cxacCVE/pIhlfzDPjhMREEVgWsFFUxU/+bKU258LKDmgXcdbbajtWtRT63VarXPnQ0sS4Bhl3V4ZKWxdJMiOXA== + dependencies: + ajv "^6.5.2" + lodash.merge "^4.6.1" + openapi-types "^8.0.0" + swagger-schema-official "2.0.0-bab6bed" + +openapi-security-handler@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/openapi-security-handler/-/openapi-security-handler-8.0.0.tgz#0b4c1a589f61c4cee7bec0b945d6d3f494fdf023" + integrity sha512-XWD15AQSZA3OQFS1gqupC9KoxOuUacyG8PUEna91sihPvZdO5lVcAfqHkJ1tqOKcn5k8Y8EsSoCwlr0d5njCaw== + dependencies: + openapi-types "^8.0.0" + +openapi-types@^7.2.3: + version "7.2.3" + resolved "https://registry.yarnpkg.com/openapi-types/-/openapi-types-7.2.3.tgz#83829911a3410a022f0e0cf2b0b2e67232ccf96e" + integrity sha512-olbaNxz12R27+mTyJ/ZAFEfUruauHH27AkeQHDHRq5AF0LdNkK1SSV7EourXQDK+4aX7dv2HtyirAGK06WMAsA== + +openapi-types@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/openapi-types/-/openapi-types-8.0.0.tgz#7e1979538798d31a3c3bfed667e5e9295402f9bc" + integrity sha512-dcHYyCDOAy4QQTrur5Sn1L3lPVspB7rd04Rw/Q7AsMvfV797IiWgmKziFCbq8VhnBoREU/SPPSBDxtK9Biwa1g== + +opencollective-postinstall@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz#7a0fff978f6dbfa4d006238fbac98ed4198c3259" + integrity sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q== + +opencollective@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/opencollective/-/opencollective-1.0.3.tgz#aee6372bc28144583690c3ca8daecfc120dd0ef1" + integrity sha1-ruY3K8KBRFg2kMPKja7PwSDdDvE= + dependencies: + babel-polyfill "6.23.0" + chalk "1.1.3" + inquirer "3.0.6" + minimist "1.2.0" + node-fetch "1.6.3" + opn "4.0.2" + +opn@4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/opn/-/opn-4.0.2.tgz#7abc22e644dff63b0a96d5ab7f2790c0f01abc95" + integrity sha1-erwi5kTf9jsKltWrfyeQwPAavJU= + dependencies: + object-assign "^4.0.1" + pinkie-promise "^2.0.0" + +os-tmpdir@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" + integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= + +p-cancelable@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" + integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw== + +p-limit@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== + dependencies: + p-try "^2.0.0" + +p-limit@^3.0.2, p-limit@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" + integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== + dependencies: + yocto-queue "^0.1.0" + +p-locate@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" + integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== + dependencies: + p-limit "^2.2.0" + +p-locate@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" + integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== + dependencies: + p-limit "^3.0.2" + +p-try@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== + +package-json@^6.3.0: + version "6.5.0" + resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0" + integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ== + dependencies: + got "^9.6.0" + registry-auth-token "^4.0.0" + registry-url "^5.0.0" + semver "^6.2.0" + +parseurl@~1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" + integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== + +path-exists@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + +path-key@^3.0.0, path-key@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" + integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== + +path-parse@^1.0.6: + version "1.0.7" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== + +path-to-regexp@0.1.7: + version "0.1.7" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" + integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= + +path-type@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" + integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== + +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: + version "2.3.0" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" + integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== + +pinkie-promise@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" + integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o= + dependencies: + pinkie "^2.0.0" + +pinkie@^2.0.0: + version "2.0.4" + resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" + integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= + +pkg-dir@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" + integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== + dependencies: + find-up "^4.0.0" + +postcss-modules-extract-imports@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d" + integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw== + +postcss-modules-local-by-default@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c" + integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ== + dependencies: + icss-utils "^5.0.0" + postcss-selector-parser "^6.0.2" + postcss-value-parser "^4.1.0" + +postcss-modules-scope@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06" + integrity sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg== + dependencies: + postcss-selector-parser "^6.0.4" + +postcss-modules-values@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c" + integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ== + dependencies: + icss-utils "^5.0.0" + +postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4: + version "6.0.6" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea" + integrity sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg== + dependencies: + cssesc "^3.0.0" + util-deprecate "^1.0.2" + +postcss-value-parser@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb" + integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ== + +postcss@^8.2.15: + version "8.3.6" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.6.tgz#2730dd76a97969f37f53b9a6096197be311cc4ea" + integrity sha512-wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A== + dependencies: + colorette "^1.2.2" + nanoid "^3.1.23" + source-map-js "^0.6.2" + +prepend-http@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" + integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= + +process@^0.11.10: + version "0.11.10" + resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" + integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI= + +promise-queue@^2.2.3: + version "2.2.5" + resolved "https://registry.yarnpkg.com/promise-queue/-/promise-queue-2.2.5.tgz#2f6f5f7c0f6d08109e967659c79b88a9ed5e93b4" + integrity sha1-L29ffA9tCBCelnZZx5uIqe1ek7Q= + +proxy-addr@~2.0.5: + version "2.0.7" + resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" + integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== + dependencies: + forwarded "0.2.0" + ipaddr.js "1.9.1" + +pump@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" + integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== + dependencies: + end-of-stream "^1.1.0" + once "^1.3.1" + +punycode@1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" + integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0= + +punycode@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + +qs@6.7.0: + version "6.7.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" + integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== + +querystring@0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" + integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= + +queue-microtask@^1.2.2: + version "1.2.3" + resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" + integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== + +randombytes@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" + integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== + dependencies: + safe-buffer "^5.1.0" + +range-parser@~1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" + integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== + +raw-body@2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332" + integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q== + dependencies: + bytes "3.1.0" + http-errors "1.7.2" + iconv-lite "0.4.24" + unpipe "1.0.0" + +rc@^1.2.8: + version "1.2.8" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== + dependencies: + deep-extend "^0.6.0" + ini "~1.3.0" + minimist "^1.2.0" + strip-json-comments "~2.0.1" + +react-dom@^17.0.2: + version "17.0.2" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23" + integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + scheduler "^0.20.2" + +react@^17.0.2: + version "17.0.2" + resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037" + integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + +readable-stream@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" + integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + +readdirp@~3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e" + integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ== + dependencies: + picomatch "^2.2.1" + +rechoir@^0.7.0: + version "0.7.1" + resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686" + integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg== + dependencies: + resolve "^1.9.0" + +regenerator-runtime@^0.10.0: + version "0.10.5" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658" + integrity sha1-M2w+/BIgrc7dosn6tntaeVWjNlg= + +regenerator-runtime@^0.11.0: + version "0.11.1" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" + integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== + +registry-auth-token@^4.0.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250" + integrity sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw== + dependencies: + rc "^1.2.8" + +registry-url@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009" + integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw== + dependencies: + rc "^1.2.8" + +require-directory@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" + integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= + +resolve-cwd@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" + integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg== + dependencies: + resolve-from "^5.0.0" + +resolve-from@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" + integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== + +resolve@^1.3.2, resolve@^1.9.0: + version "1.20.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" + integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== + dependencies: + is-core-module "^2.2.0" + path-parse "^1.0.6" + +responselike@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" + integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec= + dependencies: + lowercase-keys "^1.0.0" + +restore-cursor@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf" + integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368= + dependencies: + onetime "^2.0.0" + signal-exit "^3.0.2" + +reusify@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" + integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== + +rimraf@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== + dependencies: + glob "^7.1.3" + +run-async@^2.2.0: + version "2.4.1" + resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" + integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ== + +run-parallel@^1.1.9: + version "1.2.0" + resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" + integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== + dependencies: + queue-microtask "^1.2.2" + +rx@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782" + integrity sha1-pfE/957zt0D+MKqAP7CfmIBdR4I= + +safe-buffer@5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + +safe-buffer@^5.1.0, safe-buffer@~5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== + +"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0": + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + +scheduler@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91" + integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + +schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" + integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw== + dependencies: + "@types/json-schema" "^7.0.8" + ajv "^6.12.5" + ajv-keywords "^3.5.2" + +semver@^5.3.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + +semver@^6.2.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + +semver@^7.3.4, semver@^7.3.5: + version "7.3.5" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== + dependencies: + lru-cache "^6.0.0" + +send@0.17.1: + version "0.17.1" + resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" + integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg== + dependencies: + debug "2.6.9" + depd "~1.1.2" + destroy "~1.0.4" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + fresh "0.5.2" + http-errors "~1.7.2" + mime "1.6.0" + ms "2.1.1" + on-finished "~2.3.0" + range-parser "~1.2.1" + statuses "~1.5.0" + +serialize-javascript@5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4" + integrity sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA== + dependencies: + randombytes "^2.1.0" + +serialize-javascript@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" + integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag== + dependencies: + randombytes "^2.1.0" + +serve-static@1.14.1: + version "1.14.1" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" + integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg== + dependencies: + encodeurl "~1.0.2" + escape-html "~1.0.3" + parseurl "~1.3.3" + send "0.17.1" + +setprototypeof@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" + integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== + +shallow-clone@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" + integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA== + dependencies: + kind-of "^6.0.2" + +shebang-command@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" + integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== + dependencies: + shebang-regex "^3.0.0" + +shebang-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" + integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== + +sift@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/sift/-/sift-7.0.1.tgz#47d62c50b159d316f1372f8b53f9c10cd21a4b08" + integrity sha512-oqD7PMJ+uO6jV9EQCl0LrRw1OwsiPsiFQR5AR30heR+4Dl7jBBbDLnNvWiak20tzZlSE1H7RB30SX/1j/YYT7g== + +signal-exit@^3.0.2, signal-exit@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" + integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== + +slash@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" + integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== + +source-map-js@^0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz#0bb5de631b41cfbda6cfba8bd05a80efdfd2385e" + integrity sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug== + +source-map-support@^0.5.19, source-map-support@~0.5.19: + version "0.5.19" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" + integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + +source-map@^0.6.0, source-map@^0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== + +source-map@~0.7.2: + version "0.7.3" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" + integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== + +sprintf-js@~1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= + +"statuses@>= 1.5.0 < 2", statuses@~1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" + integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= + +stream-http@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-3.2.0.tgz#1872dfcf24cb15752677e40e5c3f9cc1926028b5" + integrity sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A== + dependencies: + builtin-status-codes "^3.0.0" + inherits "^2.0.4" + readable-stream "^3.6.0" + xtend "^4.0.2" + +"string-width@^1.0.2 || 2", string-width@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" + integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== + dependencies: + is-fullwidth-code-point "^2.0.0" + strip-ansi "^4.0.0" + +string-width@^4.1.0, string-width@^4.2.0: + version "4.2.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5" + integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.0" + +string_decoder@^1.1.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== + dependencies: + safe-buffer "~5.2.0" + +strip-ansi@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= + dependencies: + ansi-regex "^2.0.0" + +strip-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" + integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= + dependencies: + ansi-regex "^3.0.0" + +strip-ansi@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" + integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== + dependencies: + ansi-regex "^5.0.0" + +strip-final-newline@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" + integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== + +strip-json-comments@3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" + integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== + +strip-json-comments@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= + +style-loader@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-2.0.0.tgz#9669602fd4690740eaaec137799a03addbbc393c" + integrity sha512-Z0gYUJmzZ6ZdRUqpg1r8GsaFKypE+3xAzuFeMuoHgjc9KZv3wMyCRjQIWEbhoFSq7+7yoHXySDJyyWQaPajeiQ== + dependencies: + loader-utils "^2.0.0" + schema-utils "^3.0.0" + +supports-color@8.1.1, supports-color@^8.0.0: + version "8.1.1" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" + integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== + dependencies: + has-flag "^4.0.0" + +supports-color@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" + integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= + +supports-color@^5.3.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== + dependencies: + has-flag "^3.0.0" + +supports-color@^7.1.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== + dependencies: + has-flag "^4.0.0" + +swagger-schema-official@2.0.0-bab6bed: + version "2.0.0-bab6bed" + resolved "https://registry.yarnpkg.com/swagger-schema-official/-/swagger-schema-official-2.0.0-bab6bed.tgz#70070468d6d2977ca5237b2e519ca7d06a2ea3fd" + integrity sha1-cAcEaNbSl3ylI3suUZyn0Gouo/0= + +swagger-ui-dist@3.51.2: + version "3.51.2" + resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-3.51.2.tgz#b0f377edf91a7fd1f4026f4ccc75c072ea610b7b" + integrity sha512-7aDfpvGrya61WQN4Eb6x5TELvYb5+7SRJQNYySkKUDGiRIwj1A8B2PNsXs4xMD0/5t8uNi4zW58KSofutcBdhw== + +tail@^2.2.3: + version "2.2.3" + resolved "https://registry.yarnpkg.com/tail/-/tail-2.2.3.tgz#3e6bf65963bb868913e4e3b770cc1584c9d8091c" + integrity sha512-XbBmVsJZ636kncPew2Y+pOxOsb9GsNFZ1bcAGCDn23ME/JPJ+TImZYjnqBnMLdw+K11Hql5ZgiUQmRvDHaFc6w== + +tapable@^2.1.1, tapable@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.0.tgz#5c373d281d9c672848213d0e037d1c4165ab426b" + integrity sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw== + +terser-webpack-plugin@^5.1.3: + version "5.2.3" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.2.3.tgz#4852c91f709a4ea2bcf324cf48e7e88124cda0cc" + integrity sha512-eDbuaDlXhVaaoKuLD3DTNTozKqln6xOG6Us0SzlKG5tNlazG+/cdl8pm9qiF1Di89iWScTI0HcO+CDcf2dkXiw== + dependencies: + jest-worker "^27.0.6" + p-limit "^3.1.0" + schema-utils "^3.1.1" + serialize-javascript "^6.0.0" + source-map "^0.6.1" + terser "^5.7.2" + +terser@^5.7.2: + version "5.7.2" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.7.2.tgz#d4d95ed4f8bf735cb933e802f2a1829abf545e3f" + integrity sha512-0Omye+RD4X7X69O0eql3lC4Heh/5iLj3ggxR/B5ketZLOtLiOqukUgjw3q4PDnNQbsrkKr3UMypqStQG3XKRvw== + dependencies: + commander "^2.20.0" + source-map "~0.7.2" + source-map-support "~0.5.19" + +through@^2.3.6: + version "2.3.8" + resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" + integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= + +tmp@^0.0.33: + version "0.0.33" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" + integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw== + dependencies: + os-tmpdir "~1.0.2" + +to-readable-stream@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771" + integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q== + +to-regex-range@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== + dependencies: + is-number "^7.0.0" + +toidentifier@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" + integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== + +ts-loader@^9.2.3: + version "9.2.5" + resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.2.5.tgz#127733a5e9243bf6dafcb8aa3b8a266d8041dca9" + integrity sha512-al/ATFEffybdRMUIr5zMEWQdVnCGMUA9d3fXJ8dBVvBlzytPvIszoG9kZoR+94k6/i293RnVOXwMaWbXhNy9pQ== + dependencies: + chalk "^4.1.0" + enhanced-resolve "^5.0.0" + micromatch "^4.0.0" + semver "^7.3.4" + +ts-log@^2.1.4: + version "2.2.3" + resolved "https://registry.yarnpkg.com/ts-log/-/ts-log-2.2.3.tgz#4da5640fe25a9fb52642cd32391c886721318efb" + integrity sha512-XvB+OdKSJ708Dmf9ore4Uf/q62AYDTzFcAdxc8KNML1mmAWywRFVt/dn1KYJH8Agt5UJNujfM3znU5PxgAzA2w== + +tslib@^1.13.0, tslib@^1.8.1: + version "1.14.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" + integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== + +tslib@^2.1.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" + integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== + +tslint-config-prettier@^1.18.0: + version "1.18.0" + resolved "https://registry.yarnpkg.com/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz#75f140bde947d35d8f0d238e0ebf809d64592c37" + integrity sha512-xPw9PgNPLG3iKRxmK7DWr+Ea/SzrvfHtjFt5LBl61gk2UBG/DB9kCXRjv+xyIU1rUtnayLeMUVJBcMX8Z17nDg== + +tslint@^6.1.3: + version "6.1.3" + resolved "https://registry.yarnpkg.com/tslint/-/tslint-6.1.3.tgz#5c23b2eccc32487d5523bd3a470e9aa31789d904" + integrity sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg== + dependencies: + "@babel/code-frame" "^7.0.0" + builtin-modules "^1.1.1" + chalk "^2.3.0" + commander "^2.12.1" + diff "^4.0.1" + glob "^7.1.1" + js-yaml "^3.13.1" + minimatch "^3.0.4" + mkdirp "^0.5.3" + resolve "^1.3.2" + semver "^5.3.0" + tslib "^1.13.0" + tsutils "^2.29.0" + +tsutils@^2.29.0: + version "2.29.0" + resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99" + integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA== + dependencies: + tslib "^1.8.1" + +type-is@~1.6.17, type-is@~1.6.18: + version "1.6.18" + resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" + integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== + dependencies: + media-typer "0.3.0" + mime-types "~2.1.24" + +typescript@^4.3.5: + version "4.4.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.2.tgz#6d618640d430e3569a1dfb44f7d7e600ced3ee86" + integrity sha512-gzP+t5W4hdy4c+68bfcv0t400HVJMMd2+H9B7gae1nQlBzCqvrXX+6GL/b3GAgyTH966pzrZ70/fRjwAtZksSQ== + +unpipe@1.0.0, unpipe@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" + integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= + +uri-js@^4.2.2: + version "4.4.1" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== + dependencies: + punycode "^2.1.0" + +url-parse-lax@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" + integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww= + dependencies: + prepend-http "^2.0.0" + +url@^0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" + integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE= + dependencies: + punycode "1.3.2" + querystring "0.2.0" + +util-deprecate@^1.0.1, util-deprecate@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + +utils-merge@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" + integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= + +v8-compile-cache@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" + integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== + +vary@^1, vary@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" + integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= + +watchpack@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.2.0.tgz#47d78f5415fe550ecd740f99fe2882323a58b1ce" + integrity sha512-up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA== + dependencies: + glob-to-regexp "^0.4.1" + graceful-fs "^4.1.2" + +webpack-cli@^4.7.2: + version "4.8.0" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.8.0.tgz#5fc3c8b9401d3c8a43e2afceacfa8261962338d1" + integrity sha512-+iBSWsX16uVna5aAYN6/wjhJy1q/GKk4KjKvfg90/6hykCTSgozbfz5iRgDTSJt/LgSbYxdBX3KBHeobIs+ZEw== + dependencies: + "@discoveryjs/json-ext" "^0.5.0" + "@webpack-cli/configtest" "^1.0.4" + "@webpack-cli/info" "^1.3.0" + "@webpack-cli/serve" "^1.5.2" + colorette "^1.2.1" + commander "^7.0.0" + execa "^5.0.0" + fastest-levenshtein "^1.0.12" + import-local "^3.0.2" + interpret "^2.2.0" + rechoir "^0.7.0" + v8-compile-cache "^2.2.0" + webpack-merge "^5.7.3" + +webpack-merge@^5.7.3: + version "5.8.0" + resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61" + integrity sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q== + dependencies: + clone-deep "^4.0.1" + wildcard "^2.0.0" + +webpack-sources@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.0.tgz#b16973bcf844ebcdb3afde32eda1c04d0b90f89d" + integrity sha512-fahN08Et7P9trej8xz/Z7eRu8ltyiygEo/hnRi9KqBUs80KeDcnf96ZJo++ewWd84fEf3xSX9bp4ZS9hbw0OBw== + +webpack@5.48.0: + version "5.48.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.48.0.tgz#06180fef9767a6fd066889559a4c4d49bee19b83" + integrity sha512-CGe+nfbHrYzbk7SKoYITCgN3LRAG0yVddjNUecz9uugo1QtYdiyrVD8nP1PhkNqPfdxC2hknmmKpP355Epyn6A== + dependencies: + "@types/eslint-scope" "^3.7.0" + "@types/estree" "^0.0.50" + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/wasm-edit" "1.11.1" + "@webassemblyjs/wasm-parser" "1.11.1" + acorn "^8.4.1" + acorn-import-assertions "^1.7.6" + browserslist "^4.14.5" + chrome-trace-event "^1.0.2" + enhanced-resolve "^5.8.0" + es-module-lexer "^0.7.1" + eslint-scope "5.1.1" + events "^3.2.0" + glob-to-regexp "^0.4.1" + graceful-fs "^4.2.4" + json-parse-better-errors "^1.0.2" + loader-runner "^4.2.0" + mime-types "^2.1.27" + neo-async "^2.6.2" + schema-utils "^3.1.0" + tapable "^2.1.1" + terser-webpack-plugin "^5.1.3" + watchpack "^2.2.0" + webpack-sources "^3.2.0" + +which@2.0.2, which@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== + dependencies: + isexe "^2.0.0" + +wide-align@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" + integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== + dependencies: + string-width "^1.0.2 || 2" + +wildcard@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" + integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw== + +workerpool@6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.1.0.tgz#a8e038b4c94569596852de7a8ea4228eefdeb37b" + integrity sha512-toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg== + +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + +xtend@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" + integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== + +y18n@^5.0.5: + version "5.0.8" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" + integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== + +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== + +yargs-parser@20.2.4: + version "20.2.4" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" + integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== + +yargs-parser@^20.2.2: + version "20.2.9" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" + integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== + +yargs-unparser@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb" + integrity sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA== + dependencies: + camelcase "^6.0.0" + decamelize "^4.0.0" + flat "^5.0.2" + is-plain-obj "^2.1.0" + +yargs@16.2.0: + version "16.2.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" + integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== + dependencies: + cliui "^7.0.2" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.0" + y18n "^5.0.5" + yargs-parser "^20.2.2" + +yocto-queue@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" + integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== diff --git a/pkgs/applications/video/mirakurun/yarn.nix b/pkgs/applications/video/mirakurun/yarn.nix new file mode 100644 index 000000000000..5fcafbe637a5 --- /dev/null +++ b/pkgs/applications/video/mirakurun/yarn.nix @@ -0,0 +1,3765 @@ +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { + offline_cache = linkFarm "offline" packages; + packages = [ + { + name = "_babel_code_frame___code_frame_7.14.5.tgz"; + path = fetchurl { + name = "_babel_code_frame___code_frame_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz"; + sha1 = "23b08d740e83f49c5e59945fbf1b43e80bbf4edb"; + }; + } + { + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.9.tgz"; + path = fetchurl { + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.9.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz"; + sha1 = "6654d171b2024f6d8ee151bf2509699919131d48"; + }; + } + { + name = "_babel_highlight___highlight_7.14.5.tgz"; + path = fetchurl { + name = "_babel_highlight___highlight_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz"; + sha1 = "6861a52f03966405001f6aa534a01a24d99e8cd9"; + }; + } + { + name = "_discoveryjs_json_ext___json_ext_0.5.3.tgz"; + path = fetchurl { + name = "_discoveryjs_json_ext___json_ext_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz"; + sha1 = "90420f9f9c6d3987f176a19a7d8e764271a2f55d"; + }; + } + { + name = "_fluentui_date_time_utilities___date_time_utilities_8.2.2.tgz"; + path = fetchurl { + name = "_fluentui_date_time_utilities___date_time_utilities_8.2.2.tgz"; + url = "https://registry.yarnpkg.com/@fluentui/date-time-utilities/-/date-time-utilities-8.2.2.tgz"; + sha1 = "535d5bb6ee7ccfa8cc774c790e31d3d5d4edbad6"; + }; + } + { + name = "_fluentui_dom_utilities___dom_utilities_2.1.4.tgz"; + path = fetchurl { + name = "_fluentui_dom_utilities___dom_utilities_2.1.4.tgz"; + url = "https://registry.yarnpkg.com/@fluentui/dom-utilities/-/dom-utilities-2.1.4.tgz"; + sha1 = "a8eeaf906cc19f547ae40c662d2776cb2540ea11"; + }; + } + { + name = "_fluentui_font_icons_mdl2___font_icons_mdl2_8.1.11.tgz"; + path = fetchurl { + name = "_fluentui_font_icons_mdl2___font_icons_mdl2_8.1.11.tgz"; + url = "https://registry.yarnpkg.com/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.1.11.tgz"; + sha1 = "ba974aa5e1fd219a96f3b664d3b9a18956d39bab"; + }; + } + { + name = "_fluentui_foundation_legacy___foundation_legacy_8.1.11.tgz"; + path = fetchurl { + name = "_fluentui_foundation_legacy___foundation_legacy_8.1.11.tgz"; + url = "https://registry.yarnpkg.com/@fluentui/foundation-legacy/-/foundation-legacy-8.1.11.tgz"; + sha1 = "a7c51037af8bb58894bc769db16663b991084f8b"; + }; + } + { + name = "_fluentui_keyboard_key___keyboard_key_0.3.4.tgz"; + path = fetchurl { + name = "_fluentui_keyboard_key___keyboard_key_0.3.4.tgz"; + url = "https://registry.yarnpkg.com/@fluentui/keyboard-key/-/keyboard-key-0.3.4.tgz"; + sha1 = "27c95ea9d43d91cc9c64c318feb10986250584cd"; + }; + } + { + name = "_fluentui_merge_styles___merge_styles_8.1.5.tgz"; + path = fetchurl { + name = "_fluentui_merge_styles___merge_styles_8.1.5.tgz"; + url = "https://registry.yarnpkg.com/@fluentui/merge-styles/-/merge-styles-8.1.5.tgz"; + sha1 = "f5d5c4bd547aa41311f970e652a512a1c5a5bfb3"; + }; + } + { + name = "_fluentui_react_focus___react_focus_8.2.2.tgz"; + path = fetchurl { + name = "_fluentui_react_focus___react_focus_8.2.2.tgz"; + url = "https://registry.yarnpkg.com/@fluentui/react-focus/-/react-focus-8.2.2.tgz"; + sha1 = "74231170eeb02ce1798ed8ceb72a0fcdcf89a337"; + }; + } + { + name = "_fluentui_react_hooks___react_hooks_8.3.2.tgz"; + path = fetchurl { + name = "_fluentui_react_hooks___react_hooks_8.3.2.tgz"; + url = "https://registry.yarnpkg.com/@fluentui/react-hooks/-/react-hooks-8.3.2.tgz"; + sha1 = "fb6e900a0ecbada116f52cc2df8628e7c54a9fa9"; + }; + } + { + name = "_fluentui_react_window_provider___react_window_provider_2.1.4.tgz"; + path = fetchurl { + name = "_fluentui_react_window_provider___react_window_provider_2.1.4.tgz"; + url = "https://registry.yarnpkg.com/@fluentui/react-window-provider/-/react-window-provider-2.1.4.tgz"; + sha1 = "2e8368fd85f9e10062c726b060b146ffc1f916b3"; + }; + } + { + name = "_fluentui_react___react_8.27.0.tgz"; + path = fetchurl { + name = "_fluentui_react___react_8.27.0.tgz"; + url = "https://registry.yarnpkg.com/@fluentui/react/-/react-8.27.0.tgz"; + sha1 = "dc41d11eed9b217ff0d3ad5ace85e92281f855e3"; + }; + } + { + name = "_fluentui_set_version___set_version_8.1.4.tgz"; + path = fetchurl { + name = "_fluentui_set_version___set_version_8.1.4.tgz"; + url = "https://registry.yarnpkg.com/@fluentui/set-version/-/set-version-8.1.4.tgz"; + sha1 = "89fa88223f421981427dfd5372d46210045354e8"; + }; + } + { + name = "_fluentui_style_utilities___style_utilities_8.3.2.tgz"; + path = fetchurl { + name = "_fluentui_style_utilities___style_utilities_8.3.2.tgz"; + url = "https://registry.yarnpkg.com/@fluentui/style-utilities/-/style-utilities-8.3.2.tgz"; + sha1 = "721a975e41996db24256064b02def921e201e323"; + }; + } + { + name = "_fluentui_theme___theme_2.3.2.tgz"; + path = fetchurl { + name = "_fluentui_theme___theme_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/@fluentui/theme/-/theme-2.3.2.tgz"; + sha1 = "9094fc8e52758c34a5f396be91a0219bb85111a7"; + }; + } + { + name = "_fluentui_utilities___utilities_8.3.2.tgz"; + path = fetchurl { + name = "_fluentui_utilities___utilities_8.3.2.tgz"; + url = "https://registry.yarnpkg.com/@fluentui/utilities/-/utilities-8.3.2.tgz"; + sha1 = "3378c17523d1833d6ba829bcd5d091aab03f59e5"; + }; + } + { + name = "_microsoft_load_themed_styles___load_themed_styles_1.10.206.tgz"; + path = fetchurl { + name = "_microsoft_load_themed_styles___load_themed_styles_1.10.206.tgz"; + url = "https://registry.yarnpkg.com/@microsoft/load-themed-styles/-/load-themed-styles-1.10.206.tgz"; + sha1 = "9b18bb4cb5bcfd92e07d4323889731574ba6eb06"; + }; + } + { + name = "_nodelib_fs.scandir___fs.scandir_2.1.5.tgz"; + path = fetchurl { + name = "_nodelib_fs.scandir___fs.scandir_2.1.5.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"; + sha1 = "7619c2eb21b25483f6d167548b4cfd5a7488c3d5"; + }; + } + { + name = "_nodelib_fs.stat___fs.stat_2.0.5.tgz"; + path = fetchurl { + name = "_nodelib_fs.stat___fs.stat_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"; + sha1 = "5bd262af94e9d25bd1e71b05deed44876a222e8b"; + }; + } + { + name = "_nodelib_fs.walk___fs.walk_1.2.8.tgz"; + path = fetchurl { + name = "_nodelib_fs.walk___fs.walk_1.2.8.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"; + sha1 = "e95737e8bb6746ddedf69c556953494f196fe69a"; + }; + } + { + name = "_sindresorhus_is___is_0.14.0.tgz"; + path = fetchurl { + name = "_sindresorhus_is___is_0.14.0.tgz"; + url = "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz"; + sha1 = "9fb3a3cf3132328151f353de4632e01e52102bea"; + }; + } + { + name = "_szmarczak_http_timer___http_timer_1.1.2.tgz"; + path = fetchurl { + name = "_szmarczak_http_timer___http_timer_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz"; + sha1 = "b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"; + }; + } + { + name = "_types_body_parser___body_parser_1.19.1.tgz"; + path = fetchurl { + name = "_types_body_parser___body_parser_1.19.1.tgz"; + url = "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.1.tgz"; + sha1 = "0c0174c42a7d017b818303d4b5d969cb0b75929c"; + }; + } + { + name = "_types_connect___connect_3.4.35.tgz"; + path = fetchurl { + name = "_types_connect___connect_3.4.35.tgz"; + url = "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz"; + sha1 = "5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1"; + }; + } + { + name = "_types_cors___cors_2.8.12.tgz"; + path = fetchurl { + name = "_types_cors___cors_2.8.12.tgz"; + url = "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz"; + sha1 = "6b2c510a7ad7039e98e7b8d3d6598f4359e5c080"; + }; + } + { + name = "_types_eslint_scope___eslint_scope_3.7.1.tgz"; + path = fetchurl { + name = "_types_eslint_scope___eslint_scope_3.7.1.tgz"; + url = "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.1.tgz"; + sha1 = "8dc390a7b4f9dd9f1284629efce982e41612116e"; + }; + } + { + name = "_types_eslint___eslint_7.28.0.tgz"; + path = fetchurl { + name = "_types_eslint___eslint_7.28.0.tgz"; + url = "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.28.0.tgz"; + sha1 = "7e41f2481d301c68e14f483fe10b017753ce8d5a"; + }; + } + { + name = "_types_estree___estree_0.0.50.tgz"; + path = fetchurl { + name = "_types_estree___estree_0.0.50.tgz"; + url = "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz"; + sha1 = "1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83"; + }; + } + { + name = "_types_express_serve_static_core___express_serve_static_core_4.17.24.tgz"; + path = fetchurl { + name = "_types_express_serve_static_core___express_serve_static_core_4.17.24.tgz"; + url = "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.24.tgz"; + sha1 = "ea41f93bf7e0d59cd5a76665068ed6aab6815c07"; + }; + } + { + name = "_types_express___express_4.17.13.tgz"; + path = fetchurl { + name = "_types_express___express_4.17.13.tgz"; + url = "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz"; + sha1 = "a76e2995728999bab51a33fabce1d705a3709034"; + }; + } + { + name = "_types_ip___ip_1.1.0.tgz"; + path = fetchurl { + name = "_types_ip___ip_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/@types/ip/-/ip-1.1.0.tgz"; + sha1 = "aec4f5bfd49e4a4c53b590d88c36eb078827a7c0"; + }; + } + { + name = "_types_js_yaml___js_yaml_4.0.3.tgz"; + path = fetchurl { + name = "_types_js_yaml___js_yaml_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.3.tgz"; + sha1 = "9f33cd6fbf0d5ec575dc8c8fc69c7fec1b4eb200"; + }; + } + { + name = "_types_json_schema___json_schema_7.0.9.tgz"; + path = fetchurl { + name = "_types_json_schema___json_schema_7.0.9.tgz"; + url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz"; + sha1 = "97edc9037ea0c38585320b28964dde3b39e4660d"; + }; + } + { + name = "_types_mime___mime_1.3.2.tgz"; + path = fetchurl { + name = "_types_mime___mime_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz"; + sha1 = "93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"; + }; + } + { + name = "_types_morgan___morgan_1.9.3.tgz"; + path = fetchurl { + name = "_types_morgan___morgan_1.9.3.tgz"; + url = "https://registry.yarnpkg.com/@types/morgan/-/morgan-1.9.3.tgz"; + sha1 = "ae04180dff02c437312bc0cfb1e2960086b2f540"; + }; + } + { + name = "_types_node___node_16.7.10.tgz"; + path = fetchurl { + name = "_types_node___node_16.7.10.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-16.7.10.tgz"; + sha1 = "7aa732cc47341c12a16b7d562f519c2383b6d4fc"; + }; + } + { + name = "_types_node___node_12.20.23.tgz"; + path = fetchurl { + name = "_types_node___node_12.20.23.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-12.20.23.tgz"; + sha1 = "d0d5885bb885ee9b1ed114a04ea586540a1b2e2a"; + }; + } + { + name = "_types_promise_queue___promise_queue_2.2.0.tgz"; + path = fetchurl { + name = "_types_promise_queue___promise_queue_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/@types/promise-queue/-/promise-queue-2.2.0.tgz"; + sha1 = "cdba35f1b2c0bd8aa2bf925c2b1ed02958067a0a"; + }; + } + { + name = "_types_prop_types___prop_types_15.7.4.tgz"; + path = fetchurl { + name = "_types_prop_types___prop_types_15.7.4.tgz"; + url = "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz"; + sha1 = "fcf7205c25dff795ee79af1e30da2c9790808f11"; + }; + } + { + name = "_types_qs___qs_6.9.7.tgz"; + path = fetchurl { + name = "_types_qs___qs_6.9.7.tgz"; + url = "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz"; + sha1 = "63bb7d067db107cc1e457c303bc25d511febf6cb"; + }; + } + { + name = "_types_range_parser___range_parser_1.2.4.tgz"; + path = fetchurl { + name = "_types_range_parser___range_parser_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz"; + sha1 = "cd667bcfdd025213aafb7ca5915a932590acdcdc"; + }; + } + { + name = "_types_react_dom___react_dom_17.0.9.tgz"; + path = fetchurl { + name = "_types_react_dom___react_dom_17.0.9.tgz"; + url = "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.9.tgz"; + sha1 = "441a981da9d7be117042e1a6fd3dac4b30f55add"; + }; + } + { + name = "_types_react___react_17.0.20.tgz"; + path = fetchurl { + name = "_types_react___react_17.0.20.tgz"; + url = "https://registry.yarnpkg.com/@types/react/-/react-17.0.20.tgz"; + sha1 = "a4284b184d47975c71658cd69e759b6bd37c3b8c"; + }; + } + { + name = "_types_scheduler___scheduler_0.16.2.tgz"; + path = fetchurl { + name = "_types_scheduler___scheduler_0.16.2.tgz"; + url = "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz"; + sha1 = "1a62f89525723dde24ba1b01b092bf5df8ad4d39"; + }; + } + { + name = "_types_serve_static___serve_static_1.13.10.tgz"; + path = fetchurl { + name = "_types_serve_static___serve_static_1.13.10.tgz"; + url = "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz"; + sha1 = "f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9"; + }; + } + { + name = "_ungap_promise_all_settled___promise_all_settled_1.1.2.tgz"; + path = fetchurl { + name = "_ungap_promise_all_settled___promise_all_settled_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz"; + sha1 = "aa58042711d6e3275dd37dc597e5d31e8c290a44"; + }; + } + { + name = "_webassemblyjs_ast___ast_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_ast___ast_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz"; + sha1 = "2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"; + }; + } + { + name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz"; + sha1 = "f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f"; + }; + } + { + name = "_webassemblyjs_helper_api_error___helper_api_error_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_api_error___helper_api_error_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz"; + sha1 = "1a63192d8788e5c012800ba6a7a46c705288fd16"; + }; + } + { + name = "_webassemblyjs_helper_buffer___helper_buffer_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_buffer___helper_buffer_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz"; + sha1 = "832a900eb444884cde9a7cad467f81500f5e5ab5"; + }; + } + { + name = "_webassemblyjs_helper_numbers___helper_numbers_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_numbers___helper_numbers_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz"; + sha1 = "64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae"; + }; + } + { + name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz"; + sha1 = "f328241e41e7b199d0b20c18e88429c4433295e1"; + }; + } + { + name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz"; + sha1 = "21ee065a7b635f319e738f0dd73bfbda281c097a"; + }; + } + { + name = "_webassemblyjs_ieee754___ieee754_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_ieee754___ieee754_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz"; + sha1 = "963929e9bbd05709e7e12243a099180812992614"; + }; + } + { + name = "_webassemblyjs_leb128___leb128_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_leb128___leb128_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz"; + sha1 = "ce814b45574e93d76bae1fb2644ab9cdd9527aa5"; + }; + } + { + name = "_webassemblyjs_utf8___utf8_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_utf8___utf8_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz"; + sha1 = "d1f8b764369e7c6e6bae350e854dec9a59f0a3ff"; + }; + } + { + name = "_webassemblyjs_wasm_edit___wasm_edit_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_edit___wasm_edit_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz"; + sha1 = "ad206ebf4bf95a058ce9880a8c092c5dec8193d6"; + }; + } + { + name = "_webassemblyjs_wasm_gen___wasm_gen_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_gen___wasm_gen_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz"; + sha1 = "86c5ea304849759b7d88c47a32f4f039ae3c8f76"; + }; + } + { + name = "_webassemblyjs_wasm_opt___wasm_opt_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_opt___wasm_opt_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz"; + sha1 = "657b4c2202f4cf3b345f8a4c6461c8c2418985f2"; + }; + } + { + name = "_webassemblyjs_wasm_parser___wasm_parser_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_parser___wasm_parser_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz"; + sha1 = "86ca734534f417e9bd3c67c7a1c75d8be41fb199"; + }; + } + { + name = "_webassemblyjs_wast_printer___wast_printer_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_wast_printer___wast_printer_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz"; + sha1 = "d0c73beda8eec5426f10ae8ef55cee5e7084c2f0"; + }; + } + { + name = "_webpack_cli_configtest___configtest_1.0.4.tgz"; + path = fetchurl { + name = "_webpack_cli_configtest___configtest_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.4.tgz"; + sha1 = "f03ce6311c0883a83d04569e2c03c6238316d2aa"; + }; + } + { + name = "_webpack_cli_info___info_1.3.0.tgz"; + path = fetchurl { + name = "_webpack_cli_info___info_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.3.0.tgz"; + sha1 = "9d78a31101a960997a4acd41ffd9b9300627fe2b"; + }; + } + { + name = "_webpack_cli_serve___serve_1.5.2.tgz"; + path = fetchurl { + name = "_webpack_cli_serve___serve_1.5.2.tgz"; + url = "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.5.2.tgz"; + sha1 = "ea584b637ff63c5a477f6f21604b5a205b72c9ec"; + }; + } + { + name = "_xtuc_ieee754___ieee754_1.2.0.tgz"; + path = fetchurl { + name = "_xtuc_ieee754___ieee754_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz"; + sha1 = "eef014a3145ae477a1cbc00cd1e552336dceb790"; + }; + } + { + name = "_xtuc_long___long_4.2.2.tgz"; + path = fetchurl { + name = "_xtuc_long___long_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz"; + sha1 = "d291c6a4e97989b5c61d9acf396ae4fe133a718d"; + }; + } + { + name = "accepts___accepts_1.3.7.tgz"; + path = fetchurl { + name = "accepts___accepts_1.3.7.tgz"; + url = "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz"; + sha1 = "531bc726517a3b2b41f850021c6cc15eaab507cd"; + }; + } + { + name = "acorn_import_assertions___acorn_import_assertions_1.7.6.tgz"; + path = fetchurl { + name = "acorn_import_assertions___acorn_import_assertions_1.7.6.tgz"; + url = "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.7.6.tgz"; + sha1 = "580e3ffcae6770eebeec76c3b9723201e9d01f78"; + }; + } + { + name = "acorn___acorn_8.4.1.tgz"; + path = fetchurl { + name = "acorn___acorn_8.4.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz"; + sha1 = "56c36251fc7cabc7096adc18f05afe814321a28c"; + }; + } + { + name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; + path = fetchurl { + name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz"; + sha1 = "31f29da5ab6e00d1c2d329acf7b5929614d5014d"; + }; + } + { + name = "ajv___ajv_6.12.6.tgz"; + path = fetchurl { + name = "ajv___ajv_6.12.6.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz"; + sha1 = "baf5a62e802b07d977034586f8c3baf5adf26df4"; + }; + } + { + name = "ansi_colors___ansi_colors_4.1.1.tgz"; + path = fetchurl { + name = "ansi_colors___ansi_colors_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz"; + sha1 = "cbb9ae256bf750af1eab344f229aa27fe94ba348"; + }; + } + { + name = "ansi_escapes___ansi_escapes_1.4.0.tgz"; + path = fetchurl { + name = "ansi_escapes___ansi_escapes_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz"; + sha1 = "d3a8a83b319aa67793662b13e761c7911422306e"; + }; + } + { + name = "ansi_regex___ansi_regex_2.1.1.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + }; + } + { + name = "ansi_regex___ansi_regex_3.0.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz"; + sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + }; + } + { + name = "ansi_regex___ansi_regex_5.0.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz"; + sha1 = "388539f55179bf39339c81af30a654d69f87cb75"; + }; + } + { + name = "ansi_styles___ansi_styles_2.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz"; + sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; + }; + } + { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d"; + }; + } + { + name = "ansi_styles___ansi_styles_4.3.0.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz"; + sha1 = "edd803628ae71c04c85ae7a0906edad34b648937"; + }; + } + { + name = "anymatch___anymatch_3.1.2.tgz"; + path = fetchurl { + name = "anymatch___anymatch_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz"; + sha1 = "c0557c096af32f106198f4f4e2a383537e378716"; + }; + } + { + name = "argparse___argparse_1.0.10.tgz"; + path = fetchurl { + name = "argparse___argparse_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz"; + sha1 = "bcd6791ea5ae09725e17e5ad988134cd40b3d911"; + }; + } + { + name = "argparse___argparse_2.0.1.tgz"; + path = fetchurl { + name = "argparse___argparse_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz"; + sha1 = "246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"; + }; + } + { + name = "aribts___aribts_1.3.5.tgz"; + path = fetchurl { + name = "aribts___aribts_1.3.5.tgz"; + url = "https://registry.yarnpkg.com/aribts/-/aribts-1.3.5.tgz"; + sha1 = "f986ba5afb1a8ff202435101544299fc9397baf5"; + }; + } + { + name = "array_flatten___array_flatten_1.1.1.tgz"; + path = fetchurl { + name = "array_flatten___array_flatten_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz"; + sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; + }; + } + { + name = "array_union___array_union_2.1.0.tgz"; + path = fetchurl { + name = "array_union___array_union_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz"; + sha1 = "b798420adbeb1de828d84acd8a2e23d3efe85e8d"; + }; + } + { + name = "babel_polyfill___babel_polyfill_6.23.0.tgz"; + path = fetchurl { + name = "babel_polyfill___babel_polyfill_6.23.0.tgz"; + url = "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.23.0.tgz"; + sha1 = "8364ca62df8eafb830499f699177466c3b03499d"; + }; + } + { + name = "babel_runtime___babel_runtime_6.26.0.tgz"; + path = fetchurl { + name = "babel_runtime___babel_runtime_6.26.0.tgz"; + url = "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz"; + sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe"; + }; + } + { + name = "balanced_match___balanced_match_1.0.2.tgz"; + path = fetchurl { + name = "balanced_match___balanced_match_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz"; + sha1 = "e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"; + }; + } + { + name = "base64_js___base64_js_1.5.1.tgz"; + path = fetchurl { + name = "base64_js___base64_js_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz"; + sha1 = "1b1b440160a5bf7ad40b650f095963481903930a"; + }; + } + { + name = "basic_auth___basic_auth_2.0.1.tgz"; + path = fetchurl { + name = "basic_auth___basic_auth_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz"; + sha1 = "b998279bf47ce38344b4f3cf916d4679bbf51e3a"; + }; + } + { + name = "big.js___big.js_5.2.2.tgz"; + path = fetchurl { + name = "big.js___big.js_5.2.2.tgz"; + url = "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz"; + sha1 = "65f0af382f578bcdc742bd9c281e9cb2d7768328"; + }; + } + { + name = "binary_extensions___binary_extensions_2.2.0.tgz"; + path = fetchurl { + name = "binary_extensions___binary_extensions_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz"; + sha1 = "75f502eeaf9ffde42fc98829645be4ea76bd9e2d"; + }; + } + { + name = "body_parser___body_parser_1.19.0.tgz"; + path = fetchurl { + name = "body_parser___body_parser_1.19.0.tgz"; + url = "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz"; + sha1 = "96b2709e57c9c4e09a6fd66a8fd979844f69f08a"; + }; + } + { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + path = fetchurl { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha1 = "3c7fcbf529d87226f3d2f52b966ff5271eb441dd"; + }; + } + { + name = "braces___braces_3.0.2.tgz"; + path = fetchurl { + name = "braces___braces_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz"; + sha1 = "3454e1a462ee8d599e236df336cd9ea4f8afe107"; + }; + } + { + name = "browser_stdout___browser_stdout_1.3.1.tgz"; + path = fetchurl { + name = "browser_stdout___browser_stdout_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz"; + sha1 = "baa559ee14ced73452229bad7326467c61fabd60"; + }; + } + { + name = "browserslist___browserslist_4.17.0.tgz"; + path = fetchurl { + name = "browserslist___browserslist_4.17.0.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.17.0.tgz"; + sha1 = "1fcd81ec75b41d6d4994fb0831b92ac18c01649c"; + }; + } + { + name = "buffer_from___buffer_from_1.1.2.tgz"; + path = fetchurl { + name = "buffer_from___buffer_from_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz"; + sha1 = "2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"; + }; + } + { + name = "buffer___buffer_5.7.1.tgz"; + path = fetchurl { + name = "buffer___buffer_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz"; + sha1 = "ba62e7c13133053582197160851a8f648e99eed0"; + }; + } + { + name = "buffer___buffer_6.0.3.tgz"; + path = fetchurl { + name = "buffer___buffer_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz"; + sha1 = "2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6"; + }; + } + { + name = "builtin_modules___builtin_modules_1.1.1.tgz"; + path = fetchurl { + name = "builtin_modules___builtin_modules_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz"; + sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; + }; + } + { + name = "builtin_status_codes___builtin_status_codes_3.0.0.tgz"; + path = fetchurl { + name = "builtin_status_codes___builtin_status_codes_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz"; + sha1 = "85982878e21b98e1c66425e03d0174788f569ee8"; + }; + } + { + name = "bytes___bytes_3.1.0.tgz"; + path = fetchurl { + name = "bytes___bytes_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz"; + sha1 = "f6cf7933a360e0588fa9fde85651cdc7f805d1f6"; + }; + } + { + name = "cacheable_request___cacheable_request_6.1.0.tgz"; + path = fetchurl { + name = "cacheable_request___cacheable_request_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz"; + sha1 = "20ffb8bd162ba4be11e9567d823db651052ca912"; + }; + } + { + name = "camelcase___camelcase_6.2.0.tgz"; + path = fetchurl { + name = "camelcase___camelcase_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz"; + sha1 = "924af881c9d525ac9d87f40d964e5cea982a1809"; + }; + } + { + name = "caniuse_lite___caniuse_lite_1.0.30001254.tgz"; + path = fetchurl { + name = "caniuse_lite___caniuse_lite_1.0.30001254.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001254.tgz"; + sha1 = "974d45e8b7f6e3b63d4b1435e97752717612d4b9"; + }; + } + { + name = "chalk___chalk_1.1.3.tgz"; + path = fetchurl { + name = "chalk___chalk_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + }; + } + { + name = "chalk___chalk_2.4.2.tgz"; + path = fetchurl { + name = "chalk___chalk_2.4.2.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; + sha1 = "cd42541677a54333cf541a49108c1432b44c9424"; + }; + } + { + name = "chalk___chalk_4.1.2.tgz"; + path = fetchurl { + name = "chalk___chalk_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz"; + sha1 = "aac4e2b7734a740867aeb16bf02aad556a1e7a01"; + }; + } + { + name = "chardet___chardet_0.4.2.tgz"; + path = fetchurl { + name = "chardet___chardet_0.4.2.tgz"; + url = "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz"; + sha1 = "b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"; + }; + } + { + name = "chokidar___chokidar_3.5.1.tgz"; + path = fetchurl { + name = "chokidar___chokidar_3.5.1.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz"; + sha1 = "ee9ce7bbebd2b79f49f304799d5468e31e14e68a"; + }; + } + { + name = "chrome_trace_event___chrome_trace_event_1.0.3.tgz"; + path = fetchurl { + name = "chrome_trace_event___chrome_trace_event_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz"; + sha1 = "1015eced4741e15d06664a957dbbf50d041e26ac"; + }; + } + { + name = "cli_cursor___cli_cursor_2.1.0.tgz"; + path = fetchurl { + name = "cli_cursor___cli_cursor_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz"; + sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; + }; + } + { + name = "cli_width___cli_width_2.2.1.tgz"; + path = fetchurl { + name = "cli_width___cli_width_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz"; + sha1 = "b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"; + }; + } + { + name = "cliui___cliui_7.0.4.tgz"; + path = fetchurl { + name = "cliui___cliui_7.0.4.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz"; + sha1 = "a0265ee655476fc807aea9df3df8df7783808b4f"; + }; + } + { + name = "clone_deep___clone_deep_4.0.1.tgz"; + path = fetchurl { + name = "clone_deep___clone_deep_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz"; + sha1 = "c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"; + }; + } + { + name = "clone_response___clone_response_1.0.2.tgz"; + path = fetchurl { + name = "clone_response___clone_response_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz"; + sha1 = "d1dc973920314df67fbeb94223b4ee350239e96b"; + }; + } + { + name = "color_convert___color_convert_1.9.3.tgz"; + path = fetchurl { + name = "color_convert___color_convert_1.9.3.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz"; + sha1 = "bb71850690e1f136567de629d2d5471deda4c1e8"; + }; + } + { + name = "color_convert___color_convert_2.0.1.tgz"; + path = fetchurl { + name = "color_convert___color_convert_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz"; + sha1 = "72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"; + }; + } + { + name = "color_name___color_name_1.1.3.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + }; + } + { + name = "color_name___color_name_1.1.4.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz"; + sha1 = "c2a09a87acbde69543de6f63fa3995c826c536a2"; + }; + } + { + name = "colorette___colorette_1.3.0.tgz"; + path = fetchurl { + name = "colorette___colorette_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/colorette/-/colorette-1.3.0.tgz"; + sha1 = "ff45d2f0edb244069d3b772adeb04fed38d0a0af"; + }; + } + { + name = "colors___colors_1.4.0.tgz"; + path = fetchurl { + name = "colors___colors_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz"; + sha1 = "c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"; + }; + } + { + name = "commander___commander_2.20.3.tgz"; + path = fetchurl { + name = "commander___commander_2.20.3.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz"; + sha1 = "fd485e84c03eb4881c20722ba48035e8531aeb33"; + }; + } + { + name = "commander___commander_7.2.0.tgz"; + path = fetchurl { + name = "commander___commander_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz"; + sha1 = "a36cb57d0b501ce108e4d20559a150a391d97ab7"; + }; + } + { + name = "concat_map___concat_map_0.0.1.tgz"; + path = fetchurl { + name = "concat_map___concat_map_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + } + { + name = "content_disposition___content_disposition_0.5.3.tgz"; + path = fetchurl { + name = "content_disposition___content_disposition_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz"; + sha1 = "e130caf7e7279087c5616c2007d0485698984fbd"; + }; + } + { + name = "content_type___content_type_1.0.4.tgz"; + path = fetchurl { + name = "content_type___content_type_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz"; + sha1 = "e138cc75e040c727b1966fe5e5f8c9aee256fe3b"; + }; + } + { + name = "cookie_signature___cookie_signature_1.0.6.tgz"; + path = fetchurl { + name = "cookie_signature___cookie_signature_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz"; + sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; + }; + } + { + name = "cookie___cookie_0.4.0.tgz"; + path = fetchurl { + name = "cookie___cookie_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz"; + sha1 = "beb437e7022b3b6d49019d088665303ebe9c14ba"; + }; + } + { + name = "copy_webpack_plugin___copy_webpack_plugin_9.0.1.tgz"; + path = fetchurl { + name = "copy_webpack_plugin___copy_webpack_plugin_9.0.1.tgz"; + url = "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-9.0.1.tgz"; + sha1 = "b71d21991599f61a4ee00ba79087b8ba279bbb59"; + }; + } + { + name = "core_js___core_js_2.6.12.tgz"; + path = fetchurl { + name = "core_js___core_js_2.6.12.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz"; + sha1 = "d9333dfa7b065e347cc5682219d6f690859cc2ec"; + }; + } + { + name = "cors___cors_2.8.5.tgz"; + path = fetchurl { + name = "cors___cors_2.8.5.tgz"; + url = "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz"; + sha1 = "eac11da51592dd86b9f06f6e7ac293b3df875d29"; + }; + } + { + name = "crc___crc_3.8.0.tgz"; + path = fetchurl { + name = "crc___crc_3.8.0.tgz"; + url = "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz"; + sha1 = "ad60269c2c856f8c299e2c4cc0de4556914056c6"; + }; + } + { + name = "cross_spawn___cross_spawn_7.0.3.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz"; + sha1 = "f73a85b9d5d41d045551c177e2882d4ac85728a6"; + }; + } + { + name = "css_loader___css_loader_5.2.7.tgz"; + path = fetchurl { + name = "css_loader___css_loader_5.2.7.tgz"; + url = "https://registry.yarnpkg.com/css-loader/-/css-loader-5.2.7.tgz"; + sha1 = "9b9f111edf6fb2be5dc62525644cbc9c232064ae"; + }; + } + { + name = "cssesc___cssesc_3.0.0.tgz"; + path = fetchurl { + name = "cssesc___cssesc_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz"; + sha1 = "37741919903b868565e1c09ea747445cd18983ee"; + }; + } + { + name = "csstype___csstype_3.0.8.tgz"; + path = fetchurl { + name = "csstype___csstype_3.0.8.tgz"; + url = "https://registry.yarnpkg.com/csstype/-/csstype-3.0.8.tgz"; + sha1 = "d2266a792729fb227cd216fb572f43728e1ad340"; + }; + } + { + name = "debug___debug_2.6.9.tgz"; + path = fetchurl { + name = "debug___debug_2.6.9.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; + sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; + }; + } + { + name = "debug___debug_4.3.1.tgz"; + path = fetchurl { + name = "debug___debug_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz"; + sha1 = "f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"; + }; + } + { + name = "decamelize___decamelize_4.0.0.tgz"; + path = fetchurl { + name = "decamelize___decamelize_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz"; + sha1 = "aa472d7bf660eb15f3494efd531cab7f2a709837"; + }; + } + { + name = "decompress_response___decompress_response_3.3.0.tgz"; + path = fetchurl { + name = "decompress_response___decompress_response_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz"; + sha1 = "80a4dd323748384bfa248083622aedec982adff3"; + }; + } + { + name = "deep_extend___deep_extend_0.6.0.tgz"; + path = fetchurl { + name = "deep_extend___deep_extend_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz"; + sha1 = "c4fa7c95404a17a9c3e8ca7e1537312b736330ac"; + }; + } + { + name = "defer_to_connect___defer_to_connect_1.1.3.tgz"; + path = fetchurl { + name = "defer_to_connect___defer_to_connect_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz"; + sha1 = "331ae050c08dcf789f8c83a7b81f0ed94f4ac591"; + }; + } + { + name = "depd___depd_1.1.2.tgz"; + path = fetchurl { + name = "depd___depd_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz"; + sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; + }; + } + { + name = "depd___depd_2.0.0.tgz"; + path = fetchurl { + name = "depd___depd_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz"; + sha1 = "b696163cc757560d09cf22cc8fad1571b79e76df"; + }; + } + { + name = "destroy___destroy_1.0.4.tgz"; + path = fetchurl { + name = "destroy___destroy_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz"; + sha1 = "978857442c44749e4206613e37946205826abd80"; + }; + } + { + name = "diff___diff_5.0.0.tgz"; + path = fetchurl { + name = "diff___diff_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz"; + sha1 = "7ed6ad76d859d030787ec35855f5b1daf31d852b"; + }; + } + { + name = "diff___diff_4.0.2.tgz"; + path = fetchurl { + name = "diff___diff_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz"; + sha1 = "60f3aecb89d5fae520c11aa19efc2bb982aade7d"; + }; + } + { + name = "difunc___difunc_0.0.4.tgz"; + path = fetchurl { + name = "difunc___difunc_0.0.4.tgz"; + url = "https://registry.yarnpkg.com/difunc/-/difunc-0.0.4.tgz"; + sha1 = "09322073e67f82effd2f22881985e7d3e441b3ac"; + }; + } + { + name = "dir_glob___dir_glob_3.0.1.tgz"; + path = fetchurl { + name = "dir_glob___dir_glob_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz"; + sha1 = "56dbf73d992a4a93ba1584f4534063fd2e41717f"; + }; + } + { + name = "dotenv___dotenv_8.6.0.tgz"; + path = fetchurl { + name = "dotenv___dotenv_8.6.0.tgz"; + url = "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz"; + sha1 = "061af664d19f7f4d8fc6e4ff9b584ce237adcb8b"; + }; + } + { + name = "duplexer3___duplexer3_0.1.4.tgz"; + path = fetchurl { + name = "duplexer3___duplexer3_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz"; + sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; + }; + } + { + name = "ee_first___ee_first_1.1.1.tgz"; + path = fetchurl { + name = "ee_first___ee_first_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz"; + sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; + }; + } + { + name = "electron_to_chromium___electron_to_chromium_1.3.830.tgz"; + path = fetchurl { + name = "electron_to_chromium___electron_to_chromium_1.3.830.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.830.tgz"; + sha1 = "40e3144204f8ca11b2cebec83cf14c20d3499236"; + }; + } + { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz"; + sha1 = "e818fd69ce5ccfcb404594f842963bf53164cc37"; + }; + } + { + name = "emojis_list___emojis_list_3.0.0.tgz"; + path = fetchurl { + name = "emojis_list___emojis_list_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz"; + sha1 = "5570662046ad29e2e916e71aae260abdff4f6a78"; + }; + } + { + name = "encodeurl___encodeurl_1.0.2.tgz"; + path = fetchurl { + name = "encodeurl___encodeurl_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz"; + sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + }; + } + { + name = "encoding___encoding_0.1.13.tgz"; + path = fetchurl { + name = "encoding___encoding_0.1.13.tgz"; + url = "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz"; + sha1 = "56574afdd791f54a8e9b2785c0582a2d26210fa9"; + }; + } + { + name = "end_of_stream___end_of_stream_1.4.4.tgz"; + path = fetchurl { + name = "end_of_stream___end_of_stream_1.4.4.tgz"; + url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz"; + sha1 = "5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"; + }; + } + { + name = "enhanced_resolve___enhanced_resolve_5.8.2.tgz"; + path = fetchurl { + name = "enhanced_resolve___enhanced_resolve_5.8.2.tgz"; + url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz"; + sha1 = "15ddc779345cbb73e97c611cd00c01c1e7bf4d8b"; + }; + } + { + name = "envinfo___envinfo_7.8.1.tgz"; + path = fetchurl { + name = "envinfo___envinfo_7.8.1.tgz"; + url = "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz"; + sha1 = "06377e3e5f4d379fea7ac592d5ad8927e0c4d475"; + }; + } + { + name = "es_module_lexer___es_module_lexer_0.7.1.tgz"; + path = fetchurl { + name = "es_module_lexer___es_module_lexer_0.7.1.tgz"; + url = "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.7.1.tgz"; + sha1 = "c2c8e0f46f2df06274cdaf0dd3f3b33e0a0b267d"; + }; + } + { + name = "escalade___escalade_3.1.1.tgz"; + path = fetchurl { + name = "escalade___escalade_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz"; + sha1 = "d8cfdc7000965c5a0174b4a82eaa5c0552742e40"; + }; + } + { + name = "escape_html___escape_html_1.0.3.tgz"; + path = fetchurl { + name = "escape_html___escape_html_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz"; + sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; + }; + } + { + name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; + sha1 = "14ba83a5d373e3d311e5afca29cf5bfad965bf34"; + }; + } + { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + } + { + name = "eslint_scope___eslint_scope_5.1.1.tgz"; + path = fetchurl { + name = "eslint_scope___eslint_scope_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz"; + sha1 = "e786e59a66cb92b3f6c1fb0d508aab174848f48c"; + }; + } + { + name = "esprima___esprima_4.0.1.tgz"; + path = fetchurl { + name = "esprima___esprima_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz"; + sha1 = "13b04cdb3e6c5d19df91ab6987a8695619b0aa71"; + }; + } + { + name = "esrecurse___esrecurse_4.3.0.tgz"; + path = fetchurl { + name = "esrecurse___esrecurse_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz"; + sha1 = "7ad7964d679abb28bee72cec63758b1c5d2c9921"; + }; + } + { + name = "estraverse___estraverse_4.3.0.tgz"; + path = fetchurl { + name = "estraverse___estraverse_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz"; + sha1 = "398ad3f3c5a24948be7725e83d11a7de28cdbd1d"; + }; + } + { + name = "estraverse___estraverse_5.2.0.tgz"; + path = fetchurl { + name = "estraverse___estraverse_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz"; + sha1 = "307df42547e6cc7324d3cf03c155d5cdb8c53880"; + }; + } + { + name = "etag___etag_1.8.1.tgz"; + path = fetchurl { + name = "etag___etag_1.8.1.tgz"; + url = "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz"; + sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; + }; + } + { + name = "eventemitter3___eventemitter3_4.0.7.tgz"; + path = fetchurl { + name = "eventemitter3___eventemitter3_4.0.7.tgz"; + url = "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz"; + sha1 = "2de9b68f6528d5644ef5c59526a1b4a07306169f"; + }; + } + { + name = "events___events_3.3.0.tgz"; + path = fetchurl { + name = "events___events_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz"; + sha1 = "31a95ad0a924e2d2c419a813aeb2c4e878ea7400"; + }; + } + { + name = "execa___execa_5.1.1.tgz"; + path = fetchurl { + name = "execa___execa_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz"; + sha1 = "f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"; + }; + } + { + name = "express_normalize_query_params_middleware___express_normalize_query_params_middleware_0.5.1.tgz"; + path = fetchurl { + name = "express_normalize_query_params_middleware___express_normalize_query_params_middleware_0.5.1.tgz"; + url = "https://registry.yarnpkg.com/express-normalize-query-params-middleware/-/express-normalize-query-params-middleware-0.5.1.tgz"; + sha1 = "dbe1e8139aecb234fb6adb5c0059c75db9733d2a"; + }; + } + { + name = "express_openapi___express_openapi_8.0.0.tgz"; + path = fetchurl { + name = "express_openapi___express_openapi_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/express-openapi/-/express-openapi-8.0.0.tgz"; + sha1 = "ea35ca9afd3619d423f2336d4df2bdf70abb1d46"; + }; + } + { + name = "express___express_4.17.1.tgz"; + path = fetchurl { + name = "express___express_4.17.1.tgz"; + url = "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz"; + sha1 = "4491fc38605cf51f8629d39c2b5d026f98a4c134"; + }; + } + { + name = "external_editor___external_editor_2.2.0.tgz"; + path = fetchurl { + name = "external_editor___external_editor_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz"; + sha1 = "045511cfd8d133f3846673d1047c154e214ad3d5"; + }; + } + { + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; + path = fetchurl { + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; + sha1 = "3a7d56b559d6cbc3eb512325244e619a65c6c525"; + }; + } + { + name = "fast_glob___fast_glob_3.2.7.tgz"; + path = fetchurl { + name = "fast_glob___fast_glob_3.2.7.tgz"; + url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz"; + sha1 = "fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"; + }; + } + { + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + path = fetchurl { + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha1 = "874bf69c6f404c2b5d99c481341399fd55892633"; + }; + } + { + name = "fastest_levenshtein___fastest_levenshtein_1.0.12.tgz"; + path = fetchurl { + name = "fastest_levenshtein___fastest_levenshtein_1.0.12.tgz"; + url = "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz"; + sha1 = "9990f7d3a88cc5a9ffd1f1745745251700d497e2"; + }; + } + { + name = "fastq___fastq_1.12.0.tgz"; + path = fetchurl { + name = "fastq___fastq_1.12.0.tgz"; + url = "https://registry.yarnpkg.com/fastq/-/fastq-1.12.0.tgz"; + sha1 = "ed7b6ab5d62393fb2cc591c853652a5c318bf794"; + }; + } + { + name = "figures___figures_2.0.0.tgz"; + path = fetchurl { + name = "figures___figures_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz"; + sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; + }; + } + { + name = "fill_range___fill_range_7.0.1.tgz"; + path = fetchurl { + name = "fill_range___fill_range_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz"; + sha1 = "1919a6a7c75fe38b2c7c77e5198535da9acdda40"; + }; + } + { + name = "finalhandler___finalhandler_1.1.2.tgz"; + path = fetchurl { + name = "finalhandler___finalhandler_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz"; + sha1 = "b7e7d000ffd11938d0fdb053506f6ebabe9f587d"; + }; + } + { + name = "find_up___find_up_5.0.0.tgz"; + path = fetchurl { + name = "find_up___find_up_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz"; + sha1 = "4c92819ecb7083561e4f4a240a86be5198f536fc"; + }; + } + { + name = "find_up___find_up_4.1.0.tgz"; + path = fetchurl { + name = "find_up___find_up_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz"; + sha1 = "97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"; + }; + } + { + name = "flat___flat_5.0.2.tgz"; + path = fetchurl { + name = "flat___flat_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz"; + sha1 = "8ca6fe332069ffa9d324c327198c598259ceb241"; + }; + } + { + name = "forwarded___forwarded_0.2.0.tgz"; + path = fetchurl { + name = "forwarded___forwarded_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz"; + sha1 = "2269936428aad4c15c7ebe9779a84bf0b2a81811"; + }; + } + { + name = "fresh___fresh_0.5.2.tgz"; + path = fetchurl { + name = "fresh___fresh_0.5.2.tgz"; + url = "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz"; + sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; + }; + } + { + name = "fs_routes___fs_routes_8.0.0.tgz"; + path = fetchurl { + name = "fs_routes___fs_routes_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs-routes/-/fs-routes-8.0.0.tgz"; + sha1 = "98100abe1810aa0374ca7c9f439b4c1dec8232e7"; + }; + } + { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + path = fetchurl { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + } + { + name = "fsevents___fsevents_2.3.2.tgz"; + path = fetchurl { + name = "fsevents___fsevents_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz"; + sha1 = "8a526f78b8fdf4623b709e0b975c52c24c02fd1a"; + }; + } + { + name = "function_bind___function_bind_1.1.1.tgz"; + path = fetchurl { + name = "function_bind___function_bind_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz"; + sha1 = "a56899d3ea3c9bab874bb9773b7c5ede92f4895d"; + }; + } + { + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + path = fetchurl { + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz"; + sha1 = "4f94412a82db32f36e3b0b9741f8a97feb031f7e"; + }; + } + { + name = "get_stream___get_stream_4.1.0.tgz"; + path = fetchurl { + name = "get_stream___get_stream_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz"; + sha1 = "c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"; + }; + } + { + name = "get_stream___get_stream_5.2.0.tgz"; + path = fetchurl { + name = "get_stream___get_stream_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz"; + sha1 = "4966a1795ee5ace65e706c4b7beb71257d6e22d3"; + }; + } + { + name = "get_stream___get_stream_6.0.1.tgz"; + path = fetchurl { + name = "get_stream___get_stream_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz"; + sha1 = "a262d8eef67aced57c2852ad6167526a43cbf7b7"; + }; + } + { + name = "glob_parent___glob_parent_5.1.2.tgz"; + path = fetchurl { + name = "glob_parent___glob_parent_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz"; + sha1 = "869832c58034fe68a4093c17dc15e8340d8401c4"; + }; + } + { + name = "glob_parent___glob_parent_6.0.1.tgz"; + path = fetchurl { + name = "glob_parent___glob_parent_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.1.tgz"; + sha1 = "42054f685eb6a44e7a7d189a96efa40a54971aa7"; + }; + } + { + name = "glob_to_regexp___glob_to_regexp_0.4.1.tgz"; + path = fetchurl { + name = "glob_to_regexp___glob_to_regexp_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz"; + sha1 = "c75297087c851b9a578bd217dd59a92f59fe546e"; + }; + } + { + name = "glob___glob_7.1.7.tgz"; + path = fetchurl { + name = "glob___glob_7.1.7.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz"; + sha1 = "3b193e9233f01d42d0b3f78294bbeeb418f94a90"; + }; + } + { + name = "glob___glob_7.1.6.tgz"; + path = fetchurl { + name = "glob___glob_7.1.6.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz"; + sha1 = "141f33b81a7c2492e125594307480c46679278a6"; + }; + } + { + name = "globby___globby_11.0.4.tgz"; + path = fetchurl { + name = "globby___globby_11.0.4.tgz"; + url = "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz"; + sha1 = "2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"; + }; + } + { + name = "got___got_9.6.0.tgz"; + path = fetchurl { + name = "got___got_9.6.0.tgz"; + url = "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz"; + sha1 = "edf45e7d67f99545705de1f7bbeeeb121765ed85"; + }; + } + { + name = "graceful_fs___graceful_fs_4.2.8.tgz"; + path = fetchurl { + name = "graceful_fs___graceful_fs_4.2.8.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz"; + sha1 = "e412b8d33f5e006593cbd3cee6df9f2cebbe802a"; + }; + } + { + name = "growl___growl_1.10.5.tgz"; + path = fetchurl { + name = "growl___growl_1.10.5.tgz"; + url = "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz"; + sha1 = "f2735dc2283674fa67478b10181059355c369e5e"; + }; + } + { + name = "has_ansi___has_ansi_2.0.0.tgz"; + path = fetchurl { + name = "has_ansi___has_ansi_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz"; + sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + }; + } + { + name = "has_flag___has_flag_3.0.0.tgz"; + path = fetchurl { + name = "has_flag___has_flag_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz"; + sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + }; + } + { + name = "has_flag___has_flag_4.0.0.tgz"; + path = fetchurl { + name = "has_flag___has_flag_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz"; + sha1 = "944771fd9c81c81265c4d6941860da06bb59479b"; + }; + } + { + name = "has___has_1.0.3.tgz"; + path = fetchurl { + name = "has___has_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz"; + sha1 = "722d7cbfc1f6aa8241f16dd814e011e1f41e8796"; + }; + } + { + name = "he___he_1.2.0.tgz"; + path = fetchurl { + name = "he___he_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz"; + sha1 = "84ae65fa7eafb165fddb61566ae14baf05664f0f"; + }; + } + { + name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz"; + path = fetchurl { + name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"; + sha1 = "49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"; + }; + } + { + name = "http_errors___http_errors_1.7.2.tgz"; + path = fetchurl { + name = "http_errors___http_errors_1.7.2.tgz"; + url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz"; + sha1 = "4f5029cf13239f31036e5b2e55292bcfbcc85c8f"; + }; + } + { + name = "http_errors___http_errors_1.7.3.tgz"; + path = fetchurl { + name = "http_errors___http_errors_1.7.3.tgz"; + url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz"; + sha1 = "6c619e4f9c60308c38519498c14fbb10aacebb06"; + }; + } + { + name = "human_signals___human_signals_2.1.0.tgz"; + path = fetchurl { + name = "human_signals___human_signals_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz"; + sha1 = "dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"; + }; + } + { + name = "iconv_lite___iconv_lite_0.4.24.tgz"; + path = fetchurl { + name = "iconv_lite___iconv_lite_0.4.24.tgz"; + url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz"; + sha1 = "2022b4b25fbddc21d2f524974a474aafe733908b"; + }; + } + { + name = "iconv_lite___iconv_lite_0.6.3.tgz"; + path = fetchurl { + name = "iconv_lite___iconv_lite_0.6.3.tgz"; + url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz"; + sha1 = "a52f80bf38da1952eb5c681790719871a1a72501"; + }; + } + { + name = "icss_utils___icss_utils_5.1.0.tgz"; + path = fetchurl { + name = "icss_utils___icss_utils_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz"; + sha1 = "c6be6858abd013d768e98366ae47e25d5887b1ae"; + }; + } + { + name = "ieee754___ieee754_1.2.1.tgz"; + path = fetchurl { + name = "ieee754___ieee754_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz"; + sha1 = "8eb7a10a63fff25d15a57b001586d177d1b0d352"; + }; + } + { + name = "ignore___ignore_5.1.8.tgz"; + path = fetchurl { + name = "ignore___ignore_5.1.8.tgz"; + url = "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz"; + sha1 = "f150a8b50a34289b33e22f5889abd4d8016f0e57"; + }; + } + { + name = "import_local___import_local_3.0.2.tgz"; + path = fetchurl { + name = "import_local___import_local_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz"; + sha1 = "a8cfd0431d1de4a2199703d003e3e62364fa6db6"; + }; + } + { + name = "inflight___inflight_1.0.6.tgz"; + path = fetchurl { + name = "inflight___inflight_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + } + { + name = "inherits___inherits_2.0.4.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; + sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; + }; + } + { + name = "inherits___inherits_2.0.3.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + }; + } + { + name = "ini___ini_1.3.8.tgz"; + path = fetchurl { + name = "ini___ini_1.3.8.tgz"; + url = "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz"; + sha1 = "a29da425b48806f34767a4efce397269af28432c"; + }; + } + { + name = "inquirer___inquirer_3.0.6.tgz"; + path = fetchurl { + name = "inquirer___inquirer_3.0.6.tgz"; + url = "https://registry.yarnpkg.com/inquirer/-/inquirer-3.0.6.tgz"; + sha1 = "e04aaa9d05b7a3cb9b0f407d04375f0447190347"; + }; + } + { + name = "interpret___interpret_2.2.0.tgz"; + path = fetchurl { + name = "interpret___interpret_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz"; + sha1 = "1a78a0b5965c40a5416d007ad6f50ad27c417df9"; + }; + } + { + name = "ip___ip_1.1.5.tgz"; + path = fetchurl { + name = "ip___ip_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz"; + sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a"; + }; + } + { + name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; + path = fetchurl { + name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; + sha1 = "bff38543eeb8984825079ff3a2a8e6cbd46781b3"; + }; + } + { + name = "is_binary_path___is_binary_path_2.1.0.tgz"; + path = fetchurl { + name = "is_binary_path___is_binary_path_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz"; + sha1 = "ea1f7f3b80f064236e83470f86c09c254fb45b09"; + }; + } + { + name = "is_core_module___is_core_module_2.6.0.tgz"; + path = fetchurl { + name = "is_core_module___is_core_module_2.6.0.tgz"; + url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.6.0.tgz"; + sha1 = "d7553b2526fe59b92ba3e40c8df757ec8a709e19"; + }; + } + { + name = "is_dir___is_dir_1.0.0.tgz"; + path = fetchurl { + name = "is_dir___is_dir_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-dir/-/is-dir-1.0.0.tgz"; + sha1 = "41d37f495fccacc05a4778d66e83024c292ba3ff"; + }; + } + { + name = "is_extglob___is_extglob_2.1.1.tgz"; + path = fetchurl { + name = "is_extglob___is_extglob_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; + sha1 = "f116f8064fe90b3f7844a38997c0b75051269f1d"; + }; + } + { + name = "is_glob___is_glob_4.0.1.tgz"; + path = fetchurl { + name = "is_glob___is_glob_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz"; + sha1 = "7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"; + }; + } + { + name = "is_number___is_number_7.0.0.tgz"; + path = fetchurl { + name = "is_number___is_number_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz"; + sha1 = "7535345b896734d5f80c4d06c50955527a14f12b"; + }; + } + { + name = "is_plain_obj___is_plain_obj_2.1.0.tgz"; + path = fetchurl { + name = "is_plain_obj___is_plain_obj_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz"; + sha1 = "45e42e37fccf1f40da8e5f76ee21515840c09287"; + }; + } + { + name = "is_plain_object___is_plain_object_2.0.4.tgz"; + path = fetchurl { + name = "is_plain_object___is_plain_object_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz"; + sha1 = "2c163b3fafb1b606d9d17928f05c2a1c38e07677"; + }; + } + { + name = "is_stream___is_stream_1.1.0.tgz"; + path = fetchurl { + name = "is_stream___is_stream_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz"; + sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + }; + } + { + name = "is_stream___is_stream_2.0.1.tgz"; + path = fetchurl { + name = "is_stream___is_stream_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz"; + sha1 = "fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"; + }; + } + { + name = "isexe___isexe_2.0.0.tgz"; + path = fetchurl { + name = "isexe___isexe_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + }; + } + { + name = "isobject___isobject_3.0.1.tgz"; + path = fetchurl { + name = "isobject___isobject_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz"; + sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; + }; + } + { + name = "jest_worker___jest_worker_27.1.0.tgz"; + path = fetchurl { + name = "jest_worker___jest_worker_27.1.0.tgz"; + url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.1.0.tgz"; + sha1 = "65f4a88e37148ed984ba8ca8492d6b376938c0aa"; + }; + } + { + name = "js_tokens___js_tokens_4.0.0.tgz"; + path = fetchurl { + name = "js_tokens___js_tokens_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz"; + sha1 = "19203fb59991df98e3a287050d4647cdeaf32499"; + }; + } + { + name = "js_yaml___js_yaml_4.0.0.tgz"; + path = fetchurl { + name = "js_yaml___js_yaml_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz"; + sha1 = "f426bc0ff4b4051926cd588c71113183409a121f"; + }; + } + { + name = "js_yaml___js_yaml_3.14.1.tgz"; + path = fetchurl { + name = "js_yaml___js_yaml_3.14.1.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz"; + sha1 = "dae812fdb3825fa306609a8717383c50c36a0537"; + }; + } + { + name = "js_yaml___js_yaml_4.1.0.tgz"; + path = fetchurl { + name = "js_yaml___js_yaml_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz"; + sha1 = "c1fb65f8f5017901cdd2c951864ba18458a10602"; + }; + } + { + name = "json_buffer___json_buffer_3.0.0.tgz"; + path = fetchurl { + name = "json_buffer___json_buffer_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz"; + sha1 = "5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"; + }; + } + { + name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; + path = fetchurl { + name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"; + sha1 = "bb867cfb3450e69107c131d1c514bab3dc8bcaa9"; + }; + } + { + name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; + path = fetchurl { + name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660"; + }; + } + { + name = "json5___json5_2.2.0.tgz"; + path = fetchurl { + name = "json5___json5_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz"; + sha1 = "2dfefe720c6ba525d9ebd909950f0515316c89a3"; + }; + } + { + name = "keyv___keyv_3.1.0.tgz"; + path = fetchurl { + name = "keyv___keyv_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz"; + sha1 = "ecc228486f69991e49e9476485a5be1e8fc5c4d9"; + }; + } + { + name = "kind_of___kind_of_6.0.3.tgz"; + path = fetchurl { + name = "kind_of___kind_of_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz"; + sha1 = "07c05034a6c349fa06e24fa35aa76db4580ce4dd"; + }; + } + { + name = "latest_version___latest_version_5.1.0.tgz"; + path = fetchurl { + name = "latest_version___latest_version_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz"; + sha1 = "119dfe908fe38d15dfa43ecd13fa12ec8832face"; + }; + } + { + name = "loader_runner___loader_runner_4.2.0.tgz"; + path = fetchurl { + name = "loader_runner___loader_runner_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz"; + sha1 = "d7022380d66d14c5fb1d496b89864ebcfd478384"; + }; + } + { + name = "loader_utils___loader_utils_2.0.0.tgz"; + path = fetchurl { + name = "loader_utils___loader_utils_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz"; + sha1 = "e4cace5b816d425a166b5f097e10cd12b36064b0"; + }; + } + { + name = "locate_path___locate_path_5.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz"; + sha1 = "1afba396afd676a6d42504d0a67a3a7eb9f62aa0"; + }; + } + { + name = "locate_path___locate_path_6.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz"; + sha1 = "55321eb309febbc59c4801d931a72452a681d286"; + }; + } + { + name = "lodash.merge___lodash.merge_4.6.2.tgz"; + path = fetchurl { + name = "lodash.merge___lodash.merge_4.6.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz"; + sha1 = "558aa53b43b661e1925a0afdfa36a9a1085fe57a"; + }; + } + { + name = "lodash___lodash_4.17.21.tgz"; + path = fetchurl { + name = "lodash___lodash_4.17.21.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"; + sha1 = "679591c564c3bffaae8454cf0b3df370c3d6911c"; + }; + } + { + name = "log_symbols___log_symbols_4.0.0.tgz"; + path = fetchurl { + name = "log_symbols___log_symbols_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz"; + sha1 = "69b3cc46d20f448eccdb75ea1fa733d9e821c920"; + }; + } + { + name = "loose_envify___loose_envify_1.4.0.tgz"; + path = fetchurl { + name = "loose_envify___loose_envify_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz"; + sha1 = "71ee51fa7be4caec1a63839f7e682d8132d30caf"; + }; + } + { + name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; + path = fetchurl { + name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; + sha1 = "6f9e30b47084d971a7c820ff15a6c5167b74c26f"; + }; + } + { + name = "lowercase_keys___lowercase_keys_2.0.0.tgz"; + path = fetchurl { + name = "lowercase_keys___lowercase_keys_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz"; + sha1 = "2603e78b7b4b0006cbca2fbcc8a3202558ac9479"; + }; + } + { + name = "lru_cache___lru_cache_6.0.0.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz"; + sha1 = "6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"; + }; + } + { + name = "media_typer___media_typer_0.3.0.tgz"; + path = fetchurl { + name = "media_typer___media_typer_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz"; + sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + }; + } + { + name = "merge_descriptors___merge_descriptors_1.0.1.tgz"; + path = fetchurl { + name = "merge_descriptors___merge_descriptors_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; + sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; + }; + } + { + name = "merge_stream___merge_stream_2.0.0.tgz"; + path = fetchurl { + name = "merge_stream___merge_stream_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz"; + sha1 = "52823629a14dd00c9770fb6ad47dc6310f2c1f60"; + }; + } + { + name = "merge2___merge2_1.4.1.tgz"; + path = fetchurl { + name = "merge2___merge2_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz"; + sha1 = "4368892f885e907455a6fd7dc55c0c9d404990ae"; + }; + } + { + name = "methods___methods_1.1.2.tgz"; + path = fetchurl { + name = "methods___methods_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz"; + sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; + }; + } + { + name = "micromatch___micromatch_4.0.4.tgz"; + path = fetchurl { + name = "micromatch___micromatch_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz"; + sha1 = "896d519dfe9db25fce94ceb7a500919bf881ebf9"; + }; + } + { + name = "mime_db___mime_db_1.49.0.tgz"; + path = fetchurl { + name = "mime_db___mime_db_1.49.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.49.0.tgz"; + sha1 = "f3dfde60c99e9cf3bc9701d687778f537001cbed"; + }; + } + { + name = "mime_types___mime_types_2.1.32.tgz"; + path = fetchurl { + name = "mime_types___mime_types_2.1.32.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.32.tgz"; + sha1 = "1d00e89e7de7fe02008db61001d9e02852670fd5"; + }; + } + { + name = "mime___mime_1.6.0.tgz"; + path = fetchurl { + name = "mime___mime_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz"; + sha1 = "32cd9e5c64553bd58d19a568af452acff04981b1"; + }; + } + { + name = "mimic_fn___mimic_fn_1.2.0.tgz"; + path = fetchurl { + name = "mimic_fn___mimic_fn_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz"; + sha1 = "820c86a39334640e99516928bd03fca88057d022"; + }; + } + { + name = "mimic_fn___mimic_fn_2.1.0.tgz"; + path = fetchurl { + name = "mimic_fn___mimic_fn_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz"; + sha1 = "7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"; + }; + } + { + name = "mimic_response___mimic_response_1.0.1.tgz"; + path = fetchurl { + name = "mimic_response___mimic_response_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz"; + sha1 = "4923538878eef42063cb8a3e3b0798781487ab1b"; + }; + } + { + name = "minimatch___minimatch_3.0.4.tgz"; + path = fetchurl { + name = "minimatch___minimatch_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; + sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; + }; + } + { + name = "minimist___minimist_1.2.0.tgz"; + path = fetchurl { + name = "minimist___minimist_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz"; + sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + }; + } + { + name = "minimist___minimist_1.2.5.tgz"; + path = fetchurl { + name = "minimist___minimist_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; + sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; + }; + } + { + name = "mkdirp___mkdirp_0.5.5.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_0.5.5.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; + sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; + }; + } + { + name = "mocha___mocha_8.4.0.tgz"; + path = fetchurl { + name = "mocha___mocha_8.4.0.tgz"; + url = "https://registry.yarnpkg.com/mocha/-/mocha-8.4.0.tgz"; + sha1 = "677be88bf15980a3cae03a73e10a0fc3997f0cff"; + }; + } + { + name = "morgan___morgan_1.10.0.tgz"; + path = fetchurl { + name = "morgan___morgan_1.10.0.tgz"; + url = "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz"; + sha1 = "091778abc1fc47cd3509824653dae1faab6b17d7"; + }; + } + { + name = "ms___ms_2.0.0.tgz"; + path = fetchurl { + name = "ms___ms_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + } + { + name = "ms___ms_2.1.1.tgz"; + path = fetchurl { + name = "ms___ms_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz"; + sha1 = "30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"; + }; + } + { + name = "ms___ms_2.1.2.tgz"; + path = fetchurl { + name = "ms___ms_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz"; + sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009"; + }; + } + { + name = "ms___ms_2.1.3.tgz"; + path = fetchurl { + name = "ms___ms_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz"; + sha1 = "574c8138ce1d2b5861f0b44579dbadd60c6615b2"; + }; + } + { + name = "mute_stream___mute_stream_0.0.7.tgz"; + path = fetchurl { + name = "mute_stream___mute_stream_0.0.7.tgz"; + url = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz"; + sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"; + }; + } + { + name = "nanoid___nanoid_3.1.20.tgz"; + path = fetchurl { + name = "nanoid___nanoid_3.1.20.tgz"; + url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.20.tgz"; + sha1 = "badc263c6b1dcf14b71efaa85f6ab4c1d6cfc788"; + }; + } + { + name = "nanoid___nanoid_3.1.25.tgz"; + path = fetchurl { + name = "nanoid___nanoid_3.1.25.tgz"; + url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.25.tgz"; + sha1 = "09ca32747c0e543f0e1814b7d3793477f9c8e152"; + }; + } + { + name = "negotiator___negotiator_0.6.2.tgz"; + path = fetchurl { + name = "negotiator___negotiator_0.6.2.tgz"; + url = "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz"; + sha1 = "feacf7ccf525a77ae9634436a64883ffeca346fb"; + }; + } + { + name = "neo_async___neo_async_2.6.2.tgz"; + path = fetchurl { + name = "neo_async___neo_async_2.6.2.tgz"; + url = "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz"; + sha1 = "b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"; + }; + } + { + name = "node_fetch___node_fetch_1.6.3.tgz"; + path = fetchurl { + name = "node_fetch___node_fetch_1.6.3.tgz"; + url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.6.3.tgz"; + sha1 = "dc234edd6489982d58e8f0db4f695029abcd8c04"; + }; + } + { + name = "node_releases___node_releases_1.1.75.tgz"; + path = fetchurl { + name = "node_releases___node_releases_1.1.75.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.75.tgz"; + sha1 = "6dd8c876b9897a1b8e5a02de26afa79bb54ebbfe"; + }; + } + { + name = "normalize_path___normalize_path_3.0.0.tgz"; + path = fetchurl { + name = "normalize_path___normalize_path_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz"; + sha1 = "0dcd69ff23a1c9b11fd0978316644a0388216a65"; + }; + } + { + name = "normalize_url___normalize_url_4.5.1.tgz"; + path = fetchurl { + name = "normalize_url___normalize_url_4.5.1.tgz"; + url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz"; + sha1 = "0dd90cf1288ee1d1313b87081c9a5932ee48518a"; + }; + } + { + name = "npm_run_path___npm_run_path_4.0.1.tgz"; + path = fetchurl { + name = "npm_run_path___npm_run_path_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz"; + sha1 = "b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"; + }; + } + { + name = "object_assign___object_assign_4.1.1.tgz"; + path = fetchurl { + name = "object_assign___object_assign_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + } + { + name = "on_finished___on_finished_2.3.0.tgz"; + path = fetchurl { + name = "on_finished___on_finished_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz"; + sha1 = "20f1336481b083cd75337992a16971aa2d906947"; + }; + } + { + name = "on_headers___on_headers_1.0.2.tgz"; + path = fetchurl { + name = "on_headers___on_headers_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz"; + sha1 = "772b0ae6aaa525c399e489adfad90c403eb3c28f"; + }; + } + { + name = "once___once_1.4.0.tgz"; + path = fetchurl { + name = "once___once_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + } + { + name = "onetime___onetime_2.0.1.tgz"; + path = fetchurl { + name = "onetime___onetime_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz"; + sha1 = "067428230fd67443b2794b22bba528b6867962d4"; + }; + } + { + name = "onetime___onetime_5.1.2.tgz"; + path = fetchurl { + name = "onetime___onetime_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz"; + sha1 = "d0e96ebb56b07476df1dd9c4806e5237985ca45e"; + }; + } + { + name = "openapi_default_setter___openapi_default_setter_8.0.0.tgz"; + path = fetchurl { + name = "openapi_default_setter___openapi_default_setter_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/openapi-default-setter/-/openapi-default-setter-8.0.0.tgz"; + sha1 = "17caf5c58f2c8d11609d270847952a3fc295f95b"; + }; + } + { + name = "openapi_framework___openapi_framework_8.0.0.tgz"; + path = fetchurl { + name = "openapi_framework___openapi_framework_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/openapi-framework/-/openapi-framework-8.0.0.tgz"; + sha1 = "5bdaaca75cd1344ff71f622948a0f89d55b6a716"; + }; + } + { + name = "openapi_jsonschema_parameters___openapi_jsonschema_parameters_8.0.0.tgz"; + path = fetchurl { + name = "openapi_jsonschema_parameters___openapi_jsonschema_parameters_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/openapi-jsonschema-parameters/-/openapi-jsonschema-parameters-8.0.0.tgz"; + sha1 = "1aae51fe0c8312672ef3e20ef97f4456b3f33e59"; + }; + } + { + name = "openapi_request_coercer___openapi_request_coercer_8.0.0.tgz"; + path = fetchurl { + name = "openapi_request_coercer___openapi_request_coercer_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/openapi-request-coercer/-/openapi-request-coercer-8.0.0.tgz"; + sha1 = "5767c12da1a40f509fa55147210b09d66a854ee0"; + }; + } + { + name = "openapi_request_validator___openapi_request_validator_8.0.0.tgz"; + path = fetchurl { + name = "openapi_request_validator___openapi_request_validator_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/openapi-request-validator/-/openapi-request-validator-8.0.0.tgz"; + sha1 = "b22acecc73952ccc132fd3710e79e319eb8f20cc"; + }; + } + { + name = "openapi_response_validator___openapi_response_validator_8.0.0.tgz"; + path = fetchurl { + name = "openapi_response_validator___openapi_response_validator_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/openapi-response-validator/-/openapi-response-validator-8.0.0.tgz"; + sha1 = "ea4f3a43bcf9e151c1e90046f8a2d10c98607368"; + }; + } + { + name = "openapi_schema_validator___openapi_schema_validator_8.0.0.tgz"; + path = fetchurl { + name = "openapi_schema_validator___openapi_schema_validator_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/openapi-schema-validator/-/openapi-schema-validator-8.0.0.tgz"; + sha1 = "6a0eb06bec103e057ea1f1051883bb8c465684a4"; + }; + } + { + name = "openapi_security_handler___openapi_security_handler_8.0.0.tgz"; + path = fetchurl { + name = "openapi_security_handler___openapi_security_handler_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/openapi-security-handler/-/openapi-security-handler-8.0.0.tgz"; + sha1 = "0b4c1a589f61c4cee7bec0b945d6d3f494fdf023"; + }; + } + { + name = "openapi_types___openapi_types_7.2.3.tgz"; + path = fetchurl { + name = "openapi_types___openapi_types_7.2.3.tgz"; + url = "https://registry.yarnpkg.com/openapi-types/-/openapi-types-7.2.3.tgz"; + sha1 = "83829911a3410a022f0e0cf2b0b2e67232ccf96e"; + }; + } + { + name = "openapi_types___openapi_types_8.0.0.tgz"; + path = fetchurl { + name = "openapi_types___openapi_types_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/openapi-types/-/openapi-types-8.0.0.tgz"; + sha1 = "7e1979538798d31a3c3bfed667e5e9295402f9bc"; + }; + } + { + name = "opencollective_postinstall___opencollective_postinstall_2.0.3.tgz"; + path = fetchurl { + name = "opencollective_postinstall___opencollective_postinstall_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz"; + sha1 = "7a0fff978f6dbfa4d006238fbac98ed4198c3259"; + }; + } + { + name = "opencollective___opencollective_1.0.3.tgz"; + path = fetchurl { + name = "opencollective___opencollective_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/opencollective/-/opencollective-1.0.3.tgz"; + sha1 = "aee6372bc28144583690c3ca8daecfc120dd0ef1"; + }; + } + { + name = "opn___opn_4.0.2.tgz"; + path = fetchurl { + name = "opn___opn_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/opn/-/opn-4.0.2.tgz"; + sha1 = "7abc22e644dff63b0a96d5ab7f2790c0f01abc95"; + }; + } + { + name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; + path = fetchurl { + name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + }; + } + { + name = "p_cancelable___p_cancelable_1.1.0.tgz"; + path = fetchurl { + name = "p_cancelable___p_cancelable_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz"; + sha1 = "d078d15a3af409220c886f1d9a0ca2e441ab26cc"; + }; + } + { + name = "p_limit___p_limit_2.3.0.tgz"; + path = fetchurl { + name = "p_limit___p_limit_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz"; + sha1 = "3dd33c647a214fdfffd835933eb086da0dc21db1"; + }; + } + { + name = "p_limit___p_limit_3.1.0.tgz"; + path = fetchurl { + name = "p_limit___p_limit_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz"; + sha1 = "e1daccbe78d0d1388ca18c64fea38e3e57e3706b"; + }; + } + { + name = "p_locate___p_locate_4.1.0.tgz"; + path = fetchurl { + name = "p_locate___p_locate_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz"; + sha1 = "a3428bb7088b3a60292f66919278b7c297ad4f07"; + }; + } + { + name = "p_locate___p_locate_5.0.0.tgz"; + path = fetchurl { + name = "p_locate___p_locate_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz"; + sha1 = "83c8315c6785005e3bd021839411c9e110e6d834"; + }; + } + { + name = "p_try___p_try_2.2.0.tgz"; + path = fetchurl { + name = "p_try___p_try_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz"; + sha1 = "cb2868540e313d61de58fafbe35ce9004d5540e6"; + }; + } + { + name = "package_json___package_json_6.5.0.tgz"; + path = fetchurl { + name = "package_json___package_json_6.5.0.tgz"; + url = "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz"; + sha1 = "6feedaca35e75725876d0b0e64974697fed145b0"; + }; + } + { + name = "parseurl___parseurl_1.3.3.tgz"; + path = fetchurl { + name = "parseurl___parseurl_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz"; + sha1 = "9da19e7bee8d12dff0513ed5b76957793bc2e8d4"; + }; + } + { + name = "path_exists___path_exists_4.0.0.tgz"; + path = fetchurl { + name = "path_exists___path_exists_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz"; + sha1 = "513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"; + }; + } + { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + path = fetchurl { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + } + { + name = "path_key___path_key_3.1.1.tgz"; + path = fetchurl { + name = "path_key___path_key_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz"; + sha1 = "581f6ade658cbba65a0d3380de7753295054f375"; + }; + } + { + name = "path_parse___path_parse_1.0.7.tgz"; + path = fetchurl { + name = "path_parse___path_parse_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz"; + sha1 = "fbc114b60ca42b30d9daf5858e4bd68bbedb6735"; + }; + } + { + name = "path_to_regexp___path_to_regexp_0.1.7.tgz"; + path = fetchurl { + name = "path_to_regexp___path_to_regexp_0.1.7.tgz"; + url = "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; + sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; + }; + } + { + name = "path_type___path_type_4.0.0.tgz"; + path = fetchurl { + name = "path_type___path_type_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz"; + sha1 = "84ed01c0a7ba380afe09d90a8c180dcd9d03043b"; + }; + } + { + name = "picomatch___picomatch_2.3.0.tgz"; + path = fetchurl { + name = "picomatch___picomatch_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz"; + sha1 = "f1f061de8f6a4bf022892e2d128234fb98302972"; + }; + } + { + name = "pinkie_promise___pinkie_promise_2.0.1.tgz"; + path = fetchurl { + name = "pinkie_promise___pinkie_promise_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; + sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; + }; + } + { + name = "pinkie___pinkie_2.0.4.tgz"; + path = fetchurl { + name = "pinkie___pinkie_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz"; + sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; + }; + } + { + name = "pkg_dir___pkg_dir_4.2.0.tgz"; + path = fetchurl { + name = "pkg_dir___pkg_dir_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz"; + sha1 = "f099133df7ede422e81d1d8448270eeb3e4261f3"; + }; + } + { + name = "postcss_modules_extract_imports___postcss_modules_extract_imports_3.0.0.tgz"; + path = fetchurl { + name = "postcss_modules_extract_imports___postcss_modules_extract_imports_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz"; + sha1 = "cda1f047c0ae80c97dbe28c3e76a43b88025741d"; + }; + } + { + name = "postcss_modules_local_by_default___postcss_modules_local_by_default_4.0.0.tgz"; + path = fetchurl { + name = "postcss_modules_local_by_default___postcss_modules_local_by_default_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz"; + sha1 = "ebbb54fae1598eecfdf691a02b3ff3b390a5a51c"; + }; + } + { + name = "postcss_modules_scope___postcss_modules_scope_3.0.0.tgz"; + path = fetchurl { + name = "postcss_modules_scope___postcss_modules_scope_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz"; + sha1 = "9ef3151456d3bbfa120ca44898dfca6f2fa01f06"; + }; + } + { + name = "postcss_modules_values___postcss_modules_values_4.0.0.tgz"; + path = fetchurl { + name = "postcss_modules_values___postcss_modules_values_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz"; + sha1 = "d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c"; + }; + } + { + name = "postcss_selector_parser___postcss_selector_parser_6.0.6.tgz"; + path = fetchurl { + name = "postcss_selector_parser___postcss_selector_parser_6.0.6.tgz"; + url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz"; + sha1 = "2c5bba8174ac2f6981ab631a42ab0ee54af332ea"; + }; + } + { + name = "postcss_value_parser___postcss_value_parser_4.1.0.tgz"; + path = fetchurl { + name = "postcss_value_parser___postcss_value_parser_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz"; + sha1 = "443f6a20ced6481a2bda4fa8532a6e55d789a2cb"; + }; + } + { + name = "postcss___postcss_8.3.6.tgz"; + path = fetchurl { + name = "postcss___postcss_8.3.6.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-8.3.6.tgz"; + sha1 = "2730dd76a97969f37f53b9a6096197be311cc4ea"; + }; + } + { + name = "prepend_http___prepend_http_2.0.0.tgz"; + path = fetchurl { + name = "prepend_http___prepend_http_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz"; + sha1 = "e92434bfa5ea8c19f41cdfd401d741a3c819d897"; + }; + } + { + name = "process___process_0.11.10.tgz"; + path = fetchurl { + name = "process___process_0.11.10.tgz"; + url = "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz"; + sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182"; + }; + } + { + name = "promise_queue___promise_queue_2.2.5.tgz"; + path = fetchurl { + name = "promise_queue___promise_queue_2.2.5.tgz"; + url = "https://registry.yarnpkg.com/promise-queue/-/promise-queue-2.2.5.tgz"; + sha1 = "2f6f5f7c0f6d08109e967659c79b88a9ed5e93b4"; + }; + } + { + name = "proxy_addr___proxy_addr_2.0.7.tgz"; + path = fetchurl { + name = "proxy_addr___proxy_addr_2.0.7.tgz"; + url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz"; + sha1 = "f19fe69ceab311eeb94b42e70e8c2070f9ba1025"; + }; + } + { + name = "pump___pump_3.0.0.tgz"; + path = fetchurl { + name = "pump___pump_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz"; + sha1 = "b4a2116815bde2f4e1ea602354e8c75565107a64"; + }; + } + { + name = "punycode___punycode_1.3.2.tgz"; + path = fetchurl { + name = "punycode___punycode_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz"; + sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; + }; + } + { + name = "punycode___punycode_2.1.1.tgz"; + path = fetchurl { + name = "punycode___punycode_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; + sha1 = "b58b010ac40c22c5657616c8d2c2c02c7bf479ec"; + }; + } + { + name = "qs___qs_6.7.0.tgz"; + path = fetchurl { + name = "qs___qs_6.7.0.tgz"; + url = "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz"; + sha1 = "41dc1a015e3d581f1621776be31afb2876a9b1bc"; + }; + } + { + name = "querystring___querystring_0.2.0.tgz"; + path = fetchurl { + name = "querystring___querystring_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz"; + sha1 = "b209849203bb25df820da756e747005878521620"; + }; + } + { + name = "queue_microtask___queue_microtask_1.2.3.tgz"; + path = fetchurl { + name = "queue_microtask___queue_microtask_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz"; + sha1 = "4929228bbc724dfac43e0efb058caf7b6cfb6243"; + }; + } + { + name = "randombytes___randombytes_2.1.0.tgz"; + path = fetchurl { + name = "randombytes___randombytes_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz"; + sha1 = "df6f84372f0270dc65cdf6291349ab7a473d4f2a"; + }; + } + { + name = "range_parser___range_parser_1.2.1.tgz"; + path = fetchurl { + name = "range_parser___range_parser_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz"; + sha1 = "3cf37023d199e1c24d1a55b84800c2f3e6468031"; + }; + } + { + name = "raw_body___raw_body_2.4.0.tgz"; + path = fetchurl { + name = "raw_body___raw_body_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz"; + sha1 = "a1ce6fb9c9bc356ca52e89256ab59059e13d0332"; + }; + } + { + name = "rc___rc_1.2.8.tgz"; + path = fetchurl { + name = "rc___rc_1.2.8.tgz"; + url = "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz"; + sha1 = "cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"; + }; + } + { + name = "react_dom___react_dom_17.0.2.tgz"; + path = fetchurl { + name = "react_dom___react_dom_17.0.2.tgz"; + url = "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz"; + sha1 = "ecffb6845e3ad8dbfcdc498f0d0a939736502c23"; + }; + } + { + name = "react___react_17.0.2.tgz"; + path = fetchurl { + name = "react___react_17.0.2.tgz"; + url = "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz"; + sha1 = "d0b5cc516d29eb3eee383f75b62864cfb6800037"; + }; + } + { + name = "readable_stream___readable_stream_3.6.0.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"; + sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198"; + }; + } + { + name = "readdirp___readdirp_3.5.0.tgz"; + path = fetchurl { + name = "readdirp___readdirp_3.5.0.tgz"; + url = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz"; + sha1 = "9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"; + }; + } + { + name = "rechoir___rechoir_0.7.1.tgz"; + path = fetchurl { + name = "rechoir___rechoir_0.7.1.tgz"; + url = "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz"; + sha1 = "9478a96a1ca135b5e88fc027f03ee92d6c645686"; + }; + } + { + name = "regenerator_runtime___regenerator_runtime_0.10.5.tgz"; + path = fetchurl { + name = "regenerator_runtime___regenerator_runtime_0.10.5.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz"; + sha1 = "336c3efc1220adcedda2c9fab67b5a7955a33658"; + }; + } + { + name = "regenerator_runtime___regenerator_runtime_0.11.1.tgz"; + path = fetchurl { + name = "regenerator_runtime___regenerator_runtime_0.11.1.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"; + sha1 = "be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"; + }; + } + { + name = "registry_auth_token___registry_auth_token_4.2.1.tgz"; + path = fetchurl { + name = "registry_auth_token___registry_auth_token_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz"; + sha1 = "6d7b4006441918972ccd5fedcd41dc322c79b250"; + }; + } + { + name = "registry_url___registry_url_5.1.0.tgz"; + path = fetchurl { + name = "registry_url___registry_url_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz"; + sha1 = "e98334b50d5434b81136b44ec638d9c2009c5009"; + }; + } + { + name = "require_directory___require_directory_2.1.1.tgz"; + path = fetchurl { + name = "require_directory___require_directory_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + }; + } + { + name = "resolve_cwd___resolve_cwd_3.0.0.tgz"; + path = fetchurl { + name = "resolve_cwd___resolve_cwd_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz"; + sha1 = "0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"; + }; + } + { + name = "resolve_from___resolve_from_5.0.0.tgz"; + path = fetchurl { + name = "resolve_from___resolve_from_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz"; + sha1 = "c35225843df8f776df21c57557bc087e9dfdfc69"; + }; + } + { + name = "resolve___resolve_1.20.0.tgz"; + path = fetchurl { + name = "resolve___resolve_1.20.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz"; + sha1 = "629a013fb3f70755d6f0b7935cc1c2c5378b1975"; + }; + } + { + name = "responselike___responselike_1.0.2.tgz"; + path = fetchurl { + name = "responselike___responselike_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz"; + sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7"; + }; + } + { + name = "restore_cursor___restore_cursor_2.0.0.tgz"; + path = fetchurl { + name = "restore_cursor___restore_cursor_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz"; + sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; + }; + } + { + name = "reusify___reusify_1.0.4.tgz"; + path = fetchurl { + name = "reusify___reusify_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz"; + sha1 = "90da382b1e126efc02146e90845a88db12925d76"; + }; + } + { + name = "rimraf___rimraf_3.0.2.tgz"; + path = fetchurl { + name = "rimraf___rimraf_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz"; + sha1 = "f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"; + }; + } + { + name = "run_async___run_async_2.4.1.tgz"; + path = fetchurl { + name = "run_async___run_async_2.4.1.tgz"; + url = "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz"; + sha1 = "8440eccf99ea3e70bd409d49aab88e10c189a455"; + }; + } + { + name = "run_parallel___run_parallel_1.2.0.tgz"; + path = fetchurl { + name = "run_parallel___run_parallel_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz"; + sha1 = "66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"; + }; + } + { + name = "rx___rx_4.1.0.tgz"; + path = fetchurl { + name = "rx___rx_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz"; + sha1 = "a5f13ff79ef3b740fe30aa803fb09f98805d4782"; + }; + } + { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d"; + }; + } + { + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha1 = "1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"; + }; + } + { + name = "safer_buffer___safer_buffer_2.1.2.tgz"; + path = fetchurl { + name = "safer_buffer___safer_buffer_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha1 = "44fa161b0187b9549dd84bb91802f9bd8385cd6a"; + }; + } + { + name = "scheduler___scheduler_0.20.2.tgz"; + path = fetchurl { + name = "scheduler___scheduler_0.20.2.tgz"; + url = "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz"; + sha1 = "4baee39436e34aa93b4874bddcbf0fe8b8b50e91"; + }; + } + { + name = "schema_utils___schema_utils_3.1.1.tgz"; + path = fetchurl { + name = "schema_utils___schema_utils_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz"; + sha1 = "bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"; + }; + } + { + name = "semver___semver_5.7.1.tgz"; + path = fetchurl { + name = "semver___semver_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"; + sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7"; + }; + } + { + name = "semver___semver_6.3.0.tgz"; + path = fetchurl { + name = "semver___semver_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz"; + sha1 = "ee0a64c8af5e8ceea67687b133761e1becbd1d3d"; + }; + } + { + name = "semver___semver_7.3.5.tgz"; + path = fetchurl { + name = "semver___semver_7.3.5.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz"; + sha1 = "0b621c879348d8998e4b0e4be94b3f12e6018ef7"; + }; + } + { + name = "send___send_0.17.1.tgz"; + path = fetchurl { + name = "send___send_0.17.1.tgz"; + url = "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz"; + sha1 = "c1d8b059f7900f7466dd4938bdc44e11ddb376c8"; + }; + } + { + name = "serialize_javascript___serialize_javascript_5.0.1.tgz"; + path = fetchurl { + name = "serialize_javascript___serialize_javascript_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz"; + sha1 = "7886ec848049a462467a97d3d918ebb2aaf934f4"; + }; + } + { + name = "serialize_javascript___serialize_javascript_6.0.0.tgz"; + path = fetchurl { + name = "serialize_javascript___serialize_javascript_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz"; + sha1 = "efae5d88f45d7924141da8b5c3a7a7e663fefeb8"; + }; + } + { + name = "serve_static___serve_static_1.14.1.tgz"; + path = fetchurl { + name = "serve_static___serve_static_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz"; + sha1 = "666e636dc4f010f7ef29970a88a674320898b2f9"; + }; + } + { + name = "setprototypeof___setprototypeof_1.1.1.tgz"; + path = fetchurl { + name = "setprototypeof___setprototypeof_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz"; + sha1 = "7e95acb24aa92f5885e0abef5ba131330d4ae683"; + }; + } + { + name = "shallow_clone___shallow_clone_3.0.1.tgz"; + path = fetchurl { + name = "shallow_clone___shallow_clone_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz"; + sha1 = "8f2981ad92531f55035b01fb230769a40e02efa3"; + }; + } + { + name = "shebang_command___shebang_command_2.0.0.tgz"; + path = fetchurl { + name = "shebang_command___shebang_command_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz"; + sha1 = "ccd0af4f8835fbdc265b82461aaf0c36663f34ea"; + }; + } + { + name = "shebang_regex___shebang_regex_3.0.0.tgz"; + path = fetchurl { + name = "shebang_regex___shebang_regex_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz"; + sha1 = "ae16f1644d873ecad843b0307b143362d4c42172"; + }; + } + { + name = "sift___sift_7.0.1.tgz"; + path = fetchurl { + name = "sift___sift_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/sift/-/sift-7.0.1.tgz"; + sha1 = "47d62c50b159d316f1372f8b53f9c10cd21a4b08"; + }; + } + { + name = "signal_exit___signal_exit_3.0.3.tgz"; + path = fetchurl { + name = "signal_exit___signal_exit_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz"; + sha1 = "a1410c2edd8f077b08b4e253c8eacfcaf057461c"; + }; + } + { + name = "slash___slash_3.0.0.tgz"; + path = fetchurl { + name = "slash___slash_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz"; + sha1 = "6539be870c165adbd5240220dbe361f1bc4d4634"; + }; + } + { + name = "source_map_js___source_map_js_0.6.2.tgz"; + path = fetchurl { + name = "source_map_js___source_map_js_0.6.2.tgz"; + url = "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz"; + sha1 = "0bb5de631b41cfbda6cfba8bd05a80efdfd2385e"; + }; + } + { + name = "source_map_support___source_map_support_0.5.19.tgz"; + path = fetchurl { + name = "source_map_support___source_map_support_0.5.19.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz"; + sha1 = "a98b62f86dcaf4f67399648c085291ab9e8fed61"; + }; + } + { + name = "source_map___source_map_0.6.1.tgz"; + path = fetchurl { + name = "source_map___source_map_0.6.1.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz"; + sha1 = "74722af32e9614e9c287a8d0bbde48b5e2f1a263"; + }; + } + { + name = "source_map___source_map_0.7.3.tgz"; + path = fetchurl { + name = "source_map___source_map_0.7.3.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz"; + sha1 = "5302f8169031735226544092e64981f751750383"; + }; + } + { + name = "sprintf_js___sprintf_js_1.0.3.tgz"; + path = fetchurl { + name = "sprintf_js___sprintf_js_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + } + { + name = "statuses___statuses_1.5.0.tgz"; + path = fetchurl { + name = "statuses___statuses_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz"; + sha1 = "161c7dac177659fd9811f43771fa99381478628c"; + }; + } + { + name = "stream_http___stream_http_3.2.0.tgz"; + path = fetchurl { + name = "stream_http___stream_http_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/stream-http/-/stream-http-3.2.0.tgz"; + sha1 = "1872dfcf24cb15752677e40e5c3f9cc1926028b5"; + }; + } + { + name = "string_width___string_width_2.1.1.tgz"; + path = fetchurl { + name = "string_width___string_width_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz"; + sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e"; + }; + } + { + name = "string_width___string_width_4.2.2.tgz"; + path = fetchurl { + name = "string_width___string_width_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz"; + sha1 = "dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"; + }; + } + { + name = "string_decoder___string_decoder_1.3.0.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz"; + sha1 = "42f114594a46cf1a8e30b0a84f56c78c3edac21e"; + }; + } + { + name = "strip_ansi___strip_ansi_3.0.1.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + } + { + name = "strip_ansi___strip_ansi_4.0.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz"; + sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + }; + } + { + name = "strip_ansi___strip_ansi_6.0.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz"; + sha1 = "0b1571dd7669ccd4f3e06e14ef1eed26225ae532"; + }; + } + { + name = "strip_final_newline___strip_final_newline_2.0.0.tgz"; + path = fetchurl { + name = "strip_final_newline___strip_final_newline_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz"; + sha1 = "89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"; + }; + } + { + name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; + path = fetchurl { + name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz"; + sha1 = "31f1281b3832630434831c310c01cccda8cbe006"; + }; + } + { + name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; + path = fetchurl { + name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; + sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + }; + } + { + name = "style_loader___style_loader_2.0.0.tgz"; + path = fetchurl { + name = "style_loader___style_loader_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/style-loader/-/style-loader-2.0.0.tgz"; + sha1 = "9669602fd4690740eaaec137799a03addbbc393c"; + }; + } + { + name = "supports_color___supports_color_8.1.1.tgz"; + path = fetchurl { + name = "supports_color___supports_color_8.1.1.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz"; + sha1 = "cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"; + }; + } + { + name = "supports_color___supports_color_2.0.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz"; + sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + }; + } + { + name = "supports_color___supports_color_5.5.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_5.5.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz"; + sha1 = "e2e69a44ac8772f78a1ec0b35b689df6530efc8f"; + }; + } + { + name = "supports_color___supports_color_7.2.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz"; + sha1 = "1b7dcdcb32b8138801b3e478ba6a51caa89648da"; + }; + } + { + name = "swagger_schema_official___swagger_schema_official_2.0.0_bab6bed.tgz"; + path = fetchurl { + name = "swagger_schema_official___swagger_schema_official_2.0.0_bab6bed.tgz"; + url = "https://registry.yarnpkg.com/swagger-schema-official/-/swagger-schema-official-2.0.0-bab6bed.tgz"; + sha1 = "70070468d6d2977ca5237b2e519ca7d06a2ea3fd"; + }; + } + { + name = "swagger_ui_dist___swagger_ui_dist_3.51.2.tgz"; + path = fetchurl { + name = "swagger_ui_dist___swagger_ui_dist_3.51.2.tgz"; + url = "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-3.51.2.tgz"; + sha1 = "b0f377edf91a7fd1f4026f4ccc75c072ea610b7b"; + }; + } + { + name = "tail___tail_2.2.3.tgz"; + path = fetchurl { + name = "tail___tail_2.2.3.tgz"; + url = "https://registry.yarnpkg.com/tail/-/tail-2.2.3.tgz"; + sha1 = "3e6bf65963bb868913e4e3b770cc1584c9d8091c"; + }; + } + { + name = "tapable___tapable_2.2.0.tgz"; + path = fetchurl { + name = "tapable___tapable_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/tapable/-/tapable-2.2.0.tgz"; + sha1 = "5c373d281d9c672848213d0e037d1c4165ab426b"; + }; + } + { + name = "terser_webpack_plugin___terser_webpack_plugin_5.2.3.tgz"; + path = fetchurl { + name = "terser_webpack_plugin___terser_webpack_plugin_5.2.3.tgz"; + url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.2.3.tgz"; + sha1 = "4852c91f709a4ea2bcf324cf48e7e88124cda0cc"; + }; + } + { + name = "terser___terser_5.7.2.tgz"; + path = fetchurl { + name = "terser___terser_5.7.2.tgz"; + url = "https://registry.yarnpkg.com/terser/-/terser-5.7.2.tgz"; + sha1 = "d4d95ed4f8bf735cb933e802f2a1829abf545e3f"; + }; + } + { + name = "through___through_2.3.8.tgz"; + path = fetchurl { + name = "through___through_2.3.8.tgz"; + url = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz"; + sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + }; + } + { + name = "tmp___tmp_0.0.33.tgz"; + path = fetchurl { + name = "tmp___tmp_0.0.33.tgz"; + url = "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz"; + sha1 = "6d34335889768d21b2bcda0aa277ced3b1bfadf9"; + }; + } + { + name = "to_readable_stream___to_readable_stream_1.0.0.tgz"; + path = fetchurl { + name = "to_readable_stream___to_readable_stream_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz"; + sha1 = "ce0aa0c2f3df6adf852efb404a783e77c0475771"; + }; + } + { + name = "to_regex_range___to_regex_range_5.0.1.tgz"; + path = fetchurl { + name = "to_regex_range___to_regex_range_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz"; + sha1 = "1648c44aae7c8d988a326018ed72f5b4dd0392e4"; + }; + } + { + name = "toidentifier___toidentifier_1.0.0.tgz"; + path = fetchurl { + name = "toidentifier___toidentifier_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz"; + sha1 = "7e1be3470f1e77948bc43d94a3c8f4d7752ba553"; + }; + } + { + name = "ts_loader___ts_loader_9.2.5.tgz"; + path = fetchurl { + name = "ts_loader___ts_loader_9.2.5.tgz"; + url = "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.2.5.tgz"; + sha1 = "127733a5e9243bf6dafcb8aa3b8a266d8041dca9"; + }; + } + { + name = "ts_log___ts_log_2.2.3.tgz"; + path = fetchurl { + name = "ts_log___ts_log_2.2.3.tgz"; + url = "https://registry.yarnpkg.com/ts-log/-/ts-log-2.2.3.tgz"; + sha1 = "4da5640fe25a9fb52642cd32391c886721318efb"; + }; + } + { + name = "tslib___tslib_1.14.1.tgz"; + path = fetchurl { + name = "tslib___tslib_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz"; + sha1 = "cf2d38bdc34a134bcaf1091c41f6619e2f672d00"; + }; + } + { + name = "tslib___tslib_2.3.1.tgz"; + path = fetchurl { + name = "tslib___tslib_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz"; + sha1 = "e8a335add5ceae51aa261d32a490158ef042ef01"; + }; + } + { + name = "tslint_config_prettier___tslint_config_prettier_1.18.0.tgz"; + path = fetchurl { + name = "tslint_config_prettier___tslint_config_prettier_1.18.0.tgz"; + url = "https://registry.yarnpkg.com/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz"; + sha1 = "75f140bde947d35d8f0d238e0ebf809d64592c37"; + }; + } + { + name = "tslint___tslint_6.1.3.tgz"; + path = fetchurl { + name = "tslint___tslint_6.1.3.tgz"; + url = "https://registry.yarnpkg.com/tslint/-/tslint-6.1.3.tgz"; + sha1 = "5c23b2eccc32487d5523bd3a470e9aa31789d904"; + }; + } + { + name = "tsutils___tsutils_2.29.0.tgz"; + path = fetchurl { + name = "tsutils___tsutils_2.29.0.tgz"; + url = "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz"; + sha1 = "32b488501467acbedd4b85498673a0812aca0b99"; + }; + } + { + name = "type_is___type_is_1.6.18.tgz"; + path = fetchurl { + name = "type_is___type_is_1.6.18.tgz"; + url = "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz"; + sha1 = "4e552cd05df09467dcbc4ef739de89f2cf37c131"; + }; + } + { + name = "typescript___typescript_4.4.2.tgz"; + path = fetchurl { + name = "typescript___typescript_4.4.2.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-4.4.2.tgz"; + sha1 = "6d618640d430e3569a1dfb44f7d7e600ced3ee86"; + }; + } + { + name = "unpipe___unpipe_1.0.0.tgz"; + path = fetchurl { + name = "unpipe___unpipe_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz"; + sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + }; + } + { + name = "uri_js___uri_js_4.4.1.tgz"; + path = fetchurl { + name = "uri_js___uri_js_4.4.1.tgz"; + url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz"; + sha1 = "9b1a52595225859e55f669d928f88c6c57f2a77e"; + }; + } + { + name = "url_parse_lax___url_parse_lax_3.0.0.tgz"; + path = fetchurl { + name = "url_parse_lax___url_parse_lax_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz"; + sha1 = "16b5cafc07dbe3676c1b1999177823d6503acb0c"; + }; + } + { + name = "url___url_0.11.0.tgz"; + path = fetchurl { + name = "url___url_0.11.0.tgz"; + url = "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz"; + sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"; + }; + } + { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + path = fetchurl { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + } + { + name = "utils_merge___utils_merge_1.0.1.tgz"; + path = fetchurl { + name = "utils_merge___utils_merge_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz"; + sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; + }; + } + { + name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; + path = fetchurl { + name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"; + sha1 = "2de19618c66dc247dcfb6f99338035d8245a2cee"; + }; + } + { + name = "vary___vary_1.1.2.tgz"; + path = fetchurl { + name = "vary___vary_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz"; + sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; + }; + } + { + name = "watchpack___watchpack_2.2.0.tgz"; + path = fetchurl { + name = "watchpack___watchpack_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/watchpack/-/watchpack-2.2.0.tgz"; + sha1 = "47d78f5415fe550ecd740f99fe2882323a58b1ce"; + }; + } + { + name = "webpack_cli___webpack_cli_4.8.0.tgz"; + path = fetchurl { + name = "webpack_cli___webpack_cli_4.8.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.8.0.tgz"; + sha1 = "5fc3c8b9401d3c8a43e2afceacfa8261962338d1"; + }; + } + { + name = "webpack_merge___webpack_merge_5.8.0.tgz"; + path = fetchurl { + name = "webpack_merge___webpack_merge_5.8.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz"; + sha1 = "2b39dbf22af87776ad744c390223731d30a68f61"; + }; + } + { + name = "webpack_sources___webpack_sources_3.2.0.tgz"; + path = fetchurl { + name = "webpack_sources___webpack_sources_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.0.tgz"; + sha1 = "b16973bcf844ebcdb3afde32eda1c04d0b90f89d"; + }; + } + { + name = "webpack___webpack_5.48.0.tgz"; + path = fetchurl { + name = "webpack___webpack_5.48.0.tgz"; + url = "https://registry.yarnpkg.com/webpack/-/webpack-5.48.0.tgz"; + sha1 = "06180fef9767a6fd066889559a4c4d49bee19b83"; + }; + } + { + name = "which___which_2.0.2.tgz"; + path = fetchurl { + name = "which___which_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz"; + sha1 = "7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"; + }; + } + { + name = "wide_align___wide_align_1.1.3.tgz"; + path = fetchurl { + name = "wide_align___wide_align_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz"; + sha1 = "ae074e6bdc0c14a431e804e624549c633b000457"; + }; + } + { + name = "wildcard___wildcard_2.0.0.tgz"; + path = fetchurl { + name = "wildcard___wildcard_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz"; + sha1 = "a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec"; + }; + } + { + name = "workerpool___workerpool_6.1.0.tgz"; + path = fetchurl { + name = "workerpool___workerpool_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/workerpool/-/workerpool-6.1.0.tgz"; + sha1 = "a8e038b4c94569596852de7a8ea4228eefdeb37b"; + }; + } + { + name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; + sha1 = "67e145cff510a6a6984bdf1152911d69d2eb9e43"; + }; + } + { + name = "wrappy___wrappy_1.0.2.tgz"; + path = fetchurl { + name = "wrappy___wrappy_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + } + { + name = "xtend___xtend_4.0.2.tgz"; + path = fetchurl { + name = "xtend___xtend_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz"; + sha1 = "bb72779f5fa465186b1f438f674fa347fdb5db54"; + }; + } + { + name = "y18n___y18n_5.0.8.tgz"; + path = fetchurl { + name = "y18n___y18n_5.0.8.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz"; + sha1 = "7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"; + }; + } + { + name = "yallist___yallist_4.0.0.tgz"; + path = fetchurl { + name = "yallist___yallist_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"; + sha1 = "9bb92790d9c0effec63be73519e11a35019a3a72"; + }; + } + { + name = "yargs_parser___yargs_parser_20.2.4.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_20.2.4.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz"; + sha1 = "b42890f14566796f85ae8e3a25290d205f154a54"; + }; + } + { + name = "yargs_parser___yargs_parser_20.2.9.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_20.2.9.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz"; + sha1 = "2eb7dc3b0289718fc295f362753845c41a0c94ee"; + }; + } + { + name = "yargs_unparser___yargs_unparser_2.0.0.tgz"; + path = fetchurl { + name = "yargs_unparser___yargs_unparser_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz"; + sha1 = "f131f9226911ae5d9ad38c432fe809366c2325eb"; + }; + } + { + name = "yargs___yargs_16.2.0.tgz"; + path = fetchurl { + name = "yargs___yargs_16.2.0.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz"; + sha1 = "1c82bf0f6b6a66eafce7ef30e376f49a12477f66"; + }; + } + { + name = "yocto_queue___yocto_queue_0.1.0.tgz"; + path = fetchurl { + name = "yocto_queue___yocto_queue_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz"; + sha1 = "0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"; + }; + } + ]; +} diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 49a569debaa7..568c75d07ce9 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -168,36 +168,6 @@ let meta.mainProgram = "markdownlint"; }; - mirakurun = super.mirakurun.override rec { - nativeBuildInputs = with pkgs; [ makeWrapper ]; - postInstall = let - runtimeDeps = [ nodejs ] ++ (with pkgs; [ bash which v4l-utils ]); - in - '' - substituteInPlace $out/lib/node_modules/mirakurun/processes.json \ - --replace "/usr/local" "" - - # XXX: Files copied from the Nix store are non-writable, so they need - # to be given explicit write permissions - substituteInPlace $out/lib/node_modules/mirakurun/lib/Mirakurun/config.js \ - --replace 'fs.copyFileSync("config/server.yml", path);' \ - 'fs.copyFileSync("config/server.yml", path); fs.chmodSync(path, 0o644);' \ - --replace 'fs.copyFileSync("config/tuners.yml", path);' \ - 'fs.copyFileSync("config/tuners.yml", path); fs.chmodSync(path, 0o644);' \ - --replace 'fs.copyFileSync("config/channels.yml", path);' \ - 'fs.copyFileSync("config/channels.yml", path); fs.chmodSync(path, 0o644);' - - # XXX: The original mirakurun command uses PM2 to manage the Mirakurun - # server. However, we invoke the server directly and let systemd - # manage it to avoid complication. This is okay since no features - # unique to PM2 is currently being used. - makeWrapper ${nodejs}/bin/npm $out/bin/mirakurun \ - --add-flags "start" \ - --run "cd $out/lib/node_modules/mirakurun" \ - --prefix PATH : ${pkgs.lib.makeBinPath runtimeDeps} - ''; - }; - node-gyp = super.node-gyp.override { nativeBuildInputs = [ pkgs.makeWrapper ]; # Teach node-gyp to use nodejs headers locally rather that download them form https://nodejs.org. diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index ce86ebe5e6b1..b8ac7e4e7c6d 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -173,7 +173,6 @@ , "mathjax" , "meat" , "@mermaid-js/mermaid-cli" -, "mirakurun" , "mocha" , "multi-file-swagger" , "musescore-downloader" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3a5b0c0c63a..122658d0848d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7215,7 +7215,7 @@ with pkgs; pythonPackages = python3Packages; }; - mirakurun = nodePackages.mirakurun; + mirakurun = callPackage ../applications/video/mirakurun { }; miredo = callPackage ../tools/networking/miredo { }; From 23ab07cc245a3c26d8fe7a92d293c53315abe4eb Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 7 Sep 2021 08:19:50 +0200 Subject: [PATCH 140/167] exa: re-enable documentation build on aarch64-darwin ghc builds now on aarch64-darwin Revert "exa: fix on aarch64-darwin (#133660)" This reverts commit 6adca8026c26d49de0c07a239642c33df58376a8. --- pkgs/tools/misc/exa/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 9cabff9a9bef..632eb4590586 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -18,21 +18,16 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-ah8IjShmivS6IWL3ku/4/j+WNr/LdUnh1YJnPdaFdcM="; - nativeBuildInputs = [ - cmake pkg-config installShellFiles - # ghc is not supported on aarch64-darwin yet. - ] ++ lib.optional (stdenv.hostPlatform.system != "aarch64-darwin") pandoc; - + nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; - outputs = [ "out" ] ++ lib.optional (stdenv.hostPlatform.system != "aarch64-darwin") "man"; + outputs = [ "out" "man" ]; - postInstall = lib.optionalString (stdenv.hostPlatform.system != "aarch64-darwin") '' + postInstall = '' pandoc --standalone -f markdown -t man man/exa.1.md > man/exa.1 pandoc --standalone -f markdown -t man man/exa_colors.5.md > man/exa_colors.5 installManPage man/exa.1 man/exa_colors.5 - '' + '' installShellCompletion \ --name exa completions/completions.bash \ --name exa.fish completions/completions.fish \ From 9d753f27043a2c513e89e1317bde186119b51411 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Thu, 2 Sep 2021 12:33:26 +0300 Subject: [PATCH 141/167] =?UTF-8?q?lua-penlight:=20dev-1=20=E2=86=92=201.1?= =?UTF-8?q?1.0-1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream is working on some major deprecations, being on a HEAD commit will not be a good plan going forward. Remove double `busted` in `checkInputs` - keep only 1. --- maintainers/scripts/luarocks-packages.csv | 2 +- pkgs/development/lua-modules/generated-packages.nix | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 1cb6a83d42ae..8cce4049e749 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -75,7 +75,7 @@ mediator_lua,,,,,, mpack,,,,,, moonscript,,,,,,arobyn nvim-client,https://github.com/neovim/lua-client.git,,,,, -penlight,https://github.com/Tieske/Penlight.git,,,,, +penlight,https://github.com/lunarmodules/Penlight.git,,,,,alerque plenary.nvim,https://github.com/nvim-lua/plenary.nvim.git,,,,lua5_1, rapidjson,https://github.com/xpol/lua-rapidjson.git,,,,, readline,,,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 6f5ffbce9c5b..06020551513f 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -1957,15 +1957,18 @@ nvim-client = buildLuarocksPackage { penlight = buildLuarocksPackage { pname = "penlight"; - version = "dev-1"; - + version = "1.11.0-1"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/penlight-1.11.0-1.rockspec"; + sha256 = "1sjhnywvamyi9fadhra5pw2an1rhy2hk2byfxmr3n5wi0xrqv004"; + }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lunarmodules/penlight.git", "rev": "e3712f00fae09a166dd62540b677600165d5bcd7", "date": "2021-08-18T21:37:47+02:00", "path": "/nix/store/i70ndw8qhvcm828ifb3vyj08y22xp0ka-penlight", "sha256": "19n9xqkb4hlak0k7hamk4ixwjvyxslsnyh1zjazdzrl8n736xhkl", - "fetchSubmodules": true, + "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false } @@ -1973,12 +1976,13 @@ penlight = buildLuarocksPackage { disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua luafilesystem ]; - checkInputs = [ busted busted ]; + checkInputs = [ busted ]; doCheck = false; meta = { homepage = "https://lunarmodules.github.io/penlight"; description = "Lua utility libraries loosely based on the Python standard libraries"; + maintainers = with lib.maintainers; [ alerque ]; license.fullName = "MIT/X11"; }; }; From bf18449d63edbb6b198fb06c49516cec10979bad Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Thu, 2 Sep 2021 12:31:16 +0300 Subject: [PATCH 142/167] =?UTF-8?q?sile:=200.10.5=20=E2=86=92=200.11.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add link to changelog. Add missing deps and patchShebangs in build-aux/*.sh --- pkgs/tools/typesetting/sile/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index 92062b8eac8a..049938581b67 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -3,9 +3,8 @@ , fetchurl , makeWrapper , pkg-config -, autoconf -, automake , poppler_utils +, gitMinimal , harfbuzz , icu , fontconfig @@ -39,11 +38,11 @@ in stdenv.mkDerivation rec { pname = "sile"; - version = "0.10.15"; + version = "0.11.1"; src = fetchurl { url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "0p1w3s6j34qi93aycqmqggfm277n90z90nlmm1j3qizxxwq5gda9"; + sha256 = "06bx94zx6skhizk2bbrid82sldwgxfycvjh6zx1zy1xz8gajgrm3"; }; configureFlags = [ @@ -52,8 +51,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - autoconf - automake + gitMinimal pkg-config makeWrapper ]; @@ -70,7 +68,9 @@ stdenv.mkDerivation rec { poppler_utils ]; - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = '' + patchShebangs build-aux/*.sh + '' + lib.optionalString stdenv.isDarwin '' sed -i -e 's|@import AppKit;|#import |' src/macfonts.m ''; @@ -108,7 +108,8 @@ stdenv.mkDerivation rec { technologies and borrowing some ideas from graphical systems such as InDesign. ''; - homepage = "https://sile-typesetter.org/"; + homepage = "https://sile-typesetter.org"; + changelog = "https://github.com/sile-typesetter/sile/raw/v${version}/CHANGELOG.md"; platforms = platforms.unix; broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/issues/23018 maintainers = with maintainers; [ doronbehar alerque ]; From 11aedaec1f545d6b02cbe5fedc79629ee1dca557 Mon Sep 17 00:00:00 2001 From: matthewcroughan Date: Sat, 4 Sep 2021 11:39:14 +0100 Subject: [PATCH 143/167] nixos: nix.sshServe: add write option Adds the ability to provide the --write flag in addition to the --serve flag via a new option, services.sshServe.write. A user can now share their system as a remote builder with friends easily as follows: { nix = { sshServe = { enable = true; write = true; keys = ["ssh-dss AAAAB3NzaC1k... alice@example.org"]; }; }; } Co-authored-by: Raphael Megzari --- nixos/modules/services/misc/nix-ssh-serve.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/nix-ssh-serve.nix b/nixos/modules/services/misc/nix-ssh-serve.nix index 7ce3841be2f5..1764c6d79649 100644 --- a/nixos/modules/services/misc/nix-ssh-serve.nix +++ b/nixos/modules/services/misc/nix-ssh-serve.nix @@ -4,7 +4,7 @@ with lib; let cfg = config.nix.sshServe; command = if cfg.protocol == "ssh" - then "nix-store --serve" + then "nix-store --serve ${lib.optionalString cfg.write "--write"}" else "nix-daemon --stdio"; in { options = { @@ -17,6 +17,12 @@ in { description = "Whether to enable serving the Nix store as a remote store via SSH."; }; + write = mkOption { + type = types.bool; + default = false; + description = "Whether to enable writing to the Nix store as a remote store via SSH. Note: the sshServe user is named nix-ssh and is not a trusted-user. nix-ssh should be added to the nix.trustedUsers option in most use cases, such as allowing remote building of derivations."; + }; + keys = mkOption { type = types.listOf types.str; default = []; From 459957f9d4d2e82424c7819eb36de4ec7644ef8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Mon, 6 Sep 2021 18:27:52 +0200 Subject: [PATCH 144/167] nixos/documentation: expose manualPages Allows advanced users to select what packages they want to generate the man cache for, and even more advanced users to make manualPages content-addressed to avoid needless rebuilds. --- nixos/modules/misc/documentation.nix | 30 ++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index 7e04f0f16a99..f22ea5f9aeb8 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -120,6 +120,24 @@ in ''; }; + man.manualPages = mkOption { + type = types.path; + default = pkgs.buildEnv { + name = "man-paths"; + paths = config.environment.systemPackages; + pathsToLink = [ "/share/man" ]; + extraOutputsToInstall = ["man"]; + ignoreCollisions = true; + }; + defaultText = "all man pages in config.environment.systemPackages"; + description = '' + The manual pages to generate caches for if + is enabled. Must be a path to a directory with man pages under + /share/man; see the source for an example. + Advanced users can make this a content-addressed derivation to save a few rebuilds. + ''; + }; + info.enable = mkOption { type = types.bool; default = true; @@ -207,16 +225,8 @@ in environment.extraOutputsToInstall = [ "man" ] ++ optional cfg.dev.enable "devman"; environment.etc."man_db.conf".text = let - manualPages = pkgs.buildEnv { - name = "man-paths"; - paths = config.environment.systemPackages; - pathsToLink = [ "/share/man" ]; - extraOutputsToInstall = ["man"]; - ignoreCollisions = true; - }; - manualCache = pkgs.runCommandLocal "man-cache" { } - '' - echo "MANDB_MAP ${manualPages}/share/man $out" > man.conf + manualCache = pkgs.runCommandLocal "man-cache" { } '' + echo "MANDB_MAP ${cfg.man.manualPages}/share/man $out" > man.conf ${pkgs.man-db}/bin/mandb -C man.conf -psc >/dev/null 2>&1 ''; in From c863de29a77c201bf93626bc29d185d3bb185338 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 7 Sep 2021 06:29:21 -0700 Subject: [PATCH 145/167] nixos/doc/md-to-db.sh: handle Docbook inclues in CommonMark You can do includes like this: ```{=docbook} ``` --- .../from_md/development/writing-documentation.chapter.xml | 2 +- nixos/doc/manual/md-to-db.sh | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/from_md/development/writing-documentation.chapter.xml b/nixos/doc/manual/from_md/development/writing-documentation.chapter.xml index a42067f4e995..079c80060576 100644 --- a/nixos/doc/manual/from_md/development/writing-documentation.chapter.xml +++ b/nixos/doc/manual/from_md/development/writing-documentation.chapter.xml @@ -1,4 +1,4 @@ - + Writing NixOS Documentation As NixOS grows, so too does the need for a catalogue and explanation diff --git a/nixos/doc/manual/md-to-db.sh b/nixos/doc/manual/md-to-db.sh index 7949b42e8d81..c7a328b2295d 100755 --- a/nixos/doc/manual/md-to-db.sh +++ b/nixos/doc/manual/md-to-db.sh @@ -24,15 +24,19 @@ mapfile -t MD_FILES < <(find . -type f -regex '.*\.md$') for mf in ${MD_FILES[*]}; do if [ "${mf: -11}" == ".section.md" ]; then mkdir -p $(dirname "$OUT/$mf") + OUTFILE="$OUT/${mf%".section.md"}.section.xml" pandoc "$mf" "${pandoc_flags[@]}" \ - -o "$OUT/${mf%".section.md"}.section.xml" + -o "$OUTFILE" + grep -q -m 1 "xi:include" "$OUTFILE" && sed -i 's|xmlns:xlink="http://www.w3.org/1999/xlink"| xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"|' "$OUTFILE" fi if [ "${mf: -11}" == ".chapter.md" ]; then mkdir -p $(dirname "$OUT/$mf") + OUTFILE="$OUT/${mf%".chapter.md"}.chapter.xml" pandoc "$mf" "${pandoc_flags[@]}" \ --top-level-division=chapter \ - -o "$OUT/${mf%".chapter.md"}.chapter.xml" + -o "$OUTFILE" + grep -q -m 1 "xi:include" "$OUTFILE" && sed -i 's|xmlns:xlink="http://www.w3.org/1999/xlink"| xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"|' "$OUTFILE" fi done From 0d4dd66d6e22bf4861dd3ccd2ec6635c1c57e506 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Tue, 7 Sep 2021 11:31:19 -0400 Subject: [PATCH 146/167] obsidian: pin electron 13 fix #136992 Co-authored-by: Pavol Rusnak --- pkgs/applications/misc/obsidian/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 510623433173..e4aebbd2ae2a 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchurl, lib, makeWrapper, electron, makeDesktopItem, graphicsmagick +{ stdenv, fetchurl, lib, makeWrapper, electron_13, makeDesktopItem, graphicsmagick , writeScript }: let + electron = electron_13; icon = fetchurl { url = "https://forum.obsidian.md/uploads/default/original/1X/bf119bd48f748f4fd2d65f2d1bb05d3c806883b5.png"; From 659c60af7c28cd61512f809a040cc0477e1a96d3 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 7 Sep 2021 18:21:30 +0200 Subject: [PATCH 147/167] fftw: allow for optional MPI build --- pkgs/development/libraries/fftw/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index b2189b77bf76..37a7f1ce8fe4 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -9,6 +9,8 @@ , enableAvx2 ? stdenv.hostPlatform.avx2Support , enableAvx512 ? stdenv.hostPlatform.avx512Support , enableFma ? stdenv.hostPlatform.fmaSupport +, enableMpi ? false +, mpi }: with lib; @@ -38,10 +40,10 @@ stdenv.mkDerivation { nativeBuildInputs = [ gfortran ]; - buildInputs = lib.optionals stdenv.cc.isClang [ + buildInputs = optionals stdenv.cc.isClang [ # TODO: This may mismatch the LLVM version sin the stdenv, see #79818. llvmPackages.openmp - ]; + ] ++ optional enableMpi mpi; configureFlags = [ "--enable-shared" @@ -56,6 +58,7 @@ stdenv.mkDerivation { ++ optional enableAvx512 "--enable-avx512" ++ optional enableFma "--enable-fma" ++ [ "--enable-openmp" ] + ++ optional enableMpi "--enable-mpi" # doc generation causes Fortran wrapper generation which hard-codes gcc ++ optional (!withDoc) "--disable-doc"; From 6ffa6c67c95fdf65e503027cf7d605771c569291 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 7 Sep 2021 19:28:51 +0200 Subject: [PATCH 148/167] ardour: 6.7 -> 6.9 (#136694) --- pkgs/applications/audio/ardour/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 8ebf4bf0fc4b..2bd6cf03cc08 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -56,13 +56,13 @@ }: stdenv.mkDerivation rec { pname = "ardour"; - version = "6.7"; + version = "6.9"; # don't fetch releases from the GitHub mirror, they are broken src = fetchgit { url = "git://git.ardour.org/ardour/ardour.git"; rev = version; - sha256 = "19jc29fjwgvqbg3gnmy50mrz8mh5x4nwddglasvwx83nc87qwllx"; + sha256 = "0vlcbd70y0an881zv87kc3akmaiz4w7whsy3yaiiqqjww35jg1mm"; }; patches = [ From d05a0f9cea9428be209231a51dbff7d9b877fe23 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 7 Sep 2021 12:07:46 -0400 Subject: [PATCH 149/167] vimPlugins.vim-toml: fix branch name --- pkgs/misc/vim-plugins/vim-plugin-names | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index c274e414cd50..3bc923211db7 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -56,7 +56,7 @@ camspiers/lens.vim camspiers/snap@main carlitux/deoplete-ternjs ccarpita/rtorrent-syntax-file -cespare/vim-toml +cespare/vim-toml@main chaoren/vim-wordmotion chikatoike/concealedyank.vim chikatoike/sourcemap.vim From da8eac3184610dabfa6b80499f0d4f2b1af1548f Mon Sep 17 00:00:00 2001 From: Mukund Lakshman Date: Tue, 7 Sep 2021 13:44:57 -0400 Subject: [PATCH 150/167] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 444 ++++++++++++++-------------- 1 file changed, 222 insertions(+), 222 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 8593e6440a84..5990e3446831 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -41,12 +41,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2021-07-17"; + version = "2021-09-04"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "e641878818c5545afd09b093a368f2d03f169273"; - sha256 = "1zykpbd42nwvpkgbq0hh52micyybxyvia6558fp6nlcs56bdmqf4"; + rev = "0fb731c66abbacf5cdf19ccbdf326e50e0111498"; + sha256 = "0m2dwcl9nc9kv2dmyazz9xrv19dzkdwkvkdyh2naycpbr1sj2w0b"; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; @@ -77,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-09-03"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "b9fdb91e9294b091a56a9da0b8ae705490cd95c6"; - sha256 = "1l928wv1rk1hmmna7rnd4xl5vfxxq8f7p5jjz1cph2gbyalsivh0"; + rev = "35d0bd15194b95f0dc8483ee6e727fcf3d4c8b26"; + sha256 = "1ra8ns6n7xfjk032gw9yd8kvmm9ylwp06d04raz19nhalxi7ra9y"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -233,12 +233,12 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2021-08-31"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "8ffff055e3b68df809fa8a7f9fc9fceed57e7be9"; - sha256 = "1vdhyn39fn6b7a008w5hsv9ygqcxzcmca9mvbvpaga42bnw2hxc4"; + rev = "3909c7805ee3c140c6bbc16ec001046a07eada15"; + sha256 = "03ay788vacs65cylp0ly7clpzhrx8vzc7zn94mk15hr9843s1kkd"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -365,12 +365,12 @@ final: prev: bufdelete-nvim = buildVimPluginFrom2Nix { pname = "bufdelete.nvim"; - version = "2021-09-03"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "famiu"; repo = "bufdelete.nvim"; - rev = "d8293811dd8f30e3e88f83c0a46573fddcf46cdb"; - sha256 = "181dbbkqnpqyjsc8v7h7sfv5r1qnkc00n5s7qv9321l0zrlhhfgb"; + rev = "6cf11ded5c8e6e3ea997b64a78be241e2d6c0614"; + sha256 = "1ah9snm88970cyy9f23r9pdjlmzy4y39s4wlx7zwxh6wrfdfnzr1"; }; meta.homepage = "https://github.com/famiu/bufdelete.nvim/"; }; @@ -449,12 +449,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-09-03"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "6f443966b9b0da18632dd872aeeffaaf4b254da7"; - sha256 = "1nvlxx4264xyggpv7xz2nzd0fpnw7bmax3r2pya2km9vk67lkjmw"; + rev = "d578a9e0e95e67d01cd847bbd4caab62294ed241"; + sha256 = "1gjmind3dfl41mdjpp7z5zx5l41qv55ckq97zid639lhggi19hbv"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -605,12 +605,12 @@ final: prev: cmp-path = buildVimPluginFrom2Nix { pname = "cmp-path"; - version = "2021-08-25"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-path"; - rev = "48df45154ee644edf1b955d325be60928dd28d47"; - sha256 = "0c8y3i0p2li0r0jqg4ngw2cfh9jy21832nl9x45yfbwmh6gfw8qd"; + rev = "8450341c7e50cc8ae0faee1fafe60b3f516cea79"; + sha256 = "0f8apk6138d9kzcggmbxhrsckv73ld8kdgmw6hcj0ld80a1s683n"; }; meta.homepage = "https://github.com/hrsh7th/cmp-path/"; }; @@ -713,12 +713,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2021-08-23"; + version = "2021-09-05"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "595e60210f7d0c9e5a21672428bae8c3f518a3b9"; - sha256 = "0mdqb07avwk2f5h5xylq2lkg56jk82dccyrxb17cxfw2dsgbs93m"; + rev = "287c743c9f227fdf0e1db452bbb8ae3c5caffc36"; + sha256 = "18qj2zi9p4zz8252m3kcbi6yx7v27sckr0b1bfymckijws9lrlf5"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -822,12 +822,12 @@ final: prev: compe-tabnine = buildVimPluginFrom2Nix { pname = "compe-tabnine"; - version = "2021-08-11"; + version = "2021-09-04"; src = fetchFromGitHub { owner = "tzachar"; repo = "compe-tabnine"; - rev = "4e3dc7b9950e0e5dbfb9451622de670cf62875ac"; - sha256 = "0nb0jsr65q4497mbikc9fm2vkf2dq64ahxf60lv4rzm2irr3azdj"; + rev = "b00e1f9d597673bfcba39b6bfc620cea9e6c815a"; + sha256 = "0ryj8b60vvxb1q58xyv4hgrc1d7rjsbr21wn677xr13836knb5bw"; }; meta.homepage = "https://github.com/tzachar/compe-tabnine/"; }; @@ -1002,12 +1002,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2021-09-03"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "ffec425ab2052850f93e9617f308b26d625e85fc"; - sha256 = "06qjyqpbfv0dj7gpqdrx7dzm3j554n90ic6i7ljb4nh16v17k0dz"; + rev = "736033d59b2940e35565ae37c3fd5cb024c2a134"; + sha256 = "09v5frr2mlqgvdw1kswv0r683xvg0j3k4wm3h00m0r929prqd6ll"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -1328,12 +1328,12 @@ final: prev: deoplete-lsp = buildVimPluginFrom2Nix { pname = "deoplete-lsp"; - version = "2021-06-16"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "deoplete-plugins"; repo = "deoplete-lsp"; - rev = "1a9476dd83d986c861233c380ac07e1e2f2d10af"; - sha256 = "0xv34cg0lkcjhylsc5qc2pkd4np5mmf5gbx55hvryjnipk1sa06y"; + rev = "a716897b958d1f1c0809d92a70e8d849a3d652e2"; + sha256 = "1zbh595vq0y8liipncpcc3rwh5dpfifbp623z2w5fx3jpic538xw"; }; meta.homepage = "https://github.com/deoplete-plugins/deoplete-lsp/"; }; @@ -1472,12 +1472,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2021-09-03"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "7c392177dc40b333dcee939fded1c5b2f3466def"; - sha256 = "07zxdwh6c5qkazg9vm9rr7xw1n5c1i3nxsfbifvnl2qgvkb5wyxc"; + rev = "5965e8303be4bc50d26733a02e5c11100f98986c"; + sha256 = "12pxdha0zk8lwvgvqp02fwkvh5yvpzxf75865h5rxz69v1dqgspf"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -1496,12 +1496,12 @@ final: prev: doki-theme-vim = buildVimPluginFrom2Nix { pname = "doki-theme-vim"; - version = "2021-08-12"; + version = "2021-09-05"; src = fetchFromGitHub { owner = "doki-theme"; repo = "doki-theme-vim"; - rev = "78502433a41589ead80c834f9e61d7a17f97b844"; - sha256 = "1gfxq9sfld0vx320q15r8xk6kwxxbl7jla3ykr6wd167bnr1z7q0"; + rev = "a60ba5554efbab56112a06d9a1f09271fe23e96b"; + sha256 = "02idfg57j01y6d8zr2wddj7f79bk8cnqmb88h9s1b25zlf7yazmq"; }; meta.homepage = "https://github.com/doki-theme/doki-theme-vim/"; }; @@ -1520,12 +1520,12 @@ final: prev: dracula-vim = buildVimPluginFrom2Nix { pname = "dracula-vim"; - version = "2021-08-22"; + version = "2021-09-04"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "d1ff992bf605c098577b7f0e632e3ea887b71520"; - sha256 = "04zmqz270willnpfsf61pa9xx5i5phx1g6r6nw317r9rs0dnk0wj"; + rev = "d1864ac0734ce51150affa96a35a1e01ade08b79"; + sha256 = "1jyhkj22ivav6kp7rh3fkjka8w5phvsa4r82s9b6lv39vr10nj4w"; }; meta.homepage = "https://github.com/dracula/vim/"; }; @@ -1702,12 +1702,12 @@ final: prev: feline-nvim = buildVimPluginFrom2Nix { pname = "feline.nvim"; - version = "2021-09-03"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "famiu"; repo = "feline.nvim"; - rev = "0961775c8dd84fafcd7a9d92e8a95657385ff847"; - sha256 = "0bpyqg344cldx1587bpy5zay2y986b34s1zyjy2nasri95jzkvwp"; + rev = "092442db0c7eb6087f0ae2cbeb776781bcc16176"; + sha256 = "0ac4r3qv5d91srxra71paa03h0wnw6hrfpwr0v9lsk58bv0fxbc2"; }; meta.homepage = "https://github.com/famiu/feline.nvim/"; }; @@ -1847,12 +1847,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2021-08-29"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "53c823f92f159107efa238ad1a5837f63ecb4c2b"; - sha256 = "0sb8l0f7wzbhyr0aq5kjmn4c4llhi49ka9brhwkn24rhkizyyl51"; + rev = "1fc5567b29bc9c2588eb0584a001a2dfb706030b"; + sha256 = "0q8dhnz3ykx3gk7myprkfa6vnvv8xjpj86faadfc6c01l1299f15"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -1871,12 +1871,12 @@ final: prev: fugitive-gitlab-vim = buildVimPluginFrom2Nix { pname = "fugitive-gitlab.vim"; - version = "2021-09-02"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "shumphrey"; repo = "fugitive-gitlab.vim"; - rev = "ad4e00264c25bcb7dc6f400b2a409d2fce194907"; - sha256 = "0vqm6nv7nr8mis1nljxiqx4g5w3wp0g2pcc4ly9x7jidicgm7awi"; + rev = "befd5438ad55a80c6abb415f6c5a9a44275550bc"; + sha256 = "1m57c11b7q1sv6va0xzikha19bck6rgr539sjhnhppdy7nlk55lw"; }; meta.homepage = "https://github.com/shumphrey/fugitive-gitlab.vim/"; }; @@ -2063,12 +2063,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2021-08-29"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "daa233aabb4dbc7c870ea7300bcfeef96d49c2a3"; - sha256 = "0y0il8v0g8kvsyzir4hbkwvzv9wk2iqs1apxlvijk9ccfdk9ya0p"; + rev = "f2437cd95a9320c1021edd5fc5ac2e1f9e47fef3"; + sha256 = "1xyxi1cyqd0464q60kb2bpxd5vapkmq5a3g3qzvl4klr6syvrkgd"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2099,12 +2099,12 @@ final: prev: glow-nvim = buildVimPluginFrom2Nix { pname = "glow.nvim"; - version = "2021-08-30"; + version = "2021-09-05"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "glow.nvim"; - rev = "794649fa93a49f39e16364da5421508fe0223e4f"; - sha256 = "06askhkw5g07144a60g59jxrp2xvimpk3yw9qhm69lllhvkgihqz"; + rev = "ae61bac7a4ec720b247d016473d6214d0e8aa0cc"; + sha256 = "0ykydvv4pd6annkm41lv8c22pnwfai5m65v412l8dbgnll43vviz"; }; meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; @@ -2135,12 +2135,12 @@ final: prev: goto-preview = buildVimPluginFrom2Nix { pname = "goto-preview"; - version = "2021-08-20"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "rmagatti"; repo = "goto-preview"; - rev = "017efbcb377a6c0e16c4902328cf34d7257cbd1c"; - sha256 = "11n09m7agy9b5zx0cralam7gsr2bfwpf4564z2iwxgia3186bs8g"; + rev = "8093ded366e2e71e87f5e40da29994187c06fce1"; + sha256 = "0mm7vrmibcdsxn9b89q7skc0xcm9z5fi1bv0gg3cc8kb1gislnwf"; }; meta.homepage = "https://github.com/rmagatti/goto-preview/"; }; @@ -2183,12 +2183,12 @@ final: prev: gruvbox-flat-nvim = buildVimPluginFrom2Nix { pname = "gruvbox-flat.nvim"; - version = "2021-08-17"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "eddyekofo94"; repo = "gruvbox-flat.nvim"; - rev = "9f02570bf323e9484b6f04ad96adc3103a075662"; - sha256 = "1dw4mm1ksclhx7ys88z2g0481j9xxd95qi1jlma8l5cyjfzdkrkz"; + rev = "c384a5719b1ef9f5be925a94491d10c35eaf09a5"; + sha256 = "03dlkhc2n2brq1m49ji4y205sha7gywd81x014dsma81w7fhvdvk"; }; meta.homepage = "https://github.com/eddyekofo94/gruvbox-flat.nvim/"; }; @@ -2315,12 +2315,12 @@ final: prev: hop-nvim = buildVimPluginFrom2Nix { pname = "hop.nvim"; - version = "2021-07-13"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "phaazon"; repo = "hop.nvim"; - rev = "9c849dac4b8efe6ad30aabec995dabfb5b251046"; - sha256 = "0z0ddrqhpirjdck9j0dmaxx0ra5hlcll0iawqb0078xg181bhnwh"; + rev = "a3f11483e1ffd5946914db505c7b917bb6c95515"; + sha256 = "0asabmaacvfyv48rwzgcy4vy5wrp72rjmgn53ann9asfxw9ipjsh"; }; meta.homepage = "https://github.com/phaazon/hop.nvim/"; }; @@ -2423,12 +2423,12 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline.nvim"; - version = "2021-09-02"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "f26818bbb0a5428b4699f6c49fc3d3fa3e822930"; - sha256 = "1yksfc2sbkn7p7wiai2d7rjnizylckvb1fck5k7kjwbxnwzwsjk5"; + rev = "c4317837801c72686a342a9db4d4f7405857c82d"; + sha256 = "0sb49f6yba94zyvqqggiz7lwm31ch94rwz09p5jh4iys49kb4s4s"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -2844,12 +2844,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed.nvim"; - version = "2021-09-03"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "c918dd441b2e24ed4f6f805df89efc8e99015103"; - sha256 = "0ppkspsqbi05rnssk19ccjcym4zaqph7a75vw9d38akg2i176rsk"; + rev = "5a856fdaf6298be5124e26bccaba68578b625b90"; + sha256 = "1x4h2dkyf6q434j75xzw0f7xm4633zm8fjm2sgrskvx1r4hbf480"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -2916,36 +2916,36 @@ final: prev: lsp-status-nvim = buildVimPluginFrom2Nix { pname = "lsp-status.nvim"; - version = "2021-09-01"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "lsp-status.nvim"; - rev = "745ba61c353b47c365d4dbfdd3d3334a3177f8cd"; - sha256 = "06cgvrl6l1wj6aj0ndbxi14zfqdfhgdzd7h72dxi1bkx8hrf54i0"; + rev = "a5990bfde2fb67c55575ece39b1c863d107acb60"; + sha256 = "10swm4zwdkgvn8pdqif1ai8kqshzm6bzw9k9jykpb8dxy2anj27y"; }; meta.homepage = "https://github.com/nvim-lua/lsp-status.nvim/"; }; lsp_extensions-nvim = buildVimPluginFrom2Nix { pname = "lsp_extensions.nvim"; - version = "2021-06-25"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "lsp_extensions.nvim"; - rev = "a1f12b8df1d3d8e46a7010615d2a335cd06814f2"; - sha256 = "11aynapcxxm4xjicixj0g93y7qqlhby8zvmc856gq0b14k5n291q"; + rev = "379a935b797f5f8a386bcbfd3b105da8007a9303"; + sha256 = "05q9i93xvp5p770fpg8wkyngq8ncr6b21fdkh9crcgfi1bp7rhqr"; }; meta.homepage = "https://github.com/nvim-lua/lsp_extensions.nvim/"; }; lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2021-09-03"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "ef533cc43fa11f58597364c24f8898b7deac74ef"; - sha256 = "0g6m18w1jggg182dm77n3zvrj87d230c6m7rrg6snialllvbk0sh"; + rev = "d7e5a2f5192dd09b30ccec7ad0de0323c8687e34"; + sha256 = "01v9crqps9d4wngjfnk535vqgyqqfgrfjyg3aydaa46lyj1ilcvr"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -3000,24 +3000,24 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-09-03"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "1db821efe7416483a7288ef86dbae6f63ab0221e"; - sha256 = "0gjyhb7yqjgb2ld9g3aahn0hv6vns91c5q3hvjcwaxqvkc77sk2i"; + rev = "9748870f69236db39cc8eeb668d944bbe496634e"; + sha256 = "1fzqfl5isq31iqrl8m52ca8rrpn3rxh6xzwyr4czsx8fggi221dd"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; lush-nvim = buildVimPluginFrom2Nix { pname = "lush.nvim"; - version = "2021-08-30"; + version = "2021-09-05"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "58c203fe01d4c9622a51f57270c0c58b0516adff"; - sha256 = "18qk4yn8fazwxjxdlj50jl159iyh586bbvlgv3944wfnjgij727a"; + rev = "63e11d96191b66a5d7c288bad08187aebbfca97b"; + sha256 = "1g2d0c4asdc8ad0009habivppahy925sfs9zz61l22yfgwp9wvdr"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -3072,12 +3072,12 @@ final: prev: mattn-calendar-vim = buildVimPluginFrom2Nix { pname = "mattn-calendar-vim"; - version = "2021-08-29"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "mattn"; repo = "calendar-vim"; - rev = "24394ce720fcee4a672249fcdde4b088d62ed4b1"; - sha256 = "0smmwgdnby0n0hg4511wf63vbm387l4d3dw75sid3m9cm8xlpwgl"; + rev = "4cdf69c43d66500b1c1235f3c1c584f257115cb9"; + sha256 = "06phscsjqb3wnwdmb5w8rirj02fcz9svp5wdnzv9jkvj822ni4pr"; }; meta.homepage = "https://github.com/mattn/calendar-vim/"; }; @@ -3444,12 +3444,12 @@ final: prev: neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2021-06-02"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "3663e065b4f3d0c4a1144b668129ef43e0d8ff10"; - sha256 = "0l87p48lyx78a9ayqygpba76z04ld64w747m0mrdlgci0x8jnqb7"; + rev = "053d6bd3605a64f05de11a179cbab423fe759ebe"; + sha256 = "0qk3bhpjqi06jj1haydalvvsj7f7jbxbb168jc6i949694v406zj"; }; meta.homepage = "https://github.com/neomake/neomake/"; }; @@ -3480,12 +3480,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2021-08-26"; + version = "2021-09-05"; src = fetchFromGitHub { owner = "vhyrro"; repo = "neorg"; - rev = "45ded3cbd52da312b71bffd8b8a6b9bed1367500"; - sha256 = "1792j7h2an4kfc9jp6p8fa7mwri7295rb30siar35c0diapzai32"; + rev = "47a0a3d91ddde94488ccd03d38b5beeb296d3148"; + sha256 = "0n8scyjy3wx2l3anl3dyipx7rlayrjb5dlri2r81dr1s77vkch83"; }; meta.homepage = "https://github.com/vhyrro/neorg/"; }; @@ -3612,12 +3612,12 @@ final: prev: nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2021-08-12"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "0e71462f90fb4bd09121eeba829512cc24ab5c97"; - sha256 = "0q88xrd0zi0wm7rdpggq9gfrlki56w14qr4bg5x1im3p4y6nj7f3"; + rev = "e5f24e2b8bc09ce6fc3488215d69ddb7cadc5f8d"; + sha256 = "13hbf5c67hi103yixc1jhp8gky02gy2hfq2im4sq7y1wwhgfxn0l"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; @@ -3744,12 +3744,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2021-09-03"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "3b298c243eecec533de5869eff44d87cbc41b662"; - sha256 = "1vdzswx6nz1cw7d0328rx7xrlz2i64ynkw8ad5hxrfdmb589rjkd"; + rev = "f9f4c8cd1a2af30bed35296a50eca8957fa99e3b"; + sha256 = "0yi1nhh0xh6fhqd52f6wsysylm3ls9xh7dy03990lmcv64wajx9j"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -3780,24 +3780,24 @@ final: prev: nvim-ale-diagnostic = buildVimPluginFrom2Nix { pname = "nvim-ale-diagnostic"; - version = "2021-03-03"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "nathanmsmith"; repo = "nvim-ale-diagnostic"; - rev = "894a6790637fdda0df1a2ee1de3f58cd8c276e10"; - sha256 = "07jfmhac8s27awx9pknxlaqz9x3sbmjx7n90pr4np389b43zgrmp"; + rev = "f475b8909c448bfb64b9506426fdaf98a808ade1"; + sha256 = "1infpcrpy21jmn2aw4ch0b3qck24s1dkr97h3dr1q9lzi6hdzfbn"; }; meta.homepage = "https://github.com/nathanmsmith/nvim-ale-diagnostic/"; }; nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-09-02"; + version = "2021-09-04"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "8197c69a550f61ed7d7ebab44393a6545092a38a"; - sha256 = "0arfkz8qgj0qp9z9ds9qsykf3f317p2zkayxi4c5spa79d5yzl55"; + rev = "b9bb1713257ae73eec22d68579e3012134a3598c"; + sha256 = "0m71mqcsmi4masabpmidpyqc1r8v48zj2kzicg2fnw1xkmwjbh5n"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -3852,12 +3852,12 @@ final: prev: nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2021-09-03"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "972ff2732536d4c3c8cc22bcf05c0d59cac19994"; - sha256 = "0vr1f3qcpqm1zdn5ryl7wjk7fv38pxnsxkcrwq4sra181zzp2jhc"; + rev = "c44ae32bf52b95b0b98e08b6430b998bfde02cf8"; + sha256 = "0yhgimz1hqzb7sxhzv4hirzl89r2ri5y0h671rcl7xlhhzmmb7ks"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -3876,12 +3876,12 @@ final: prev: nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-08-31"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "efd9f425383ec57756a74c60a6e85d190b110ed7"; - sha256 = "0vqmpgrvgn0923dadf9y1clxpaxf56brscsx31l96v2qghwac7m8"; + rev = "980357a9eeabe84f29c96d38421c9bff321a2bc8"; + sha256 = "1qh8axjfwc2dwdfvc9izfmzwy382vzg9jcnfzs8fkl7lqb87i3a0"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -3912,12 +3912,12 @@ final: prev: nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2021-09-01"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "ef803555f7b399b92b35ff7be1ec5c275d9af6d3"; - sha256 = "09dq62dqx2gnpi3b6mf97ai0d01pvw596gyrz3bfm6p2yq8l8089"; + rev = "8683ebb3a599cccb0ca1d850e9423debe193b468"; + sha256 = "1jd9cbwb4vpyp5mvc2zpz776j5b6313bmw3cij3q5fbg5mqzg23s"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -3960,12 +3960,12 @@ final: prev: nvim-gps = buildVimPluginFrom2Nix { pname = "nvim-gps"; - version = "2021-09-02"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-gps"; - rev = "56d41c2ce5dfbdf32fc11ef8381a8b523774a208"; - sha256 = "1f1wz18x0y8kbnfx859j4i6dwa8vxwny0l0cj9m5hah71slawglx"; + rev = "4c68a6463599ec432ee67b0eb337235c153c6b64"; + sha256 = "1mfi2si4x2qn5qww3lfp4827sjpa3j7ma4k1ypidpqq53fr2h8c8"; }; meta.homepage = "https://github.com/smiteshp/nvim-gps/"; }; @@ -4008,12 +4008,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2021-08-31"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "6566daf66fe8c05e963a1a5358ef81eca7a1e135"; - sha256 = "1hqyzm6lgnm5qyibjjqx2h7nahqnb726832b489vabvvca4s0ndj"; + rev = "3792030b5281a2f7bcc186e04440036b44648e90"; + sha256 = "0wq82v8z0vsnbakc5dnn0f00bjm3mirqdaq3zlq0z2gx7jkmldfg"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -4032,24 +4032,24 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-09-02"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "71c241425fd7a84f0ae33ea1eb7c071f20499bcd"; - sha256 = "15hrqdzz6y07p6d7w8ydqra27pl3hqphzwlh2bqixpdpq9chlhyh"; + rev = "ea72eaae8809c0e475a8248aa665034d7d4520db"; + sha256 = "01mzyf0d5q0wmr9md6dj3yxlxqc3s80mz43ig3lkz7cgywjzn3qz"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; nvim-lsputils = buildVimPluginFrom2Nix { pname = "nvim-lsputils"; - version = "2021-08-09"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "RishabhRD"; repo = "nvim-lsputils"; - rev = "ae2f20d6938bab234815e0bc69dae1a991307b99"; - sha256 = "0ikim2zwrlc19bpshr1vzsk15wi5z7am59f4fi53rbh985jmncqr"; + rev = "0800dfa7307a64a3e195e62b775f20bb14f557af"; + sha256 = "0s9pp4azvvss8h38hx6r0b5a2nvsf72iqckmzhjnqnxs2w14b839"; }; meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/"; }; @@ -4068,12 +4068,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2021-09-03"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "3c394b379eea00699a2a2515a19ceb3b79068a8f"; - sha256 = "10gw5sfn5kjw87961mcci5zam428zyfnx2c1l1lvgwsxnla7cbqz"; + rev = "6602d0d2bec64994e2f3d5b2038e98cb67101828"; + sha256 = "0njp63lignvm7b6akq3v840wkyqfw2crips36rvxljy00d5q4smz"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -4092,12 +4092,12 @@ final: prev: nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2021-09-03"; + version = "2021-09-05"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "bec1c4b9b4c8f6a3fccb20ecc2469e91ec791614"; - sha256 = "0w2lxr6jd2dw2bvv09qwg11sxav7c8imw65zs7zx6anyznx1p86r"; + rev = "ac9ce2834753eee1a8cdb8851567f968d2770870"; + sha256 = "1j4xdrk8lvjglkkadkvmcwap2ikgcvymsds2xzmix3xjn5kvrjxj"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -4116,12 +4116,12 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2021-09-03"; + version = "2021-09-04"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "425f5eedc7fa2c6152063d59ec1d840136f37d0d"; - sha256 = "0k7a21kc50bgasmd25pk8caxrnjyl3inlxixxnck75b0rdf03bvf"; + rev = "71122d798482e30c599d78aa7ae4a756c6e81a79"; + sha256 = "1gdhq3q0r63z5qy29h833v8g77y1d6939z1n1y1skjay4y9krx2z"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; @@ -4368,12 +4368,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer.nvim"; - version = "2021-09-01"; + version = "2021-09-04"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "3f950aeed3bd908e33fd59643e8f3be05b719df6"; - sha256 = "0sa6ygr0sb67p1bfjwhi2fm19yvalgy2zv1j55r66gh8lwmg0xx2"; + rev = "daec6c759f95cd8528e5dd7c214b18b4cec2658c"; + sha256 = "1mavf0rwrlvwd9bmxj1nnyd32jqrzn4wpiman8wpakf5dcn1i8gb"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -4753,12 +4753,12 @@ final: prev: registers-nvim = buildVimPluginFrom2Nix { pname = "registers.nvim"; - version = "2021-08-11"; + version = "2021-09-04"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "fc070007d6c1c87a671db6632425004fa8a0b2e2"; - sha256 = "1bziyijfsm5q1m6bbp5m7nkki48f16nsiyibr178k9rlr2k6yccm"; + rev = "b99098afe11d275297715f06ddea4536e90eac7a"; + sha256 = "0f42zvbgqqv3vs5rplwwyx9pdsysm375nyr3fdb0xdfx2gn9wc38"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -4849,24 +4849,24 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools.nvim"; - version = "2021-08-29"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "54a7a24cc7afd9cec765a3c30e23859b974e731d"; - sha256 = "16y4mdxmvbdgb5k6lds4kwd1xh005g1v1vlnbykjd1lnkfz4h4kq"; + rev = "cd5105d76fc124634b53039c02ea253cc06bc9b9"; + sha256 = "1bhjzng02yfnlfr3kvh6lkl5vbpcmcd51kpgg7yjxmlzlga5k2k3"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; rust-vim = buildVimPluginFrom2Nix { pname = "rust.vim"; - version = "2021-08-30"; + version = "2021-09-04"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "7505d5b7f66a163209a181dff327b57d592da7c2"; - sha256 = "0n2044mgnzpkvx4wr2ihx16ajw6mczqcvirv31md97qicrzfqy91"; + rev = "c06a17151c69b9d61e60a28274932a28fd37c453"; + sha256 = "11ms2has79w2jazvca2mysdbscs1412xmcql0mxc72wrpnws321h"; }; meta.homepage = "https://github.com/rust-lang/rust.vim/"; }; @@ -5211,24 +5211,24 @@ final: prev: sqlite-lua = buildVimPluginFrom2Nix { pname = "sqlite.lua"; - version = "2021-09-03"; + version = "2021-09-04"; src = fetchFromGitHub { owner = "tami5"; repo = "sqlite.lua"; - rev = "f1051e5ee1dbc9a41007f94433ff882e4243fafa"; - sha256 = "0vyb48x65ywsc7hdcp1ggmlah97866dpx4wmidjck15mqzkiwldz"; + rev = "f43b038b4e1c05c457d36b89afe240089089358d"; + sha256 = "1681hzxz4pykb6svk18mhv8w5wr9c2m626sfyvpg9na25w4d7ijd"; }; meta.homepage = "https://github.com/tami5/sqlite.lua/"; }; srcery-vim = buildVimPluginFrom2Nix { pname = "srcery-vim"; - version = "2021-07-26"; + version = "2021-09-04"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "9a34db8c7e1eda84754420eaced9fdf00f43a929"; - sha256 = "1nh6zwx4lcyx8vdvdfr04z5vwvpcbg8ns2pfxmcgjpcajhawg3nx"; + rev = "c4d0ae8e25528cdfaa18144b12ddd95ced21bef8"; + sha256 = "04ma5si8ig169gfq7pqjxx24fg6mmys41z4581dajrsfqbajc727"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; @@ -5331,24 +5331,24 @@ final: prev: symbols-outline-nvim = buildVimPluginFrom2Nix { pname = "symbols-outline.nvim"; - version = "2021-08-28"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "simrat39"; repo = "symbols-outline.nvim"; - rev = "80490ad0c697d7277cbd4ea24883120f6de32db0"; - sha256 = "16gl8jc7bqszmpw3yj0sxkxdq9zch6lfj8n0cd6jihd6i9ans564"; + rev = "02ce2dab138a12a36c422ac58fabe9f5a35c664c"; + sha256 = "0z5a5q49csfgz0zdad11q75r8ck150ypj866199cl4j1mzb0xdgv"; }; meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/"; }; syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2021-07-19"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "vim-syntastic"; repo = "syntastic"; - rev = "7414f30365a342e1d89072d474a35913643b6eec"; - sha256 = "19c9dv8dc72nnb1dx7wdraihpzf5b42wwq3c9vn0na8k1xy26h8y"; + rev = "97bf9ec720662af51ae403b6dfe720d4a24bfcbc"; + sha256 = "0rcivwwvb6hmd420jkgy8gnzyv78z0bb8gw6232qrwf9m2lskzad"; }; meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; @@ -5475,12 +5475,12 @@ final: prev: tcomment_vim = buildVimPluginFrom2Nix { pname = "tcomment_vim"; - version = "2021-04-14"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "tomtom"; repo = "tcomment_vim"; - rev = "a15822ec1b42b7d43f5c8affaa3ad2c553a2831f"; - sha256 = "0bl4shhk5ldqamq2zk8sv2bdswd9a4762fh2smj0h1jgs2ff5pkm"; + rev = "5c5c31121ec607011c1e382163c0bce207ac2966"; + sha256 = "1cbalg696gcw1bbvclacrg081w1ygb7xfpv6y2w969b50m17l2lc"; }; meta.homepage = "https://github.com/tomtom/tcomment_vim/"; }; @@ -5584,12 +5584,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2021-09-02"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "ac42f0c26cb417b76046a394c1b3163d346e9107"; - sha256 = "1qzc04xlrkssgvrmciddbykcczklqzhh8fnkr0pf6xrll0vvm1fv"; + rev = "12a44ededa1fc2426d40886feb4034230759a19a"; + sha256 = "0h2idrbi8ahldvgrlcl6hi5bjm2gwd4raz3k7mc3k34vmfk3r29z"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -5777,12 +5777,12 @@ final: prev: tremor-vim = buildVimPluginFrom2Nix { pname = "tremor-vim"; - version = "2020-11-19"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "tremor-rs"; repo = "tremor-vim"; - rev = "17e53c33f3b0e825330580034ca60172b8ddaadc"; - sha256 = "1gy67qjv0iwqza0yx9y8p5yzn5fszrp7szg1527h0ki3q69cfqki"; + rev = "fe94939d107528f905e5751839e1c3df10f0561b"; + sha256 = "1h4plzbdzw7zfl56i7xfk3dp7labzfyw6xzii3cv8fyahihs83sy"; }; meta.homepage = "https://github.com/tremor-rs/tremor-vim/"; }; @@ -6497,12 +6497,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-09-03"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "60a728c6f29f9c1844e004ffe773b3208d1fd10a"; - sha256 = "1d0iyafbsmpav0zh1wmf50yjcw066592z179vak8pxw03ppy912x"; + rev = "84cbe8dc7bfcc53422971ae89f1eda4d95611d50"; + sha256 = "08scpqjkqmjl3wh58haa9ii9rabilllgb60jrj8sc4hs9zr4n04n"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -7013,12 +7013,12 @@ final: prev: vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2021-08-25"; + version = "2021-09-04"; src = fetchFromGitHub { owner = "elixir-editors"; repo = "vim-elixir"; - rev = "c29c1ede8f9f12d9c76b7c8b5b8ead7690c5792c"; - sha256 = "1rz24r97z3dlzxn3b8m3s4m697f9vhs5688jbqgs4fcbki2wrsyj"; + rev = "7e7f42cf10ba05b6d783de411a6ceca50fe0cc69"; + sha256 = "0pfh63qinj1kr612plnixw12rndpv2qz45w1kb9kqddzzp3fjy98"; }; meta.homepage = "https://github.com/elixir-editors/vim-elixir/"; }; @@ -7085,12 +7085,12 @@ final: prev: vim-erlang-runtime = buildVimPluginFrom2Nix { pname = "vim-erlang-runtime"; - version = "2021-01-08"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "vim-erlang"; repo = "vim-erlang-runtime"; - rev = "47c643f51e4480541fc81e352ec5b2a361544d0b"; - sha256 = "0xlxkdqjq8fp9fpkhqv5nd2ipiq8nw1bdzd7hqibizwcdsisf91s"; + rev = "461717a931a7d985ac0ac8f4d856a7564b4d3f18"; + sha256 = "1axs13d5jz7vsckyl3v44vli096p991rp67gcvpis4isg609ld8f"; }; meta.homepage = "https://github.com/vim-erlang/vim-erlang-runtime/"; }; @@ -7289,12 +7289,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-09-02"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "2a53d7924877b38b3d82fba188fd9053bfbc646e"; - sha256 = "17zafl9bj7szfzadwl245dhv5s4f14bcipksir95kw7h2lcwxxmx"; + rev = "6f07d7e6cd23b7a76dc461fdfb1984717d233806"; + sha256 = "01kb2xhjd57irqzinvsiif60dkds6f80yjw7k2hl480szx62j57q"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -7373,12 +7373,12 @@ final: prev: vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2021-08-30"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "832f7c62261930517453fec96d78f79d5289b75d"; - sha256 = "1ykw84a2dayix0pm82nl0rcpfahrsyqhg0h5fw67fw6dihrdnh0s"; + rev = "256702dd1432894b3607d3de6cd660863b331818"; + sha256 = "0zpa7cs59a8sq0k3frlf9flpf30jcn239yrpmv40r7nqvxzglbpl"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -7397,12 +7397,12 @@ final: prev: vim-glsl = buildVimPluginFrom2Nix { pname = "vim-glsl"; - version = "2020-04-21"; + version = "2021-09-05"; src = fetchFromGitHub { owner = "tikhomirov"; repo = "vim-glsl"; - rev = "36266238d96cd2219769793855a7e915f5e6a32c"; - sha256 = "0vxjbv5qn7lvvpqv1danmkg423cbf7czxzp208zlx9l82vnr24z8"; + rev = "373e4ec58f725910ea242e79ce03fe21f100b6e3"; + sha256 = "0hf583fkrkq0y38ic9m0rl1p2h1s6fq8gx9gxk64hh6ibqxdicgz"; }; meta.homepage = "https://github.com/tikhomirov/vim-glsl/"; }; @@ -7722,12 +7722,12 @@ final: prev: vim-illuminate = buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2021-06-12"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "8fe150bd775f659da7e40ea2d3ad7473e6d29494"; - sha256 = "1y8bhfcbk5062nrscihr24p8b955c09hnbii5grb4x16jir06cbg"; + rev = "519203e07c515bbedc3fa03164176a5bd5653900"; + sha256 = "1j8qaami22b7f9fzq0w21vkmh7w6qj1vkh7rv8hg840i4cp6sq5j"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -8095,12 +8095,12 @@ final: prev: vim-localvimrc = buildVimPluginFrom2Nix { pname = "vim-localvimrc"; - version = "2021-02-18"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "embear"; repo = "vim-localvimrc"; - rev = "0206f5f5a8721cc8c5c84ebb8ab2886e9afcd0ac"; - sha256 = "1zin6pk581cnkivm2kgks0wrvpxjcl1y3x46wpkzdqg1hhif2129"; + rev = "e7acc32cdc1b70db0d42856ecde9ccf362720bd5"; + sha256 = "02giz39c5qdsvsfdfydyz9a6dznh82x84mm2acblyw4hhx5yvpcq"; }; meta.homepage = "https://github.com/embear/vim-localvimrc/"; }; @@ -8131,12 +8131,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2021-08-27"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "52ded667a5c8426d6845b53b943d2a5f6cc3fd6a"; - sha256 = "01jynlb339pbg9pqjnfdgq62n4hccg8ay13j9anvkvjmrpbdg7y4"; + rev = "14f9ab319ff96eea16ef6dbf57ed801c8fc8967e"; + sha256 = "04kj6q2kgl1m4l6z2v74c3mjab4rmi43ly2rpyvq4xqf25him10k"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -8480,12 +8480,12 @@ final: prev: vim-ocaml = buildVimPluginFrom2Nix { pname = "vim-ocaml"; - version = "2021-03-03"; + version = "2021-09-05"; src = fetchFromGitHub { owner = "ocaml"; repo = "vim-ocaml"; - rev = "400bee047d116d1cbe72a479943ec69d5b5bba01"; - sha256 = "0njprv1h38rsagpmp1z68vq90pf9fll3pa8767nhgv2kyadn29jx"; + rev = "3582a24f46c965cfe5d6b0c50f636f52168df650"; + sha256 = "0wmrc4z4l8rk96kkixb148d53jzdm4w4vxlqidjm8q4d9vxnf6sb"; }; meta.homepage = "https://github.com/ocaml/vim-ocaml/"; }; @@ -8588,12 +8588,12 @@ final: prev: vim-oscyank = buildVimPluginFrom2Nix { pname = "vim-oscyank"; - version = "2021-08-17"; + version = "2021-09-04"; src = fetchFromGitHub { owner = "ojroques"; repo = "vim-oscyank"; - rev = "9c84cb3eeff0a30f5f8f0dccd77b12ac8494dd95"; - sha256 = "17fjjm5mcwvi0mxsfnqasbr96cln2b0125wyzjj36z4y2bx7w1dm"; + rev = "5d152a9e03ca1c975c1f439456376e01561a02b5"; + sha256 = "0zdjj4mhw27jbdw8xrjc2gj3mx65p02c6nnyp7gci78fzxcv7slr"; }; meta.homepage = "https://github.com/ojroques/vim-oscyank/"; }; @@ -9080,12 +9080,12 @@ final: prev: vim-ruby = buildVimPluginFrom2Nix { pname = "vim-ruby"; - version = "2021-08-18"; + version = "2021-09-05"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "cb2ed789ebcd836fa699fc4555f924f69d19f199"; - sha256 = "1a4h0cc4w68mfpkw37vxnaqk9ml3ygkgmfqqdcr74ncmnl58cqjq"; + rev = "10dfcbe875b392b6c98585bd0a07794f0cc78906"; + sha256 = "0gfzvxi890bmgp0c4wbfk5ppawm8cq187p73id2spj2zqhfgjhvn"; }; meta.homepage = "https://github.com/vim-ruby/vim-ruby/"; }; @@ -9356,12 +9356,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2021-08-27"; + version = "2021-09-06"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "e081212205f767fc5b050977c0a2b0f1536a3bdf"; - sha256 = "1z7dbhjz7y9wl9gvv35pn4v25pksaavibblxakw3pxv6xk5c5kxf"; + rev = "ef4f418e5326b2069ab767e4139b7bd3dfa5e0f0"; + sha256 = "1wxv22d79mv0jns0jcfkww4xyilwpvcmi82jd1b92l8b3xc6awyp"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -9536,12 +9536,12 @@ final: prev: vim-table-mode = buildVimPluginFrom2Nix { pname = "vim-table-mode"; - version = "2021-05-29"; + version = "2021-09-04"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-table-mode"; - rev = "35e9fbf64c06fddc41651e65b92200f902d8ae0b"; - sha256 = "16p68x4669y4qpg91hmi4gc3f8qc8bzbr8v6w3nc75vm48s64z6k"; + rev = "02d28b932398bb7774def2edaef6f1c0ad92c3e3"; + sha256 = "1bh93qfvswb66fj7amhfmhyiyg17rnp28cpq07asm5gccr27ssw7"; }; meta.homepage = "https://github.com/dhruvasagar/vim-table-mode/"; }; @@ -9933,12 +9933,12 @@ final: prev: vim-vsnip-integ = buildVimPluginFrom2Nix { pname = "vim-vsnip-integ"; - version = "2021-08-21"; + version = "2021-09-05"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip-integ"; - rev = "8f94cdd9ca6c3e6c328edaf22029f1bf17f3d1c5"; - sha256 = "1wh44m7jn1s7jyk0g9flf2qhkqgcl5amfi5w7dwjqkr8z495r29h"; + rev = "0a917e0a2c057185b71a4d8367aa69366ebe54e5"; + sha256 = "1fx8a798d7z2xl9jgwn9nvs1cskvi36c557v5yr4w8fc1afl6abm"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/"; }; @@ -10245,12 +10245,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-08-20"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "14f34ea6d12b71a720356ce83c386f8ba393e700"; - sha256 = "1w680m5xwv6imyc4rd5mpj76w2ac6qgvfsaw33xd9wpgl3ld444j"; + rev = "51d78fce5f95fb10ba84b8ab66e97d44d75df010"; + sha256 = "119x44yvva87f02rra9dm6xg8zmisa9ij9f8426vqpx4307p1wfc"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -10258,12 +10258,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-09-02"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "1861f3c89d9c4dc776f95639295ebdbe00c12702"; - sha256 = "0wby0dvm6briqb40c2f2kn6vbf546wn8xwzrk9wpi5xpv1z4a29g"; + rev = "5623fb4c44b2975dd89b0925ba3b952ffa33dfc6"; + sha256 = "0xd6ysq8f946wf4680gd12irdl9q3fqjpq6234d53k15b302lf71"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -10498,12 +10498,12 @@ final: prev: yats-vim = buildVimPluginFrom2Nix { pname = "yats.vim"; - version = "2021-07-10"; + version = "2021-09-05"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "dfa61676a32d096aa05003ace3ba8b977c136e1f"; - sha256 = "1mj35p5ym92qi4gjfnvfxqv328cgwp8sp2sldw54g6f6yxfzi37a"; + rev = "3188778d38c736f11161cf6fafc33572cb055816"; + sha256 = "04hy09rzn8s56wxacs5x4j74v9xdixkbskm57bsrxys96n2n1kyb"; fetchSubmodules = true; }; meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; From 47aadbb2377b220b4a0cb97faa50c68534e73437 Mon Sep 17 00:00:00 2001 From: Mukund Lakshman Date: Tue, 7 Sep 2021 13:45:20 -0400 Subject: [PATCH 151/167] vimPlugins.nvim-solarized-lua: init at 2021-07-09 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 5990e3446831..cb35276ed962 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -4102,6 +4102,18 @@ final: prev: meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; + nvim-solarized-lua = buildVimPluginFrom2Nix { + pname = "nvim-solarized-lua"; + version = "2021-07-09"; + src = fetchFromGitHub { + owner = "ishan9299"; + repo = "nvim-solarized-lua"; + rev = "fa437ae65a6c1239525e4ec7f4cbf4671eaa55ba"; + sha256 = "032gs63g3x62mym6nhznvywsqk1cxsgwx0fv2vyh2c929fb27ji7"; + }; + meta.homepage = "https://github.com/ishan9299/nvim-solarized-lua/"; + }; + nvim-terminal-lua = buildVimPluginFrom2Nix { pname = "nvim-terminal.lua"; version = "2019-10-17"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 3bc923211db7..a2c2dd5b1267 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -244,6 +244,7 @@ inkarkat/vim-ReplaceWithSameIndentRegister inkarkat/vim-SyntaxRange int3/vim-extradite Iron-E/nvim-highlite +ishan9299/nvim-solarized-lua itchyny/calendar.vim itchyny/lightline.vim itchyny/thumbnail.vim From 82d19cb068d7213c8beaa96220f1d81d57a28381 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 7 Sep 2021 12:15:15 -0400 Subject: [PATCH 152/167] vimPlugins: fix update script --- pkgs/misc/vim-plugins/update-shell.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/vim-plugins/update-shell.nix b/pkgs/misc/vim-plugins/update-shell.nix index e95801624b69..b26620677039 100644 --- a/pkgs/misc/vim-plugins/update-shell.nix +++ b/pkgs/misc/vim-plugins/update-shell.nix @@ -7,6 +7,7 @@ mkShell { packages = [ bash pyEnv + nix nix-prefetch-scripts ]; } From 6439f26a9b6f95ad1717388a0d27541eeffa00e2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Sep 2021 20:00:18 +0200 Subject: [PATCH 153/167] python3Packages.archinfo: 9.0.9684 -> 9.0.9792 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 66f9444f0edf..18f6b9859af5 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.9684"; + version = "9.0.9792"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uRwNvYrea3oexJ3Rcoa9oUMXa+gSnha2K0NM8e/A09k="; + sha256 = "sha256-st4h/ck7hxIx2cZ241C4hEFJvFsTqHmawAB4zsfQ/oU="; }; checkInputs = [ From 6ba261ca10031a7f6582273549db81740030b7e9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Sep 2021 20:00:21 +0200 Subject: [PATCH 154/167] python3Packages.ailment: 9.0.9684 -> 9.0.9792 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index e7e057b5a8c3..551e26e71add 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.0.9684"; + version = "9.0.9792"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dWHioxNpNuvUTC8FkkKTsoRs4x+eHUfDb4rpgeIGaIA="; + sha256 = "sha256-c+E3ypmN69IyE0HagefrYN8bdCY7amRxa/PGoIX4/cQ="; }; propagatedBuildInputs = [ pyvex ]; From 2df513ae1a621c9f7e9b77b7a2fd11869a7158c3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Sep 2021 20:00:24 +0200 Subject: [PATCH 155/167] python3Packages.pyvex: 9.0.9684 -> 9.0.9792 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index c07199b741e8..4e3200c3fe70 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.9684"; + version = "9.0.9792"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pf+LUFatC16a8EScoNYZKCXiaCINPRRn+6R1Op4GMRE="; + sha256 = "sha256-8AF7dCvQvBDjITRwi40KqMXcgiJpmKcK16ys1ybFIyk="; }; postPatch = lib.optionalString stdenv.isDarwin '' From a7cb4dabc70beaf675f172468bf4b2331b1473f3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Sep 2021 20:00:28 +0200 Subject: [PATCH 156/167] python3Packages.claripy: 9.0.9684 -> 9.0.9792 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 30400fcdaf56..5a80bb1dc360 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.0.9684"; + version = "9.0.9792"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tGRnCsuOLqZmWBcITF0TzgQ7kW6e7wZyhtObyU5Pasw="; + sha256 = "sha256-9jwD75leV02N5B7RaLF2DbC6GjhoDQMmkfFIO9MJ4Es="; }; # Use upstream z3 implementation From 7d835af9d6f5cd7a7a78e1f940e2e63b210e95bb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Sep 2021 20:00:31 +0200 Subject: [PATCH 157/167] python3Packages.cle: 9.0.9684 -> 9.0.9792 --- pkgs/development/python-modules/cle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index be8106f97f43..0b4b0fc94d00 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.0.9684"; + version = "9.0.9792"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yza6Q0kxDXHOXxZcDFt43I621dSGI+bzTUrxWAQkGFQ="; + sha256 = "sha256-lCRZj0/L/XNcnJNiLxPY2mCFZowV6hLEpHOEiCsyQ/0="; }; propagatedBuildInputs = [ From e46e3c798b8e2d456e41e5e8af3420ee516a51a1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Sep 2021 20:00:35 +0200 Subject: [PATCH 158/167] python3Packages.angr: 9.0.9684 -> 9.0.9792 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index ed7bb44349d2..7ff5e8bb35c9 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -43,14 +43,14 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.0.9684"; + version = "9.0.9792"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-37WCiH0uYRRh8yxNwz9OW0LcyNS9Kr2l1J662JYaPhg="; + sha256 = "sha256-zDy3dwhCNBtCAwflF/grdNsRllNUHJHMx1PQThHjcnw="; }; propagatedBuildInputs = [ From 9215390c882ae8c6d12694c575299e857e7b943f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Sep 2021 20:00:38 +0200 Subject: [PATCH 159/167] python3Packages.angrop: 9.0.9684 -> 9.0.9792 --- pkgs/development/python-modules/angrop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index 9605539a9cb6..3bee7edbf520 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.0.9684"; + version = "9.0.9792"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rl7ZELiLAVuCOkR6NVCUB5c6AtW/rFniDxB3E9ZPnK8="; + sha256 = "sha256-rXhXzqjefsKvfsFky4XJd+RaF5z/TRWDg6+IYFIfP2w="; }; propagatedBuildInputs = [ From 2d9b8a81e299d581330b81dd0aa571c802d72599 Mon Sep 17 00:00:00 2001 From: Mukund Lakshman Date: Tue, 31 Aug 2021 12:36:11 +0100 Subject: [PATCH 160/167] Add a comment to update script. --- pkgs/misc/vim-plugins/update.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py index fa80b58eb386..326e30dd5d72 100755 --- a/pkgs/misc/vim-plugins/update.py +++ b/pkgs/misc/vim-plugins/update.py @@ -9,6 +9,11 @@ # linted: # $ nix run nixpkgs.python3Packages.flake8 -c flake8 --ignore E501,E265,E402 update.py +# If you see `HTTP Error 429: too many requests` errors while running this script, +# refer to: +# +# https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks/vim.section.md#updating-plugins-in-nixpkgs-updating-plugins-in-nixpkgs + import inspect import os import sys From 17681be1d3d5dd86b33ce1e5178ed7e168a86dfc Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 7 Sep 2021 11:28:38 -0700 Subject: [PATCH 161/167] linux_4_14_hardened: 4.14.245 -> 4.14.246 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index dc379de31612..e4b78f9c4589 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,9 +1,9 @@ { "4.14": { "extra": "-hardened1", - "name": "linux-hardened-4.14.245-hardened1.patch", - "sha256": "035sq0l15afhyfivkavd08pyaywsrcl6f468gykmbq9j3i2swbb6", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.245-hardened1/linux-hardened-4.14.245-hardened1.patch" + "name": "linux-hardened-4.14.246-hardened1.patch", + "sha256": "1b15687ac2pkz46qliq1blyja7cjwn19q2bkd0c5912kzly76ghd", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.246-hardened1/linux-hardened-4.14.246-hardened1.patch" }, "4.19": { "extra": "-hardened1", From 1c0e5d13a99b35f8587041064c7df57eef2e2fc8 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 7 Sep 2021 11:29:21 -0700 Subject: [PATCH 162/167] linux_4_19_hardened: 4.19.205 -> 4.19.206 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index e4b78f9c4589..67b33efd04ce 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -7,9 +7,9 @@ }, "4.19": { "extra": "-hardened1", - "name": "linux-hardened-4.19.205-hardened1.patch", - "sha256": "14v3kwkkhyng0wfz4spca6z7wvsxj4kplj144qv1k3fm9yy2cy3h", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.205-hardened1/linux-hardened-4.19.205-hardened1.patch" + "name": "linux-hardened-4.19.206-hardened1.patch", + "sha256": "12ylhvjvabal29gi00cpjh3s47qj0vav6f2y145z4c9r2z77816k", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.206-hardened1/linux-hardened-4.19.206-hardened1.patch" }, "5.10": { "extra": "-hardened1", From 8169d9283ebd366a0effe99bd5d9f5caae3aebb3 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 7 Sep 2021 11:30:28 -0700 Subject: [PATCH 163/167] linux_5_4_hardened: 5.4.143 -> 5.4.144 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 67b33efd04ce..56714b5f9843 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -25,8 +25,8 @@ }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.143-hardened1.patch", - "sha256": "0xv29cclypywq52908zppxpjrxllcdb67chw7lcia60y1aqsg83z", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.143-hardened1/linux-hardened-5.4.143-hardened1.patch" + "name": "linux-hardened-5.4.144-hardened1.patch", + "sha256": "1vm19d5cwxw3l2s4h7sbzrhk60m24nhbjdlpqd1bkbm8x8zcp9f3", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.144-hardened1/linux-hardened-5.4.144-hardened1.patch" } } From 1aba1d891fbf3cf9a34c10b12f14f3dd64dba6f1 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 7 Sep 2021 11:29:46 -0700 Subject: [PATCH 164/167] linux_5_10_hardened: 5.10.61 -> 5.10.62 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 56714b5f9843..bf69324f197b 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -13,9 +13,9 @@ }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.61-hardened1.patch", - "sha256": "0hg67w9s6nzfmar8y01cnc46b2m2sa6s1xz85x1z1c46vw9558f0", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.61-hardened1/linux-hardened-5.10.61-hardened1.patch" + "name": "linux-hardened-5.10.62-hardened1.patch", + "sha256": "0xdj9mp0ccilj06pb8my5jqw47xwc2fk7f2ck36g4bzsp669nisj", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.62-hardened1/linux-hardened-5.10.62-hardened1.patch" }, "5.13": { "extra": "-hardened1", From abfa8098ace1c87c6591cb27f9c1ac19d6081e9b Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 7 Sep 2021 11:30:08 -0700 Subject: [PATCH 165/167] linux_5_13_hardened: 5.13.13 -> 5.13.14 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index bf69324f197b..5da3676a1c82 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -19,9 +19,9 @@ }, "5.13": { "extra": "-hardened1", - "name": "linux-hardened-5.13.13-hardened1.patch", - "sha256": "1rb4jpz8zbpijybpm7dwxr05f9nmf6b9av2b651ffxg5vziw17l3", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.13.13-hardened1/linux-hardened-5.13.13-hardened1.patch" + "name": "linux-hardened-5.13.14-hardened1.patch", + "sha256": "00lmqq10d66s1852q1j2m8cj90bb0gfpsg617bc7f3pm2v6iyl93", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.13.14-hardened1/linux-hardened-5.13.14-hardened1.patch" }, "5.4": { "extra": "-hardened1", From d72603b5eab34017b03150512712578757683243 Mon Sep 17 00:00:00 2001 From: CRTified Date: Tue, 7 Sep 2021 23:03:39 +0200 Subject: [PATCH 166/167] home-assistant: pin aioesphomeapi to 7.0.0 Relevant comment in the bump of aioesphomeapi: https://github.com/NixOS/nixpkgs/pull/135669#issuecomment-912177954 --- pkgs/servers/home-assistant/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index cc10491ffff2..68a80dc41d7e 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -112,6 +112,19 @@ let (self: super: { home-assistant-frontend = self.callPackage ./frontend.nix { }; }) + + # Pinned due to incompability with aioesphomeapi 8.0.0 + (self: super: { + aioesphomeapi = super.aioesphomeapi.overrideAttrs (oldAttrs: rec { + version = "7.0.0"; + src = fetchFromGitHub { + owner = "esphome"; + repo = oldAttrs.pname; + rev = "v${version}"; + hash = "sha256-ho/1fpq4yAgmYNERPqs51oqr08ncaN9+GRTUUuGU7ps="; + }; + }); + }) ]; mkOverride = attrname: version: sha256: From 724809eab9b9403848c8eed2582950e1dd70d7ef Mon Sep 17 00:00:00 2001 From: Ricardo Guevara Date: Tue, 7 Sep 2021 15:22:12 -0700 Subject: [PATCH 167/167] ccloud-cli: 1.25 > 1.39 (#137016) --- pkgs/development/tools/ccloud-cli/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ccloud-cli/default.nix b/pkgs/development/tools/ccloud-cli/default.nix index 3095d661ab35..5814ab90e6d9 100644 --- a/pkgs/development/tools/ccloud-cli/default.nix +++ b/pkgs/development/tools/ccloud-cli/default.nix @@ -2,20 +2,22 @@ stdenv.mkDerivation rec { pname = "ccloud-cli"; - version = "1.25.0"; + version = "1.39.0"; # To get the latest version: # curl -L https://cnfl.io/ccloud-cli | sh -s -- -l | grep -v latest | sort -V | tail -n1 src = fetchurl (if stdenv.hostPlatform.isDarwin then { url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/ccloud-cli/archives/${version}/ccloud_v${version}_darwin_amd64.tar.gz"; - sha256 = "0306jg36dpccwyy239r2xvw3bvsrnrdc88390g26fhcb0048qmgb"; + sha256 = "0jqpmnx3izl4gv02zpx03z6ayi3cb5if4rnyl1374yaclx44k1gd"; } else { url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/ccloud-cli/archives/${version}/ccloud_v${version}_linux_amd64.tar.gz"; - sha256 = "02sly7cxqlrfd6chamlp05k9ar93mpfrkx5183js0hf595nlki61"; + sha256 = "0936hipcl37w4mzzsnjlz4q1z4j9094i4irigzqwg14gdbs7p11s"; }); nativeBuildInputs = [ autoPatchelfHook ]; + dontStrip = stdenv.isDarwin; + installPhase = '' mkdir -p $out/{bin,share/doc/ccloud-cli} cp ccloud $out/bin/