diff --git a/nixos/doc/manual/administration/boot-problems.section.md b/nixos/doc/manual/administration/boot-problems.section.md index dee83e7ec225..bca4fdc3fb38 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/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/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 0d3355e56a58..8e0e300f367b 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/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/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/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/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/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/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/rebooting.chapter.md b/nixos/doc/manual/administration/rebooting.chapter.md new file mode 100644 index 000000000000..ec4b889b1648 --- /dev/null +++ b/nixos/doc/manual/administration/rebooting.chapter.md @@ -0,0 +1,30 @@ +# 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/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/running.xml b/nixos/doc/manual/administration/running.xml index 19bec1f7794d..24fd864956ff 100644 --- a/nixos/doc/manual/administration/running.xml +++ b/nixos/doc/manual/administration/running.xml @@ -10,12 +10,12 @@ 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..bb0f9b62e913 --- /dev/null +++ b/nixos/doc/manual/administration/service-mgmt.chapter.md @@ -0,0 +1,120 @@ +# 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, `systemctl` 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 +[](#opt-systemd.packages) 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/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 b055acadacf3..d447b537335b 100644 --- a/nixos/doc/manual/administration/troubleshooting.xml +++ b/nixos/doc/manual/administration/troubleshooting.xml @@ -9,8 +9,8 @@ you manage your NixOS system. - - - - + + + + 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/configuration/ad-hoc-network-config.section.md b/nixos/doc/manual/configuration/ad-hoc-network-config.section.md new file mode 100644 index 000000000000..4478d77f361d --- /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 [](#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/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/adding-custom-packages.section.md b/nixos/doc/manual/configuration/adding-custom-packages.section.md new file mode 100644 index 000000000000..5d1198fb0f41 --- /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 [](#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/config-file.section.md b/nixos/doc/manual/configuration/config-file.section.md new file mode 100644 index 000000000000..f21ba113bf8c --- /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, +[](#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..d1351ff934e5 100644 --- a/nixos/doc/manual/configuration/config-syntax.xml +++ b/nixos/doc/manual/configuration/config-syntax.xml @@ -18,8 +18,8 @@ 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/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml index 6949189b8883..2461a5de73ad 100644 --- a/nixos/doc/manual/configuration/configuration.xml +++ b/nixos/doc/manual/configuration/configuration.xml @@ -15,17 +15,17 @@ - + - - - - + + + + - - + + - + 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..bceeeb2d7a16 --- /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, +[](#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 cd84d1951d24..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/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/firewall.section.md b/nixos/doc/manual/configuration/firewall.section.md new file mode 100644 index 000000000000..dbf0ffb9273e --- /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 +[](#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 +[](#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/gpu-accel.chapter.md b/nixos/doc/manual/configuration/gpu-accel.chapter.md new file mode 100644 index 000000000000..08b6af5d98ae --- /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 +[](#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 +[](#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 +[](#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 [](#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 +[](#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 +[](#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/configuration/ipv4-config.section.md b/nixos/doc/manual/configuration/ipv4-config.section.md new file mode 100644 index 000000000000..c73024b856d7 --- /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 [](#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/ipv6-config.section.md b/nixos/doc/manual/configuration/ipv6-config.section.md new file mode 100644 index 000000000000..ce66f53ed472 --- /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 [](#opt-networking.tempAddresses). This option +may be overridden on a per-interface basis by +[](#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/kubernetes.chapter.md b/nixos/doc/manual/configuration/kubernetes.chapter.md new file mode 100644 index 000000000000..93787577be9b --- /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 +[](#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 +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: +[](#opt-services.kubernetes.apiserver.insecurePort) and +[](#opt-services.kubernetes.apiserver.insecureBindAddress) + +::: {.note} +As of NixOS 19.03, it is mandatory to configure: +[](#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, +[](#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 [](#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 +[](#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 +[](#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/configuration/linux-kernel.chapter.md b/nixos/doc/manual/configuration/linux-kernel.chapter.md new file mode 100644 index 000000000000..1d06543d4f1e --- /dev/null +++ b/nixos/doc/manual/configuration/linux-kernel.chapter.md @@ -0,0 +1,140 @@ +# 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.linuxKernel.packages.linux_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. + +While `pkgs.linuxKernel.packages` contains all available kernel packages, +you may want to use one of the unversioned `pkgs.linuxPackages_*` aliases +such as `pkgs.linuxPackages_latest`, that are kept up to date with new +versions. + +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: pkgs.lib.recursiveUpdate pkgs { + linuxKernel.kernels.linux_5_10 = pkgs.linuxKernel.kernels.linux_5_10.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 +[](#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 [](#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 +[](#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 `linuxKernel.manualConfig`: + +```nix +custom-kernel = let base_kernel = linuxKernel.kernels.linux_4_9; + in super.linuxKernel.manualConfig { + inherit (super) stdenv hostPlatform; + inherit (base_kernel) src; + version = "${base_kernel.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 2675220b3a80..000000000000 --- a/nixos/doc/manual/configuration/linux-kernel.xml +++ /dev/null @@ -1,140 +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.linuxKernel.packages.linux_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. - - - While pkgs.linuxKernel.packages contains all available kernel packages, you may want to use one of the unversioned pkgs.linuxPackages_* aliases such as pkgs.linuxPackages_latest, that are kept up to date with new versions. - - - 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: pkgs.lib.recursiveUpdate pkgs { - linuxKernel.kernels.linux_5_10 = pkgs.linuxKernel.kernels.linux_5_10.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 - linuxKernel.manualConfig: - - 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/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/configuration/modularity.section.md b/nixos/doc/manual/configuration/modularity.section.md new file mode 100644 index 000000000000..3395ace20c4f --- /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 +[](#opt-environment.systemPackages). When multiple modules define an +option, NixOS will try to *merge* the definitions. In the case 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`: + +```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 [](#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 +[](#opt-environment.systemPackages) only if +[](#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/configuration/network-manager.section.md b/nixos/doc/manual/configuration/network-manager.section.md new file mode 100644 index 000000000000..4bda21d34a10 --- /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 +[](#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..5dd0278569b9 100644 --- a/nixos/doc/manual/configuration/networking.xml +++ b/nixos/doc/manual/configuration/networking.xml @@ -8,13 +8,13 @@ This section describes how to configure networking components on your NixOS machine. - - - - - - - - + + + + + + + + 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/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..e2dd7c76089c --- /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, [](#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..0a0df483c123 --- /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](#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..f3e29b92f5e6 --- /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 [](#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..aaea5c8c0288 --- /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 [](#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/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..9fb5e18c384a --- /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 +[](#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..d185a9a774b7 --- /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](#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/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..ae9f8fa7757f --- /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](#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](#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..02a3b65ae422 --- /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](#opt-environment.noXlibs), sets +[](#opt-i18n.supportedLocales) to +only support the user-selected locale, +[disables packages' documentation](#opt-documentation.enable), +and [disables sound](#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/configuration/renaming-interfaces.section.md b/nixos/doc/manual/configuration/renaming-interfaces.section.md new file mode 100644 index 000000000000..b124e8303fee --- /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 +[](#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/configuration/ssh.section.md b/nixos/doc/manual/configuration/ssh.section.md new file mode 100644 index 000000000000..cba81eb43f49 --- /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 +[](#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/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 new file mode 100644 index 000000000000..84f9c2703378 --- /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 [](#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/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/configuration/user-mgmt.chapter.md b/nixos/doc/manual/configuration/user-mgmt.chapter.md new file mode 100644 index 000000000000..37990664a8f1 --- /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 [](#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 +[](#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/configuration/wayland.chapter.md b/nixos/doc/manual/configuration/wayland.chapter.md new file mode 100644 index 000000000000..a3a46aa3da6f --- /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 +[](#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/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/configuration/x-windows.chapter.md b/nixos/doc/manual/configuration/x-windows.chapter.md new file mode 100644 index 000000000000..2c80b786b267 --- /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 +[](#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 [](#ch-options)). +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/configuration/xfce.chapter.md b/nixos/doc/manual/configuration/xfce.chapter.md new file mode 100644 index 000000000000..b0ef6682aae8 --- /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 +[](#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 +[](#opt-services.xserver.desktopManager.xfce.thunarPlugins). +You shouldn\'t just add them to [](#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/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/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/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/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/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/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/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/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 04497db77b89..167976247091 100644 --- a/nixos/doc/manual/development/writing-modules.xml +++ b/nixos/doc/manual/development/writing-modules.xml @@ -179,13 +179,13 @@ in { } - - - + + + - - - - - + + + + + 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 4ea01e78f32f..144661c86eba 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/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. + +
+ 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. + +
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. + + 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. + +
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 + +
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. + + 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. + +
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/ + +
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. + + 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 + +
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..8b01b8f896a4 --- /dev/null +++ b/nixos/doc/manual/from_md/administration/service-mgmt.chapter.xml @@ -0,0 +1,141 @@ + + 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, systemctl 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 + 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/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. + +
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 + + 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..035ee3122e15 --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/ad-hoc-network-config.section.xml @@ -0,0 +1,16 @@ +
+ 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: + + +networking.localCommands = + '' + ip -6 addr add 2001:610:685:1::1/64 dev eth0 + ''; + +
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. + +
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..4fa40d61966e --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/adding-custom-packages.section.xml @@ -0,0 +1,80 @@ +
+ 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 + , 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! + +
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..952c6e600302 --- /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, + 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 + . + + + + +
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..f78b5dc5460c --- /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, + 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.) + +
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..24c19bb1c66d --- /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 + . + + + 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 + . + +
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..8e780c5dee95 --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml @@ -0,0 +1,239 @@ + + 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: + + +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 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 + 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: + + +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. + +
+
+ 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..047ba2165f07 --- /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 = "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/from_md/configuration/ipv6-config.section.xml b/nixos/doc/manual/from_md/configuration/ipv6-config.section.xml new file mode 100644 index 000000000000..137c3d772a86 --- /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 + . This option may be + overridden on a per-interface basis by + . 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. + +
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..83a50d7c49d1 --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/kubernetes.chapter.xml @@ -0,0 +1,126 @@ + + 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 + 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/linux-kernel.chapter.xml b/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml new file mode 100644 index 000000000000..a1d6815af29c --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml @@ -0,0 +1,157 @@ + + 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.linuxKernel.packages.linux_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. + + + While pkgs.linuxKernel.packages contains all + available kernel packages, you may want to use one of the + unversioned pkgs.linuxPackages_* aliases such as + pkgs.linuxPackages_latest, that are kept up to + date with new versions. + + + 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: pkgs.lib.recursiveUpdate pkgs { + linuxKernel.kernels.linux_5_10 = pkgs.linuxKernel.kernels.linux_5_10.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. + + +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 = [ "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. + + +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 linuxKernel.manualConfig: + + +custom-kernel = let base_kernel = linuxKernel.kernels.linux_4_9; + in super.linuxKernel.manualConfig { + inherit (super) stdenv hostPlatform; + inherit (base_kernel) src; + version = "${base_kernel.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 + +
+ 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; + +
+
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..a7688090fcc5 --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/modularity.section.xml @@ -0,0 +1,152 @@ +
+ 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 + . 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: + + +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 + , + 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 only if + 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") ]; } + +
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..8f0d6d680ae0 --- /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 + , 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. + + +
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..43ac5edea7f8 --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/profiles/all-hardware.section.xml @@ -0,0 +1,15 @@ +
+ 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/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..09c2680a1067 --- /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..97c2a92dcab5 --- /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 + . + +
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..1b109519d436 --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/profiles/graphical.section.xml @@ -0,0 +1,14 @@ +
+ 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/from_md/configuration/profiles/hardened.section.xml b/nixos/doc/manual/from_md/configuration/profiles/hardened.section.xml new file mode 100644 index 000000000000..44c11786d940 --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/profiles/hardened.section.xml @@ -0,0 +1,25 @@ +
+ 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/from_md/configuration/profiles/headless.section.xml b/nixos/doc/manual/from_md/configuration/profiles/headless.section.xml new file mode 100644 index 000000000000..0910b9ffaad2 --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/profiles/headless.section.xml @@ -0,0 +1,15 @@ +
+ 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..837e69df06e1 --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/profiles/installation-device.section.xml @@ -0,0 +1,32 @@ +
+ 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..a3fe30357dff --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/profiles/minimal.section.xml @@ -0,0 +1,13 @@ +
+ 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 + 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. + +
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..1c32e30b3f85 --- /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 + 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/ssh.section.xml b/nixos/doc/manual/from_md/configuration/ssh.section.xml new file mode 100644 index 000000000000..037418d8ea4d --- /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 + 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/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 new file mode 100644 index 000000000000..794c2c34e399 --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/subversion.chapter.xml @@ -0,0 +1,121 @@ + + 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/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 ]) + + + + + +
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..06492d5c2512 --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/user-mgmt.chapter.xml @@ -0,0 +1,105 @@ + + 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 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: + + +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. + + 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..1e90d4f31177 --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/wayland.chapter.xml @@ -0,0 +1,31 @@ + + 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 + and related options. + + 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 + +
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..274d0d817bc1 --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/x-windows.chapter.xml @@ -0,0 +1,381 @@ + + 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 + 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 ). + 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 + . + +
+ 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..f96ef2e8c483 --- /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 + 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/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. + + +
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; +} + +
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 + + + +
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" ]). + +
+
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 = [ ... ]; + }) + ]; + +
+
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. + + + + + + + +
+
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." ]; + }; +} + +
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. + ''; +}; + +
+
+
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..86f0b15b41c5 --- /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/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/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/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/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/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/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/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/changing-config.chapter.md b/nixos/doc/manual/installation/changing-config.chapter.md new file mode 100644 index 000000000000..8a404f085d7c --- /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](#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 2901f462dee0..cc18a9c6e9ff 100644 --- a/nixos/doc/manual/installation/installation.xml +++ b/nixos/doc/manual/installation/installation.xml @@ -10,8 +10,8 @@ first-time use. - + - - + + 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-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-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-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-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 ff2425e725e8..6eb097f243ab 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -603,14 +603,14 @@ Retype new password: ***
Additional installation notes - + - + - + - + - +
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. - - - - - 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; - - -
- diff --git a/nixos/modules/programs/bash/bash-completion.nix b/nixos/modules/programs/bash/bash-completion.nix index f07b1b636ef9..b8e5b1bfa336 100644 --- a/nixos/modules/programs/bash/bash-completion.nix +++ b/nixos/modules/programs/bash/bash-completion.nix @@ -26,7 +26,7 @@ in shopt -s nullglob for p in $NIX_PROFILES; do for m in "$p/etc/bash_completion.d/"*; do - . $m + . "$m" done done eval "$nullglobStatus" diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix index 908ab34b08d0..7281126979e5 100644 --- a/nixos/modules/programs/bash/bash.nix +++ b/nixos/modules/programs/bash/bash.nix @@ -78,10 +78,10 @@ in promptInit = mkOption { default = '' # Provide a nice prompt if the terminal supports it. - if [ "$TERM" != "dumb" -o -n "$INSIDE_EMACS" ]; then + if [ "$TERM" != "dumb" ] || [ -n "$INSIDE_EMACS" ]; then PROMPT_COLOR="1;31m" - let $UID && PROMPT_COLOR="1;32m" - if [ -n "$INSIDE_EMACS" -o "$TERM" == "eterm" -o "$TERM" == "eterm-color" ]; then + ((UID)) && PROMPT_COLOR="1;32m" + if [ -n "$INSIDE_EMACS" ] || [ "$TERM" = "eterm" ] || [ "$TERM" = "eterm-color" ]; then # Emacs term mode doesn't support xterm title escape sequence (\e]0;) PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]\\$\[\033[0m\] " else @@ -173,7 +173,7 @@ in # /etc/bashrc: DO NOT EDIT -- this file has been generated automatically. # Only execute this file once per shell. - if [ -n "$__ETC_BASHRC_SOURCED" -o -n "$NOSYSBASHRC" ]; then return; fi + if [ -n "$__ETC_BASHRC_SOURCED" ] || [ -n "$NOSYSBASHRC" ]; then return; fi __ETC_BASHRC_SOURCED=1 # If the profile was not loaded in a parent process, source diff --git a/nixos/modules/programs/command-not-found/command-not-found.nix b/nixos/modules/programs/command-not-found/command-not-found.nix index 79786584c666..4d2a89b51584 100644 --- a/nixos/modules/programs/command-not-found/command-not-found.nix +++ b/nixos/modules/programs/command-not-found/command-not-found.nix @@ -49,10 +49,10 @@ in '' # This function is called whenever a command is not found. command_not_found_handle() { - local p=${commandNotFound}/bin/command-not-found - if [ -x $p -a -f ${cfg.dbPath} ]; then + local p='${commandNotFound}/bin/command-not-found' + if [ -x "$p" ] && [ -f '${cfg.dbPath}' ]; then # Run the helper program. - $p "$@" + "$p" "$@" # Retry the command if we just installed it. if [ $? = 126 ]; then "$@" @@ -70,10 +70,10 @@ in '' # This function is called whenever a command is not found. command_not_found_handler() { - local p=${commandNotFound}/bin/command-not-found - if [ -x $p -a -f ${cfg.dbPath} ]; then + local p='${commandNotFound}/bin/command-not-found' + if [ -x "$p" ] && [ -f '${cfg.dbPath}' ]; then # Run the helper program. - $p "$@" + "$p" "$@" # Retry the command if we just installed it. if [ $? = 126 ]; then diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index 440f34b3dc5c..1d7a28d5d245 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -8,9 +8,13 @@ let esConfig = '' network.host: ${cfg.listenAddress} cluster.name: ${cfg.cluster_name} + ${lib.optionalString cfg.single_node '' + discovery.type: single-node + gateway.auto_import_dangling_indices: true + ''} http.port: ${toString cfg.port} - transport.tcp.port: ${toString cfg.tcp_port} + transport.port: ${toString cfg.tcp_port} ${cfg.extraConf} ''; @@ -77,6 +81,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 = ""; 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/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index db6e03f47417..a6c8221c9f72 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -6,7 +6,7 @@ libcddb, libcdio, libcdio-paranoia, libcue, libjack2, libmad, libmms, libmodplug, libmowgli, libnotify, libogg, libpulseaudio, libsamplerate, libsidplayfp, libsndfile, libvorbis, libxml2, lirc, mpg123, neon, qtmultimedia, soxr, - wavpack, openmpt123 + wavpack, libopenmpt }: mkDerivation rec { @@ -33,7 +33,7 @@ mkDerivation rec { libcdio libcdio-paranoia libcue libjack2 libmad libmms libmodplug libmowgli libnotify libogg libpulseaudio libsamplerate libsidplayfp libsndfile libvorbis libxml2 lirc mpg123 neon qtmultimedia soxr wavpack - openmpt123 + libopenmpt ]; # Here we build both audacious and audacious-plugins in one 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 ]; diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/libopenmpt/default.nix similarity index 94% rename from pkgs/applications/audio/openmpt123/default.nix rename to pkgs/applications/audio/libopenmpt/default.nix index 3bfb1a5a4da8..521c9ba2339a 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/libopenmpt/default.nix @@ -2,9 +2,11 @@ , usePulseAudio ? config.pulseaudio or false, libpulseaudio }: stdenv.mkDerivation rec { - pname = "openmpt123"; + pname = "libopenmpt"; version = "0.5.10"; + outputs = [ "out" "lib" "dev" ]; + src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; sha256 = "sha256-Waj6KNi432nLf6WXK9+TEIHatOHhFWxpoaU7ZcK+n/o="; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index f31265c2e4c1..502c68d3269f 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -9,8 +9,8 @@ let inherit buildFHSUserEnv; }; stableVersion = { - version = "2020.3.1.23"; # "Android Studio Arctic Fox (2020.3.1)" - sha256Hash = "06xjdibb5lxiga3jg9akmvbazjwk11akyhy3g4pc562hcifsa5sk"; + version = "2020.3.1.24"; # "Android Studio Arctic Fox (2020.3.1)" + sha256Hash = "0k8jcq8vpjayvwm9wqcrjhnp7dly0h4bb8nxspck5zmi8q2ar67l"; }; betaVersion = { version = "2020.3.1.21"; # "Android Studio Arctic Fox (2020.3.1) RC 1" diff --git a/pkgs/applications/editors/featherpad/default.nix b/pkgs/applications/editors/featherpad/default.nix index 42c8e77ac68e..84dc16c76d12 100644 --- a/pkgs/applications/editors/featherpad/default.nix +++ b/pkgs/applications/editors/featherpad/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "featherpad"; - version = "0.18.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "tsujan"; repo = "FeatherPad"; rev = "V${version}"; - sha256 = "0av96yx9ir1ap5adn2cvr6n5y7qjrspk73and21m65dmpwlfdiqb"; + sha256 = "sha256-GcOvof6bD7GNrABXIR8jOfzjDEN5Lvnj24M154iqQgU="; }; nativeBuildInputs = [ cmake pkg-config qttools ]; diff --git a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock index d0827bf2a7ff..7a1975c37c6b 100644 --- a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock +++ b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock @@ -1,9 +1,9 @@ GEM remote: https://rubygems.org/ specs: - msgpack (1.2.6) - multi_json (1.13.1) - neovim (0.8.0) + msgpack (1.4.2) + multi_json (1.15.0) + neovim (0.8.1) msgpack (~> 1.1) multi_json (~> 1.0) diff --git a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix index 28a53cc590f6..60dcc8ba3832 100644 --- a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix +++ b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix @@ -1,27 +1,33 @@ { msgpack = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0031gd2mjyba6jb7m97sqa149zjkr0vzn2s2gpb3m9nb67gqkm13"; + sha256 = "06iajjyhx0rvpn4yr3h1hc4w4w3k59bdmfhxnjzzh76wsrdxxrc6"; type = "gem"; }; - version = "1.2.6"; + version = "1.4.2"; }; multi_json = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; type = "gem"; }; - version = "1.13.1"; + version = "1.15.0"; }; neovim = { dependencies = ["msgpack" "multi_json"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07scrdfk7pyn5jgx5m2yajdqpbdv42833vbw568qqag6xp99j3yk"; + sha256 = "0lfrbi4r6lagn2q92lyivk2w22i2spw0jbdzxxlcfj2zhv2wnvvi"; type = "gem"; }; - version = "0.8.0"; + version = "0.8.1"; }; } diff --git a/pkgs/applications/graphics/fig2dev/default.nix b/pkgs/applications/graphics/fig2dev/default.nix index 31d14185dcd9..8fa85803bfd8 100644 --- a/pkgs/applications/graphics/fig2dev/default.nix +++ b/pkgs/applications/graphics/fig2dev/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , ghostscript , libpng , makeWrapper @@ -14,22 +13,13 @@ stdenv.mkDerivation rec { pname = "fig2dev"; - version = "3.2.8a"; + version = "3.2.8b"; src = fetchurl { url = "mirror://sourceforge/mcj/fig2dev-${version}.tar.xz"; - sha256 = "1bm75lf9j54qpbjx8hzp6ixaayp1x9w4v3yxl6vxyw8g5m4sqdk3"; + sha256 = "1jv8rg71dsy00lpg434r5zqs5qrg8mxqvv2gpcjjvmzsm551d2j1"; }; - patches = [ - (fetchpatch { - name = "CVE-2021-3561.patch"; - # Using Debian patch since it is not possible to download it directly from Sourceforge - url = "https://sources.debian.org/data/main/f/fig2dev/1:3.2.8-3/debian/patches/33_sanitize-color.patch"; - sha256 = "1bppr3li03nj4qjibnddr2f38mpk55pcn5z6k98pf00gabq33fgs"; - }) - ]; - nativeBuildInputs = [ makeWrapper ]; buildInputs = [ libpng ]; diff --git a/pkgs/applications/graphics/fondo/default.nix b/pkgs/applications/graphics/fondo/default.nix index 19d93cee79b4..abcb77f9f8b2 100644 --- a/pkgs/applications/graphics/fondo/default.nix +++ b/pkgs/applications/graphics/fondo/default.nix @@ -12,23 +12,23 @@ , gsettings-desktop-schemas , gtk3 , libgee +, libhandy +, libsoup , json-glib , glib-networking -, libsoup -, libunity , desktop-file-utils , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "fondo"; - version = "1.5.2"; + version = "1.6.1"; src = fetchFromGitHub { owner = "calo001"; repo = pname; rev = version; - sha256 = "sha256-EATZRmYSGUzWYaPqFT4mLTGGvwUp+Mn93yMF2JsPaYo="; + sha256 = "sha256-JiDbkVs+EZRWRohSiuh8xFFgEhbnMYZfnZtz5Z4Wdb0="; }; nativeBuildInputs = [ @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { gtk3 json-glib libgee + libhandy libsoup - libunity pantheon.granite ]; 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 ]; 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 ]; diff --git a/pkgs/applications/misc/xplr/default.nix b/pkgs/applications/misc/xplr/default.nix index b84da33df40d..9ac39d722b56 100644 --- a/pkgs/applications/misc/xplr/default.nix +++ b/pkgs/applications/misc/xplr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "xplr"; - version = "0.14.5"; + version = "0.14.7"; src = fetchCrate { inherit pname version; - sha256 = "00kgxc4pn07p335dl3d53shiyw4f4anw64qc8axz9nspdq734nj5"; + sha256 = "sha256-rGU9Jf+MHDs3pnuddqxLaWc8YqL+Ka7Rex+fTuU62sM="; }; buildInputs = lib.optional stdenv.isDarwin libiconv; - cargoSha256 = "1wmc4frjllj8dgcg4yw4cigm4mhq807pmp3l3ysi70q490g24gwh"; + cargoSha256 = "sha256-GwepsY7PcWjKZpJ7H4D9vtXwd2XGFgG1c+QvinMAG4Q="; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; 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; diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index df9fc3f822cd..50ada47a4446 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -13,13 +13,13 @@ assert enablePython -> python != null; stdenv.mkDerivation rec { pname = "elinks"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "rkd77"; repo = "felinks"; rev = "v${version}"; - sha256 = "sha256-D7dUVHgYGzY4FXEnOzXw0Fao3gLgfFuCl8LJdLVpcSM="; + sha256 = "sha256-/VsxMpITBDKJqyMwl1oitS8aUM4AziibV/OHRSHbRjg="; }; buildInputs = [ diff --git a/pkgs/applications/networking/browsers/telescope/default.nix b/pkgs/applications/networking/browsers/telescope/default.nix index a6762e255f43..492709d88a50 100644 --- a/pkgs/applications/networking/browsers/telescope/default.nix +++ b/pkgs/applications/networking/browsers/telescope/default.nix @@ -1,23 +1,27 @@ { stdenv , lib -, fetchurl +, fetchFromGitHub , pkg-config , bison , libevent , libressl , ncurses +, autoreconfHook }: stdenv.mkDerivation rec { pname = "telescope"; - version = "0.4.1"; + version = "0.5.1"; - src = fetchurl { - url = "https://github.com/omar-polo/telescope/releases/download/${version}/telescope-${version}.tar.gz"; - sha256 = "086zps4nslv5isfw1b5gvms7vp3fglm7x1a6ks0h0wxarzj350bl"; + src = fetchFromGitHub { + owner = "omar-polo"; + repo = pname; + rev = version; + sha256 = "0dd09r7b2gm9nv1q67yq4zk9f4v0fwqr5lw51crki9ii82gmj2h8"; }; nativeBuildInputs = [ + autoreconfHook pkg-config bison ]; diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix index 4fe8bea90717..003c527a176f 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 ]; diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix index 24ec320cc431..012d00026cf5 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -21,19 +21,19 @@ stdenv.mkDerivation rec { pname = "newsflash"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; - rev = version; - hash = "sha256-8W158GrvVGu5b3TG5bomK+hAF6jttZuImkmtcZOl91o="; + rev = "v.${version}"; + hash = "sha256-c/zT+FNRDu7jdooNTEYbeG9jLrL+9txe+aC7nSy4bB0="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-zHtD3NVWYQ5njg17Z2YmEttiK2oiq01OiAXIZofIqKI="; + hash = "sha256-yTElaPSoTiJpfIGzuNJCWxVzdWBzim5rt0N2r0ARhvM="; }; patches = [ 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 diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index 8e7bbed90978..ec75454514c4 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -2,7 +2,6 @@ , lib , fetchFromGitea , fetchurl -, fetchpatch , runCommand , fcft , freetype @@ -28,7 +27,7 @@ }: let - version = "1.8.2"; + version = "1.9.0"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -89,6 +88,8 @@ let # using a compiler which foot's PGO build supports (clang or gcc) doPgo = allowPgo && (stdenv.hostPlatform == stdenv.buildPlatform) && compilerName != "unknown"; + + terminfoDir = "${placeholder "terminfo"}/share/terminfo"; in stdenv.mkDerivation rec { pname = "foot"; @@ -99,18 +100,9 @@ stdenv.mkDerivation rec { owner = "dnkl"; repo = pname; rev = version; - sha256 = "1k0alz991cslls4926c5gq02pdq0vfw9jfpprh2a1vb59xgikv7h"; + sha256 = "0mkzq5lbgl5qp5nj8sk5gyg9hrrklmbjdqzlcr2a6rlmilkxlhwm"; }; - patches = [ - # Fixes PGO builds with clang - (fetchpatch { - url = "https://codeberg.org/dnkl/foot/commit/2acd4b34c57659d86dca76c58e4363de9b0a1f17.patch"; - sha256 = "13xi9ppaqx2p88cxbh6801ry9ral70ylh40agn6ij7pklybs4d7s"; - includes = [ "pgo/pgo.c" ]; - }) - ]; - depsBuildBuild = [ pkg-config ]; @@ -154,7 +146,15 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Db_lto=true" - "-Dterminfo-install-location=${placeholder "terminfo"}/share/terminfo" + # Prevent foot from installing its terminfo file into a custom location, + # we need to do this manually in postInstall. + # See https://codeberg.org/dnkl/foot/pulls/673, + # https://codeberg.org/dnkl/foot/src/tag/1.9.0/INSTALL.md#options + "-Dterminfo=disabled" + # Ensure TERM=foot is used + "-Ddefault-terminfo=foot" + # Tell foot what to set TERMINFO to + "-Dcustom-terminfo-install-location=${terminfoDir}" ]; # build and run binary generating PGO profiles, @@ -174,11 +174,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "terminfo" ]; - # make sure nix-env and buildEnv also include the - # terminfo output when the package is installed postInstall = '' - mkdir -p "$out/nix-support" - echo "$terminfo" >> "$out/nix-support/propagated-user-env-packages" + # build and install foot's terminfo to the standard location + # instead of its custom location + mkdir -p "${terminfoDir}" + tic -o "${terminfoDir}" -x -e foot,foot-direct "$NIX_BUILD_TOP/$sourceRoot/foot.info" ''; passthru.tests = { @@ -189,6 +189,10 @@ stdenv.mkDerivation rec { clang-latest-compilation = foot.override { inherit (llvmPackages_latest) stdenv; }; + + noPgo = foot.override { + allowPgo = false; + }; }; meta = with lib; { @@ -198,5 +202,18 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ maintainers.sternenseemann ]; platforms = platforms.linux; + # From (presumably) ncurses version 6.3, it will ship a foot + # terminfo file. This however won't include some non-standard + # capabilities foot's bundled terminfo file contains. Unless we + # want to have some features in e. g. vim or tmux stop working, + # we need to make sure that the foot terminfo overwrites ncurses' + # one. Due to + # ncurses is always added to environment.systemPackages on + # NixOS with its priority increased by 3, so we need to go + # one bigger. + # This doesn't matter a lot for local use since foot sets + # TERMINFO to a store path, but allows installing foot.terminfo + # on remote systems for proper foot terminfo support. + priority = (ncurses.meta.priority or 5) + 3 + 1; }; } 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; 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/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; + }; +} 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; + }; +} 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; { diff --git a/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix b/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix new file mode 100644 index 000000000000..b0a5ca641a41 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: + +rustPlatform.buildRustPackage rec { + pname = "git-cliff"; + version = "0.2.6"; + + src = fetchFromGitHub { + owner = "orhun"; + repo = "git-cliff"; + rev = "v${version}"; + sha256 = "sha256-oQ23jvKR4HGIMnW56FVE0XlBpO4pnMBbRXVoc6OuiHo="; + }; + + cargoSha256 = "sha256-49RHGOhTaYrg+JKYZMWcgSL7dxe6H50G6n9tJyGaLMQ="; + + # attempts to run the program on .git in src which is not deterministic + doCheck = false; + + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + + meta = with lib; { + description = "A highly customizable Changelog Generator that follows Conventional Commit specifications"; + homepage = "https://github.com/orhun/git-cliff"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/gitty/default.nix b/pkgs/applications/version-management/git-and-tools/gitty/default.nix new file mode 100644 index 000000000000..45c0f2635a07 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/gitty/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "gitty"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "muesli"; + repo = "gitty"; + rev = "v${version}"; + sha256 = "1byjcvzimwn6nmhz0agicq7zq0xhkj4idi9apm1mgd3m2l509ivj"; + }; + + vendorSha256 = "1mbl585ja82kss5p8vli3hbykqxa00j8z63ypq6vi464qkh5x3py"; + + ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; + + meta = with lib; { + homepage = "https://github.com/muesli/gitty/"; + description = "Contextual information about your git projects, right on the command-line"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ izorkin ]; + }; +} 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/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index c201ad8805b1..adff564a3c9a 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "lima"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kSJbSJ85cM6N+V67z+trNNuEO4O2KNs62JTy3Mz8Bi4="; + sha256 = "sha256-3Bc8F8L4ac0YoUp2zoQYPsj7hcXKf8SVkE7q6q0MNSs="; }; - vendorSha256 = "sha256-PeIEIUX/PwwnbZfXnK3IsENO+zRYLhljBRe910aZgKs="; + vendorSha256 = "sha256-vYeHv6sSiO6fY+oXR8bFFs/NAhivtnkc15pXEu+reZQ="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index e1f1583d0365..0e83a113e5db 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -15,11 +15,11 @@ with lib; buildGoPackage rec { pname = "singularity"; - version = "3.8.1"; + version = "3.8.2"; src = fetchurl { url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz"; - sha256 = "sha256-Jkg2b7x+j8up0y+PGH6hSTVsX5CDpXgm1kE1n6hBXZo="; + sha256 = "sha256-mWYR3sQCtNNyuLlFbdnsHLQ3EtCFAuRV84UhvRmYVtM="; }; goPackagePath = "github.com/sylabs/singularity"; diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index 1584b7fed019..e4efc13262d2 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , asciidoc , cmake , expat @@ -48,6 +49,15 @@ stdenv.mkDerivation rec { hash = "sha256-R06tiWS9z6K5Nbi+vvk7DyozpcFdrHleMeh7Iq/FfHQ="; }; + patches = [ + # https://github.com/ice-wm/icewm/pull/57 + # Fix trailing -I that leads to "to generate dependencies you must specify either '-M' or '-MM'" + (fetchpatch { + url = "https://github.com/ice-wm/icewm/pull/57/commits/ebd2c45341cc31755758a423392a0f78a64d2d37.patch"; + sha256 = "16m9znd3ijcfl7la3l27ac3clx8l9qng3fprkpxqcifd89ny1ml5"; + }) + ]; + nativeBuildInputs = [ asciidoc cmake diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 26b38582e992..324b23782187 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "193a13be44c51ebfc8e991b7bb53a4065129ff4d", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/193a13be44c51ebfc8e991b7bb53a4065129ff4d.tar.gz", - "sha256": "08j6qx3jqcw7ydwnpjr132l2mlpq6dqvwqgm3gq0ym4kjzrbdwsd", - "msg": "Update from Hackage at 2021-08-23T13:50:03Z" + "commit": "182ca4558e20c333fb3f4c659b2af4267d4d9b46", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/182ca4558e20c333fb3f4c659b2af4267d4d9b46.tar.gz", + "sha256": "123dr3lza56nj7s53m37zm2qfvwl2qvrr2prwl0q32wzidfc12w9", + "msg": "Update from Hackage at 2021-09-03T13:28:39Z" } diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix index 529596cd6e17..510da6c83d94 100644 --- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -50,6 +50,7 @@ , vte , glib-networking , qemu-utils +, qemu }: stdenv.mkDerivation rec { @@ -121,7 +122,7 @@ stdenv.mkDerivation rec { ]; preFixup = '' - gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ mtools cdrkit libcdio qemu-utils ]}") + gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ mtools cdrkit libcdio qemu-utils qemu ]}") ''; postPatch = '' diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index 58a4dfbe36e1..a1598d3d3f07 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -147,6 +147,7 @@ stdenv.mkDerivation ({ else "") + lib.optionalString targetPlatform.isAvr '' makeFlagsArray+=( + '-s' # workaround for hitting hydra log limit 'LIMITS_H_TEST=false' ) ''; diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix index 15d935618712..7b7f542de0cf 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -152,6 +152,7 @@ stdenv.mkDerivation ({ else "") + lib.optionalString targetPlatform.isAvr '' makeFlagsArray+=( + '-s' # workaround for hitting hydra log limit 'LIMITS_H_TEST=false' ) ''; diff --git a/pkgs/development/compilers/ghc/8.10.2-binary.nix b/pkgs/development/compilers/ghc/8.10.2-binary.nix index 824794774cec..c21096b5920e 100644 --- a/pkgs/development/compilers/ghc/8.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/8.10.2-binary.nix @@ -374,6 +374,8 @@ stdenv.mkDerivation rec { # `pkgsMusl`. platforms = builtins.attrNames ghcBinDists.${distSetName}; hydraPlatforms = builtins.filter (p: minimal || p != "aarch64-linux") platforms; - maintainers = with lib.maintainers; [ lostnet guibou ]; + maintainers = with lib.maintainers; [ + guibou + ] ++ lib.teams.haskell.members; }; } diff --git a/pkgs/development/compilers/ghc/8.10.7-binary.nix b/pkgs/development/compilers/ghc/8.10.7-binary.nix index 34643dd2f87c..ad106f2f2a54 100644 --- a/pkgs/development/compilers/ghc/8.10.7-binary.nix +++ b/pkgs/development/compilers/ghc/8.10.7-binary.nix @@ -386,6 +386,9 @@ stdenv.mkDerivation rec { # `pkgsMusl`. platforms = builtins.attrNames ghcBinDists.${distSetName}; hydraPlatforms = builtins.filter (p: minimal || p != "aarch64-linux") platforms; - maintainers = with lib.maintainers; [ lostnet ]; + maintainers = with lib.maintainers; [ + prusnak + domenkozar + ] ++ lib.teams.haskell.members; }; } diff --git a/pkgs/development/compilers/ghc/8.10.7.nix b/pkgs/development/compilers/ghc/8.10.7.nix index ce16ed80b45b..7af598da1dfd 100644 --- a/pkgs/development/compilers/ghc/8.10.7.nix +++ b/pkgs/development/compilers/ghc/8.10.7.nix @@ -314,7 +314,9 @@ stdenv.mkDerivation (rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = with lib.maintainers; [ marcweber andres peti guibou ]; + maintainers = with lib.maintainers; [ + guibou + ] ++ lib.teams.haskell.members; timeout = 24 * 3600; inherit (ghc.meta) license platforms; diff --git a/pkgs/development/compilers/ghc/8.6.5-binary.nix b/pkgs/development/compilers/ghc/8.6.5-binary.nix index c2fac6faf774..d30275dee124 100644 --- a/pkgs/development/compilers/ghc/8.6.5-binary.nix +++ b/pkgs/development/compilers/ghc/8.6.5-binary.nix @@ -192,6 +192,8 @@ stdenv.mkDerivation rec { hydraPlatforms = builtins.filter (p: p != "aarch64-linux") platforms; # build segfaults, use ghc8102Binary which has proper musl support instead broken = stdenv.hostPlatform.isMusl; - maintainers = with lib.maintainers; [ guibou ]; + maintainers = with lib.maintainers; [ + guibou + ] ++ lib.teams.haskell.members; }; } diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix index 9bf03bae7d74..81c5a8811ce6 100644 --- a/pkgs/development/compilers/ghc/8.8.4.nix +++ b/pkgs/development/compilers/ghc/8.8.4.nix @@ -317,7 +317,9 @@ stdenv.mkDerivation (rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = with lib.maintainers; [ marcweber andres peti guibou ]; + maintainers = with lib.maintainers; [ + guibou + ] ++ lib.teams.haskell.members; timeout = 24 * 3600; inherit (ghc.meta) license platforms; diff --git a/pkgs/development/compilers/ghc/9.0.1.nix b/pkgs/development/compilers/ghc/9.0.1.nix index fe553dc1e580..af740c01f5bf 100644 --- a/pkgs/development/compilers/ghc/9.0.1.nix +++ b/pkgs/development/compilers/ghc/9.0.1.nix @@ -298,7 +298,9 @@ stdenv.mkDerivation (rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = with lib.maintainers; [ marcweber andres peti guibou ]; + maintainers = with lib.maintainers; [ + guibou + ] ++ lib.teams.haskell.members; timeout = 24 * 3600; inherit (ghc.meta) license platforms; diff --git a/pkgs/development/compilers/ghc/9.2.1.nix b/pkgs/development/compilers/ghc/9.2.1.nix index 4664ed834f57..b565870addb2 100644 --- a/pkgs/development/compilers/ghc/9.2.1.nix +++ b/pkgs/development/compilers/ghc/9.2.1.nix @@ -301,7 +301,9 @@ stdenv.mkDerivation (rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = with lib.maintainers; [ marcweber andres peti guibou ]; + maintainers = with lib.maintainers; [ + guibou + ] ++ lib.teams.haskell.members; timeout = 24 * 3600; inherit (ghc.meta) license platforms; @@ -311,6 +313,7 @@ stdenv.mkDerivation (rec { # https://gitlab.haskell.org/ghc/ghc/-/issues/19950#note_373726 broken = (enableIntegerSimple && hostPlatform.isMusl) || stdenv.hostPlatform.isDarwin; + hydraPlatforms = lib.remove "x86_64-darwin" ghc.meta.platforms; }; } // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index fe5e90d64579..f2c965ebe47a 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -319,7 +319,9 @@ stdenv.mkDerivation (rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = with lib.maintainers; [ marcweber andres peti guibou ]; + maintainers = with lib.maintainers; [ + guibou + ] ++ lib.teams.haskell.members; timeout = 24 * 3600; inherit (ghc.meta) license platforms; # ghcHEAD times out on aarch64-linux on Hydra. diff --git a/pkgs/development/haskell-modules/HACKING.md b/pkgs/development/haskell-modules/HACKING.md index 9024a90a09da..b53fa3d73e06 100644 --- a/pkgs/development/haskell-modules/HACKING.md +++ b/pkgs/development/haskell-modules/HACKING.md @@ -75,7 +75,7 @@ The short version is this: --- -This is the follow-up to #TODO. +This is the follow-up to #TODO. Come to [#haskell:nixos.org](https://matrix.to/#/#haskell:nixos.org) if you have any questions. ``` Make sure to replace all TODO with the actual values. diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 069b90f04372..cee85a22ba3a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1112,34 +1112,13 @@ self: super: { # Therefore we jailbreak it. hakyll-contrib-hyphenation = doJailbreak super.hakyll-contrib-hyphenation; - # Jailbreak due to bounds on multiple dependencies, - # bound on pandoc needs to be patched since it is conditional - hakyll = doJailbreak (overrideCabal super.hakyll (drv: { - patches = [ - # Remove when Hakyll > 4.14.0.0 - (pkgs.fetchpatch { - url = "https://github.com/jaspervdj/hakyll/commit/0dc6127d81ff688e27c36ce469230320eee60246.patch"; - sha256 = "sha256-YyRz3bAmIBODTEeS5kGl2J2x31SjiPoLzUZUlo3nHvQ="; - }) - # Remove when Hakyll > 4.14.0.0 - (pkgs.fetchpatch { - url = "https://github.com/jaspervdj/hakyll/commit/af9e29b5456c105dc948bc46c93e989a650b5ed1.patch"; - sha256 = "sha256-ghc0V5L9OybNHWKmM0vhjRBN2rIvDlp+ClcK/aQst44="; - }) - # Remove when Hakyll > 4.14.0.0 - (pkgs.fetchpatch { - url = "https://github.com/jaspervdj/hakyll/commit/e0c63558a82ac4347181d5d77dce7f763a1db410.patch"; - sha256 = "sha256-wYlxJmq56YQ29vpVsQhO+JdL0GBezCAfkdhIdFnLYsc="; - }) - ]; - })); - # 2020-06-22: NOTE: > 0.4.0 => rm Jailbreak: https://github.com/serokell/nixfmt/issues/71 nixfmt = doJailbreak super.nixfmt; # The test suite depends on an impure cabal-install installation in # $HOME, which we don't have in our build sandbox. cabal-install-parsers = dontCheck super.cabal-install-parsers; + cabal-install-parsers_0_4_2 = dontCheck super.cabal-install-parsers_0_4_2; # 2021-08-18: Erroneously claims that it needs a newer HStringTemplate (>= 0.8.8) than stackage. gitit = doJailbreak super.gitit; @@ -1785,8 +1764,11 @@ self: super: { # 2021-05-09 haskell-ci pins ShellCheck 0.7.1 # https://github.com/haskell-CI/haskell-ci/issues/507 + # 2021-09-05 haskell-ci needs Cabal 3.4, + # cabal-install-parsers uses Cabal 3.6 since 0.4.3 haskell-ci = super.haskell-ci.override { ShellCheck = self.ShellCheck_0_7_1; + cabal-install-parsers = self.cabal-install-parsers_0_4_2; }; Frames-streamly = overrideCabal (super.Frames-streamly.override { relude = super.relude_1_0_0_1; }) (drv: { @@ -1950,12 +1932,9 @@ EOT # 2021-08-18: streamly-posix was released with hspec 2.8.2, but it works with older versions too. streamly-posix = doJailbreak super.streamly-posix; - distribution-nixpkgs = assert super.distribution-nixpkgs.version == "1.6.0"; - overrideCabal super.distribution-nixpkgs { - version = "1.6.1"; - revision = null; - sha256 = "136q893in07iw53m9pqr65h3mrnpvfda272bl4rq1b0z3hzpyhkm"; - editedCabalFile = null; - }; + # 2021-09-06: hadolint depends on language-docker >= 10.1 + hadolint = super.hadolint.override { + language-docker = self.language-docker_10_1_1; + }; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 5ef659349b38..6a7ad8a0492a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -48,8 +48,13 @@ self: super: { base16-bytestring = self.base16-bytestring_0_1_1_7; }); - # cabal-install-parsers is written for Cabal 3.4 - cabal-install-parsers = super.cabal-install-parsers.override { Cabal = super.Cabal_3_4_0_0; }; + # cabal-install-parsers is written for Cabal 3.6 + cabal-install-parsers = super.cabal-install-parsers.override { Cabal = super.Cabal_3_6_0_0; }; + + # older version of cabal-install-parsers for reverse dependencies that use Cabal 3.4 + cabal-install-parsers_0_4_2 = super.cabal-install-parsers_0_4_2.override { + Cabal = self.Cabal_3_4_0_0; + }; # Jailbreak to fix the build. base-noprelude = doJailbreak super.base-noprelude; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 08431ee0dd39..bb530b765b49 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -99,7 +99,7 @@ self: super: { darcs = dontDistribute super.darcs; # The package needs the latest Cabal version. - cabal-install-parsers = super.cabal-install-parsers.overrideScope (self: super: { Cabal = self.Cabal_3_2_1_0; }); + cabal-install-parsers = super.cabal-install-parsers.overrideScope (self: super: { Cabal = self.Cabal_3_6_0_0; }); # cabal-fmt requires Cabal3 cabal-fmt = super.cabal-fmt.override { Cabal = self.Cabal_3_2_1_0; }; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index f549dfbce1ad..c69f2fc9c973 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -43,6 +43,9 @@ self: super: { unix = null; xhtml = null; + # 0.12.0 introduces support for 9.2 + base-compat = self.base-compat_0_12_0; + # cabal-install needs more recent versions of Cabal and base16-bytestring. cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: { Cabal = null; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 8a13571f0a17..4af51fc79a5b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1586,6 +1586,7 @@ broken-packages: - getflag - GGg - ggtsTC + - ghc-bignum-orphans - ghc-clippy-plugin - ghc-core-smallstep - ghc-datasize @@ -2536,7 +2537,6 @@ broken-packages: - IsNull - iso8601-duration - isobmff - - isocline - isotope - itcli - itemfield @@ -2656,6 +2656,7 @@ broken-packages: - KSP - ktx - ktx-codec + - kubernetes-client - kuifje - kure - kure-your-boilerplate @@ -2664,7 +2665,6 @@ broken-packages: - lagrangian - lambda2js - lambdaBase - - lambdabot-social-plugins - lambdabot-utils - lambda-bridge - lambda-canvas @@ -2718,6 +2718,7 @@ broken-packages: - layers - layout - layout-bootstrap + - lazify - lazyarray - lazyboy - lazy-priority-queue @@ -3110,6 +3111,7 @@ broken-packages: - monopati - months - monus + - monus-weighted-search - monzo - morfette - morfeusz @@ -3196,6 +3198,7 @@ broken-packages: - nanomsg-haskell - nanoparsec - NanoProlog + - nanovg-simple - nanq - naperian - naqsha @@ -3588,9 +3591,11 @@ broken-packages: - phoityne - phone-numbers - phone-push + - phonetic-languages-plus - phonetic-languages-properties - phonetic-languages-simplified-properties-lists - phonetic-languages-simplified-properties-lists-double + - phonetic-languages-ukrainian-array - phraskell - Phsu - phybin @@ -3800,6 +3805,7 @@ broken-packages: - provenience - proxy-kindness - proxy-mapping + - prune-juice - pseudo-trie - PTQ - publicsuffixlistcreate @@ -5212,6 +5218,7 @@ broken-packages: - weighted-regexp - welshy - werewolf + - wgpu-hs - Wheb - while-lang-parser - whim diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 7637972c07fd..6e77dc353923 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -92,6 +92,8 @@ default-package-overrides: - streamly-process # dhall-nix is not part of stackage, remove if dhall >= 1.40 - dhall-nix < 1.1.22 + # reflex-dom-pandoc is only used by neuron which needs a version < 1.0.0.0 + - reflex-dom-pandoc < 1.0.0.0 extra-packages: - base16-bytestring < 1 # required for cabal-install etc. @@ -119,6 +121,7 @@ extra-packages: - sbv == 7.13 # required for pkgs.petrinizer - crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses - ShellCheck == 0.7.1 # 2021-05-09: haskell-ci 0.12.1 pins this version + - cabal-install-parsers == 0.4.2 # 2021-09-04: needed haskell-ci by until it upgrades to Cabal >= 3.6 - ghc-api-compat < 8.10.5 # 2021-08-18: ghc-api-compat 8.10.5 is only compatible with ghc 8.10.5 package-maintainers: @@ -240,6 +243,8 @@ package-maintainers: - streamly - taskwarrior - witch + ncfavier: + - lambdabot pacien: - ldgallery-compiler peti: diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index cb8c927bad33..30d76b259f39 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 18.7 +# Stackage LTS 18.8 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -140,7 +140,7 @@ default-package-overrides: - amazonka-workspaces ==1.6.1 - amazonka-xray ==1.6.1 - amqp ==0.22.0 - - amqp-utils ==0.6.1.1 + - amqp-utils ==0.6.2.2 - annotated-wl-pprint ==0.7.0 - ansi-terminal ==0.11 - ansi-wl-pprint ==0.6.9 @@ -491,7 +491,7 @@ default-package-overrides: - crackNum ==3.1 - crc32c ==0.0.0 - credential-store ==0.1.2 - - criterion ==1.5.9.0 + - criterion ==1.5.10.0 - criterion-measurement ==0.1.3.0 - cron ==0.7.0 - crypto-api ==0.13.3 @@ -596,7 +596,7 @@ default-package-overrides: - dhall ==1.39.0 - dhall-bash ==1.0.37 - dhall-json ==1.7.7 - - dhall-lsp-server ==1.0.15 + - dhall-lsp-server ==1.0.16 - dhall-yaml ==1.2.7 - diagrams-solve ==0.1.3 - dialogflow-fulfillment ==0.1.1.4 @@ -885,20 +885,20 @@ default-package-overrides: - geojson ==4.0.2 - getopt-generics ==0.13.0.4 - ghc-byteorder ==4.11.0.0.10 - - ghc-check ==0.5.0.5 + - ghc-check ==0.5.0.6 - ghc-core ==0.5.6 - ghc-events ==0.17.0 - ghc-exactprint ==0.6.4 - ghcid ==0.8.7 - ghci-hexcalc ==0.1.1.0 - ghcjs-codemirror ==0.0.0.2 - - ghc-lib ==8.10.6.20210814 - - ghc-lib-parser ==8.10.6.20210814 - - ghc-lib-parser-ex ==8.10.0.22 + - ghc-lib ==8.10.7.20210828 + - ghc-lib-parser ==8.10.7.20210828 + - ghc-lib-parser-ex ==8.10.0.23 - ghc-parser ==0.2.3.0 - ghc-paths ==0.1.0.12 - ghc-prof ==1.4.1.9 - - ghc-source-gen ==0.4.1.0 + - ghc-source-gen ==0.4.2.0 - ghc-syntax-highlighter ==0.0.6.0 - ghc-tcplugins-extra ==0.4.2 - ghc-trace-events ==0.1.2.3 @@ -1135,7 +1135,7 @@ default-package-overrides: - hspec-wai-json ==0.11.0 - hs-php-session ==0.0.9.3 - hsshellscript ==3.5.0 - - hs-tags ==0.1.5 + - hs-tags ==0.1.5.1 - HStringTemplate ==0.8.8 - HSvm ==0.1.1.3.22 - HsYAML ==0.2.1.0 @@ -1155,7 +1155,7 @@ default-package-overrides: - http-client-openssl ==0.3.2.0 - http-client-overrides ==0.1.1.0 - http-client-tls ==0.3.5.3 - - http-common ==0.8.2.1 + - http-common ==0.8.3.4 - http-conduit ==2.3.8 - http-date ==0.0.11 - http-directory ==0.1.8 @@ -1165,7 +1165,7 @@ default-package-overrides: - http-media ==0.8.0.0 - http-query ==0.1.0.1 - http-reverse-proxy ==0.6.0 - - http-streams ==0.8.8.1 + - http-streams ==0.8.9.4 - http-types ==0.12.3 - human-readable-duration ==0.2.1.4 - HUnit ==1.6.2.0 @@ -1248,11 +1248,11 @@ default-package-overrides: - inliterate ==0.1.0 - input-parsers ==0.2.3 - insert-ordered-containers ==0.2.5 - - inspection-testing ==0.4.5.0 + - inspection-testing ==0.4.6.0 - instance-control ==0.1.2.0 - int-cast ==0.2.0.0 - integer-logarithms ==1.0.3.1 - - integer-roots ==1.0 + - integer-roots ==1.0.0.1 - integration ==0.2.1 - intern ==0.9.4 - interpolate ==0.2.1 @@ -1639,7 +1639,7 @@ default-package-overrides: - nonce ==1.0.7 - nondeterminism ==1.4 - non-empty ==0.3.3 - - nonempty-containers ==0.3.4.1 + - nonempty-containers ==0.3.4.3 - nonemptymap ==0.0.6.0 - non-empty-sequence ==0.2.0.4 - nonempty-vector ==0.2.1.0 @@ -1818,7 +1818,7 @@ default-package-overrides: - posix-paths ==0.3.0.0 - possibly ==1.0.0.0 - postgres-options ==0.2.0.0 - - postgresql-binary ==0.12.4 + - postgresql-binary ==0.12.4.1 - postgresql-libpq ==0.9.4.3 - postgresql-libpq-notify ==0.2.0.0 - postgresql-orm ==0.5.1 @@ -1865,7 +1865,7 @@ default-package-overrides: - project-template ==0.2.1.0 - prometheus ==2.2.2 - prometheus-client ==1.0.1 - - prometheus-metrics-ghc ==1.0.1.1 + - prometheus-metrics-ghc ==1.0.1.2 - prometheus-wai-middleware ==1.0.1.0 - promises ==0.3 - prompt ==0.1.1.2 @@ -2035,7 +2035,7 @@ default-package-overrides: - safe-foldable ==0.1.0.0 - safeio ==0.0.5.0 - safe-json ==1.1.1.1 - - safe-money ==0.9 + - safe-money ==0.9.1 - SafeSemaphore ==0.10.1 - safe-tensor ==0.2.1.1 - saltine ==0.1.1.1 @@ -2237,7 +2237,7 @@ default-package-overrides: - stm-delay ==0.1.1.1 - stm-extras ==0.1.0.3 - stm-lifted ==2.5.0.0 - - STMonadTrans ==0.4.5 + - STMonadTrans ==0.4.6 - stm-split ==0.0.2.1 - stopwatch ==0.1.0.6 - storable-complex ==0.2.3.0 @@ -2318,7 +2318,7 @@ default-package-overrides: - tar ==0.5.1.1 - tar-conduit ==0.3.2 - tardis ==0.4.3.0 - - tasty ==1.4.1 + - tasty ==1.4.2 - tasty-ant-xml ==1.1.8 - tasty-bench ==0.2.5 - tasty-dejafu ==2.0.0.8 @@ -2373,7 +2373,7 @@ default-package-overrides: - text-ldap ==0.1.1.13 - textlocal ==0.1.0.5 - text-manipulate ==0.3.0.0 - - text-metrics ==0.3.0 + - text-metrics ==0.3.1 - text-postgresql ==0.0.3.1 - text-printer ==0.5.0.1 - text-regex-replace ==0.1.1.4 @@ -2459,7 +2459,7 @@ default-package-overrides: - triplesec ==0.2.2.1 - trivial-constraint ==0.7.0.0 - tsv2csv ==0.1.0.2 - - ttc ==1.1.0.1 + - ttc ==1.1.0.2 - ttl-hashtables ==1.4.1.0 - ttrie ==0.1.2.1 - tuple ==0.3.0.2 @@ -2602,7 +2602,7 @@ default-package-overrides: - wai-middleware-auth ==0.2.5.1 - wai-middleware-caching ==0.1.0.2 - wai-middleware-clacks ==0.1.0.1 - - wai-middleware-prometheus ==1.0.0 + - wai-middleware-prometheus ==1.0.0.1 - wai-middleware-static ==0.9.0 - wai-rate-limit ==0.1.0.0 - wai-rate-limit-redis ==0.1.0.0 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index d44ef0dafcc8..3ac2adbf56c2 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -962,6 +962,7 @@ dont-distribute-packages: - distribution-plot - dixi - dl-fedora + - dl-fedora_0_9_1 - dmenu-pkill - dmenu-pmount - dmenu-search @@ -979,6 +980,7 @@ dont-distribute-packages: - dph-prim-interface - dph-prim-par - dph-prim-seq + - dprox - dropbox-sdk - dropsolve - dsh-sql @@ -1232,6 +1234,7 @@ dont-distribute-packages: - gnss-converters - gnuidn - goal-geometry + - goal-graphical - goal-probability - goal-simulation - goat @@ -1698,6 +1701,7 @@ dont-distribute-packages: - ideas-math - ideas-math-types - ideas-statistics + - if-instance - ige-mac-integration - ihaskell-inline-r - ihaskell-rlangqq @@ -1865,8 +1869,6 @@ dont-distribute-packages: - lambda-options - lambdaFeed - lambdaLit - - lambdabot - - lambdabot-xmpp - lambdabot-zulip - lambdacms-media - lambdacube @@ -2302,6 +2304,10 @@ dont-distribute-packages: - peyotls-codec - pgsql-simple - phonetic-languages-examples + - phonetic-languages-general + - phonetic-languages-simplified-examples-array + - phonetic-languages-simplified-examples-common + - phonetic-languages-simplified-generalized-examples-array - phonetic-languages-simplified-lists-examples - phooey - photoname diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 3553b4fe6a13..1f15b4cdda7c 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -950,4 +950,8 @@ self: super: builtins.intersectAttrs super { }) ) ); + + # Test suite is just the default example executable which doesn't work if not + # executed by Setup.hs, but works if started on a proper TTY + isocline = dontCheck super.isocline; } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 22c4b4143c89..848ec4f89e83 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -11590,8 +11590,8 @@ self: { }: mkDerivation { pname = "Jikka"; - version = "5.3.0.0"; - sha256 = "0njy5mgzbpvqdqp343a7bh69sdrmvfd57skr3qwma7dya5m12v2r"; + version = "5.4.0.0"; + sha256 = "0qajwn7sxiz2smk0d2fjy81ni5pzmv6nv05ln7j3cgh6dkx20jxz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -11795,8 +11795,8 @@ self: { pname = "JuicyPixels-scale-dct"; version = "0.1.2"; sha256 = "04rhrmjnh12hh2nz04k245avgdcwqfyjnsbpcrz8j9328j41nf7p"; - revision = "6"; - editedCabalFile = "0np8wqf0s0pwqnjfhs8zw9h133p2x173xbv984c4dn5a1xhn0azq"; + revision = "7"; + editedCabalFile = "12ylqc5xi7jhgdsq8dbxm4v6llbi1km78zam962052b5s81d00qw"; libraryHaskellDepends = [ base base-compat carray fft JuicyPixels ]; @@ -12729,6 +12729,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "ListLike_4_7_6" = callPackage + ({ mkDerivation, array, base, bytestring, containers, deepseq + , dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string + , vector + }: + mkDerivation { + pname = "ListLike"; + version = "4.7.6"; + sha256 = "08jip0q2f9qc95wcqka2lrqpf8r7sswsi5104w73kyrbmfirqnrd"; + libraryHaskellDepends = [ + array base bytestring containers deepseq dlist fmlist text + utf8-string vector + ]; + testHaskellDepends = [ + array base bytestring containers dlist fmlist HUnit QuickCheck + random text utf8-string vector + ]; + description = "Generalized support for list-like structures"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ListT" = callPackage ({ mkDerivation, base, smallcheck, tasty, tasty-smallcheck , transformers, util @@ -17760,22 +17782,6 @@ self: { }) {}; "STMonadTrans" = callPackage - ({ mkDerivation, array, base, mtl, tasty, tasty-hunit - , tasty-quickcheck, transformers - }: - mkDerivation { - pname = "STMonadTrans"; - version = "0.4.5"; - sha256 = "0kly2zjizk8m84jzmkd93h6qpqgb03i4cjhm9q7rzr284qn5x09m"; - libraryHaskellDepends = [ array base mtl ]; - testHaskellDepends = [ - array base tasty tasty-hunit tasty-quickcheck transformers - ]; - description = "A monad transformer version of the ST monad"; - license = lib.licenses.bsd3; - }) {}; - - "STMonadTrans_0_4_6" = callPackage ({ mkDerivation, array, base, mtl, tasty, tasty-hunit , tasty-quickcheck, transformers }: @@ -17789,7 +17795,6 @@ self: { ]; description = "A monad transformer version of the ST monad"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "SVD2HS" = callPackage @@ -24408,8 +24413,8 @@ self: { pname = "aeson"; version = "1.5.6.0"; sha256 = "1s5z4bgb5150h6a4cjf5vh8dmyrn6ilh29gh05999v6jwd5w6q83"; - revision = "1"; - editedCabalFile = "1y7ddmghsjblsxaj1wyif66wrw0vvp2dca5i7v9rqk33z1r6iryk"; + revision = "2"; + editedCabalFile = "1zxkarvmbgc2cpcc9sx1rlqm7nfh473052898ypiwk8azawp1hbj"; libraryHaskellDepends = [ attoparsec base base-compat-batteries bytestring containers data-fix deepseq dlist ghc-prim hashable primitive scientific @@ -24564,8 +24569,8 @@ self: { pname = "aeson-compat"; version = "0.3.9"; sha256 = "1j13gykv4ryvmr14w5blz0nnpdb4p0hpa27wahw3mhb1lwdr8hz0"; - revision = "6"; - editedCabalFile = "18ni5j2zvn7qfdama9j1s84kz9ylsnjmi5ynbq68mpri5wimm448"; + revision = "7"; + editedCabalFile = "15aflmqs5y0yg2p4042yvnhxyp11ndlihs1dxj21bxfdzd1bbkrn"; libraryHaskellDepends = [ aeson attoparsec attoparsec-iso8601 base base-compat bytestring containers exceptions hashable scientific tagged text time @@ -24691,8 +24696,8 @@ self: { pname = "aeson-extra"; version = "0.5"; sha256 = "0nlp6bwb8zynfncfzr05fi9acfs8n2fkz4anm2c0g97dk2ziq213"; - revision = "1"; - editedCabalFile = "1x1fh0zgb0y3w7wf94zznbmdmbxs0b5n7prfw324g3kzhi428s3d"; + revision = "2"; + editedCabalFile = "02c6rjwm8dyijfcj2wvhx1s9pd3d37g9yqgih4x80na533naps31"; libraryHaskellDepends = [ aeson attoparsec attoparsec-iso8601 base base-compat-batteries bytestring containers deepseq exceptions hashable parsec @@ -24961,8 +24966,8 @@ self: { pname = "aeson-optics"; version = "1.1.0.1"; sha256 = "1pfi84cl7w5bp7dwdhcyi8kchvbfjybqcp0sifqrn70dj2b50mf7"; - revision = "5"; - editedCabalFile = "102mdf74ka25qnw45282j7c4ds3v4mppa3g1mp1hr0hf0f2ya3bk"; + revision = "6"; + editedCabalFile = "1id12jhwlgx1gckxjzap4rm3n495fm57ja47gas5r8v2j5ky8lic"; libraryHaskellDepends = [ aeson attoparsec base base-compat bytestring optics-core optics-extra scientific text unordered-containers vector @@ -29823,19 +29828,19 @@ self: { "amqp-utils" = callPackage ({ mkDerivation, amqp, base, bytestring, connection, containers - , data-default-class, directory, hinotify, magic, network, process - , text, time, tls, unix, utf8-string, x509-system + , data-default-class, directory, filepath, hinotify, magic, network + , process, text, time, tls, unix, utf8-string, x509-system }: mkDerivation { pname = "amqp-utils"; - version = "0.6.1.1"; - sha256 = "1lffc76ybvk73k57qn5m6788m2nkfsqavs7mfs1kaqw38pya940c"; + version = "0.6.2.2"; + sha256 = "03hc962z1q9gpaa7955y71wyzh1gaazrfcpw8wzacll3p28fdnpx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ amqp base bytestring connection containers data-default-class - directory hinotify magic network process text time tls unix - utf8-string x509-system + directory filepath hinotify magic network process text time tls + unix utf8-string x509-system ]; description = "AMQP toolset for the command line"; license = lib.licenses.gpl3Only; @@ -32940,6 +32945,8 @@ self: { pname = "arithmetic-circuits"; version = "0.2.0"; sha256 = "09fqcg8302dklzlr3fqlac09zzfws3li45nri4cd886cx8b1vzzq"; + revision = "2"; + editedCabalFile = "0386y15pncrafpvm5k10ipxhx09vbkjl3yj9z3895j5n1bpdn7f4"; libraryHaskellDepends = [ aeson base bulletproofs containers elliptic-curve filepath galois-fft galois-field MonadRandom poly process-extras protolude @@ -35065,6 +35072,17 @@ self: { broken = true; }) {}; + "attenuation" = callPackage + ({ mkDerivation, base, profunctors }: + mkDerivation { + pname = "attenuation"; + version = "0.1.0.0"; + sha256 = "0swiqnh34654rljydbd91nbkpgi1x816b7y3f57i4qnync29nsd0"; + libraryHaskellDepends = [ base profunctors ]; + description = "Representational subtyping relations and variance roles"; + license = lib.licenses.asl20; + }) {}; + "attic-schedule" = callPackage ({ mkDerivation, attoparsec, base, control-bool, doctest, foldl , protolude, system-filepath, text, time, turtle @@ -35319,8 +35337,8 @@ self: { pname = "attoparsec-iso8601"; version = "1.0.2.0"; sha256 = "162gc101mwhmjbfhhv1wm3yvk2h4ra34wpw5x87735cfqxvjv582"; - revision = "1"; - editedCabalFile = "1c43ynmjfljp3nsp67521nrnb0d4vzwr33dfqf15xh02gifcf9ma"; + revision = "2"; + editedCabalFile = "18557xy5gvkhj0sb35wwxmhqirkiqrkwm0y0pqygsr0aimccs5zm"; libraryHaskellDepends = [ attoparsec base base-compat-batteries text time time-compat ]; @@ -38216,6 +38234,18 @@ self: { license = lib.licenses.mit; }) {}; + "base-compat_0_12_0" = callPackage + ({ mkDerivation, base, unix }: + mkDerivation { + pname = "base-compat"; + version = "0.12.0"; + sha256 = "1fb8lszh8bc4158bc3lyhzakjsjx5l7sa3598zg0zzcrnzb75axp"; + libraryHaskellDepends = [ base unix ]; + description = "A compatibility layer for base"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "base-compat-batteries" = callPackage ({ mkDerivation, base, base-compat, hspec, hspec-discover , QuickCheck @@ -38231,6 +38261,24 @@ self: { license = lib.licenses.mit; }) {}; + "base-compat-batteries_0_12_0" = callPackage + ({ mkDerivation, base, base-compat, hspec, hspec-discover + , QuickCheck + }: + mkDerivation { + pname = "base-compat-batteries"; + version = "0.12.0"; + sha256 = "02j5v1xcj383nfjg1r3y0py4ahy8mhigkkabqvij5a5lfdbalkfs"; + revision = "1"; + editedCabalFile = "17wd527f6ssylwg81f51s45mpp2k3b3zb0j5a6xd6z682x2pj97b"; + libraryHaskellDepends = [ base base-compat ]; + testHaskellDepends = [ base hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "base-compat with extra batteries"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "base-compat-migrate" = callPackage ({ mkDerivation, base, base-compat }: mkDerivation { @@ -38330,6 +38378,21 @@ self: { license = lib.licenses.mit; }) {}; + "base-orphans_0_8_5" = callPackage + ({ mkDerivation, base, ghc-prim, hspec, hspec-discover, QuickCheck + }: + mkDerivation { + pname = "base-orphans"; + version = "0.8.5"; + sha256 = "1lw1jhrrsdq7x9wr2bwkxq9mscidcad0n30kh9gfk8kgifl5xh9k"; + libraryHaskellDepends = [ base ghc-prim ]; + testHaskellDepends = [ base hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "Backwards-compatible orphan instances for base"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "base-prelude" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -38688,8 +38751,8 @@ self: { pname = "base64-bytestring-type"; version = "1.0.1"; sha256 = "03kq4rjj6by02rf3hg815jfdqpdk0xygm5f46r2pn8mb99yd01zn"; - revision = "8"; - editedCabalFile = "196m1ylkl9d03iymld08fhfnfcdydzd824v7ffl67ijmfxcvzcyn"; + revision = "9"; + editedCabalFile = "003vi0psr8s5whjy1qw43swiw1g1l1mxa962xqz9fdpxbmvlanfy"; libraryHaskellDepends = [ aeson base base-compat base64-bytestring binary bytestring cereal deepseq hashable http-api-data QuickCheck serialise text @@ -39973,8 +40036,8 @@ self: { }: mkDerivation { pname = "bencoding"; - version = "0.4.5.2"; - sha256 = "1q0v56jj5vdhd5qgs8kwnbnb4wz84bn7ghnki8c36k6hsm1f56kq"; + version = "0.4.5.3"; + sha256 = "0sj69g4a68bv43vgmqdgp2nzi30gzp4lgz78hg1rdhind8lxrvp9"; libraryHaskellDepends = [ attoparsec base bytestring deepseq ghc-prim integer-gmp mtl pretty text @@ -42602,33 +42665,32 @@ self: { }) {}; "bishbosh" = callPackage - ({ mkDerivation, array, base, Cabal, containers, data-default - , deepseq, directory, extra, factory, filepath, HUnit, hxt - , hxt-relaxng, mtl, parallel, polyparse, QuickCheck, random, time - , toolshed, unix + ({ mkDerivation, array, base, containers, data-default, deepseq + , directory, extra, factory, filepath, HUnit, hxt, hxt-relaxng, mtl + , parallel, polyparse, process, QuickCheck, random, time, toolshed + , unix }: mkDerivation { pname = "bishbosh"; - version = "0.0.0.8"; - sha256 = "0mk0mki02m8nvk667wbrk954qnb6qxdfzyz10bfcyvfbz1afg702"; + version = "0.1.0.0"; + sha256 = "0hri2bkydcffs2d9xjsr1gc16rl75g4vymjvgd8gr35p01zdc9mq"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - array base Cabal containers data-default deepseq extra factory - filepath hxt mtl parallel polyparse random time toolshed + array base containers data-default deepseq extra factory filepath + hxt mtl parallel polyparse process random time toolshed ]; executableHaskellDepends = [ - array base Cabal containers data-default deepseq directory extra - factory filepath hxt hxt-relaxng mtl parallel polyparse random time - toolshed unix + array base containers data-default deepseq directory extra factory + filepath hxt hxt-relaxng mtl process random time toolshed unix ]; testHaskellDepends = [ - array base Cabal containers data-default extra filepath HUnit hxt + array base containers data-default deepseq extra filepath HUnit hxt mtl polyparse QuickCheck random toolshed ]; description = "Plays chess"; - license = "GPL"; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -43696,8 +43758,8 @@ self: { pname = "blank-canvas"; version = "0.7.3"; sha256 = "1g10959ly5nv2xfhax4pamzxnxkqbniahplc5za8k5r4nq1vjrm2"; - revision = "2"; - editedCabalFile = "00nv87d38agrnqp1bhlk5id78r23k2fk7pqnar1lzg2wr39b1mvi"; + revision = "3"; + editedCabalFile = "0bdl3xbxj2dpg5gv1h0561hhjjs6pp3bkgrg18gpl3pbksmr9q8j"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat-batteries base64-bytestring bytestring @@ -44092,6 +44154,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "blaze-textual_0_2_2_1" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, double-conversion + , ghc-prim, integer-gmp, old-locale, QuickCheck, test-framework + , test-framework-quickcheck2, text, time, vector + }: + mkDerivation { + pname = "blaze-textual"; + version = "0.2.2.1"; + sha256 = "0zjnwnjpcpnnm0815h9ngr3a3iy0szsnb3nrcavkbx4905s9k4bs"; + libraryHaskellDepends = [ + base blaze-builder bytestring ghc-prim integer-gmp old-locale text + time vector + ]; + testHaskellDepends = [ + base blaze-builder bytestring double-conversion QuickCheck + test-framework test-framework-quickcheck2 + ]; + description = "Fast rendering of common datatypes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "blaze-textual-native" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, ghc-prim , integer-gmp, old-locale, text, time, vector @@ -45512,8 +45596,8 @@ self: { pname = "bound"; version = "2.0.3"; sha256 = "0rhpcz99sax81zh2k1ww7g2xgfcna56ppj9xc1l4gfnsrrlb27yg"; - revision = "1"; - editedCabalFile = "16hy32ccjrch3zw45282m630p5hk1hziapmmk8a5nis2mlkq6z2h"; + revision = "2"; + editedCabalFile = "1s2vmmmj9gshhisj7fplm146p69bd4js4w0x4zk3qcb9qxl707i2"; libraryHaskellDepends = [ base bifunctors binary bytes cereal comonad deepseq hashable mmorph profunctors template-haskell th-abstraction transformers @@ -45954,6 +46038,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "brick_0_64" = callPackage + ({ mkDerivation, base, bytestring, config-ini, containers + , contravariant, data-clist, deepseq, directory, dlist, exceptions + , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm + , template-haskell, text, text-zipper, transformers, unix, vector + , vty, word-wrap + }: + mkDerivation { + pname = "brick"; + version = "0.64"; + sha256 = "06l6vqxl2hd788pf465h7d4xicnd8zj6h1n73dg7s3mnhx177n2n"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring config-ini containers contravariant data-clist + deepseq directory dlist exceptions filepath microlens microlens-mtl + microlens-th stm template-haskell text text-zipper transformers + unix vector vty word-wrap + ]; + testHaskellDepends = [ + base containers microlens QuickCheck vector + ]; + description = "A declarative terminal user interface library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "brick-dropdownmenu" = callPackage ({ mkDerivation, base, brick, containers, microlens, microlens-ghc , microlens-th, pointedlist, vector, vty @@ -47759,6 +47870,8 @@ self: { pname = "bytesmith"; version = "0.3.7.0"; sha256 = "13dc4cwiga63wmnw9hl332d8gvqjl4yl0p09z2pkmwl81br7ybrc"; + revision = "1"; + editedCabalFile = "0jwax6jdzfcy007dqwdza1r4q8s12ly2gpzpaqy8gi52ap6xc05x"; libraryHaskellDepends = [ base byteslice bytestring contiguous primitive run-st text-short wide-word @@ -49275,7 +49388,7 @@ self: { broken = true; }) {}; - "cabal-install-parsers" = callPackage + "cabal-install-parsers_0_4_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring , binary, binary-instances, bytestring, Cabal, containers , criterion, cryptohash-sha256, deepseq, directory, filepath, lukko @@ -49301,6 +49414,35 @@ self: { ]; description = "Utilities to work with cabal-install files"; license = "GPL-2.0-or-later AND BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + }) {}; + + "cabal-install-parsers" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring + , binary, binary-instances, bytestring, Cabal, containers + , criterion, cryptohash-sha256, deepseq, directory, filepath, lukko + , network-uri, parsec, pretty, tar, tasty, tasty-golden + , tasty-hunit, text, time, transformers, tree-diff + }: + mkDerivation { + pname = "cabal-install-parsers"; + version = "0.4.3"; + sha256 = "0gpnfv80rhrws12b1klyi5fkqvn8pgnl2hxh5fbnfp8fbrwklfjq"; + libraryHaskellDepends = [ + aeson base base16-bytestring binary binary-instances bytestring + Cabal containers cryptohash-sha256 deepseq directory filepath lukko + network-uri parsec pretty tar text time transformers + ]; + testHaskellDepends = [ + ansi-terminal base base16-bytestring bytestring Cabal containers + directory filepath pretty tar tasty tasty-golden tasty-hunit + tree-diff + ]; + benchmarkHaskellDepends = [ + base bytestring Cabal containers criterion directory filepath + ]; + description = "Utilities to work with cabal-install files"; + license = "GPL-2.0-or-later AND BSD-3-Clause"; }) {}; "cabal-lenses" = callPackage @@ -52619,6 +52761,8 @@ self: { pname = "cborg"; version = "0.2.5.0"; sha256 = "08da498bpbnl5c919m45mjm7sr78nn6qs7xyl0smfgd06wwm65xf"; + revision = "1"; + editedCabalFile = "0fnyjafbq9lzgr06ladraxfgzk6dj5gns17ihn7lc1ya49yv83wr"; libraryHaskellDepends = [ array base bytestring containers deepseq ghc-prim half integer-gmp primitive text @@ -58155,8 +58299,8 @@ self: { }: mkDerivation { pname = "code-conjure"; - version = "0.4.2"; - sha256 = "1y8pg8siz4myia38bbyzaibargkjbsls57i9n79w0z63kqij6wn4"; + version = "0.4.4"; + sha256 = "155jkrdklwh65aqvg138yhysjpxcj9d6l77h54z2q338iak9fbvs"; libraryHaskellDepends = [ base express leancheck speculate template-haskell ]; @@ -58646,28 +58790,39 @@ self: { , bytestring, containers, cryptonite, exceptions, HsOpenSSL , http-api-data, http-client, http-client-tls, http-streams , http-types, io-streams, memory, network, servant, servant-client - , servant-client-core, text, time, transformers, unagi-streams - , unordered-containers, uuid, vector, websockets, wuss + , servant-client-core, tasty, tasty-hunit, text, time, transformers + , unagi-streams, unordered-containers, uuid, vector, websockets + , wuss }: mkDerivation { pname = "coinbase-pro"; - version = "0.9.2.2"; - sha256 = "1jfmzzwjk81w5bm9v4zfan2w7qi2sl2a1py9nxisz1wq8vxdyvxn"; + version = "0.9.3.0"; + sha256 = "0974snfkil4xmrkw38d81d85n5w78ld3jd0kbsn3s22jd36dzjlm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-casing async base binary bytestring containers cryptonite exceptions HsOpenSSL http-api-data http-client http-client-tls http-streams http-types io-streams memory network - servant servant-client servant-client-core text time transformers - unagi-streams unordered-containers uuid vector websockets wuss + servant servant-client servant-client-core tasty tasty-hunit text + time transformers unagi-streams unordered-containers uuid vector + websockets wuss ]; executableHaskellDepends = [ aeson aeson-casing async base binary bytestring containers cryptonite exceptions HsOpenSSL http-api-data http-client http-client-tls http-streams http-types io-streams memory network - servant servant-client servant-client-core text time transformers - unagi-streams unordered-containers uuid vector websockets wuss + servant servant-client servant-client-core tasty tasty-hunit text + time transformers unagi-streams unordered-containers uuid vector + websockets wuss + ]; + testHaskellDepends = [ + aeson aeson-casing async base binary bytestring containers + cryptonite exceptions HsOpenSSL http-api-data http-client + http-client-tls http-streams http-types io-streams memory network + servant servant-client servant-client-core tasty tasty-hunit text + time transformers unagi-streams unordered-containers uuid vector + websockets wuss ]; description = "Client for Coinbase Pro"; license = lib.licenses.mit; @@ -60547,6 +60702,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "composite-cassava" = callPackage + ({ mkDerivation, base, bytestring, cassava, composite-base, tasty + , tasty-hunit, text, unordered-containers, vector + }: + mkDerivation { + pname = "composite-cassava"; + version = "0.0.3.1"; + sha256 = "138yg758qq9a0zyqjw3xaa0jdp9h09gfnxwp2lrkibgqvhinnxxa"; + libraryHaskellDepends = [ + base cassava composite-base text unordered-containers vector + ]; + testHaskellDepends = [ + base bytestring cassava composite-base tasty tasty-hunit text + unordered-containers vector + ]; + description = "Csv parsing functionality for composite"; + license = lib.licenses.mit; + }) {}; + "composite-dhall" = callPackage ({ mkDerivation, base, composite-base, dhall, tasty, tasty-hunit , text @@ -63628,8 +63802,8 @@ self: { }: mkDerivation { pname = "contiguous"; - version = "0.5.2"; - sha256 = "04ylz0mld2yj0mdj88k38jw9330p88h0ga46p4wzlmazsy0p5s67"; + version = "0.6.0"; + sha256 = "0wlm8y732v0l7my67vlm0r7dpmp0ah8b4zqnjhksmabmrb7vfbak"; libraryHaskellDepends = [ base deepseq primitive primitive-unlifted run-st ]; @@ -64585,6 +64759,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "core-program_0_2_9_1" = callPackage + ({ mkDerivation, async, base, bytestring, chronologique, core-data + , core-text, directory, exceptions, filepath, fsnotify, hashable + , hourglass, mtl, prettyprinter, safe-exceptions, stm + , template-haskell, terminal-size, text, text-short, transformers + , unix + }: + mkDerivation { + pname = "core-program"; + version = "0.2.9.1"; + sha256 = "1r604zbr0ds2g29rp1470x2m25yv8j2iw1jglf3ppf7j30dsv8qj"; + libraryHaskellDepends = [ + async base bytestring chronologique core-data core-text directory + exceptions filepath fsnotify hashable hourglass mtl prettyprinter + safe-exceptions stm template-haskell terminal-size text text-short + transformers unix + ]; + description = "Opinionated Haskell Interoperability"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "core-text" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, colour, deepseq , fingertree, hashable, prettyprinter, template-haskell, text @@ -64602,6 +64798,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "core-text_0_3_2_0" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, colour, deepseq + , fingertree, hashable, prettyprinter, template-haskell, text + , text-short + }: + mkDerivation { + pname = "core-text"; + version = "0.3.2.0"; + sha256 = "1dxxw75xdb1r9vcxfg52z7fg7a1050n8a9c8ndakgxqh5c9j6xqq"; + libraryHaskellDepends = [ + ansi-terminal base bytestring colour deepseq fingertree hashable + prettyprinter template-haskell text text-short + ]; + description = "A rope type based on a finger tree over UTF-8 fragments"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "corebot-bliki" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers , directory, filepath, filestore, http-types, monads-tf, pandoc @@ -66014,45 +66228,6 @@ self: { }) {}; "criterion" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat - , base-compat-batteries, binary, binary-orphans, bytestring - , cassava, code-page, containers, criterion-measurement, deepseq - , directory, exceptions, filepath, Glob, HUnit, js-chart - , microstache, mtl, mwc-random, optparse-applicative, parsec - , QuickCheck, statistics, tasty, tasty-hunit, tasty-quickcheck - , text, time, transformers, transformers-compat, vector - , vector-algorithms - }: - mkDerivation { - pname = "criterion"; - version = "1.5.9.0"; - sha256 = "0qhlylhra1d3vzk6miqv0gdrn10gw03bdwv8b4bfmdzgpf0zgqr1"; - revision = "1"; - editedCabalFile = "140444pqw65vsqpa168c13cljb66rdgvq41mxnvds296wxq2yz7i"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson ansi-wl-pprint base base-compat-batteries binary - binary-orphans bytestring cassava code-page containers - criterion-measurement deepseq directory exceptions filepath Glob - js-chart microstache mtl mwc-random optparse-applicative parsec - statistics text time transformers transformers-compat vector - vector-algorithms - ]; - executableHaskellDepends = [ - base base-compat-batteries optparse-applicative - ]; - testHaskellDepends = [ - aeson base base-compat base-compat-batteries bytestring deepseq - directory HUnit QuickCheck statistics tasty tasty-hunit - tasty-quickcheck vector - ]; - description = "Robust, reliable performance measurement and analysis"; - license = lib.licenses.bsd3; - }) {}; - - "criterion_1_5_10_0" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat , base-compat-batteries, binary, binary-orphans, bytestring , cassava, code-page, containers, criterion-measurement, deepseq @@ -66066,6 +66241,8 @@ self: { pname = "criterion"; version = "1.5.10.0"; sha256 = "0akws27z3i9381xrb0p0h5qicz4w5nnxy8jq7gk68gi50gj0flxq"; + revision = "1"; + editedCabalFile = "0j5cmc0w5m4fy28531f79dmbv3la51zh7k14l3kq3ix835crmmbz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -66087,7 +66264,6 @@ self: { ]; description = "Robust, reliable performance measurement and analysis"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "criterion-cmp" = callPackage @@ -70581,6 +70757,8 @@ self: { pname = "data-reify"; version = "0.6.3"; sha256 = "1sacbil9xn1n2085wpa0dq7ikf1wvh2kkddnvmwsp22ssx059h55"; + revision = "1"; + editedCabalFile = "137z993v7af9ym468vprys09416c7l7pys5hrng7k5vafga73y3b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70701,6 +70879,49 @@ self: { broken = true; }) {}; + "data-sketches" = callPackage + ({ mkDerivation, base, criterion, data-sketches-core, ghc-prim + , hspec, hspec-discover, mtl, mwc-random, pretty-show, primitive + , QuickCheck, statistics, vector, vector-algorithms + }: + mkDerivation { + pname = "data-sketches"; + version = "0.3.1.0"; + sha256 = "0a3157ch2l2vn6s1b6mcfjw3lnvp45vm3dykzbjmfglhz7x9dxbz"; + libraryHaskellDepends = [ + base data-sketches-core ghc-prim mtl mwc-random primitive vector + vector-algorithms + ]; + testHaskellDepends = [ + base data-sketches-core ghc-prim hspec hspec-discover mtl + mwc-random pretty-show primitive QuickCheck statistics vector + vector-algorithms + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base criterion data-sketches-core ghc-prim mtl mwc-random primitive + vector vector-algorithms + ]; + license = lib.licenses.asl20; + }) {}; + + "data-sketches-core" = callPackage + ({ mkDerivation, base, deepseq, ghc-prim, mwc-random, primitive + , vector, vector-algorithms + }: + mkDerivation { + pname = "data-sketches-core"; + version = "0.1.0.0"; + sha256 = "0ffw8ppgv1ifqh43nr3730qc188dg65d4bswsk0vj519fw578m93"; + libraryHaskellDepends = [ + base deepseq ghc-prim mwc-random primitive vector vector-algorithms + ]; + testHaskellDepends = [ + base deepseq ghc-prim mwc-random primitive vector vector-algorithms + ]; + license = lib.licenses.bsd3; + }) {}; + "data-spacepart" = callPackage ({ mkDerivation, base, vector-space }: mkDerivation { @@ -72211,8 +72432,8 @@ self: { }: mkDerivation { pname = "dear-imgui"; - version = "1.0.1"; - sha256 = "06w88awpcgjdj7d0alikswcqg76gn7pv8njn7dvb4w8dxllypib2"; + version = "1.1.0"; + sha256 = "0vi9aqlp6pm1qmnihmx426fla3ffvnc2nc1s2i41180wfa6karbf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73801,6 +74022,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "deriving-compat_0_6" = callPackage + ({ mkDerivation, base, base-compat, base-orphans, containers + , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged + , template-haskell, th-abstraction, transformers + , transformers-compat, void + }: + mkDerivation { + pname = "deriving-compat"; + version = "0.6"; + sha256 = "0yy4gm4wf9ivwfz2hwc7j3kavbya1p01s49fdgnzisgsk3h9xvnp"; + libraryHaskellDepends = [ + base containers ghc-boot-th ghc-prim template-haskell + th-abstraction transformers transformers-compat + ]; + testHaskellDepends = [ + base base-compat base-orphans hspec QuickCheck tagged + template-haskell transformers transformers-compat void + ]; + testToolDepends = [ hspec-discover ]; + description = "Backports of GHC deriving extensions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "deriving-show-simple" = callPackage ({ mkDerivation, base, HUnit }: mkDerivation { @@ -74436,7 +74681,7 @@ self: { maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; - "dhall_1_40_0" = callPackage + "dhall_1_40_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write , base, bytestring, case-insensitive, cborg, cborg-json, containers , contravariant, cryptonite, data-fix, deepseq, Diff, directory @@ -74454,8 +74699,8 @@ self: { }: mkDerivation { pname = "dhall"; - version = "1.40.0"; - sha256 = "1a5hvfrygk9y9jlldyrbhfv9nzl03s6lqlmzf5dkwycwmfb7cc66"; + version = "1.40.1"; + sha256 = "0m2fw9ak9l6fz8ylpbi0cdihf2j66jlnd5j3vf56r7wlqgbkxhi1"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -74733,38 +74978,6 @@ self: { }) {}; "dhall-lsp-server" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers - , data-default, dhall, dhall-json, directory, doctest, filepath - , haskell-lsp, haskell-lsp-types, hslogger, hspec, lens, lsp-test - , megaparsec, mtl, network-uri, optparse-applicative, prettyprinter - , QuickCheck, rope-utf16-splay, tasty, tasty-hspec, text - , transformers, unordered-containers, uri-encode - }: - mkDerivation { - pname = "dhall-lsp-server"; - version = "1.0.15"; - sha256 = "0bq6k92g22vdym9zyj95gx052yyzvgr1jv7yszlcj8p5angbxdqy"; - revision = "1"; - editedCabalFile = "0l1y8c02i4ydh3y67br1727al9xahpld879pinwgyv45f30n1jcb"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty base bytestring containers data-default dhall - dhall-json directory filepath haskell-lsp hslogger lens megaparsec - mtl network-uri prettyprinter rope-utf16-splay text transformers - unordered-containers uri-encode - ]; - executableHaskellDepends = [ base optparse-applicative ]; - testHaskellDepends = [ - base directory doctest filepath haskell-lsp-types hspec lsp-test - QuickCheck tasty tasty-hspec text - ]; - description = "Language Server Protocol (LSP) server for Dhall"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ Gabriel439 ]; - }) {}; - - "dhall-lsp-server_1_0_16" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , data-default, dhall, dhall-json, directory, doctest, filepath , haskell-lsp, haskell-lsp-types, hslogger, hspec, lens, lsp-test @@ -74791,7 +75004,6 @@ self: { ]; description = "Language Server Protocol (LSP) server for Dhall"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; @@ -77318,6 +77530,21 @@ self: { license = lib.licenses.mit; }) {markdown = null;}; + "discover-instances" = callPackage + ({ mkDerivation, base, some-dict-of, template-haskell, th-compat }: + mkDerivation { + pname = "discover-instances"; + version = "0.1.0.0"; + sha256 = "1ncmvc9xc4xynsjymw3i61p6310pfi41kkkmqi2dmbagfv7n2xl6"; + libraryHaskellDepends = [ + base some-dict-of template-haskell th-compat + ]; + testHaskellDepends = [ + base some-dict-of template-haskell th-compat + ]; + license = lib.licenses.bsd3; + }) {}; + "discrete" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -78175,10 +78402,8 @@ self: { }: mkDerivation { pname = "distribution-nixpkgs"; - version = "1.6.0"; - sha256 = "0m1kw3wy0n611487qhskldivrxmkh7m5bkzib44d8n0qfg5lv06i"; - revision = "1"; - editedCabalFile = "0j35y7ws7rbc68vkmyvpa4m2dyfpzpzzvm4lv7h6r7x34w331dgg"; + version = "1.6.1"; + sha256 = "136q893in07iw53m9pqr65h3mrnpvfda272bl4rq1b0z3hzpyhkm"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring Cabal containers deepseq language-nix lens @@ -78427,6 +78652,29 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "dl-fedora_0_9_1" = callPackage + ({ mkDerivation, base, bytestring, directory, extra, filepath + , http-client, http-client-tls, http-directory, http-types + , optparse-applicative, regex-posix, simple-cmd, simple-cmd-args + , text, time, unix, xdg-userdirs + }: + mkDerivation { + pname = "dl-fedora"; + version = "0.9.1"; + sha256 = "1ryvgccwfs8yzhywcvgd5s9imr4w3sxdif79npfw3zk1rcnl23v4"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring directory extra filepath http-client + http-client-tls http-directory http-types optparse-applicative + regex-posix simple-cmd simple-cmd-args text time unix xdg-userdirs + ]; + testHaskellDepends = [ base simple-cmd ]; + description = "Fedora image download tool"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "dlist" = callPackage ({ mkDerivation, base, deepseq, QuickCheck }: mkDerivation { @@ -78459,8 +78707,8 @@ self: { pname = "dlist-nonempty"; version = "0.1.1"; sha256 = "0csbspdy43pzvasb5mhs5pz2f49ws78pi253cx7pp84wjx6ads20"; - revision = "10"; - editedCabalFile = "0k9h3d93ivjykdpblkdcxyv1aybbjq6m5laqjh7bdv6nrdr5va2c"; + revision = "11"; + editedCabalFile = "1mnf6qa3773v2j2k2gp51qb0pbd9lf1hw9cx2sqrpcwjxfb3lfqg"; libraryHaskellDepends = [ base base-compat deepseq dlist semigroupoids ]; @@ -80325,28 +80573,29 @@ self: { }) {}; "dprox" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers, dns - , hashable, hspec, iproute, network, optparse-applicative, psqueues - , streaming-commons, time, unix, unordered-containers + ({ mkDerivation, attoparsec, base, bytestring, bytestring-trie + , containers, dns, hashable, hspec, iproute, network + , optparse-applicative, psqueues, streaming-commons, time, unix }: mkDerivation { pname = "dprox"; - version = "0.2.0"; - sha256 = "0hylymdpvnh353rg9gh8d9m9ag8hfxjh2ndrdxvhapbpddbbz3qm"; + version = "0.3.0"; + sha256 = "1my3v3g7jb8akc41hxx557kamsqhry3q8g76rhsf9h8fhsm31gv1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - attoparsec base bytestring containers dns hashable iproute network - optparse-applicative psqueues streaming-commons time unix - unordered-containers + attoparsec base bytestring bytestring-trie containers dns hashable + iproute network optparse-applicative psqueues streaming-commons + time unix ]; testHaskellDepends = [ - attoparsec base bytestring containers dns hashable hspec iproute - network optparse-applicative psqueues streaming-commons time unix - unordered-containers + attoparsec base bytestring bytestring-trie containers dns hashable + hspec iproute network optparse-applicative psqueues + streaming-commons time unix ]; description = "a lightweight DNS proxy server"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "drClickOn" = callPackage @@ -83720,14 +83969,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "elm-bridge_0_7_0" = callPackage + "elm-bridge_0_8_0" = callPackage ({ mkDerivation, aeson, base, containers, hspec, QuickCheck , template-haskell, text }: mkDerivation { pname = "elm-bridge"; - version = "0.7.0"; - sha256 = "1ccqsvyy60bzq7vhy9kwbl6rmlnpk0bpy7wyqapm54qxkx71bfk6"; + version = "0.8.0"; + sha256 = "05xnbwxzxm80xccrd5g4f83gsvs7gmyg9a7a0xxyk10qx93j4rs3"; libraryHaskellDepends = [ aeson base template-haskell ]; testHaskellDepends = [ aeson base containers hspec QuickCheck text @@ -84773,8 +85022,8 @@ self: { }: mkDerivation { pname = "encoding"; - version = "0.8.5"; - sha256 = "1kqi6ic5sa8y01ya99v7r5j9rl68vgy2lsixhbnavi8fx2200hcs"; + version = "0.8.6"; + sha256 = "0m68a4q98q4hf0sy0s9b3cmi2pl5s00xxchnjqqs3lb6b8xzg4fz"; setupHaskellDepends = [ base Cabal containers filepath ghc-prim HaXml ]; @@ -86446,6 +86695,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "esqueleto_3_5_2_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring + , conduit, containers, exceptions, hspec, hspec-core, monad-logger + , mtl, mysql, mysql-simple, persistent, persistent-mysql + , persistent-postgresql, persistent-sqlite, postgresql-simple + , QuickCheck, resourcet, tagged, text, time, transformers, unliftio + , unordered-containers + }: + mkDerivation { + pname = "esqueleto"; + version = "3.5.2.2"; + sha256 = "19m4lzxhjakf1zbsvwa0xmhcln1wb8ydbsnfyhiwhgvryrhvw9ga"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-html bytestring conduit containers + monad-logger persistent resourcet tagged text time transformers + unliftio unordered-containers + ]; + testHaskellDepends = [ + aeson attoparsec base blaze-html bytestring conduit containers + exceptions hspec hspec-core monad-logger mtl mysql mysql-simple + persistent persistent-mysql persistent-postgresql persistent-sqlite + postgresql-simple QuickCheck resourcet tagged text time + transformers unliftio unordered-containers + ]; + description = "Type-safe EDSL for SQL queries on persistent backends"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ess" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -87399,6 +87677,8 @@ self: { pname = "eventlog2html"; version = "0.9.1"; sha256 = "17fp0q44lk3nkqzpilxlvzbr0b25girbh7j18yl6blcp5mcmq2cd"; + revision = "1"; + editedCabalFile = "17p7h7xii3p0k8ji11jw7dcprmcrwhw0lfpyq2f557s87cpwlinf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -87633,6 +87913,23 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "evoke" = callPackage + ({ mkDerivation, aeson, base, ghc, HUnit, insert-ordered-containers + , lens, QuickCheck, random, swagger2, text + }: + mkDerivation { + pname = "evoke"; + version = "0.2021.8.25"; + sha256 = "14yq5izrlzyqwm3cf9lc26dgxix3yyfiafp5i4p9s6j4d1dspm1i"; + libraryHaskellDepends = [ base ghc random ]; + testHaskellDepends = [ + aeson base HUnit insert-ordered-containers lens QuickCheck swagger2 + text + ]; + description = "A GHC plugin to derive instances"; + license = lib.licenses.mit; + }) {}; + "ewe" = callPackage ({ mkDerivation, alex, array, base, Cabal, containers, happy, mtl , pretty, transformers, uuagc, uuagc-cabal, uulib @@ -88414,8 +88711,8 @@ self: { }: mkDerivation { pname = "exon"; - version = "0.1.0.0"; - sha256 = "014jbbzhb9ar3azxqjnagyyasack0dik32h2d0lzb6yr0yiwsv8m"; + version = "0.2.0.0"; + sha256 = "1kd1gf4yrbjpd62arrb74x5sri1xvjx88lk4dah0mbx1f19129ar"; libraryHaskellDepends = [ base flatparse haskell-src-exts haskell-src-meta relude template-haskell text @@ -88791,12 +89088,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "express_1_0_4" = callPackage + "express_1_0_6" = callPackage ({ mkDerivation, base, leancheck, template-haskell }: mkDerivation { pname = "express"; - version = "1.0.4"; - sha256 = "0yv7gn7pj6ya4ijvwsh6gqn02qm4xn3ri98q10zd0zvjipmn20db"; + version = "1.0.6"; + sha256 = "0zkjd3xv2vskj2slyvvxhakcqxygklbcigsrgrlrvg6d3sgx1wy9"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base leancheck ]; benchmarkHaskellDepends = [ base leancheck ]; @@ -89194,6 +89491,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "extra_1_7_10" = callPackage + ({ mkDerivation, base, clock, directory, filepath, process + , QuickCheck, quickcheck-instances, time, unix + }: + mkDerivation { + pname = "extra"; + version = "1.7.10"; + sha256 = "0h219hi4b74x51jdxhyfff0lyxsbgyclm428lv3nr6y8hrwydpwz"; + libraryHaskellDepends = [ + base clock directory filepath process time unix + ]; + testHaskellDepends = [ + base directory filepath QuickCheck quickcheck-instances unix + ]; + description = "Extra functions I use"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "extract-dependencies" = callPackage ({ mkDerivation, async, base, Cabal, containers , package-description-remote @@ -89392,8 +89708,8 @@ self: { }: mkDerivation { pname = "factory"; - version = "0.3.2.2"; - sha256 = "00nxadfipy92rpg7d3ypgigr51n4sn9jjh6n1gzxfjl6p7vq6myn"; + version = "0.3.2.3"; + sha256 = "0x743fvk24pin54ghz4zlzvqngnhi52rx4s1a3pb7l9m4aj1iz4y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89408,7 +89724,7 @@ self: { toolshed ]; description = "Rational arithmetic in an irrational world"; - license = "GPL"; + license = lib.licenses.gpl3Plus; }) {}; "facts" = callPackage @@ -90634,6 +90950,27 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "fcf-composite" = callPackage + ({ mkDerivation, base, composite-base, fcf-containers + , first-class-families, tasty, tasty-hunit, vinyl + }: + mkDerivation { + pname = "fcf-composite"; + version = "0.1.1.0"; + sha256 = "1ghcggwvwrdc47lalamdxx18q1qfxfr4w2kw5vxci4fkfc5p0wkb"; + revision = "1"; + editedCabalFile = "08k5mxb792d940id4kdahdw78sna7appv7n958ni7s2rsds90haj"; + libraryHaskellDepends = [ + base composite-base fcf-containers first-class-families vinyl + ]; + testHaskellDepends = [ + base composite-base fcf-containers first-class-families tasty + tasty-hunit vinyl + ]; + description = "Type-level computation for composite using first-class-families"; + license = lib.licenses.mit; + }) {}; + "fcf-containers" = callPackage ({ mkDerivation, base, doctest, first-class-families, Glob }: mkDerivation { @@ -91869,6 +92206,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "file-embed_0_0_15_0" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath + , template-haskell + }: + mkDerivation { + pname = "file-embed"; + version = "0.0.15.0"; + sha256 = "1pavxj642phrkq67620g10wqykjfhmm9yj2rm8pja83sadfvhrph"; + libraryHaskellDepends = [ + base bytestring directory filepath template-haskell + ]; + testHaskellDepends = [ base bytestring filepath ]; + description = "Use Template Haskell to embed file contents directly"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "file-embed-lzma" = callPackage ({ mkDerivation, base, base-compat, bytestring, directory, filepath , lzma, template-haskell, text, th-lift-instances, transformers @@ -91877,8 +92231,8 @@ self: { pname = "file-embed-lzma"; version = "0"; sha256 = "0xqcgx4ysyjqrygnfabs169y4w986kwzvsaqh64h7x3wfi7z8v78"; - revision = "6"; - editedCabalFile = "0m2ay6krrjs2cgmy7divlavx0wvgwhwgba97f1m3ppcxxm1y4ikv"; + revision = "7"; + editedCabalFile = "1jm3jr70vvfv9an3nb7n5rx5ldk6i4c1dcwi3pgbf6lkx7lkp754"; libraryHaskellDepends = [ base base-compat bytestring directory filepath lzma template-haskell text th-lift-instances transformers @@ -93720,6 +94074,23 @@ self: { license = lib.licenses.publicDomain; }) {}; + "flexible-numeric-parsers" = callPackage + ({ mkDerivation, attoparsec, base, hedgehog, parsers, scientific + , tasty, tasty-hedgehog, tasty-hunit, text + }: + mkDerivation { + pname = "flexible-numeric-parsers"; + version = "0.1.0.0"; + sha256 = "122nncxfp776g4yn4s78vr8r33khl02dl1x475k3z3138ylav8zp"; + libraryHaskellDepends = [ base parsers scientific ]; + testHaskellDepends = [ + attoparsec base hedgehog parsers scientific tasty tasty-hedgehog + tasty-hunit text + ]; + description = "Flexible numeric parsers for real-world programming languages"; + license = lib.licenses.mit; + }) {}; + "flexible-time" = callPackage ({ mkDerivation, base, bytestring, unix-time }: mkDerivation { @@ -93991,6 +94362,8 @@ self: { pname = "flock"; version = "0.3.2"; sha256 = "0zi04gmrjda11zp8y7zx6r9hkz00wplvjj7sn6q7lbm2h5kv20xr"; + revision = "1"; + editedCabalFile = "18mhjwcrz2jx0vsdd8cyb84lnabhliwfxaw76k8sifarhk847af8"; libraryHaskellDepends = [ base lifted-base monad-control transformers unix ]; @@ -96505,8 +96878,8 @@ self: { pname = "free-vector-spaces"; version = "0.1.5.0"; sha256 = "0rf6yhjcd2x4yj2jvyl6yc8x55a2hqhj5mxzg4f24734agh720z1"; - revision = "3"; - editedCabalFile = "09jy8kj31p6b4pmzry6glq7climw6pmpph23byhijs82a7yl609w"; + revision = "4"; + editedCabalFile = "07xkdzajkrswa69gazl0gpzayklafs883xz4xf8cawk58m5pr645"; libraryHaskellDepends = [ base lens linear MemoTrie pragmatic-show vector vector-space ]; @@ -98397,33 +98770,34 @@ self: { }) {}; "futhark" = callPackage - ({ mkDerivation, aeson, alex, ansi-terminal, array, base, binary - , blaze-html, bmp, bytestring, bytestring-to-vector, cmark-gfm - , containers, directory, directory-tree, dlist, file-embed - , filepath, free, futhark-data, futhark-server, gitrev, happy - , hashable, haskeline, language-c-quote, mainland-pretty - , megaparsec, mtl, neat-interpolation, parallel, parser-combinators - , pcg-random, process, process-extras, QuickCheck, regex-tdfa - , srcloc, tasty, tasty-hunit, tasty-quickcheck, template-haskell - , temporary, terminal-size, text, time, transformers - , unordered-containers, utf8-string, vector - , vector-binary-instances, versions, zip-archive, zlib + ({ mkDerivation, aeson, alex, ansi-terminal, array, base + , base16-bytestring, binary, blaze-html, bmp, bytestring + , bytestring-to-vector, cmark-gfm, containers, cryptohash-md5 + , directory, directory-tree, dlist, file-embed, filepath, free + , futhark-data, futhark-server, githash, half, happy, haskeline + , language-c-quote, mainland-pretty, megaparsec, mtl + , neat-interpolation, parallel, parser-combinators, pcg-random + , process, process-extras, QuickCheck, regex-tdfa, srcloc, tasty + , tasty-hunit, tasty-quickcheck, template-haskell, temporary + , terminal-size, text, time, transformers, unordered-containers + , vector, vector-binary-instances, versions, zip-archive, zlib }: mkDerivation { pname = "futhark"; - version = "0.19.7"; - sha256 = "1c3la98gsw3xxvakg4zsknwn3z3whn75r5vr9rf6w6f48jl0829k"; + version = "0.20.1"; + sha256 = "0ay1ly65sv57p6hymnb902xz5jmvjzl0zfshffrl73v8mgqbgnlv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal array base binary blaze-html bmp bytestring - bytestring-to-vector cmark-gfm containers directory directory-tree - dlist file-embed filepath free futhark-data futhark-server gitrev - hashable haskeline language-c-quote mainland-pretty megaparsec mtl - neat-interpolation parallel pcg-random process process-extras - regex-tdfa srcloc template-haskell temporary terminal-size text - time transformers unordered-containers utf8-string vector - vector-binary-instances versions zip-archive zlib + aeson ansi-terminal array base base16-bytestring binary blaze-html + bmp bytestring bytestring-to-vector cmark-gfm containers + cryptohash-md5 directory directory-tree dlist file-embed filepath + free futhark-data futhark-server githash half haskeline + language-c-quote mainland-pretty megaparsec mtl neat-interpolation + parallel pcg-random process process-extras regex-tdfa srcloc + template-haskell temporary terminal-size text time transformers + unordered-containers vector vector-binary-instances versions + zip-archive zlib ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base text ]; @@ -98949,6 +99323,8 @@ self: { pname = "galois-field"; version = "1.0.2"; sha256 = "17khwhh0annwlbbsdj5abh3jv2csg84qvhgn1ircgc69fzb0r59d"; + revision = "1"; + editedCabalFile = "1bxvg0906s3b3gnppdmgdcag5vdpgh6rwbk8a2pkqmd8dn1k2z8z"; libraryHaskellDepends = [ base bitvec groups integer-gmp mod MonadRandom poly protolude QuickCheck semirings vector wl-pprint-text @@ -100123,6 +100499,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "generic-deriving_1_14_1" = callPackage + ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover + , template-haskell, th-abstraction + }: + mkDerivation { + pname = "generic-deriving"; + version = "1.14.1"; + sha256 = "19qpahcfhs9nqqv6na8znybrvpw885cajbdnrfylxbsmm0sys4s7"; + libraryHaskellDepends = [ + base containers ghc-prim template-haskell th-abstraction + ]; + testHaskellDepends = [ base hspec template-haskell ]; + testToolDepends = [ hspec-discover ]; + description = "Generic programming library for generalised deriving"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "generic-enum" = callPackage ({ mkDerivation, array, base, bytestring, hspec }: mkDerivation { @@ -101694,8 +102088,8 @@ self: { }: mkDerivation { pname = "geomancy"; - version = "0.2.2.4"; - sha256 = "0vx2dz7fxd4hq50whsx0g6i3v1aidr7rpbylf169q1vshhrl8yaf"; + version = "0.2.3.0"; + sha256 = "1li0411y725c5k6zmkki0brz4w4yksxfdbk2ggq31yirmdihc5al"; libraryHaskellDepends = [ base containers deepseq ]; testHaskellDepends = [ base deepseq hedgehog linear ]; benchmarkHaskellDepends = [ base criterion deepseq linear ]; @@ -101951,6 +102345,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-bignum-orphans" = callPackage + ({ mkDerivation, base, ghc-bignum }: + mkDerivation { + pname = "ghc-bignum-orphans"; + version = "0.1"; + sha256 = "034m3qfw6rks1a0a5ivrhjb9my5prscq6ydc980cfdsz486pap8n"; + libraryHaskellDepends = [ base ghc-bignum ]; + description = "Backwards-compatible orphan instances for ghc-bignum"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "ghc-boot_9_0_1" = callPackage ({ mkDerivation, base, binary, bytestring, containers, directory , filepath, ghc-boot-th @@ -102012,8 +102419,8 @@ self: { }: mkDerivation { pname = "ghc-check"; - version = "0.5.0.5"; - sha256 = "0ml5v9r729i24dwj54fh8fqr55xbndc7wpbkzaids4r666hsjlsi"; + version = "0.5.0.6"; + sha256 = "14cdfbjk8l3j97v46clpb806zlkckbfhgpzip67byhw9kzv5r14s"; libraryHaskellDepends = [ base containers directory filepath ghc ghc-paths process safe-exceptions template-haskell th-compat transformers @@ -102381,6 +102788,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-exactprint_1_2_0" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "ghc-exactprint"; + version = "1.2.0"; + sha256 = "0dxjhw7vqd7grhghwz5zcjfb7bm5sa9mq0iqsr9vsz4vxxlfyi4k"; + isLibrary = true; + isExecutable = true; + description = "ExactPrint for GHC"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-gc-tune" = callPackage ({ mkDerivation, base, directory, filepath, process }: mkDerivation { @@ -102530,8 +102950,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "8.10.6.20210814"; - sha256 = "0gnjps6xf5wq0nl4rlm4c1mqp3a3rbkwskv85fm852n5cf7bicd6"; + version = "8.10.7.20210828"; + sha256 = "1p0svqh9dnpia9ddp6z9v1k5b68jc70181v69adr8rqzk0dl4i40"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -102571,8 +102991,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser"; - version = "8.10.6.20210814"; - sha256 = "16kmm5wv3kym3qjq43pldycnira64zyga2c4b2vccvlvbi0v40hi"; + version = "8.10.7.20210828"; + sha256 = "178v4f7q9ndqmlhg2vhlk6ifm3ilajlrz8iw84vggzs7rp0fnlx0"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -102611,8 +103031,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser-ex"; - version = "8.10.0.22"; - sha256 = "1a1yhm8rflln6m8sn2bbh5x6cbn20zfq91vfk1ywmia0v5y2sx03"; + version = "8.10.0.23"; + sha256 = "0r5sl7hhn0cxp0b1dskx1lshplc0yka7hcvs2nh10nrj07fjd3vj"; libraryHaskellDepends = [ base bytestring containers ghc ghc-boot ghc-boot-th uniplate ]; @@ -103014,8 +103434,8 @@ self: { }: mkDerivation { pname = "ghc-source-gen"; - version = "0.4.1.0"; - sha256 = "09rd6p8bprmj9nbdhh2909hw5il9gapj0cm3i7aiin200v80k84y"; + version = "0.4.2.0"; + sha256 = "1cb4yb48xzpdlrbw3gp6gf6nmjgyy0i9yzh63scl872allv8jfm3"; libraryHaskellDepends = [ base ghc ]; testHaskellDepends = [ base ghc ghc-paths QuickCheck tasty tasty-hunit tasty-quickcheck @@ -103174,8 +103594,8 @@ self: { ({ mkDerivation, base, ghc, transformers }: mkDerivation { pname = "ghc-tcplugin-api"; - version = "0.3.1.0"; - sha256 = "10s9i2n8r3ckdz3kd1s4pwwm4j8p8fg13xhn2m2dy4832iwg12bz"; + version = "0.5.1.0"; + sha256 = "1rwdq81k0f85idg3fypac127iq6r3da5jrkq4ynixvpahj1w6m87"; libraryHaskellDepends = [ base ghc transformers ]; description = "An API for type-checker plugins"; license = lib.licenses.bsd3; @@ -107859,57 +108279,91 @@ self: { }) {}; "goal-core" = callPackage - ({ mkDerivation, base, cairo, Chart, Chart-cairo, Chart-gtk, colour - , containers, data-default-class, gtk, lens + ({ mkDerivation, async, base, bytestring, cassava, containers + , criterion, deepseq, directory, finite-typelits + , ghc-typelits-knownnat, ghc-typelits-natnormalise, hmatrix + , hmatrix-gsl, math-functions, mwc-probability, mwc-random + , optparse-applicative, primitive, process, vector, vector-sized }: mkDerivation { pname = "goal-core"; - version = "0.1"; - sha256 = "11k66j7by9lx0kra354p8c3h7ph1z33n632wiy8b7vim5pw35fc4"; - isLibrary = true; - isExecutable = true; + version = "0.20"; + sha256 = "0lqcyllfg0r2dxd6lwil1i4wbdlpxq4plyxamjwhi7s5k41q1k93"; libraryHaskellDepends = [ - base cairo Chart Chart-cairo Chart-gtk colour containers - data-default-class gtk lens + async base bytestring cassava containers criterion deepseq + directory finite-typelits ghc-typelits-knownnat + ghc-typelits-natnormalise hmatrix hmatrix-gsl math-functions + optparse-applicative primitive process vector vector-sized ]; - executableHaskellDepends = [ base ]; - description = "Core imports for Geometric Optimization Libraries"; + benchmarkHaskellDepends = [ + base criterion hmatrix mwc-probability mwc-random + ]; + description = "Common, non-geometric tools for use with Goal"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; }) {}; "goal-geometry" = callPackage - ({ mkDerivation, base, goal-core, hmatrix, vector }: + ({ mkDerivation, ad, base, ghc-typelits-knownnat + , ghc-typelits-natnormalise, goal-core, indexed-list-literals + }: mkDerivation { pname = "goal-geometry"; - version = "0.1"; - sha256 = "0x6w7qvhs8mvzhf7ccyciznwq1jjpn337nq5jkns2zza72dm5gz0"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base goal-core hmatrix vector ]; - executableHaskellDepends = [ base goal-core ]; - description = "Scientific computing on geometric objects"; + version = "0.20"; + sha256 = "0bjyy0q7f4wmwna019wbaf7gfflpkng60f2rqxnffqcar9q127jk"; + libraryHaskellDepends = [ + ad base ghc-typelits-knownnat ghc-typelits-natnormalise goal-core + indexed-list-literals + ]; + description = "The basic geometric type system of Goal"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "goal-graphical" = callPackage + ({ mkDerivation, base, bytestring, cassava, containers, criterion + , ghc-typelits-knownnat, ghc-typelits-natnormalise, goal-core + , goal-geometry, goal-probability, hmatrix, hmatrix-special + , mwc-probability, mwc-random, parallel, statistics, vector + }: + mkDerivation { + pname = "goal-graphical"; + version = "0.20"; + sha256 = "1ckp0238wkdvsxpi7mc7vp0ymfhmpz4hh2nzgpfr09c9dz02cv61"; + libraryHaskellDepends = [ + base containers ghc-typelits-knownnat ghc-typelits-natnormalise + goal-core goal-geometry goal-probability hmatrix hmatrix-special + mwc-probability mwc-random parallel statistics vector + ]; + benchmarkHaskellDepends = [ + base bytestring cassava criterion goal-core goal-geometry + goal-probability + ]; + description = "Optimization of latent variable and dynamical models with Goal"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; "goal-probability" = callPackage - ({ mkDerivation, base, goal-core, goal-geometry, hmatrix - , math-functions, mwc-random, mwc-random-monad, statistics, vector + ({ mkDerivation, base, bytestring, cassava, containers, criterion + , ghc-typelits-knownnat, ghc-typelits-natnormalise, goal-core + , goal-geometry, hmatrix, hmatrix-special, mwc-random, parallel + , statistics, vector }: mkDerivation { pname = "goal-probability"; - version = "0.1"; - sha256 = "0bch2lcq7crr7g96rz7m98wy8lc1cldxq0pl1kf0bsadxwc3b2nl"; - isLibrary = true; - isExecutable = true; + version = "0.20"; + sha256 = "14yfsazxrn8g3ygbwx8zs9xgjjzi5q1dw6sqbdkrixb8ffw7xszm"; libraryHaskellDepends = [ - base goal-core goal-geometry hmatrix math-functions mwc-random - mwc-random-monad statistics vector + base containers ghc-typelits-knownnat ghc-typelits-natnormalise + goal-core goal-geometry hmatrix hmatrix-special mwc-random parallel + statistics vector ]; - executableHaskellDepends = [ base goal-core goal-geometry vector ]; - description = "Manifolds of probability distributions"; + benchmarkHaskellDepends = [ + base bytestring cassava criterion goal-core goal-geometry + ]; + description = "Optimization on manifolds of probability distributions with Goal"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; @@ -113452,8 +113906,8 @@ self: { }: mkDerivation { pname = "gtk2hs-buildtools"; - version = "0.13.8.0"; - sha256 = "1645pgrs9cj6imhpdpkbkhr9mn9005wbqlvily5f8iaf02zpvfwd"; + version = "0.13.8.1"; + sha256 = "102x753jbc90lfm9s0ng5kvm0risqwpar331xwsd752as0bms142"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -113606,8 +114060,8 @@ self: { }: mkDerivation { pname = "gtk3"; - version = "0.15.5"; - sha256 = "1y5wmxxpvhfw1ypli3f48k5bg3hfbx081d9xr5ks8sj3g7f7cf60"; + version = "0.15.6"; + sha256 = "008q6pbl0vq4c2cg94s5az67xdy5q3nzi8qgr7934q3cgdhzbb8w"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -115666,8 +116120,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "2.6.1"; - sha256 = "1h4bcgjf6kxhaxjhdmpxkgxamrg3ibw43hkr97iqk9h5skjcx6d9"; + version = "2.7.0"; + sha256 = "11jpqx6i7qbg4yjh8rbdz7zqjmp9r9ch9z299h72af48wrwr16fl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116165,29 +116619,29 @@ self: { }) {}; "hakyll" = callPackage - ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring - , containers, cryptonite, data-default, deepseq, directory - , file-embed, filepath, fsnotify, http-conduit, http-types - , lrucache, memory, mtl, network-uri, optparse-applicative, pandoc - , parsec, process, QuickCheck, random, regex-tdfa, resourcet - , scientific, tagsoup, tasty, tasty-golden, tasty-hunit - , tasty-quickcheck, template-haskell, text, time + ({ mkDerivation, aeson, array, base, binary, blaze-html + , blaze-markup, bytestring, containers, data-default, deepseq + , directory, file-embed, filepath, fsnotify, hashable, http-conduit + , http-types, lifted-async, lrucache, mtl, network-uri + , optparse-applicative, pandoc, parsec, process, QuickCheck, random + , regex-tdfa, resourcet, scientific, tagsoup, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, template-haskell, text, time , time-locale-compat, unordered-containers, util-linux, vector, wai , wai-app-static, warp, yaml }: mkDerivation { pname = "hakyll"; - version = "4.14.0.0"; - sha256 = "088df9vs5f2p5iiv7rbrisz4z4s38mkr9z41gy3hqdapg4m7mi1c"; + version = "4.14.1.0"; + sha256 = "1s0y7fc48zw0dkk4m9gv53mmklk1zfk4rkf7r6xawnkg5cj6sjpc"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base binary blaze-html blaze-markup bytestring containers - cryptonite data-default deepseq directory file-embed filepath - fsnotify http-conduit http-types lrucache memory mtl network-uri - optparse-applicative pandoc parsec process random regex-tdfa - resourcet scientific tagsoup template-haskell text time + aeson array base binary blaze-html blaze-markup bytestring + containers data-default deepseq directory file-embed filepath + fsnotify hashable http-conduit http-types lifted-async lrucache mtl + network-uri optparse-applicative pandoc parsec process random + regex-tdfa resourcet scientific tagsoup template-haskell text time time-locale-compat unordered-containers vector wai wai-app-static warp yaml ]; @@ -118862,17 +119316,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "hashable_1_3_2_0" = callPackage + "hashable_1_3_3_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, ghc-prim, HUnit , integer-gmp, QuickCheck, random, test-framework , test-framework-hunit, test-framework-quickcheck2, text, unix }: mkDerivation { pname = "hashable"; - version = "1.3.2.0"; - sha256 = "0dyn343wdwbm1facpcjiyd8w0s0hk23jqh7mbj108az5dx5rdgar"; - revision = "1"; - editedCabalFile = "05jwmd6d127vykb1y13q7sjn5mhfs5pbbkal33jq5kg1rx3hj6kq"; + version = "1.3.3.0"; + sha256 = "1p45rck6avm0ng963mmhphhwjljv9wcb7r2171cnka5nizjpi9cr"; libraryHaskellDepends = [ base bytestring deepseq ghc-prim integer-gmp text ]; @@ -122170,21 +122622,22 @@ self: { "hasklepias" = callPackage ({ mkDerivation, aeson, base, bytestring, cmdargs, co-log - , containers, flow, ghc-prim, hspec, interval-algebra, lens - , lens-aeson, mtl, nonempty-containers, QuickCheck, safe - , semiring-simple, tasty, tasty-hspec, tasty-hunit, text, time - , unordered-containers, vector, witherable + , containers, contravariant, flow, ghc-prim, hspec + , interval-algebra, lens, lens-aeson, mtl, nonempty-containers + , QuickCheck, safe, semiring-simple, tasty, tasty-hspec + , tasty-hunit, text, time, tuple, unordered-containers, vector + , witherable }: mkDerivation { pname = "hasklepias"; - version = "0.16.1"; - sha256 = "19bskg552zfkfxrkgp7s3pcwjccn3ra3qc13inis55gxg56gwcs0"; + version = "0.18.0"; + sha256 = "1kfsiw32bqf8xl801bk21jzhx5ma7skfi9pnp3vsz3n6n856yva9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring cmdargs co-log containers flow ghc-prim - interval-algebra lens lens-aeson mtl nonempty-containers QuickCheck - safe semiring-simple tasty tasty-hunit text time + aeson base bytestring cmdargs co-log containers contravariant flow + ghc-prim interval-algebra lens lens-aeson mtl nonempty-containers + QuickCheck safe semiring-simple tasty tasty-hunit text time tuple unordered-containers vector witherable ]; testHaskellDepends = [ @@ -122725,10 +123178,8 @@ self: { }: mkDerivation { pname = "hasktags"; - version = "0.71.2"; - sha256 = "1s2k9qrgy1jily96img2pmn7g35mwnnfiw6si3aw32jfhg5zsh1c"; - revision = "2"; - editedCabalFile = "0jidvbmmj4piaxb6apwsd7jypsyjq1a1h2ziz82pc8w13yzascj3"; + version = "0.72.0"; + sha256 = "09p79w16fgpqi6bwq162769xdrnyb7wnmz56k00nz6dj1a0bbbdd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -123700,17 +124151,18 @@ self: { "hasqlator-mysql" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers, dlist - , io-streams, megaparsec, mtl, mysql-haskell, pretty-simple - , prettyprinter, scientific, template-haskell, text, time + , io-streams, megaparsec, mtl, mysql-haskell, optics-core + , pretty-simple, prettyprinter, scientific, template-haskell, text + , time }: mkDerivation { pname = "hasqlator-mysql"; - version = "0.0.8"; - sha256 = "1ns8ckpvib53s4gvdd3pa5c0ypqw2qw2fwvxakkkd1h66xx8as08"; + version = "0.0.9"; + sha256 = "0cqvykjwdqi96dqz75xsgn9698ygvjrdcw7gi8v892gxsvjdk8cp"; libraryHaskellDepends = [ aeson base binary bytestring containers dlist io-streams megaparsec - mtl mysql-haskell pretty-simple prettyprinter scientific - template-haskell text time + mtl mysql-haskell optics-core pretty-simple prettyprinter + scientific template-haskell text time ]; description = "composable SQL generation"; license = lib.licenses.bsd3; @@ -126273,6 +126725,8 @@ self: { pname = "hedn"; version = "0.3.0.3"; sha256 = "0amfsmnly9yxzv1j34ya8kq9fqd067kgklx7rswy5g7aflj3bpwl"; + revision = "1"; + editedCabalFile = "0b7574wgav4xkk4ykazvh2dpl3z5dyln2n55m6z288rbw56diylb"; libraryHaskellDepends = [ base containers deepseq deriving-compat megaparsec parser-combinators prettyprinter scientific template-haskell text @@ -128552,6 +129006,25 @@ self: { broken = true; }) {}; + "hgraph" = callPackage + ({ mkDerivation, array, base, clock, containers, happy-dot, HUnit + , linear, mtl, random, transformers + }: + mkDerivation { + pname = "hgraph"; + version = "1.2.0.1"; + sha256 = "0zdjnkisk1m5z8yz6r3sdprxxbikqffjx4aqw3qarafqb46kr9mv"; + libraryHaskellDepends = [ + array base containers happy-dot linear mtl random transformers + ]; + testHaskellDepends = [ base containers HUnit transformers ]; + benchmarkHaskellDepends = [ + base clock containers random transformers + ]; + description = "Tools for working on (di)graphs"; + license = lib.licenses.gpl3Only; + }) {}; + "hgrep" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, ghc , ghc-exactprint, hscolour, lens, optparse-applicative, pcre-heavy @@ -128888,6 +129361,39 @@ self: { license = lib.licenses.bsd3; }) {}; + "hie-bios_0_7_6" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , conduit, conduit-extra, containers, cryptohash-sha1, deepseq + , directory, exceptions, extra, file-embed, filepath, ghc, hslogger + , hspec-expectations, optparse-applicative, process, tasty + , tasty-expected-failure, tasty-hunit, temporary, text, time + , transformers, unix-compat, unordered-containers, vector, yaml + }: + mkDerivation { + pname = "hie-bios"; + version = "0.7.6"; + sha256 = "13x8m7hg5ahmh96xq703ygx7f2zk69gbrgmrbrrwzvbc9h0ci02r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring conduit conduit-extra + containers cryptohash-sha1 deepseq directory exceptions extra + file-embed filepath ghc hslogger process temporary text time + transformers unix-compat unordered-containers vector yaml + ]; + executableHaskellDepends = [ + base directory filepath ghc optparse-applicative + ]; + testHaskellDepends = [ + base directory extra filepath ghc hspec-expectations tasty + tasty-expected-failure tasty-hunit temporary text + unordered-containers yaml + ]; + description = "Set up a GHC API session"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hie-compat" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory , filepath, ghc, ghc-boot, transformers @@ -128950,8 +129456,8 @@ self: { }: mkDerivation { pname = "hiedb"; - version = "0.4.0.0"; - sha256 = "1frcl9mxmn97qc97l3kw21ksapyndn6jq7yfxxrr0fvzn7jji7wv"; + version = "0.4.1.0"; + sha256 = "1389qmlga5rq8has02rn35pzag5wnfpx3w77r60mzl3b4pkpzi7i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129392,8 +129898,8 @@ self: { pname = "hills"; version = "0.1.2.7"; sha256 = "0zq402ycyxaw9rpxlgj0307xz80qw1159albzw1q0sr4lxfxykcv"; - revision = "1"; - editedCabalFile = "1wjln7r8q8dhvq4i5svlhk4zfypibi1cjx75jffc1aq54xy0qq3s"; + revision = "2"; + editedCabalFile = "18a6b08lac0cfc0b2aqwg21brq9qnm93cb973papyyraspwar2iv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -131400,6 +131906,8 @@ self: { pname = "hlint"; version = "3.2.7"; sha256 = "0z6gxndrh7blzapkdn6fq1pkbkjlmbgjbq9ydnvy2wm00fb3v73g"; + revision = "1"; + editedCabalFile = "1wc66vjdcf0xdwiw7r2ias1xx328ipjw0227w1xfr48if5lgc4k1"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -131415,7 +131923,7 @@ self: { maintainers = with lib.maintainers; [ maralorn ]; }) {}; - "hlint_3_3_1" = callPackage + "hlint_3_3_4" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs , containers, cpphs, data-default, directory, extra, file-embed , filepath, filepattern, ghc-lib-parser, ghc-lib-parser-ex @@ -131424,8 +131932,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "3.3.1"; - sha256 = "12l2p5pbgh1wcn2bh0ax36sclwaiky8hf09ivgz453pb5ss0jghc"; + version = "3.3.4"; + sha256 = "030hvf0hmnf5pamrcqvr97zmm185b1vs0y28nq6vzlyyg15ap6qq"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -133849,6 +134357,8 @@ self: { pname = "hoogle"; version = "5.0.18.1"; sha256 = "15ia0l96yjdnam5vljcsslcavsjwfq0kxldwdcr3zq9c0w6q6i3w"; + revision = "1"; + editedCabalFile = "1m92rpf0rhcbyana2v6ggxl16mi87dlnmq1bllhb3dm5z5hlha8i"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -133867,6 +134377,39 @@ self: { license = lib.licenses.bsd3; }) {}; + "hoogle_5_0_18_2" = callPackage + ({ mkDerivation, aeson, base, binary, blaze-html, blaze-markup + , bytestring, cmdargs, conduit, conduit-extra, connection + , containers, deepseq, directory, extra, filepath, foundation + , hashable, haskell-src-exts, http-conduit, http-types, js-flot + , js-jquery, mmap, old-locale, process-extras, QuickCheck + , resourcet, storable-tuple, tar, template-haskell, text, time + , transformers, uniplate, utf8-string, vector, wai, wai-logger + , warp, warp-tls, zlib + }: + mkDerivation { + pname = "hoogle"; + version = "5.0.18.2"; + sha256 = "1xacx2f33x1a4qlv25f8rlmb4wi0cjfzrj22nlnkrd0knghik3m7"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base binary blaze-html blaze-markup bytestring cmdargs + conduit conduit-extra connection containers deepseq directory extra + filepath foundation hashable haskell-src-exts http-conduit + http-types js-flot js-jquery mmap old-locale process-extras + QuickCheck resourcet storable-tuple tar template-haskell text time + transformers uniplate utf8-string vector wai wai-logger warp + warp-tls zlib + ]; + executableHaskellDepends = [ base ]; + testTarget = "--test-option=--no-net"; + description = "Haskell API Search"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hoogle-index" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , errors, filepath, hoogle, optparse-applicative, process @@ -136606,25 +137149,6 @@ self: { }) {}; "hs-tags" = callPackage - ({ mkDerivation, base, Cabal, containers, directory, filepath, ghc - , mtl, process, strict - }: - mkDerivation { - pname = "hs-tags"; - version = "0.1.5"; - sha256 = "0gy894sr2557a6pmvi99dkn03990r43ycxknryxym62z54bz1q8f"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base Cabal containers directory filepath ghc mtl process strict - ]; - description = "Create tag files (ctags and etags) for Haskell code"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "hs-tags_0_1_5_1" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath, ghc , ghc-paths, mtl, process, strict }: @@ -137739,8 +138263,8 @@ self: { }: mkDerivation { pname = "hscim"; - version = "0.3.5"; - sha256 = "16qkrw1a5la2x26d3q1bixxlnf1giqcc8bx4gn4swbynkyrsihr5"; + version = "0.3.6"; + sha256 = "1zd18l4afknhkjqizwhjzyrdh03p5940kvwz5jdrap1bnpszgv3p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139683,17 +140207,20 @@ self: { }) {}; "hspec-pg-transact" = callPackage - ({ mkDerivation, base, bytestring, hspec, pg-transact + ({ mkDerivation, base, bytestring, hspec, hspec-core, pg-transact , postgresql-simple, resource-pool, text, tmp-postgres }: mkDerivation { pname = "hspec-pg-transact"; - version = "0.1.0.2"; - sha256 = "030wy3ajlfd7pi6gwfn6xcsl2yi0gvznxl8m7kq001bkiabjmv55"; + version = "0.1.0.3"; + sha256 = "0laxy8sl5gci8nwal1y3rvddw3mf571sk0mv5j4rzqgqzirdmyps"; libraryHaskellDepends = [ base bytestring hspec pg-transact postgresql-simple resource-pool text tmp-postgres ]; + testHaskellDepends = [ + base hspec hspec-core pg-transact postgresql-simple tmp-postgres + ]; description = "Helpers for creating database tests with hspec and pg-transact"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -140995,8 +141522,8 @@ self: { }: mkDerivation { pname = "htdp-image"; - version = "1.1.0.0"; - sha256 = "17123nqkg8yk0pssmshdza0ipc42rx818q9gidig1d1camiyrfl4"; + version = "1.1.0.1"; + sha256 = "1xyz896dikva5pf8ng2brfj5ckrzp1dmqhsnz3pdmi1n0iwa2fcd"; libraryHaskellDepends = [ AC-Angle base gloss ]; testHaskellDepends = [ base gloss HUnit test-framework test-framework-hunit @@ -141593,8 +142120,8 @@ self: { pname = "http-api-data"; version = "0.4.3"; sha256 = "171bw2a44pg50d3y77gw2y9vmx72laky7hnn5hw6r93pnjmlf9yz"; - revision = "2"; - editedCabalFile = "1ihz467bn26cszgdk82l49mz2428r7y11693fj2x75fp2h2ml01i"; + revision = "3"; + editedCabalFile = "0hmi3jbk53pa58k86nl07m133x20bx3ls3vyvn4sjxfapdyh81wn"; libraryHaskellDepends = [ attoparsec attoparsec-iso8601 base base-compat bytestring containers cookie hashable http-types tagged text time-compat @@ -141936,23 +142463,6 @@ self: { }) {}; "http-common" = callPackage - ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring - , case-insensitive, directory, mtl, network, text, transformers - , unordered-containers - }: - mkDerivation { - pname = "http-common"; - version = "0.8.2.1"; - sha256 = "1pzi1h9qb6mpzkmv1bfa54vfzrp5jcdlbwj1i7qiricrwhqxh3dk"; - libraryHaskellDepends = [ - base base64-bytestring blaze-builder bytestring case-insensitive - directory mtl network text transformers unordered-containers - ]; - description = "Common types for HTTP clients and servers"; - license = lib.licenses.bsd3; - }) {}; - - "http-common_0_8_3_4" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring , case-insensitive, directory, mtl, network, random, text , transformers, unordered-containers @@ -141967,7 +142477,6 @@ self: { ]; description = "Common types for HTTP clients and servers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "http-conduit" = callPackage @@ -142589,37 +143098,6 @@ self: { }) {}; "http-streams" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base - , base64-bytestring, blaze-builder, bytestring, case-insensitive - , directory, ghc-prim, HsOpenSSL, hspec, hspec-expectations - , http-common, HUnit, io-streams, lifted-base, mtl, network - , network-uri, openssl-streams, snap-core, snap-server - , system-fileio, system-filepath, text, transformers - , unordered-containers - }: - mkDerivation { - pname = "http-streams"; - version = "0.8.8.1"; - sha256 = "0jh7ps2hi72pjzrjwkmq8sq0djwjv9nf9cbxhjb121grg0gzzrbh"; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-builder bytestring - case-insensitive directory HsOpenSSL http-common io-streams mtl - network network-uri openssl-streams text transformers - unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-pretty attoparsec base base64-bytestring blaze-builder - bytestring case-insensitive directory ghc-prim HsOpenSSL hspec - hspec-expectations http-common HUnit io-streams lifted-base mtl - network network-uri openssl-streams snap-core snap-server - system-fileio system-filepath text transformers - unordered-containers - ]; - description = "An HTTP client using io-streams"; - license = lib.licenses.bsd3; - }) {}; - - "http-streams_0_8_9_4" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base , base64-bytestring, blaze-builder, bytestring, case-insensitive , directory, filepath, ghc-prim, HsOpenSSL, hspec @@ -142648,7 +143126,6 @@ self: { ]; description = "An HTTP client using io-streams"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "http-test" = callPackage @@ -146170,6 +146647,8 @@ self: { pname = "hzenity"; version = "0.4"; sha256 = "1zyj7wnjcmv5pmgzn6cgly2zalys5i9waik17b4n46kk38f2pv1i"; + revision = "1"; + editedCabalFile = "11b7zavg3d84w8iypikvp8n4yy0d084j9qvifjh9yny2m64w5xav"; libraryHaskellDepends = [ base containers data-default process process-extras text time ]; @@ -146976,6 +147455,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "if-instance" = callPackage + ({ mkDerivation, base, ghc, ghc-tcplugin-api }: + mkDerivation { + pname = "if-instance"; + version = "0.3.0.0"; + sha256 = "0d64h9ai0zmyzb9nnxfmr66chxbgdyy6vw2xhqybh4x7ga3ys4r9"; + libraryHaskellDepends = [ base ghc ghc-tcplugin-api ]; + testHaskellDepends = [ base ghc ]; + doHaddock = false; + description = "Branch on whether a constraint is satisfied"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ifcxt" = callPackage ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck , template-haskell @@ -147894,7 +148387,7 @@ self: { }) {}; "imperative-edsl" = callPackage - ({ mkDerivation, array, base, BoundedChan, constraints, containers + ({ mkDerivation, array, base, BoundedChan, containers , data-default-class, deepseq, directory, exception-transformers , filepath, ghc-prim, language-c-quote, mainland-pretty, microlens , microlens-mtl, microlens-th, mtl, operational-alacarte, process @@ -147902,11 +148395,11 @@ self: { }: mkDerivation { pname = "imperative-edsl"; - version = "0.8.2"; - sha256 = "1m8ynjzi97ps9x9sf03zg7y2vq15kzch9fdnzmh9wsmmkfpqljzs"; + version = "0.9"; + sha256 = "0qzk3kjmjv3357dlc4fa43k4xn7xhyavmbnni0cd86zrilgxha6h"; libraryHaskellDepends = [ - array base BoundedChan constraints containers data-default-class - deepseq directory exception-transformers ghc-prim language-c-quote + array base BoundedChan containers data-default-class deepseq + directory exception-transformers ghc-prim language-c-quote mainland-pretty microlens microlens-mtl microlens-th mtl operational-alacarte process srcloc stm syntactic time ]; @@ -149172,6 +149665,22 @@ self: { broken = true; }) {}; + "injections" = callPackage + ({ mkDerivation, base, containers, hspec, QuickCheck + , quickcheck-instances, text + }: + mkDerivation { + pname = "injections"; + version = "0.1.0.0"; + sha256 = "0xvsnggwgm4fc41jgkz3mss9w957663rmkcx6kwlwqa8k37dgmgq"; + libraryHaskellDepends = [ base containers text ]; + testHaskellDepends = [ + base containers hspec QuickCheck quickcheck-instances text + ]; + description = "Canonical categorical conversions (injections and projections)"; + license = lib.licenses.bsd3; + }) {}; + "inline-asm" = callPackage ({ mkDerivation, base, bytestring, containers, either, ghc-prim , hspec, hspec-core, megaparsec, mtl, parser-combinators @@ -149385,6 +149894,8 @@ self: { pname = "insert-ordered-containers"; version = "0.2.5"; sha256 = "0bb3ggzic8z5zmvmzp1fsnb572c2v383740b0ddf1fwihpn52c1y"; + revision = "1"; + editedCabalFile = "12x4xi525ikbqvxh2kmnxsl7cqmbz2l8vqc5ym4lap0p21niiazr"; libraryHaskellDepends = [ aeson base base-compat deepseq hashable indexed-traversable lens optics-core optics-extra semigroupoids semigroups text transformers @@ -149430,22 +149941,6 @@ self: { }) {}; "inspection-testing" = callPackage - ({ mkDerivation, base, containers, ghc, mtl, template-haskell - , transformers - }: - mkDerivation { - pname = "inspection-testing"; - version = "0.4.5.0"; - sha256 = "1d8bi60m97yw4vxmajclg66xhaap8nj4dli8bxni0mf4mcm0px01"; - libraryHaskellDepends = [ - base containers ghc mtl template-haskell transformers - ]; - testHaskellDepends = [ base ]; - description = "GHC plugin to do inspection testing"; - license = lib.licenses.mit; - }) {}; - - "inspection-testing_0_4_6_0" = callPackage ({ mkDerivation, base, containers, ghc, mtl, template-haskell , transformers }: @@ -149459,7 +149954,6 @@ self: { testHaskellDepends = [ base ]; description = "GHC plugin to do inspection testing"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "inspector-wrecker" = callPackage @@ -149813,18 +150307,17 @@ self: { }) {}; "integer-roots" = callPackage - ({ mkDerivation, base, integer-gmp, smallcheck, tasty, tasty-hunit - , tasty-quickcheck, tasty-smallcheck + ({ mkDerivation, base, doctest, integer-gmp, smallcheck, tasty + , tasty-hunit, tasty-quickcheck, tasty-smallcheck }: mkDerivation { pname = "integer-roots"; - version = "1.0"; - sha256 = "12570cr39jj5lk30ls5nnc0w6881l0kflzhmwpk35qc7m39pjgy1"; - revision = "1"; - editedCabalFile = "0h130qddg27234mhi5spkwcgcxpnmq07bppwig5vq8z70fh5f1qx"; + version = "1.0.0.1"; + sha256 = "1q0gmgxr5xm15y1id47851z2mcklzrwrv5a9jcjadkarx21knc7q"; libraryHaskellDepends = [ base integer-gmp ]; testHaskellDepends = [ - base smallcheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck + base doctest smallcheck tasty tasty-hunit tasty-quickcheck + tasty-smallcheck ]; description = "Integer roots and perfect powers"; license = lib.licenses.mit; @@ -150348,8 +150841,8 @@ self: { }: mkDerivation { pname = "interval-algebra"; - version = "0.10.1"; - sha256 = "1nplznmspji7g51g2xxsr2b5lahhxqnmbs180mm3zmvkam8zizri"; + version = "0.10.2"; + sha256 = "13rglhfcjlwsvch4qcrsjfgcxv4rsxx63zhw3fjzvb5hrj7qvgb1"; libraryHaskellDepends = [ base containers foldl QuickCheck safe time witherable ]; @@ -151968,8 +152461,8 @@ self: { ({ mkDerivation, base, bytestring, text }: mkDerivation { pname = "isocline"; - version = "1.0.1"; - sha256 = "1s57gqzhic1zjc0fn1j8l834cfa24w9q2rvhbxdfkb442qpw4piw"; + version = "1.0.4"; + sha256 = "0p985fbr19sqgrxzxywkshyl0ca5f2kpl4pkmqgl6ya2alvwymzl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring text ]; @@ -151977,8 +152470,6 @@ self: { testHaskellDepends = [ base bytestring text ]; description = "A portable alternative to GNU Readline"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "isohunt" = callPackage @@ -152739,6 +153230,21 @@ self: { license = lib.licenses.mit; }) {}; + "ixset-typed-cassava" = callPackage + ({ mkDerivation, base, bytestring, cassava, ixset-typed, vector }: + mkDerivation { + pname = "ixset-typed-cassava"; + version = "0.0.2.0"; + sha256 = "0qr0j1pkq2jc0clwbrzwmj31i90n8frxb0gaki0sapmla8pfb5yc"; + revision = "1"; + editedCabalFile = "07qm52l00j4ghhc7bld99nnjkah9filzbkwcyzpdqhisp51q687q"; + libraryHaskellDepends = [ + base bytestring cassava ixset-typed vector + ]; + description = "cassava encoding and decoding via ixset-typed"; + license = lib.licenses.mit; + }) {}; + "ixset-typed-conversions" = callPackage ({ mkDerivation, base, exceptions, free, hashable, ixset-typed , unordered-containers, zipper-extra @@ -157152,8 +157658,8 @@ self: { }: mkDerivation { pname = "keid-core"; - version = "0.1.0.1"; - sha256 = "1hvrnyw1m03v36xyak514a4v0l2jrwz7mr5k3jqzdmab4srz887s"; + version = "0.1.1.1"; + sha256 = "03pfn145ggpd44qq4r7fgx8nk02vhd2jd9f70gwmfsivs9ykg94x"; libraryHaskellDepends = [ adjunctions base binary bytestring cryptohash-md5 derive-storable derive-storable-plugin distributive foldl geomancy GLFW-b ktx-codec @@ -157192,8 +157698,8 @@ self: { }: mkDerivation { pname = "keid-render-basic"; - version = "0.1.1.0"; - sha256 = "0j8474chg9qbknj71nd288h8r5652rk55vax7y5nzm5qznbirg1b"; + version = "0.1.1.2"; + sha256 = "1plp5mq1vqslrcnlnlsfy8fphzlijwk2q9a6qw6q5njfpf3g9hcv"; libraryHaskellDepends = [ aeson base binary bytestring cryptohash-md5 derive-storable derive-storable-plugin foldl geomancy GLFW-b keid-core @@ -157856,8 +158362,8 @@ self: { pname = "kleene"; version = "0.1"; sha256 = "00w1gywdhqyy2k3y238gfjs9h2w4pjanmi45bna5lj215n0jb0hg"; - revision = "3"; - editedCabalFile = "1bx73d86qhki4bvqckhv7nrvn06rha6x231fqjms2a7a9zpv47bm"; + revision = "4"; + editedCabalFile = "1n7bf4l3wmm3qcwswjkw1d8n39a4b7pxqizpnpkjwq6lj8qxkmd2"; libraryHaskellDepends = [ attoparsec base base-compat bytestring containers lattices MemoTrie QuickCheck range-set-list regex-applicative semigroupoids @@ -158428,6 +158934,8 @@ self: { ]; description = "Client library for Kubernetes"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "kubernetes-client-core" = callPackage @@ -158882,17 +159390,17 @@ self: { }) {}; "lambda-cube" = callPackage - ({ mkDerivation, base, hspec, megaparsec, QuickCheck + ({ mkDerivation, base, hspec, megaparsec, syb, tasty, tasty-hspec , template-haskell, text }: mkDerivation { pname = "lambda-cube"; - version = "0.1.0.0"; - sha256 = "0s5sh4r43r5xhlldxqy2snddc5dgnx2rpawk4pipxp69983xhazi"; - revision = "3"; - editedCabalFile = "0ycaf4j9g0zsbw4qjwd6san4vn7h6iiyyf0dqgqwcl0vfv7z2hf0"; - libraryHaskellDepends = [ base megaparsec template-haskell text ]; - testHaskellDepends = [ base hspec QuickCheck ]; + version = "0.3.0.0"; + sha256 = "0m4w9pvm87j421yqw5iwywbjpwdpywgliia0bdvnynsms1z8s2a4"; + libraryHaskellDepends = [ + base megaparsec syb template-haskell text + ]; + testHaskellDepends = [ base hspec tasty tasty-hspec text ]; description = "Haskell implementation of (some of) lambda cube calculi"; license = lib.licenses.mit; }) {}; @@ -159061,7 +159569,7 @@ self: { ]; description = "Lambdabot is a development tool and advanced IRC bot"; license = "GPL"; - hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ ncfavier ]; }) {}; "lambdabot-core" = callPackage @@ -159199,8 +159707,6 @@ self: { ]; description = "Social plugins for Lambdabot"; license = "GPL"; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lambdabot-trusted" = callPackage @@ -160064,6 +160570,29 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "language-docker_10_1_1" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default-class + , hspec, hspec-megaparsec, HUnit, megaparsec, prettyprinter + , QuickCheck, split, text, time + }: + mkDerivation { + pname = "language-docker"; + version = "10.1.1"; + sha256 = "0qk6riw3xf57p4jizw15bd45in924vmjkrycaw0dvwkizb74a53b"; + libraryHaskellDepends = [ + base bytestring containers data-default-class megaparsec + prettyprinter split text time + ]; + testHaskellDepends = [ + base bytestring containers data-default-class hspec + hspec-megaparsec HUnit megaparsec prettyprinter QuickCheck split + text time + ]; + description = "Dockerfile parser, pretty-printer and embedded DSL"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "language-dockerfile" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath, free , Glob, hspec, HUnit, mtl, parsec, pretty, process, QuickCheck @@ -161475,8 +162004,8 @@ self: { pname = "lattices"; version = "2.0.2"; sha256 = "108rhpax72j6xdl0yqdmg7n32l1j805861f3q9wd3jh8nc67avix"; - revision = "3"; - editedCabalFile = "1n1sv7477v88ibcwb5rh4p1r9r4hj0jj7s0vh6r0y2w4hbhpslvr"; + revision = "4"; + editedCabalFile = "1kqxhrbj0kd9l4fn7qryg9a2k7ad4f7mj4nsaz6lxa90lvi3ynj7"; libraryHaskellDepends = [ base base-compat containers deepseq hashable integer-logarithms QuickCheck semigroupoids tagged transformers universe-base @@ -161707,6 +162236,20 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "lazify" = callPackage + ({ mkDerivation, base, containers, tagged, transformers }: + mkDerivation { + pname = "lazify"; + version = "0.1.0.1"; + sha256 = "14ar766spifs3acdki8namldgy77fjjd2gxli16k08gnl65bpk1y"; + libraryHaskellDepends = [ base containers tagged transformers ]; + testHaskellDepends = [ base ]; + description = "A simple utility for lazy record matching"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "lazy" = callPackage ({ mkDerivation, base, comonad }: mkDerivation { @@ -162620,8 +163163,8 @@ self: { pname = "lens"; version = "5.0.1"; sha256 = "0gzwx4b758phm51hz5i4bbkbvjw1ka7qj04zd9l9sh9n6s9ksm7c"; - revision = "1"; - editedCabalFile = "0lk83zwnl91yyhzkq6zx18plkk85pdvdf8x0y5rivqkgmr1vwzy9"; + revision = "2"; + editedCabalFile = "1h3jcadrms3xqd0887ckf9190xc3dblmlz9xhb0imlw1rkvj62dw"; libraryHaskellDepends = [ array assoc base base-orphans bifunctors bytestring call-stack comonad containers contravariant distributive exceptions filepath @@ -164469,8 +165012,8 @@ self: { pname = "libtelnet"; version = "0.1.0.1"; sha256 = "13g7wpibjncj9h6yva8gj9fqs8j806r1vnina78wgv8f980dqxks"; - revision = "1"; - editedCabalFile = "13lg79nlwmhd5qqyr31bk7wpfl0mvr37q4ha3q83gxya03f34v5h"; + revision = "2"; + editedCabalFile = "1f05qj982h6kkr3mdhxqaycxm39ngw2ljcdx4qr4ydyh5ix6mjw8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -165191,24 +165734,18 @@ self: { , bytestring, cryptohash-sha256, deepseq, free, hspec , hspec-discover, hspec-expectations, hspec-wai, http-api-data , http-client, http-client-tls, http-media, http-types, mtl - , scientific, servant, servant-client, servant-client-core - , servant-server, string-conversions, text, time, transformers, wai - , wai-extra, warp + , servant, servant-client, servant-client-core, servant-server + , string-conversions, text, time, transformers, wai, warp }: mkDerivation { pname = "line-bot-sdk"; - version = "0.7.1"; - sha256 = "0q7nzycmd3adckpzrskjfjw72bcxia278qb9z72sa991riyawscz"; - isLibrary = true; - isExecutable = true; + version = "0.7.2"; + sha256 = "0nz4c5r06lkjrmg16nvfg9b6qgiskflrqb14cw69mj74szflqkaw"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring cryptohash-sha256 deepseq http-api-data http-client http-client-tls http-media http-types mtl - scientific servant servant-client servant-client-core - servant-server string-conversions text time transformers wai - ]; - executableHaskellDepends = [ - base servant servant-server transformers wai wai-extra warp + servant servant-client servant-client-core servant-server + string-conversions text time wai ]; testHaskellDepends = [ aeson aeson-qq base base64-bytestring bytestring cryptohash-sha256 @@ -169976,8 +170513,8 @@ self: { ({ mkDerivation, base, unamb }: mkDerivation { pname = "lub"; - version = "0.1.7"; - sha256 = "1dsm7cg0i930r5dn8591aabkl0p8b5l348pccdvi7p0g7asx451h"; + version = "0.1.8"; + sha256 = "0b3p70sw88a66c0gzj0h5mn3ki72ya5zyx70934mkzh1y4lcwicc"; libraryHaskellDepends = [ base unamb ]; description = "information operators: least upper bound (lub) and greatest lower bound (glb)"; license = lib.licenses.bsd3; @@ -172093,8 +172630,8 @@ self: { }: mkDerivation { pname = "mandrill"; - version = "0.5.4.0"; - sha256 = "0cp0xd4by5ml1526lybqvxr1g5ccgskmj9ibl3xnrcmkbi9a14y6"; + version = "0.5.5.0"; + sha256 = "1zq7kfs513zh7v5y4hafh5d6ly4jhmxsl3rfjavh2faw4i19fy3n"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-html bytestring containers email-validate http-client http-client-tls http-types microlens-th @@ -173174,8 +173711,10 @@ self: { }: mkDerivation { pname = "matchable-th"; - version = "0.1.1.1"; - sha256 = "0q6bvdfmdil68van4cmhy6kj2w0x1kf2kgs2f3wzz6m723ach30v"; + version = "0.1.2.0"; + sha256 = "007ngl7c5sl57pjg40kl6iwz0bwb93ky4vd7z2x4qsjw4p6qgc0j"; + revision = "1"; + editedCabalFile = "11q83hcj3a58y76r12yfj29yi6inrgcnjq770f86c8dq28ibzbiw"; libraryHaskellDepends = [ base matchable template-haskell th-abstraction ]; @@ -180876,6 +181415,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "monoidal-functors" = callPackage + ({ mkDerivation, base, bifunctors, comonad, contravariant + , profunctors, semigroupoids, tagged, these + }: + mkDerivation { + pname = "monoidal-functors"; + version = "0.1.0.0"; + sha256 = "0k590a0hmdzg9zwq697v73xdr0xh03yalr5pzxqkbx59grg31dw3"; + libraryHaskellDepends = [ + base bifunctors comonad contravariant profunctors semigroupoids + tagged these + ]; + license = lib.licenses.mit; + }) {}; + "monoidplus" = callPackage ({ mkDerivation, base, contravariant, semigroups, transformers }: mkDerivation { @@ -180919,8 +181473,8 @@ self: { }: mkDerivation { pname = "monomer"; - version = "1.0.0.2"; - sha256 = "1m0c6ldc5sg2if4b21n7b13f5rpyws0vmw9nn8gjqly7rbq446az"; + version = "1.0.0.3"; + sha256 = "1jzjpzf3y5rawis57f8a08sxpqhmjgkndvjks5n06406k4c9qafd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181052,8 +181606,8 @@ self: { pname = "months"; version = "0.2"; sha256 = "054dag7806850hdii7s5rxg8gx2spdp33pnx4s4ckni9ayvspija"; - revision = "1"; - editedCabalFile = "0hg0qa1bja05ls9l0aascqxx65nxvm1rwyvgis93ajwrbqpbi9j5"; + revision = "2"; + editedCabalFile = "1fvpzhfjpf2j01p2rwds6m82d2q0j77ak5v467nxsc8f161rfz21"; libraryHaskellDepends = [ aeson attoparsec base base-compat deepseq hashable intervals QuickCheck text time-compat @@ -181082,6 +181636,27 @@ self: { broken = true; }) {}; + "monus-weighted-search" = callPackage + ({ mkDerivation, array, base, containers, criterion, deepseq, mtl + , QuickCheck, random, tasty, tasty-quickcheck, transformers + }: + mkDerivation { + pname = "monus-weighted-search"; + version = "0.1.0.0"; + sha256 = "121pmhk45kq290xxqnj9d74p2y9lyml3m9b3321j6943fshfx772"; + libraryHaskellDepends = [ + array base containers deepseq mtl QuickCheck random transformers + ]; + testHaskellDepends = [ + array base mtl QuickCheck tasty tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base criterion random ]; + description = "Efficient search weighted by an ordered monoid with monus"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "monzo" = callPackage ({ mkDerivation, aeson, authenticate-oauth, base, bytestring , containers, hspec, http-client, http-client-tls, mtl, network @@ -181352,18 +181927,18 @@ self: { }) {}; "morph" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, filepath - , optparse-applicative, postgresql-simple, text, yaml + ({ mkDerivation, base, bytestring, directory, filepath + , optparse-applicative, postgresql-simple, text }: mkDerivation { pname = "morph"; - version = "0.1.1.3"; - sha256 = "0dbqw6bk5wnmbbn494qzfrh55cxwb80d0kc2vn4j5y043iznswgm"; + version = "0.2.0.0"; + sha256 = "0yc6b5gmr8px2vcrdg09l9xs77la3dwxd3ay0hix89g28wrrfv6p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring directory filepath optparse-applicative - postgresql-simple text yaml + base bytestring directory filepath optparse-applicative + postgresql-simple text ]; executableHaskellDepends = [ base ]; description = "A simple database migrator for PostgreSQL"; @@ -185749,6 +186324,8 @@ self: { ]; description = "Simple interface to rendering with NanoVG"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "nanq" = callPackage @@ -186625,7 +187202,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "net-mqtt_0_8_0_2" = callPackage + "net-mqtt_0_8_1_0" = callPackage ({ mkDerivation, async, attoparsec, attoparsec-binary, base, binary , bytestring, checkers, conduit, conduit-extra, connection , containers, deepseq, HUnit, network-conduit-tls, network-uri @@ -186634,8 +187211,8 @@ self: { }: mkDerivation { pname = "net-mqtt"; - version = "0.8.0.2"; - sha256 = "0rvsyb9msp1dkba941094d07apdinlda0hg4pb32jxs17wwnj0a7"; + version = "0.8.1.0"; + sha256 = "1cy17mv8ld3aifh1nr5sggm4x08h58vaa6q1s7nd7nhnkj1icajk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -189583,27 +190160,56 @@ self: { }) {}; "nixpkgs-update" = callPackage - ({ mkDerivation, base, directory, doctest, errors, filepath, github - , mtl, neat-interpolation, optparse-applicative, regex-applicative - , shelly, text, time, unix, vector + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , cryptohash-sha256, directory, doctest, errors, filepath, github + , hspec, hspec-discover, http-client, http-client-tls, http-conduit + , http-types, iso8601-time, lifted-base, mtl, neat-interpolation + , optparse-applicative, parsec, parsers, partial-order, polysemy + , polysemy-plugin, regex-applicative-text, servant, servant-client + , sqlite-simple, template-haskell, temporary, text, th-env, time + , transformers, typed-process, unix, unordered-containers, vector + , versions, xdg-basedir, zlib }: mkDerivation { pname = "nixpkgs-update"; - version = "0.2.0"; - sha256 = "1vlvkyvvykzcss5w4snmwa9lrd50rss8d2gsv36a69w4y0k2ms5z"; - isLibrary = false; + version = "0.3.0"; + sha256 = "1lgy6m3s4qr2kgjhvly55f05y32aljdpzrd45r4fprmycf5zj2h7"; + isLibrary = true; isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring conduit containers cryptohash-sha256 + directory errors filepath github http-client http-client-tls + http-conduit http-types iso8601-time lifted-base mtl + neat-interpolation optparse-applicative parsec parsers + partial-order polysemy polysemy-plugin regex-applicative-text + servant servant-client sqlite-simple template-haskell temporary + text th-env time transformers typed-process unix + unordered-containers vector versions xdg-basedir zlib + ]; executableHaskellDepends = [ - base directory errors filepath github mtl neat-interpolation - optparse-applicative regex-applicative shelly text time unix vector + aeson base bytestring conduit containers cryptohash-sha256 + directory errors filepath github http-client http-client-tls + http-conduit http-types iso8601-time lifted-base mtl + neat-interpolation optparse-applicative parsec parsers + partial-order polysemy polysemy-plugin regex-applicative-text + servant servant-client sqlite-simple template-haskell temporary + text th-env time transformers typed-process unix + unordered-containers vector versions xdg-basedir zlib ]; testHaskellDepends = [ - base directory doctest errors filepath github mtl - neat-interpolation optparse-applicative regex-applicative shelly - text time unix vector + aeson base bytestring conduit containers cryptohash-sha256 + directory doctest errors filepath github hspec hspec-discover + http-client http-client-tls http-conduit http-types iso8601-time + lifted-base mtl neat-interpolation optparse-applicative parsec + parsers partial-order polysemy polysemy-plugin + regex-applicative-text servant servant-client sqlite-simple + template-haskell temporary text th-env time transformers + typed-process unix unordered-containers vector versions xdg-basedir + zlib ]; + testToolDepends = [ hspec-discover ]; description = "Tool for semi-automatic updating of nixpkgs repository"; - license = lib.licenses.publicDomain; + license = lib.licenses.cc0; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -190177,8 +190783,8 @@ self: { }: mkDerivation { pname = "nonempty-containers"; - version = "0.3.4.1"; - sha256 = "0cpn0f0gnir9w366hw2906316qx5yc06rrrlv67xba1p66507m83"; + version = "0.3.4.3"; + sha256 = "1k58xj3cvi4s79ga5xi3ci16lh6wcxsb9qsn9ipa1kvzj0p4i5g0"; libraryHaskellDepends = [ aeson base comonad containers deepseq nonempty-vector semigroupoids these vector @@ -195212,6 +195818,24 @@ self: { maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; + "optparse-generic_1_4_5" = callPackage + ({ mkDerivation, base, bytestring, Only, optparse-applicative + , system-filepath, text, time, transformers, void + }: + mkDerivation { + pname = "optparse-generic"; + version = "1.4.5"; + sha256 = "06lyx1im1a5sxj2i6v3lzc16q8pk6lafqzqvdzg9aiximm3idy1a"; + libraryHaskellDepends = [ + base bytestring Only optparse-applicative system-filepath text time + transformers void + ]; + description = "Auto-generate a command-line parser for your datatype"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ Gabriel439 ]; + }) {}; + "optparse-helper" = callPackage ({ mkDerivation, base, optparse-applicative }: mkDerivation { @@ -197301,8 +197925,8 @@ self: { ({ mkDerivation, base, containers, pandoc-types, relude, text }: mkDerivation { pname = "pandoc-link-context"; - version = "1.0.0.0"; - sha256 = "0pl232p0cdn810jyp3xjdhf3zfj6ryjmb1f462l4jivawffyjfd4"; + version = "1.2.0.0"; + sha256 = "06yd4wp7v8p1z9jrg4rzcinkkdng94v2gpcs039brb7cb9qi4gpl"; libraryHaskellDepends = [ base containers pandoc-types relude text ]; @@ -197605,8 +198229,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.4.5"; - sha256 = "0r8pw2zy6yckizy9hrwg3kpg6f9v0dkj0fxw873sxpc4ccz5nkl0"; + version = "0.4.6"; + sha256 = "0x1wnrdbri1jcpi2iva69rw6bs6i9y192fymjamrab0w69bd9p4y"; description = "A box of patterns and paradigms"; license = lib.licenses.mit; }) {}; @@ -201939,6 +202563,43 @@ self: { maintainers = with lib.maintainers; [ psibi ]; }) {}; + "persistent_2_13_1_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , blaze-html, bytestring, conduit, containers, criterion, deepseq + , fast-logger, file-embed, hspec, http-api-data, lift-type + , monad-logger, mtl, path-pieces, QuickCheck, quickcheck-instances + , resource-pool, resourcet, scientific, shakespeare, silently + , template-haskell, text, th-lift-instances, time, transformers + , unliftio, unliftio-core, unordered-containers, vector + }: + mkDerivation { + pname = "persistent"; + version = "2.13.1.2"; + sha256 = "09si4h64i9drqr80a2sxpxhmsinacqx9bvsc3jah5zlm915q092y"; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-html bytestring + conduit containers fast-logger http-api-data lift-type monad-logger + mtl path-pieces resource-pool resourcet scientific silently + template-haskell text th-lift-instances time transformers unliftio + unliftio-core unordered-containers vector + ]; + testHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-html bytestring + conduit containers fast-logger hspec http-api-data monad-logger mtl + path-pieces QuickCheck quickcheck-instances resource-pool resourcet + scientific shakespeare silently template-haskell text + th-lift-instances time transformers unliftio unliftio-core + unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base criterion deepseq file-embed template-haskell text + ]; + description = "Type-safe, multi-backend data serialization"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ psibi ]; + }) {}; + "persistent-audit" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , getopt-generics, hashable, hspec, mongoDB, persistent @@ -202269,6 +202930,33 @@ self: { license = lib.licenses.mit; }) {}; + "persistent-mysql_2_13_0_2" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit + , containers, fast-logger, hspec, http-api-data, HUnit + , monad-logger, mysql, mysql-simple, path-pieces, persistent + , persistent-qq, persistent-test, QuickCheck, quickcheck-instances + , resource-pool, resourcet, text, time, transformers, unliftio-core + }: + mkDerivation { + pname = "persistent-mysql"; + version = "2.13.0.2"; + sha256 = "18ji7a7lb1mjgqvi2mv2cg4vlgjkyzg2hgp09s7c9v071p3ll732"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring conduit containers monad-logger + mysql mysql-simple persistent resource-pool resourcet text + transformers unliftio-core + ]; + testHaskellDepends = [ + aeson base bytestring containers fast-logger hspec http-api-data + HUnit monad-logger mysql path-pieces persistent persistent-qq + persistent-test QuickCheck quickcheck-instances resourcet text time + transformers unliftio-core + ]; + description = "Backend for the persistent library using MySQL database server"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "persistent-mysql-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , fast-logger, hspec, HUnit, io-streams, monad-logger @@ -203359,6 +204047,7 @@ self: { ]; description = "A generalization of the uniqueness-periods-vector-general functionality"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-permutations" = callPackage @@ -203389,8 +204078,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-phonetics-basics"; - version = "0.8.1.0"; - sha256 = "1y67w8ywcmv8d86b52vhiqxsgk31pglf8hcjnmml2q5kh8cpjwmp"; + version = "0.8.3.0"; + sha256 = "11pdp7myhc70h4vv84z9n246nrs33jq42vh4rnbc4j2lf1vlfwxg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -203409,17 +204098,22 @@ self: { }: mkDerivation { pname = "phonetic-languages-plus"; - version = "0.2.0.0"; - sha256 = "05xzmkzx3lc070ln6q2ynbqfh6rb70rx1n845gy0i59h6zpsl9ai"; + version = "0.4.0.0"; + sha256 = "01c0yfgg78za60izyak3qcxwf39xydyw405grflwxxkcl4bq5ax7"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base lists-flines ]; + libraryHaskellDepends = [ + base bytestring lists-flines parallel + uniqueness-periods-vector-stats + ]; executableHaskellDepends = [ base bytestring lists-flines parallel uniqueness-periods-vector-stats ]; description = "Some common shared between different packages functions"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "phonetic-languages-properties" = callPackage @@ -203445,8 +204139,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "phonetic-languages-rhythmicity"; - version = "0.9.0.0"; - sha256 = "1xymd8r5lp4jn0qb4p1dyzbhdyb3nsnvphx7f9nvf46kjbz18670"; + version = "0.9.1.0"; + sha256 = "1j2fr1hf6k9b7838sqyv5lq5cx75a44d2adk78ljyc0qx9hh9537"; libraryHaskellDepends = [ base ]; description = "Allows to estimate the rhythmicity properties for the text"; license = lib.licenses.mit; @@ -203495,8 +204189,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-examples-array"; - version = "0.10.0.0"; - sha256 = "0m7p4iddilaf0v81kjya41m6rczplhw8cl3gq4axwq5lw0x5nppf"; + version = "0.10.1.0"; + sha256 = "0js0rbm401b7yipf7kbngzam44lrxjv9nnicdf5y3dk684n7xkyv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -203523,25 +204217,26 @@ self: { ]; description = "Helps to create Ukrainian texts with the given phonetic properties"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-examples-common" = callPackage ({ mkDerivation, base, heaps, mmsyn2-array , phonetic-languages-constraints-array - , phonetic-languages-ukrainian-array, subG + , phonetic-languages-ukrainian-array , ukrainian-phonetics-basic-array }: mkDerivation { pname = "phonetic-languages-simplified-examples-common"; - version = "0.1.1.0"; - sha256 = "09h63czjpab863gi7806k1yw4q9mykszvvnb3zwbv9i97nfbvnfa"; + version = "0.1.2.0"; + sha256 = "0px34h2j6b1vjsldjg3mvm1spprkd3k31y1lli7wm6r0pgk33b86"; libraryHaskellDepends = [ base heaps mmsyn2-array phonetic-languages-constraints-array - phonetic-languages-ukrainian-array subG - ukrainian-phonetics-basic-array + phonetic-languages-ukrainian-array ukrainian-phonetics-basic-array ]; description = "Some commonly used by phonetic-languages-simplified* series functions"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-generalized-examples-array" = callPackage @@ -203557,8 +204252,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-array"; - version = "0.10.0.0"; - sha256 = "169ln5g5gz4lshsk2qfmj6h25x3xch0ar4mm0i9wn07wa7g1yyvj"; + version = "0.10.1.0"; + sha256 = "1h78v236mw43gs424pc0ilyaa4yrld9fwh64p6rmc3jvkgkp1ry1"; libraryHaskellDepends = [ base heaps mmsyn2-array mmsyn3 parallel phonetic-languages-constraints-array @@ -203572,18 +204267,18 @@ self: { ]; description = "Helps to create texts with the given phonetic properties (e. g. poetic)."; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-generalized-examples-common" = callPackage ({ mkDerivation, base, heaps, phonetic-languages-phonetics-basics - , subG }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-common"; - version = "0.2.0.0"; - sha256 = "15ngw29ffsyp7j71rpyllfyifvqybgpb5mh2cfgi1vscl8c6zydl"; + version = "0.2.1.0"; + sha256 = "1i05h0rd6svffwpwzsrryzf6yvjwxd0g3f4wasz8mkh1sdgj0r5g"; libraryHaskellDepends = [ - base heaps phonetic-languages-phonetics-basics subG + base heaps phonetic-languages-phonetics-basics ]; description = "Some common code for phonetic languages generalized functionality"; license = lib.licenses.mit; @@ -203596,8 +204291,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-properties-array"; - version = "0.8.0.0"; - sha256 = "0fi76agkx6i55121pcj3wxrfw4ymqyqb5l8sa8vm78nvx5r54nsd"; + version = "0.8.1.0"; + sha256 = "0bf3fijam1ipswp85kakhgphp9z3fqjkxl4rkqgh25jvz5yvz4si"; libraryHaskellDepends = [ base phonetic-languages-phonetics-basics phonetic-languages-rhythmicity phonetic-languages-simplified-base @@ -203648,8 +204343,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-properties-array"; - version = "0.8.0.0"; - sha256 = "1h32g5cqib72j2ib26ch6b1r50j506arx0pz6zfxl968095vmcan"; + version = "0.8.1.0"; + sha256 = "1v2kyb631kf71j71gz0gmvzmmdhzby769gax4fr8p5yng4nabmxg"; libraryHaskellDepends = [ base phonetic-languages-rhythmicity phonetic-languages-simplified-base ukrainian-phonetics-basic-array @@ -203713,11 +204408,16 @@ self: { ({ mkDerivation, base, mmsyn2-array, mmsyn5 }: mkDerivation { pname = "phonetic-languages-ukrainian-array"; - version = "0.2.1.0"; - sha256 = "17gyg64hwk5cj9drpdsadyn3l94g2n6m859ghfplr665id2pgzlg"; + version = "0.5.0.0"; + sha256 = "034xkl4q4n0gdvacymsgbhwyqfj42d06swldn3q8q1i9ka6d4nxv"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base mmsyn2-array mmsyn5 ]; + executableHaskellDepends = [ base mmsyn2-array mmsyn5 ]; description = "Prepares Ukrainian text to be used as a phonetic language text"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "phonetic-languages-vector" = callPackage @@ -207568,8 +208268,8 @@ self: { }: mkDerivation { pname = "polysemy-chronos"; - version = "0.1.3.2"; - sha256 = "0h3fla28m0y9fgw5pxrirz3bhm7baf12z70a5s8rmpi8q5h8v841"; + version = "0.1.4.0"; + sha256 = "1rkk87rnvs58hlcm46l8hqd8zf27madk8yr5p8zs0iliy0j1zsi0"; libraryHaskellDepends = [ aeson base chronos containers polysemy polysemy-time relude text ]; @@ -207583,23 +208283,20 @@ self: { }) {}; "polysemy-conc" = callPackage - ({ mkDerivation, async, base, containers, hedgehog, polysemy - , polysemy-test, polysemy-time, relude, stm, stm-chans - , string-interpolate, tasty, tasty-hedgehog, template-haskell, text - , time, unagi-chan, unix + ({ mkDerivation, async, base, containers, polysemy, polysemy-test + , polysemy-time, relude, stm, stm-chans, string-interpolate, tasty + , template-haskell, text, time, unagi-chan, unix }: mkDerivation { pname = "polysemy-conc"; - version = "0.1.1.0"; - sha256 = "0mhhywk0iziw33j8i47k8fbdk8xrzr382afkk5wlwac7gqr4hxkf"; + version = "0.2.0.0"; + sha256 = "16ywldx4p76s64qfwlm7swdzz8kcvzzrflz7cprlq2pc1fc6bf7x"; libraryHaskellDepends = [ async base containers polysemy polysemy-time relude stm stm-chans string-interpolate template-haskell text time unagi-chan unix ]; testHaskellDepends = [ - async base containers hedgehog polysemy polysemy-test polysemy-time - relude stm stm-chans string-interpolate tasty tasty-hedgehog - template-haskell text time unagi-chan unix + base polysemy polysemy-test polysemy-time stm tasty unagi-chan unix ]; description = "Polysemy Effects for Concurrency"; license = "BSD-2-Clause-Patent"; @@ -207746,8 +208443,8 @@ self: { }: mkDerivation { pname = "polysemy-log"; - version = "0.2.2.2"; - sha256 = "16xr9ym9ahc4452v5rdna8i5xsm7z50zjkjxa6kl6ql3vxrqfj2m"; + version = "0.2.2.3"; + sha256 = "1a2l9zspg0ajbgq0vqbxz399fcbr53sydhk71j8ii8y79pm1b3z4"; libraryHaskellDepends = [ ansi-terminal base polysemy polysemy-conc polysemy-time relude string-interpolate template-haskell text time @@ -207769,8 +208466,8 @@ self: { }: mkDerivation { pname = "polysemy-log-co"; - version = "0.2.2.2"; - sha256 = "1w3jyl8qb491v2a0lbkffpg7yx04mwhxsv1zqk7894145rryxkpn"; + version = "0.2.2.3"; + sha256 = "04gx2irrj59rs0jm0mrc3mka3xk46qx9z5mwad4akh0kmpsl09rz"; libraryHaskellDepends = [ base co-log co-log-core co-log-polysemy polysemy polysemy-conc polysemy-log polysemy-time relude text time @@ -207792,8 +208489,8 @@ self: { }: mkDerivation { pname = "polysemy-log-di"; - version = "0.2.2.2"; - sha256 = "0p1sz7w247fqvxjmz0bjh34nbvb8p9pc4wimklcmkvghqzny5qkz"; + version = "0.2.2.3"; + sha256 = "050y12sgd4j3487q01bczsjsn1dask507gpz1i8fgl958vr0ywwj"; libraryHaskellDepends = [ base di-polysemy polysemy polysemy-conc polysemy-log polysemy-time relude text time @@ -208066,8 +208763,8 @@ self: { }: mkDerivation { pname = "polysemy-time"; - version = "0.1.3.2"; - sha256 = "0h0fds1qz2k9w24v6kng8hb5zr32r6y6r8jm2jaj2krn9s58pv7b"; + version = "0.1.4.0"; + sha256 = "1j6qm8nribp876z4h8jgms0790qmm37f32k5aw883c8716nfavjq"; libraryHaskellDepends = [ aeson base composition containers data-default either polysemy relude string-interpolate template-haskell text time torsor @@ -208142,8 +208839,8 @@ self: { }: mkDerivation { pname = "polysemy-webserver"; - version = "0.2.1.0"; - sha256 = "1kzswc20c2a720r46krphwckp6bcgkinw59immjpwvixxdfd0bma"; + version = "0.2.1.1"; + sha256 = "126c4bw0gj9knvqn67yldzy90cp08hmc70ip85vsfl3njd0ayj33"; libraryHaskellDepends = [ base bytestring http-types polysemy polysemy-plugin wai wai-websockets warp websockets @@ -208825,6 +209522,80 @@ self: { license = lib.licenses.bsd3; }) {}; + "portray" = callPackage + ({ mkDerivation, base, containers, HUnit, test-framework + , test-framework-hunit, text, wrapped + }: + mkDerivation { + pname = "portray"; + version = "0.1.0.0"; + sha256 = "06czmcf00rdhj7f5xyrllkjmbqsvgv7j9bxvr0jn4cipvnd8lq7c"; + libraryHaskellDepends = [ base containers text wrapped ]; + testHaskellDepends = [ + base containers HUnit test-framework test-framework-hunit text + wrapped + ]; + description = "A pseudo-Haskell syntax type and typeclass producing it"; + license = lib.licenses.asl20; + }) {}; + + "portray-diff" = callPackage + ({ mkDerivation, base, containers, dlist, portray, text, wrapped }: + mkDerivation { + pname = "portray-diff"; + version = "0.1.0.0"; + sha256 = "16lb8gcvdqbnjz72znjcm5c8zrydnjwwmqr9hm4bq3vay4f2dapm"; + libraryHaskellDepends = [ + base containers dlist portray text wrapped + ]; + description = "Visualize the structural differences between two values"; + license = lib.licenses.asl20; + }) {}; + + "portray-diff-hunit" = callPackage + ({ mkDerivation, base, HUnit, portray-diff, portray-pretty, pretty + }: + mkDerivation { + pname = "portray-diff-hunit"; + version = "0.1.0.0"; + sha256 = "0gig1gvw0s7cl4jbffqh53r7lfs08clkcjpdypjjbpk0815pk34h"; + libraryHaskellDepends = [ + base HUnit portray-diff portray-pretty pretty + ]; + description = "Equality assertion functions for HUnit based on portray-diff"; + license = lib.licenses.asl20; + }) {}; + + "portray-diff-quickcheck" = callPackage + ({ mkDerivation, base, portray-diff, portray-pretty, QuickCheck }: + mkDerivation { + pname = "portray-diff-quickcheck"; + version = "0.1.0.0"; + sha256 = "1kif82y8bapf5d3awkfv7wp3ih89q3p14djanyz6jfapryhccm12"; + libraryHaskellDepends = [ + base portray-diff portray-pretty QuickCheck + ]; + description = "Equality assertion functions for QuickCheck based on portray-diff"; + license = lib.licenses.asl20; + }) {}; + + "portray-pretty" = callPackage + ({ mkDerivation, base, HUnit, portray, portray-diff, pretty + , test-framework, test-framework-hunit, text + }: + mkDerivation { + pname = "portray-pretty"; + version = "0.1.0.0"; + sha256 = "1pz42y8b0psks8p9yd18ns0149q9m41ym4ah28zcg1arl36b3bf4"; + libraryHaskellDepends = [ base portray portray-diff pretty text ]; + testHaskellDepends = [ + base HUnit portray portray-diff pretty test-framework + test-framework-hunit text + ]; + description = "\"pretty\" integration for \"portray\""; + license = lib.licenses.asl20; + }) {}; + "ports" = callPackage ({ mkDerivation, base, haskell98, unix }: mkDerivation { @@ -209247,8 +210018,8 @@ self: { }: mkDerivation { pname = "postgresql-binary"; - version = "0.12.4"; - sha256 = "1im0wfssg8f31rdis86qxhz0cqra1bdgiyxgsbqxf78qi3w05f4c"; + version = "0.12.4.1"; + sha256 = "1pldd0fx60bl2xfdlyygjdk5p415lgh94km6l48nfib6sxqwlks4"; libraryHaskellDepends = [ aeson base binary-parser bytestring bytestring-strict-builder containers network-ip scientific text time transformers @@ -212756,14 +213527,14 @@ self: { }: mkDerivation { pname = "procex"; - version = "0.3.0"; - sha256 = "1s4p6150ps17pb1wzq1qysw92nivy1pxqpwacqyyclkrg07rql9b"; + version = "0.3.1"; + sha256 = "16f91ic12wldf59dabdca76bdcvq5r1alf05bai060dby5qqj2qj"; libraryHaskellDepends = [ async base bytestring containers deepseq unix utf8-string ]; testHaskellDepends = [ async base bytestring hspec unix ]; description = "Ergonomic process launching with extreme flexibility and speed"; - license = lib.licenses.asl20; + license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -213409,8 +214180,8 @@ self: { }: mkDerivation { pname = "prolude"; - version = "0.0.0.17"; - sha256 = "1c98ybwv8jdswkx80q2wlxr7jqll6kyy07lyk2rc27phxb153slk"; + version = "0.0.0.18"; + sha256 = "0pjw02zr3gvwfq8raibqq4dwmnkf8ybqdg1jv74q9gjgqi5y08pp"; libraryHaskellDepends = [ aeson amazonka base bytestring cassava containers generic-random lens mongoDB mtl network-uri persistent persistent-mongoDB @@ -213465,6 +214236,36 @@ self: { license = lib.licenses.asl20; }) {}; + "prometheus-client_1_1_0" = callPackage + ({ mkDerivation, atomic-primops, base, bytestring, clock + , containers, criterion, data-sketches, deepseq, doctest + , exceptions, hspec, mtl, primitive, QuickCheck, random + , random-shuffle, stm, text, transformers, transformers-compat + , utf8-string + }: + mkDerivation { + pname = "prometheus-client"; + version = "1.1.0"; + sha256 = "1f9csz40asdkmmh6kp8sc8gkbxvkrvv8v2byxn4jp67lg7s3g9bx"; + libraryHaskellDepends = [ + atomic-primops base bytestring clock containers data-sketches + deepseq exceptions mtl primitive stm text transformers + transformers-compat utf8-string + ]; + testHaskellDepends = [ + atomic-primops base bytestring clock containers data-sketches + deepseq doctest exceptions hspec mtl primitive QuickCheck + random-shuffle stm text transformers transformers-compat + utf8-string + ]; + benchmarkHaskellDepends = [ + base bytestring criterion random text utf8-string + ]; + description = "Haskell client library for http://prometheus.io."; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "prometheus-effect" = callPackage ({ mkDerivation, base, bytestring, clock, criterion, hashable , http-types, mtl, random, retry, safe-exceptions, streaming @@ -213499,8 +214300,8 @@ self: { }: mkDerivation { pname = "prometheus-metrics-ghc"; - version = "1.0.1.1"; - sha256 = "0afa29ym9jvagm8n99axj2qy6m4ps6qd07k1wlyb64078yc2nqn9"; + version = "1.0.1.2"; + sha256 = "06pah4wn9yj65shpgg6lb5pwfmx46gk2nbrs1d6bqiqni05s9pzk"; libraryHaskellDepends = [ base prometheus-client text utf8-string ]; @@ -214530,6 +215331,8 @@ self: { ]; description = "Prune unused Haskell dependencies"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "psc-ide" = callPackage @@ -215319,8 +216122,8 @@ self: { }: mkDerivation { pname = "purescript"; - version = "0.14.3"; - sha256 = "0g0zly5wh75w8p09zq6sy25phbb432vb0allmcbx34vd84nm70ia"; + version = "0.14.4"; + sha256 = "0qda90yycv2yyjdpfqvmsnxbyxpx55b53cfp9rgnbhbrskr0w2vk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -215433,8 +216236,8 @@ self: { }: mkDerivation { pname = "purescript-cst"; - version = "0.3.0.0"; - sha256 = "15gf3fxpqngnx75w7g8nyvmj452y3x9p8ymwwk4mkzql0zps2fy2"; + version = "0.4.0.0"; + sha256 = "0r3f5lr9lrv9wpgkwj6nyl42lvxryj2lvr1w7ld4gki8ylq24n8g"; libraryHaskellDepends = [ aeson array base base-compat bytestring containers deepseq dlist filepath microlens mtl protolude scientific semigroups serialise @@ -219694,8 +220497,8 @@ self: { }: mkDerivation { pname = "raw-feldspar"; - version = "0.3.1"; - sha256 = "1kn86izm2wpqj59nnpxw34n37bh1w5y7h9rd59c1pcymhp29n6qd"; + version = "0.4"; + sha256 = "1bx98zsykvfc72jaas3qzjm614dliij2bdvbm44fj0npd3zvbq0r"; libraryHaskellDepends = [ array base constraints containers data-default-class data-hash imperative-edsl language-c-quote mtl operational-alacarte @@ -220936,6 +221739,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "record-dot-preprocessor_0_2_12" = callPackage + ({ mkDerivation, base, extra, filepath, ghc, record-hasfield + , uniplate + }: + mkDerivation { + pname = "record-dot-preprocessor"; + version = "0.2.12"; + sha256 = "02vyfcfanf09nd33q37jmnq0wbncvkfjn4hx4yzr62dkmh47bkkf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base extra ghc uniplate ]; + executableHaskellDepends = [ base extra ]; + testHaskellDepends = [ base extra filepath record-hasfield ]; + description = "Preprocessor to allow record.field syntax"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "record-encode" = callPackage ({ mkDerivation, base, doctest, generics-sop, hspec, QuickCheck , vector @@ -222103,6 +222924,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "reflex-dom-pandoc_1_0_0_0" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, constraints + , containers, data-default, lens, lens-aeson, mtl, pandoc-types + , ref-tf, reflex, reflex-dom-core, safe, skylighting, text, time + }: + mkDerivation { + pname = "reflex-dom-pandoc"; + version = "1.0.0.0"; + sha256 = "1xfz8r61y6kgh0s79406dm816ndvakfpslzblf03y7x2gkzx0fvy"; + libraryHaskellDepends = [ + aeson base binary bytestring constraints containers data-default + lens lens-aeson mtl pandoc-types ref-tf reflex reflex-dom-core safe + skylighting text time + ]; + description = "Render Pandoc documents to HTML using reflex-dom"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "reflex-dom-retractable" = callPackage ({ mkDerivation, base, containers, jsaddle, mtl, ref-tf, reflex , reflex-dom @@ -224077,6 +224917,22 @@ self: { broken = true; }) {}; + "reloto" = callPackage + ({ mkDerivation, base, containers, QuickCheck, tasty + , tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "reloto"; + version = "2.1.0.20180829"; + sha256 = "1z9y85k9rvi71l2wvv2fyvi9zkqh43ap1a96ayg45acj71m260xg"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base containers QuickCheck tasty tasty-quickcheck text transformers + ]; + description = "Equiprobable draw from publicly verifiable random data"; + license = lib.licenses.agpl3Plus; + }) {}; + "relude" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, doctest , gauge, ghc-prim, Glob, hashable, hedgehog, mtl, stm, text @@ -226034,6 +226890,8 @@ self: { pname = "retroclash-lib"; version = "0.1.0"; sha256 = "062pjqhba41d4bb9gb8wxpd87mpsmzj3np8y9ymagjrnv5iyaf5w"; + revision = "1"; + editedCabalFile = "1h38k4nxpz80j9sax7s0c7spvrmr90n1wig55id22ba361y980zh"; libraryHaskellDepends = [ barbies base clash-ghc clash-lib clash-prelude containers ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise @@ -229823,8 +230681,8 @@ self: { }: mkDerivation { pname = "safe-money"; - version = "0.9"; - sha256 = "0c3xpsydqgcz183klmhgdn3xdagrj0falfqb63cmknk77z610s7f"; + version = "0.9.1"; + sha256 = "03fizw68y87lyk6r1r2dmjpakgm1whi54avsb5k2krvmgwhy6fs5"; libraryHaskellDepends = [ base binary constraints deepseq hashable QuickCheck text vector-space @@ -232267,8 +233125,8 @@ self: { pname = "scotty"; version = "0.12"; sha256 = "1lpggpdzgjk23mq7aa64yylds5dbm4ynhcvbarqihjxabvh7xmz1"; - revision = "4"; - editedCabalFile = "0xwqybz4hhhw6ccqgyf4khis06p2pc17h9b78va0wywqsz01xaqb"; + revision = "5"; + editedCabalFile = "0fvxkpggysz6wfpllqwzx5xywgb2fnfmknw9xhvmxgk765v60jrn"; libraryHaskellDepends = [ aeson base base-compat-batteries blaze-builder bytestring case-insensitive data-default-class exceptions fail http-types @@ -233560,6 +234418,31 @@ self: { broken = true; }) {inherit (pkgs) secp256k1;}; + "secp256k1-haskell_0_6_0" = callPackage + ({ mkDerivation, base, base16, bytestring, cereal, deepseq, entropy + , hashable, hspec, hspec-discover, HUnit, monad-par, mtl + , QuickCheck, secp256k1, string-conversions, unliftio-core + }: + mkDerivation { + pname = "secp256k1-haskell"; + version = "0.6.0"; + sha256 = "0qq37xy61kk5h9h6zaiycjlrr1k9kjddy319qgqi0ja9vkm8msj1"; + libraryHaskellDepends = [ + base base16 bytestring cereal deepseq entropy hashable QuickCheck + string-conversions unliftio-core + ]; + libraryPkgconfigDepends = [ secp256k1 ]; + testHaskellDepends = [ + base base16 bytestring cereal deepseq entropy hashable hspec HUnit + monad-par mtl QuickCheck string-conversions unliftio-core + ]; + testToolDepends = [ hspec-discover ]; + description = "Bindings for secp256k1"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {inherit (pkgs) secp256k1;}; + "secp256k1-legacy" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, Cabal, cereal , cryptohash, entropy, HUnit, mtl, QuickCheck, string-conversions @@ -234231,6 +235114,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "semigroups_0_19_2" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "semigroups"; + version = "0.19.2"; + sha256 = "0h1sl3i6k8csy5zkkpy65rxzds9wg577z83aaakybr3n1gcv4855"; + libraryHaskellDepends = [ base ]; + description = "Anything that associates"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "semigroups-actions" = callPackage ({ mkDerivation, base, containers, semigroups }: mkDerivation { @@ -236642,8 +237537,8 @@ self: { pname = "servant-openapi3"; version = "2.0.1.2"; sha256 = "1lqvycbv49x0i3adbsdlcl49n65wxfjzhiz9pj11hg4k0j952q5p"; - revision = "2"; - editedCabalFile = "0cb41wx0lgssda2v26cn36c32j2g0q6gsif7jyy3c5fhaqmn3svv"; + revision = "3"; + editedCabalFile = "0pbv4h3nb61b8ykxniav1a8b769i8qbvxdkpkncgsx1xaklq16ly"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson aeson-pretty base base-compat bytestring hspec http-media @@ -243158,8 +244053,8 @@ self: { }: mkDerivation { pname = "slack-web"; - version = "0.3.0.0"; - sha256 = "1z223dhv0qb7labrxppjq65lp2jyscxgxk4rjdvfd2xsglj36dbf"; + version = "0.3.0.1"; + sha256 = "0dx0g6syvp9j5nslv7zdrawf7ldabgdpcrxlwmcijslfr29dk12h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -246495,8 +247390,8 @@ self: { ({ mkDerivation, base, constraints }: mkDerivation { pname = "some-dict-of"; - version = "0.1.0.0"; - sha256 = "0c7gr41fqak777wnh0q81mkpv89j6m1q3qqca5r2mzqhkqli4d4d"; + version = "0.1.0.1"; + sha256 = "15gs459x08a8dg18vjizy0rmhh0vnmy33dvx9a38jni0bpmmnc6f"; libraryHaskellDepends = [ base constraints ]; testHaskellDepends = [ base constraints ]; description = "Carry evidence of constraints around"; @@ -247515,12 +248410,12 @@ self: { broken = true; }) {}; - "speculate_0_4_12" = callPackage + "speculate_0_4_14" = callPackage ({ mkDerivation, base, cmdargs, containers, express, leancheck }: mkDerivation { pname = "speculate"; - version = "0.4.12"; - sha256 = "0v5c8nzad1y5wjrnjswq4hyahkfmmb4npzhrrkdg5brwv6c784v7"; + version = "0.4.14"; + sha256 = "1v635vvj4c3krbgv0y681l0dd3kq6knb9vfqy1jhnci14dy2nnr2"; libraryHaskellDepends = [ base cmdargs containers express leancheck ]; @@ -251093,8 +251988,8 @@ self: { pname = "step-function"; version = "0.2"; sha256 = "1mg7zqqs32zdh1x1738kk0yydyksbhx3y3x8n31f7byk5fvzqq6j"; - revision = "5"; - editedCabalFile = "03xg6n7dyz73y3llbbahnlh46xfy2iq29s1jwjp22qxd4z6xndsa"; + revision = "6"; + editedCabalFile = "01ncir4kfij1wp591wi333isf20v4sppjfcv27siz6m048cbscg4"; libraryHaskellDepends = [ base base-compat-batteries containers deepseq QuickCheck ]; @@ -252631,24 +253526,23 @@ self: { ({ mkDerivation, aeson, attoparsec, base, bytestring, http-client , http-client-tls, json-stream, mtl, network, network-simple, pipes , resourcet, streaming, streaming-bytestring, streaming-commons - , transformers + , transformers, zlib }: mkDerivation { pname = "streaming-utils"; - version = "0.2.0.0"; - sha256 = "05cgcypwxrhhf3xyxggwiz0v3193hf8h7vripqjam38f8ji3lxhk"; - revision = "1"; - editedCabalFile = "0wfk7bq5kpm6cn28z8mjlr1w5y2gp7bkm1xng1myy3jzyjwr68ph"; + version = "0.2.1.0"; + sha256 = "1c751g4k93365bibambr713w5fngpx4n11sp38pxixlhw7a2f7x7"; libraryHaskellDepends = [ aeson attoparsec base bytestring http-client http-client-tls json-stream mtl network network-simple pipes resourcet streaming streaming-bytestring streaming-commons transformers ]; + libraryPkgconfigDepends = [ zlib ]; description = "http, attoparsec, pipes and other utilities for the streaming libraries"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; - }) {}; + }) {inherit (pkgs) zlib;}; "streaming-wai" = callPackage ({ mkDerivation, base, bytestring, bytestring-builder, http-types @@ -252672,10 +253566,8 @@ self: { }: mkDerivation { pname = "streaming-with"; - version = "0.2.2.1"; - sha256 = "005krn43z92x1v8w8pgfx489h3livkklgrr7s2i2wijgsz55xp09"; - revision = "1"; - editedCabalFile = "0z1jy02hc4k1xv0bd4981cblnm4pr022hakrj6zmi4zds74m9wzm"; + version = "0.3.0.0"; + sha256 = "00p8n7qx4rjbxfhw40nnpankar3zsbciqv2yxpyq3gzgzj9g5n7i"; libraryHaskellDepends = [ base exceptions managed streaming-bytestring temporary transformers ]; @@ -253515,8 +254407,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "string-interpreter"; - version = "0.2.0.0"; - sha256 = "1bwdfbpmlfqixfwc02jxdyyv0pkiysh24pnmna12cwpvb9582f6n"; + version = "0.4.0.0"; + sha256 = "08d200kjwh0sjj75sv9ckkfkvr254233bjsisd7aaj81kiig4vnn"; libraryHaskellDepends = [ base ]; description = "Is used in the recursive mode for phonetic languages approach"; license = lib.licenses.mit; @@ -254862,8 +255754,8 @@ self: { ({ mkDerivation, base, generics-sop, vector }: mkDerivation { pname = "summer"; - version = "0.2.0.1"; - sha256 = "0kxxvifs68gbmh7vdjfcsf1baiih646s9msvd5rh7hrbr8n14w5l"; + version = "0.3.2.0"; + sha256 = "1gs9w6a5wh14f4c868b85acz92wn0s75cv8hadiws0546g4amb9v"; libraryHaskellDepends = [ base generics-sop vector ]; testHaskellDepends = [ base ]; description = "An implementation of extensible products and sums"; @@ -256090,7 +256982,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "sydtest_0_3_0_3" = callPackage + "sydtest_0_4_0_0" = callPackage ({ mkDerivation, async, base, bytestring, containers, Diff, dlist , envparse, filepath, MonadRandom, mtl, optparse-applicative, path , path-io, pretty-show, QuickCheck, quickcheck-io, random-shuffle @@ -256099,8 +256991,8 @@ self: { }: mkDerivation { pname = "sydtest"; - version = "0.3.0.3"; - sha256 = "1h6x9k5shpsp028d5mhi03pgzg324qglapk1nick1cnr0njr7v7w"; + version = "0.4.0.0"; + sha256 = "1r3isd8rjlzx7j1j5drgd1zjxdp8a1hvwsla513hpv32mkbqf0za"; libraryHaskellDepends = [ async base bytestring containers Diff dlist envparse filepath MonadRandom mtl optparse-applicative path path-io pretty-show @@ -256635,13 +257527,13 @@ self: { }: mkDerivation { pname = "symantic-base"; - version = "0.1.0.20210703"; - sha256 = "1jwk22d028k34h468218fx0czmr9ksc8fm2462am82av20azb07h"; + version = "0.2.0.20210831"; + sha256 = "1vvhshqv0pcnyrdmpk7fpz39lic666ck5hcqpw429fyqmv92k4kh"; libraryHaskellDepends = [ base containers hashable template-haskell transformers unordered-containers ]; - description = "Commonly useful symantics for Embedded Domain-Specific Languages (EDSL)"; + description = "Basic symantics combinators for Embedded Domain-Specific Languages (EDSL)"; license = lib.licenses.agpl3Plus; }) {}; @@ -256669,14 +257561,14 @@ self: { }: mkDerivation { pname = "symantic-document"; - version = "1.5.1.20191028"; - sha256 = "1c4vwjjh6r2m6y3waz1zgf5c1xq3xg9xy4742hgfsfjigw0ba4hj"; + version = "1.5.3.20200320"; + sha256 = "1xcvvdmy8wfx5ylbvabfc3fd93lickmhkvp8nqw226ymnk3x9nbr"; libraryHaskellDepends = [ ansi-terminal base text transformers ]; testHaskellDepends = [ base containers tasty tasty-hunit text transformers ]; - description = "Document symantics"; - license = lib.licenses.gpl3Only; + description = "Symantics combinators for generating documents"; + license = lib.licenses.agpl3Plus; }) {}; "symantic-grammar" = callPackage @@ -256855,8 +257747,8 @@ self: { }: mkDerivation { pname = "symantic-parser"; - version = "0.2.0.20210703"; - sha256 = "16mpc4s9y41a9hqxvx9jfnv1nrnpzk342bylh9091qd34gw657il"; + version = "0.2.1.20210803"; + sha256 = "1nr0zl2cajnk70jv92ayprhpnc5lbvxyxwvwsgyg3xm8zx747yi9"; libraryHaskellDepends = [ array attoparsec base bytestring containers deepseq directory filepath ghc-prim hashable megaparsec pretty process strict @@ -259291,8 +260183,8 @@ self: { }: mkDerivation { pname = "taskell"; - version = "1.11.3"; - sha256 = "1wymiy9cp8d3h17nbk6qfb1visdr30c6ivrygm6dwxrbambarvd8"; + version = "1.11.4"; + sha256 = "1mcpl4wj2lc6bv6x75c2snw9aqa27k2yh0bbwc2xl185c33a3rp7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -259355,23 +260247,6 @@ self: { }) {}; "tasty" = callPackage - ({ mkDerivation, ansi-terminal, base, clock, containers, mtl - , optparse-applicative, stm, tagged, unbounded-delays, unix - , wcwidth - }: - mkDerivation { - pname = "tasty"; - version = "1.4.1"; - sha256 = "0ixfsjjdps0an6iy8cqb41h6kjjli9sg0xw531jwci8xlr7g0a17"; - libraryHaskellDepends = [ - ansi-terminal base clock containers mtl optparse-applicative stm - tagged unbounded-delays unix wcwidth - ]; - description = "Modern and extensible testing framework"; - license = lib.licenses.mit; - }) {}; - - "tasty_1_4_2" = callPackage ({ mkDerivation, ansi-terminal, base, clock, containers, mtl , optparse-applicative, stm, tagged, unbounded-delays, unix , wcwidth @@ -259386,7 +260261,6 @@ self: { ]; description = "Modern and extensible testing framework"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "tasty-ant-xml" = callPackage @@ -260055,6 +260929,8 @@ self: { pname = "tasty-silver"; version = "3.2.2"; sha256 = "0zsl6nna8ir215qyxhyh2czx4i16hzw1n1m8jw8ym02j6sp6iz13"; + revision = "1"; + editedCabalFile = "0mgdk77xz38zc46qbxvss6vnp4yk328zbpw1l0c1n0f5gyf6sbav"; libraryHaskellDepends = [ ansi-terminal async base bytestring containers deepseq directory filepath mtl optparse-applicative process process-extras regex-tdfa @@ -260472,6 +261348,8 @@ self: { pname = "tdigest"; version = "0.2.1.1"; sha256 = "1dvkf7cs8dcr13wza5iyq2qgvz75r33mzgfmhdihw62xzxsqb6d3"; + revision = "1"; + editedCabalFile = "1paw32ixw4jgq0pl9f4ag43n8gqg5gmdjib6w4wx8x6ynmk19cq0"; libraryHaskellDepends = [ base base-compat binary deepseq reducers semigroupoids transformers vector vector-algorithms @@ -261385,6 +262263,62 @@ self: { license = lib.licenses.agpl3Only; }) {}; + "ten" = callPackage + ({ mkDerivation, adjunctions, base, data-default-class, deepseq + , distributive, hashable, HUnit, portray, portray-diff, some + , test-framework, test-framework-hunit, text, transformers, wrapped + }: + mkDerivation { + pname = "ten"; + version = "0.1.0.0"; + sha256 = "0rgcwwc3rq1bk3dc1plqyhc8mzk429ghswl6ry4zs2n8ds57gnwj"; + libraryHaskellDepends = [ + adjunctions base data-default-class deepseq distributive hashable + portray portray-diff some text transformers wrapped + ]; + testHaskellDepends = [ + adjunctions base data-default-class deepseq distributive hashable + HUnit portray portray-diff some test-framework test-framework-hunit + text transformers wrapped + ]; + description = "Typeclasses like Functor, etc. over arity-1 type constructors."; + license = lib.licenses.asl20; + }) {}; + + "ten-lens" = callPackage + ({ mkDerivation, base, lens, profunctors, some, ten }: + mkDerivation { + pname = "ten-lens"; + version = "0.1.0.0"; + sha256 = "1b27ds47395jnzqvhsp68807ffa6lmln37vzqkyp1l4r3bk2s7wb"; + libraryHaskellDepends = [ base lens profunctors some ten ]; + description = "Lenses for the types in the \"ten\" package"; + license = lib.licenses.asl20; + }) {}; + + "ten-unordered-containers" = callPackage + ({ mkDerivation, base, hashable, HUnit, lens, portray, portray-diff + , portray-diff-hunit, portray-pretty, some, ten, ten-lens + , test-framework, test-framework-hunit, text, transformers + , unordered-containers, wrapped + }: + mkDerivation { + pname = "ten-unordered-containers"; + version = "0.1.0.0"; + sha256 = "1p399g5m3sbd5f11wksiz49hjd4jrs000jypav82dqw9qr2ys0xl"; + libraryHaskellDepends = [ + base hashable portray portray-diff some ten unordered-containers + wrapped + ]; + testHaskellDepends = [ + base hashable HUnit lens portray portray-diff portray-diff-hunit + portray-pretty some ten ten-lens test-framework + test-framework-hunit text transformers unordered-containers wrapped + ]; + description = "A package providing one unordered container"; + license = lib.licenses.asl20; + }) {}; + "tensor" = callPackage ({ mkDerivation, base, ghc-prim, QuickCheck, random, vector }: mkDerivation { @@ -263272,23 +264206,6 @@ self: { }) {}; "text-metrics" = callPackage - ({ mkDerivation, base, containers, criterion, deepseq, hspec - , QuickCheck, text, vector, weigh - }: - mkDerivation { - pname = "text-metrics"; - version = "0.3.0"; - sha256 = "18mzxwkdvjp31r720ai9bnxr638qq8x3a2v408bz0d8f0rsayx1q"; - revision = "4"; - editedCabalFile = "017drxq9x56b345d8w5m8xdsi1zzs0z16pbdx8j35cd1lsnh3kf1"; - libraryHaskellDepends = [ base containers text vector ]; - testHaskellDepends = [ base hspec QuickCheck text ]; - benchmarkHaskellDepends = [ base criterion deepseq text weigh ]; - description = "Calculate various string metrics efficiently"; - license = lib.licenses.bsd3; - }) {}; - - "text-metrics_0_3_1" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, hspec , QuickCheck, text, vector, weigh }: @@ -263301,7 +264218,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq text weigh ]; description = "Calculate various string metrics efficiently"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "text-normal" = callPackage @@ -263542,6 +264458,37 @@ self: { license = lib.licenses.bsd3; }) {}; + "text-show_3_9_2" = callPackage + ({ mkDerivation, array, base, base-compat-batteries, base-orphans + , bifunctors, bytestring, bytestring-builder, containers, criterion + , deepseq, deriving-compat, generic-deriving, ghc-boot-th, ghc-prim + , hspec, hspec-discover, integer-gmp, QuickCheck + , quickcheck-instances, template-haskell, text, th-abstraction + , th-lift, transformers, transformers-compat + }: + mkDerivation { + pname = "text-show"; + version = "3.9.2"; + sha256 = "0srm3qj7z0c1zxpzp7n0frjdh0hxb76mz43d1ry30nrg0k4lj8lh"; + libraryHaskellDepends = [ + array base base-compat-batteries bifunctors bytestring + bytestring-builder containers generic-deriving ghc-boot-th ghc-prim + integer-gmp template-haskell text th-abstraction th-lift + transformers transformers-compat + ]; + testHaskellDepends = [ + array base base-compat-batteries base-orphans bytestring + bytestring-builder deriving-compat generic-deriving ghc-prim hspec + QuickCheck quickcheck-instances template-haskell text transformers + transformers-compat + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ]; + description = "Efficient conversion of values into Text"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-show-instances" = callPackage ({ mkDerivation, base, base-compat-batteries, bifunctors, binary , containers, directory, generic-deriving, ghc-boot-th, ghc-prim @@ -263939,6 +264886,21 @@ self: { license = lib.licenses.isc; }) {}; + "th-abstraction_0_4_3_0" = callPackage + ({ mkDerivation, base, containers, ghc-prim, template-haskell }: + mkDerivation { + pname = "th-abstraction"; + version = "0.4.3.0"; + sha256 = "01nyscmjriga4fh4362b4zjad48hdv33asjkd28sj8hx3pii7fy8"; + libraryHaskellDepends = [ + base containers ghc-prim template-haskell + ]; + testHaskellDepends = [ base containers template-haskell ]; + description = "Nicer interface for reified information about data types"; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; + }) {}; + "th-alpha" = callPackage ({ mkDerivation, base, containers, derive, mmorph, mtl, tasty , tasty-hunit, tasty-quickcheck, template-haskell, th-desugar @@ -264012,6 +264974,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "th-compat_0_1_3" = callPackage + ({ mkDerivation, base, base-compat, hspec, hspec-discover, mtl + , template-haskell + }: + mkDerivation { + pname = "th-compat"; + version = "0.1.3"; + sha256 = "1il1hs5yjfkb417c224pw1vrh4anyprasfwmjbd4fkviyv55jl3b"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ + base base-compat hspec mtl template-haskell + ]; + testToolDepends = [ hspec-discover ]; + description = "Backward- (and forward-)compatible Quote and Code types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "th-constraint-compat" = callPackage ({ mkDerivation, base, containers, template-haskell }: mkDerivation { @@ -264137,6 +265117,8 @@ self: { pname = "th-expand-syns"; version = "0.4.8.0"; sha256 = "1mw0yxfbmicv0irfrcz4s6pn39za7yjd7zz09ialwym1b46624si"; + revision = "1"; + editedCabalFile = "0l30cmwm20lgjpvr3a5yxj6429s1hqahjsij8z2ap88754phd41l"; libraryHaskellDepends = [ base containers syb template-haskell th-abstraction ]; @@ -264145,6 +265127,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "th-expand-syns_0_4_9_0" = callPackage + ({ mkDerivation, base, containers, syb, template-haskell + , th-abstraction + }: + mkDerivation { + pname = "th-expand-syns"; + version = "0.4.9.0"; + sha256 = "1yc6n4pgapl3vfjcilxn6hjdf6cr54c1w32i7wwbn806sljflhwy"; + libraryHaskellDepends = [ + base containers syb template-haskell th-abstraction + ]; + testHaskellDepends = [ base template-haskell th-abstraction ]; + description = "Expands type synonyms in Template Haskell ASTs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "th-extras" = callPackage ({ mkDerivation, base, syb, template-haskell }: mkDerivation { @@ -264370,6 +265369,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "th-orphans_0_13_12" = callPackage + ({ mkDerivation, base, bytestring, ghc-prim, hspec, hspec-discover + , mtl, template-haskell, th-compat, th-expand-syns, th-lift + , th-lift-instances, th-reify-many + }: + mkDerivation { + pname = "th-orphans"; + version = "0.13.12"; + sha256 = "03n6qxnpxhbzyzbyrjq77d1y62dwgx39mmxfwmnc04l8pawgrxxz"; + revision = "1"; + editedCabalFile = "0vfz9dl5g9xwp2zmwqc5gngyvjaqj3i0s97vbcslafcqhdqw3qaj"; + libraryHaskellDepends = [ + base mtl template-haskell th-compat th-expand-syns th-lift + th-lift-instances th-reify-many + ]; + testHaskellDepends = [ + base bytestring ghc-prim hspec template-haskell th-lift + ]; + testToolDepends = [ hspec-discover ]; + description = "Orphan instances for TH datatypes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "th-pprint" = callPackage ({ mkDerivation, base, lens, pretty, template-haskell }: mkDerivation { @@ -264422,6 +265445,8 @@ self: { pname = "th-reify-many"; version = "0.1.9"; sha256 = "0hxf56filzqnyrc8q7766vai80y6cgrrbrczx6n93caskl1dv2gq"; + revision = "1"; + editedCabalFile = "0y0gyh866i40a71732mbkzb1clxh4cq26kma4xnrq86kdd7s2rr8"; libraryHaskellDepends = [ base containers mtl safe template-haskell th-expand-syns ]; @@ -264479,8 +265504,8 @@ self: { pname = "th-test-utils"; version = "1.1.0"; sha256 = "12a8yp9wfl40afa3ps8jg3axcaah018pangjm0fzzga2awr1wzwk"; - revision = "2"; - editedCabalFile = "1jwx31jqglfcy6ylj4520kqfp918lnv6m13flx2qvhfwbd88xwcv"; + revision = "3"; + editedCabalFile = "10726mnihw50vjbl6qqccx18a3wjcik5jl5gw85jfxlam7ifwyrb"; libraryHaskellDepends = [ base template-haskell th-orphans transformers ]; @@ -264910,6 +265935,36 @@ self: { license = lib.licenses.mit; }) {}; + "thread-utils-context" = callPackage + ({ mkDerivation, base, containers, ghc-prim + , thread-utils-finalizers + }: + mkDerivation { + pname = "thread-utils-context"; + version = "0.1.0.0"; + sha256 = "0zq24w0cgyvzs7nafas92jwkakf34bmj1099ysqkfv10nlwgkf5q"; + libraryHaskellDepends = [ + base containers ghc-prim thread-utils-finalizers + ]; + testHaskellDepends = [ + base containers ghc-prim thread-utils-finalizers + ]; + description = "Garbage-collected thread local storage"; + license = lib.licenses.bsd3; + }) {}; + + "thread-utils-finalizers" = callPackage + ({ mkDerivation, base, ghc-prim }: + mkDerivation { + pname = "thread-utils-finalizers"; + version = "0.1.0.0"; + sha256 = "0r8pvp8137y5gklxr0dyi4l4s7x2qcma64529npkw32ma61iabdl"; + libraryHaskellDepends = [ base ghc-prim ]; + testHaskellDepends = [ base ghc-prim ]; + description = "Perform finalization for threads"; + license = lib.licenses.bsd3; + }) {}; + "threadPool" = callPackage ({ mkDerivation, base, process }: mkDerivation { @@ -265764,15 +266819,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "time-compat_1_9_6" = callPackage + "time-compat_1_9_6_1" = callPackage ({ mkDerivation, base, base-compat, base-orphans, deepseq, hashable , HUnit, QuickCheck, tagged, tasty, tasty-hunit, tasty-quickcheck , time }: mkDerivation { pname = "time-compat"; - version = "1.9.6"; - sha256 = "0k466nyn7v8g3lx0gjfq6hzs4gmm4ws2wcm7xqyw48fmn55pb5rx"; + version = "1.9.6.1"; + sha256 = "103b3vpn277kkccv6jv54b2wpi5c00mpb01ndl9w4y4nxc0bn1xd"; libraryHaskellDepends = [ base base-orphans deepseq hashable time ]; @@ -268117,8 +269172,8 @@ self: { pname = "topograph"; version = "1.0.0.1"; sha256 = "1sd2gyirkdgwcll76zxw954wdsyxzajn59xa9zk55fbrsm6w24cv"; - revision = "1"; - editedCabalFile = "1cbpm16jk8x8xy0r3v8zdmwrdgxlp6zww03rmzbz0031hddpywrk"; + revision = "2"; + editedCabalFile = "1iyjrvpv7lgfpfirb2vw0lv4fs3fhpkfkicl2p49wi8zc4dv7xz1"; libraryHaskellDepends = [ base base-compat base-orphans containers vector ]; @@ -268672,8 +269727,8 @@ self: { pname = "trackit"; version = "0.7.2"; sha256 = "1ha28wdc4dabr9qxkbpg9fasfnplicb2pyrn9zmija204nigbcdj"; - revision = "1"; - editedCabalFile = "0l9hi5f90nixayzahksgxrs4zij76767x64irql890ph6qzsq13c"; + revision = "2"; + editedCabalFile = "0dinhqmnm23rwg9xd056idbd7351bzbyik4k708h8xlw3pgq62i9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -269576,6 +270631,8 @@ self: { pname = "tree-diff"; version = "0.2"; sha256 = "1ny7mi0n8cyb65q9ihbnm2gxiyya888dw2c4y0hjy8k882wdhf0x"; + revision = "1"; + editedCabalFile = "0brlnq5ddmambidll1dn4jnjac2i44a9hd5hwp2p0rbh1s8jfyhm"; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base base-compat bytestring bytestring-builder containers deepseq hashable parsec parsers @@ -270088,8 +271145,8 @@ self: { pname = "trie-simple"; version = "0.4.1.1"; sha256 = "0h3wfq4fjakkwvrv35l25709xv528h1c08cr754gvk4l8vqnk6k7"; - revision = "3"; - editedCabalFile = "02h7dw73879gvy0jrxd7a4rzfhi2fcr5jivqc4ck97w67w2pg8zm"; + revision = "4"; + editedCabalFile = "0in7aycdkf63d6431dz747znkkky4q1jw9a3ihzvcjam41nc2wpw"; libraryHaskellDepends = [ base containers deepseq mtl ]; testHaskellDepends = [ base containers hspec QuickCheck vector ]; benchmarkHaskellDepends = [ @@ -270647,22 +271704,6 @@ self: { }) {}; "ttc" = callPackage - ({ mkDerivation, base, bytestring, tasty, tasty-hunit - , template-haskell, text - }: - mkDerivation { - pname = "ttc"; - version = "1.1.0.1"; - sha256 = "0vngp6md5viz4r57q0qn3pf09ph6kpkzvdigsxmgqcic2ha1a4n1"; - libraryHaskellDepends = [ base bytestring template-haskell text ]; - testHaskellDepends = [ - base bytestring tasty tasty-hunit template-haskell text - ]; - description = "Textual Type Classes"; - license = lib.licenses.mit; - }) {}; - - "ttc_1_1_0_2" = callPackage ({ mkDerivation, base, bytestring, tasty, tasty-hunit , template-haskell, text }: @@ -270676,7 +271717,6 @@ self: { ]; description = "Textual Type Classes"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "ttl-hashtables" = callPackage @@ -275154,23 +276194,18 @@ self: { }) {}; "units" = callPackage - ({ mkDerivation, base, containers, deepseq, HUnit-approx, lens - , linear, mtl, multimap, singletons, syb, tasty, tasty-hunit - , template-haskell, th-desugar, units-parser, vector-space + ({ mkDerivation, base, containers, deepseq, lens, linear, mtl + , multimap, singletons, syb, template-haskell, th-desugar + , units-parser, vector-space }: mkDerivation { pname = "units"; - version = "2.4.1.3"; - sha256 = "1ksrw65ci9j8qnqj6cxpdmdb9b3k4k9w8ld3j4h00r2vkcqgn9qg"; + version = "2.4.1.4"; + sha256 = "1r6innb99d6ljbbbrl2q9i4l6j4cb96mmv0k56q9l2xckwlsfz32"; libraryHaskellDepends = [ base containers deepseq lens linear mtl multimap singletons syb template-haskell th-desugar units-parser vector-space ]; - testHaskellDepends = [ - base containers deepseq HUnit-approx lens linear mtl multimap - singletons syb tasty tasty-hunit template-haskell th-desugar - units-parser vector-space - ]; description = "A domain-specific type system for dimensional analysis"; license = lib.licenses.bsd3; }) {}; @@ -275196,8 +276231,8 @@ self: { ({ mkDerivation, base, template-haskell, units }: mkDerivation { pname = "units-defs"; - version = "2.2"; - sha256 = "1g55hnhd9bgqp649jgmq41s5i5j0gfpn3iwqaxvmikwaasyr69ki"; + version = "2.2.1"; + sha256 = "0b7g29hqz0rzk9sjyz1h7b73jvsfd7il6l9yj982mpxazk5mc2j7"; libraryHaskellDepends = [ base template-haskell units ]; description = "Definitions for use with the units package"; license = lib.licenses.bsd3; @@ -275767,6 +276802,32 @@ self: { license = lib.licenses.mit; }) {}; + "unliftio_0_2_20" = callPackage + ({ mkDerivation, async, base, bytestring, containers, deepseq + , directory, filepath, gauge, hspec, process, QuickCheck, stm, time + , transformers, unix, unliftio-core + }: + mkDerivation { + pname = "unliftio"; + version = "0.2.20"; + sha256 = "0mbm57h7r16qd7kpglbm50qrnfjmazd70avbrl647n4jwhlrp7my"; + libraryHaskellDepends = [ + async base bytestring deepseq directory filepath process stm time + transformers unix unliftio-core + ]; + testHaskellDepends = [ + async base bytestring containers deepseq directory filepath hspec + process QuickCheck stm time transformers unix unliftio-core + ]; + benchmarkHaskellDepends = [ + async base bytestring deepseq directory filepath gauge process stm + time transformers unix unliftio-core + ]; + description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "unliftio-core" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -278031,13 +279092,30 @@ self: { }) {}; "valida" = callPackage - ({ mkDerivation, base, smallcheck, tasty, tasty-hunit + ({ mkDerivation, base, profunctors, smallcheck, tasty, tasty-hunit , tasty-quickcheck, tasty-smallcheck }: mkDerivation { pname = "valida"; - version = "0.1.0"; - sha256 = "1spdf40jcm9b6ah18m5nw550x2mlq4bjmqvscf4cnjpc7izdmdng"; + version = "1.1.0"; + sha256 = "1i9di1gmcd6s2xmf8s5mwg7fra48zg54r89f1qf1gfj34asab62m"; + libraryHaskellDepends = [ base profunctors ]; + testHaskellDepends = [ + base profunctors smallcheck tasty tasty-hunit tasty-quickcheck + tasty-smallcheck + ]; + description = "Simple applicative validation for product types, batteries included!"; + license = lib.licenses.mit; + }) {}; + + "valida-base" = callPackage + ({ mkDerivation, base, smallcheck, tasty, tasty-hunit + , tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "valida-base"; + version = "0.2.0"; + sha256 = "0wyj7nm1dqy5lq86mgqzr40s065jkwccmb4bky4hg1h7nz2lpqbj"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base smallcheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck @@ -278361,6 +279439,22 @@ self: { license = lib.licenses.mit; }) {}; + "valor_1_0_0_0" = callPackage + ({ mkDerivation, base, doctest, hspec, hspec-discover, QuickCheck + }: + mkDerivation { + pname = "valor"; + version = "1.0.0.0"; + sha256 = "0ssdyy84xh68rxinp6i36zg7c3k10122b1l30q1qi8r10bvyg3r0"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + doHaddock = false; + description = "Simple and powerful data validation"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "value-supply" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -279359,6 +280453,25 @@ self: { maintainers = with lib.maintainers; [ expipiplus1 ]; }) {}; + "vector-sized_1_5_0" = callPackage + ({ mkDerivation, adjunctions, base, binary, comonad, deepseq + , distributive, finite-typelits, hashable, indexed-list-literals + , primitive, vector + }: + mkDerivation { + pname = "vector-sized"; + version = "1.5.0"; + sha256 = "13h4qck1697iswd9f8w17fpjc6yhl2pgrvay7pb22j2h3mgaxpjl"; + libraryHaskellDepends = [ + adjunctions base binary comonad deepseq distributive + finite-typelits hashable indexed-list-literals primitive vector + ]; + description = "Size tagged vectors"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ expipiplus1 ]; + }) {}; + "vector-space" = callPackage ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: mkDerivation { @@ -282268,8 +283381,8 @@ self: { }: mkDerivation { pname = "wai-middleware-prometheus"; - version = "1.0.0"; - sha256 = "0c04cq7q3ck394d7n92mwm0k9qh2dmyn9bsf1n20yzrwrnr9fgkl"; + version = "1.0.0.1"; + sha256 = "1657zar254550skn3hx7y1g06aww2pjls5i4frw6ci4sxy3nynxp"; libraryHaskellDepends = [ base bytestring clock data-default http-types prometheus-client text wai @@ -284821,8 +285934,8 @@ self: { }: mkDerivation { pname = "weeder"; - version = "2.1.3"; - sha256 = "0yph2dzg4xrfs7439jmxn3jc7h42id0c2f987wl6lccrbn39vzd7"; + version = "2.2.0"; + sha256 = "07ylcq8mza4429snaklhfszpg2c0xcp75hyf0jxhi32mpiz7a5v2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -285008,37 +286121,42 @@ self: { }) {}; "wgpu-hs" = callPackage - ({ mkDerivation, base, bytestring, data-default, GLFW-b, text - , transformers, vector, wgpu-raw-hs + ({ mkDerivation, base, bytestring, containers, data-default + , data-has, GLFW-b, lens, mtl, resourcet, safe-exceptions, sdl2 + , string-qq, text, transformers, vector, wgpu-raw-hs }: mkDerivation { pname = "wgpu-hs"; - version = "0.2.0.0"; - sha256 = "1kc5xmknfhh9dmn90rbnplmx8n7f07xwvrvz7dcybjpiw8pr2dml"; + version = "0.3.0.0"; + sha256 = "1m5rglmj20544x36i64iyiz8zb73pci8aqf483wrpfswrvf2k6xg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring data-default GLFW-b text transformers vector - wgpu-raw-hs + base bytestring containers data-default data-has GLFW-b lens mtl + resourcet safe-exceptions sdl2 text vector wgpu-raw-hs ]; executableHaskellDepends = [ - base data-default GLFW-b text transformers + base data-default data-has GLFW-b lens mtl resourcet + safe-exceptions sdl2 string-qq text transformers vector ]; doHaddock = false; description = "WGPU"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "wgpu-raw-hs" = callPackage - ({ mkDerivation, base, GLFW-b, unix }: + ({ mkDerivation, base, GLFW-b, SDL2, sdl2, unix }: mkDerivation { pname = "wgpu-raw-hs"; - version = "0.2.0.0"; - sha256 = "05dzz6q5laxw7wwhly7v5i4bppfqz4yahh8qq6qc0h2c8v0qmdzp"; - libraryHaskellDepends = [ base GLFW-b unix ]; + version = "0.3.0.0"; + sha256 = "0p7j8v0wxjv22b1zmdx0d433rdl91h7p5bcbvm9g30dg8y0fip0x"; + libraryHaskellDepends = [ base GLFW-b sdl2 unix ]; + libraryPkgconfigDepends = [ SDL2 ]; description = "WGPU Raw"; license = lib.licenses.bsd3; - }) {}; + }) {inherit (pkgs) SDL2;}; "what4" = callPackage ({ mkDerivation, attoparsec, base, bifunctors, bimap, bv-sized @@ -286657,6 +287775,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "wrapped" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "wrapped"; + version = "0.1.0.0"; + sha256 = "07xvml89ml36qx23114qr72sk1kqfpj3dassfs5mwhaw45016rk2"; + libraryHaskellDepends = [ base ]; + description = "Provides a single standardized place to hang DerivingVia instances"; + license = lib.licenses.asl20; + }) {}; + + "wrapped-generic-default" = callPackage + ({ mkDerivation, base, data-default-class, wrapped }: + mkDerivation { + pname = "wrapped-generic-default"; + version = "0.1.0.0"; + sha256 = "0h1aay81l8b2nih08pli30ly0vcwvi8n2kdxck60ww2qb2b7wzzc"; + libraryHaskellDepends = [ base data-default-class wrapped ]; + description = "Provides an orphan instance Default (Wrapped Generic a)"; + license = lib.licenses.asl20; + }) {}; + "wraxml" = callPackage ({ mkDerivation, base, containers, data-accessor , explicit-exception, HaXml, hxt, hxt-filter, polyparse, tagchup @@ -290479,8 +291619,8 @@ self: { }: mkDerivation { pname = "yaml-light-lens"; - version = "0.3.3.6"; - sha256 = "034dj7k0719lkhwgrz91wk2dfpxg4kvyj9ax7cpz9q6qa8jn0zp7"; + version = "0.3.4"; + sha256 = "1ac05hm2kh1xv0987yb5vjfrmanvzkq6yx8whi7jxdwdb0fa7l3p"; libraryHaskellDepends = [ base bytestring bytestring-lexing containers lens yaml-light ]; @@ -295600,8 +296740,8 @@ self: { ({ mkDerivation, base, hspec, Z-Data, Z-IO, zookeeper_mt }: mkDerivation { pname = "zoovisitor"; - version = "0.1.2.0"; - sha256 = "0s0svxa7y7a35jg4f0qq6zdg187c2g1s0f3payd26vpwa6rp8f8k"; + version = "0.1.3.1"; + sha256 = "0mfarqcm2h9chbn7kybw58gd6l2wpjkhpg1vgip92djwmvkilarl"; libraryHaskellDepends = [ base Z-Data Z-IO ]; librarySystemDepends = [ zookeeper_mt ]; testHaskellDepends = [ base hspec ]; diff --git a/pkgs/development/interpreters/elixir/1.12.nix b/pkgs/development/interpreters/elixir/1.12.nix index 4b631098fe19..0ea014e36d70 100644 --- a/pkgs/development/interpreters/elixir/1.12.nix +++ b/pkgs/development/interpreters/elixir/1.12.nix @@ -3,7 +3,7 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz mkDerivation { - version = "1.12.2"; - sha256 = "sha256-PQkvBaQQljATt+LA3hWJOFyQessqqR1t6o1J2LHllec="; + version = "1.12.3"; + sha256 = "sha256-Jo9ZC5cSBVpjVnGZ8tEIUKOhW9uvJM/h84+VcnrT0R0="; minimumOTPVersion = "22"; } diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix index f2b2961c4c77..3e36f77dab43 100644 --- a/pkgs/development/interpreters/lua-5/default.nix +++ b/pkgs/development/interpreters/lua-5/default.nix @@ -54,9 +54,4 @@ rec { inherit callPackage; }; - luajit_openresty = import ../luajit/openresty.nix { - self = luajit_openresty; - inherit callPackage; - }; - } diff --git a/pkgs/development/interpreters/luajit/2.0.nix b/pkgs/development/interpreters/luajit/2.0.nix index ceb796f0433e..efae91c17bc7 100644 --- a/pkgs/development/interpreters/luajit/2.0.nix +++ b/pkgs/development/interpreters/luajit/2.0.nix @@ -1,14 +1,12 @@ { self, callPackage, lib }: callPackage ./default.nix { inherit self; - owner = "LuaJIT"; - repo = "LuaJIT"; - version = "2.0.5-2021-06-08"; - rev = "98f95f69180d48ce49289d6428b46a9ccdd67a46"; + version = "2.0.5-2021-07-27"; + rev = "3a654999c6f00de4cb9e61232d23579442e544a0"; isStable = true; - sha256 = "1pdmhk5syp0nir80xcnkf6xy2w5rwslak8hgmjpgaxzlnrjcgs7p"; + sha256 = "0q187vn6bspn9i33hrvfy59mh83nd8jjmik5qkkkc3vls13jxr6z"; extraMeta = { # this isn't precise but it at least stops the useless Hydra build - platforms = with lib; filter (p: p != "aarch64-linux") + platforms = with lib; filter (p: !hasPrefix "aarch64-" p) (platforms.linux ++ platforms.darwin); }; } diff --git a/pkgs/development/interpreters/luajit/2.1.nix b/pkgs/development/interpreters/luajit/2.1.nix index 87976a45dfe1..6ac47a6c3359 100644 --- a/pkgs/development/interpreters/luajit/2.1.nix +++ b/pkgs/development/interpreters/luajit/2.1.nix @@ -1,10 +1,8 @@ { self, callPackage }: callPackage ./default.nix { inherit self; - owner = "LuaJIT"; - repo = "LuaJIT"; - version = "2.1.0-2021-06-25"; - rev = "e957737650e060d5bf1c2909b741cc3dffe073ac"; + version = "2.1.0-2021-08-12"; + rev = "8ff09d9f5ad5b037926be2a50dc32b681c5e7597"; isStable = false; - sha256 = "04i7n5xdd1nci4mv2p6bv71fq5b1nkswz12hcgirsxqbnkrlbbcj"; + sha256 = "18wp8sgmiwlslnvgs35cy35ji2igksyfm3f8hrx07hqmsq2d77vr"; } diff --git a/pkgs/development/interpreters/luajit/aarch64-darwin-disable-unwind-external.patch b/pkgs/development/interpreters/luajit/aarch64-darwin-disable-unwind-external.patch new file mode 100644 index 000000000000..dcfb1e9d4e7f --- /dev/null +++ b/pkgs/development/interpreters/luajit/aarch64-darwin-disable-unwind-external.patch @@ -0,0 +1,14 @@ +diff --git a/src/Makefile b/src/Makefile +index 2538503f..7e6380da 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -320,7 +320,9 @@ ifeq (Darwin,$(TARGET_SYS)) + $(error missing: export MACOSX_DEPLOYMENT_TARGET=XX.YY) + endif + TARGET_STRIP+= -x ++ ifneq (arm64,$(shell uname -m)) + TARGET_XCFLAGS+= -DLUAJIT_UNWIND_EXTERNAL ++ endif + TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC + TARGET_DYNXLDOPTS= + TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER) diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 728161598282..6a163c4b562f 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -1,15 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, buildPackages +{ lib +, stdenv +, fetchFromGitHub +, buildPackages , name ? "luajit-${version}" , isStable -, owner -, repo , sha256 , rev , version -, extraMeta ? {} +, extraMeta ? { } , callPackage , self -, packageOverrides ? (self: super: {}) +, packageOverrides ? (self: super: { }) , enableFFI ? true , enableJIT ? true , enableJITDebugModule ? enableJIT @@ -26,28 +27,34 @@ assert enableJITDebugModule -> enableJIT; assert enableGDBJITSupport -> enableJIT; assert enableValgrindSupport -> valgrind != null; let - luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;}; + luaPackages = callPackage ../../lua-modules { lua = self; overrides = packageOverrides; }; XCFLAGS = with lib; - optional (!enableFFI) "-DLUAJIT_DISABLE_FFI" - ++ optional (!enableJIT) "-DLUAJIT_DISABLE_JIT" - ++ optional enable52Compat "-DLUAJIT_ENABLE_LUA52COMPAT" - ++ optional (!enableGC64) "-DLUAJIT_DISABLE_GC64" - ++ optional useSystemMalloc "-DLUAJIT_USE_SYSMALLOC" - ++ optional enableValgrindSupport "-DLUAJIT_USE_VALGRIND" - ++ optional enableGDBJITSupport "-DLUAJIT_USE_GDBJIT" - ++ optional enableAPICheck "-DLUAJIT_USE_APICHECK" - ++ optional enableVMAssertions "-DLUAJIT_USE_ASSERT" + optional (!enableFFI) "-DLUAJIT_DISABLE_FFI" + ++ optional (!enableJIT) "-DLUAJIT_DISABLE_JIT" + ++ optional enable52Compat "-DLUAJIT_ENABLE_LUA52COMPAT" + ++ optional (!enableGC64) "-DLUAJIT_DISABLE_GC64" + ++ optional useSystemMalloc "-DLUAJIT_USE_SYSMALLOC" + ++ optional enableValgrindSupport "-DLUAJIT_USE_VALGRIND" + ++ optional enableGDBJITSupport "-DLUAJIT_USE_GDBJIT" + ++ optional enableAPICheck "-DLUAJIT_USE_APICHECK" + ++ optional enableVMAssertions "-DLUAJIT_USE_ASSERT" ; in stdenv.mkDerivation rec { inherit name version; src = fetchFromGitHub { - inherit owner repo sha256 rev; + owner = "LuaJIT"; + repo = "LuaJIT"; + inherit sha256 rev; }; luaversion = "5.1"; + # Fix for pcall on aarch64-darwin. + # Upstream issue: https://github.com/LuaJIT/LuaJIT/issues/698 + patches = lib.optionals (stdenv.hostPlatform.system == "aarch64-darwin") [ ./aarch64-darwin-disable-unwind-external.patch ]; + postPatch = '' substituteInPlace Makefile --replace ldconfig : if test -n "''${dontStrip-}"; then @@ -82,8 +89,10 @@ stdenv.mkDerivation rec { ''; LuaPathSearchPaths = [ - "lib/lua/${luaversion}/?.lua" "share/lua/${luaversion}/?.lua" - "share/lua/${luaversion}/?/init.lua" "lib/lua/${luaversion}/?/init.lua" + "lib/lua/${luaversion}/?.lua" + "share/lua/${luaversion}/?.lua" + "share/lua/${luaversion}/?/init.lua" + "lib/lua/${luaversion}/?/init.lua" "share/${name}/?.lua" ]; LuaCPathSearchPaths = [ "lib/lua/${luaversion}/?.so" "share/lua/${luaversion}/?.so" ]; @@ -94,16 +103,16 @@ stdenv.mkDerivation rec { lua = self; inherit (luaPackages) requiredLuaModules; }; - withPackages = import ../lua-5/with-packages.nix { inherit buildEnv luaPackages;}; + withPackages = import ../lua-5/with-packages.nix { inherit buildEnv luaPackages; }; pkgs = luaPackages; interpreter = "${self}/bin/lua"; }; meta = with lib; { description = "High-performance JIT compiler for Lua 5.1"; - homepage = "http://luajit.org"; - license = licenses.mit; - platforms = platforms.linux ++ platforms.darwin; + homepage = "http://luajit.org"; + license = licenses.mit; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ thoughtpolice smironov vcunat andir lblasc ]; } // extraMeta; } diff --git a/pkgs/development/interpreters/luajit/openresty.nix b/pkgs/development/interpreters/luajit/openresty.nix deleted file mode 100644 index 78e06f46f1d0..000000000000 --- a/pkgs/development/interpreters/luajit/openresty.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ self, callPackage }: -callPackage ./default.nix rec { - inherit self; - owner = "openresty"; - repo = "luajit2"; - version = "2.1-20210510"; - rev = "v${version}"; - isStable = true; - sha256 = "1h21w5axwka2j9jb86yc69qrprcavccyr2qihiw4b76r1zxzalvd"; -} diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix index f1a7420fbce7..f53ea0d705cc 100644 --- a/pkgs/development/libraries/bamf/default.nix +++ b/pkgs/development/libraries/bamf/default.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { pname = "bamf"; - version = "0.5.4"; + version = "0.5.5"; outputs = [ "out" "dev" "devdoc" ]; src = fetchgit { url = "https://git.launchpad.net/~unity-team/bamf"; - rev = version; - sha256 = "1klvij1wyhdj5d8sr3b16pfixc1yk8ihglpjykg7zrr1f50jfgsz"; + rev = "${version}+21.10.20210710-0ubuntu1"; + sha256 = "0iwz5z5cz9r56pmfjvjd2kcjlk416dw6g38svs33ynssjgsqbdm0"; }; nativeBuildInputs = [ @@ -57,11 +57,6 @@ stdenv.mkDerivation rec { libwnck ]; - patches = [ - # Port tests and checks to python3 lxml. - ./gtester2xunit-python3.patch - ]; - # Fix hard-coded path # https://bugs.launchpad.net/bamf/+bug/1780557 postPatch = '' diff --git a/pkgs/development/libraries/bamf/gtester2xunit-python3.patch b/pkgs/development/libraries/bamf/gtester2xunit-python3.patch deleted file mode 100644 index 8dc478541943..000000000000 --- a/pkgs/development/libraries/bamf/gtester2xunit-python3.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 41cb7db..93ef0ec 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -115,9 +115,9 @@ GTK_DOC_CHECK(1.0) - - AC_PATH_PROG([PYTHON],[python]) - AC_MSG_CHECKING(for gtester2xunit dependencies) --if !($PYTHON -c "import libxslt, libxml2" 2> /dev/null); then -+if !($PYTHON -c "import lxml" 2> /dev/null); then - AC_MSG_RESULT([no]) -- AC_MSG_ERROR([You need to install python-libxslt1 and python-libxml2]); -+ AC_MSG_ERROR([You need to install python-lxml]); - fi - AC_MSG_RESULT([yes]) - -@@ -189,6 +189,6 @@ ${PACKAGE}-${VERSION} - Introspection: ${enable_introspection} - Headless tests: ${enable_headless_tests} - Coverage Reporting: ${use_gcov} -- Export actions menus: ${enable_export_actions_menu} -+ Export actions menus: ${enable_export_actions_menu} - - EOF -diff --git a/tests/gtester2xunit.py b/tests/gtester2xunit.py -index fbe3c66..861d541 100755 ---- a/tests/gtester2xunit.py -+++ b/tests/gtester2xunit.py -@@ -1,18 +1,17 @@ - #! /usr/bin/python - from argparse import ArgumentParser --import libxslt --import libxml2 - import sys - import os -+from lxml import etree - - XSL_TRANSFORM='/usr/share/gtester2xunit/gtester.xsl' - - def transform_file(input_filename, output_filename, xsl_file): -- gtester = libxml2.parseFile(xsl_file) -- style = libxslt.parseStylesheetDoc(gtester) -- doc = libxml2.parseFile(input_filename) -- result = style.applyStylesheet(doc, None) -- result.saveFormatFile(filename=output_filename, format=True) -+ gtester = etree.parse(xsl_file) -+ style = etree.XSLT(gtester) -+ doc = etree.parse(input_filename) -+ result = style(doc) -+ result.write(filename=output_filename, format=True) - - - def get_output_filename(input_filename): diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 91551d076dcf..b2774e41ce46 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (rec { pname = "folly"; - version = "2021.08.23.00"; + version = "2021.08.30.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "sha256-B+J4h12jjusA15+QRR3egmUEwYRrnegtEWMuQX+QuJk="; + sha256 = "sha256-LS1FD5NMLkv7dr4j1b75aEdTDJdbjrXymF7eDFPGRDI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix index 236305a572bf..87997cead43f 100644 --- a/pkgs/development/libraries/freeimage/default.nix +++ b/pkgs/development/libraries/freeimage/default.nix @@ -18,6 +18,14 @@ stdenv.mkDerivation { prePatch = "rm -rf Source/Lib* Source/OpenEXR Source/ZLib"; patches = [ ./unbundle.diff ]; + postPatch = '' + # To support cross compilation, use the correct `pkg-config`. + substituteInPlace Makefile.fip \ + --replace "pkg-config" "$PKG_CONFIG" + substituteInPlace Makefile.gnu \ + --replace "pkg-config" "$PKG_CONFIG" + ''; + nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 5723323defd6..aa89d947a012 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -55,6 +55,7 @@ , opencv4 , openexr , openh264 +, libopenmpt , pango , rtmpdump , sbc @@ -143,6 +144,7 @@ stdenv.mkDerivation rec { mpeg2dec libmicrodns openjpeg + libopenmpt libopus librsvg curl.dev @@ -250,7 +252,6 @@ stdenv.mkDerivation rec { # is needed, and then patching upstream to find it (though it probably # already works on Arch?). "-Dmusepack=disabled" - "-Dopenmpt=disabled" # `libopenmpt` not packaged in nixpkgs as of writing "-Dopenni2=disabled" # not packaged in nixpkgs as of writing "-Dopensles=disabled" # not packaged in nixpkgs as of writing "-Dsctp=disabled" # required `usrsctp` library not packaged in nixpkgs as of writing diff --git a/pkgs/development/libraries/imath/default.nix b/pkgs/development/libraries/imath/default.nix index f3678064f3c5..15bd5907af9e 100644 --- a/pkgs/development/libraries/imath/default.nix +++ b/pkgs/development/libraries/imath/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "imath"; - version = "3.1.2"; + version = "3.1.3"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "imath"; rev = "v${version}"; - sha256 = "sha256-X+LY1xtMeYMO6Ri6fmBF2JEDuY6MF7j5XO5YhWMuffM="; + sha256 = "sha256-LoyV1Wtugva6MTpREstP2rYMrHW2xR0qfEAIV1Fo1Ns="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libjxl/default.nix b/pkgs/development/libraries/libjxl/default.nix index d33b2bc3bb58..b406654caba1 100644 --- a/pkgs/development/libraries/libjxl/default.nix +++ b/pkgs/development/libraries/libjxl/default.nix @@ -18,17 +18,24 @@ stdenv.mkDerivation rec { pname = "libjxl"; - version = "unstable-2021-06-22"; + version = "0.5"; src = fetchFromGitHub { owner = "libjxl"; repo = "libjxl"; - rev = "409efe027d6a4a4446b84abe8d7b2fa40409257d"; - sha256 = "1akb6yyp2h4h6mfcqd4bgr3ybcik5v5kdc1rxaqnyjs7fp2f6nvv"; + rev = "v${version}"; + sha256 = "0grljgmy6cfhm8zni9d1mdn01qzc49k1pl75vhr7qcd3sp4r8lxm"; # There are various submodules in `third_party/`. fetchSubmodules = true; }; + # hydra's darwin machines run into https://github.com/libjxl/libjxl/issues/408 + # unless we disable highway's tests + postPatch = lib.optional stdenv.isDarwin '' + substituteInPlace third_party/highway/CMakeLists.txt \ + --replace 'if(BUILD_TESTING)' 'if(false)' + ''; + nativeBuildInputs = [ asciidoc # for docs cmake 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" ]; 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 ]; 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); 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 68759cabeaaf..3e1467d10819 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -175,7 +175,6 @@ , "mathjax" , "meat" , "@mermaid-js/mermaid-cli" -, "mirakurun" , "mocha" , "multi-file-swagger" , "musescore-downloader" diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix index ec20eedd7688..090b96ece0cc 100644 --- a/pkgs/development/ocaml-modules/camomile/default.nix +++ b/pkgs/development/ocaml-modules/camomile/default.nix @@ -15,7 +15,11 @@ buildDunePackage rec { buildInputs = [ cppo ]; - configurePhase = "ocaml configure.ml --share $out/share/camomile"; + configurePhase = '' + runHook preConfigure + ocaml configure.ml --share $out/share/camomile + runHook postConfigure + ''; meta = { inherit (src.meta) homepage; diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index 272ff72d8c59..6a50c73103b7 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -11,7 +11,11 @@ buildDunePackage { sha256 = "0kzqkk451m69nqi5qiwak0rd0rp5vzi613gcngsiig7dyxwka61c"; }; - dontConfigure = true; + # dont do autotools configuration, but do trigger findlib's preConfigure hook + configurePhase = '' + runHook preConfigure + runHook postConfigure + ''; buildInputs = [ dune-configurator ncurses ]; propagatedBuildInputs = [ zarith zlib ]; diff --git a/pkgs/development/ocaml-modules/erm_xmpp/default.nix b/pkgs/development/ocaml-modules/erm_xmpp/default.nix index cff155f47098..9eaad7575ec3 100644 --- a/pkgs/development/ocaml-modules/erm_xmpp/default.nix +++ b/pkgs/development/ocaml-modules/erm_xmpp/default.nix @@ -16,9 +16,21 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; propagatedBuildInputs = [ erm_xml mirage-crypto mirage-crypto-rng base64 ]; - configurePhase = "ocaml setup.ml -configure --prefix $out"; - buildPhase = "ocaml setup.ml -build"; - installPhase = "ocaml setup.ml -install"; + configurePhase = '' + runHook preConfigure + ocaml setup.ml -configure --prefix $out + runHook postConfigure + ''; + buildPhase = '' + runHook preBuild + ocaml setup.ml -build + runHook postBuild + ''; + installPhase = '' + runHook preInstall + ocaml setup.ml -install + runHook postInstall + ''; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix index 5c7d36fcc08d..d1860788838a 100644 --- a/pkgs/development/ocaml-modules/extlib/default.nix +++ b/pkgs/development/ocaml-modules/extlib/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib cppo ]; createFindlibDestdir = true; - dontConfigure = true; makeFlags = lib.optional minimal "minimal=1"; diff --git a/pkgs/development/ocaml-modules/janestreet/0.14.nix b/pkgs/development/ocaml-modules/janestreet/0.14.nix index 5717dd07b423..23f2cb5cd651 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -351,7 +351,8 @@ with self; parsexp = janePackage { pname = "parsexp"; - hash = "0rvbrf8ggh2imsbhqi15jzyyqbi3m5hzvy2iy2r4skx6m102mzpd"; + version = "0.14.1"; + hash = "1nr0ncb8l2mkk8pqzknr7fsqw5kpz8y102kyv5bc0x7c36v0d4zy"; minimumOCamlVersion = "4.04.2"; meta.description = "S-expression parsing library"; propagatedBuildInputs = [ base sexplib0 ]; diff --git a/pkgs/development/ocaml-modules/visitors/default.nix b/pkgs/development/ocaml-modules/visitors/default.nix index a47cd414fb1e..42c077e24a87 100644 --- a/pkgs/development/ocaml-modules/visitors/default.nix +++ b/pkgs/development/ocaml-modules/visitors/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "visitors"; - version = "20210316"; + version = "20210608"; useDune2 = true; @@ -13,13 +13,14 @@ buildDunePackage rec { repo = pname; rev = version; domain = "gitlab.inria.fr"; - sha256 = "12d45ncy3g9mpcs6n58aq6yzs5qz662msgcr7ccms9jhiq44m8f7"; + sha256 = "1p75x5yqwbwv8yb2gz15rfl3znipy59r45d1f4vcjdghhjws6q2a"; }; propagatedBuildInputs = [ ppxlib ppx_deriving result ]; meta = with lib; { homepage = "https://gitlab.inria.fr/fpottier/visitors"; + changelog = "https://gitlab.inria.fr/fpottier/visitors/-/raw/${version}/CHANGES.md"; license = licenses.lgpl21; description = "An OCaml syntax extension (technically, a ppx_deriving plugin) which generates object-oriented visitors for traversing and transforming data structures"; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix index 04e21ac9a68e..7f235485b757 100644 --- a/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/pkgs/development/python-modules/async-upnp-client/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.20.0"; + version = "0.21.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "StevenLooman"; repo = "async_upnp_client"; rev = version; - sha256 = "sha256-jxYGOljV7tcsiAgpOhbXj7g7AwyP1kDDC83PiHG6ZFg="; + sha256 = "sha256-GKvljxm2N4pC8Mh+UOW170VPB3va9X9BuQXp6OJ/SSQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bidict/default.nix b/pkgs/development/python-modules/bidict/default.nix index 8ad3534170d5..8e32a0830035 100644 --- a/pkgs/development/python-modules/bidict/default.nix +++ b/pkgs/development/python-modules/bidict/default.nix @@ -1,5 +1,6 @@ -{ lib, buildPythonPackage, fetchPypi -, setuptools-scm +{ lib +, buildPythonPackage +, fetchPypi , sphinx , hypothesis , py @@ -7,21 +8,23 @@ , pytest-benchmark , sortedcollections , sortedcontainers -, isPy3k +, pythonOlder }: buildPythonPackage rec { pname = "bidict"; - version = "0.21.2"; - disabled = !isPy3k; + version = "0.21.3"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "4fa46f7ff96dc244abfc437383d987404ae861df797e2fd5b190e233c302be09"; + sha256 = "sha256-1QvYH65140GY/8lJeaDrCTn/mts+8yvMk6kT2LPj7R0="; }; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ sphinx ]; + propagatedBuildInputs = [ + sphinx + ]; checkInputs = [ hypothesis @@ -32,6 +35,8 @@ buildPythonPackage rec { sortedcontainers ]; + pythonImportsCheck = [ "bidict" ]; + meta = with lib; { homepage = "https://github.com/jab/bidict"; description = "Efficient, Pythonic bidirectional map data structures and related functionality"; diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index ad97a5f04c8b..ad20467f162d 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.3.2"; + version = "2.3.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-S+47qRZLZs72TxCZ6aO4jpndzQyUOAfplENhPhhLSLQ="; + sha256 = "sha256-Dt9jCkRxpIYnrsC4QM87jhCQEZHTKPZRFWBCBFneKC4="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index 2b968fb991a7..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 @@ -10,6 +9,7 @@ , mypy-extensions , pathspec , parameterized +, platformdirs , regex , tomli , typed-ast @@ -20,13 +20,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 ]; @@ -59,12 +59,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp aiohttp-cors - appdirs attrs click colorama mypy-extensions pathspec + platformdirs regex tomli typed-ast # required for tests and python2 extra 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 = [ diff --git a/pkgs/development/python-modules/django-jinja2/default.nix b/pkgs/development/python-modules/django-jinja2/default.nix index 266160fc17f8..04885072c678 100644 --- a/pkgs/development/python-modules/django-jinja2/default.nix +++ b/pkgs/development/python-modules/django-jinja2/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "django-jinja"; - version = "2.9.0"; + version = "2.9.1"; meta = { description = "Simple and nonobstructive jinja2 integration with Django"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "69433ea312264a541acf1e3e9748e44783ad33381e48e6a7230762e02f005276"; + sha256 = "6c1fc68b0f4b1fb21b208a3e5dc19a3b11bab2812c06f827d5fdbd24001a1910"; }; buildInputs = [ django pytz tox ]; diff --git a/pkgs/development/python-modules/hg-commitsigs/default.nix b/pkgs/development/python-modules/hg-commitsigs/default.nix new file mode 100644 index 000000000000..5c195bfe19f1 --- /dev/null +++ b/pkgs/development/python-modules/hg-commitsigs/default.nix @@ -0,0 +1,41 @@ +{ lib +, fetchhg +, stdenv +, python3 +}: + +stdenv.mkDerivation rec { + pname = "hg-commitsigs"; + # Latest tag is 11 years old. + version = "unstable-2021-01-08"; + + src = fetchhg { + url = "https://foss.heptapod.net/mercurial/commitsigs"; + rev = "b53eb6862bff"; + sha256 = "sha256-PS1OhC9MiVFD7WYlIn6FavD5TyhM50WoV6YagI2pLxU="; + }; + + # Not sure how the tests are supposed to be run, and they 10 years old... + doCheck = false; + dontBuild = true; + + installPhase = '' + mkdir -p $out/lib/${python3.libPrefix}/site-packages/hgext3rd/ + install -D $src/commitsigs.py \ + $out/lib/${python3.libPrefix}/site-packages/hgext3rd/ + ''; + + meta = with lib; { + description = "Automatic signing of changeset hashes"; + longDescription = '' + This packages provides a Mercurial extension that lets you sign + the changeset hash when you commit. The signature is embedded + directly in the changeset itself; there wont be any extra + commits. Either GnuPG or OpenSSL can be used to sign the hashes. + ''; + homepage = "https://foss.heptapod.net/mercurial/commitsigs"; + maintainers = with maintainers; [ yoctocell ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; # same as Mercurial + }; +} diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix index bc8f6159bbba..040c34ee8006 100644 --- a/pkgs/development/python-modules/numpy-stl/default.nix +++ b/pkgs/development/python-modules/numpy-stl/default.nix @@ -1,4 +1,13 @@ -{ lib, buildPythonPackage, fetchPypi, cython, numpy, nine, pytest, pytest-runner, python-utils, enum34 }: +{ lib +, buildPythonPackage +, cython +, enum34 +, fetchPypi +, nine +, numpy +, pytestCheckHook +, python-utils +}: buildPythonPackage rec { pname = "numpy-stl"; @@ -9,15 +18,24 @@ buildPythonPackage rec { sha256 = "3e635b6fb6112a3c5e00e9e20eedab93b9b0c45ff1cc34eb7bdc0b3e922e2d77"; }; - checkInputs = [ pytest pytest-runner ]; + propagatedBuildInputs = [ + cython + enum34 + nine + numpy + python-utils + ]; - checkPhase = "py.test"; + checkInputs = [ + pytestCheckHook + ]; - propagatedBuildInputs = [ cython numpy nine python-utils enum34 ]; + pythonImportsCheck = [ "stl" ]; meta = with lib; { description = "Library to make reading, writing and modifying both binary and ascii STL files easy"; homepage = "https://github.com/WoLpH/numpy-stl/"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/poetry-semver/default.nix b/pkgs/development/python-modules/poetry-semver/default.nix new file mode 100644 index 000000000000..2318a2cf60be --- /dev/null +++ b/pkgs/development/python-modules/poetry-semver/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "poetry-semver"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-2Am2Eqons5vy0PydMbT0gJsOlyZGxfGc+kbHJbdjiBA="; + }; + + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "A semantic versioning library for Python."; + homepage = "https://github.com/python-poetry/semver"; + license = licenses.mit; + maintainers = with maintainers; [ cpcloud ]; + }; +} diff --git a/pkgs/development/python-modules/poetry2conda/default.nix b/pkgs/development/python-modules/poetry2conda/default.nix new file mode 100644 index 000000000000..7f5268a23dc4 --- /dev/null +++ b/pkgs/development/python-modules/poetry2conda/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, pytest-mock +, pytestCheckHook +, toml +, poetry +, poetry-semver +, pyyaml +}: + +buildPythonApplication rec { + pname = "poetry2conda"; + version = "0.3.0"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "dojeda"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-UqNoEGgStvqtxhYwExk7wO4SvATaM2kGaFbB5ViJa7U="; + }; + + nativeBuildInputs = [ poetry ]; + + propagatedBuildInputs = [ + poetry-semver + toml + ]; + + checkInputs = [ + pytest-mock + pytestCheckHook + pyyaml + ]; + + meta = with lib; { + description = "A script to convert a Python project declared on a pyproject.toml to a conda environment"; + homepage = "https://github.com/dojeda/poetry2conda"; + license = licenses.mit; + maintainers = with maintainers; [ cpcloud ]; + }; +} 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/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 = [ diff --git a/pkgs/development/python-modules/pyezviz/default.nix b/pkgs/development/python-modules/pyezviz/default.nix index 1c2593d5a6df..47337335fb6c 100644 --- a/pkgs/development/python-modules/pyezviz/default.nix +++ b/pkgs/development/python-modules/pyezviz/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pyezviz"; - version = "0.1.9.2"; + version = "0.1.9.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "baqs"; repo = "pyEzviz"; rev = version; - sha256 = "sha256-t5b2PuHC+ZY2uh+ryS+bjTS7kReZi0Rvlvkr98JFyH4="; + sha256 = "sha256-TDFkEz8I0/YoAFhWSYkLqL4+R4yiqAu+QncEieAlh2A="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix index 6da6b7803828..50a0b4130225 100644 --- a/pkgs/development/python-modules/pyvicare/default.nix +++ b/pkgs/development/python-modules/pyvicare/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyvicare"; - version = "2.7.1"; + version = "2.8"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "somm15"; repo = "PyViCare"; rev = version; - sha256 = "sha256-YczzB95RyOdRGEye1pUqCZxegtp6kjCtUUHYyHD0WP0="; + sha256 = "sha256-mVuwajfY5IAhu6giGrgWw17MDexmR2JDT/9iL3nqJrM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index 4b3442657ff8..f7c2cdbf27ac 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -36,7 +36,9 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ + brotlicffi certifi + charset-normalizer chardet idna urllib3 diff --git a/pkgs/development/python-modules/simplisafe-python/default.nix b/pkgs/development/python-modules/simplisafe-python/default.nix index d79b741d278e..09f7a3056fbd 100644 --- a/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/pkgs/development/python-modules/simplisafe-python/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "simplisafe-python"; - version = "11.0.5"; + version = "11.0.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-QLxp7WrYXJDGVG/MZ+GpvzYZ8gyLwconqikgs581voI="; + sha256 = "sha256-XVn/GBcTTthvsRJOnCZ0yOF3nUwbBZ2dfMJZsJXnE6U="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/xkcdpass/default.nix b/pkgs/development/python-modules/xkcdpass/default.nix index 233f77613fe8..f74332e53649 100644 --- a/pkgs/development/python-modules/xkcdpass/default.nix +++ b/pkgs/development/python-modules/xkcdpass/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "xkcdpass"; - version = "1.19.2"; + version = "1.19.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-F7977Tb8iu/pRy6YhginJgK0N0G3CjPpHjomLTFf1F8="; + sha256 = "c5a2e948746da6fe504e8404284f457d8e98da6df5047c6bb3f71b18882e9d2a"; }; nativeBuildInputs = [ installShellFiles ]; 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/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 = [ 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; diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 78df8883cf9b..e87a6be9cc55 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.158.0"; + version = "0.159.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "sha256-Wl+Jux20gtl+upaKcFF3ub5TetNUf2GwfenH+Ddvqfw="; + sha256 = "sha256-NGYaevL6Jpv5rkYlSzIFMIn36ds7ecOJtEToQIzbOsU="; }; installPhase = '' diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/development/tools/continuous-integration/drone-cli/default.nix index 21dbbcf0b72c..4ee5870e47cd 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; { diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index ad88f368e8ad..5399e863f949 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.12.24"; + version = "0.12.25"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-oD8QjjolEfmfxs+Q4duVUCbEp74HzIWaPrmH8Vn1H+o="; + sha256 = "sha256-2qYfev8x+DmtujIRNgwblTD31Lr+WvQQ/XXjjBOVusE="; }; vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; 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"; }; } diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index 4c7d20bb74b9..3887a1591483 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-task"; - version = "3.7.0"; + version = "3.7.3"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "v${version}"; - sha256 = "sha256-EksCnhSde25hradmKaDSOfIa/QnMAlIbgbQWX6k5v+4="; + sha256 = "sha256-/NeOMLfYU37Ra7RG/vofq+45Thky6kfGDcgnQxVLVGo="; }; - vendorSha256 = "sha256-Y2Yuc2pcxW0M1CJfN3dezPB9cg6MvOUg5A+yFHCwntk="; + vendorSha256 = "sha256-NU0Mgt8TJE/uE9/f2pFLRT0x6ZgCDbRcomlMFkA+juA="; doCheck = false; 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 ]; diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index f9121e1e206f..9e852793ab7a 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = version; - sha256 = "sha256-dolx2P7bnGiK3azMkwj75+ZA3qYr3rCUSLhMPtK85zA="; + sha256 = "sha256-KC/m+I4uOBS0bJb5yvxSkj+1Jlq+bekLTqHlz4vqv8I="; }; - cargoSha256 = "sha256-GPetK2uGB4HIPr/3DdTA0HNHELS8V1MqPtpgilubo9k="; + cargoSha256 = "sha256-et7V7orw2msv30nJ9sntzEQoeN1YqhHMnHOUt4a6e2I="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix index 6854c7c20ca3..10c7bf63aa41 100644 --- a/pkgs/development/tools/ocaml/oasis/default.nix +++ b/pkgs/development/tools/ocaml/oasis/default.nix @@ -18,9 +18,21 @@ stdenv.mkDerivation { ocaml findlib ocamlbuild ocamlmod ocamlify ]; - configurePhase = "ocaml setup.ml -configure --prefix $out"; - buildPhase = "ocaml setup.ml -build"; - installPhase = "ocaml setup.ml -install"; + configurePhase = '' + runHook preConfigure + ocaml setup.ml -configure --prefix $out + runHook postConfigure + ''; + buildPhase = '' + runHook preBuild + ocaml setup.ml -build + runHook postBuild + ''; + installPhase = '' + runHook preInstall + ocaml setup.ml -install + runHook postInstall + ''; meta = with lib; { homepage = "http://oasis.forge.ocamlcore.org/"; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-agda.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-agda.json index f16877e94655..36dd834d4d0f 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-agda.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-agda.json @@ -4,6 +4,7 @@ "date": "2019-09-20T18:06:06+08:00", "path": "/nix/store/wqz9v9znaiwhhqi19hgig9bn0yvl4i9s-tree-sitter-agda", "sha256": "1wpfj47l97pxk3i9rzdylqipy849r482fnj3lmx8byhalv7z1vm6", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json index abb86b305459..090ee63616ec 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json @@ -4,6 +4,7 @@ "date": "2021-03-04T14:15:26-08:00", "path": "/nix/store/nvlvdv02wdy4dq4w19bvzq6nlkgvpj20-tree-sitter-bash", "sha256": "18c030bb65r50i6z37iy7jb9z9i8i36y7b08dbc9bchdifqsijs5", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json index 8b8315e4abdc..eefde83db98b 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-c-sharp", - "rev": "3953034ee61e8639100b063092d4280e047ca9e9", - "date": "2021-06-21T12:18:46+02:00", - "path": "/nix/store/8f2bnr790zwibhyd3jqjm38zfc1md5is-tree-sitter-c-sharp", - "sha256": "0k6pb27f463y88bf6ym0zl4d36182y5cr3013j71h3vlg264z96c", + "rev": "87c1aba089207f0fcc022ed88138af5a3e4cf454", + "date": "2021-09-05T21:16:06+01:00", + "path": "/nix/store/wx1asjwcpcmizavl7z756q55z3mvn714-tree-sitter-c-sharp", + "sha256": "1c1s2x7bpirsrkr6cqj9v4czpgavyf6b9dg290l9v7vd9fg3zh6v", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json index 9ed735f1e3fa..4e8c4521613f 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-c", - "rev": "008008e30a81849fca0c79291e2b480855e0e02c", - "date": "2021-05-26T09:13:01-07:00", - "path": "/nix/store/vkps4991ip8dhgjqwfw7mamnmnizw31m-tree-sitter-c", - "sha256": "1mw4vma7kl504qn91f6janiqk9i05849rizqkqhyagb3glfbkrx2", + "rev": "d09ab34013de8a30d97a1912fc30811f1172515f", + "date": "2021-08-16T09:37:46-07:00", + "path": "/nix/store/94lp3b3hgap1baci006329zl2i168scm-tree-sitter-c", + "sha256": "0wf85g82p5j1vlw7rphfcpwch4b8sbvp4kk095aqmmcsm7d7dxl4", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json index 0037ab6c42d4..3da60411f95c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json @@ -4,6 +4,7 @@ "date": "2021-08-13T15:03:50-05:00", "path": "/nix/store/4aqsac34f0pzpa889067dqci743axrmx-tree-sitter-comment", "sha256": "0fqhgvpd391nxrpyhxcp674h8qph280ax6rm6dz1pj3lqs3grdka", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json index 4de8502e4151..95a0ea8a478d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-cpp", - "rev": "53afc568b70e4b71ee799501f34c876ad511f56e", - "date": "2021-08-13T10:48:59-05:00", - "path": "/nix/store/6gj41lh1fnnmcrz4c1bk3ncw0kpm97nm-tree-sitter-cpp", - "sha256": "02avniqmb5hgpkzwmkgxhrxk296dbkra9miyi5pax461ab4j7a9r", + "rev": "5bb411db33c86b108c891fb2c1473ddc9fad9701", + "date": "2021-08-17T11:20:29-07:00", + "path": "/nix/store/a23w5pnww3wryjs1vimp5ggvgq9bg0rl-tree-sitter-cpp", + "sha256": "1gxd40ipbzjhlk2amsk09v67cjxk4wal60kxycnb04lp6wxwlm8b", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json index 924eea489cee..9b67d955eeb5 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-css", - "rev": "94e10230939e702b4fa3fa2cb5c3bc7173b95d07", - "date": "2021-03-04T15:25:23-08:00", - "path": "/nix/store/0q3y4zhphdcc54qijbx2pdp8li9idk64-tree-sitter-css", - "sha256": "0y90nsfbh13mf33yahbk7zklbv7124rpm0v19qydz6nv1f9hpywd", + "rev": "7c390622166517b01445e0bb08f72831731d3088", + "date": "2021-08-17T11:20:41-07:00", + "path": "/nix/store/wx5dzm92k2zv53r5p2s3jv1sak8xdk57-tree-sitter-css", + "sha256": "01r63dqxhgvsc1gkfy0mqsq98dmvc2hdw3c5zdkzdbry8zqpyn8s", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json index 32459e77ef01..53cac3040afc 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json @@ -4,6 +4,7 @@ "date": "2021-03-04T10:06:18-08:00", "path": "/nix/store/09b9drfnywcy1i8wlw6slnn76ch40kqk-tree-sitter-embedded-template", "sha256": "0c9l4i6kwb29zp05h616y3vk2hhcfc8bhdf9m436bk47pfy2zabg", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json index 85e2f5e71b80..e4d5751ab8b2 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json @@ -1,9 +1,10 @@ { "url": "https://github.com/travonted/tree-sitter-fennel", - "rev": "bc689e2ef264e2cba499cfdcd16194e8f5fe87d2", - "date": "2021-03-09T16:47:45-05:00", - "path": "/nix/store/3h4j1mrqvn0ybqjalic92bnhk7c15442-tree-sitter-fennel", - "sha256": "1jm21bmsdrz9x5skqmx433q9b4mfi88gzc4la5hqps4is28inqms", + "rev": "e10b04389094d9b96aa8489121c1f285562d701d", + "date": "2021-08-18T16:21:04-04:00", + "path": "/nix/store/rmlldcr0yq9c87lp96jrajbf5n4xin6r-tree-sitter-fennel", + "sha256": "1bavjjy8wbp1hkj1nps1lsqa9ihwhnj039hfi1fvgxv5j7il74ir", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json index 4699358f6452..b32445c2804c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json @@ -4,6 +4,7 @@ "date": "2021-08-02T21:46:56+01:00", "path": "/nix/store/0n3jfh7gk16bmikix34y5m534ac12xgc-tree-sitter-fish", "sha256": "1810z8ah1b09qpxcr4bh63bxsnxx24r6d2h46v2cpqv1lg0g4z14", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fluent.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fluent.json index f40b8465b7db..6eeb5ccfe0a5 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fluent.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fluent.json @@ -4,6 +4,7 @@ "date": "2018-06-18T13:00:38-07:00", "path": "/nix/store/zbj8abdlrqi9swm8qn8rhpqmjwcz145f-tree-sitter-fluent", "sha256": "0528v9w0cs73p9048xrddb1wpdhr92sn1sw8yyqfrq5sq0danr9k", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json index 69d4869010f4..02fff8098ad6 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-go", - "rev": "eb306e6e60f393df346cfc8cbfaf52667a37128a", - "date": "2021-05-04T14:03:16-07:00", - "path": "/nix/store/xgi4w5by155m1zqhqf2s7hmngy6sxdq3-tree-sitter-go", - "sha256": "03x3nkjxdfck9a4z2i50wq065vixqqk4v5w6fnd870q63v0zrc7c", + "rev": "42b1e657c3a394c01df51dd3eadc8b214274a73c", + "date": "2021-08-16T18:29:17+02:00", + "path": "/nix/store/a1crqhfrd8v9g9w0565aca7nc9k2x7a0-tree-sitter-go", + "sha256": "1khsl8qz6r4dqw7h43m3jw3iqhh79sgpnsps0jy95f165iy496z3", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json index 1a0bf43fff47..3f04f23304dc 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-haskell", - "rev": "30eea3c1339e573cda5dcffd8f9b06003ec31789", - "date": "2021-08-07T14:37:05+02:00", - "path": "/nix/store/b99w2q2y5gjj5h1bxipncaf40dyx5sd2-tree-sitter-haskell", - "sha256": "0cch7bcr4d9ll92vhcp79bjzs9dw0glvdrdj2q2h2mg5mmkzcya8", + "rev": "acafd11d9e45b1c28b49ff798022022b29d8b450", + "date": "2021-08-27T16:35:25+02:00", + "path": "/nix/store/wmw8ppdkndwg3f8phdhws985ckxs0yvk-tree-sitter-haskell", + "sha256": "1zm8m7lpgmh4gr0iw0792bsqi5jpf3w0kx6l3s91clici69nwkiq", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json index b2a0b71f41c2..211e170adced 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-html", - "rev": "af9339f3deb131ab99acfac906713b81dbcc41c9", - "date": "2021-07-11T11:04:28-07:00", - "path": "/nix/store/jg23pmi6jfy4kykah645gl44a145929c-tree-sitter-html", - "sha256": "1qb4rfbra3nc0fwmla8q1hb4r48k8cv3nl60zc24xhrw3q1d9zh1", + "rev": "161a92474a7bb2e9e830e48e76426f38299d99d1", + "date": "2021-08-17T11:20:56-07:00", + "path": "/nix/store/pv8x73j4sbngsqplwfm73jlpwc31mc17-tree-sitter-html", + "sha256": "1gwvgwk0py09pp65vnga522l5r16dvgwxsc76fg66y07k2i63cfk", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json index 0856320ef59b..62bec402bd76 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json @@ -4,6 +4,7 @@ "date": "2021-05-04T14:05:05-07:00", "path": "/nix/store/bzljwaraqj6zqpq85cz9xb0vwh7c10yj-tree-sitter-java", "sha256": "09v3xg1356ghc2n0yi8iqkp80lbkav0jpfgz8iz2j1sl7ihbvkyw", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json index 08ad936562c4..f5b7e3f1c092 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-javascript", - "rev": "bc2eb3994fd7cc605d27a32f9fcbee80bbb57f6d", - "date": "2021-08-13T14:29:43-07:00", - "path": "/nix/store/jkq26hbij9si8ri8k5agkdadr3p1nmbi-tree-sitter-javascript", - "sha256": "0f6bny38za17mmwqw0q0nmdb4f9i0xs7kbzixxgi44yyd43r5pzp", + "rev": "2cc5803225a307308005930b3bedb939b1543722", + "date": "2021-08-29T11:32:53-07:00", + "path": "/nix/store/kjviknhcrayrzv94i762zsy2kvpxpkx6-tree-sitter-javascript", + "sha256": "1xkll7g38j1vajylfaifbn6i5y5f22kmjfy2dxy9bk903assxy05", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json index 94920e80442f..3f9b7203f3ff 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json @@ -4,6 +4,7 @@ "date": "2021-03-04T14:39:14-08:00", "path": "/nix/store/dpm11vziss6jbgp3dxvmgkb0dgg1ygc8-tree-sitter-jsdoc", "sha256": "0qpsy234p30j6955wpjlaqwbr21bi56p0ln5vhrd84s99ac7s6b6", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json index ad00365e71ee..13e67533f401 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-json", - "rev": "65bceef69c3b0f24c0b19ce67d79f57c96e90fcb", - "date": "2021-03-09T16:25:11-05:00", - "path": "/nix/store/bn5smxwwg4zzdc52wp2qb6s6yjdfi8mg-tree-sitter-json", - "sha256": "13p4ffmajirl9qh64d6qnng1gjnh5f6jkqbra0nlc1260nsf12hp", + "rev": "203e239408d642be83edde8988d6e7b20a19f0e8", + "date": "2021-08-18T10:35:07-07:00", + "path": "/nix/store/yqbmn17vs2lxqg5wa8b269fcsd5wr4bv-tree-sitter-json", + "sha256": "08igb9ylfdsjasyn0p9j4sqpp0i2x1qcdzacbmsag02jmkyi6s7f", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json index ef319a1e33d7..9f093a4d4e37 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json @@ -4,6 +4,7 @@ "date": "2021-05-03T17:44:45-07:00", "path": "/nix/store/lbz23r698hn7cha09qq0dbfay7dh74gg-tree-sitter-julia", "sha256": "0rmd7k3rv567psxrlqv17gvckijs19xs6mxni045rpayxmk441sk", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json index b96375e3caf0..c41e4237b767 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json @@ -4,6 +4,7 @@ "date": "2021-07-19T17:50:34+02:00", "path": "/nix/store/vrpfbjfps3bd9vrx8760l0vx7m7ijhja-tree-sitter-latex", "sha256": "0dfpdv5sibvajf2grlc0mqhyggjf6ip9j01jikk58n1yc9va88ib", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json index be89244fc6e7..988f76792273 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json @@ -4,6 +4,7 @@ "date": "2021-08-02T15:13:28+02:00", "path": "/nix/store/h1bhl291jac001w2c8fxi9w7dsqxq5q0-tree-sitter-lua", "sha256": "05ash0l46s66q9yamzzh6ghk8yv0vas13c7dmz0c9xljbjk5ab1d", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json index 0079a47810a3..c908bde0dfff 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json @@ -4,6 +4,7 @@ "date": "2021-04-18T20:49:21+08:00", "path": "/nix/store/4z2k0q6rwqmb7vbqr4vgc26w28szlan3-tree-sitter-markdown", "sha256": "1a2899x7i6dgbsrf13qzmh133hgfrlvmjsr3bbpffi1ixw1h7azk", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json index f857c40c4fe1..e04d8f81ff63 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json @@ -4,6 +4,7 @@ "date": "2021-07-21T20:36:40-05:00", "path": "/nix/store/n5pq9gba570874akpwpvs052d7vyalhh-tree-sitter-nix", "sha256": "03jhvyrsxq49smk9p2apjj839wmzjmrzy045wcxawz1g7xssp9pr", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json index fe6b149e0409..abf7df917efe 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-ocaml", - "rev": "0348562f385bc2bd67ecf181425e1afd6d454192", - "date": "2021-05-07T21:05:16+02:00", - "path": "/nix/store/s2499rsi28k0nrwx8wl2idsp86zsx2iz-tree-sitter-ocaml", - "sha256": "0iqmwcz3c2ai4gyx4xli1rhn6hi6a0f60dn20f8jas9ham9dc2df", + "rev": "23d419ba45789c5a47d31448061557716b02750a", + "date": "2021-08-26T21:21:27+02:00", + "path": "/nix/store/942q4rv9vs77wwvvw46yx0jnqja2cbig-tree-sitter-ocaml", + "sha256": "1bh3afd3iix0gf6ldjngf2c65nyfdwvbmsq25gcxm04jwbg9c6k8", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json index 6f62a595ee3d..ac5891e5409d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-php", - "rev": "63cebc37ebed42887f14cdd0baec961d5a1e16c1", - "date": "2021-08-10T20:56:40+02:00", - "path": "/nix/store/bh4yl563l5fgh7r8f95zzybsavci8hyh-tree-sitter-php", - "sha256": "1psiamww22imw05z0h34yks7vh7y4x4bdn62dwic1gpwfbjdrfmr", + "rev": "77d98f3ce47ea52ff39137be29bc6376951c2286", + "date": "2021-09-03T18:25:31+02:00", + "path": "/nix/store/l143h3fxi89kk7dcp71zjdhdfmfmr68s-tree-sitter-php", + "sha256": "15cl1mdclhjiw72xzkcmw0lxq2hv1bjf2xf2nkgibi7zp8s1qvyw", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json index 1b6e562f85a6..0ba8de4a09cf 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json @@ -4,6 +4,7 @@ "date": "2021-03-27T09:41:53-07:00", "path": "/nix/store/4v24ahydid4hr7kj0xi41mgbpglfnnki-tree-sitter-python", "sha256": "173lpxi4vqa42dcdr9aj5phg5g6ny9ns04djw9n86pasx2w66dhk", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json index 41c63a2ce8c0..d1a73a02c0b4 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json @@ -4,6 +4,7 @@ "date": "2021-06-02T18:46:47+02:00", "path": "/nix/store/yhyi9y09shv1fm87gka43vnv9clvyd92-tree-sitter-ql", "sha256": "0x5f9989ymqvw3g8acckyk4j7zpmnc667qishbgly9icl9rkmv7w", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json index 6df921757bb8..b07344339855 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-regex", - "rev": "3041aa3472d16fd94c6a9e15b741dbfecd9b714e", - "date": "2021-03-04T14:37:27-08:00", - "path": "/nix/store/7d200fzyx2rkbbgf47g5ismvd4id0fqy-tree-sitter-regex", - "sha256": "0jah3apalvp7966sjzdrka2n7f83h64sd56nbq2lzmrxgv98rxmg", + "rev": "7b97502cfc3ffa7110f6b68bb39fb259c9a0500c", + "date": "2021-08-17T11:21:39-07:00", + "path": "/nix/store/3lpj820c141i26p20kin465xlr5jpyjs-tree-sitter-regex", + "sha256": "0n9lmwwgij00078v3fr19vfn1g3wh3agm8jqp80v1cnrcsmpn97p", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json index c8142974fd43..86320373d7ea 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json @@ -4,6 +4,7 @@ "date": "2021-03-03T16:54:30-08:00", "path": "/nix/store/ragrvqj7hm98r74v5b3fljvc47gd3nhj-tree-sitter-ruby", "sha256": "0m3h4928rbs300wcb6776h9r88hi32rybbhcaf6rdympl5nzi83v", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json index b83bcb258852..8e8af00423b8 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-rust", - "rev": "a360da0a29a19c281d08295a35ecd0544d2da211", - "date": "2021-03-27T09:50:22-07:00", - "path": "/nix/store/h4snh879ccy159fa390qr8l0nyaf5ndr-tree-sitter-rust", - "sha256": "0knaza3ww5h5w95hzdaalg5yrfpiv0r394q0imadxp5611132hxz", + "rev": "cc7bdd3e6d14677e8aa77da64f6a3f57b6f8b00a", + "date": "2021-08-17T11:21:11-07:00", + "path": "/nix/store/aw8bi91hz7a26swc5qrfqwn2lrdmiymr-tree-sitter-rust", + "sha256": "15qz4rwz1fkpcy78g0aspfgk9pgykvzv5sxmhgm37nfpgyi7vlg1", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json index ed48c146fbe2..e721ed08eee0 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-scala", - "rev": "ec38674996753f9631615fa558d4f1fa3bf90633", - "date": "2021-08-08T14:43:30-07:00", - "path": "/nix/store/2b0z1j06gvpcn1rvq8hv5vdqlh3qlzmv-tree-sitter-scala", - "sha256": "1xv544wnyd075g5pc8lxi0ix6wrwiv82sdjhzf3wd1np42vxq3d4", + "rev": "449b6baa6b1cd0c2403636459af1571e075dbaa8", + "date": "2021-08-31T13:42:29-07:00", + "path": "/nix/store/8m3s0ndhmns8435g2mlbcz9sdbqgmjz7-tree-sitter-scala", + "sha256": "1lmiljsd5irzc0pabxdcjgfq98xyqm76fracglq68p106mngia07", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json index 41c4fcfe734d..d3ea25aad8f2 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json @@ -4,6 +4,7 @@ "date": "2021-03-20T16:45:11+05:30", "path": "/nix/store/8krdxqwpi95ljrb5jgalwgygz3aljqr8-tree-sitter-svelte", "sha256": "0ckmss5gmvffm6danlsvgh6gwvrlznxsqf6i6ipkn7k5lxg1awg3", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-swift.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-swift.json index 8f73380e3799..0c7fbb0d1add 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-swift.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-swift.json @@ -4,6 +4,7 @@ "date": "2019-10-24T19:04:02-06:00", "path": "/nix/store/pk5xk8yp6vanbar75bhfrs104w0k1ph0-tree-sitter-swift", "sha256": "14b40lmwrnyvdz2wiv684kfh4fvqfhbj1dgrx81ppmy7hsz7jcq7", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-toml.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-toml.json index a3d9bedd133b..ae182486506a 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-toml.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-toml.json @@ -4,6 +4,7 @@ "date": "2021-05-11T12:47:32+08:00", "path": "/nix/store/isgpadcxmgkb14w9yg67pb8lx7wlfhnn-tree-sitter-toml", "sha256": "0yasw5fp4mq6vzrdwlc3dxlss8a94bsffv4mzrfp0b3iw0s1dlyg", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tsq.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tsq.json index 918e87b38a42..6119c6e1603d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tsq.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tsq.json @@ -4,6 +4,7 @@ "date": "2021-05-18T15:57:40-04:00", "path": "/nix/store/j59y4s3bsv6d5nbmhhdgb043hmk8157k-tree-sitter-tsq", "sha256": "03bch2wp2jwxk69zjplvm0gbyw06qqdy7il9qkiafvhrbh03ayd9", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json index 1a399772957f..adeb1e182735 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json @@ -1,9 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-typescript", - "rev": "d598c96714a2dc9e346589c63369aff6719a51e6", - "date": "2021-08-02T14:05:14-07:00", - "path": "/nix/store/hf714sspmakhzra9bqazhbb0iljva1hi-tree-sitter-typescript", - "sha256": "0yra8fhgv7wqkik85icqyckf980v9ch411mqcjcf50n5dc1siaik", + "rev": "83816f563c8d9d2f1b9c921206a7944d0c5904ad", + "date": "2021-08-17T11:21:26-07:00", + "path": "/nix/store/jwxdv5xbs92n43yqvxnwz443jvngxmqp-tree-sitter-typescript", + "sha256": "1w989z36pvfv7m4z9s9qq67l81p8rx37z53kqmsxsyc01wnpb4nr", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json index 5e4e14a95b37..700ec9f22dd0 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json @@ -4,6 +4,7 @@ "date": "2021-03-31T21:27:26-07:00", "path": "/nix/store/4j6hrf8bc8zjd7r9xnna9njpw0i4z817-tree-sitter-verilog", "sha256": "0ygm6bdxqzpl3qn5l58mnqyj730db0mbasj373bbsx81qmmzkgzz", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json index 8959c80f9f48..1942b47e081d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json @@ -4,6 +4,7 @@ "date": "2021-05-11T12:47:24+08:00", "path": "/nix/store/7d7m4zs4ydnwbn3xnfm3pvpy7gvkrmg8-tree-sitter-yaml", "sha256": "0wyvjh62zdp5bhd2y8k7k7x4wz952l55i1c8d94rhffsbbf9763f", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json index 97774bc58f61..538edddce644 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json @@ -4,6 +4,7 @@ "date": "2021-03-30T12:55:10-03:00", "path": "/nix/store/av4xgzr3c1rhr7v4fa9mm68krd2qv1lg-tree-sitter-zig", "sha256": "0gjxac43qpqc4332bp3mpdbvh7rqv0q3hvw8834b30ml5q0r0qr0", + "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/tracy/default.nix b/pkgs/development/tools/tracy/default.nix index 5bb056d5b34e..55114c518e57 100644 --- a/pkgs/development/tools/tracy/default.nix +++ b/pkgs/development/tools/tracy/default.nix @@ -20,6 +20,9 @@ in stdenv.mkDerivation rec { ++ lib.optionals stdenv.isLinux [ gtk3 tbb ]; NIX_CFLAGS_COMPILE = [ ] + # Apple's compiler finds a format string security error on + # ../../../server/TracyView.cpp:649:34, preventing building. + ++ lib.optional stdenv.isDarwin "-Wno-format-security" ++ lib.optional stdenv.isLinux "-ltbb" ++ lib.optional stdenv.cc.isClang "-faligned-allocation" ++ lib.optional disableLTO "-fno-lto"; diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index c222d5232bac..fb239bccb400 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; diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index 051266fa8007..4b022615e6c0 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, lua5_3, pkg-config, python3 , zlib, bzip2, curl, xz, gettext, libiconv , sdlClient ? true, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype, fluidsynth -, gtkClient ? stdenv.isLinux, gtk3 +, gtkClient ? false, gtk3, wrapGAppsHook , qtClient ? false, qt5 , server ? true, readline , enableSqlite ? true, sqlite @@ -26,7 +26,8 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ autoreconfHook pkg-config ] - ++ lib.optional qtClient [ qt5.wrapQtAppsHook ]; + ++ lib.optional qtClient [ qt5.wrapQtAppsHook ] + ++ lib.optional gtkClient [ wrapGAppsHook ]; buildInputs = [ lua5_3 zlib bzip2 curl xz gettext libiconv ] ++ lib.optionals sdlClient [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype fluidsynth ] @@ -36,6 +37,7 @@ stdenv.mkDerivation rec { ++ lib.optional enableSqlite sqlite; dontWrapQtApps = true; + dontWrapGApps = true; configureFlags = [ "--enable-shared" ] ++ lib.optional sdlClient "--enable-client=sdl" @@ -47,6 +49,12 @@ stdenv.mkDerivation rec { ++ lib.optional (!gtkClient) "--enable-fcmp=cli" ++ lib.optional (!server) "--disable-server"; + postFixup = lib.optionalString qtClient '' + wrapQtApp $out/bin/freeciv-qt + '' + lib.optionalString gtkClient '' + wrapGApp $out/bin/freeciv-gtk3.22 + ''; + enableParallelBuilding = true; meta = with lib; { diff --git a/pkgs/games/sdlpop/default.nix b/pkgs/games/sdlpop/default.nix index cef321fdce4e..f9b91e3dc158 100644 --- a/pkgs/games/sdlpop/default.nix +++ b/pkgs/games/sdlpop/default.nix @@ -8,22 +8,25 @@ stdenv.mkDerivation rec { pname = "sdlpop"; - version = "1.21"; + version = "1.22"; src = fetchFromGitHub { owner = "NagyD"; repo = "SDLPoP"; rev = "v${version}"; - sha256 = "1q4mnyg8v4420f1bp24v8lgi335vijdv61yi3fan14jgfzl38l7w"; + sha256 = "1yy5r1r0hv0xggk8qd8bwk2zy7abpv89nikq4flqgi53fc5q9xl7"; }; nativeBuildInputs = [ pkg-config makeWrapper copyDesktopItems ]; + buildInputs = [ SDL2 SDL2_image ]; makeFlags = [ "-C" "src" ]; preBuild = '' - substituteInPlace src/Makefile --replace "CC = gcc" "CC = ${stdenv.cc.targetPrefix}gcc" + substituteInPlace src/Makefile \ + --replace "CC = gcc" "CC = ${stdenv.cc.targetPrefix}cc" \ + --replace "CFLAGS += -I/opt/local/include" "CFLAGS += -I${SDL2.dev}/include/SDL2 -I${SDL2_image}/include/SDL2" ''; # The prince binary expects two things of the working directory it is called from: @@ -63,6 +66,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ iblech ]; platforms = platforms.unix; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 212a3222b7c6..d7f131d2608f 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -75,8 +75,8 @@ in rec { winetricks = fetchFromGitHub rec { # https://github.com/Winetricks/winetricks/releases - version = "20210206"; - sha256 = "sha256-tnwownY9A05nYlkYaoCQZjeGGHuE+kJYzA7MPE2bXnQ="; + version = "20210825"; + sha256 = "sha256-exMhj3dS8uXCEgOaWbftaq94mBOmtZIXsXb9xNX5ha8="; owner = "Winetricks"; repo = "winetricks"; rev = version; 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'"; }; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 22adcb743166..f4263d12161f 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -51,7 +51,7 @@ , CoreFoundation , CoreServices -# nvim-treesitter dependencies + # nvim-treesitter dependencies , tree-sitter # sved dependencies @@ -66,7 +66,7 @@ , openssl , pkg-config -# vim-go dependencies + # vim-go dependencies , asmfmt , delve , errcheck @@ -86,7 +86,7 @@ , iferr , impl , reftools -# must be lua51Packages + # must be lua51Packages , luaPackages }: @@ -311,13 +311,9 @@ self: super: { pname = "himalaya-vim"; inherit (himalaya) src version; dependencies = with self; [ himalaya ]; - patchPhase = '' - rm -rf !"vim/" - cp -vaR vim/. . - rm -rf vim/ - ''; - preFixup = '' - substituteInPlace $out/share/vim-plugins/himalaya-vim/plugin/himalaya.vim \ + configurePhase = '' + cd vim + substituteInPlace plugin/himalaya.vim \ --replace 'if !executable("himalaya")' 'if v:false' ''; postFixup = '' @@ -391,9 +387,9 @@ self: super: { minimap-vim = super.minimap-vim.overrideAttrs (old: { preFixup = '' - substituteInPlace $out/share/vim-plugins/minimap-vim/plugin/minimap.vim \ + substituteInPlace $out/share/vim-plugins/minimap.vim/plugin/minimap.vim \ --replace "code-minimap" "${code-minimap}/bin/code-minimap" - substituteInPlace $out/share/vim-plugins/minimap-vim/bin/minimap_generator.sh \ + substituteInPlace $out/share/vim-plugins/minimap.vim/bin/minimap_generator.sh \ --replace "code-minimap" "${code-minimap}/bin/code-minimap" ''; }); diff --git a/pkgs/os-specific/linux/cramfsprogs/default.nix b/pkgs/os-specific/linux/cramfsprogs/default.nix index 3f3e8a075b19..59fbfed1b728 100644 --- a/pkgs/os-specific/linux/cramfsprogs/default.nix +++ b/pkgs/os-specific/linux/cramfsprogs/default.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { # So patch the "missing include" bug ourselves. patches = [ ./include-sysmacros.patch ]; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + ]; + installPhase = '' install --target $out/bin -D cramfsck mkcramfs ''; diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index 7750b776575c..b19b52132352 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -2,7 +2,7 @@ let # having the full version string here makes it easier to update - modDirVersion = "5.13.13-zen1"; + modDirVersion = "5.14.1-zen1"; parts = lib.splitString "-" modDirVersion; version = lib.elemAt parts 0; suffix = lib.elemAt parts 1; @@ -19,7 +19,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${modDirVersion}"; - sha256 = "sha256-aTTbhXy0wsDDCSbX1k27l9g3FliqwE6TbRq2zkI3mnw="; + sha256 = "sha256-InfDIs+eELLJE5aw7mD8Jo7SlrpeI/ZuD3z4TyFf7/k="; }; structuredExtraConfig = with lib.kernel; { diff --git a/pkgs/os-specific/linux/sysklogd/default.nix b/pkgs/os-specific/linux/sysklogd/default.nix index 8e02ab71dbe9..4d9844f516b0 100644 --- a/pkgs/os-specific/linux/sysklogd/default.nix +++ b/pkgs/os-specific/linux/sysklogd/default.nix @@ -15,6 +15,17 @@ stdenv.mkDerivation rec { 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 diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 801601487913..2b159cf8c875 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "caddy"; - version = "2.4.4"; + version = "2.4.5"; subPackages = [ "cmd/caddy" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "caddyserver"; repo = pname; rev = "v${version}"; - sha256 = "sha256-POdDORICDE49BQ5LLTs4GTb1VoSXZD4K4MpRkVoj+AY="; + sha256 = "sha256-/DZnIXAvhCaXFl4DvYP4LSFQQytzj6HWYsmqx5T8GNM="; }; - vendorSha256 = "sha256-JAQaxEmdX0fpDahe55pEKnUW64k8JjrytkBrXpQJz3I="; + vendorSha256 = "sha256-ZevSZ8zTGtkrrJF0xvAtxCgP0CsxcORqD40LkMQ0aWc="; passthru.tests = { inherit (nixosTests) caddy; }; diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 4adb649e0868..4a8ed6a0b080 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring , systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2, libmnl , autoreconfHook, nixosTests +, fetchpatch }: stdenv.mkDerivation rec { @@ -25,6 +26,11 @@ stdenv.mkDerivation rec { # They are later created from NixOS itself. ./dont-create-run-time-dirs.patch ./runtime-deps.patch + # rename task_t to worker_task_t to fix redefinition issues on (aach64-)darwin + (fetchpatch { + url = "https://gitlab.nic.cz/knot/knot-dns/-/commit/a70b718085f9b97e556970444313c37a702a60f7.diff"; + sha256 = "0m776pb9iga0lj2gadk23shfrcfrsrzlyaj8800klw7xh6qq32bm"; + }) ]; nativeBuildInputs = [ pkg-config autoreconfHook ]; 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 diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 3a9f7c7480d0..961e2d80e901 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -724,6 +724,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" diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index c252747c2fcf..379a50770447 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -71,5 +71,6 @@ buildGoModule rec { homepage = "https://grafana.com"; maintainers = with maintainers; [ offline fpletz willibutz globin ma27 Frostman ]; platforms = platforms.linux ++ platforms.darwin; + mainProgram = "grafana-server"; }; } diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 4b69aca710ad..245ff62f7c03 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation rec { pname = "postgis"; - version = "3.1.3"; + version = "3.1.4"; outputs = [ "out" "doc" ]; src = fetchurl { url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; - sha256 = "1jwz6hdrym837b7dvn00qmwnbb40a7gr43va409h8fmp7dajksbi"; + sha256 = "15ip38p7df9d9l6l3xhn2x8marbz8dy5lk3jblpl4bjkpkl3z3nw"; }; buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ] diff --git a/pkgs/servers/web-apps/vikunja/api.nix b/pkgs/servers/web-apps/vikunja/api.nix index 285352da36e6..fc1aa09e4f69 100644 --- a/pkgs/servers/web-apps/vikunja/api.nix +++ b/pkgs/servers/web-apps/vikunja/api.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "vikunja-api"; - version = "0.17.1"; + version = "0.18.0"; src = fetchFromGitea { domain = "kolaente.dev"; owner = "vikunja"; repo = "api"; rev = "v${version}"; - sha256 = "sha256-xqC7MaPe5cClMUTSRE3HLTEH3LH1J1bJSdH+1ZOfGo4="; + sha256 = "sha256-43y9+y5VVgbCexHPsYZ9/Up84OoPSrThHWiKR0P1h3s="; }; nativeBuildInputs = @@ -24,7 +24,7 @@ buildGoModule rec { ''; in [ fakeGit mage ]; - vendorSha256 = "sha256-/vXyZznGxj5hxwqi4sttBBkEoS25DJqwoBtADCRO9Qc="; + vendorSha256 = "sha256-1tXnlOlVH61Y4jN07XBfTgZhAsU2HeudiEVAtlP+Cpk="; # checks need to be disabled because of needed internet for some checks doCheck = false; diff --git a/pkgs/servers/web-apps/vikunja/frontend.nix b/pkgs/servers/web-apps/vikunja/frontend.nix index e3b8a8785dec..6cca64e19ae9 100644 --- a/pkgs/servers/web-apps/vikunja/frontend.nix +++ b/pkgs/servers/web-apps/vikunja/frontend.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "vikunja-frontend"; - version = "0.17.0"; + version = "0.18.0"; src = fetchurl { url = "https://dl.vikunja.io/frontend/${pname}-${version}.zip"; - sha256 = "sha256-LUYBCdEwDMwhFuIIRmnrtQN9ChaEZyFbItMxh27H5XY="; + sha256 = "sha256-LV7+HfXeNcVHuoo+n6fuAQoIb/m0lOs6JYYMNLM/jTA="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 7e4316bf52e6..b4dfcd17aeb3 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -125,5 +125,6 @@ in stdenv.mkDerivation rec { homepage = "https://cloud.google.com/sdk/"; maintainers = with maintainers; [ iammrinal0 pradyuman stephenmw zimbatm ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; + mainProgram = "gcloud"; }; } diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 722e3b947738..523f8165802e 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -1,5 +1,5 @@ { lib, hwdata, pkg-config, lxc, buildGoPackage, fetchurl -, makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq +, makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq, attr , squashfsTools, iproute2, iptables, ebtables, iptables-nftables-compat, libcap , dqlite, raft-canonical, sqlite-replication, udev , writeShellScriptBin, apparmor-profiles, apparmor-parser @@ -19,13 +19,13 @@ let in buildGoPackage rec { pname = "lxd"; - version = "4.17"; + version = "4.18"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz"; - sha256 = "1kzmgyg5kw3zw9qa6jabld6rmb53b6yy69h7y9znsdlf74jllljl"; + sha256 = "19gkllahfd2fgz6vng5lrqx3bdrzaf9s874gzznvzvj9sgj0j3mn"; }; postPatch = '' @@ -34,12 +34,6 @@ buildGoPackage rec { ''; preBuild = '' - # unpack vendor - pushd go/src/github.com/lxc/lxd - rm _dist/src/github.com/lxc/lxd - cp -r _dist/src/* ../../.. - popd - # required for go-dqlite. See: https://github.com/lxc/lxd/pull/8939 export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)" @@ -52,7 +46,7 @@ buildGoPackage rec { wrapProgram $out/bin/lxd --prefix PATH : ${lib.makeBinPath ( networkPkgs - ++ [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute2 bash criu ] + ++ [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute2 bash criu attr ] ++ [ (writeShellScriptBin "apparmor_parser" '' exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@" '') ] 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"; 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 diff --git a/pkgs/tools/filesystems/sasquatch/default.nix b/pkgs/tools/filesystems/sasquatch/default.nix index b14dc620e421..238223c4981e 100644 --- a/pkgs/tools/filesystems/sasquatch/default.nix +++ b/pkgs/tools/filesystems/sasquatch/default.nix @@ -48,7 +48,12 @@ stdenv.mkDerivation rec { installFlags = [ "INSTALL_DIR=\${out}/bin" ]; - makeFlags = [ "XZ_SUPPORT=1" ] + makeFlags = [ + "XZ_SUPPORT=1" + "CC=${stdenv.cc.targetPrefix}cc" + "CXX=${stdenv.cc.targetPrefix}c++" + "AR=${stdenv.cc.targetPrefix}ar" + ] ++ lib.optional lz4Support "LZ4_SUPPORT=1"; meta = with lib; { diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index d65d31d44c4e..fd08f09b9607 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -6,12 +6,12 @@ mkDerivation rec { pname = "calamares"; - version = "3.2.39"; + version = "3.2.42"; # release including submodule src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-QGdy49RndRIBR3B+Z7iXbFyx5gxXO2GHNYc+iv0z47w="; + sha256 = "sha256-NbtgtbhauEo7EGvNUNltUQRBpLlzBjAR0GLL9CadgsQ="; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index 041d799307ec..7a0178eea735 100644 --- a/pkgs/tools/misc/chafa/default.nix +++ b/pkgs/tools/misc/chafa/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "1.6.1"; + version = "1.8.0"; pname = "chafa"; src = fetchFromGitHub { owner = "hpjansson"; repo = "chafa"; rev = version; - sha256 = "sha256-isQxeb7OQh4W8RvtKWXbKVYJ8LlfLiOkMJoPjsGFouM="; + sha256 = "sha256-8ENPmcl0KVxoBu8FGOGk+y8XsONWW0YW32MHAKBUiPE="; }; nativeBuildInputs = [ autoconf diff --git a/pkgs/tools/misc/envsubst/default.nix b/pkgs/tools/misc/envsubst/default.nix index be563345b2c2..5ecae8dbcbe9 100644 --- a/pkgs/tools/misc/envsubst/default.nix +++ b/pkgs/tools/misc/envsubst/default.nix @@ -1,10 +1,9 @@ -{ lib, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoModule }: -buildGoPackage rec { +buildGoModule rec { pname = "envsubst"; version = "1.2.0"; - goPackagePath = "github.com/a8m/envsubst"; src = fetchFromGitHub { owner = "a8m"; repo = "envsubst"; @@ -12,6 +11,12 @@ buildGoPackage rec { sha256 = "0zkgjdlw3d5xh7g45bzxqspxr61ljdli8ng4a1k1gk0dls4sva8n"; }; + vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + + postInstall = '' + install -Dm444 -t $out/share/doc/${pname} LICENSE *.md + ''; + meta = with lib; { description = "Environment variables substitution for Go"; homepage = "https://github.com/a8m/envsubst"; 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 diff --git a/pkgs/tools/misc/macchina/default.nix b/pkgs/tools/misc/macchina/default.nix index 8b4b897526da..91f23e1bc1d5 100644 --- a/pkgs/tools/misc/macchina/default.nix +++ b/pkgs/tools/misc/macchina/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "macchina"; - version = "1.0.0"; + version = "1.1.3"; src = fetchFromGitHub { owner = "Macchina-CLI"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZuQ0FZM77ENAQ57B0oFqFmGqQnFblCP2wJETb47yo1E="; + sha256 = "sha256:0afsv8n12z98z3dxdb4nflc6z8ss6n2prfqmjzy655ly9rrhkcrw"; }; - cargoSha256 = "sha256-YwhhOHiQcN8VS1DFTtZGvD2QvNAfPngPm/ZeOxzuDnw="; + cargoSha256 = "sha256:0jc2030217xz5v5h3ry2pb7rkakn9zmrcap55bv2r8p7hi5gvh60"; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index c7889b158735..2d07c45e61db 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -6,20 +6,21 @@ , pkg-config , libiconv , openssl +, expect }: rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "zellij-org"; repo = "zellij"; rev = "v${version}"; - sha256 = "sha256-IcpCE9mqR7H1+gRhHyscvXhYHOynJFtOyrSr1FiMxFc="; + sha256 = "sha256-2DYNgPURQzHaR8wHKEzuXSzubrxsQHpl3H3ko4okY7M="; }; - cargoSha256 = "sha256-22ggPs4iVOI1LKHtW5skfSO7J/FLF8EinvcyHVO14Dw="; + cargoSha256 = "sha256-AxtXWBfOzdLCpRchaQJbBBs+6rIyF+2ralOflRvkY4k="; nativeBuildInputs = [ installShellFiles pkg-config ]; @@ -31,9 +32,9 @@ rustPlatform.buildRustPackage rec { postInstall = '' installShellCompletion --cmd $pname \ - --bash <($out/bin/zellij setup --generate-completion bash) \ - --fish <($out/bin/zellij setup --generate-completion fish) \ - --zsh <($out/bin/zellij setup --generate-completion zsh) + --bash <(${expect}/bin/unbuffer $out/bin/zellij setup --generate-completion bash) \ + --fish <(${expect}/bin/unbuffer $out/bin/zellij setup --generate-completion fish) \ + --zsh <(${expect}/bin/unbuffer $out/bin/zellij setup --generate-completion zsh) ''; meta = with lib; { diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 5dba94abe35b..b3572e01c96d 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { "--without-ca-bundle" "--without-ca-path" # The build fails when using wolfssl with --with-ca-fallback - (lib.withFeature wolfsslSupport "ca-fallback") + (lib.withFeature (!wolfsslSupport) "ca-fallback") "--disable-manual" (lib.withFeatureAs sslSupport "ssl" openssl.dev) (lib.withFeatureAs gnutlsSupport "gnutls" gnutls.dev) @@ -145,5 +145,7 @@ stdenv.mkDerivation rec { license = licenses.curl; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.all; + # Fails to link against static brotli or gss + broken = stdenv.hostPlatform.isStatic && (brotliSupport || gssSupport); }; } diff --git a/pkgs/tools/networking/hurl/default.nix b/pkgs/tools/networking/hurl/default.nix index 6ecff2e6e389..de3b08bee2ad 100644 --- a/pkgs/tools/networking/hurl/default.nix +++ b/pkgs/tools/networking/hurl/default.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage rec { pname = "hurl"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "Orange-OpenSource"; repo = pname; rev = version; - sha256 = "0hbyqj794pvvfrg6jgz63mih73bnmnvgmwbv705c2238w7wsgk9w"; + sha256 = "sha256-bAUuNKaS0BQ31GxTd8C2EVZiD8ryevFBOfxLCq6Ccz4="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { # Tests require network access to a test server doCheck = false; - cargoSha256 = "09ndgm6kmqwdz7yn2rqxk5xr1qkai87zm1k138cng4wq135c3w6g"; + cargoSha256 = "sha256-dc1hu5vv2y4S1sskO7YN7bm+l2j5Jp5xOLMvXzX8Ago="; meta = with lib; { description = "Command line tool that performs HTTP requests defined in a simple plain text format."; diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index db8f9bdb9d1a..4b9efdc24a60 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.6.5"; + version = "1.6.6"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = version; - sha256 = "ZHEUJiEJzQzSwWgY07dDflY5GRiD1We435htY/7IOdQ="; + sha256 = "64TfXPz1NCGKnozI9j+yog+hln1rA/qpzCLvPNSvH+c="; }; postPatch = lib.optionalString (batchSize != null) '' 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 = "= 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"; }; } diff --git a/pkgs/tools/text/sad/default.nix b/pkgs/tools/text/sad/default.nix new file mode 100644 index 000000000000..2b748d60d1fe --- /dev/null +++ b/pkgs/tools/text/sad/default.nix @@ -0,0 +1,25 @@ +{ lib +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "sad"; + version = "0.4.14"; + + src = fetchFromGitHub { + owner = "ms-jpq"; + repo = pname; + rev = "v${version}"; + sha256 = "03b6qxkn8sqv06gs4p6wg02arz0n9llc3z92zhfd5ipz8han83fd"; + }; + + cargoSha256 = "13nkd4354siy8pr2032bxz2z5x8b378mccq6pnm71cpl9dl6w4ad"; + + meta = with lib; { + description = "CLI tool to search and replace"; + homepage = "https://github.com/ms-jpq/sad"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0038243d19eb..dfb5e9709f0f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -603,6 +603,7 @@ mapAliases ({ openisns = open-isns; # added 2020-01-28 openjpeg_1 = throw "openjpeg_1 has been removed, use openjpeg_2 instead"; # added 2021-01-24 openjpeg_2 = openjpeg; # added 2021-01-25 + openmpt123 = libopenmpt; # added 2021-09-05 opensans-ttf = open-sans; # added 2018-12-04 openssh_with_kerberos = openssh; # added 2018-01-28 orchis = orchis-theme; # added 2021-06-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7888af80493e..b8ab569a7274 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1017,6 +1017,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; @@ -2192,9 +2195,9 @@ with pkgs; traefik-certs-dumper = callPackage ../tools/misc/traefik-certs-dumper { }; - calamares = libsForQt514.callPackage ../tools/misc/calamares { + calamares = libsForQt515.callPackage ../tools/misc/calamares { python = python3; - boost = pkgs.boost.override { python = python3; }; + boost = pkgs.boost.override { enablePython = true; python = python3; }; }; calendar-cli = callPackage ../tools/networking/calendar-cli { }; @@ -4106,11 +4109,12 @@ with pkgs; ldapSupport = true; }; - curl = curlMinimal.override { + curl = curlMinimal.override ({ idnSupport = true; + } // lib.optionalAttrs (!stdenv.hostPlatform.isStatic) { gssSupport = true; brotliSupport = true; - }; + }); curlMinimal = callPackage ../tools/networking/curl { }; @@ -5277,6 +5281,10 @@ with pkgs; git-cinnabar = callPackage ../applications/version-management/git-and-tools/git-cinnabar { }; + git-cliff = callPackage ../applications/version-management/git-and-tools/git-cliff { + inherit (pkgs.darwin.apple_sdk.frameworks) Security; + }; + git-codeowners = callPackage ../applications/version-management/git-and-tools/git-codeowners { }; git-codereview = callPackage ../applications/version-management/git-and-tools/git-codereview { }; @@ -5430,6 +5438,8 @@ with pkgs; gitstatus = callPackage ../applications/version-management/git-and-tools/gitstatus { }; + gitty = callPackage ../applications/version-management/git-and-tools/gitty { }; + gitui = callPackage ../applications/version-management/git-and-tools/gitui { inherit (darwin.apple_sdk.frameworks) Security AppKit; }; @@ -7206,7 +7216,7 @@ with pkgs; pythonPackages = python3Packages; }; - mirakurun = nodePackages.mirakurun; + mirakurun = callPackage ../applications/video/mirakurun { }; miredo = callPackage ../tools/networking/miredo { }; @@ -8767,6 +8777,8 @@ with pkgs; sacad = callPackage ../tools/misc/sacad { }; + sad = callPackage ../tools/text/sad { }; + safecopy = callPackage ../tools/system/safecopy { }; sacd = callPackage ../tools/cd-dvd/sacd { }; @@ -12726,7 +12738,7 @@ with pkgs; ### LUA interpreters luaInterpreters = callPackage ./../development/interpreters/lua-5 {}; - inherit (luaInterpreters) lua5_1 lua5_2 lua5_2_compat lua5_3 lua5_3_compat lua5_4 lua5_4_compat luajit_openresty luajit_2_1 luajit_2_0; + inherit (luaInterpreters) lua5_1 lua5_2 lua5_2_compat lua5_3 lua5_3_compat lua5_4 lua5_4_compat luajit_2_1 luajit_2_0; lua5 = lua5_2_compat; lua = lua5; @@ -12937,6 +12949,8 @@ with pkgs; inherit pkgs lib; }; + poetry2conda = python3Packages.callPackage ../development/python-modules/poetry2conda { }; + pipenv = callPackage ../development/tools/pipenv {}; pipewire = callPackage ../development/libraries/pipewire {}; @@ -26283,7 +26297,7 @@ with pkgs; vivaldi-widevine = callPackage ../applications/networking/browsers/vivaldi/widevine.nix { }; - openmpt123 = callPackage ../applications/audio/openmpt123 { }; + libopenmpt = callPackage ../applications/audio/libopenmpt { }; openrazer-daemon = with python3Packages; toPythonApplication openrazer-daemon; @@ -27661,12 +27675,7 @@ with pkgs; wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { }; wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped); neovim-unwrapped = callPackage ../applications/editors/neovim { - # See: - # - https://github.com/NixOS/nixpkgs/issues/129099 - # - https://github.com/NixOS/nixpkgs/issues/128959 - lua = - if (stdenv.isDarwin && stdenv.isAarch64) then luajit_openresty else - luajit; + lua = luajit; }; neovimUtils = callPackage ../applications/editors/neovim/utils.nix { }; @@ -29489,9 +29498,13 @@ with pkgs; steamcmd = steamPackages.steamcmd; protontricks = python3Packages.callPackage ../tools/package-management/protontricks { - inherit steam-run; - inherit winetricks; - inherit (gnome) zenity; + winetricks = winetricks.override { + # Remove default build of wine to reduce closure size. + # Falls back to wine in PATH. + wine = null; + }; + + inherit steam-run yad; }; protonup = with python3Packages; toPythonApplication protonup; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e4331bc9bc4c..02f67b652ad6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4657,6 +4657,20 @@ let propagatedBuildInputs = [ Curses TermReadKey ]; }; + CursesUIGrid = buildPerlPackage { + pname = "Curses-UI-Grid"; + version = "0.15"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AD/ADRIANWIT/Curses-UI-Grid-0.15.tar.gz"; + sha256 = "0820ca4a9fb949ba8faf97af574018baeffb694e980c5087bb6522aa70b9dbec"; + }; + propagatedBuildInputs = [ CursesUI TestPod TestPodCoverage ]; + meta = { + description = "Create and manipulate data in grid model"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + CryptX = buildPerlPackage { pname = "CryptX"; version = "0.069"; @@ -17207,13 +17221,19 @@ let }; }; - PkgConfig = buildPerlPackage { + PkgConfig = buildPerlPackage rec { pname = "PkgConfig"; version = "0.25026"; src = fetchurl { url = "mirror://cpan/authors/id/P/PL/PLICEASE/PkgConfig-0.25026.tar.gz"; sha256 = "1862hzlkibqsgynrnwg43acycp4rlsv19gsybjwq39nnqb9mxfjd"; }; + # support cross-compilation by simplifying the way we get version during build + postPatch = '' + substituteInPlace Makefile.PL --replace \ + 'do { require "./lib/PkgConfig.pm"; $PkgConfig::VERSION; }' \ + '"${version}"' + ''; meta = { description = "Pure-Perl Core-Only replacement for pkg-config"; license = with lib.licenses; [ artistic1 gpl1Plus ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ff603b6be8e0..882a99cc019f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3323,6 +3323,8 @@ in { heudiconv = callPackage ../development/python-modules/heudiconv { }; + hg-commitsigs = callPackage ../development/python-modules/hg-commitsigs { }; + hg-evolve = callPackage ../development/python-modules/hg-evolve { }; hglib = callPackage ../development/python-modules/hglib { }; @@ -5569,6 +5571,10 @@ in { poetry-core = callPackage ../development/python-modules/poetry-core { }; + poetry-semver = callPackage ../development/python-modules/poetry-semver { }; + + poetry2conda = callPackage ../development/python-modules/poetry2conda { }; + poezio = callPackage ../applications/networking/instant-messengers/poezio { }; polib = callPackage ../development/python-modules/polib { }; @@ -5581,6 +5587,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 { }; @@ -9609,6 +9617,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 {