diff options
77 files changed, 1952 insertions, 2376 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 94aab69a2c2..0fc7587677e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5105,6 +5105,12 @@ githubId = 36706276; name = "Fufezan Mihai"; }; + fugi = { + email = "me@fugi.dev"; + github = "FugiMuffi"; + githubId = 21362942; + name = "Fugi"; + }; fusion809 = { email = "brentonhorne77@gmail.com"; github = "fusion809"; diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 913058746b3..264a8bcef27 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -254,12 +254,17 @@ in rec { # Generate the NixOS manpages. manpages = runCommand "nixos-manpages" { inherit sources; - nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ]; + nativeBuildInputs = [ + buildPackages.libxml2.bin + buildPackages.libxslt.bin + buildPackages.installShellFiles + ]; allowedReferences = ["out"]; } '' # Generate manpages. - mkdir -p $out/share/man + mkdir -p $out/share/man/man8 + installManPage ${./manpages}/* xsltproc --nonet \ --maxdepth 6000 \ --param man.output.in.separate.dir 1 \ diff --git a/nixos/doc/manual/man-nixos-build-vms.xml b/nixos/doc/manual/man-nixos-build-vms.xml deleted file mode 100644 index fa7c8c0c6d7..00000000000 --- a/nixos/doc/manual/man-nixos-build-vms.xml +++ /dev/null @@ -1,138 +0,0 @@ -<refentry xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude"> - <refmeta> - <refentrytitle><command>nixos-build-vms</command> - </refentrytitle><manvolnum>8</manvolnum> - <refmiscinfo class="source">NixOS</refmiscinfo> -<!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> --> - </refmeta> - <refnamediv> - <refname><command>nixos-build-vms</command></refname> - <refpurpose>build a network of virtual machines from a network of NixOS configurations</refpurpose> - </refnamediv> - <refsynopsisdiv> - <cmdsynopsis> - <command>nixos-build-vms</command> - <arg> - <option>--show-trace</option> - </arg> - - <arg> - <option>--no-out-link</option> - </arg> - - <arg> - <option>--help</option> - </arg> - - <arg> - <option>--option</option> - <replaceable>name</replaceable> - <replaceable>value</replaceable> - </arg> - - <arg choice="plain"> - <replaceable>network.nix</replaceable> - </arg> - </cmdsynopsis> - </refsynopsisdiv> - <refsection> - <title>Description</title> - <para> - This command builds a network of QEMU-KVM virtual machines of a Nix - expression specifying a network of NixOS machines. The virtual network can - be started by executing the <filename>bin/run-vms</filename> shell script - that is generated by this command. By default, a <filename>result</filename> - symlink is produced that points to the generated virtual network. - </para> - <para> - A network Nix expression has the following structure: -<screen> -{ - test1 = {pkgs, config, ...}: - { - services.openssh.enable = true; - nixpkgs.localSystem.system = "i686-linux"; - deployment.targetHost = "test1.example.net"; - - # Other NixOS options - }; - - test2 = {pkgs, config, ...}: - { - services.openssh.enable = true; - services.httpd.enable = true; - environment.systemPackages = [ pkgs.lynx ]; - nixpkgs.localSystem.system = "x86_64-linux"; - deployment.targetHost = "test2.example.net"; - - # Other NixOS options - }; -} -</screen> - Each attribute in the expression represents a machine in the network (e.g. - <varname>test1</varname> and <varname>test2</varname>) referring to a - function defining a NixOS configuration. In each NixOS configuration, two - attributes have a special meaning. The - <varname>deployment.targetHost</varname> specifies the address (domain name - or IP address) of the system which is used by <command>ssh</command> to - perform remote deployment operations. The - <varname>nixpkgs.localSystem.system</varname> attribute can be used to - specify an architecture for the target machine, such as - <varname>i686-linux</varname> which builds a 32-bit NixOS configuration. - Omitting this property will build the configuration for the same - architecture as the host system. - </para> - </refsection> - <refsection> - <title>Options</title> - <para> - This command accepts the following options: - </para> - <variablelist> - <varlistentry> - <term> - <option>--show-trace</option> - </term> - <listitem> - <para> - Shows a trace of the output. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--no-out-link</option> - </term> - <listitem> - <para> - Do not create a 'result' symlink. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>-h</option>, <option>--help</option> - </term> - <listitem> - <para> - Shows the usage of this command to the user. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--option</option> <replaceable>name</replaceable> <replaceable>value</replaceable> - </term> - <listitem> - <para>Set the Nix configuration option - <replaceable>name</replaceable> to <replaceable>value</replaceable>. - This overrides settings in the Nix configuration file (see - <citerefentry><refentrytitle>nix.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>). - </para> - </listitem> - </varlistentry> - </variablelist> - </refsection> -</refentry> diff --git a/nixos/doc/manual/man-nixos-enter.xml b/nixos/doc/manual/man-nixos-enter.xml deleted file mode 100644 index 41f0e6b9751..00000000000 --- a/nixos/doc/manual/man-nixos-enter.xml +++ /dev/null @@ -1,154 +0,0 @@ -<refentry xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude"> - <refmeta> - <refentrytitle><command>nixos-enter</command> - </refentrytitle><manvolnum>8</manvolnum> - <refmiscinfo class="source">NixOS</refmiscinfo> -<!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> --> - </refmeta> - <refnamediv> - <refname><command>nixos-enter</command></refname> - <refpurpose>run a command in a NixOS chroot environment</refpurpose> - </refnamediv> - <refsynopsisdiv> - <cmdsynopsis> - <command>nixos-enter</command> - <arg> - <arg choice='plain'> - <option>--root</option> - </arg> - <replaceable>root</replaceable> - </arg> - - <arg> - <arg choice='plain'> - <option>--system</option> - </arg> - <replaceable>system</replaceable> - </arg> - - <arg> - <arg choice='plain'> - <option>-c</option> - </arg> - <replaceable>shell-command</replaceable> - </arg> - - <arg> - <arg choice='plain'> - <option>--silent</option> - </arg> - </arg> - - <arg> - <arg choice='plain'> - <option>--help</option> - </arg> - </arg> - - <arg> - <arg choice='plain'> - <option>--</option> - </arg> - <replaceable>arguments</replaceable> - </arg> - </cmdsynopsis> - </refsynopsisdiv> - <refsection> - <title>Description</title> - <para> - This command runs a command in a NixOS chroot environment, that is, in a - filesystem hierarchy previously prepared using - <command>nixos-install</command>. - </para> - </refsection> - <refsection> - <title>Options</title> - <para> - This command accepts the following options: - </para> - <variablelist> - <varlistentry> - <term> - <option>--root</option> - </term> - <listitem> - <para> - The path to the NixOS system you want to enter. It defaults to - <filename>/mnt</filename>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--system</option> - </term> - <listitem> - <para> - The NixOS system configuration to use. It defaults to - <filename>/nix/var/nix/profiles/system</filename>. You can enter a - previous NixOS configuration by specifying a path such as - <filename>/nix/var/nix/profiles/system-106-link</filename>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--command</option> - </term> - <term> - <option>-c</option> - </term> - <listitem> - <para> - The bash command to execute. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--silent</option> - </term> - <listitem> - <para> - Suppresses all output from the activation script of the target system. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--</option> - </term> - <listitem> - <para> - Interpret the remaining arguments as the program name and arguments to be - invoked. The program is not executed in a shell. - </para> - </listitem> - </varlistentry> - </variablelist> - </refsection> - <refsection> - <title>Examples</title> - <para> - Start an interactive shell in the NixOS installation in - <filename>/mnt</filename>: - </para> -<screen> -<prompt># </prompt>nixos-enter --root /mnt -</screen> - <para> - Run a shell command: - </para> -<screen> -<prompt># </prompt>nixos-enter -c 'ls -l /; cat /proc/mounts' -</screen> - <para> - Run a non-shell command: - </para> -<screen> -# nixos-enter -- cat /proc/mounts -</screen> - </refsection> -</refentry> diff --git a/nixos/doc/manual/man-nixos-generate-config.xml b/nixos/doc/manual/man-nixos-generate-config.xml deleted file mode 100644 index 9ac3b918ff6..00000000000 --- a/nixos/doc/manual/man-nixos-generate-config.xml +++ /dev/null @@ -1,214 +0,0 @@ -<refentry xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude"> - <refmeta> - <refentrytitle><command>nixos-generate-config</command> - </refentrytitle><manvolnum>8</manvolnum> - <refmiscinfo class="source">NixOS</refmiscinfo> -<!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> --> - </refmeta> - <refnamediv> - <refname><command>nixos-generate-config</command></refname> - <refpurpose>generate NixOS configuration modules</refpurpose> - </refnamediv> - <refsynopsisdiv> - <cmdsynopsis> - <command>nixos-generate-config</command> - <arg> - <option>--force</option> - </arg> - - <arg> - <arg choice='plain'> - <option>--root</option> - </arg> - <replaceable>root</replaceable> - </arg> - - <arg> - <arg choice='plain'> - <option>--dir</option> - </arg> - <replaceable>dir</replaceable> - </arg> - </cmdsynopsis> - </refsynopsisdiv> - <refsection> - <title>Description</title> - <para> - This command writes two NixOS configuration modules: - <variablelist> - <varlistentry> - <term> - <option>/etc/nixos/hardware-configuration.nix</option> - </term> - <listitem> - <para> - This module sets NixOS configuration options based on your current - hardware configuration. In particular, it sets the - <option>fileSystem</option> option to reflect all currently mounted file - systems, the <option>swapDevices</option> option to reflect active swap - devices, and the <option>boot.initrd.*</option> options to ensure that - the initial ramdisk contains any kernel modules necessary for mounting - the root file system. - </para> - <para> - If this file already exists, it is overwritten. Thus, you should not - modify it manually. Rather, you should include it from your - <filename>/etc/nixos/configuration.nix</filename>, and re-run - <command>nixos-generate-config</command> to update it whenever your - hardware configuration changes. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>/etc/nixos/configuration.nix</option> - </term> - <listitem> - <para> - This is the main NixOS system configuration module. If it already - exists, it’s left unchanged. Otherwise, - <command>nixos-generate-config</command> will write a template for you - to customise. - </para> - </listitem> - </varlistentry> - </variablelist> - </para> - </refsection> - <refsection> - <title>Options</title> - <para> - This command accepts the following options: - </para> - <variablelist> - <varlistentry> - <term> - <option>--root</option> - </term> - <listitem> - <para> - If this option is given, treat the directory - <replaceable>root</replaceable> as the root of the file system. This - means that configuration files will be written to - <filename><replaceable>root</replaceable>/etc/nixos</filename>, and that - any file systems outside of <replaceable>root</replaceable> are ignored - for the purpose of generating the <option>fileSystems</option> option. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--dir</option> - </term> - <listitem> - <para> - If this option is given, write the configuration files to the directory - <replaceable>dir</replaceable> instead of - <filename>/etc/nixos</filename>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--force</option> - </term> - <listitem> - <para> - Overwrite <filename>/etc/nixos/configuration.nix</filename> if it already - exists. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--no-filesystems</option> - </term> - <listitem> - <para> - Omit everything concerning file systems and swap devices from the - hardware configuration. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--show-hardware-config</option> - </term> - <listitem> - <para> - Don't generate <filename>configuration.nix</filename> or - <filename>hardware-configuration.nix</filename> and print the hardware - configuration to stdout only. - </para> - </listitem> - </varlistentry> - </variablelist> - </refsection> - <refsection> - <title>Examples</title> - <para> - This command is typically used during NixOS installation to write initial - configuration modules. For example, if you created and mounted the target - file systems on <filename>/mnt</filename> and - <filename>/mnt/boot</filename>, you would run: -<screen> -<prompt>$ </prompt>nixos-generate-config --root /mnt -</screen> - The resulting file - <filename>/mnt/etc/nixos/hardware-configuration.nix</filename> might look - like this: -<programlisting> -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, pkgs, ... }: - -{ - imports = - [ <nixos/modules/installer/scan/not-detected.nix> - ]; - - boot.initrd.availableKernelModules = [ "ehci_hcd" "ahci" ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-label/nixos"; - fsType = "ext3"; - options = [ "rw" "data=ordered" "relatime" ]; - }; - - fileSystems."/boot" = - { device = "/dev/sda1"; - fsType = "ext3"; - options = [ "rw" "errors=continue" "user_xattr" "acl" "barrier=1" "data=writeback" "relatime" ]; - }; - - swapDevices = - [ { device = "/dev/sda2"; } - ]; - - nix.maxJobs = 8; -} -</programlisting> - It will also create a basic - <filename>/mnt/etc/nixos/configuration.nix</filename>, which you should edit - to customise the logical configuration of your system. This file includes - the result of the hardware scan as follows: -<programlisting> - imports = [ ./hardware-configuration.nix ]; -</programlisting> - </para> - <para> - After installation, if your hardware configuration changes, you can run: -<screen> -<prompt>$ </prompt>nixos-generate-config -</screen> - to update <filename>/etc/nixos/hardware-configuration.nix</filename>. Your - <filename>/etc/nixos/configuration.nix</filename> will - <emphasis>not</emphasis> be overwritten. - </para> - </refsection> -</refentry> diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml deleted file mode 100644 index eb6680b6567..00000000000 --- a/nixos/doc/manual/man-nixos-install.xml +++ /dev/null @@ -1,357 +0,0 @@ -<refentry xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude"> - <refmeta> - <refentrytitle><command>nixos-install</command> - </refentrytitle><manvolnum>8</manvolnum> - <refmiscinfo class="source">NixOS</refmiscinfo> -<!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> --> - </refmeta> - <refnamediv> - <refname><command>nixos-install</command></refname> - <refpurpose>install bootloader and NixOS</refpurpose> - </refnamediv> - <refsynopsisdiv> - <cmdsynopsis> - <command>nixos-install</command> - <arg> - <group choice='req'> - <arg choice='plain'> - <option>--verbose</option> - </arg> - <arg choice='plain'> - <option>-v</option> - </arg> - </group> - </arg> - <arg> - <arg choice='plain'> - <option>-I</option> - </arg> - <replaceable>path</replaceable> - </arg> - - <arg> - <arg choice='plain'> - <option>--root</option> - </arg> - <replaceable>root</replaceable> - </arg> - - <arg> - <arg choice='plain'> - <option>--system</option> - </arg> - <replaceable>path</replaceable> - </arg> - - <arg> - <option>--flake</option> <replaceable>flake-uri</replaceable> - </arg> - - <arg> - <group choice='req'> - <arg choice='plain'><option>--impure</option></arg> - </group> - </arg> - - <arg> - <arg choice='plain'> - <option>--channel</option> - </arg> - <replaceable>channel</replaceable> - </arg> - - <arg> - <arg choice='plain'> - <option>--no-channel-copy</option> - </arg> - </arg> - - <arg> - <group choice='req'> - <arg choice='plain'> - <option>--no-root-password</option> - </arg> - <arg choice='plain'> - <option>--no-root-passwd</option> - </arg> - </group> - </arg> - - <arg> - <arg choice='plain'> - <option>--no-bootloader</option> - </arg> - </arg> - - <arg> - <group choice='req'> - <arg choice='plain'> - <option>--max-jobs</option> - </arg> - - <arg choice='plain'> - <option>-j</option> - </arg> - </group> <replaceable>number</replaceable> - </arg> - - <arg> - <option>--cores</option> <replaceable>number</replaceable> - </arg> - - <arg> - <option>--option</option> <replaceable>name</replaceable> <replaceable>value</replaceable> - </arg> - - <arg> - <arg choice='plain'> - <option>--show-trace</option> - </arg> - </arg> - - <arg> - <arg choice='plain'> - <option>--keep-going</option> - </arg> - </arg> - - <arg> - <arg choice='plain'> - <option>--help</option> - </arg> - </arg> - </cmdsynopsis> - </refsynopsisdiv> - <refsection> - <title>Description</title> - <para> - This command installs NixOS in the file system mounted on - <filename>/mnt</filename>, based on the NixOS configuration specified in - <filename>/mnt/etc/nixos/configuration.nix</filename>. It performs the - following steps: - <itemizedlist> - <listitem> - <para> - It copies Nix and its dependencies to - <filename>/mnt/nix/store</filename>. - </para> - </listitem> - <listitem> - <para> - It runs Nix in <filename>/mnt</filename> to build the NixOS configuration - specified in <filename>/mnt/etc/nixos/configuration.nix</filename>. - </para> - </listitem> - <listitem> - <para> - It installs the current channel <quote>nixos</quote> in the target channel - profile (unless <option>--no-channel-copy</option> is specified). - </para> - </listitem> - <listitem> - <para> - It installs the GRUB boot loader on the device specified in the option - <option>boot.loader.grub.device</option> (unless - <option>--no-bootloader</option> is specified), and generates a GRUB - configuration file that boots into the NixOS configuration just - installed. - </para> - </listitem> - <listitem> - <para> - It prompts you for a password for the root account (unless - <option>--no-root-password</option> is specified). - </para> - </listitem> - </itemizedlist> - </para> - <para> - This command is idempotent: if it is interrupted or fails due to a temporary - problem (e.g. a network issue), you can safely re-run it. - </para> - </refsection> - <refsection> - <title>Options</title> - <para> - This command accepts the following options: - </para> - <variablelist> - <varlistentry> - <term><option>--verbose</option> / <option>-v</option></term> - <listitem> - <para>Increases the level of verbosity of diagnostic messages - printed on standard error. For each Nix operation, the information - printed on standard output is well-defined; any diagnostic - information is printed on standard error, never on standard - output.</para> - <para>Please note that this option may be specified repeatedly.</para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--root</option> - </term> - <listitem> - <para> - Defaults to <filename>/mnt</filename>. If this option is given, treat the - directory <replaceable>root</replaceable> as the root of the NixOS - installation. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--system</option> - </term> - <listitem> - <para> - If this option is provided, <command>nixos-install</command> will install - the specified closure rather than attempt to build one from - <filename>/mnt/etc/nixos/configuration.nix</filename>. - </para> - <para> - The closure must be an appropriately configured NixOS system, with boot - loader and partition configuration that fits the target host. Such a - closure is typically obtained with a command such as <command>nix-build - -I nixos-config=./configuration.nix '<nixpkgs/nixos>' -A system - --no-out-link</command> - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--flake</option> <replaceable>flake-uri</replaceable>#<replaceable>name</replaceable> - </term> - <listitem> - <para> - Build the NixOS system from the specified flake. - The flake must contain an output named - <literal>nixosConfigurations.<replaceable>name</replaceable></literal>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--channel</option> - </term> - <listitem> - <para> - If this option is provided, do not copy the current - <quote>nixos</quote> channel to the target host. Instead, use the - specified derivation. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>-I</option> - </term> - <listitem> - <para> - Add a path to the Nix expression search path. This option may be given - multiple times. See the NIX_PATH environment variable for information on - the semantics of the Nix search path. Paths added through - <replaceable>-I</replaceable> take precedence over NIX_PATH. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--max-jobs</option> - </term> - <term> - <option>-j</option> - </term> - <listitem> - <para> - Sets the maximum number of build jobs that Nix will perform in parallel - to the specified number. The default is <literal>1</literal>. A higher - value is useful on SMP systems or to exploit I/O latency. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--cores</option> - </term> - <listitem> - <para> - Sets the value of the <envar>NIX_BUILD_CORES</envar> environment variable - in the invocation of builders. Builders can use this variable at their - discretion to control the maximum amount of parallelism. For instance, in - Nixpkgs, if the derivation attribute - <varname>enableParallelBuilding</varname> is set to - <literal>true</literal>, the builder passes the - <option>-j<replaceable>N</replaceable></option> flag to GNU Make. The - value <literal>0</literal> means that the builder should use all - available CPU cores in the system. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--option</option> <replaceable>name</replaceable> <replaceable>value</replaceable> - </term> - <listitem> - <para> - Set the Nix configuration option <replaceable>name</replaceable> to - <replaceable>value</replaceable>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--show-trace</option> - </term> - <listitem> - <para> - Causes Nix to print out a stack trace in case of Nix expression - evaluation errors. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--keep-going</option> - </term> - <listitem> - <para> - Causes Nix to continue building derivations as far as possible - in the face of failed builds. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>--help</option> - </term> - <listitem> - <para> - Synonym for <command>man nixos-install</command>. - </para> - </listitem> - </varlistentry> - </variablelist> - </refsection> - <refsection> - <title>Examples</title> - <para> - A typical NixOS installation is done by creating and mounting a file system - on <filename>/mnt</filename>, generating a NixOS configuration in - <filename>/mnt/etc/nixos/configuration.nix</filename>, and running - <command>nixos-install</command>. For instance, if we want to install NixOS - on an <literal>ext4</literal> file system created in - <filename>/dev/sda1</filename>: -<screen> -<prompt>$ </prompt>mkfs.ext4 /dev/sda1 -<prompt>$ </prompt>mount /dev/sda1 /mnt -<prompt>$ </prompt>nixos-generate-config --root /mnt -<prompt>$ </prompt># edit /mnt/etc/nixos/configuration.nix -<prompt>$ </prompt>nixos-install -<prompt>$ </prompt>reboot -</screen> - </para> - </refsection> -</refentry> diff --git a/nixos/doc/manual/man-nixos-option.xml b/nixos/doc/manual/man-nixos-option.xml deleted file mode 100644 index b921386d0df..00000000000 --- a/nixos/doc/manual/man-nixos-option.xml +++ /dev/null @@ -1,134 +0,0 @@ -<refentry xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude"> - <refmeta> - <refentrytitle><command>nixos-option</command> - </refentrytitle><manvolnum>8</manvolnum> - <refmiscinfo class="source">NixOS</refmiscinfo> -<!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> --> - </refmeta> - <refnamediv> - <refname><command>nixos-option</command></refname> - <refpurpose>inspect a NixOS configuration</refpurpose> - </refnamediv> - <refsynopsisdiv> - <cmdsynopsis> - <command>nixos-option</command> - - <arg> - <group choice='req'> - <arg choice='plain'><option>-r</option></arg> - <arg choice='plain'><option>--recursive</option></arg> - </group> - </arg> - - <arg> - <option>-I</option> <replaceable>path</replaceable> - </arg> - - <arg> - <replaceable>option.name</replaceable> - </arg> - </cmdsynopsis> - </refsynopsisdiv> - <refsection> - <title>Description</title> - <para> - This command evaluates the configuration specified in - <filename>/etc/nixos/configuration.nix</filename> and returns the properties - of the option name given as argument. - </para> - <para> - When the option name is not an option, the command prints the list of - attributes contained in the attribute set. - </para> - </refsection> - <refsection> - <title>Options</title> - <para> - This command accepts the following options: - </para> - <variablelist> - <varlistentry> - <term><option>-r</option></term> - <term><option>--recursive</option></term> - <listitem> - <para> - Print all the values at or below the specified path recursively. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>-I</option> <replaceable>path</replaceable> - </term> - <listitem> - <para> - This option is passed to the underlying - <command>nix-instantiate</command> invocation. - </para> - </listitem> - </varlistentry> - </variablelist> - </refsection> - <refsection> - <title>Environment</title> - <variablelist> - <varlistentry> - <term> - <envar>NIXOS_CONFIG</envar> - </term> - <listitem> - <para> - Path to the main NixOS configuration module. Defaults to - <filename>/etc/nixos/configuration.nix</filename>. - </para> - </listitem> - </varlistentry> - </variablelist> - </refsection> - <refsection> - <title>Examples</title> - <para> - Investigate option values: -<screen><prompt>$ </prompt>nixos-option boot.loader -This attribute set contains: -generationsDir -grub -initScript - -<prompt>$ </prompt>nixos-option boot.loader.grub.enable -Value: -true - -Default: -true - -Description: -Whether to enable the GNU GRUB boot loader. - -Declared by: - "/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix" - -Defined by: - "/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix" -</screen> - </para> - </refsection> - <refsection> - <title>Bugs</title> - <para> - The author listed in the following section is wrong. If there is any other - bug, please report to Nicolas Pierron. - </para> - </refsection> - <refsection> - <title>See also</title> - <para> - <citerefentry> - <refentrytitle>configuration.nix</refentrytitle> - <manvolnum>5</manvolnum> - </citerefentry> - </para> - </refsection> -</refentry> diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml deleted file mode 100644 index bf0f4aafa14..00000000000 --- a/nixos/doc/manual/man-nixos-rebuild.xml +++ /dev/null @@ -1,781 +0,0 @@ -<refentry xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude"> - <refmeta> - <refentrytitle><command>nixos-rebuild</command> - </refentrytitle><manvolnum>8</manvolnum> - <refmiscinfo class="source">NixOS</refmiscinfo> -<!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> --> - </refmeta> - - <refnamediv> - <refname><command>nixos-rebuild</command></refname> - <refpurpose>reconfigure a NixOS machine</refpurpose> - </refnamediv> - - <refsynopsisdiv> - <cmdsynopsis> - <command>nixos-rebuild</command><group choice='req'> - <arg choice='plain'> - <option>switch</option> - </arg> - - <arg choice='plain'> - <option>boot</option> - </arg> - - <arg choice='plain'> - <option>test</option> - </arg> - - <arg choice='plain'> - <option>build</option> - </arg> - - <arg choice='plain'> - <option>dry-build</option> - </arg> - - <arg choice='plain'> - <option>dry-activate</option> - </arg> - - <arg choice='plain'> - <option>edit</option> - </arg> - - <arg choice='plain'> - <option>build-vm</option> - </arg> - - <arg choice='plain'> - <option>build-vm-with-bootloader</option> - </arg> - </group> - <sbr /> - - <arg> - <group choice='req'> - <arg choice='plain'> - <option>--upgrade</option> - </arg> - <arg choice='plain'> - <option>--upgrade-all</option> - </arg> - </group> - </arg> - - <arg> - <option>--install-bootloader</option> - </arg> - - <arg> - <option>--no-build-nix</option> - </arg> - - <arg> - <option>--fast</option> - </arg> - - <arg> - <option>--rollback</option> - </arg> - - <arg> - <option>--builders</option> <replaceable>builder-spec</replaceable> - </arg> - - <sbr/> - - <arg> - <option>--flake</option> <replaceable>flake-uri</replaceable> - </arg> - - <arg> - <option>--no-flake</option> - </arg> - - <arg> - <option>--override-input</option> <replaceable>input-name</replaceable> <replaceable>flake-uri</replaceable> - </arg> - - <sbr /> - - <arg> - <group choice='req'> - <arg choice='plain'> - <option>--profile-name</option> - </arg> - - <arg choice='plain'> - <option>-p</option> - </arg> - </group> <replaceable>name</replaceable> - </arg> - - <arg> - <group choice='req'> - <arg choice='plain'> - <option>--specialisation</option> - </arg> - - <arg choice='plain'> - <option>-c</option> - </arg> - </group> <replaceable>name</replaceable> - </arg> - - <sbr /> - - <arg> - <option>--build-host</option> <replaceable>host</replaceable> - </arg> - - <arg> - <option>--target-host</option> <replaceable>host</replaceable> - </arg> - - <arg> - <option>--use-remote-sudo</option> - </arg> - - <sbr /> - - <arg> - <option>--show-trace</option> - </arg> - <arg> - <option>-I</option> - <replaceable>NIX_PATH</replaceable> - </arg> - <arg> - <group choice='req'> - <arg choice='plain'><option>--verbose</option></arg> - <arg choice='plain'><option>-v</option></arg> - </group> - </arg> - <arg> - <group choice='req'> - <arg choice='plain'><option>--impure</option></arg> - </group> - </arg> - <arg> - <group choice='req'> - <arg choice='plain'><option>--max-jobs</option></arg> - <arg choice='plain'><option>-j</option></arg> - </group> - <replaceable>number</replaceable> - </arg> - <arg> - <group choice='req'> - <arg choice='plain'><option>--keep-failed</option></arg> - <arg choice='plain'><option>-K</option></arg> - </group> - </arg> - <arg> - <group choice='req'> - <arg choice='plain'><option>--keep-going</option></arg> - <arg choice='plain'><option>-k</option></arg> - </group> - </arg> - </cmdsynopsis> - </refsynopsisdiv> - - <refsection> - <title>Description</title> - - <para> - This command updates the system so that it corresponds to the - configuration specified in - <filename>/etc/nixos/configuration.nix</filename> or - <filename>/etc/nixos/flake.nix</filename>. Thus, every time you - modify the configuration or any other NixOS module, you must run - <command>nixos-rebuild</command> to make the changes take - effect. It builds the new system in - <filename>/nix/store</filename>, runs its activation script, and - stop and (re)starts any system services if needed. Please note that - user services need to be started manually as they aren't detected - by the activation script at the moment. - </para> - - <para> - This command has one required argument, which specifies the desired - operation. It must be one of the following: - - <variablelist> - <varlistentry> - <term> - <option>switch</option> - </term> - <listitem> - <para> - Build and activate the new configuration, and make it the boot default. - That is, the configuration is added to the GRUB boot menu as the default - menu entry, so that subsequent reboots will boot the system into the new - configuration. Previous configurations activated with - <command>nixos-rebuild switch</command> or <command>nixos-rebuild - boot</command> remain available in the GRUB menu. - </para> - <para> - Note that if you are using specializations, running just - <command>nixos-rebuild switch</command> will switch you back to the - unspecialized, base system - in that case, you might want to use this - instead: -<screen> -<prompt>$ </prompt>nixos-rebuild switch --specialisation your-specialisation-name -</screen> - This command will build all specialisations and make them bootable just - like regular <command>nixos-rebuild switch</command> does - the only - thing different is that it will switch to given specialisation instead - of the base system; it can be also used to switch from the base system - into a specialised one, or to switch between specialisations. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>boot</option> - </term> - <listitem> - <para> - Build the new configuration and make it the boot default (as with - <command>nixos-rebuild switch</command>), but do not activate it. That - is, the system continues to run the previous configuration until the - next reboot. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>test</option> - </term> - <listitem> - <para> - Build and activate the new configuration, but do not add it to the GRUB - boot menu. Thus, if you reboot the system (or if it crashes), you will - automatically revert to the default configuration (i.e. the - configuration resulting from the last call to <command>nixos-rebuild - switch</command> or <command>nixos-rebuild boot</command>). - </para> - <para> - Note that if you are using specialisations, running just - <command>nixos-rebuild test</command> will activate the unspecialised, - base system - in that case, you might want to use this instead: -<screen> -<prompt>$ </prompt>nixos-rebuild test --specialisation your-specialisation-name -</screen> - This command can be also used to switch from the base system into a - specialised one, or to switch between specialisations. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>build</option> - </term> - <listitem> - <para> - Build the new configuration, but neither activate it nor add it to the - GRUB boot menu. It leaves a symlink named <filename>result</filename> in - the current directory, which points to the output of the top-level - “system” derivation. This is essentially the same as doing -<screen> -<prompt>$ </prompt>nix-build /path/to/nixpkgs/nixos -A system -</screen> - Note that you do not need to be <literal>root</literal> to run - <command>nixos-rebuild build</command>. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>dry-build</option> - </term> - <listitem> - <para> - Show what store paths would be built or downloaded by any of the - operations above, but otherwise do nothing. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>dry-activate</option> - </term> - <listitem> - <para> - Build the new configuration, but instead of activating it, show what - changes would be performed by the activation (i.e. by - <command>nixos-rebuild test</command>). For instance, this command will - print which systemd units would be restarted. The list of changes is not - guaranteed to be complete. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>edit</option> - </term> - <listitem> - <para> - Opens <filename>configuration.nix</filename> in the default editor. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>build-vm</option> - </term> - <listitem> - <para> - Build a script that starts a NixOS virtual machine with the desired - configuration. It leaves a symlink <filename>result</filename> in the - current directory that points (under - <filename>result/bin/run-<replaceable>hostname</replaceable>-vm</filename>) - at the script that starts the VM. Thus, to test a NixOS configuration in - a virtual machine, you should do the following: -<screen> -<prompt>$ </prompt>nixos-rebuild build-vm -<prompt>$ </prompt>./result/bin/run-*-vm -</screen> - </para> - - <para> - The VM is implemented using the <literal>qemu</literal> package. For - best performance, you should load the <literal>kvm-intel</literal> or - <literal>kvm-amd</literal> kernel modules to get hardware - virtualisation. - </para> - - <para> - The VM mounts the Nix store of the host through the 9P file system. The - host Nix store is read-only, so Nix commands that modify the Nix store - will not work in the VM. This includes commands such as - <command>nixos-rebuild</command>; to change the VM’s configuration, - you must halt the VM and re-run the commands above. - </para> - - <para> - The VM has its own <literal>ext3</literal> root file system, which is - automatically created when the VM is first started, and is persistent - across reboots of the VM. It is stored in - <literal>./<replaceable>hostname</replaceable>.qcow2</literal>. -<!-- The entire file system hierarchy of the host is available in - the VM under <filename>/hostfs</filename>.--> - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>build-vm-with-bootloader</option> - </term> - <listitem> - <para> - Like <option>build-vm</option>, but boots using the regular boot loader - of your configuration (e.g., GRUB 1 or 2), rather than booting directly - into the kernel and initial ramdisk of the system. This allows you to - test whether the boot loader works correctly. However, it does not - guarantee that your NixOS configuration will boot successfully on the - host hardware (i.e., after running <command>nixos-rebuild - switch</command>), because the hardware and boot loader configuration in - the VM are different. The boot loader is installed on an automatically - generated virtual disk containing a <filename>/boot</filename> - partition. - </para> - </listitem> - </varlistentry> - </variablelist> - </para> - </refsection> - - <refsection> - <title>Options</title> - <para> - This command accepts the following options: - </para> - - <variablelist> - <varlistentry> - <term> - <option>--upgrade</option> - </term> - <term> - <option>--upgrade-all</option> - </term> - <listitem> - <para> - Update the root user's channel named <literal>nixos</literal> - before rebuilding the system. - </para> - <para> - In addition to the <literal>nixos</literal> channel, the root - user's channels which have a file named - <literal>.update-on-nixos-rebuild</literal> in their base - directory will also be updated. - </para> - <para> - Passing <option>--upgrade-all</option> updates all of the root - user's channels. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>--install-bootloader</option> - </term> - <listitem> - <para> - Causes the boot loader to be (re)installed on the device specified by the - relevant configuration options. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>--no-build-nix</option> - </term> - <listitem> - <para> - Normally, <command>nixos-rebuild</command> first builds the - <varname>nixUnstable</varname> attribute in Nixpkgs, and uses the - resulting instance of the Nix package manager to build the new system - configuration. This is necessary if the NixOS modules use features not - provided by the currently installed version of Nix. This option disables - building a new Nix. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>--fast</option> - </term> - <listitem> - <para> - Equivalent to <option>--no-build-nix</option>. This option is - useful if you call <command>nixos-rebuild</command> frequently - (e.g. if you’re hacking on a NixOS module). - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>--rollback</option> - </term> - <listitem> - <para> - Instead of building a new configuration as specified by - <filename>/etc/nixos/configuration.nix</filename>, roll back to the - previous configuration. (The previous configuration is defined as the one - before the “current” generation of the Nix profile - <filename>/nix/var/nix/profiles/system</filename>.) - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>--builders</option> <replaceable>builder-spec</replaceable> - </term> - <listitem> - <para> - Allow ad-hoc remote builders for building the new system. This requires - the user executing <command>nixos-rebuild</command> (usually root) to be - configured as a trusted user in the Nix daemon. This can be achieved by - using the <literal>nix.settings.trusted-users</literal> NixOS option. Examples - values for that option are described in the <literal>Remote builds - chapter</literal> in the Nix manual, (i.e. <command>--builders - "ssh://bigbrother x86_64-linux"</command>). By specifying an empty string - existing builders specified in <filename>/etc/nix/machines</filename> can - be ignored: <command>--builders ""</command> for example when they are - not reachable due to network connectivity. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>--profile-name</option> - </term> - <term> - <option>-p</option> - </term> - <listitem> - <para> - Instead of using the Nix profile - <filename>/nix/var/nix/profiles/system</filename> to keep track of the - current and previous system configurations, use - <filename>/nix/var/nix/profiles/system-profiles/<replaceable>name</replaceable></filename>. - When you use GRUB 2, for every system profile created with this flag, - NixOS will create a submenu named “NixOS - Profile - '<replaceable>name</replaceable>'” in GRUB’s boot menu, containing - the current and previous configurations of this profile. - </para> - <para> - For instance, if you want to test a configuration file named - <filename>test.nix</filename> without affecting the default system - profile, you would do: -<screen> -<prompt>$ </prompt>nixos-rebuild switch -p test -I nixos-config=./test.nix -</screen> - The new configuration will appear in the GRUB 2 submenu “NixOS - - Profile 'test'”. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>--specialisation</option> - </term> - <term> - <option>-c</option> - </term> - <listitem> - <para> - Activates given specialisation; when not specified, switching and testing - will activate the base, unspecialised system. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>--build-host</option> - </term> - <listitem> - <para> - Instead of building the new configuration locally, use the specified host - to perform the build. The host needs to be accessible with ssh, and must - be able to perform Nix builds. If the option - <option>--target-host</option> is not set, the build will be copied back - to the local machine when done. - </para> - <para> - Note that, if <option>--no-build-nix</option> is not specified, Nix will - be built both locally and remotely. This is because the configuration - will always be evaluated locally even though the building might be - performed remotely. - </para> - <para> - You can include a remote user name in the host name - (<replaceable>user@host</replaceable>). You can also set ssh options by - defining the <envar>NIX_SSHOPTS</envar> environment variable. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>--target-host</option> - </term> - <listitem> - <para> - Specifies the NixOS target host. By setting this to something other than - an empty string, the system activation will happen - on the remote host instead of the local machine. The remote host needs to - be accessible over ssh, and for the commands <option>switch</option>, - <option>boot</option> and <option>test</option> you need root access. - </para> - - <para> - If <option>--build-host</option> is not explicitly specified or empty, - building will take place locally. - </para> - - <para> - You can include a remote user name in the host name - (<replaceable>user@host</replaceable>). You can also set ssh options by - defining the <envar>NIX_SSHOPTS</envar> environment variable. - </para> - - <para> - Note that <command>nixos-rebuild</command> honors the - <literal>nixpkgs.crossSystem</literal> setting of the given configuration - but disregards the true architecture of the target host. Hence the - <literal>nixpkgs.crossSystem</literal> setting has to match the target - platform or else activation will fail. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>--use-substitutes</option> - </term> - <listitem> - <para> - When set, nixos-rebuild will add <option>--use-substitutes</option> - to each invocation of nix-copy-closure. This will only affect the - behavior of nixos-rebuild if <option>--target-host</option> or - <option>--build-host</option> is also set. This is useful when - the target-host connection to cache.nixos.org is faster than the - connection between hosts. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>--use-remote-sudo</option> - </term> - <listitem> - <para> - When set, nixos-rebuild prefixes remote commands that run on - the <option>--build-host</option> and <option>--target-host</option> - systems with <command>sudo</command>. Setting this option allows - deploying as a non-root user. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>--flake</option> <replaceable>flake-uri</replaceable><optional>#<replaceable>name</replaceable></optional> - </term> - <listitem> - <para> - Build the NixOS system from the specified flake. It defaults to - the directory containing the target of the symlink - <filename>/etc/nixos/flake.nix</filename>, if it exists. The - flake must contain an output named - <literal>nixosConfigurations.<replaceable>name</replaceable></literal>. If - <replaceable>name</replaceable> is omitted, it default to the - current host name. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>--no-flake</option> - </term> - <listitem> - <para> - Do not imply <option>--flake</option> if - <filename>/etc/nixos/flake.nix</filename> exists. With this - option, it is possible to build non-flake NixOS configurations - even if the current NixOS systems uses flakes. - </para> - </listitem> - </varlistentry> - - </variablelist> - - <para> - In addition, <command>nixos-rebuild</command> accepts various Nix-related - flags, including <option>--max-jobs</option> / <option>-j</option>, <option>-I</option>, - <option>--show-trace</option>, <option>--keep-failed</option>, - <option>--keep-going</option>, <option>--impure</option>, and <option>--verbose</option> / - <option>-v</option>. See the Nix manual for details. - </para> - </refsection> - - <refsection> - <title>Environment</title> - - <variablelist> - <varlistentry> - <term> - <envar>NIXOS_CONFIG</envar> - </term> - <listitem> - <para> - Path to the main NixOS configuration module. Defaults to - <filename>/etc/nixos/configuration.nix</filename>. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <envar>NIX_PATH</envar> - </term> - <listitem> - <para> - A colon-separated list of directories used to look up Nix expressions enclosed in angle brackets (e.g <nixpkgs>). Example - <screen> - nixpkgs=./my-nixpkgs - </screen> - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <envar>NIX_SSHOPTS</envar> - </term> - <listitem> - <para> - Additional options to be passed to <command>ssh</command> on the command - line. - </para> - </listitem> - </varlistentry> - </variablelist> - </refsection> - - <refsection> - <title>Files</title> - - <variablelist> - - <varlistentry> - <term> - <filename>/etc/nixos/flake.nix</filename> - </term> - <listitem> - <para> - If this file exists, then <command>nixos-rebuild</command> will - use it as if the <option>--flake</option> option was given. This - file may be a symlink to a <filename>flake.nix</filename> in an - actual flake; thus <filename>/etc/nixos</filename> need not be a - flake. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <filename>/run/current-system</filename> - </term> - <listitem> - <para> - A symlink to the currently active system configuration in the Nix store. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <filename>/nix/var/nix/profiles/system</filename> - </term> - <listitem> - <para> - The Nix profile that contains the current and previous system - configurations. Used to generate the GRUB boot menu. - </para> - </listitem> - </varlistentry> - - </variablelist> - </refsection> - - <refsection> - <title>Bugs</title> - <para> - This command should be renamed to something more descriptive. - </para> - </refsection> -</refentry> diff --git a/nixos/doc/manual/man-nixos-version.xml b/nixos/doc/manual/man-nixos-version.xml deleted file mode 100644 index 507c5035ed8..00000000000 --- a/nixos/doc/manual/man-nixos-version.xml +++ /dev/null @@ -1,158 +0,0 @@ -<refentry xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude"> - <refmeta> - <refentrytitle><command>nixos-version</command> - </refentrytitle><manvolnum>8</manvolnum> - <refmiscinfo class="source">NixOS</refmiscinfo> - </refmeta> - <refnamediv> - <refname><command>nixos-version</command></refname> - <refpurpose>show the NixOS version</refpurpose> - </refnamediv> - <refsynopsisdiv> - <cmdsynopsis> - <command>nixos-version</command> - <arg> - <option>--hash</option> - </arg> - - <arg> - <option>--revision</option> - </arg> - - <arg> - <option>--configuration-revision</option> - </arg> - - <arg> - <option>--json</option> - </arg> - - </cmdsynopsis> - </refsynopsisdiv> - - <refsection> - <title>Description</title> - <para> - This command shows the version of the currently active NixOS configuration. - For example: -<screen><prompt>$ </prompt>nixos-version -16.03.1011.6317da4 (Emu) -</screen> - The version consists of the following elements: - <variablelist> - <varlistentry> - <term> - <literal>16.03</literal> - </term> - <listitem> - <para> - The NixOS release, indicating the year and month in which it was - released (e.g. March 2016). - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>1011</literal> - </term> - <listitem> - <para> - The number of commits in the Nixpkgs Git repository between the start of - the release branch and the commit from which this version was built. - This ensures that NixOS versions are monotonically increasing. It is - <literal>git</literal> when the current NixOS configuration was built - from a checkout of the Nixpkgs Git repository rather than from a NixOS - channel. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>6317da4</literal> - </term> - <listitem> - <para> - The first 7 characters of the commit in the Nixpkgs Git repository from - which this version was built. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <literal>Emu</literal> - </term> - <listitem> - <para> - The code name of the NixOS release. The first letter of the code name - indicates that this is the N'th stable NixOS release; for example, Emu - is the fifth release. - </para> - </listitem> - </varlistentry> - </variablelist> - </para> - </refsection> - - <refsection> - <title>Options</title> - - <para> - This command accepts the following options: - </para> - - <variablelist> - - <varlistentry> - <term> - <option>--hash</option> - </term> - <term> - <option>--revision</option> - </term> - <listitem> - <para> - Show the full SHA1 hash of the Git commit from which this configuration - was built, e.g. -<screen><prompt>$ </prompt>nixos-version --hash -6317da40006f6bc2480c6781999c52d88dde2acf -</screen> - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>--configuration-revision</option> - </term> - <listitem> - <para> - Show the configuration revision if available. This could be the full SHA1 - hash of the Git commit of the system flake, if you add - <screen>{ system.configurationRevision = self.rev or "dirty"; }</screen> - to the <screen>modules</screen> array of your flake.nix system configuration e.g. -<screen><prompt>$ </prompt>nixos-version --configuration-revision -aa314ebd1592f6cdd53cb5bba8bcae97d9323de8 -</screen> - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> - <option>--json</option> - </term> - <listitem> - <para> - Print a JSON representation of the versions of NixOS and the - top-level configuration flake. - </para> - </listitem> - </varlistentry> - - </variablelist> - - </refsection> - -</refentry> diff --git a/nixos/doc/manual/man-pages.xml b/nixos/doc/manual/man-pages.xml index 58f73521e94..0186221bddc 100644 --- a/nixos/doc/manual/man-pages.xml +++ b/nixos/doc/manual/man-pages.xml @@ -15,11 +15,4 @@ </copyright> </info> <xi:include href="man-configuration.xml" /> - <xi:include href="man-nixos-build-vms.xml" /> - <xi:include href="man-nixos-generate-config.xml" /> - <xi:include href="man-nixos-install.xml" /> - <xi:include href="man-nixos-enter.xml" /> - <xi:include href="man-nixos-option.xml" /> - <xi:include href="man-nixos-rebuild.xml" /> - <xi:include href="man-nixos-version.xml" /> </reference> diff --git a/nixos/doc/manual/manpages/README.md b/nixos/doc/manual/manpages/README.md new file mode 100644 index 00000000000..ed2682e5332 --- /dev/null +++ b/nixos/doc/manual/manpages/README.md @@ -0,0 +1,55 @@ +# NixOS manpages + +This is the collection of NixOS manpages, excluding `configuration.nix(5)`. + +Man pages are written in [`mdoc(7)` format](https://mandoc.bsd.lv/man/mdoc.7.html) and should be portable between mandoc and groff for rendering (though minor differences may occur, mandoc and groff seem to have slightly different spacing rules.) + +Being written in `mdoc` these manpages use semantic markup. This file provides a guideline on where to apply which of the semantic elements of `mdoc`. + +### Command lines and arguments + +In any manpage, commands, flags and arguments to the *current* executable should be marked according to their semantics. Commands, flags and arguments passed to *other* executables should not be marked like this and should instead be considered as code examples and marked with `Ql`. + + - Use `Fl` to mark flag arguments, `Ar` for their arguments. + - Repeating arguments should be marked by adding ellipses (`...`). + - Use `Cm` to mark literal string arguments, e.g. the `boot` command argument passed to `nixos-rebuild`. + - Optional flags or arguments should be marked with `Op`. This includes optional repeating arguments. + - Required flags or arguments should not be marked. + - Mutually exclusive groups of arguments should be enclosed in curly brackets, preferrably created with `Bro`/`Brc` blocks. + +When an argument is used in an example it should be marked up with `Ar` again to differentiate it from a constant. For example, a command with a `--host name` flag that calls ssh to retrieve the host's local time would signify this thusly: +``` +This will run +.Ic ssh Ar name Ic time +to retrieve the remote time. +``` + +### Paths, NixOS options, environment variables + +Constant paths should be marked with `Pa`, NixOS options with `Va`, and environment variables with `Ev`. + +Generated paths, e.g. `result/bin/run-hostname-vm` (where `hostname` is a variable or arguments) should be marked as `Ql` inline literals with their variable components marked appropriately. + + - Taking `hostname` from an argument become `.Ql result/bin/run- Ns Ar hostname Ns -vm` + - Taking `hostname` from a variable otherwise defined becomes `.Ql result/bin/run- Ns Va hostname Ns -vm` + +### Code examples and other commands + +In free text names and complete invocations of other commands (e.g. `ssh` or `tar -xvf src.tar`) should be marked with `Ic`, fragments of command lines should be marked with `Ql`. + +Larger code blocks or those that cannot be shown inline should use indented literal display block markup for their contents, i.e. +``` +.Bd -literal -offset indent +... +.Ed +``` +Contents of code blocks may be marked up further, e.g. if they refer to arguments that will be subsituted into them: +``` +.Bd -literal -offset indent +{ + options.hostname = "\c +.Ar hostname Ns \c +"; +} +.Ed +``` diff --git a/nixos/doc/manual/manpages/nixos-build-vms.8 b/nixos/doc/manual/manpages/nixos-build-vms.8 new file mode 100644 index 00000000000..abf06b5dd59 --- /dev/null +++ b/nixos/doc/manual/manpages/nixos-build-vms.8 @@ -0,0 +1,109 @@ +.Dd January 1, 1980 +.\" nixpkgs groff will use Nixpkgs as the OS in the title by default, taking it from +.\" doc-default-operating-system. mandoc doesn't have this register set by default, +.\" so we can use it as a groff/mandoc switch. +.ie ddoc-default-operating-system .Dt nixos-build-vms \&8 "NixOS System Manager's Manual" +.el .Dt nixos-build-vms 8 +.Os NixOS +.Sh NAME +.Nm nixos-build-vms +.Nd build a network of virtual machines from a network of NixOS configurations +. +. +. +.Sh SYNOPSIS +.Nm nixos-build-vms +.Op Fl -show-trace +.Op Fl -no-out-link +.Op Fl -help +.Op Fl -option Ar name value +.Pa network.nix +. +. +. +.Sh DESCRIPTION +. +This command builds a network of QEMU\-KVM virtual machines of a Nix expression +specifying a network of NixOS machines. The virtual network can be started by +executing the +.Pa bin/run-vms +shell script that is generated by this command. By default, a +.Pa result +symlink is produced that points to the generated virtual network. +. +.Pp +A network Nix expression has the following structure: +.Bd -literal -offset indent +{ + test1 = {pkgs, config, ...}: + { + services.openssh.enable = true; + nixpkgs.localSystem.system = "i686-linux"; + deployment.targetHost = "test1.example.net"; + + # Other NixOS options + }; + + test2 = {pkgs, config, ...}: + { + services.openssh.enable = true; + services.httpd.enable = true; + environment.systemPackages = [ pkgs.lynx ]; + nixpkgs.localSystem.system = "x86_64-linux"; + deployment.targetHost = "test2.example.net"; + + # Other NixOS options + }; +} +.Ed +. +.Pp +Each attribute in the expression represents a machine in the network +.Ns (e.g. +.Va test1 +and +.Va test2 Ns +) referring to a function defining a NixOS configuration. In each NixOS +configuration, two attributes have a special meaning. The +.Va deployment.targetHost +specifies the address (domain name or IP address) of the system which is used by +.Ic ssh +to perform remote deployment operations. The +.Va nixpkgs.localSystem.system +attribute can be used to specify an architecture for the target machine, such as +.Ql i686-linux +which builds a 32-bit NixOS configuration. Omitting this property will build the +configuration for the same architecture as the host system. +. +. +. +.Sh OPTIONS +.Bl -tag -width indent +.It Fl -show-trace +Shows a trace of the output. +. +.It Fl -no-out-link +Do not create a +.Pa result +symlink. +. +.It Fl h , -help +Shows the usage of this command to the user. +. +.It Fl -option Ar name Va value +Set the Nix configuration option +.Va name +to +.Va value Ns +\&. This overrides settings in the Nix configuration file (see +.Xr nix.conf 5 Ns +). +.El +. +. +. +.Sh AUTHORS +.An -nosplit +.An Eelco Dolstra +and +.An the Nixpkgs/NixOS contributors diff --git a/nixos/doc/manual/manpages/nixos-enter.8 b/nixos/doc/manual/manpages/nixos-enter.8 new file mode 100644 index 00000000000..bc8df31e5f2 --- /dev/null +++ b/nixos/doc/manual/manpages/nixos-enter.8 @@ -0,0 +1,76 @@ +.Dd January 1, 1980 +.\" nixpkgs groff will use Nixpkgs as the OS in the title by default, taking it from +.\" doc-default-operating-system. mandoc doesn't have this register set by default, +.\" so we can use it as a groff/mandoc switch. +.ie ddoc-default-operating-system .Dt nixos-enter \&8 "NixOS System Manager's Manual" +.el .Dt nixos-enter 8 +.Os NixOS +.Sh NAME +.Nm nixos-enter +.Nd run a command in a NixOS chroot environment +. +. +. +.Sh SYNOPSIS +.Nm nixos-enter +.Op Fl -root Ar root +.Op Fl -system Ar system +.Op Fl -command | c Ar shell-command +.Op Fl -silent +.Op Fl -help +.Op Fl - Ar arguments ... +. +. +. +.Sh DESCRIPTION +This command runs a command in a NixOS chroot environment, that is, in a filesystem hierarchy previously prepared using +.Xr nixos-install 8 . +. +. +. +.Sh OPTIONS +.Bl -tag -width indent +.It Fl -root Ar root +The path to the NixOS system you want to enter. It defaults to +.Pa /mnt Ns +\&. +.It Fl -system Ar system +The NixOS system configuration to use. It defaults to +.Pa /nix/var/nix/profiles/system Ns +\&. You can enter a previous NixOS configuration by specifying a path such as +.Pa /nix/var/nix/profiles/system-106-link Ns +\&. +. +.It Fl -command Ar shell-command , Fl c Ar shell-command +The bash command to execute. +. +.It Fl -silent +Suppresses all output from the activation script of the target system. +. +.It Fl - +Interpret the remaining arguments as the program name and arguments to be invoked. +The program is not executed in a shell. +.El +. +. +. +.Sh EXAMPLES +.Bl -tag -width indent +.It Ic nixos-enter --root /mnt +Start an interactive shell in the NixOS installation in +.Pa /mnt Ns . +. +.It Ic nixos-enter -c 'ls -l /; cat /proc/mounts' +Run a shell command. +. +.It Ic nixos-enter -- cat /proc/mounts +Run a non-shell command. +.El +. +. +. +.Sh AUTHORS +.An -nosplit +.An Eelco Dolstra +and +.An the Nixpkgs/NixOS contributors diff --git a/nixos/doc/manual/manpages/nixos-generate-config.8 b/nixos/doc/manual/manpages/nixos-generate-config.8 new file mode 100644 index 00000000000..8b9bb4d4248 --- /dev/null +++ b/nixos/doc/manual/manpages/nixos-generate-config.8 @@ -0,0 +1,169 @@ +.Dd January 1, 1980 +.\" nixpkgs groff will use Nixpkgs as the OS in the title by default, taking it from +.\" doc-default-operating-system. mandoc doesn't have this register set by default, +.\" so we can use it as a groff/mandoc switch. +.ie ddoc-default-operating-system .Dt nixos-generate-config \&8 "NixOS System Manager's Manual" +.el .Dt nixos-generate-config 8 +.Os NixOS +.Sh NAME +.Nm nixos-generate-config +.Nd generate NixOS configuration modules +. +. +. +.Sh SYNOPSIS +.Nm nixos-generate-config +.Op Fl -force +.Op Fl -root Ar root +.Op Fl -dir Ar dir +. +. +. +.Sh DESCRIPTION +This command writes two NixOS configuration modules: +.Bl -tag -width indent +.It Pa /etc/nixos/hardware-configuration.nix +This module sets NixOS configuration options based on your current hardware +configuration. In particular, it sets the +.Va fileSystem +option to reflect all currently mounted file systems, the +.Va swapDevices +option to reflect active swap devices, and the +.Va boot.initrd.* +options to ensure that the initial ramdisk contains any kernel modules necessary +for mounting the root file system. +.Pp +If this file already exists, it is overwritten. Thus, you should not modify it +manually. Rather, you should include it from your +.Pa /etc/nixos/configuration.nix Ns +, and re-run +.Nm +to update it whenever your hardware configuration changes. +. +.It Pa /etc/nixos/configuration.nix +This is the main NixOS system configuration module. If it already exists, it’s +left unchanged. Otherwise, +.Nm +will write a template for you to customise. +.El +. +. +. +.Sh OPTIONS +.Bl -tag -width indent +.It Fl -root Ar root +If this option is given, treat the directory +.Ar root +as the root of the file system. This means that configuration files will be written to +.Ql Ar root Ns /etc/nixos Ns +, and that any file systems outside of +.Ar root +are ignored for the purpose of generating the +.Va fileSystems +option. +. +.It Fl -dir Ar dir +If this option is given, write the configuration files to the directory +.Ar dir +instead of +.Pa /etc/nixos Ns +\&. +. +.It Fl -force +Overwrite +.Pa /etc/nixos/configuration.nix +if it already exists. +. +.It Fl -no-filesystems +Omit everything concerning file systems and swap devices from the hardware configuration. +. +.It Fl -show-hardware-config +Don't generate +.Pa configuration.nix +or +.Pa hardware-configuration.nix +and print the hardware configuration to stdout only. +.El +. +. +. +.Sh EXAMPLES +This command is typically used during NixOS installation to write initial +configuration modules. For example, if you created and mounted the target file +systems on +.Pa /mnt +and +.Pa /mnt/boot Ns +, you would run: +.Bd -literal -offset indent +$ nixos-generate-config --root /mnt +.Ed +. +.Pp +The resulting file +.Pa /mnt/etc/nixos/hardware-configuration.nix +might look like this: +.Bd -literal -offset indent +# Do not modify this file! It was generated by 'nixos-generate-config' +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, pkgs, ... }: + +{ + imports = + [ <nixos/modules/installer/scan/not-detected.nix> + ]; + + boot.initrd.availableKernelModules = [ "ehci_hcd" "ahci" ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-label/nixos"; + fsType = "ext3"; + options = [ "rw" "data=ordered" "relatime" ]; + }; + + fileSystems."/boot" = + { device = "/dev/sda1"; + fsType = "ext3"; + options = [ "rw" "errors=continue" "user_xattr" "acl" "barrier=1" "data=writeback" "relatime" ]; + }; + + swapDevices = + [ { device = "/dev/sda2"; } + ]; + + nix.maxJobs = 8; +} +.Ed +. +.Pp +It will also create a basic +.Pa /mnt/etc/nixos/configuration.nix Ns +, which you should edit to customise the logical configuration of your system. \ +This file includes the result of the hardware scan as follows: +.Bd -literal -offset indent +imports = [ ./hardware-configuration.nix ]; +.Ed +. +.Pp +After installation, if your hardware configuration changes, you can run: +.Bd -literal -offset indent +$ nixos-generate-config +.Ed +. +.Pp +to update +.Pa /etc/nixos/hardware-configuration.nix Ns +\&. Your +.Pa /etc/nixos/configuration.nix +will +.Em not +be overwritten. +. +.Sh AUTHORS +.An -nosplit +.An Eelco Dolstra +and +.An the Nixpkgs/NixOS contributors diff --git a/nixos/doc/manual/manpages/nixos-install.8 b/nixos/doc/manual/manpages/nixos-install.8 new file mode 100644 index 00000000000..dc0a5da275d --- /dev/null +++ b/nixos/doc/manual/manpages/nixos-install.8 @@ -0,0 +1,195 @@ +.Dd January 1, 1980 +.\" nixpkgs groff will use Nixpkgs as the OS in the title by default, taking it from +.\" doc-default-operating-system. mandoc doesn't have this register set by default, +.\" so we can use it as a groff/mandoc switch. +.ie ddoc-default-operating-system .Dt nixos-install \&8 "NixOS System Manager's Manual" +.el .Dt nixos-install 8 +.Os NixOS +.Sh NAME +.Nm nixos-install +.Nd install bootloader and NixOS +. +. +. +.Sh SYNOPSIS +.Nm nixos-install +.Op Fl -verbose | v +.Op Fl I Ar path +.Op Fl -root Ar root +.Op Fl -system Ar path +.Op Fl -flake Ar flake-uri +.Op Fl -impure +.Op Fl -channel Ar channel +.Op Fl -no-channel-copy +.Op Fl -no-root-password | -no-root-passwd +.Op Fl -no-bootloader +.Op Fl -max-jobs | j Ar number +.Op Fl -cores Ar number +.Op Fl -option Ar name value +.Op Fl -show-trace +.Op Fl -keep-going +.Op Fl -help +. +. +. +.Sh DESCRIPTION +This command installs NixOS in the file system mounted on +.Pa /mnt Ns +, based on the NixOS configuration specified in +.Pa /mnt/etc/nixos/configuration.nix Ns +\&. It performs the following steps: +. +.Bl -enum +.It +It copies Nix and its dependencies to +.Pa /mnt/nix/store Ns +\&. +. +.It +It runs Nix in +.Pa /mnt +to build the NixOS configuration specified in +.Pa /mnt/etc/nixos/configuration.nix Ns +\&. +. +.It +It installs the current channel +.Dq nixos +in the target channel profile (unless +.Fl -no-channel-copy +is specified). +. +.It +It installs the GRUB boot loader on the device specified in the option +.Va boot.loader.grub.device +(unless +.Fl -no-bootloader +is specified), and generates a GRUB configuration file that boots into the NixOS +configuration just installed. +. +.It +It prompts you for a password for the root account (unless +.Fl -no-root-password +is specified). +.El +. +.Pp +This command is idempotent: if it is interrupted or fails due to a temporary +problem (e.g. a network issue), you can safely re-run it. +. +. +. +.Sh OPTIONS +.Bl -tag -width indent +.It Fl -verbose , v +Increases the level of verbosity of diagnostic messages printed on standard +error. For each Nix operation, the information printed on standard output is +well-defined; any diagnostic information is printed on standard error, never on +standard output. +.Pp +Please note that this option may be specified repeatedly. +. +.It Fl -root Ar root +Defaults to +.Pa /mnt Ns +\&. If this option is given, treat the directory +.Ar root +as the root of the NixOS installation. +. +.It Fl -system Ar path +If this option is provided, +.Nm +will install the specified closure rather than attempt to build one from +.Pa /mnt/etc/nixos/configuration.nix Ns +\&. +.Pp +The closure must be an appropriately configured NixOS system, with boot loader +and partition configuration that fits the target host. Such a closure is +typically obtained with a command such as +.Ic nix-build -I nixos-config=./configuration.nix '<nixpkgs/nixos>' -A system --no-out-link Ns +\&. +. +.It Fl -flake Ar flake-uri Ns # Ns Ar name +Build the NixOS system from the specified flake. The flake must contain an +output named +.Ql nixosConfigurations. Ns Ar name Ns +\&. +. +.It Fl -channel Ar channel +If this option is provided, do not copy the current +.Dq nixos +channel to the target host. Instead, use the specified derivation. +. +.It Fl I Ar Path +Add a path to the Nix expression search path. This option may be given multiple +times. See the +.Ev NIX_PATH +environment variable for information on the semantics of the Nix search path. Paths added through +.Fl I +take precedence over +.Ev NIX_PATH Ns +\&. +. +.It Fl -max-jobs , j Ar number +Sets the maximum number of build jobs that Nix will perform in parallel to the +specified number. The default is 1. A higher value is useful on SMP systems or +to exploit I/O latency. +. +.It Fl -cores Ar N +Sets the value of the +.Ev NIX_BUILD_CORES +environment variable in the invocation of builders. Builders can use this +variable at their discretion to control the maximum amount of parallelism. For +instance, in Nixpkgs, if the derivation attribute +.Va enableParallelBuilding +is set to true, the builder passes the +.Fl j Ns Va N +flag to GNU Make. The value 0 means that the builder should use all available CPU cores in the system. +. +.It Fl -option Ar name value +Set the Nix configuration option +.Ar name +to +.Ar value Ns +\&. +. +.It Fl -show-trace +Causes Nix to print out a stack trace in case of Nix expression evaluation errors. +. +.It Fl -keep-going +Causes Nix to continue building derivations as far as possible in the face of failed builds. +. +.It Fl -help +Synonym for +.Ic man nixos-install Ns +\&. +.El +. +. +. +.Sh EXAMPLES +A typical NixOS installation is done by creating and mounting a file system on +.Pa /mnt Ns +, generating a NixOS configuration in +.Pa /mnt/etc/nixos/configuration.nix Ns +, and running +.Nm Ns +\&. For instance, if we want to install NixOS on an ext4 file system created in +.Pa /dev/sda1 Ns +: +.Bd -literal -offset indent +$ mkfs.ext4 /dev/sda1 +$ mount /dev/sda1 /mnt +$ nixos-generate-config --root /mnt +$ # edit /mnt/etc/nixos/configuration.nix +$ nixos-install +$ reboot +.Ed +. +. +. +.Sh AUTHORS +.An -nosplit +.An Eelco Dolstra +and +.An the Nixpkgs/NixOS contributors diff --git a/nixos/doc/manual/manpages/nixos-option.8 b/nixos/doc/manual/manpages/nixos-option.8 new file mode 100644 index 00000000000..79cc113cfaf --- /dev/null +++ b/nixos/doc/manual/manpages/nixos-option.8 @@ -0,0 +1,93 @@ +.Dd January 1, 1980 +.\" nixpkgs groff will use Nixpkgs as the OS in the title by default, taking it from +.\" doc-default-operating-system. mandoc doesn't have this register set by default, +.\" so we can use it as a groff/mandoc switch. +.ie ddoc-default-operating-system .Dt nixos-option \&8 "NixOS System Manager's Manual" +.el .Dt nixos-option 8 +.Os NixOS +.Sh NAME +.Nm nixos-option +.Nd inspect a NixOS configuration +. +. +. +.Sh SYNOPSIS +.Nm +.Op Fl r | -recursive +.Op Fl I Ar path +.Ar option.name +. +. +. +.Sh DESCRIPTION +This command evaluates the configuration specified in +.Pa /etc/nixos/configuration.nix +and returns the properties of the option name given as argument. +. +.Pp +When the option name is not an option, the command prints the list of attributes +contained in the attribute set. +. +. +. +.Sh OPTIONS +.Bl -tag -width indent +.It Fl r , -recursive +Print all the values at or below the specified path recursively. +. +.It Fl I Ar path +This option is passed to the underlying +.Xr nix-instantiate 1 +invocation. +.El +. +. +. +.Sh ENVIRONMENT +.Bl -tag -width indent +.It Ev NIXOS_CONFIG +Path to the main NixOS configuration module. Defaults to +.Pa /etc/nixos/configuration.nix Ns +\&. +.El +. +. +. +.Sh EXAMPLES +Investigate option values: +.Bd -literal -offset indent +$ nixos-option boot.loader +This attribute set contains: +generationsDir +grub +initScript + +$ nixos-option boot.loader.grub.enable +Value: +true + +Default: +true + +Description: +Whether to enable the GNU GRUB boot loader. + +Declared by: + "/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix" + +Defined by: + "/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix" +.Ed +. +. +. +.Sh SEE ALSO +.Xr configuration.nix 5 +. +. +. +.Sh AUTHORS +.An -nosplit +.An Nicolas Pierron +and +.An the Nixpkgs/NixOS contributors diff --git a/nixos/doc/manual/manpages/nixos-rebuild.8 b/nixos/doc/manual/manpages/nixos-rebuild.8 new file mode 100644 index 00000000000..8ff59d6da9c --- /dev/null +++ b/nixos/doc/manual/manpages/nixos-rebuild.8 @@ -0,0 +1,456 @@ +.Dd January 1, 1980 +.\" nixpkgs groff will use Nixpkgs the OS in the title by default, taking it from +.\" doc-default-operating-system. mandoc doesn't have this register set by default, +.\" so we can use it as a groff/mandoc switch. +.ie ddoc-default-operating-system .Dt nixos-rebuild \&8 "NixOS System Manager's Manual" +.el .Dt nixos-rebuild 8 +.Os NixOS +.Sh NAME +.Nm nixos-rebuild +.Nd reconfigure a NixOS machine +. +. +. +.Sh SYNOPSIS +.Nm +.Bro +.Cm switch | boot | test | build | dry-build | dry-activate | edit | build-vm | build-vm-with-bootloader +.Brc +.br +.Op Fl -upgrade | -upgrade-all +.Op Fl -install-bootloader +.Op Fl -no-build-nix +.Op Fl -fast +.Op Fl -rollback +.Op Fl -builders Ar builder-spec +.br +.Op Fl -flake Ar flake-uri +.Op Fl -no-flake +.Op Fl -override-input Ar input-name flake-uri +.br +.Op Fl -profile-name | p Ar name +.Op Fl -specialisation | c Ar name +.br +.Op Fl -build-host Va host +.Op Fl -target-host Va host +.Op Fl -use-remote-sudo +.br +.Op Fl -show-trace +.Op Fl I Va NIX_PATH +.Op Fl -verbose | v +.Op Fl -impure +.Op Fl -max-jobs | j Va number +.Op Fl -keep-failed | K +.Op Fl -keep-going | k +. +. +. +.Sh DESCRIPTION +This command updates the system so that it corresponds to the +configuration specified in +.Pa /etc/nixos/configuration.nix +or +.Pa /etc/nixos/flake.nix Ns +\&. Thus, every time you modify the configuration or any other NixOS module, you +must run +.Nm +to make the changes take effect. It builds the new system in +.Pa /nix/store Ns +, runs its activation script, and stop and (re)starts any system services if +needed. Please note that user services need to be started manually as they +aren't detected by the activation script at the moment. +. +.Pp +This command has one required argument, which specifies the desired +operation. It must be one of the following: +.Bl -tag -width indent +.It Cm switch +Build and activate the new configuration, and make it the boot default. That +is, the configuration is added to the GRUB boot menu as the default +menu entry, so that subsequent reboots will boot the system into the new +configuration. Previous configurations activated with +.Ic nixos-rebuild switch +or +.Ic nixos-rebuild boot +remain available in the GRUB menu. +.Pp +Note that if you are using specializations, running just +.Ic nixos-rebuild switch +will switch you back to the unspecialized, base system \(em in that case, you +might want to use this instead: +.Bd -literal -offset indent +$ nixos-rebuild switch --specialisation your-specialisation-name +.Ed +.Pp +This command will build all specialisations and make them bootable just +like regular +.Ic nixos-rebuild switch +does \(em the only thing different is that it will switch to given +specialisation instead of the base system; it can be also used to switch from +the base system into a specialised one, or to switch between specialisations. +. +.It Cm boot +Build the new configuration and make it the boot default (as with +.Ic nixos-rebuild switch Ns +), but do not activate it. That is, the system continues to run the previous +configuration until the next reboot. +. +.It Cm test +Build and activate the new configuration, but do not add it to the GRUB +boot menu. Thus, if you reboot the system (or if it crashes), you will +automatically revert to the default configuration (i.e. the +configuration resulting from the last call to +.Ic nixos-rebuild switch +or +.Ic nixos-rebuild boot Ns +). +.Pp +Note that if you are using specialisations, running just +.Ic nixos-rebuild test +will activate the unspecialised, base system \(em in that case, you might want +to use this instead: +.Bd -literal -offset indent +$ nixos-rebuild test --specialisation your-specialisation-name +.Ed +.Pp +This command can be also used to switch from the base system into a +specialised one, or to switch between specialisations. +. +.It Cm build +Build the new configuration, but neither activate it nor add it to the +GRUB boot menu. It leaves a symlink named +.Pa result +in the current directory, which points to the output of the top-level +.Dq system +derivation. This is essentially the same as doing +.Bd -literal -offset indent +$ nix-build /path/to/nixpkgs/nixos -A system +.Ed +.Pp +Note that you do not need to be root to run +.Ic nixos-rebuild build Ns +\&. +. +.It Cm dry-build +Show what store paths would be built or downloaded by any of the +operations above, but otherwise do nothing. +. +.It Cm dry-activate +Build the new configuration, but instead of activating it, show what +changes would be performed by the activation (i.e. by +.Ic nixos-rebuild test Ns +). For instance, this command will print which systemd units would be restarted. +The list of changes is not guaranteed to be complete. +. +.It Cm edit +Opens +.Pa configuration.nix +in the default editor. +. +.It Cm build-vm +Build a script that starts a NixOS virtual machine with the desired +configuration. It leaves a symlink +.Pa result +in the current directory that points (under +.Ql result/bin/run\- Ns Va hostname Ns \-vm Ns +) +at the script that starts the VM. Thus, to test a NixOS configuration in +a virtual machine, you should do the following: +.Bd -literal -offset indent +$ nixos-rebuild build-vm +$ ./result/bin/run-*-vm +.Ed +.Pp +The VM is implemented using the +.Ql qemu +package. For best performance, you should load the +.Ql kvm-intel +or +.Ql kvm-amd +kernel modules to get hardware virtualisation. +.Pp +The VM mounts the Nix store of the host through the 9P file system. The +host Nix store is read-only, so Nix commands that modify the Nix store +will not work in the VM. This includes commands such as +.Nm Ns +; to change the VM’s configuration, you must halt the VM and re-run the commands +above. +.Pp +The VM has its own ext3 root file system, which is automatically created when +the VM is first started, and is persistent across reboots of the VM. It is +stored in +.Ql ./ Ns Va hostname Ns .qcow2 Ns +\&. +.\" The entire file system hierarchy of the host is available in +.\" the VM under +.\" .Pa /hostfs Ns +.\" . +. +.It Cm build-vm-with-bootloader +Like +.Cm build-vm Ns +, but boots using the regular boot loader of your configuration (e.g. GRUB 1 or +2), rather than booting directly into the kernel and initial ramdisk of the +system. This allows you to test whether the boot loader works correctly. \ +However, it does not guarantee that your NixOS configuration will boot +successfully on the host hardware (i.e., after running +.Ic nixos-rebuild switch Ns +), because the hardware and boot loader configuration in the VM are different. +The boot loader is installed on an automatically generated virtual disk +containing a +.Pa /boot +partition. +.El +. +. +. +.Sh OPTIONS +.Bl -tag -width indent +.It Fl -upgrade , -upgrade-all +Update the root user's channel named +.Ql nixos +before rebuilding the system. +.Pp +In addition to the +.Ql nixos +channel, the root user's channels which have a file named +.Ql .update-on-nixos-rebuild +in their base directory will also be updated. +.Pp +Passing +.Fl -upgrade-all +updates all of the root user's channels. +. +.It Fl -install-bootloader +Causes the boot loader to be (re)installed on the device specified by the +relevant configuration options. +. +.It Fl -no-build-nix +Normally, +.Nm +first builds the +.Ql nixUnstable +attribute in Nixpkgs, and uses the resulting instance of the Nix package manager +to build the new system configuration. This is necessary if the NixOS modules +use features not provided by the currently installed version of Nix. This option +disables building a new Nix. +. +.It Fl -fast +Equivalent to +.Fl -no-build-nix Ns +\&. This option is useful if you call +.Nm +frequently (e.g. if you’re hacking on a NixOS module). +. +.It Fl -rollback +Instead of building a new configuration as specified by +.Pa /etc/nixos/configuration.nix Ns +, roll back to the previous configuration. (The previous configuration is +defined as the one before the “current” generation of the Nix profile +.Pa /nix/var/nix/profiles/system Ns +\&.) +. +.It Fl -builders Ar builder-spec +Allow ad-hoc remote builders for building the new system. This requires +the user executing +.Nm +(usually root) to be configured as a trusted user in the Nix daemon. This can be +achieved by using the +.Va nix.settings.trusted-users +NixOS option. Examples values for that option are described in the +.Dq Remote builds +chapter in the Nix manual, (i.e. +.Ql --builders \(dqssh://bigbrother x86_64-linux\(dq Ns +). By specifying an empty string existing builders specified in +.Pa /etc/nix/machines +can be ignored: +.Ql --builders \(dq\(dq +for example when they are not reachable due to network connectivity. +. +.It Fl -profile-name Ar name , Fl p Ar name +Instead of using the Nix profile +.Pa /nix/var/nix/profiles/system +to keep track of the current and previous system configurations, use +.Pa /nix/var/nix/profiles/system-profiles/ Ns Va name Ns +\&. When you use GRUB 2, for every system profile created with this flag, NixOS +will create a submenu named +.Dq NixOS - Profile Va name +in GRUB’s boot menu, containing the current and previous configurations of this profile. +.Pp +For instance, if you want to test a configuration file named +.Pa test.nix +without affecting the default system profile, you would do: +.Bd -literal -offset indent +$ nixos-rebuild switch -p test -I nixos-config=./test.nix +.Ed +.Pp +The new configuration will appear in the GRUB 2 submenu +.Dq NixOS - Profile 'test' Ns +\&. +. +.It Fl -specialisation Ar name , Fl c Ar name +Activates given specialisation; when not specified, switching and testing +will activate the base, unspecialised system. +. +.It Fl -build-host Ar host +Instead of building the new configuration locally, use the specified host +to perform the build. The host needs to be accessible with +.Ic ssh Ns , +and must be able to perform Nix builds. If the option +.Fl -target-host +is not set, the build will be copied back to the local machine when done. +.Pp +Note that, if +.Fl -no-build-nix +is not specified, Nix will be built both locally and remotely. This is because +the configuration will always be evaluated locally even though the building +might be performed remotely. +.Pp +You can include a remote user name in the host name +.Ns ( Va user@host Ns +). You can also set ssh options by defining the +.Ev NIX_SSHOPTS +environment variable. +. +.It Fl -target-host Ar host +Specifies the NixOS target host. By setting this to something other than an +empty string, the system activation will happen on the remote host instead of +the local machine. The remote host needs to be accessible over +.Ic ssh Ns , +and for the commands +.Cm switch Ns +, +.Cm boot +and +.Cm test +you need root access. +.Pp +If +.Fl -build-host +is not explicitly specified or empty, building will take place locally. +.Pp +You can include a remote user name in the host name +.Ns ( Va user@host Ns +). You can also set ssh options by defining the +.Ev NIX_SSHOPTS +environment variable. +.Pp +Note that +.Nm +honors the +.Va nixpkgs.crossSystem +setting of the given configuration but disregards the true architecture of the +target host. Hence the +.Va nixpkgs.crossSystem +setting has to match the target platform or else activation will fail. +. +.It Fl -use-substitutes +When set, nixos-rebuild will add +.Fl -use-substitutes +to each invocation of nix-copy-closure. This will only affect the behavior of +nixos-rebuild if +.Fl -target-host +or +.Fl -build-host +is also set. This is useful when the target-host connection to cache.nixos.org +is faster than the connection between hosts. +. +.It Fl -use-remote-sudo +When set, nixos-rebuild prefixes remote commands that run on the +.Fl -build-host +and +.Fl -target-host +systems with +.Ic sudo Ns +\&. Setting this option allows deploying as a non-root user. +. +.It Fl -flake Va flake-uri Ns Op Va #name +Build the NixOS system from the specified flake. It defaults to the directory +containing the target of the symlink +.Pa /etc/nixos/flake.nix Ns +, if it exists. The flake must contain an output named +.Ql nixosConfigurations. Ns Va name Ns +\&. If +.Va name +is omitted, it default to the current host name. +. +.It Fl -no-flake +Do not imply +.Fl -flake +if +.Pa /etc/nixos/flake.nix +exists. With this option, it is possible to build non-flake NixOS configurations +even if the current NixOS systems uses flakes. +.El +.Pp +In addition, +.Nm +accepts various Nix-related flags, including +.Fl -max-jobs Ns , +.Fl j Ns , +.Fl I Ns , +.Fl -show-trace Ns , +.Fl -keep-failed Ns , +.Fl -keep-going Ns , +.Fl -impure Ns , +.Fl -verbose Ns , and +.Fl v Ns +\&. See the Nix manual for details. +. +. +. +.Sh ENVIRONMENT +.Bl -tag -width indent +.It Ev NIXOS_CONFIG +Path to the main NixOS configuration module. Defaults to +.Pa /etc/nixos/configuration.nix Ns +\&. +. +.It Ev NIX_PATH +A colon-separated list of directories used to look up Nix expressions enclosed +in angle brackets (e.g. <nixpkgs>). Example: +.Bd -literal -offset indent +nixpkgs=./my-nixpkgs +.Ed +. +.It Ev NIX_SSHOPTS +Additional options to be passed to +.Ic ssh +on the command line. +.El +. +. +. +.Sh FILES +.Bl -tag -width indent +.It Pa /etc/nixos/flake.nix +If this file exists, then +.Nm +will use it as if the +.Fl -flake +option was given. This file may be a symlink to a +.Pa flake.nix +in an actual flake; thus +.Pa /etc/nixos +need not be a flake. +. +.It Pa /run/current-system +A symlink to the currently active system configuration in the Nix store. +. +.It Pa /nix/var/nix/profiles/system +The Nix profile that contains the current and previous system +configurations. Used to generate the GRUB boot menu. +.El +. +. +. +.Sh BUGS +This command should be renamed to something more descriptive. +. +. +. +.Sh AUTHORS +.An -nosplit +.An Eelco Dolstra +and +.An the Nixpkgs/NixOS contributors diff --git a/nixos/doc/manual/manpages/nixos-version.8 b/nixos/doc/manual/manpages/nixos-version.8 new file mode 100644 index 00000000000..980ee8b1f49 --- /dev/null +++ b/nixos/doc/manual/manpages/nixos-version.8 @@ -0,0 +1,90 @@ +.Dd January 1, 1980 +.\" nixpkgs groff will use Nixpkgs as the OS in the title by default, taking it from +.\" doc-default-operating-system. mandoc doesn't have this register set by default, +.\" so we can use it as a groff/mandoc switch. +.ie ddoc-default-operating-system .Dt nixos-version \&8 "NixOS System Manager's Manual" +.el .Dt nixos-version 8 +.Os NixOS +.Sh NAME +.Nm nixos-version +.Nd show the NixOS version +. +. +. +.Sh SYNOPSIS +.Nm nixos-version +.Op Fl -hash +.Op Fl -revision +.Op Fl -configuration-revision +.Op Fl -json +. +. +. +.Sh DESCRIPTION +This command shows the version of the currently active NixOS configuration. For example: +.Bd -literal -offset indent +$ nixos-version +16.03.1011.6317da4 (Emu) +.Ed +. +.Pp +The version consists of the following elements: +.Bl -tag -width indent +.It Ql 16.03 +The NixOS release, indicating the year and month in which it was released +(e.g. March 2016). +.It Ql 1011 +The number of commits in the Nixpkgs Git repository between the start of the +release branch and the commit from which this version was built. This ensures +that NixOS versions are monotonically increasing. It is +.Ql git +when the current NixOS configuration was built from a checkout of the Nixpkgs +Git repository rather than from a NixOS channel. +.It Ql 6317da4 +The first 7 characters of the commit in the Nixpkgs Git repository from which +this version was built. +.It Ql Emu +The code name of the NixOS release. The first letter of the code name indicates +that this is the N'th stable NixOS release; for example, Emu is the fifth +release. +.El +. +. +. +.Sh OPTIONS +.Bl -tag -width indent +.It Fl -hash , -revision +Show the full SHA1 hash of the Git commit from which this configuration was +built, e.g. +.Bd -literal -offset indent +$ nixos-version --hash +6317da40006f6bc2480c6781999c52d88dde2acf +.Ed +. +.It Fl -configuration-revision +Show the configuration revision if available. This could be the full SHA1 hash +of the Git commit of the system flake, if you add +.Bd -literal -offset indent +{ system.configurationRevision = self.rev or "dirty"; } +.Ed +.Pp +to the +.Ql modules +array of your flake.nix system configuration e.g. +.Bd -literal -offset indent +$ nixos-version --configuration-revision +aa314ebd1592f6cdd53cb5bba8bcae97d9323de8 +.Ed +. +.It Fl -json +Print a JSON representation of the versions of NixOS and the top-level +configuration flake. +.El +. +. +. +.Sh AUTHORS +.An -nosplit +.An Eelco Dolstra +and +.An the Nixpkgs/NixOS contributors diff --git a/nixos/modules/services/monitoring/cadvisor.nix b/nixos/modules/services/monitoring/cadvisor.nix index a8fba4e6e8c..68e6e8e40b3 100644 --- a/nixos/modules/services/monitoring/cadvisor.nix +++ b/nixos/modules/services/monitoring/cadvisor.nix @@ -123,7 +123,7 @@ in { ${escapeShellArgs cfg.extraOptions} \ ${optionalString (cfg.storageDriver != null) '' -storage_driver "${cfg.storageDriver}" \ - -storage_driver_user "${cfg.storageDriverHost}" \ + -storage_driver_host "${cfg.storageDriverHost}" \ -storage_driver_db "${cfg.storageDriverDb}" \ -storage_driver_user "${cfg.storageDriverUser}" \ -storage_driver_password "$(cat "${cfg.storageDriverPasswordFile}")" \ diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 4fcaeebffc3..d26ea7597c4 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -90,7 +90,7 @@ let # copy what we need. Instead of using statically linked binaries, # we just copy what we need from Glibc and use patchelf to make it # work. - extraUtils = pkgs.runCommandCC "extra-utils" + extraUtils = pkgs.runCommand "extra-utils" { nativeBuildInputs = [pkgs.buildPackages.nukeReferences]; allowedReferences = [ "out" ]; # prevent accidents like glibc being included in the initrd } diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index e6c2c72339f..aa44f264269 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -25,11 +25,7 @@ in config = { - assertions = [ - { assertion = versionOlder config.boot.kernelPackages.kernel.version "5.17"; - message = "ENA driver fails to build with kernel >= 5.17"; - } - ]; + assertions = [ ]; boot.growPartition = true; diff --git a/pkgs/applications/editors/jetbrains/versions.json b/pkgs/applications/editors/jetbrains/versions.json index b6d4e39f9fc..0dc6e8297c6 100644 --- a/pkgs/applications/editors/jetbrains/versions.json +++ b/pkgs/applications/editors/jetbrains/versions.json @@ -27,10 +27,10 @@ "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "566eada40511cd06727d69047e8a6a1e75b06ebade93d1ea78262fc2715c8a38", - "url": "https://download.jetbrains.com/go/goland-2022.3.1.tar.gz", - "build_number": "223.8214.59" + "version": "2022.3.2", + "sha256": "f130d0e4c2c89dcd291e05cca33484eb08e247e9ec29c13deaf67176afbf6a36", + "url": "https://download.jetbrains.com/go/goland-2022.3.2.tar.gz", + "build_number": "223.8617.58" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", @@ -59,10 +59,10 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "222e8cf974f70a77c92f03b34c38645bfe72a2dd4da20d7154f40375db54709b", - "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.1.tar.gz", - "build_number": "223.8214.64", + "version": "2022.3.2", + "sha256": "7592d18fa1e199087cfd661b64c2fad717840f8ff3e3faf4d88db58bdb397e03", + "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.2.tar.gz", + "build_number": "223.8617.59", "version-major-minor": "2022.3" }, "pycharm-community": { @@ -92,18 +92,18 @@ "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "4d2adb310b14fb38afcaa2da5c254c2fc0bede109e597eed6d3c36837497591f", - "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.1.tar.gz", - "build_number": "223.8214.60" + "version": "2022.3.2", + "sha256": "8c803914c55a3c1801ff9b619870d81597fabedbfb08a7c1aecf24f5d0884aea", + "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.2.tar.gz", + "build_number": "223.8617.48" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "d78bd6494cced51fe77d87c07040fa3a29e8af917317399036af161c56afd927", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.1.tar.gz", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "2b612177c99ff0c6c542abe005846c3aa6cf170faa0202daafeb4ab1627c3794", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.2.tar.gz", + "build_number": "223.8617.44" } }, "x86_64-darwin": { @@ -134,10 +134,10 @@ "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", - "version": "2022.3.1", - "sha256": "296d5da052b59a00b0930cf6eea07eb2e5ed4eb1417ee505b013c6d83ffda2e1", - "url": "https://download.jetbrains.com/go/goland-2022.3.1.dmg", - "build_number": "223.8214.59" + "version": "2022.3.2", + "sha256": "8e12ae0ee0d88cd716ac76a8a49392a51236287984d84c19324a19758fe8fc03", + "url": "https://download.jetbrains.com/go/goland-2022.3.2.dmg", + "build_number": "223.8617.58" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", @@ -166,10 +166,10 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", - "version": "2022.3.1", - "sha256": "a2ea7d0f1fd9810a46a3f3fea5f47475fe8b325514488f46ee4dace474388fa4", - "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.1.dmg", - "build_number": "223.8214.64", + "version": "2022.3.2", + "sha256": "a2833c575cfa17c8d30a5f2e0d4ff06167372e7d8190ff08fc2f14e57a21396c", + "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.2.dmg", + "build_number": "223.8617.59", "version-major-minor": "2022.3" }, "pycharm-community": { @@ -199,18 +199,18 @@ "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", - "version": "2022.3.1", - "sha256": "3b23165c3ea9ef3d87233a64005bee4fbf98c99df5d60410a1418e022ce032d6", - "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.1.dmg", - "build_number": "223.8214.60" + "version": "2022.3.2", + "sha256": "bea0a86a4ca00c08d78ccca7568ad5170798544c4a64b21bbfede126bdff0a99", + "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.2.dmg", + "build_number": "223.8617.48" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", - "version": "2022.3.1", - "sha256": "ea2fb464cf8ba0bf553115cd0f006cb4dab729cbde941de2fc86588024abe8b9", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.1.dmg", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "87e716107156d15aa68230369b6eab2d25c5f6134cfe38cdb01e5b10f2a24418", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.2.dmg", + "build_number": "223.8617.44" } }, "aarch64-darwin": { @@ -241,10 +241,10 @@ "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "5873200406e91ca64df50470eb20f907c568f5d95b7488cb4c3b3d3eb8353df4", - "url": "https://download.jetbrains.com/go/goland-2022.3.1-aarch64.dmg", - "build_number": "223.8214.59" + "version": "2022.3.2", + "sha256": "1df4707686f88e284e15a7fd63945b476dabf8e5a041894c281aba4838c603d9", + "url": "https://download.jetbrains.com/go/goland-2022.3.2-aarch64.dmg", + "build_number": "223.8617.58" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", @@ -273,10 +273,10 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "7658bcf3433d8f6b983136cc3f3edae5c02053d6983a59c273448f246ea3bcef", - "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.1-aarch64.dmg", - "build_number": "223.8214.64", + "version": "2022.3.2", + "sha256": "4e1244d7fa459a7f07ec43725ed4271e2c669c3202cc04cc074f11fb07bbb25e", + "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.2-aarch64.dmg", + "build_number": "223.8617.59", "version-major-minor": "2022.3" }, "pycharm-community": { @@ -306,18 +306,18 @@ "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "d0ec036ed67146beb46059a6ec9aa07d8caa2225e141183fe1d47e27170ad71a", - "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.1-aarch64.dmg", - "build_number": "223.8214.60" + "version": "2022.3.2", + "sha256": "346b990c412f272acc2fc7e87448f456d8d6a1978b7a94eb645f9cea806b083c", + "url": "https://download.jetbrains.com/ruby/RubyMine-2022.3.2-aarch64.dmg", + "build_number": "223.8617.48" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "f63d2708cccc57bd404b782137f11e5dabf012df0c18aabf900743c4f02daa97", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.1-aarch64.dmg", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "a869cd1c1c7b01bbd98f9a1cfd08b1b18ebe77f1c4422ee7e11ddc2c3cb250ce", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.3.2-aarch64.dmg", + "build_number": "223.8617.44" } } } diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 62846215da7..5610f40b61e 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -197,12 +197,12 @@ final: prev: Navigator-nvim = buildVimPluginFrom2Nix { pname = "Navigator.nvim"; - version = "2022-12-21"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "numToStr"; repo = "Navigator.nvim"; - rev = "a2e7d6ebd26e647469135d4096dfa89da4f070e5"; - sha256 = "0jli6pba08n20n97h0wh6h36pkca9bwq93h9dipmb0q4a2zqb37m"; + rev = "91d86506ac2a039504d5205d32a1d4bc7aa57072"; + sha256 = "12hsdwj4jqbkh8z3hcr1c660jmh44c0j4rzlchnc326gcbrayarv"; }; meta.homepage = "https://github.com/numToStr/Navigator.nvim/"; }; @@ -559,12 +559,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2023-01-29"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "116d713f63c7a81663fa53efa10e34649c9479e3"; - sha256 = "1hqlav8h09qffcicxjwzq74rm8b128jav1hgcyjv7jyz7f3fjcw4"; + rev = "98f466f9ce851edeb99fa14a75fca1f266f62d52"; + sha256 = "12g90abfnb7nmb2s5q9w6hn27hpwplghhxz5w38m6dghy8nmfs4n"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -727,12 +727,12 @@ final: prev: aurora = buildVimPluginFrom2Nix { pname = "aurora"; - version = "2023-01-31"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "a55448018d75817e820c03b21d28a2cd65b7d353"; - sha256 = "1vlbpw4mgkh5rd2mqwjsvz9sxnq5zjci4jddhmnmkilrlgancfg0"; + rev = "ef44f07a563d59b23c3f17792f4ff3b5fb4280a1"; + sha256 = "14w830fnr19rnjqwg5yqns4xf27nhvc169qrmkjn8y054i6yjsg2"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -1039,12 +1039,12 @@ final: prev: calendar-vim = buildVimPluginFrom2Nix { pname = "calendar.vim"; - version = "2023-01-14"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "8d4ab7a8d9120a3538216056047d10df3947789b"; - sha256 = "0v6d2kiww9ky0m0b94c66kfvxwmv11rkpxqyfv62pigirs8x3a82"; + rev = "6004885c90fd0239b84ce242babbcfe7cd379535"; + sha256 = "0avpcl9y718xldlhc6ip8hq6y6wp50k4hqdfrm3zg1z6l7iladwh"; }; meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; @@ -1303,12 +1303,12 @@ final: prev: cmp-dictionary = buildVimPluginFrom2Nix { pname = "cmp-dictionary"; - version = "2023-01-31"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "cmp-dictionary"; - rev = "06876deb8b82e2cc6a318f22196c39218f4f59bd"; - sha256 = "1m723a5qrs281n9sghmcgm8cnp9nrjxkaajnlq34bg3s56d32hik"; + rev = "8b5acfbc79eea0bfe2c08ffeb8f137f13449ab56"; + sha256 = "18j7rdq32xmmdh2bazfyv1q0d37ravz8x9brm8v1z9gracbly43a"; }; meta.homepage = "https://github.com/uga-rosa/cmp-dictionary/"; }; @@ -2083,12 +2083,12 @@ final: prev: copilot-lua = buildVimPluginFrom2Nix { pname = "copilot.lua"; - version = "2023-01-31"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "bfae743805d5f16fc31f6d3a8f2e46b3f3dbb175"; - sha256 = "1gkb9w1ad8fq6hbvr96p6sp1kzx8vlk0x6wy47mqbliqpxgp3vhr"; + rev = "a54e7b11a2c6efc9ddd3f42e56cf7d9eed1a9683"; + sha256 = "05bpgrq11zcp9flqp0gm0xjcaq622z46yjxlf6iliv8a4pmbrbgr"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; @@ -2179,12 +2179,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2023-01-24"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "c2e9929c3ac40776c30bc7b328a7dff98756050a"; - sha256 = "1lqxbb6r49afqqc2gfxdim1kr3dww74gg1pbz26s6bqvga1wzf8s"; + rev = "1bca9122ddc4bf4c6573402bf6686fc084470a7e"; + sha256 = "0isvyph3lpqpijxpfj5rjfh1w1mh3629jpyahy5sj2g8hn46mj08"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2287,12 +2287,12 @@ final: prev: dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2023-02-01"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "glepnir"; repo = "dashboard-nvim"; - rev = "df68a1943ac2f08a73e3284b266ea50e7d381db4"; - sha256 = "1m2c7xqsb5fp41j0sbv7z5w34pi372x21gxifkvhx6znv4l5r9f7"; + rev = "f4eedba90f0a55111351fd45444db5a82081727f"; + sha256 = "00h2n33m6mhvkxqdrwnfijwj2j5v0j6daa9422mmxf6m3qxgs03k"; }; meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; }; @@ -2891,12 +2891,12 @@ final: prev: fcitx-vim = buildVimPluginFrom2Nix { pname = "fcitx.vim"; - version = "2022-11-15"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "lilydjwg"; repo = "fcitx.vim"; - rev = "dc95d0301b61a7db1f1badfe743fb627ea6e06d1"; - sha256 = "1z6n9ax8mnr9p1j64hrl463kqnaf7gc08975j5n7c77rrz23bd1q"; + rev = "92247352c6f05c8deebea2f50d8e842bfd91c294"; + sha256 = "01p7w8pc0d3crbksn5xwz4zcbnb7phjz5n6lk59v9b326sjm3rai"; }; meta.homepage = "https://github.com/lilydjwg/fcitx.vim/"; }; @@ -3048,12 +3048,12 @@ final: prev: flutter-tools-nvim = buildVimPluginFrom2Nix { pname = "flutter-tools.nvim"; - version = "2023-01-01"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "akinsho"; repo = "flutter-tools.nvim"; - rev = "ae0be3cef35c0cb41d6c7f814a19b3402d50fd7a"; - sha256 = "0ynidizghmbrapcm2wrn6cjmn28gvzkxc1ia9s8nmh63574prfrv"; + rev = "f84836a906fac21e9fb096ce15478051cd7df589"; + sha256 = "1j725v2cf9k1dlxnpmzcz1ys7v9iyj0vyvjw9bkmjvy17hqcrxaw"; }; meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; }; @@ -3180,12 +3180,12 @@ final: prev: fzf-lsp-nvim = buildVimPluginFrom2Nix { pname = "fzf-lsp.nvim"; - version = "2022-07-16"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "gfanto"; repo = "fzf-lsp.nvim"; - rev = "f8988d7d738a0e9e7aba2f0a9512df6356bbda07"; - sha256 = "1bl8a3mnz9p9a03pqq3gdxpfxk8j3pjj8g4828nca3df72nk9vrn"; + rev = "16905056051759b15a388709a3fa65ff098eb243"; + sha256 = "1330a2ycs9bz0kkkygbsri5fh9grldzkg5fwahv30vf3nsybsrpc"; }; meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/"; }; @@ -3196,8 +3196,8 @@ final: prev: src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "bc7fd1253aff19ae5514fc11b0f947cc4b052a90"; - sha256 = "1maddqgwdxxsp6ar6csbxsvd1ng3i3ybqdy4b2jslj9f8v54znds"; + rev = "5ad5771eb77d233ec7a4352240d2780dde8034d1"; + sha256 = "0fkwsi9f2qymgavfpgxzrbga1z0z0024sri1wslsp66g1512x92f"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -4211,12 +4211,12 @@ final: prev: leap-nvim = buildVimPluginFrom2Nix { pname = "leap.nvim"; - version = "2023-01-19"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "ff4c3663e5a0a0ecbb3fffbc8318825def35d2aa"; - sha256 = "1pxm1b3crqmvbmds5cjfnqirvqbjqzc6vc59i6jsr8i79vymf16z"; + rev = "6068651f7f2bdb379344de52b9833d82bce27cec"; + sha256 = "0skyq97hzslpx3w5y6ikcqbblzn1yqfwmk1wxrrmwayvyfcqqh9j"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; @@ -4594,12 +4594,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2023-02-01"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "c15369260448d81cb65e5c6965850232ed22fbbc"; - sha256 = "07s83hn47rnvb96fz7h9kxdy9qxmz7h0v23m0ij8c4yhk9z8xyxj"; + rev = "6f6252f63b0baf0f2224c4caea33819a27f3f550"; + sha256 = "01913fb3g3f8291fw48a3rlsr4wkn6imljpk0h60vg65d2xc15l3"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -4666,12 +4666,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2023-01-27"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "94f192cf5f0a1931b3035c2d8affdebec460968c"; - sha256 = "163zh6pq6a7qxs3yvkrpn5sihrbn1vhmr3jv27p4swkh2x3dn5q8"; + rev = "d404ec306bfa4cdb0c3605dbb17e8a93a9597337"; + sha256 = "1m6dmfplyln4xvc09srqxby93ksq1a62qai09j9msnd5pv4yqniy"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -4763,12 +4763,12 @@ final: prev: mason-nvim = buildVimPluginFrom2Nix { pname = "mason.nvim"; - version = "2023-02-01"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "07de1d12940a6580c125720d37e26abc318f778a"; - sha256 = "19m2j1kmc0mnzbjyp266dqqgfp2fw1mlzcsc9286ggbbvgisadih"; + rev = "24846a00941ec020c8addc7f52040a1b2fc12174"; + sha256 = "1civr6qrq7c0z50yx7y9ly6w76vv5a1h0iqa1rxw8spc7h66hdva"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -5195,12 +5195,12 @@ final: prev: neoconf-nvim = buildVimPluginFrom2Nix { pname = "neoconf.nvim"; - version = "2023-02-01"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "9fb68ebc1b5632b2e3e93ddb5ad1985c75c59fbd"; - sha256 = "0p2n2k28z0qjdsiyxq0frfl7y6lvf96bl5c7w8zk0amvabkh23wf"; + rev = "a16d133b426fe5ddfd97d30e3658772d403847f3"; + sha256 = "03dbdllmvp68cfzf8m3sz8v9795h4mp28gd27bcvxyfjiif7r5lj"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -5303,12 +5303,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2023-01-29"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "b977fa0f2069ff71111237df07de2bdeeb2b7079"; - sha256 = "04r5pcdkvm9dgfsyhx0skf8nwyf790myrha7rjkqr9cpr707l6mj"; + rev = "36cc15300c0dfc19d483b0a4176cb89e94f4730a"; + sha256 = "07c0lib513d5m7b9y0g0h8g681pyjnh0p9vr93z2y31va5all7w0"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -5723,12 +5723,12 @@ final: prev: nvim-base16 = buildVimPluginFrom2Nix { pname = "nvim-base16"; - version = "2023-01-30"; + version = "2023-02-03"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "d41f301dcd3de51e95d5e1b7737e22a4e1eddd28"; - sha256 = "1dlxa4n0xv5zpkpvw06xvbmcyaghs5byrw9xkpv9m3wqk55x395d"; + rev = "a3e0146ba46a797a0118da0177cbec5e28722399"; + sha256 = "079f6dvdcl6zzdl8rgyxr7g8gla066w41ndmg2qakrbj5fap3fyn"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; @@ -6059,12 +6059,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2023-01-20"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "beb9101fb4a8a4f2655e691980b4c82a27d2e920"; - sha256 = "1j56xz39wfdxinmzi83qfb6gljnag8a590wvyjg9c8m7ssd0ixw6"; + rev = "1f640d14d17f20cfc63c1acc26a10f9466e66a75"; + sha256 = "1cfl5cjjfcijdsnbh1f23vp3msjlpkvr81am6lpkhx5as2dfws67"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -6335,12 +6335,12 @@ final: prev: nvim-spectre = buildVimPluginFrom2Nix { pname = "nvim-spectre"; - version = "2023-01-11"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "24275beae382e6bd0180b3064cf5729548641a02"; - sha256 = "0rw2g0a1sdd92ac22rgmvb4yk17ps2c760g03pbdwfca14d50fnh"; + rev = "17b7c84ea8884bfec8e71b8021e924cb3a39c180"; + sha256 = "1r6jran2nqyzjgxmwnykd53k38iz8pdc5x9ndcqd8w88ybg3bbpd"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; @@ -6395,12 +6395,12 @@ final: prev: nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-02-01"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "f0e083912ac42e9001e02a89f70269aa0698e9ec"; - sha256 = "0yd2rfy2vsrnnxz0ih8j1f975kww9xcdwzp7241dbdyvy9h7ra7d"; + rev = "660a070af7131387c690c7b839718371916e27f9"; + sha256 = "10imjkvk4p8pljyk8imh6r2x5vydxk4wmk5yw5gkrghnx8ql0bmq"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -6611,12 +6611,12 @@ final: prev: omnisharp-extended-lsp-nvim = buildVimPluginFrom2Nix { pname = "omnisharp-extended-lsp.nvim"; - version = "2022-10-29"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "Hoffs"; repo = "omnisharp-extended-lsp.nvim"; - rev = "83be0f285afa360ca4a134820381e54b4b7aadd3"; - sha256 = "1hdsc68qzf4j83xah72yjan7mlsvdz7w310m1qw81yzd45z0scyd"; + rev = "55cb3d7310e07e38d0d420d195f353c51eb603fb"; + sha256 = "1wy2cpg4cb2f18751lxiy8lbhxmp17z9d01b7qwbz6pxyr4l6k2p"; }; meta.homepage = "https://github.com/Hoffs/omnisharp-extended-lsp.nvim/"; }; @@ -6659,12 +6659,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2023-01-24"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "c3409eca73d2ae334935ca4afdb0428f453ba404"; - sha256 = "1zj4kp8ffhgq9syqh5w7rr5zzb92kvzdkcpf3x0v2d4cwxysd2ji"; + rev = "64d5c6d75c9769f8edca674138cf63e71efcf65b"; + sha256 = "1zacxqgrmbpnmx7xp99b9g1s348874i5vmf4dj3f9hxzawlqq351"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -6731,12 +6731,12 @@ final: prev: oxocarbon-nvim = buildVimPluginFrom2Nix { pname = "oxocarbon.nvim"; - version = "2023-01-10"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "nyoom-engineering"; repo = "oxocarbon.nvim"; - rev = "b58812cde84df6ec0c2f54e602d608d94a78ebef"; - sha256 = "0gk2j9dkdjdiagz49wxj0skm9w50fifl0xg2496rcdarvhh5lny7"; + rev = "f7b05feadc985f39639650067f1a333285cb4085"; + sha256 = "0pwk7g59cmfpnqvvflbxxknmy3hnp6g9rz5la1gs00n7391gmcqq"; }; meta.homepage = "https://github.com/nyoom-engineering/oxocarbon.nvim/"; }; @@ -6863,12 +6863,12 @@ final: prev: playground = buildVimPluginFrom2Nix { pname = "playground"; - version = "2023-01-24"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "c19bcfd6a3681bc876e1b861f6685bfc04972d0d"; - sha256 = "07vhiknf5gfd8rp6ynp9xq3rlc17b1sh322mlhg3976hl62lgs4f"; + rev = "c481c660fa903a0e295902b1765ecfbd6e76a556"; + sha256 = "0d30s2rnjdizy8mibxl7pw99ij8209k09myv03d2sqnzapgx28ib"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; @@ -7512,6 +7512,18 @@ final: prev: meta.homepage = "https://github.com/gorkunov/smartpairs.vim/"; }; + smart-splits-nvim = buildVimPluginFrom2Nix { + pname = "smart-splits.nvim"; + version = "2022-12-21"; + src = fetchFromGitHub { + owner = "mrjones2014"; + repo = "smart-splits.nvim"; + rev = "fdd158ce7554dc830fb86e0fe952cd9476cdf726"; + sha256 = "17xjcfjfzmy4crs6ks8drdjcygdnri776gf3vmnssjyvmzab3mdl"; + }; + meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; + }; + snap = buildVimPluginFrom2Nix { pname = "snap"; version = "2022-08-03"; @@ -8334,12 +8346,12 @@ final: prev: template-string-nvim = buildVimPluginFrom2Nix { pname = "template-string.nvim"; - version = "2022-11-10"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "axelvc"; repo = "template-string.nvim"; - rev = "fa94fd309f511ac19bcba0b4390104520f07a08d"; - sha256 = "00q8f8v6zcs85iyv36byil0a9v20m7q7scmkx1231nq0z21kzadc"; + rev = "b97ee201fa2d5edced1c6dbaf432d00fec0468f1"; + sha256 = "0cygqc07grd55w4bk42qil80353fr7hf3f73mc9n2y43knijamf8"; }; meta.homepage = "https://github.com/axelvc/template-string.nvim/"; }; @@ -8539,12 +8551,12 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2023-01-13"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "a54e6c471ce1cd8ef8357e34598a28a955297131"; - sha256 = "07q90impvavl0vv2c89ckqm2g6b7yk5n4z8n1864pz1j6442vhda"; + rev = "19aad0f41f47affbba1274f05e3c067e6d718e1e"; + sha256 = "1zslvsdv6y15yiqjyq52mdib15rk7k7k2qg1shwxhjjipgzykvpl"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; @@ -9151,12 +9163,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2023-01-29"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "18b85395d32e235128b85a059dd60b562f9dbfe1"; - sha256 = "0212cazr83r9n07gmm0rbzp7mq0lh88iwbcqsdza3nw98rqp3i5z"; + rev = "038e3a6ca59f11b3bb6a94087c1792322d1a1d5c"; + sha256 = "0m59sij2y38sgcmzic3jxw08bwkycywkjxn906xgfkwn2rvhv8cv"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -12995,12 +13007,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2023-01-29"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "6be01c509779b1c8a3d1747677a9203419bd11c2"; - sha256 = "17ifpbrcyfs8szdsk3j59916lsbal72mysk4ksgpw0q1paqzk75s"; + rev = "0dfb1bf84bf8899dc57ae1102605336b929898e7"; + sha256 = "1pyk4bf3mrmhylmmrxj0wlq145ilanmkiblyjmdl0imwn8m5jyl9"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -13536,12 +13548,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2023-01-30"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "b8607084b324ab0c98892ca20f78433904aecef5"; - sha256 = "15n8mfiq8mxcjlp13mv17prdfc59cd2kqjsbk7wg89khhbg81sq3"; + rev = "8ef5b0d9b85e7bb57b00b4571db4804aec0e10eb"; + sha256 = "1nk85v06s4kybvnmh8raxcmj49snph4nsbfyizwcixwr592amcs1"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -13993,12 +14005,12 @@ final: prev: lspsaga-nvim-original = buildVimPluginFrom2Nix { pname = "lspsaga-nvim-original"; - version = "2023-02-01"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "glepnir"; repo = "lspsaga.nvim"; - rev = "f514660f65983d33613bf605bfd0adf583c06a8b"; - sha256 = "1xgkwfacglm3f96mvs5q799h5vxa7a0dsik562jzi20vhgm49x9x"; + rev = "f621bd86398617c93d54170de224eb7f608f21cf"; + sha256 = "0kvl6qsfdhd947azz58xwvm3lgys0i03xnx2ksq4f44g5r714083"; }; meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index a6ef2653ea5..4c00f7d205d 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -60,23 +60,23 @@ }; bash = buildGrammar { language = "bash"; - version = "4488aa4"; + version = "88ed46b"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-bash"; - rev = "4488aa41406547e478636a4fcfd24f5bbc3f2f74"; - hash = "sha256-QkH5rI9/7x6L7e3YIwDMdSbBHOGhhC6LTHfasS7wX9U="; + rev = "88ed46b8c32782379d5cab8bc9ea111ca7ad7dcb"; + hash = "sha256-eUW0MuRC5aElfYsBScjics0h6+FOrZ3oWDCjJqsJdhc="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash"; }; beancount = buildGrammar { language = "beancount"; - version = "c68ffc4"; + version = "f3741a3"; src = fetchFromGitHub { owner = "polarmutex"; repo = "tree-sitter-beancount"; - rev = "c68ffc4c6c27eadd81dd56c66f03f4d202d4b2d7"; - hash = "sha256-MJDatUpXJMf3OB8KocA+kJi+mqNKRs7wraq33tCg3/c="; + rev = "f3741a3a68ade59ec894ed84a64673494d2ba8f3"; + hash = "sha256-WtZ3FindaePKbtlnilK9KkOoPxBaxRKNVM+8D52DtBE="; }; meta.homepage = "https://github.com/polarmutex/tree-sitter-beancount"; }; @@ -435,6 +435,17 @@ }; meta.homepage = "https://github.com/mgramigna/tree-sitter-fsh"; }; + func = buildGrammar { + language = "func"; + version = "ea161a0"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-func"; + rev = "ea161a03f738872426c9bcc207ec0f4763f9672c"; + hash = "sha256-JhPEZ9w/zoxlDwKZmw1e+NXV9jTDx9cmTmeWtLq5hlE="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-func"; + }; fusion = buildGrammar { language = "fusion"; version = "19db2f4"; @@ -637,12 +648,12 @@ }; help = buildGrammar { language = "help"; - version = "9dee68e"; + version = "8f75ef3"; src = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vimdoc"; - rev = "9dee68e3912d16e9878b06e3cd87e21ada3d9029"; - hash = "sha256-6XYEC+wKrCbPtcdjFH1O0EdX84M+NpPfTO2tXGFkwtk="; + rev = "8f75ef3ec86bc315d5fdb939899b397289389181"; + hash = "sha256-zzD899bOSVn0/RCki6i8wHEQgaIrCurRw4AxnN3J+VA="; }; meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc"; }; @@ -1401,12 +1412,12 @@ }; sql = buildGrammar { language = "sql"; - version = "286e10c"; + version = "8d28e17"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "286e10c5bc5d1703ee8f9afb351165a9a6182be1"; - hash = "sha256-sIZ6615ioSz2wzjQLxcMaXKxd17qGR6nFDMxuwOx0Z8="; + rev = "8d28e173285ca4bee8113157cb15662a6928925a"; + hash = "sha256-zBAJGYMRBt3nQJqHQITW4rMAAhktOIdtIjle9idvXx0="; }; generate = true; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; @@ -1606,12 +1617,12 @@ }; v = buildGrammar { language = "v"; - version = "7ef1f12"; + version = "6e9daed"; src = fetchFromGitHub { owner = "vlang"; repo = "vls"; - rev = "7ef1f120c1c8950c7a3e1cdffe655bdd7220321b"; - hash = "sha256-2oVvuJsvEgv8J3abkV5ezAt0YdIkNNA4psqrcr4K+jo="; + rev = "6e9daed18b99f5a3515c5142a0ab66a7bca589d2"; + hash = "sha256-ejUcwjOraywdliTBvmkedmC2nobdg6L9FrWgNbXkYIQ="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/vlang/vls"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index abd06638868..6df9c0a226c 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -630,6 +630,7 @@ https://github.com/AndrewRadev/sideways.vim/,, https://github.com/lotabout/skim.vim/,, https://github.com/mopp/sky-color-clock.vim/,, https://github.com/kovisoft/slimv/,, +https://github.com/mrjones2014/smart-splits.nvim/,, https://github.com/gorkunov/smartpairs.vim/,, https://github.com/camspiers/snap/,, https://github.com/norcalli/snippets.nvim/,, diff --git a/pkgs/applications/misc/thedesk/default.nix b/pkgs/applications/misc/thedesk/default.nix index 57dbf849a3a..a7a184e8003 100644 --- a/pkgs/applications/misc/thedesk/default.nix +++ b/pkgs/applications/misc/thedesk/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "thedesk"; - version = "23.0.5"; + version = "24.0.7"; src = fetchurl { url = "https://github.com/cutls/TheDesk/releases/download/v${version}/${pname}_${version}_amd64.deb"; - sha256 = "sha256-6pXbHkLdJw0+G9lep/tGkbSGAf8AobkQQgvw6gPYlro="; + sha256 = "sha256-EG5TMhYvECXahIbB25gP40iNQpStcrgaJW3ld9x02/E="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 4e31f689dd7..365016eb672 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "23.1.1"; - sha256 = "159myaz0zh0j8vdknxshyvkl1khxbznvls2mk5wyssxqll8b3j32"; - vendorSha256 = "sha256-7+ppFmM+NVnMU6pg2FcaSGqcq429EmrPYgAZfHANtEg="; + version = "23.1.2"; + sha256 = "1c8l5zzy5pjilp1a84084g3dgdm0rxkx7hj7lqcn0iihfvhxc1xq"; + vendorSha256 = "sha256-6dOX3SsKjpwC/dEUO2SnVna99lpav7kIEKrMUy4YfhA="; } diff --git a/pkgs/applications/networking/cluster/linkerd/generic.nix b/pkgs/applications/networking/cluster/linkerd/generic.nix index f21ee96ecd3..a4aec900a48 100644 --- a/pkgs/applications/networking/cluster/linkerd/generic.nix +++ b/pkgs/applications/networking/cluster/linkerd/generic.nix @@ -20,6 +20,11 @@ buildGoModule rec { env GOFLAGS="" go generate ./jaeger/static env GOFLAGS="" go generate ./multicluster/static env GOFLAGS="" go generate ./viz/static + + # Necessary for building Musl + if [[ $NIX_HARDENING_ENABLE =~ "pie" ]]; then + export GOFLAGS="-buildmode=pie $GOFLAGS" + fi ''; tags = [ diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index c698212db52..743c1738da0 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -39,13 +39,13 @@ "vendorHash": "sha256-pCWrJPW39J2SE1U1nQ61XI8/WtB+hqQGu9wKkRNkS1k=" }, "akamai": { - "hash": "sha256-vna0TVanrfhbELwpD3ZidwkBfB20dM+11Gq6qdZ0MmA=", + "hash": "sha256-xX1SitZZoAznP4atUSrqAC8+dxKRlQ2nnZh6ropzuak=", "homepage": "https://registry.terraform.io/providers/akamai/akamai", "owner": "akamai", "repo": "terraform-provider-akamai", - "rev": "v3.2.1", + "rev": "v3.3.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-pz+h8vbdCEgNSH9AoPlIP7zprViAMawXk64SV0wnVPo=" + "vendorHash": "sha256-xIxQxgfOv+/i0gyRtpZaCm22rsK/4ajFNKQpGP5uy0Y=" }, "alicloud": { "hash": "sha256-sG241dMkFL9YllVGuQ7KlZ8Ta3hz9v8VdyOOcjOKie0=", @@ -93,14 +93,14 @@ "vendorHash": "sha256-pRbhgukYRn0Ej0v/ANKZ3gtkmfL8qo1E6F/fKDNf/Iw=" }, "avi": { - "hash": "sha256-0FcdVd7EGVHZ0iRonoGfjwYgXpJtUhqX5i925Ejhv54=", + "hash": "sha256-mBLdIL4mUI4zA3c9gB4DL1QY0xHW15Q1rO/v1gVYKYU=", "homepage": "https://registry.terraform.io/providers/vmware/avi", "owner": "vmware", "proxyVendor": true, "repo": "terraform-provider-avi", - "rev": "v22.1.2", + "rev": "v22.1.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-yDkox74g0N8iniWHSNk6KjfM0HJa8H2HUxm6RxrdhkE=" + "vendorHash": "sha256-0k1BYRQWp4iU9DRwPbluOg3S5VzL981PpFrgiQaYWNw=" }, "aviatrix": { "hash": "sha256-jZXTsCa1TDwdOFGJKX4xM3sB0zfix5nTBuBdBGtwOOs=", @@ -112,13 +112,13 @@ "vendorHash": null }, "aws": { - "hash": "sha256-jZYeMQW2DTGE/KyUJYGFPHGjFUGgfl11kE1jucZ5sH4=", + "hash": "sha256-CdG7StgMUr6FjC4YJKIfQlWqjvgnvzyGh8zKQ+DUJzU=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v4.52.0", + "rev": "v4.53.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-/6RbqOh5/Fpn25woV/AzmkTs1qnIo+sl3fKQxCtVZHQ=" + "vendorHash": "sha256-rnOrA3QYLZAU+VCm6OVLrnJ37Vcp6xzq0N8ohjWDl3Q=" }, "azuread": { "hash": "sha256-Byr6AJ1kP6fBxBCD8vLxQD5tz8fI3Z1fcCa0rXS9rhs=", @@ -670,13 +670,13 @@ "vendorHash": "sha256-4jAJf2FC83NdH4t1l7EA26yQ0pqteWmTIyrZDJdi7fg=" }, "linode": { - "hash": "sha256-bwVHrgcxc2W5Lx1aheqkdgwfrFfk4YAhD5bqvHdcxtI=", + "hash": "sha256-uebz6flGALcmRpBYjEEj+X2YFDkTjuaGLdGGD1jY+ns=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v1.29.4", + "rev": "v1.30.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-D7WZ2Ep/W8aCCFOVgsveJKAIg/j5l9fEnnXLMobICnc=" + "vendorHash": "sha256-DbhHBmFuuyoWtGqZjXKFMpSP3Xlt5GVEhSvUyWerKtM=" }, "linuxbox": { "hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=", @@ -1032,11 +1032,11 @@ "vendorHash": null }, "snowflake": { - "hash": "sha256-cocHU3xdlSAyBeOI5yLEo3j/ErfPwFIkkWgF4JB43fY=", + "hash": "sha256-uO3LgEQjeHS8kbolFZ3jb6FltMAiWNTVsjCSrsI776M=", "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", "owner": "Snowflake-Labs", "repo": "terraform-provider-snowflake", - "rev": "v0.56.2", + "rev": "v0.56.3", "spdx": "MIT", "vendorHash": "sha256-ulgTRY8qQ5oXONkwYtffRl1QMNnbvyn0zYiYqqvwrUU=" }, @@ -1168,13 +1168,13 @@ "vendorHash": null }, "utils": { - "hash": "sha256-B2FdeukUD+xuJHBT1Yv9G2txjX/OmkxAGXDUw2HItig=", + "hash": "sha256-gJUnsuRRDrnFUSoqDugJQPAGl/V3GBDQq9i+pE87wVE=", "homepage": "https://registry.terraform.io/providers/cloudposse/utils", "owner": "cloudposse", "repo": "terraform-provider-utils", - "rev": "1.6.0", + "rev": "1.7.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-jyGp0HIu+VxZ7n6Cctq6pi6Z7IKZ7W7FeqnGXk9Pt7o=" + "vendorHash": "sha256-4V2StvyVj8fRZo5iRrpojMW36VDswOhLaBNDfrvH00s=" }, "vault": { "hash": "sha256-aNyCUDV1yjpmbPNYlxuJNaiXtG3fJySxRsDLJx/hZ04=", diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 1fba61b8b0c..2c34523f551 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,12 +1,12 @@ { callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { signal-desktop = { dir = "Signal"; - version = "6.3.0"; - hash = "sha256-Mg7znebHiREC9QI5T7bWT4QXL8biDVBp0Z6Jgeid/gY="; + version = "6.4.1"; + hash = "sha256-/Rrph74nVr64Z6blNNn3oMM25YK92MZY/vuF1d+r6Yc="; }; signal-desktop-beta = { dir = "Signal Beta"; - version = "6.4.0-beta.1"; - hash = "sha256-GR7RWFT20i5dx6XYrp73inCOQ2Hj2UjSXf5jmjfDKMU="; + version = "6.5.0-beta.2"; + hash = "sha256-cAX9oU3bJrTOH3RbbfUK+49OiRSLjEZLdpJNOMAa94I="; }; } diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index 5828ac35fc3..822ef3da221 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { cheroot click flask - flaskbabel + flask-babel jaraco_functools jinja2 markdown2 diff --git a/pkgs/applications/video/hdhomerun-config-gui/default.nix b/pkgs/applications/video/hdhomerun-config-gui/default.nix index 32f4267d9fc..58516191fa3 100644 --- a/pkgs/applications/video/hdhomerun-config-gui/default.nix +++ b/pkgs/applications/video/hdhomerun-config-gui/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "hdhomerun-config-gui"; - version = "20210224"; + version = "20221031"; src = fetchurl { url = "https://download.silicondust.com/hdhomerun/hdhomerun_config_gui_${version}.tgz"; - sha256 = "sha256-vzrSk742Ca2I8Uk0uGo44SxpEoVY1QBn62Ahwz8E7p8="; + sha256 = "17zf0hzw68b0xdkh1maqhl96jb7171mbhd29y64as29nps9x4fmz"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/video/stremio/default.nix b/pkgs/applications/video/stremio/default.nix index 0316318534d..f1b469006a7 100644 --- a/pkgs/applications/video/stremio/default.nix +++ b/pkgs/applications/video/stremio/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { mkdir -p $out/{bin,share/applications} ln -s $out/opt/stremio/stremio $out/bin/stremio mv $out/opt/stremio/smartcode-stremio.desktop $out/share/applications + install -Dm 644 images/stremio_window.png $out/share/pixmaps/smartcode-stremio.png ln -s ${nodejs}/bin/node $out/opt/stremio/node ln -s $server $out/opt/stremio/server.js ''; diff --git a/pkgs/data/fonts/material-symbols/default.nix b/pkgs/data/fonts/material-symbols/default.nix new file mode 100644 index 00000000000..5cd79834b3c --- /dev/null +++ b/pkgs/data/fonts/material-symbols/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, rename +}: + +stdenvNoCC.mkDerivation { + pname = "material-symbols"; + version = "unstable-2023-01-07"; + + src = fetchFromGitHub { + owner = "google"; + repo = "material-design-icons"; + rev = "511eea577b20d2b02ad77477750da1e44c66a52c"; + sha256 = "sha256-ENoWeyV9Dw26pgjy0Xst+qpxJ/mjgfqrY2Du2VwzwCE="; + sparseCheckout = [ "variablefont" ]; + }; + + nativeBuildInputs = [ rename ]; + + installPhase = '' + runHook preInstall + + rename 's/\[FILL,GRAD,opsz,wght\]//g' variablefont/* + install -Dm755 variablefont/*.ttf -t $out/share/fonts/TTF + install -Dm755 variablefont/*.woff2 -t $out/share/fonts/woff2 + + runHook postInstall + ''; + + meta = with lib; { + description = "Material Symbols icons by Google"; + homepage = "https://fonts.google.com/icons"; + downloadPage = "https://github.com/google/material-design-icons"; + license = lib.licenses.asl20; + maintainers = with maintainers; [ fufexan ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/desktops/deepin/apps/deepin-editor/default.nix b/pkgs/desktops/deepin/apps/deepin-editor/default.nix new file mode 100644 index 00000000000..01a26d58f28 --- /dev/null +++ b/pkgs/desktops/deepin/apps/deepin-editor/default.nix @@ -0,0 +1,83 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, dtkwidget +, qt5integration +, qt5platform-plugins +, dde-qt-dbus-factory +, cmake +, pkg-config +, qttools +, qtbase +, qtsvg +, wrapQtAppsHook +, kcodecs +, syntax-highlighting +, libchardet +, libuchardet +, libiconv +, gtest +}: + +stdenv.mkDerivation rec { + pname = "deepin-editor"; + version = "5.10.35"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-X3tsmtqMUSpYQZqCmgtCLCSGwzSmCZagF7TUWQYJsqU="; + }; + + patches = [ + (fetchpatch { + name = "chore: use GNUInstallDirs in CmakeLists"; + url = "https://github.com/linuxdeepin/deepin-editor/commit/7f4314f386a3c8f5cdea3618591b8eb027d034c3.patch"; + sha256 = "sha256-/aSBa2nILc/YrFchUyhBHHs2c7Mv6N1juwD5Sdc39Uo="; + }) + ]; + + postPatch = '' + substituteInPlace src/common/utils.h --replace "/usr/share" "$out/share" + ''; + + nativeBuildInputs = [ + cmake + pkg-config + qttools + wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + qtsvg + dtkwidget + qt5platform-plugins + dde-qt-dbus-factory + kcodecs + syntax-highlighting + libchardet + libuchardet + libiconv + gtest + ]; + + strictDeps = true; + + cmakeFlags = [ "-DVERSION=${version}" ]; + + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH + qtWrapperArgs = [ + "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" + ]; + + meta = with lib; { + description = "A desktop text editor that supports common text editing features"; + homepage = "https://github.com/linuxdeepin/deepin-editor"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 69f6afff8ee..ec3302908a0 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -22,6 +22,7 @@ let #### Dtk Application deepin-calculator = callPackage ./apps/deepin-calculator { }; + deepin-editor = callPackage ./apps/deepin-editor { }; deepin-terminal = callPackage ./apps/deepin-terminal { }; #### ARTWORK diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix index b6e2df653be..922a601584d 100644 --- a/pkgs/development/coq-modules/coquelicot/default.nix +++ b/pkgs/development/coq-modules/coquelicot/default.nix @@ -7,10 +7,12 @@ mkCoqDerivation { domain = "gitlab.inria.fr"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.12" "8.16"; out = "3.3.0"; } { case = range "8.8" "8.16"; out = "3.2.0"; } { case = range "8.8" "8.13"; out = "3.1.0"; } { case = range "8.5" "8.9"; out = "3.0.2"; } ] null; + release."3.3.0".sha256 = "sha256-bh9qP/EhWrHpTe2GMGG3S2vgBSSK088mFfhAIGejVoU="; release."3.2.0".sha256 = "07w7dbl8x7xxnbr2q39wrdh054gvi3daqjpdn1jm53crsl1fjxm4"; release."3.1.0".sha256 = "02i0djar13yk01hzaqprcldhhscn9843x9nf6x3jkv4wv1jwnx9f"; release."3.0.2".sha256 = "1rqfbbskgz7b1bcpva8wh3v3456sq2364y804f94sc8y5sij23nl"; diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index bb709694dc6..0f0a3f5e674 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -312,8 +312,8 @@ in { inherit passthruFun; }; - rustpython = callPackage ./rustpython/default.nix { - inherit (darwin.apple_sdk.frameworks) SystemConfiguration; + rustpython = darwin.apple_sdk_11_0.callPackage ./rustpython/default.nix { + inherit (darwin.apple_sdk_11_0.frameworks) SystemConfiguration; }; }) diff --git a/pkgs/development/interpreters/python/rustpython/default.nix b/pkgs/development/interpreters/python/rustpython/default.nix index a7c6c8d842b..e3e2ca8c18c 100644 --- a/pkgs/development/interpreters/python/rustpython/default.nix +++ b/pkgs/development/interpreters/python/rustpython/default.nix @@ -31,14 +31,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://rustpython.github.io"; license = licenses.mit; maintainers = with maintainers; [ prusnak ]; - - # TODO: Remove once nixpkgs uses newer SDKs that supports '*at' functions. - # Probably macOS SDK 10.13 or later. Check the current version in - # .../os-specific/darwin/apple-sdk/default.nix - # - # From the build logs: - # - # > Undefined symbols for architecture x86_64: "_utimensat" - broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/pkgs/development/libraries/functionalplus/default.nix b/pkgs/development/libraries/functionalplus/default.nix new file mode 100644 index 00000000000..c764b097b26 --- /dev/null +++ b/pkgs/development/libraries/functionalplus/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "functionalplus"; + version = "0.2.18-p0"; + + src = fetchFromGitHub { + owner = "Dobiasd"; + repo = "FunctionalPlus"; + rev = "v${version}"; + sha256 = "sha256-jypBQjFdVEktB8Q71RTg+3RJoeFwD5Wxw+fq+4QG38g="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Functional Programming Library for C++"; + homepage = "https://github.com/Dobiasd/FunctionalPlus"; + license = licenses.boost; + platforms = platforms.all; + maintainers = with maintainers; [ candyc1oud ]; + }; +} diff --git a/pkgs/development/python-modules/approval-utilities/default.nix b/pkgs/development/python-modules/approval-utilities/default.nix new file mode 100644 index 00000000000..3b21c3ffab8 --- /dev/null +++ b/pkgs/development/python-modules/approval-utilities/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, approvaltests +, pythonOlder +}: + +buildPythonPackage rec { + pname = "approval-utilities"; + inherit (approvaltests) version src; + disabled = pythonOlder "3.7"; + format = "setuptools"; + + postPatch = '' + mv setup.approval_utilities.py setup.py + ''; + + pythonImportsCheck = [ "approval_utilities" ]; + + # upstream has no tests + doCheck = false; + + meta = { + description = "Utilities for your production code that work well with approvaltests"; + homepage = "https://github.com/approvals/ApprovalTests.Python"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index e9df0a22482..066af243f62 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -5,10 +5,13 @@ # propagates , allpairspy +, approval-utilities , beautifulsoup4 , empty-files +, mrjob , pyperclip , pytest +, typing-extensions # tests , numpy @@ -16,26 +19,29 @@ }: buildPythonPackage rec { - version = "5.4.2"; + version = "8.1.0"; pname = "approvaltests"; format = "setuptools"; - disabled = pythonOlder "3.6.1"; + disabled = pythonOlder "3.7"; # no tests included in PyPI tarball src = fetchFromGitHub { owner = "approvals"; repo = "ApprovalTests.Python"; rev = "refs/tags/v${version}"; - sha256 = "sha256-ZXtIM3McpfDFCaedlbJ6SU+Er5NyfI8kGnrn7sb1V5M="; + hash = "sha256-01OgofksXFglohcQtJqkir/nqBJArw3pXEmnX9P7rOA="; }; propagatedBuildInputs = [ allpairspy + approval-utilities beautifulsoup4 empty-files + mrjob pyperclip pytest + typing-extensions ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/asyauth/default.nix b/pkgs/development/python-modules/asyauth/default.nix index 3e157887f65..7eab56d09bb 100644 --- a/pkgs/development/python-modules/asyauth/default.nix +++ b/pkgs/development/python-modules/asyauth/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "asyauth"; - version = "0.0.11"; + version = "0.0.12"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KCG+SdAtpenwDf+5nA2+p8eKrWiJQSdiRyCU+lGf/1o="; + hash = "sha256-ctTuabTfLhYJL/yv0k6oXP7JV0+qRFA0SARI3XopTeM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix index 9e5b4d0fbc4..69bc78ddda6 100644 --- a/pkgs/development/python-modules/blis/default.nix +++ b/pkgs/development/python-modules/blis/default.nix @@ -10,14 +10,16 @@ buildPythonPackage rec { pname = "blis"; - version = "0.9.1"; + # Do not update to BLIS 0.9.x until the following issue is resolved: + # https://github.com/explosion/thinc/issues/771#issuecomment-1255825935 + version = "0.7.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fOrEZoAfnZfss04Q3e2MJM9eCSfqfoNNocydLtP8Nm8="; + hash = "sha256-Ke9MJQB3hakP/C8Ks9O9O3XNLXhWqaSCt9DayNURoJ0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index 2b5223c044c..4af53c9f756 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "dateparser"; - version = "1.1.6"; + version = "1.1.7"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "scrapinghub"; repo = "dateparser"; rev = "refs/tags/v${version}"; - sha256 = "sha256-rn8RD1nnUi4MhK6QKLaP5eG6UAFrhlecimvn8sAsu6k="; + hash = "sha256-KQCjXuBDBZduNYJITwk1qx7mBp8CJ95ZbFlhrFMkE8w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flask-babel/default.nix b/pkgs/development/python-modules/flask-babel/default.nix index 9a2aef0570e..fa7ffee5a9c 100644 --- a/pkgs/development/python-modules/flask-babel/default.nix +++ b/pkgs/development/python-modules/flask-babel/default.nix @@ -1,34 +1,66 @@ { lib , buildPythonPackage -, unittestCheckHook -, fetchPypi -, flask +, fetchFromGitHub + +# build-system +, poetry-core + +# docs +, furo +, sphinxHook + +# runtime , babel +, flask , jinja2 , pytz -, speaklater + +# tests +, pytest-mock +, pytestCheckHook }: buildPythonPackage rec { - pname = "Flask-Babel"; - version = "2.0.0"; + pname = "flask-babel"; + version = "3.0.0"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d"; + src = fetchFromGitHub { + owner = "python-babel"; + repo = "flask-babel"; + rev = "refs/tags/v${version}"; + hash = "sha256-c3QKAnyMe1THHuJ3uB2d0jMMo1SYGRAB9mBpIJSAHw0="; }; + outputs = [ + "out" + "doc" + ]; + + nativeBuildInputs = [ + furo + poetry-core + sphinxHook + ]; + propagatedBuildInputs = [ - flask babel + flask jinja2 pytz - speaklater ]; - unittestFlagsArray = [ "-s" "tests" ]; + pythonImportsCheck = [ + "flask_babel" + ]; + + checkInputs = [ + pytest-mock + pytestCheckHook + ]; meta = with lib; { + changelog = "https://github.com/python-babel/flask-babel/releases/tag/v${version}"; description = "Adds i18n/l10n support to Flask applications"; longDescription = '' Implements i18n and l10n support for Flask. @@ -36,7 +68,7 @@ buildPythonPackage rec { installed automatically for you if you install this library. ''; license = licenses.bsd2; - maintainers = teams.sage.members; + maintainers = teams.sage.members ++ (with maintainers; [ matejc ]); homepage = "https://github.com/python-babel/flask-babel"; }; } diff --git a/pkgs/development/python-modules/flaskbabel/default.nix b/pkgs/development/python-modules/flaskbabel/default.nix deleted file mode 100644 index a0e42e60c2e..00000000000 --- a/pkgs/development/python-modules/flaskbabel/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, flask -, jinja2 -, speaklater -, babel -, pytz -}: - -buildPythonPackage rec { - pname = "Flask-Babel"; - version = "2.0.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d"; - }; - - propagatedBuildInputs = [ flask jinja2 speaklater babel pytz ]; - - meta = with lib; { - description = "Adds i18n/l10n support to Flask applications"; - homepage = "https://github.com/mitsuhiko/flask-babel"; - license = licenses.bsd0; - maintainers = with maintainers; [ matejc ]; - }; - -} diff --git a/pkgs/development/python-modules/goodwe/default.nix b/pkgs/development/python-modules/goodwe/default.nix index c9615f1ca30..31d7127519e 100644 --- a/pkgs/development/python-modules/goodwe/default.nix +++ b/pkgs/development/python-modules/goodwe/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "goodwe"; - version = "0.2.22"; + version = "0.2.23"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "marcelblijleven"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-mRI+SalWNGLEwL8UcQIrsEKOpzgat9VdmdV1E5H48aY="; + sha256 = "sha256-SX49v+DuV4IZdTJc9XhqhgtG81qLC9QnR/LPMu2m0fo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/jupyterlab-pygments/default.nix b/pkgs/development/python-modules/jupyterlab-pygments/default.nix index 3d6b9fa9335..a31f0de42e6 100644 --- a/pkgs/development/python-modules/jupyterlab-pygments/default.nix +++ b/pkgs/development/python-modules/jupyterlab-pygments/default.nix @@ -1,16 +1,18 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pygments }: +{ lib, buildPythonPackage, fetchPypi, pygments, jupyter-packaging }: buildPythonPackage rec { pname = "jupyterlab_pygments"; - version = "0.1.2"; + version = "0.2.2"; - src = fetchFromGitHub { - owner = "jupyterlab"; - repo = pname; - rev = version; - sha256 = "02lv63qalw4x6xs70n2w2p3c2cnhk91sr961wlbi77xs0g8fcman"; + src = fetchPypi { + inherit pname version; + hash = "sha256-dAXX/eYIGdkFqfqM6J5M2DDjGM2tIqADD3qQHacFWF0="; }; + nativeBuildInputs = [ + jupyter-packaging + ]; + # no tests exist on upstream repo doCheck = false; diff --git a/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix b/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix index 47c8734eb2b..aa769a3037d 100644 --- a/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix +++ b/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, fetchpatch , pytest-mockito , pytestCheckHook , robotframework @@ -10,7 +9,7 @@ buildPythonPackage rec { pname = "robotframework-pythonlibcore"; - version = "4.0.0"; + version = "4.1.0"; disabled = pythonOlder "3.7"; @@ -20,17 +19,9 @@ buildPythonPackage rec { owner = "robotframework"; repo = "PythonLibCore"; rev = "v${version}"; - hash = "sha256-86o5Lh9zWo4vUF2186dN7e8tTUu5PIxM/ZukPwNl0S8="; + hash = "sha256-BgnllONYJjfeKIN8BLfMw1iZrVewtXB1KN8b9KjdtK0="; }; - patches = [ - (fetchpatch { - name = "fix-finding-version.patch"; - url = "https://github.com/robotframework/PythonLibCore/commit/84c73979e309f59de057ae6a77725ab0f468b71f.patch"; - hash = "sha256-zrjsNvXpJDLpXql200NV+QGWFLtnRVZTeAjT52dRn2s="; - }) - ]; - nativeCheckInputs = [ pytest-mockito pytestCheckHook diff --git a/pkgs/development/python-modules/tensorly/default.nix b/pkgs/development/python-modules/tensorly/default.nix index 52b3be102a2..0de6a2ff9ee 100644 --- a/pkgs/development/python-modules/tensorly/default.nix +++ b/pkgs/development/python-modules/tensorly/default.nix @@ -1,16 +1,16 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchFromGitHub , numpy , pytestCheckHook , pythonOlder , scipy -, sparse }: buildPythonPackage rec { pname = "tensorly"; - version = "0.7.0"; + version = "0.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,29 +18,35 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = pname; repo = pname; - rev = version; - sha256 = "sha256-VcX3pCczZQUYZaD7xrrkOcj0QPJt28cYTwpZm5D/X3c="; + rev = "refs/tags/${version}"; + hash = "sha256-6iZvUgsoYf8fDGEuAODgfr4jCkiJwaJXlQUAsaOF9JU="; }; propagatedBuildInputs = [ numpy scipy - sparse ]; nativeCheckInputs = [ pytestCheckHook ]; - postPatch = '' - # nose is not actually required for anything - # (including testing with the minimal dependencies) - substituteInPlace setup.py \ - --replace ", 'nose'" "" - ''; - pythonImportsCheck = [ "tensorly" + "tensorly.base" + "tensorly.cp_tensor" + "tensorly.tucker_tensor" + "tensorly.tt_tensor" + "tensorly.tt_matrix" + "tensorly.parafac2_tensor" + "tensorly.tenalg" + "tensorly.decomposition" + "tensorly.regression" + "tensorly.metrics" + "tensorly.random" + "tensorly.datasets" + "tensorly.plugins" + "tensorly.contrib" ]; pytestFlagsArray = [ @@ -48,6 +54,8 @@ buildPythonPackage rec { ]; disabledTests = [ + # tries to download data: + "test_kinetic" # AssertionError: Partial_SVD took too long, maybe full_matrices set wrongly "test_svd_time" ]; @@ -57,5 +65,6 @@ buildPythonPackage rec { homepage = "https://tensorly.org/"; license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin ]; + broken = stdenv.isLinux && stdenv.isAarch64; # test failures: test_TTOI and test_validate_tucker_rank }; } diff --git a/pkgs/development/tools/azure-static-sites-client/versions.json b/pkgs/development/tools/azure-static-sites-client/versions.json index 0cb5de09026..bd08b32de19 100644 --- a/pkgs/development/tools/azure-static-sites-client/versions.json +++ b/pkgs/development/tools/azure-static-sites-client/versions.json @@ -1,20 +1,20 @@ [ { "version": "latest", - "buildId": "1.0.021731", - "publishDate": "2022-12-14T02:22:20.0230853Z", + "buildId": "1.0.022152", + "publishDate": "2023-01-24T18:38:40.5584174Z", "files": { "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.021731/linux/StaticSitesClient", - "sha": "d2f88cf8b855169534c7e330dd95385b993b1c0f83331306e685faa8468a82b5" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022152/linux/StaticSitesClient", + "sha": "40e1639efc239151b3021a262ee85a747403fbf1c9ffce3de1aa0cbf273a3069" }, "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.021731/windows/StaticSitesClient.exe", - "sha": "525d13ebffd79ea9663a15a4bd2e6d49bca72d20aa44838aa4b83133943d450c" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022152/windows/StaticSitesClient.exe", + "sha": "e3287b8b63b00faa501573cd205ce8f7bb9743f7107f3e4f01639d0b297f21fc" }, "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.021731/macOS/StaticSitesClient", - "sha": "5de3ac4b205d3871e7a8ff3b5869f2a57002277ac7fa6317032239d114e25ab8" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022152/macOS/StaticSitesClient", + "sha": "396f5fefe087399c78521b2f5456c79e58c771ca64785e4be055a149738a2e6a" } } }, diff --git a/pkgs/development/tools/poac/default.nix b/pkgs/development/tools/poac/default.nix index 335b5cd17be..ffe1eaf6a48 100644 --- a/pkgs/development/tools/poac/default.nix +++ b/pkgs/development/tools/poac/default.nix @@ -4,6 +4,7 @@ , cmake , cpm-cmake , git +, git2-cpp , cacert , boost179 , fmt_8 @@ -11,19 +12,14 @@ , libarchive , libgit2 , lz4 +, mitama-cpp-result , ninja , openssl_3 +, package-project-cmake , spdlog }: let - git2Cpp = fetchFromGitHub { - owner = "ken-matsui"; - repo = "git2-cpp"; - rev = "v0.1.0-alpha.1"; - sha256 = "sha256-Ub0wrBK5oMfWGv+kpq/W1PN3yzpcfg+XWRFF/lV9VCY="; - }; - glob = fetchFromGitHub { owner = "p-ranav"; repo = "glob"; @@ -31,20 +27,6 @@ let sha256 = "sha256-2y+a7YFBiYX8wbwCCWw1Cm+SFoXGB3ZxLPi/QdZhcdw="; }; - packageProjectCMake = fetchFromGitHub { - owner = "TheLartians"; - repo = "PackageProject.cmake"; - rev = "v1.3"; - sha256 = "sha256-ZktftDrPo+JhBt0XKJekv0cyxIagvcgMcXZOBd4RtKs="; - }; - - mitamaCppResult = fetchFromGitHub { - owner = "LoliGothick"; - repo = "mitama-cpp-result"; - rev = "v9.3.0"; - sha256 = "sha256-CWYVPpmPIZZTsqXKh+Ft3SlQ4C9yjUof1mJ8Acn5kmM="; - }; - structopt = fetchFromGitHub { owner = "p-ranav"; repo = "structopt"; @@ -61,13 +43,13 @@ let in stdenv.mkDerivation rec { pname = "poac"; - version = "0.4.1"; + version = "0.5.1"; src = fetchFromGitHub { owner = "poacpm"; repo = pname; rev = version; - sha256 = "sha256-jXYPeI/rVuTr7OYV5sMgNr+U1OfN0XZtun6mihtlErY="; + sha256 = "sha256-JgGa7lomDvZG5HLxGJMALcezjnZprexJDTxyTUjLetg="; }; preConfigure = '' @@ -76,13 +58,13 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ - "-DCPM_USE_LOCAL_PACKAGES=ON" + "-DPOAC_BUILD_TESTING=OFF" "-DCPM_SOURCE_CACHE=${placeholder "out"}/share" "-DFETCHCONTENT_SOURCE_DIR_FMT=${fmt_8}" - "-DFETCHCONTENT_SOURCE_DIR_GIT2-CPP=${git2Cpp}" + "-DFETCHCONTENT_SOURCE_DIR_GIT2-CPP=${git2-cpp.src}" "-DFETCHCONTENT_SOURCE_DIR_GLOB=${glob}" - "-DFETCHCONTENT_SOURCE_DIR_PACKAGEPROJECT.CMAKE=${packageProjectCMake}" - "-DFETCHCONTENT_SOURCE_DIR_MITAMA-CPP-RESULT=${mitamaCppResult}" + "-DFETCHCONTENT_SOURCE_DIR_PACKAGEPROJECT.CMAKE=${package-project-cmake.src}" + "-DFETCHCONTENT_SOURCE_DIR_MITAMA-CPP-RESULT=${mitama-cpp-result.src}" "-DFETCHCONTENT_SOURCE_DIR_NINJA=${ninja.src}" "-DFETCHCONTENT_SOURCE_DIR_STRUCTOPT=${structopt}" "-DFETCHCONTENT_SOURCE_DIR_TOML11=${toml11}" @@ -95,10 +77,10 @@ stdenv.mkDerivation rec { enableStatic = !stdenv.isDarwin; }) fmt_8 - git2Cpp + git2-cpp glob - packageProjectCMake - mitamaCppResult + package-project-cmake + mitama-cpp-result ninja structopt toml11 diff --git a/pkgs/development/tools/py-spy/default.nix b/pkgs/development/tools/py-spy/default.nix index e9bcb2efae9..cc6212a5242 100644 --- a/pkgs/development/tools/py-spy/default.nix +++ b/pkgs/development/tools/py-spy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgsBuildBuild, rustPlatform, fetchFromGitHub, pkg-config, libunwind, python3 }: +{ lib, stdenv, pkgsBuildBuild, rustPlatform, fetchFromGitHub, pkg-config, libunwind, python3, runCommand, darwin }: rustPlatform.buildRustPackage rec { pname = "py-spy"; @@ -11,6 +11,15 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-NciyzKiDKIMeuHhTjzmHIc3dYW4AniuCNjZugm4hMss="; }; + nativeBuildInputs = [ rustPlatform.bindgenHook ]; + + buildInputs = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + # Pull a header that contains a definition of proc_pid_rusage(). + (runCommand "${pname}_headers" { } '' + install -Dm444 ${lib.getDev darwin.apple_sdk.sdk}/include/libproc.h $out/include/libproc.h + '') + ]; + NIX_CFLAGS_COMPILE = "-L${libunwind}/lib"; # error: linker `arm-linux-gnueabihf-gcc` not found diff --git a/pkgs/development/tools/renderdoc/default.nix b/pkgs/development/tools/renderdoc/default.nix index 3858394ce3b..d568743ec67 100644 --- a/pkgs/development/tools/renderdoc/default.nix +++ b/pkgs/development/tools/renderdoc/default.nix @@ -32,13 +32,13 @@ let in mkDerivation rec { pname = "renderdoc"; - version = "1.24"; + version = "1.25"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; rev = "v${version}"; - sha256 = "sha256-owFNk+UMKBkrad45zcSHTUidmRVIIGRZ06Ll84ZfEfA="; + sha256 = "sha256-0+9fxNj0TZUQwOh9kww00/k/J8ciuWfYQS4e1aCcd7Y="; }; buildInputs = [ diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix index f0a05437b68..fe056be74a7 100644 --- a/pkgs/os-specific/linux/ena/default.nix +++ b/pkgs/os-specific/linux/ena/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, kernel }: stdenv.mkDerivation rec { - version = "2.8.0"; + version = "2.8.2"; name = "ena-${version}-${kernel.version}"; src = fetchFromGitHub { owner = "amzn"; repo = "amzn-drivers"; rev = "ena_linux_${version}"; - sha256 = "sha256-Nw86s93v8ahc/yt5sNsGz4LRwzDPtBnIZNno8vpFdsY="; + sha256 = "sha256-KlRNI2lnUbNeQGY1G+Qm683yXRTNCJwWIri51+PAi9o="; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index b94f4351ff5..9a4f375289b 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "evdi"; - version = "1.12.0"; + version = "unstable-2022-10-13"; src = fetchFromGitHub { owner = "DisplayLink"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-JZKZ7+1OMbBtUA7pAZ41TzeDDyiD0h7yTXJINJ5FjN4="; + rev = "bdc258b25df4d00f222fde0e3c5003bf88ef17b5"; + hash = "sha256-mt+vEp9FFf7smmE2PzuH/3EYl7h89RBN1zTVvv2qJ/o="; }; NIX_CFLAGS_COMPILE = "-Wno-error -Wno-error=sign-compare"; diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 756e1352635..3a69923aca8 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -1,41 +1,16 @@ -{ lib, stdenv, fetchgit, fetchpatch, kernel }: +{ lib, stdenv, fetchFromGitHub, kernel }: stdenv.mkDerivation rec { pname = "lttng-modules-${kernel.version}"; - version = "2.13.4"; + version = "2.13.8"; - src = fetchgit { - url = "https://git.lttng.org/lttng-modules.git"; + src = fetchFromGitHub { + owner = "lttng"; + repo = "lttng-modules"; rev = "v${version}"; - hash = "sha256-J2Tr1vOiCAilmnf3attF3bz8Irn9IQ2QbapdXJ4MUSg="; + hash = "sha256-6ohWsGUGFz7QlHkKWyW5edpSsBTE9DFS3v6EsH9wNZo="; }; - patches = [ - # fix: mm/page_alloc: fix tracepoint mm_page_alloc_zone_locked() (v5.19) - (fetchpatch { - url = "https://git.lttng.org/?p=lttng-modules.git;a=patch;h=6229bbaa423832f6b7c7a658ad11e1d4242752ff"; - hash = "sha256-pqbKxBzjfN20wfsqSeBLXNQ+/U+3qk9RfTiT32OwSIc="; - }) - - # fix: fs: Remove flags parameter from aops->write_begin (v5.19) - (fetchpatch { - url = "https://git.lttng.org/?p=lttng-modules.git;a=patch;h=5e2f832d59d51589ab69479c7db43c7581fb9346"; - hash = "sha256-auoCbvFEVR76sOCLjIe+q/Q+vunQlR3G3gVcjqAGGPk="; - }) - - # fix: workqueue: Fix type of cpu in trace event (v5.19) - (fetchpatch { - url = "https://git.lttng.org/?p=lttng-modules.git;a=patch;h=c6da9604b1666780ea4725b3b3d1bfa1548f9c89"; - hash = "sha256-qoTwy+P32qg1L+JctqM1+70OkeTbnbL3QJ9LwaBq/bw="; - }) - - # fix: net: skb: introduce kfree_skb_reason() (v5.15.58..v5.16) - (fetchpatch { - url = "https://git.lttng.org/?p=lttng-modules.git;a=patch;h=96c477dabaaf6cd1734bebe0972fef877e5a463b"; - hash = "sha256-b7BhrYZ5SZqeRVGEu0Eo9GfbcZdDPrgEnOl2XU3z+ds="; - }) - ]; - nativeBuildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; @@ -57,6 +32,6 @@ stdenv.mkDerivation rec { license = with licenses; [ lgpl21Only gpl2Only mit ]; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; - broken = (lib.versions.majorMinor kernel.modDirVersion) == "5.10"; + broken = (lib.versions.majorMinor kernel.modDirVersion) == "5.10" || (lib.versions.majorMinor kernel.modDirVersion) == "5.4"; }; } diff --git a/pkgs/os-specific/linux/rtl8723ds/default.nix b/pkgs/os-specific/linux/rtl8723ds/default.nix index 1f2c074f3e7..be4b954c1b6 100644 --- a/pkgs/os-specific/linux/rtl8723ds/default.nix +++ b/pkgs/os-specific/linux/rtl8723ds/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "rtl8723ds"; - version = "${kernel.version}-unstable-2022-10-20"; + version = "${kernel.version}-unstable-2022-12-01"; src = fetchFromGitHub { owner = "lwfinger"; repo = "rtl8723ds"; - rev = "912fdb30531bc8c071267a047e7df16feae7a865"; - sha256 = "sha256-HhoCKrrRg1Q995sekQvzhaiqANeTP8pANItj2vLV+Cw="; + rev = "a638cc8639015b8b9390af3350fab0366b6c87e7"; + sha256 = "sha256-qfVE7k71NPzw3FwoOaUxH66PnDjbpMAF6CyOyUVdSMA="; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 9475b667fa1..bd682ec5933 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rtl8812au"; - version = "${kernel.version}-unstable-2022-08-22"; + version = "${kernel.version}-unstable-2023-01-17"; src = fetchFromGitHub { owner = "morrownr"; repo = "8812au-20210629"; - rev = "7aa0e0c74551b4e4f319f4b54e00ccbfe588b7ce"; - sha256 = "sha256-BHC1DpWHv/1UvSfj6S5fo/ODZ1VDgLQO2A9EC+BR1JE="; + rev = "0a8bb3cec3ef91e6ef8cf549ca926016ba0a8acd"; + sha256 = "sha256-25NaMQq9H6mqVynNQJXpqISAslxfEVSt3ELzG7s4mV4="; }; nativeBuildInputs = [ bc nukeReferences ] ++ kernel.moduleBuildDependencies; diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/pkgs/os-specific/linux/rtl8821ce/default.nix index 0c1899f2c8a..476bce22fb1 100644 --- a/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -1,25 +1,19 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , kernel , bc }: stdenv.mkDerivation rec { pname = "rtl8821ce"; - version = "${kernel.version}-unstable-2022-06-01"; + version = "${kernel.version}-unstable-2023-01-01"; src = fetchFromGitHub { owner = "tomaspinho"; repo = "rtl8821ce"; - rev = "be733dc86781c68571650b395dd0fa6b53c0a039"; - sha256 = "sha256-4PgISOjCSSGymz96VwE4jzcUiOEO+Ocuk2kJVIA+TQM="; - }; - - patches = fetchpatch { - url = "https://github.com/tomaspinho/rtl8821ce/pull/291.patch"; - sha256 = "sha256-GCZ/iPtzF7PP0ZgagBev6r7IVQ2VenPoLKL9GnPSt+U="; + rev = "a3e2f7c1f91e92f2dc788e8fcd7f2986af3d19b6"; + sha256 = "sha256-eR4iTkRMnhNEBrUEC+fKlwq3hezNC9mSAQ7D0Wwss/0="; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/servers/dns/dnsdist/default.nix b/pkgs/servers/dns/dnsdist/default.nix index 2081f32ea67..3878b554afd 100644 --- a/pkgs/servers/dns/dnsdist/default.nix +++ b/pkgs/servers/dns/dnsdist/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "dnsdist"; - version = "1.7.2"; + version = "1.7.3"; src = fetchurl { url = "https://downloads.powerdns.com/releases/dnsdist-${version}.tar.bz2"; - hash = "sha256-UkvSuwWqLgWYKpca6FEPKBIwOrRIajhhtiIS0GsRJ80="; + hash = "sha256-fq9vrC8mVlxdhljUKiE3meBfTTvGjnxxbnF030ExWIY="; }; patches = [ diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix index 0026e5bdbcf..60a8e22a484 100644 --- a/pkgs/servers/web-apps/searx/default.nix +++ b/pkgs/servers/web-apps/searx/default.nix @@ -27,7 +27,7 @@ toPythonModule (buildPythonApplication rec { certifi python-dateutil flask - flaskbabel + flask-babel gevent grequests jinja2 diff --git a/pkgs/servers/web-apps/searxng/default.nix b/pkgs/servers/web-apps/searxng/default.nix index 0ddfc5351e3..2b1a6f69b51 100644 --- a/pkgs/servers/web-apps/searxng/default.nix +++ b/pkgs/servers/web-apps/searxng/default.nix @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { certifi python-dateutil flask - flaskbabel + flask-babel brotli jinja2 langdetect diff --git a/pkgs/shells/fish/plugins/grc.nix b/pkgs/shells/fish/plugins/grc.nix index f506ba36c13..1149c082cac 100644 --- a/pkgs/shells/fish/plugins/grc.nix +++ b/pkgs/shells/fish/plugins/grc.nix @@ -11,6 +11,10 @@ buildFishPlugin { sha256 = "sha256-NQa12L0zlEz2EJjMDhWUhw5cz/zcFokjuCK5ZofTn+Q="; }; + postInstall = '' + cp conf.d/executables $out/share/fish/vendor_conf.d/ + ''; + meta = with lib; { description = "grc Colourizer for some commands on Fish shell"; license = licenses.mit; diff --git a/pkgs/shells/zsh/agdsn-zsh-config/default.nix b/pkgs/shells/zsh/agdsn-zsh-config/default.nix new file mode 100644 index 00000000000..5fcad36035d --- /dev/null +++ b/pkgs/shells/zsh/agdsn-zsh-config/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenvNoCC, fetchFromGitHub }: + +stdenvNoCC.mkDerivation rec { + pname = "agdsn-zsh-config"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "agdsn"; + repo = "agdsn-zsh-config"; + rev = "v${version}"; + sha256 = "sha256-/l2fE4ZsZ6f89fYG9sTEV1mrXZ3MLXx6K3CTUQHiAsc="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + install -D -m644 zshrc-base-hw.zsh "$out/etc/zsh/zshrc" + install -D -m644 zshrc-home.zsh "$out/etc/skel/.zshrc" + install -D -m644 zshrc-home.zsh "$out/etc/zsh/newuser.zshrc.recommended" + install -D -m644 profile-d-agdsn-zsh-config.sh "$out/etc/profile.d/agdsn-zsh-config.sh" + + runHook postInstall + ''; + + meta = with lib; { + description = "A modified version of the Grml Zsh configuration specialised for the needs of system administration"; + homepage = "https://github.com/agdsn/agdsn-zsh-config"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ fugi ]; + }; +} diff --git a/pkgs/tools/audio/fmtoy/default.nix b/pkgs/tools/audio/fmtoy/default.nix index dd3f0402132..69a0f570d3b 100644 --- a/pkgs/tools/audio/fmtoy/default.nix +++ b/pkgs/tools/audio/fmtoy/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fmtoy"; - version = "unstable-2021-12-24"; + version = "unstable-2022-12-23"; src = fetchFromGitHub { owner = "vampirefrog"; repo = "fmtoy"; - rev = "0de6703b3373eb5bf19fd3deaae889286f330c21"; - sha256 = "0sr6klkmjd2hd2kyb9y0x986d6lsy8bziizfc6cmhkqcq92fh45c"; + rev = "78b61b5e9bc0c6874962dc4040456581c9999b36"; + sha256 = "r5zbr6TCxzDiQvDsLQu/QwNfem1K4Ahaji0yIz/2yl0="; }; postPatch = '' @@ -63,9 +63,9 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/vampirefrog/fmtoy"; description = "Tools for FM voices for Yamaha YM chips (OPL, OPM and OPN series)"; - # Unknown license situation + # Unclear if gpl3Only or gpl3Plus # https://github.com/vampirefrog/fmtoy/issues/1 - license = licenses.unfree; + license = licenses.gpl3; maintainers = with maintainers; [ OPNA2608 ]; platforms = platforms.all; }; diff --git a/pkgs/tools/filesystems/wiimms-iso-tools/default.nix b/pkgs/tools/filesystems/wiimms-iso-tools/default.nix index b9eefb0b02c..4519ee9d42a 100644 --- a/pkgs/tools/filesystems/wiimms-iso-tools/default.nix +++ b/pkgs/tools/filesystems/wiimms-iso-tools/default.nix @@ -1,12 +1,12 @@ -{lib, stdenv, fetchurl, fetchpatch, zlib, ncurses, fuse}: +{ lib, stdenv, fetchurl, fetchpatch, zlib, ncurses, fuse }: stdenv.mkDerivation rec { pname = "wiimms-iso-tools"; - version = "3.02a"; + version = "3.05a"; src = fetchurl { - url = "https://download.wiimm.de/source/wiimms-iso-tools/wiimms-iso-tools.source-${version}.tar.bz2"; - sha256 = "074cvcaqz23xyihslc6n64wwxwcnl6xp7l0750yb9pc0wrqxmj69"; + url = "https://download.wiimm.de/source/wiimms-iso-tools/wiimms-iso-tools.source-${version}.txz"; + hash = "sha256-5aikiPJkZf9OwD8QmQ7ijhBOtFQpkIErvb6gOvEu2L0="; }; buildInputs = [ zlib ncurses fuse ]; @@ -25,13 +25,11 @@ stdenv.mkDerivation rec { ]; postPatch = '' - patchShebangs setup.sh - patchShebangs gen-template.sh - patchShebangs gen-text-file.sh + patchShebangs setup.sh gen-template.sh gen-text-file.sh + substituteInPlace setup.sh --replace gcc "$CC" + substituteInPlace Makefile --replace gcc "$CC" ''; - # Workaround build failure on -fno-common toolchains like upstream gcc-10. - NIX_CFLAGS_COMPILE = "-Wno-error=format-security -fcommon"; INSTALL_PATH = "$out"; installPhase = '' @@ -44,7 +42,7 @@ stdenv.mkDerivation rec { homepage = "https://wit.wiimm.de"; description = "A set of command line tools to manipulate Wii and GameCube ISO images and WBFS containers"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ nilp0inter ]; }; } diff --git a/pkgs/tools/misc/otel-cli/default.nix b/pkgs/tools/misc/otel-cli/default.nix index 68d89d1a6e4..251cf113c4e 100644 --- a/pkgs/tools/misc/otel-cli/default.nix +++ b/pkgs/tools/misc/otel-cli/default.nix @@ -1,17 +1,17 @@ -{ lib, bash, buildGoModule, fetchFromGitHub, getent, stdenv }: +{ lib, bash, buildGoModule, fetchFromGitHub, getent, nix-update-script, stdenv }: buildGoModule rec { pname = "otel-cli"; - version = "0.0.20"; + version = "0.1.0"; src = fetchFromGitHub { owner = "equinix-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-bWdkuw0uEE75l9YCo2Dq1NpWXuMH61RQ6p7m65P1QCE="; + hash = "sha256-iYlyokBAS5KQUYq83zhKWH/Vulq7prQdceFpeBJN2PI="; }; - vendorHash = "sha256-IJ2Gq5z1oNvcpWPh+BMs46VZMN1lHyE+M7kUinTSRr8="; + vendorHash = "sha256-5c5uDp5KVo/DYAM5F76ivtT52+lNBheVmjAjmq6EJFk="; preCheck = '' ln -s $GOPATH/bin/otel-cli . @@ -20,6 +20,8 @@ buildGoModule rec { --replace 'const minimumPath = `/bin:/usr/bin`' 'const minimumPath = `${lib.makeBinPath [ getent ]}`' ''; + passthru.updateScript = nix-update-script {}; + meta = with lib; { homepage = "https://github.com/equinix-labs/otel-cli"; description = "A command-line tool for sending OpenTelemetry traces"; diff --git a/pkgs/tools/misc/pokemonsay/default.nix b/pkgs/tools/misc/pokemonsay/default.nix index f61b93a874f..7053e4ba807 100644 --- a/pkgs/tools/misc/pokemonsay/default.nix +++ b/pkgs/tools/misc/pokemonsay/default.nix @@ -1,6 +1,7 @@ { lib , stdenvNoCC , fetchFromGitHub +, fetchpatch , cowsay , coreutils , findutils @@ -8,15 +9,23 @@ stdenvNoCC.mkDerivation rec { pname = "pokemonsay"; - version = "unstable-2021-10-05"; + version = "1.0.0"; src = fetchFromGitHub { owner = "HRKings"; repo = "pokemonsay-newgenerations"; - rev = "baccc6d2fe1897c48f60d82ff9c4d4c018f5b594"; + rev = "v${version}"; hash = "sha256-IDTAZmOzkUg0kLUM0oWuVbi8EwE4sEpLWrNAtq/he+g="; }; + patches = [ + (fetchpatch { # https://github.com/HRKings/pokemonsay-newgenerations/pull/5 + name = "word-wrap-fix.patch"; + url = "https://github.com/pbsds/pokemonsay-newgenerations/commit/7056d7ba689479a8e6c14ec000be1dfcd83afeb0.patch"; + hash = "sha256-aqUJkyJDWArLjChxLZ4BbC6XAB53LAqARzTvEAxrFCI="; + }) + ]; + postPatch = '' substituteInPlace pokemonsay.sh \ --replace \ @@ -51,8 +60,11 @@ stdenvNoCC.mkDerivation rec { cp pokemons/*.cow $out/share/pokemonsay ''; - checkPhase = '' - $out/bin/pokemonsay --list-pokemon + doInstallCheck = true; + installCheckPhase = '' + (set -x + test "$($out/bin/pokemonsay --list | wc -l)" -ge 891 + ) ''; meta = with lib; { diff --git a/pkgs/tools/misc/qmk/default.nix b/pkgs/tools/misc/qmk/default.nix index 144038f60f4..2c5403d4a14 100644 --- a/pkgs/tools/misc/qmk/default.nix +++ b/pkgs/tools/misc/qmk/default.nix @@ -12,22 +12,18 @@ python3.pkgs.buildPythonApplication rec { pname = "qmk"; version = "1.1.1"; + format = "pyproject"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "sha256-3QKOCevNYfi9+MuCkp36/A4AfZelo4A7RYGbRkF3Mmk="; + hash = "sha256-3QKOCevNYfi9+MuCkp36/A4AfZelo4A7RYGbRkF3Mmk="; }; nativeBuildInputs = with python3.pkgs; [ - nose2 - setuptools-scm - yapf + setuptools ]; propagatedBuildInputs = with python3.pkgs; [ - appdirs - argcomplete - colorama dotty-dict hid hjson @@ -50,14 +46,6 @@ python3.pkgs.buildPythonApplication rec { pkgsCross.avr.libcCross ]; - # buildPythonApplication requires setup.py; the setup.py file crafted below - # acts as a wrapper to setup.cfg - postConfigure = '' - touch setup.py - echo "from setuptools import setup" >> setup.py - echo "setup()" >> setup.py - ''; - # no tests implemented doCheck = false; diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix index 26869c3ee01..517aae1f792 100644 --- a/pkgs/tools/misc/steampipe/default.nix +++ b/pkgs/tools/misc/steampipe/default.nix @@ -2,24 +2,24 @@ buildGoModule rec { pname = "steampipe"; - version = "0.16.4"; + version = "0.18.2"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe"; rev = "v${version}"; - sha256 = "sha256-awZlA02lKYpFdvCsGUC8Blv8FHek5XskkljseDGjDmk="; + sha256 = "sha256-n/5+IVhTaME4x0KFTueo4SSBkAvXgin1VJHNEe2JnPI="; }; - vendorSha256 = "sha256-6l3bBxGhdZGIXmdzgF44TGZQqT6gSUHSwOAE2SlgLgg="; + vendorHash = "sha256-W30f7QYgm+QyLDJICpjMn7mtUIziTR1igThEbv+Aa7M="; proxyVendor = true; patchPhase = '' runHook prePatch # Patch test that relies on looking up homedir in user struct to prefer ~ substituteInPlace pkg/steampipeconfig/shared_test.go \ - --replace '"github.com/turbot/go-kit/helpers"' "" \ - --replace 'filepaths.SteampipeDir, _ = helpers.Tildefy("~/.steampipe")' 'filepaths.SteampipeDir = "~/.steampipe"'; + --replace 'filehelpers "github.com/turbot/go-kit/files"' "" \ + --replace 'filepaths.SteampipeDir, _ = filehelpers.Tildefy("~/.steampipe")' 'filepaths.SteampipeDir = "~/.steampipe"'; runHook postPatch ''; diff --git a/pkgs/tools/misc/timer/default.nix b/pkgs/tools/misc/timer/default.nix new file mode 100644 index 00000000000..abfd48b83a8 --- /dev/null +++ b/pkgs/tools/misc/timer/default.nix @@ -0,0 +1,28 @@ +{ lib, buildGoModule, fetchFromGitHub, testers, timer }: + +buildGoModule rec { + pname = "timer"; + version = "unstable-2023-02-01"; + + src = fetchFromGitHub { + owner = "caarlos0"; + repo = "timer"; + rev = "1f437baceb1ca76b341fdc229fe45938b282f2aa"; + hash = "sha256-u+naemEiKufKYROuJB55u8QgiIgg4nLsB+FerUImtXs="; + }; + + vendorHash = "sha256-n4AjaojcDAYbgOIuaAJ4faVJqV+/0uby5OHRMsyL9Dg="; + + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; + + passthru.tests.version = testers.testVersion { + package = timer; + }; + + meta = with lib; { + description = "A `sleep` with progress"; + homepage = "https://github.com/caarlos0/timer"; + license = licenses.mit; + maintainers = with maintainers; [ zowoq ]; + }; +} diff --git a/pkgs/tools/text/mdbook-pagetoc/default.nix b/pkgs/tools/text/mdbook-pagetoc/default.nix new file mode 100644 index 00000000000..7ee5f8fdde4 --- /dev/null +++ b/pkgs/tools/text/mdbook-pagetoc/default.nix @@ -0,0 +1,22 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "mdbook-pagetoc"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "slowsage"; + repo = pname; + rev = "v${version}"; + hash = "sha256-SRrlyUkEdC63NbdAv+J9kb5LTCL/GBwMhnUVdTE4nas="; + }; + + cargoHash = "sha256-Gx6N8VFUnaOvQ290TLeeNj/pVDeK/nUWLjM/KwVAjNo="; + + meta = with lib; { + description = "Table of contents for mdbook (in sidebar)"; + homepage = "https://github.com/slowsage/mdbook-pagetoc"; + license = licenses.mit; + maintainers = with maintainers; [ blaggacao ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 808c0dbfb2b..6d50705e8b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9034,6 +9034,8 @@ with pkgs; mdbook-cmdrun = callPackage ../tools/text/mdbook-cmdrun { }; + mdbook-pagetoc = callPackage ../tools/text/mdbook-pagetoc { }; + mdbook-graphviz = callPackage ../tools/text/mdbook-graphviz { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -12520,6 +12522,8 @@ with pkgs; time-decode = callPackage ../tools/misc/time-decode { }; + timer = callPackage ../tools/misc/timer { }; + tio = callPackage ../tools/misc/tio { }; tiv = callPackage ../applications/misc/tiv { }; @@ -13795,6 +13799,8 @@ with pkgs; runtimeShell = "${runtimeShellPackage}${runtimeShellPackage.shellPath}"; runtimeShellPackage = bash; + agdsn-zsh-config = callPackage ../shells/zsh/agdsn-zsh-config { }; + any-nix-shell = callPackage ../shells/any-nix-shell { }; bash = lowPrio (callPackage ../shells/bash/5.nix { @@ -19670,6 +19676,8 @@ with pkgs; funambol = callPackage ../development/libraries/funambol { }; + functionalplus = callPackage ../development/libraries/functionalplus { }; + galer = callPackage ../tools/security/galer { }; gallia = callPackage ../tools/security/gallia { }; @@ -27366,6 +27374,8 @@ with pkgs; material-icons = callPackage ../data/fonts/material-icons { }; + material-symbols = callPackage ../data/fonts/material-symbols { }; + material-kwin-decoration = libsForQt5.callPackage ../data/themes/material-kwin-decoration { }; meslo-lg = callPackage ../data/fonts/meslo-lg {}; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index d9728d8cb5a..9a09ae6663f 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -82,6 +82,7 @@ mapAliases ({ fake_factory = throw "fake_factory has been removed because it is unused and deprecated by upstream since 2016."; # added 2022-05-30 faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12 filemagic = throw "inactive since 2014, so use python-magic instead"; # added 2022-11-19 + flaskbabel = flask-babel; # added 2023-01-19 flask_login = flask-login; # added 2022-10-17 flask_sqlalchemy = flask-sqlalchemy; # added 2022-07-20 flask_testing = flask-testing; # added 2022-04-25 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3ca8170ac75..09dbaf7ea32 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -532,6 +532,8 @@ self: super: with self; { apprise = callPackage ../development/python-modules/apprise { }; + approval-utilities = callPackage ../development/python-modules/approval-utilities { }; + approvaltests = callPackage ../development/python-modules/approvaltests { }; apptools = callPackage ../development/python-modules/apptools { }; @@ -3394,8 +3396,6 @@ self: super: with self; { flask-babel = callPackage ../development/python-modules/flask-babel { }; - flaskbabel = callPackage ../development/python-modules/flaskbabel { }; - flask-babelex = callPackage ../development/python-modules/flask-babelex { }; flask-basicauth = callPackage ../development/python-modules/flask-basicauth { }; |