diff options
132 files changed, 1873 insertions, 1049 deletions
diff --git a/doc/hooks/index.xml b/doc/hooks/index.xml new file mode 100644 index 00000000000..6a046eae288 --- /dev/null +++ b/doc/hooks/index.xml @@ -0,0 +1,10 @@ +<chapter xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:xi="http://www.w3.org/2001/XInclude" + xml:id="chap-hooks"> + <title>Hooks reference</title> + <para> + Nixpkgs has several hook packages that augment the stdenv phases. + </para> + <xi:include href="./postgresql-test-hook.section.xml" /> +</chapter> diff --git a/doc/hooks/postgresql-test-hook.section.md b/doc/hooks/postgresql-test-hook.section.md new file mode 100644 index 00000000000..077fac14ebb --- /dev/null +++ b/doc/hooks/postgresql-test-hook.section.md @@ -0,0 +1,59 @@ + +# `postgresqlTestHook` {#sec-postgresqlTestHook} + +This hook starts a PostgreSQL server during the `checkPhase`. Example: + +```nix +{ stdenv, postgresql, postgresqlTestHook }: +stdenv.mkDerivation { + + # ... + + checkInputs = [ + postgresql + postgresqlTestHook + ]; +} +``` + +If you use a custom `checkPhase`, remember to add the `runHook` calls: +```nix + checkPhase '' + runHook preCheck + + # ... your tests + + runHook postCheck + '' +``` + +## Variables {#sec-postgresqlTestHook-variables} + +The hook logic will read a number of variables and set them to a default value if unset or empty. + +Exported variables: + + - `PGDATA`: location of server files. + - `PGHOST`: location of UNIX domain socket directory; the default `host` in a connection string. + - `PGUSER`: user to create / log in with, default: `test_user`. + - `PGDATABASE`: database name, default: `test_db`. + +Bash-only variables: + + - `postgresqlTestUserOptions`: SQL options to use when creating the `$PGUSER` role, default: `LOGIN`. + - `postgresqlTestSetupSQL`: SQL commands to run as database administrator after startup, default: statements that create `$PGUSER` and `$PGDATABASE`. + - `postgresqlTestSetupCommands`: bash commands to run after database start, defaults to running `$postgresqlTestSetupSQL` as database administrator. + - `postgresqlEnableTCP`: set to `1` to enable TCP listening. Flaky; not recommended. + - `postgresqlStartCommands`: defaults to `pg_ctl start`. + +## TCP and the Nix sandbox {#sec-postgresqlTestHook-tcp} + +`postgresqlEnableTCP` relies on network sandboxing, which is not available on macOS and some custom Nix installations, resulting in flaky tests. +For this reason, it is disabled by default. + +The preferred solution is to make the test suite use a UNIX domain socket connection. This is the default behavior when no `host` connection parameter is provided. +Some test suites hardcode a value for `host` though, so a patch may be required. If you can upstream the patch, you can make `host` default to the `PGHOST` environment variable when set. Otherwise, you can patch it locally to omit the `host` connection string parameter altogether. + +::: {.note} +The error `libpq: failed (could not receive data from server: Connection refused` is generally an indication that the test suite is trying to connect through TCP. +::: diff --git a/doc/manual.xml b/doc/manual.xml index b43021d85ca..e49ae67ec94 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -27,6 +27,7 @@ <xi:include href="builders/trivial-builders.chapter.xml" /> <xi:include href="builders/special.xml" /> <xi:include href="builders/images.xml" /> + <xi:include href="hooks/index.xml" /> <xi:include href="languages-frameworks/index.xml" /> <xi:include href="builders/packages/index.xml" /> </part> diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2f21f219274..287a20b2f04 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2089,12 +2089,6 @@ githubId = 18648043; name = "Daniel Cartwright"; }; - chiiruno = { - email = "okinan@protonmail.com"; - github = "chiiruno"; - githubId = 30435868; - name = "Okina Matara"; - }; Chili-Man = { email = "dr.elhombrechile@gmail.com"; name = "Diego Rodriguez"; @@ -14234,6 +14228,12 @@ github = "zbioe"; githubId = 7332055; }; + zendo = { + name = "zendo"; + email = "linzway@qq.com"; + github = "zendo"; + githubId = 348013; + }; zenithal = { name = "zenithal"; email = "i@zenithal.me"; diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index be38e3fb389..cf5dd6c0916 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -75,6 +75,13 @@ </listitem> <listitem> <para> + The new + <link xlink:href="https://nixos.org/manual/nixpkgs/stable/#sec-postgresqlTestHook"><literal>postgresqlTestHook</literal></link> + runs a PostgreSQL server for the duration of package checks. + </para> + </listitem> + <listitem> + <para> <link xlink:href="https://kops.sigs.k8s.io"><literal>kops</literal></link> defaults to 1.22.4, which will enable <link xlink:href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-service.html">Instance @@ -464,6 +471,44 @@ </listitem> <listitem> <para> + <literal>pkgs.ssmtp</literal> has been dropped due to the + program being unmaintained. <literal>pkgs.msmtp</literal> can + be used instead as a substitute <literal>sendmail</literal> + implementation. The corresponding options + <literal>services.ssmtp.*</literal> have been removed as well. + <literal>programs.msmtp.*</literal> can be used instead for an + equivalent setup. For example: + </para> + <programlisting language="bash"> +{ + # Original ssmtp configuration: + services.ssmtp = { + enable = true; + useTLS = true; + useSTARTTLS = true; + hostName = "smtp.example:587"; + authUser = "someone"; + authPassFile = "/secrets/password.txt"; + }; + + # Equivalent msmtp configuration: + programs.msmtp = { + enable = true; + accounts.default = { + tls = true; + tls_starttls = true; + auth = true; + host = "smtp.example"; + port = 587; + user = "someone"; + passwordeval = "cat /secrets/password.txt"; + }; + }; +} +</programlisting> + </listitem> + <listitem> + <para> <literal>services.kubernetes.addons.dashboard</literal> was removed due to it being an outdated version. </para> @@ -600,6 +645,13 @@ </listitem> <listitem> <para> + <literal>hbase</literal> version 0.98.24 has been removed. The + package now defaults to version 2.4.11. Versions 1.7.1 and + 3.0.0-alpha-2 are also available. + </para> + </listitem> + <listitem> + <para> <literal>services.paperless-ng</literal> was renamed to <literal>services.paperless</literal>. Accordingly, the <literal>paperless-ng-manage</literal> script (located in @@ -1195,6 +1247,14 @@ </listitem> <listitem> <para> + <literal>systemd-shutdown</literal> is now properly linked on + shutdown to unmount all filesystems and device mapper devices + cleanly. This can be disabled using + <literal>boot.systemd.shutdown.enable</literal>. + </para> + </listitem> + <listitem> + <para> The Tor SOCKS proxy is now actually disabled if <literal>services.tor.client.enable</literal> is set to <literal>false</literal> (the default). If you are using this @@ -1809,6 +1869,29 @@ </listitem> <listitem> <para> + The option + <link linkend="opt-services.xserver.desktopManager.runXdgAutostartIfNone">services.xserver.desktopManager.runXdgAutostartIfNone</link> + was added in order to automatically run XDG autostart files + for sessions without a desktop manager. This replaces helpers + like the <literal>dex</literal> package. + </para> + </listitem> + <listitem> + <para> + When setting + <link linkend="opt-i18n.inputMethod.enabled">i18n.inputMethod.enabled</link> + to <literal>fcitx5</literal>, it no longer creates + corresponding systemd user services. It now relies on XDG + autostart files to start and work properly in your desktop + sessions. If you are using only a window manager without a + desktop manager, you need to enable + <literal>services.xserver.desktopManager.runXdgAutostartIfNone</literal> + or using the <literal>dex</literal> package to make + <literal>fcitx5</literal> work. + </para> + </listitem> + <listitem> + <para> A new module was added for the Envoy reverse proxy, providing the options <literal>services.envoy.enable</literal> and <literal>services.envoy.settings</literal>. diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 4fddd34d447..675a53996ef 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -27,6 +27,8 @@ In addition to numerous new and upgraded packages, this release has the followin - Systemd has been upgraded to the version 250. +- The new [`postgresqlTestHook`](https://nixos.org/manual/nixpkgs/stable/#sec-postgresqlTestHook) runs a PostgreSQL server for the duration of package checks. + - [`kops`](https://kops.sigs.k8s.io) defaults to 1.22.4, which will enable [Instance Metadata Service Version 2](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-service.html) and require tokens on new clusters with Kubernetes 1.22. This will increase security by default, but may break some types of workloads. See the [release notes](https://kops.sigs.k8s.io/releases/1.22-notes/) for details. - Module authors can use `mkRenamedOptionModuleWith` to automate the deprecation cycle without annoying out-of-tree module authors and their users. @@ -150,6 +152,39 @@ In addition to numerous new and upgraded packages, this release has the followin - `security.klogd` was removed. Logging of kernel messages is handled by systemd since Linux 3.5. +- `pkgs.ssmtp` has been dropped due to the program being unmaintained. + `pkgs.msmtp` can be used instead as a substitute `sendmail` implementation. + The corresponding options `services.ssmtp.*` have been removed as well. + `programs.msmtp.*` can be used instead for an equivalent setup. For example: + + ```nix + { + # Original ssmtp configuration: + services.ssmtp = { + enable = true; + useTLS = true; + useSTARTTLS = true; + hostName = "smtp.example:587"; + authUser = "someone"; + authPassFile = "/secrets/password.txt"; + }; + + # Equivalent msmtp configuration: + programs.msmtp = { + enable = true; + accounts.default = { + tls = true; + tls_starttls = true; + auth = true; + host = "smtp.example"; + port = 587; + user = "someone"; + passwordeval = "cat /secrets/password.txt"; + }; + }; + } + ``` + - `services.kubernetes.addons.dashboard` was removed due to it being an outdated version. - `services.kubernetes.scheduler.{port,address}` now set `--secure-port` and `--bind-address` instead of `--port` and `--address`, since the former have been deprecated and are no longer functional in kubernetes>=1.23. Ensure that you are not relying on the insecure behaviour before upgrading. @@ -194,6 +229,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `services.ipfs.extraFlags` is now escaped with `utils.escapeSystemdExecArgs`. If you rely on systemd interpolating `extraFlags` in the service `ExecStart`, this will no longer work. +- `hbase` version 0.98.24 has been removed. The package now defaults to version 2.4.11. Versions 1.7.1 and 3.0.0-alpha-2 are also available. + - `services.paperless-ng` was renamed to `services.paperless`. Accordingly, the `paperless-ng-manage` script (located in `dataDir`) was renamed to `paperless-manage`. `services.paperless` now uses `paperless-ngx`. - The `matrix-synapse` service (`services.matrix-synapse`) has been converted to use the `settings` option defined in RFC42. @@ -457,6 +494,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `systemd-nspawn@.service` settings have been reverted to the default systemd behaviour. User namespaces are now activated by default. If you want to keep running nspawn containers without user namespaces you need to set `systemd.nspawn.<name>.execConfig.PrivateUsers = false` +- `systemd-shutdown` is now properly linked on shutdown to unmount all filesystems and device mapper devices cleanly. This can be disabled using `boot.systemd.shutdown.enable`. + - The Tor SOCKS proxy is now actually disabled if `services.tor.client.enable` is set to `false` (the default). If you are using this functionality but didn't change the setting or set it to `false`, you now need to set it to `true`. - The terraform 0.12 compatibility has been removed and the `terraform.withPlugins` and `terraform-providers.mkProvider` implementations simplified. Providers now need to be stored under @@ -658,6 +697,17 @@ In addition to numerous new and upgraded packages, this release has the followin - The `services.stubby` module was converted to a [settings-style](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md) configuration. +- The option + [services.xserver.desktopManager.runXdgAutostartIfNone](#opt-services.xserver.desktopManager.runXdgAutostartIfNone) + was added in order to automatically run XDG autostart files for sessions without a desktop manager. + This replaces helpers like the `dex` package. + +- When setting [i18n.inputMethod.enabled](#opt-i18n.inputMethod.enabled) to `fcitx5`, + it no longer creates corresponding systemd user services. + It now relies on XDG autostart files to start and work properly in your desktop sessions. + If you are using only a window manager without a desktop manager, you need to enable + `services.xserver.desktopManager.runXdgAutostartIfNone` or using the `dex` package to make `fcitx5` work. + - A new module was added for the Envoy reverse proxy, providing the options `services.envoy.enable` and `services.envoy.settings`. - The option `services.duplicati.dataDir` has been added to allow changing the location of duplicati's files. diff --git a/nixos/modules/i18n/input-method/fcitx5.nix b/nixos/modules/i18n/input-method/fcitx5.nix index 414aabbbaa7..6fea28e2234 100644 --- a/nixos/modules/i18n/input-method/fcitx5.nix +++ b/nixos/modules/i18n/input-method/fcitx5.nix @@ -28,11 +28,5 @@ in { QT_IM_MODULE = "fcitx"; XMODIFIERS = "@im=fcitx"; }; - - systemd.user.services.fcitx5-daemon = { - enable = true; - script = "${fcitx5Package}/bin/fcitx5"; - wantedBy = [ "graphical-session.target" ]; - }; }; } diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 4c882707c5f..9aa8817ca51 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -205,7 +205,6 @@ ./programs/spacefm.nix ./programs/singularity.nix ./programs/ssh.nix - ./programs/ssmtp.nix ./programs/sysdig.nix ./programs/systemtap.nix ./programs/starship.nix @@ -1184,6 +1183,7 @@ ./system/boot/systemd/journald.nix ./system/boot/systemd/logind.nix ./system/boot/systemd/nspawn.nix + ./system/boot/systemd/shutdown.nix ./system/boot/systemd/tmpfiles.nix ./system/boot/systemd/user.nix ./system/boot/systemd/initrd.nix diff --git a/nixos/modules/programs/ssmtp.nix b/nixos/modules/programs/ssmtp.nix deleted file mode 100644 index b454bf35229..00000000000 --- a/nixos/modules/programs/ssmtp.nix +++ /dev/null @@ -1,190 +0,0 @@ -# Configuration for `ssmtp', a trivial mail transfer agent that can -# replace sendmail/postfix on simple systems. It delivers email -# directly to an SMTP server defined in its configuration file, without -# queueing mail locally. - -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.ssmtp; - -in -{ - - imports = [ - (mkRenamedOptionModule [ "networking" "defaultMailServer" "directDelivery" ] [ "services" "ssmtp" "enable" ]) - (mkRenamedOptionModule [ "networking" "defaultMailServer" "hostName" ] [ "services" "ssmtp" "hostName" ]) - (mkRenamedOptionModule [ "networking" "defaultMailServer" "domain" ] [ "services" "ssmtp" "domain" ]) - (mkRenamedOptionModule [ "networking" "defaultMailServer" "root" ] [ "services" "ssmtp" "root" ]) - (mkRenamedOptionModule [ "networking" "defaultMailServer" "useTLS" ] [ "services" "ssmtp" "useTLS" ]) - (mkRenamedOptionModule [ "networking" "defaultMailServer" "useSTARTTLS" ] [ "services" "ssmtp" "useSTARTTLS" ]) - (mkRenamedOptionModule [ "networking" "defaultMailServer" "authUser" ] [ "services" "ssmtp" "authUser" ]) - (mkRenamedOptionModule [ "networking" "defaultMailServer" "authPassFile" ] [ "services" "ssmtp" "authPassFile" ]) - (mkRenamedOptionModule [ "networking" "defaultMailServer" "setSendmail" ] [ "services" "ssmtp" "setSendmail" ]) - - (mkRemovedOptionModule [ "networking" "defaultMailServer" "authPass" ] "authPass has been removed since it leaks the clear-text password into the world-readable store. Use authPassFile instead and make sure it's not a store path") - (mkRemovedOptionModule [ "services" "ssmtp" "authPass" ] "authPass has been removed since it leaks the clear-text password into the world-readable store. Use authPassFile instead and make sure it's not a store path") - ]; - - options = { - - services.ssmtp = { - - enable = mkOption { - type = types.bool; - default = false; - description = '' - Use the trivial Mail Transfer Agent (MTA) - <command>ssmtp</command> package to allow programs to send - e-mail. If you don't want to run a “real” MTA like - <command>sendmail</command> or <command>postfix</command> on - your machine, set this option to <literal>true</literal>, and - set the option - <option>services.ssmtp.hostName</option> to the - host name of your preferred mail server. - ''; - }; - - settings = mkOption { - type = with types; attrsOf (oneOf [ bool str ]); - default = {}; - description = '' - <citerefentry><refentrytitle>ssmtp</refentrytitle><manvolnum>5</manvolnum></citerefentry> configuration. Refer - to <link xlink:href="https://linux.die.net/man/5/ssmtp.conf"/> for details on supported values. - ''; - example = literalExpression '' - { - Debug = true; - FromLineOverride = false; - } - ''; - }; - - hostName = mkOption { - type = types.str; - example = "mail.example.org"; - description = '' - The host name of the default mail server to use to deliver - e-mail. Can also contain a port number (ex: mail.example.org:587), - defaults to port 25 if no port is given. - ''; - }; - - root = mkOption { - type = types.str; - default = ""; - example = "root@example.org"; - description = '' - The e-mail to which mail for users with UID < 1000 is forwarded. - ''; - }; - - domain = mkOption { - type = types.str; - default = ""; - example = "example.org"; - description = '' - The domain from which mail will appear to be sent. - ''; - }; - - useTLS = mkOption { - type = types.bool; - default = false; - description = '' - Whether TLS should be used to connect to the default mail - server. - ''; - }; - - useSTARTTLS = mkOption { - type = types.bool; - default = false; - description = '' - Whether the STARTTLS should be used to connect to the default - mail server. (This is needed for TLS-capable mail servers - running on the default SMTP port 25.) - ''; - }; - - authUser = mkOption { - type = types.str; - default = ""; - example = "foo@example.org"; - description = '' - Username used for SMTP auth. Leave blank to disable. - ''; - }; - - authPassFile = mkOption { - type = types.nullOr types.str; - default = null; - example = "/run/keys/ssmtp-authpass"; - description = '' - Path to a file that contains the password used for SMTP auth. The file - should not contain a trailing newline, if the password does not contain one - (e.g. use <command>echo -n "password" > file</command>). - This file should be readable by the users that need to execute ssmtp. - ''; - }; - - setSendmail = mkOption { - type = types.bool; - default = true; - description = "Whether to set the system sendmail to ssmtp's."; - }; - - }; - - }; - - - config = mkIf cfg.enable { - - assertions = [ - { - assertion = cfg.useSTARTTLS -> cfg.useTLS; - message = "services.ssmtp.useSTARTTLS has no effect without services.ssmtp.useTLS"; - } - ]; - - services.ssmtp.settings = mkMerge [ - ({ - MailHub = cfg.hostName; - FromLineOverride = mkDefault true; - UseTLS = cfg.useTLS; - UseSTARTTLS = cfg.useSTARTTLS; - }) - (mkIf (cfg.root != "") { root = cfg.root; }) - (mkIf (cfg.domain != "") { rewriteDomain = cfg.domain; }) - (mkIf (cfg.authUser != "") { AuthUser = cfg.authUser; }) - (mkIf (cfg.authPassFile != null) { AuthPassFile = cfg.authPassFile; }) - ]; - - # careful here: ssmtp REQUIRES all config lines to end with a newline char! - environment.etc."ssmtp/ssmtp.conf".text = with generators; toKeyValue { - mkKeyValue = mkKeyValueDefault { - mkValueString = value: - if value == true then "YES" - else if value == false then "NO" - else mkValueStringDefault {} value - ; - } "="; - } cfg.settings; - - environment.systemPackages = [pkgs.ssmtp]; - - services.mail.sendmailSetuidWrapper = mkIf cfg.setSendmail { - program = "sendmail"; - source = "${pkgs.ssmtp}/bin/sendmail"; - setuid = false; - setgid = false; - owner = "root"; - group = "root"; - }; - - }; - -} diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 72395b2ee86..1d226276493 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -69,6 +69,11 @@ with lib; '') (mkRemovedOptionModule [ "services" "quagga" ] "the corresponding package has been removed from nixpkgs") (mkRemovedOptionModule [ "services" "seeks" ] "") + (mkRemovedOptionModule [ "services" "ssmtp" ] '' + The ssmtp package and the corresponding module have been removed due to + the program being unmaintained. The options `programs.msmtp.*` can be + used instead. + '') (mkRemovedOptionModule [ "services" "venus" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "wakeonlan"] "This module was removed in favor of enabling it with networking.interfaces.<name>.wakeOnLan") (mkRemovedOptionModule [ "services" "winstone" ] "The corresponding package was removed from nixpkgs.") diff --git a/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix b/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix index 6027e4f3d4b..09761d6300e 100644 --- a/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix +++ b/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix @@ -58,7 +58,7 @@ in { Configuration for the media session core. For details see https://gitlab.freedesktop.org/pipewire/media-session/-/blob/${cfg.package.version}/src/daemon/media-session.d/media-session.conf ''; - default = {}; + default = defaults.media-session; }; alsa-monitor = mkOption { @@ -67,7 +67,7 @@ in { Configuration for the alsa monitor. For details see https://gitlab.freedesktop.org/pipewire/media-session/-/blob/${cfg.package.version}/src/daemon/media-session.d/alsa-monitor.conf ''; - default = {}; + default = defaults.alsa-monitor; }; bluez-monitor = mkOption { @@ -76,7 +76,7 @@ in { Configuration for the bluez5 monitor. For details see https://gitlab.freedesktop.org/pipewire/media-session/-/blob/${cfg.package.version}/src/daemon/media-session.d/bluez-monitor.conf ''; - default = {}; + default = defaults.bluez-monitor; }; v4l2-monitor = mkOption { @@ -85,7 +85,7 @@ in { Configuration for the V4L2 monitor. For details see https://gitlab.freedesktop.org/pipewire/media-session/-/blob/${cfg.package.version}/src/daemon/media-session.d/v4l2-monitor.conf ''; - default = {}; + default = defaults.v4l2-monitor; }; }; }; diff --git a/nixos/modules/services/monitoring/nagios.nix b/nixos/modules/services/monitoring/nagios.nix index 2c7f0ed1966..69173ce4e44 100644 --- a/nixos/modules/services/monitoring/nagios.nix +++ b/nixos/modules/services/monitoring/nagios.nix @@ -102,8 +102,8 @@ in plugins = mkOption { type = types.listOf types.package; - default = with pkgs; [ monitoring-plugins ssmtp mailutils ]; - defaultText = literalExpression "[pkgs.monitoring-plugins pkgs.ssmtp pkgs.mailutils]"; + default = with pkgs; [ monitoring-plugins msmtp mailutils ]; + defaultText = literalExpression "[pkgs.monitoring-plugins pkgs.msmtp pkgs.mailutils]"; description = " Packages to be added to the Nagios <envar>PATH</envar>. Typically used to add plugins, but can be anything. diff --git a/nixos/modules/services/networking/headscale.nix b/nixos/modules/services/networking/headscale.nix index 091d2a938cd..5b07beadb45 100644 --- a/nixos/modules/services/networking/headscale.nix +++ b/nixos/modules/services/networking/headscale.nix @@ -479,7 +479,7 @@ in NoNewPrivileges = true; LockPersonality = true; RestrictRealtime = true; - SystemCallFilter = [ "@system-service" "~@priviledged" "@chown" ]; + SystemCallFilter = [ "@system-service" "~@privileged" "@chown" ]; SystemCallArchitectures = "native"; RestrictAddressFamilies = "AF_INET AF_INET6 AF_UNIX"; }; diff --git a/nixos/modules/services/networking/nbd.nix b/nixos/modules/services/networking/nbd.nix index 87f8c41a8e5..df3358f5187 100644 --- a/nixos/modules/services/networking/nbd.nix +++ b/nixos/modules/services/networking/nbd.nix @@ -4,28 +4,34 @@ with lib; let cfg = config.services.nbd; - configFormat = pkgs.formats.ini { }; iniFields = with types; attrsOf (oneOf [ bool int float str ]); - serverConfig = configFormat.generate "nbd-server-config" - ({ - generic = - (cfg.server.extraOptions // { - user = "root"; - group = "root"; - port = cfg.server.listenPort; - } // (optionalAttrs (cfg.server.listenAddress != null) { - listenaddr = cfg.server.listenAddress; - })); - } - // (mapAttrs + # The `[generic]` section must come before all the others in the + # config file. This means we can't just dump an attrset to INI + # because that sorts the sections by name. Instead, we serialize it + # on its own first. + genericSection = { + generic = (cfg.server.extraOptions // { + user = "root"; + group = "root"; + port = cfg.server.listenPort; + } // (optionalAttrs (cfg.server.listenAddress != null) { + listenaddr = cfg.server.listenAddress; + })); + }; + exportSections = + mapAttrs (_: { path, allowAddresses, extraOptions }: extraOptions // { exportname = path; } // (optionalAttrs (allowAddresses != null) { authfile = pkgs.writeText "authfile" (concatStringsSep "\n" allowAddresses); })) - cfg.server.exports) - ); + cfg.server.exports; + serverConfig = + pkgs.writeText "nbd-server-config" '' + ${lib.generators.toINI {} genericSection} + ${lib.generators.toINI {} exportSections} + ''; splitLists = partition (path: hasPrefix "/dev/" path) @@ -103,6 +109,13 @@ in }; config = mkIf cfg.server.enable { + assertions = [ + { + assertion = !(cfg.server.exports ? "generic"); + message = "services.nbd.server exports must not be named 'generic'"; + } + ]; + boot.kernelModules = [ "nbd" ]; systemd.services.nbd-server = { diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix index 3f41646bf01..1f64113950a 100644 --- a/nixos/modules/services/networking/tailscale.nix +++ b/nixos/modules/services/networking/tailscale.nix @@ -21,6 +21,12 @@ in { description = ''The interface name for tunnel traffic. Use "userspace-networking" (beta) to not use TUN.''; }; + permitCertUid = mkOption { + type = types.nullOr types.nonEmptyStr; + default = null; + description = "Username or user ID of the user allowed to to fetch Tailscale TLS certificates for the node."; + }; + package = mkOption { type = types.package; default = pkgs.tailscale; @@ -38,7 +44,9 @@ in { serviceConfig.Environment = [ "PORT=${toString cfg.port}" ''"FLAGS=--tun ${lib.escapeShellArg cfg.interfaceName}"'' - ]; + ] ++ (lib.optionals (cfg.permitCertUid != null) [ + "TS_PERMIT_CERT_UID=${cfg.permitCertUid}" + ]); }; }; } diff --git a/nixos/modules/services/networking/zeronet.nix b/nixos/modules/services/networking/zeronet.nix index 3370390a4c6..dd83b7facc1 100644 --- a/nixos/modules/services/networking/zeronet.nix +++ b/nixos/modules/services/networking/zeronet.nix @@ -90,5 +90,5 @@ in with lib; { (mkRemovedOptionModule [ "services" "zeronet" "logDir" ] "Zeronet will log by default in /var/lib/zeronet") ]; - meta.maintainers = with maintainers; [ chiiruno ]; + meta.maintainers = with maintainers; [ Madouura ]; } diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix index 00a87e788dc..0caebc8ce90 100644 --- a/nixos/modules/services/system/nscd.nix +++ b/nixos/modules/services/system/nscd.nix @@ -7,10 +7,6 @@ let nssModulesPath = config.system.nssModules.path; cfg = config.services.nscd; - nscd = if pkgs.stdenv.hostPlatform.libc == "glibc" - then pkgs.stdenv.cc.libc.bin - else pkgs.glibc.bin; - in { @@ -37,6 +33,19 @@ in description = "Configuration to use for Name Service Cache Daemon."; }; + package = mkOption { + type = types.package; + default = if pkgs.stdenv.hostPlatform.libc == "glibc" + then pkgs.stdenv.cc.libc.bin + else pkgs.glibc.bin; + defaultText = literalExample '' + if pkgs.stdenv.hostPlatform.libc == "glibc" + then pkgs.stdenv.cc.libc.bin + else pkgs.glibc.bin; + ''; + description = "package containing the nscd binary to be used by the service"; + }; + }; }; @@ -69,16 +78,16 @@ in # files. So prefix the ExecStart command with "!" to prevent systemd # from dropping privileges early. See ExecStart in systemd.service(5). serviceConfig = - { ExecStart = "!@${nscd}/sbin/nscd nscd"; + { ExecStart = "!@${cfg.package}/bin/nscd nscd"; Type = "forking"; DynamicUser = true; RuntimeDirectory = "nscd"; PIDFile = "/run/nscd/nscd.pid"; Restart = "always"; ExecReload = - [ "${nscd}/sbin/nscd --invalidate passwd" - "${nscd}/sbin/nscd --invalidate group" - "${nscd}/sbin/nscd --invalidate hosts" + [ "${cfg.package}/bin/nscd --invalidate passwd" + "${cfg.package}/bin/nscd --invalidate group" + "${cfg.package}/bin/nscd --invalidate hosts" ]; }; }; diff --git a/nixos/modules/services/web-servers/hydron.nix b/nixos/modules/services/web-servers/hydron.nix index a4a5a435b2e..46f62a9119f 100644 --- a/nixos/modules/services/web-servers/hydron.nix +++ b/nixos/modules/services/web-servers/hydron.nix @@ -161,5 +161,5 @@ in with lib; { (mkRenamedOptionModule [ "services" "hydron" "baseDir" ] [ "services" "hydron" "dataDir" ]) ]; - meta.maintainers = with maintainers; [ chiiruno ]; + meta.maintainers = with maintainers; [ Madouura ]; } diff --git a/nixos/modules/services/x11/desktop-managers/none.nix b/nixos/modules/services/x11/desktop-managers/none.nix index af7a376ae02..b5e498b67a0 100644 --- a/nixos/modules/services/x11/desktop-managers/none.nix +++ b/nixos/modules/services/x11/desktop-managers/none.nix @@ -1,7 +1,46 @@ +{ config, lib, pkgs, ... }: +with lib; +let + runXdgAutostart = config.services.xserver.desktopManager.runXdgAutostartIfNone; +in { - services.xserver.desktopManager.session = - [ { name = "none"; - start = ""; - } - ]; + options = { + services.xserver.desktopManager.runXdgAutostartIfNone = mkOption { + type = types.bool; + default = false; + description = '' + Whether to run XDG autostart files for sessions without a desktop manager + (with only a window manager), these sessions usually don't handle XDG + autostart files by default. + + Some services like <option>i18n.inputMethod</option> and + <option>service.earlyoom</option> use XDG autostart files to start. + If this option is not set to <literal>true</literal> and you are using + a window manager without a desktop manager, you need to manually start + them or running <package>dex</package> somewhere. + ''; + }; + }; + + config = mkMerge [ + { + services.xserver.desktopManager.session = [ + { + name = "none"; + start = optionalString runXdgAutostart '' + /run/current-system/systemd/bin/systemctl --user start xdg-autostart-if-no-desktop-manager.target + ''; + } + ]; + } + (mkIf runXdgAutostart { + systemd.user.targets.xdg-autostart-if-no-desktop-manager = { + description = "Run XDG autostart files"; + # From `plasma-workspace`, `share/systemd/user/plasma-workspace@.target`. + requires = [ "xdg-desktop-autostart.target" "graphical-session.target" ]; + before = [ "xdg-desktop-autostart.target" "graphical-session.target" ]; + bindsTo = [ "graphical-session.target" ]; + }; + }) + ]; } diff --git a/nixos/modules/system/boot/systemd/shutdown.nix b/nixos/modules/system/boot/systemd/shutdown.nix new file mode 100644 index 00000000000..93426931667 --- /dev/null +++ b/nixos/modules/system/boot/systemd/shutdown.nix @@ -0,0 +1,32 @@ +{ config, lib, ... }: let + + cfg = config.boot.systemd.shutdown; + +in { + options.boot.systemd.shutdown = { + enable = lib.mkEnableOption "pivoting back to an initramfs for shutdown" // { default = true; }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.generate-shutdown-ramfs = { + description = "Generate shutdown ramfs"; + before = [ "shutdown.target" ]; + unitConfig = { + DefaultDependencies = false; + ConditionFileIsExecutable = [ + "!/run/initramfs/shutdown" + "/run/current-system/systemd/lib/systemd/systemd-shutdown" + ]; + }; + + serviceConfig.Type = "oneshot"; + script = '' + mkdir -p /run/initramfs + if ! mountpoint -q /run/initramfs; then + mount -t tmpfs tmpfs /run/initramfs + fi + cp /run/current-system/systemd/lib/systemd/systemd-shutdown /run/initramfs/shutdown + ''; + }; + }; +} diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 8ca4ad7b7d8..d09e9b99248 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -403,6 +403,15 @@ let </itemizedlist> ''; + hostidFile = pkgs.runCommand "gen-hostid" { preferLocalBuild = true; } '' + hi="${cfg.hostId}" + ${if pkgs.stdenv.isBigEndian then '' + echo -ne "\x''${hi:0:2}\x''${hi:2:2}\x''${hi:4:2}\x''${hi:6:2}" > $out + '' else '' + echo -ne "\x''${hi:6:2}\x''${hi:4:2}\x''${hi:2:2}\x''${hi:0:2}" > $out + ''} + ''; + in { @@ -1383,16 +1392,8 @@ in domainname "${cfg.domain}" ''; - environment.etc.hostid = mkIf (cfg.hostId != null) - { source = pkgs.runCommand "gen-hostid" { preferLocalBuild = true; } '' - hi="${cfg.hostId}" - ${if pkgs.stdenv.isBigEndian then '' - echo -ne "\x''${hi:0:2}\x''${hi:2:2}\x''${hi:4:2}\x''${hi:6:2}" > $out - '' else '' - echo -ne "\x''${hi:6:2}\x''${hi:4:2}\x''${hi:2:2}\x''${hi:0:2}" > $out - ''} - ''; - }; + environment.etc.hostid = mkIf (cfg.hostId != null) { source = hostidFile; }; + boot.initrd.systemd.contents."/etc/hostid" = mkIf (cfg.hostId != null) { source = hostidFile; }; # static hostname configuration needed for hostnamectl and the # org.freedesktop.hostname1 dbus service (both provided by systemd) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index cb68ef68530..57c17508aab 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -199,6 +199,9 @@ in haste-server = handleTest ./haste-server.nix {}; haproxy = handleTest ./haproxy.nix {}; hardened = handleTest ./hardened.nix {}; + hbase1 = handleTest ./hbase.nix { package=pkgs.hbase1; }; + hbase2 = handleTest ./hbase.nix { package=pkgs.hbase2; }; + hbase3 = handleTest ./hbase.nix { package=pkgs.hbase3; }; hedgedoc = handleTest ./hedgedoc.nix {}; herbstluftwm = handleTest ./herbstluftwm.nix {}; installed-tests = pkgs.recurseIntoAttrs (handleTest ./installed-tests {}); @@ -521,6 +524,7 @@ in systemd-confinement = handleTest ./systemd-confinement.nix {}; systemd-cryptenroll = handleTest ./systemd-cryptenroll.nix {}; systemd-escaping = handleTest ./systemd-escaping.nix {}; + systemd-initrd-shutdown = handleTest ./systemd-shutdown.nix { systemdStage1 = true; }; systemd-initrd-simple = handleTest ./systemd-initrd-simple.nix {}; systemd-initrd-swraid = handleTest ./systemd-initrd-swraid.nix {}; systemd-journal = handleTest ./systemd-journal.nix {}; @@ -531,6 +535,7 @@ in systemd-networkd-ipv6-prefix-delegation = handleTest ./systemd-networkd-ipv6-prefix-delegation.nix {}; systemd-networkd-vrf = handleTest ./systemd-networkd-vrf.nix {}; systemd-nspawn = handleTest ./systemd-nspawn.nix {}; + systemd-shutdown = handleTest ./systemd-shutdown.nix {}; systemd-timesyncd = handleTest ./systemd-timesyncd.nix {}; systemd-misc = handleTest ./systemd-misc.nix {}; taskserver = handleTest ./taskserver.nix {}; @@ -591,6 +596,7 @@ in xautolock = handleTest ./xautolock.nix {}; xfce = handleTest ./xfce.nix {}; xmonad = handleTest ./xmonad.nix {}; + xmonad-xdg-autostart = handleTest ./xmonad-xdg-autostart.nix {}; xrdp = handleTest ./xrdp.nix {}; xss-lock = handleTest ./xss-lock.nix {}; xterm = handleTest ./xterm.nix {}; diff --git a/nixos/tests/bcachefs.nix b/nixos/tests/bcachefs.nix index 832cc9c38f0..68ac49d0a6a 100644 --- a/nixos/tests/bcachefs.nix +++ b/nixos/tests/bcachefs.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "bcachefs"; - meta.maintainers = with pkgs.lib.maintainers; [ chiiruno ]; + meta.maintainers = with pkgs.lib.maintainers; [ Madouura ]; nodes.machine = { pkgs, ... }: { virtualisation.emptyDiskImages = [ 4096 ]; diff --git a/nixos/tests/hbase.nix b/nixos/tests/hbase.nix new file mode 100644 index 00000000000..a449d24dd6f --- /dev/null +++ b/nixos/tests/hbase.nix @@ -0,0 +1,30 @@ +import ./make-test-python.nix ({ pkgs, lib, package ? pkgs.hbase, ... }: +{ + name = "hbase"; + + meta = with lib.maintainers; { + maintainers = [ illustris ]; + }; + + nodes = { + hbase = { pkgs, ... }: { + services.hbase = { + enable = true; + inherit package; + # Needed for standalone mode in hbase 2+ + # This setting and standalone mode are not suitable for production + settings."hbase.unsafe.stream.capability.enforce" = "false"; + }; + environment.systemPackages = with pkgs; [ + package + ]; + }; + }; + + testScript = '' + start_all() + hbase.wait_for_unit("hbase.service") + hbase.wait_until_succeeds("echo \"create 't1','f1'\" | sudo -u hbase hbase shell -n") + assert "NAME => 'f1'" in hbase.succeed("echo \"describe 't1'\" | sudo -u hbase hbase shell -n") + ''; +}) diff --git a/nixos/tests/mailcatcher.nix b/nixos/tests/mailcatcher.nix index d7858ab354b..f23b749a021 100644 --- a/nixos/tests/mailcatcher.nix +++ b/nixos/tests/mailcatcher.nix @@ -9,8 +9,13 @@ import ./make-test-python.nix ({ lib, ... }: { services.mailcatcher.enable = true; - services.ssmtp.enable = true; - services.ssmtp.hostName = "localhost:1025"; + programs.msmtp = { + enable = true; + accounts.default = { + host = "localhost"; + port = 1025; + }; + }; environment.systemPackages = [ pkgs.mailutils ]; }; diff --git a/nixos/tests/nbd.nix b/nixos/tests/nbd.nix index 16255e68e8a..b4aaf29ee4e 100644 --- a/nixos/tests/nbd.nix +++ b/nixos/tests/nbd.nix @@ -28,6 +28,11 @@ import ./make-test-python.nix ({ pkgs, ... }: ## It's also a loopback device to test exporting /dev/... systemd.services.create-priv-file = mkCreateSmallFileService { path = "/vault-priv.disk"; loop = true; }; + ## `aaa.disk` is just here because "[aaa]" sorts before + ## "[generic]" lexicographically, and nbd-server breaks if + ## "[generic]" isn't the first section. + systemd.services.create-aaa-file = + mkCreateSmallFileService { path = "/aaa.disk"; }; # Needed only for nbd-client used in the tests. environment.systemPackages = [ pkgs.nbd ]; @@ -39,6 +44,9 @@ import ./make-test-python.nix ({ pkgs, ... }: services.nbd.server = { enable = true; exports = { + aaa = { + path = "/aaa.disk"; + }; vault-pub = { path = "/vault-pub.disk"; }; @@ -83,5 +91,13 @@ import ./make-test-python.nix ({ pkgs, ... }: if foundString != testString: raise Exception(f"Read the wrong string from nbd disk. Expected: '{testString}'. Found: '{foundString}'") server.succeed("nbd-client -d /dev/nbd0") + + # Server: Successfully connect to the aaa disk + server.succeed("nbd-client localhost ${toString listenPort} /dev/nbd0 -name aaa -persist") + server.succeed(f"echo '{testString}' | dd of=/dev/nbd0 conv=notrunc") + foundString = server.succeed(f"dd status=none if=/aaa.disk count={len(testString)}")[:len(testString)] + if foundString != testString: + raise Exception(f"Read the wrong string from nbd disk. Expected: '{testString}'. Found: '{foundString}'") + server.succeed("nbd-client -d /dev/nbd0") ''; }) diff --git a/nixos/tests/systemd-shutdown.nix b/nixos/tests/systemd-shutdown.nix new file mode 100644 index 00000000000..9283489c255 --- /dev/null +++ b/nixos/tests/systemd-shutdown.nix @@ -0,0 +1,21 @@ +import ./make-test-python.nix ({ pkgs, systemdStage1 ? false, ...} : { + name = "systemd-shutdown"; + meta = with pkgs.lib.maintainers; { + maintainers = [ das_j ]; + }; + + nodes.machine = { + imports = [ ../modules/profiles/minimal.nix ]; + boot.initrd.systemd.enable = systemdStage1; + }; + + testScript = '' + machine.wait_for_unit("multi-user.target") + # .shutdown() would wait for the machine to power off + machine.succeed("systemctl poweroff") + # Message printed by systemd-shutdown + machine.wait_for_console_text("All filesystems, swaps, loop devices, MD devices and DM devices detached.") + # Don't try to sync filesystems + machine.booted = False + ''; +}) diff --git a/nixos/tests/xmonad-xdg-autostart.nix b/nixos/tests/xmonad-xdg-autostart.nix new file mode 100644 index 00000000000..2577a9ce2ea --- /dev/null +++ b/nixos/tests/xmonad-xdg-autostart.nix @@ -0,0 +1,35 @@ +import ./make-test-python.nix ({ lib, ... }: { + name = "xmonad-xdg-autostart"; + meta.maintainers = with lib.maintainers; [ oxalica ]; + + nodes.machine = { pkgs, config, ... }: { + imports = [ ./common/x11.nix ./common/user-account.nix ]; + test-support.displayManager.auto.user = "alice"; + services.xserver.displayManager.defaultSession = "none+xmonad"; + services.xserver.windowManager.xmonad.enable = true; + services.xserver.desktopManager.runXdgAutostartIfNone = true; + + environment.systemPackages = [ + (pkgs.writeTextFile { + name = "test-xdg-autostart"; + destination = "/etc/xdg/autostart/test-xdg-autostart.desktop"; + text = '' + [Desktop Entry] + Name=test-xdg-autoatart + Type=Application + Terminal=false + Exec=${pkgs.coreutils}/bin/touch ${config.users.users.alice.home}/xdg-autostart-executed + ''; + }) + ]; + }; + + testScript = { nodes, ... }: + let + user = nodes.machine.config.users.users.alice; + in + '' + machine.wait_for_x() + machine.wait_for_file("${user.home}/xdg-autostart-executed") + ''; +}) diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/pkgs/applications/audio/helio-workstation/default.nix index b36d977b2bd..9801f2d2b2a 100644 --- a/pkgs/applications/audio/helio-workstation/default.nix +++ b/pkgs/applications/audio/helio-workstation/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "helio-workstation"; - version = "3.8"; + version = "3.9"; src = fetchFromGitHub { owner = "helio-fm"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-uwRSOJ5WvDH4mfL9pCTCGzuSRT8SIBrI+Wsbumzejv0="; + sha256 = "sha256-AtgKgw+F5lc0Ma3zOxmk3iaZQp2KZb2FP5F8QvvYTT4="; }; buildInputs = [ diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix index 860eca652e7..e415798b460 100644 --- a/pkgs/applications/audio/qpwgraph/default.nix +++ b/pkgs/applications/audio/qpwgraph/default.nix @@ -5,14 +5,14 @@ mkDerivation rec { pname = "qpwgraph"; - version = "0.2.2"; + version = "0.2.5"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${version}"; - sha256 = "sha256-BBvF1L3IqkYqSghHxcbwOBizdu6GtxaWof3Q/bc+aTY="; + sha256 = "sha256-OYIBlTO1vXmmY4/ZacvsEQ5EnOfetBvnG2v5xL44czY="; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -29,6 +29,6 @@ mkDerivation rec { homepage = "https://gitlab.freedesktop.org/rncbc/qpwgraph"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ kanashimia ]; + maintainers = with maintainers; [ kanashimia exi ]; }; } diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index a7345b1decf..637f5b543cb 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -8,7 +8,7 @@ }: { stdenv, lib, fetchurl, fetchpatch, ncurses, xlibsWrapper, libXaw, libXpm , Xaw3d, libXcursor, pkg-config, gettext, libXft, dbus, libpng, libjpeg, giflib -, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux +, libtiff, librsvg, libwebp, gconf, libxml2, imagemagick, gnutls, libselinux , alsa-lib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf , sigtool, jansson, harfbuzz, sqlite, nixosTests , dontRecurseIntoAttrs, emacsPackagesFor @@ -22,6 +22,7 @@ , withMotif ? false, motif ? null , withSQLite3 ? false , withCsrc ? true +, withWebP ? false , srcRepo ? false, autoreconfHook ? null, texinfo ? null , siteStart ? ./site-start.el , nativeComp ? false @@ -134,6 +135,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { ++ lib.optionals (withX && withGTK3) [ gtk3-x11 gsettings-desktop-schemas ] ++ lib.optional (withX && withMotif) motif ++ lib.optional withSQLite3 sqlite + ++ lib.optional withWebP libwebp ++ lib.optionals (withX && withXwidgets) [ webkitgtk glib-networking ] ++ lib.optionals withNS [ AppKit GSS ImageIO ] ++ lib.optionals stdenv.isDarwin [ sigtool ] diff --git a/pkgs/applications/editors/pinegrow/default.nix b/pkgs/applications/editors/pinegrow/default.nix index 65604926b8f..a91c5f64c09 100644 --- a/pkgs/applications/editors/pinegrow/default.nix +++ b/pkgs/applications/editors/pinegrow/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { version = "6.5"; src = fetchurl { - url = "https://download.pinegrow.com/PinegrowLinux64.${version}.zip"; + url = "https://github.com/Pinegrow/PinegrowReleases/releases/download/pg${version}/PinegrowLinux64.${version}.zip"; sha256 = "1l7cf5jgidpykaf68mzf92kywl1vxwl3fg43ibgr2rg4cnl1g82b"; }; diff --git a/pkgs/applications/emulators/ares/default.nix b/pkgs/applications/emulators/bsnes/ares/default.nix index 33a7858455d..33a7858455d 100644 --- a/pkgs/applications/emulators/ares/default.nix +++ b/pkgs/applications/emulators/bsnes/ares/default.nix diff --git a/pkgs/applications/emulators/ares/fix-ruby.patch b/pkgs/applications/emulators/bsnes/ares/fix-ruby.patch index 01bd57ebaad..01bd57ebaad 100644 --- a/pkgs/applications/emulators/ares/fix-ruby.patch +++ b/pkgs/applications/emulators/bsnes/ares/fix-ruby.patch diff --git a/pkgs/applications/emulators/bsnes-hd/default.nix b/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix index 6494185958c..6494185958c 100644 --- a/pkgs/applications/emulators/bsnes-hd/default.nix +++ b/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix diff --git a/pkgs/applications/emulators/bsnes-hd/macos-copy-app-to-prefix.patch b/pkgs/applications/emulators/bsnes/bsnes-hd/macos-copy-app-to-prefix.patch index d38efbc99bc..d38efbc99bc 100644 --- a/pkgs/applications/emulators/bsnes-hd/macos-copy-app-to-prefix.patch +++ b/pkgs/applications/emulators/bsnes/bsnes-hd/macos-copy-app-to-prefix.patch diff --git a/pkgs/applications/emulators/bsnes-hd/macos-replace-sips-with-png2icns.patch b/pkgs/applications/emulators/bsnes/bsnes-hd/macos-replace-sips-with-png2icns.patch index 85adb33e3ab..85adb33e3ab 100644 --- a/pkgs/applications/emulators/bsnes-hd/macos-replace-sips-with-png2icns.patch +++ b/pkgs/applications/emulators/bsnes/bsnes-hd/macos-replace-sips-with-png2icns.patch diff --git a/pkgs/applications/emulators/higan/001-include-cmath.patch b/pkgs/applications/emulators/bsnes/higan/001-include-cmath.patch index 67644e656aa..67644e656aa 100644 --- a/pkgs/applications/emulators/higan/001-include-cmath.patch +++ b/pkgs/applications/emulators/bsnes/higan/001-include-cmath.patch diff --git a/pkgs/applications/emulators/higan/002-sips-to-png2icns.patch b/pkgs/applications/emulators/bsnes/higan/002-sips-to-png2icns.patch index 0585c8a38c7..0585c8a38c7 100644 --- a/pkgs/applications/emulators/higan/002-sips-to-png2icns.patch +++ b/pkgs/applications/emulators/bsnes/higan/002-sips-to-png2icns.patch diff --git a/pkgs/applications/emulators/higan/default.nix b/pkgs/applications/emulators/bsnes/higan/default.nix index c5f38a040c1..c5f38a040c1 100644 --- a/pkgs/applications/emulators/higan/default.nix +++ b/pkgs/applications/emulators/bsnes/higan/default.nix diff --git a/pkgs/applications/finance/irpf/default.nix b/pkgs/applications/finance/irpf/default.nix index e7ac78da18e..a5f90026af7 100644 --- a/pkgs/applications/finance/irpf/default.nix +++ b/pkgs/applications/finance/irpf/default.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation rec { pname = "irpf"; - version = "2022-1.0"; + version = "2022-1.3"; src = let year = lib.head (lib.splitVersion version); in fetchzip { url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${version}.zip"; - sha256 = "0h8f51ilvg7m6hlx0y5mpxhac90p32ksbrffw0hxdqbilgjz1s68"; + sha256 = "sha256-nAmcVPSnMIWuq2zj1xq/657RmzaSmdtxlI9cp9v5P0A="; }; nativeBuildInputs = [ unzip makeWrapper copyDesktopItems ]; @@ -57,7 +57,12 @@ stdenvNoCC.mkDerivation rec { ''; meta = with lib; { - description = "Programa Oficial da Receita para elaboração do IRPF"; + description = "Brazillian government application for reporting income tax"; + longDescription = '' + Brazillian government application for reporting income tax. + + IRFP - Imposto de Renda Pessoa Física - Receita Federal do Brasil. + ''; homepage = "https://www.gov.br/receitafederal/pt-br"; license = licenses.unfree; platforms = platforms.all; diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 8e74f2a9278..ef9bc61d57c 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "480"; + version = "481"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; - rev = "v${version}"; - sha256 = "sha256-TZQY9wFXJFJtMAw2N+mlfVymewL96rn0Lza9jnDOGNA="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-6I4vLJj5WzC2bCtQYnoLGOL6N6pKFU+PZQqaOqhZhWU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/openboard/default.nix b/pkgs/applications/graphics/openboard/default.nix index 084787d6315..0725acd2379 100644 --- a/pkgs/applications/graphics/openboard/default.nix +++ b/pkgs/applications/graphics/openboard/default.nix @@ -33,11 +33,10 @@ in mkDerivation rec { }; patches = [ - # Poppler requires at least C++17 + # Fix build with poppler >= 22.01 (fetchpatch { - name = "use-c-17-for-pdf-on-linux-builds"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/use-c-17-for-pdf-on-linux-builds.patch?h=openboard"; - sha256 = "sha256-M6HigpOo8ul7qaub4cd7/ATUc85HezEyKyDuzsrZvC8="; + url = "https://github.com/OpenBoard-org/OpenBoard/commit/3a9b043e0fafec08e4123f362dcb7750f7476b59.patch"; + sha256 = "sha256-yD163FK79HBU1W7m6sLxhfsRo4r/38zYTFWgeyqwU1o="; }) ]; diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 413e1671821..2379962bb55 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -59,6 +59,10 @@ mkDerivation rec { enableParallelBuilding = true; + preBuild = '' + make objects/parser.cxx + ''; + postInstall = lib.optionalString stdenv.isDarwin '' mkdir $out/Applications mv $out/bin/*.app $out/Applications diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index 8898e0fd1d9..f4e1e50347a 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -20,8 +20,8 @@ let in python3Packages.buildPythonApplication rec { pname = "bottles"; - version = "2022.4.14-trento"; - sha256 = "0kjc1w8x4d6g2lx8x8isa2vnwacyjlh9lldf14wn4b118hsw85zs"; + version = "2022.4.14-trento-1"; + sha256 = "16cb01fhxa64f8fadwpr0mawfmchig6xlbx20mz4q9yh5fnagywj"; # Note: Update via pkgs/applications/misc/bottles/update.py # mostly copypasted from pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index cc6d4e33fb2..9a7ed898e51 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,20 +3,20 @@ }: let pname = "josm"; - version = "18387"; + version = "18427"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "sha256-zkEWZjjSy0ajG5X1/dIgLPZ7zr0BiaJJcHaN8sv/3yc="; + sha256 = "sha256-SsoeKfpWi41sd77LfaQW0OcHnyf8iLolKWF74dhalpY="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip"; - sha256 = "sha256-xOVnnQ+eUkboT8Tq5F4QJEou1wAaHwiEdyiEKDR/fUk="; + sha256 = "sha256-cz3OT03StvJy9XYBiPxx+nz36O0cg+XrL/uc52/G/1c="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; rev = version; - sha256 = "sha256-GbIWZTJmmUT8r9L63/6mcnRt7dvavqGAVbozxlbF89g="; + sha256 = "sha256-AyfUFE0y8d8FtgfhxSscQGE1IVNwYYNymH6jTnrUBTs="; }; }; in diff --git a/pkgs/applications/misc/keylight-controller-mschneider82/default.nix b/pkgs/applications/misc/keylight-controller-mschneider82/default.nix new file mode 100644 index 00000000000..e019e9f1b98 --- /dev/null +++ b/pkgs/applications/misc/keylight-controller-mschneider82/default.nix @@ -0,0 +1,53 @@ +{ buildGoModule, fetchFromGitHub, lib, libGL, nssmdns, pkg-config, xorg }: + +buildGoModule rec { + pname = "keylight-controller-mschneider82"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "mschneider82"; + repo = "keylight-control"; + rev = "v${version}"; + sha256 = "sha256-UZfbGihCgFBQE1oExuzCexoNgpVGwNoA9orjZ9fh4gA="; + }; + + vendorSha256 = "sha256-nFttVJbEAAGsrAglMphuw0wJ2Kf8sWB4HrpVqfHO76o="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libGL + nssmdns + ] ++ (with xorg; [ + libX11 + libX11.dev + libXcursor + libXext + libXi + libXinerama + libXrandr + libXxf86vm + xinput + ]); + + meta = with lib; { + description = "A desktop application to control Elgato Keylights"; + longDescription = '' + Requires having: + * Elgato's Keylight paired to local wifi network. + * Service avahi with nssmdns enabled. + ''; + license = licenses.mit; + homepage = "https://github.com/mschneider82/keylight-control"; + maintainers = with maintainers; [ superherointj ]; + }; +} + +# Note: Application errors on first executions but works on re-runs. + +# Troubleshooting +# 1. Keylight lists at: `avahi-browse --all --resolve --ignore-local` +# 2. Ping Keylight's IP +# 3. Resolve Keylight's hostname: `getent hosts elgato-key-light-XXXX.local` diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index 0446c694fe0..c8490f0d80a 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -148,7 +148,7 @@ buildPythonApplication rec { homepage = "https://lutris.net"; description = "Open Source gaming platform for GNU/Linux"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ chiiruno ]; + maintainers = with maintainers; [ Madouura ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/pdfstudio/default.nix b/pkgs/applications/misc/pdfstudio/default.nix index c91f6f64cf7..e27519da2cd 100644 --- a/pkgs/applications/misc/pdfstudio/default.nix +++ b/pkgs/applications/misc/pdfstudio/default.nix @@ -12,7 +12,7 @@ in pdfstudio = callPackage ./common.nix rec { pname = program; year = "2021"; - version = "${year}.1.2"; + version = "${year}.1.3"; desktopName = "PDF Studio"; longDescription = '' PDF Studio is an easy to use, full-featured PDF editing software. This is the standard/pro edition, which requires a license. For the free PDF Studio Viewer see the package pdfstudioviewer. @@ -22,21 +22,21 @@ in ]; src = fetchurl { url = makeurl { inherit pname year version; }; - sha256 = "1188ll2qz58rr2slavqxisbz4q3fdzidpasb1p33926z0ym3rk45"; + sha256 = "sha256-2az8/slWeLY7l7dCwyTaT18KFfvsO71vJFDZEvbDHGM="; }; }; pdfstudioviewer = callPackage ./common.nix rec { pname = program; year = "2021"; - version = "${year}.1.2"; + version = "${year}.1.3"; desktopName = "PDF Studio Viewer"; longDescription = '' PDF Studio Viewer is an easy to use, full-featured PDF editing software. This is the free edition. For the standard/pro edition, see the package pdfstudio. ''; src = fetchurl { url = makeurl { inherit pname year version; }; - sha256 = "128k3fm8m8zdykx4s30g5m2zl7cgmvs4qinf1w525zh84v56agz6"; + sha256 = "sha256-kd+rQruBL0fudmc30agRO/XV97l/6unqU0GK25yhOzI="; }; }; }.${program} diff --git a/pkgs/applications/misc/ydict/default.nix b/pkgs/applications/misc/ydict/default.nix new file mode 100644 index 00000000000..49370870f69 --- /dev/null +++ b/pkgs/applications/misc/ydict/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "ydict"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "TimothyYe"; + repo = "ydict"; + rev = "v${version}"; + sha256 = "sha256-zhjsXZsRk0UNijjqjGjZh4TiPxAM5p+ic3JMx2wrPeY="; + }; + + vendorSha256 = "sha256-O6czDfKD18rGVMIZv6II09oQu1w0ijQRuZRGt2gj9Cs="; + + ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "A command-line Chinese dictionary"; + homepage = "https://github.com/TimothyYe/ydict"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/networking/browsers/qtchan/default.nix b/pkgs/applications/networking/browsers/qtchan/default.nix index 9786fad2fdc..8ad81139fbe 100644 --- a/pkgs/applications/networking/browsers/qtchan/default.nix +++ b/pkgs/applications/networking/browsers/qtchan/default.nix @@ -24,7 +24,7 @@ mkDerivation rec { description = "4chan browser in qt5"; homepage = "https://github.com/siavash119/qtchan"; license = licenses.mit; - maintainers = with maintainers; [ chiiruno ]; + maintainers = with maintainers; [ Madouura ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index adb46540cba..202b9fd5e68 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -17,6 +17,8 @@ , openssl , glibc , nixosTests +, sparkSupport ? true +, spark }: with lib; @@ -52,6 +54,9 @@ let --prefix PATH : "${makeBinPath [ bash coreutils which]}"\ --prefix JAVA_LIBRARY_PATH : "${makeLibraryPath buildInputs}" done + '' + optionalString sparkSupport '' + # Add the spark shuffle service jar to YARN + cp ${spark.src}/yarn/spark-${spark.version}-yarn-shuffle.jar $out/lib/${untarDir}/share/hadoop/yarn/ '' + libPatches; passthru = { inherit tests; }; diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 057be75aeb3..a3ca42dff34 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -6,6 +6,7 @@ , python3Packages , extraPythonPackages ? [ ] , coreutils +, hadoopSupport ? true , hadoop , RSupport ? true , R @@ -17,12 +18,13 @@ let spark = { pname, version, sha256, extraMeta ? {} }: stdenv.mkDerivation rec { inherit pname version; + jdk = if hadoopSupport then hadoop.jdk else jdk8; src = fetchzip { url = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz"; sha256 = sha256; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jdk8 python3Packages.python ] + buildInputs = [ jdk python3Packages.python ] ++ extraPythonPackages ++ optional RSupport R; @@ -34,9 +36,11 @@ let cp $out/lib/${untarDir}/conf/log4j.properties{.template,} cat > $out/lib/${untarDir}/conf/spark-env.sh <<- EOF - export JAVA_HOME="${jdk8}" + export JAVA_HOME="${jdk}" export SPARK_HOME="$out/lib/${untarDir}" + '' + optionalString hadoopSupport '' export SPARK_DIST_CLASSPATH=$(${hadoop}/bin/hadoop classpath) + '' + '' export PYSPARK_PYTHON="${python3Packages.python}/bin/${python3Packages.python.executable}" export PYTHONPATH="\$PYTHONPATH:$PYTHONPATH" ${optionalString RSupport '' diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 15c7c7ce38e..cd3af80f1e5 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -40,10 +40,10 @@ "owner": "aliyun", "provider-source-address": "registry.terraform.io/aliyun/alicloud", "repo": "terraform-provider-alicloud", - "rev": "v1.163.0", - "sha256": "sha256-lSg8jAzQfRc++U6zAhkfbVf/+hIW/1Nov35o6M8mRrw=", - "vendorSha256": "sha256-8dAk23ISxYuYKj5s0W6g93RBW1++NuZEPva5MaNBSyw=", - "version": "1.163.0" + "rev": "v1.164.0", + "sha256": "sha256-UZ+/l8eBpzo0KBW6x8koLzBt0QniHjP73zdjKIw8ByI=", + "vendorSha256": "sha256-xxq+VOG6FkX1perAcXOiFtL/bjsHl9IWIJb5dfaIkpY=", + "version": "1.164.0" }, "ansible": { "owner": "nbering", @@ -94,10 +94,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v4.9.0", - "sha256": "sha256-VLw2bqL6VEKwqzXYkNJGJtIi8gg+3/oCwbBf9UtATE4=", - "vendorSha256": "sha256-7pwwQHgtHO3GfcEAOHALo01i1pt9WsriZZkJjFzjwRE=", - "version": "4.9.0" + "rev": "v4.10.0", + "sha256": "sha256-FhW7+Ot1cVxTdDFuwP+Xq9LCfogRTJ7wlTU5TR98UPA=", + "vendorSha256": "sha256-91SSNiWHFcNWg6Ssr8XA+uiOoAbuBpivDPmkzWlFvPk=", + "version": "4.10.0" }, "azuread": { "owner": "hashicorp", @@ -112,10 +112,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v3.1.0", - "sha256": "sha256-idrGxmfhnMKvxtKJtjLs321D008Mcv27cHyhAjwCZfA=", + "rev": "v3.2.0", + "sha256": "sha256-GKI6d2zSaaEaKnt6MLqzEbLjLYdrIOa+aeIlFPa5hM4=", "vendorSha256": null, - "version": "3.1.0" + "version": "3.2.0" }, "azurestack": { "owner": "hashicorp", @@ -139,19 +139,19 @@ "owner": "F5Networks", "provider-source-address": "registry.terraform.io/F5Networks/bigip", "repo": "terraform-provider-bigip", - "rev": "v1.13.0", - "sha256": "0l1fgbzv3zjsgmnkg96ac299plx9zi4j54cjxrl27csvf87wi4lv", + "rev": "v1.13.1", + "sha256": "sha256-nNcOHTFJrvvjKAZUsb1IVTp71/Xk5OuSzihPyi08anw=", "vendorSha256": null, - "version": "1.13.0" + "version": "1.13.1" }, "bitbucket": { "owner": "DrFaust92", "provider-source-address": "registry.terraform.io/DrFaust92/bitbucket", "repo": "terraform-provider-bitbucket", - "rev": "v2.14.0", - "sha256": "sha256-tF1Q55mxwPU6dziiNzdacNtHvemd9ciQHE2E6een1WY=", + "rev": "v2.15.0", + "sha256": "sha256-m9LNW73CZHfOHX7qIn5Xm5JbMoV6ADGpxL9HNn8E+kA=", "vendorSha256": "sha256-L8QYz1xgw8ZQjrU33uP18XxNUjImPYATZ02h46G4aXs=", - "version": "2.14.0" + "version": "2.15.0" }, "brightbox": { "owner": "brightbox", @@ -194,10 +194,10 @@ "owner": "cloudflare", "provider-source-address": "registry.terraform.io/cloudflare/cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v3.12.1", - "sha256": "sha256-8l6+hyjW+N3N5OGj/cviH97EFqouSrnJULk/SXrYCTk=", + "rev": "v3.12.2", + "sha256": "sha256-vshZlMLfyRxbzsk6H34PZb5+RowpEJEvWhNVYzrySeg=", "vendorSha256": "sha256-v6fUzYwrYt4rk5LT0LyNd8e9X79r3dwtd3s1QIV/w/s=", - "version": "3.12.1" + "version": "3.12.2" }, "cloudfoundry": { "owner": "cloudfoundry-community", @@ -227,22 +227,23 @@ "version": "3.2.0" }, "constellix": { + "deleteVendor": true, "owner": "Constellix", "provider-source-address": "registry.terraform.io/Constellix/constellix", "repo": "terraform-provider-constellix", - "rev": "v0.4.3", - "sha256": "sha256-U5jQVa4dJTqH06psx/vNLSlL8muV15SgkyoM820PwjI=", - "vendorSha256": null, - "version": "0.4.3" + "rev": "v0.4.5", + "sha256": "sha256-ecwXWYrs7XJM1web+kia2ccpvTjxAVFPzav6lLal4e4=", + "vendorSha256": "sha256-UJHDX/vx3n/RTuQ50Y6TAhpEEFk9yBoaz8yK02E8Fhw=", + "version": "0.4.5" }, "consul": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/consul", "repo": "terraform-provider-consul", - "rev": "v2.15.0", - "sha256": "sha256-6NQL1ZlHZsxfoRV0zMOXApuCR+nj8CPWjpxj7BAJivY=", + "rev": "v2.15.1", + "sha256": "sha256-QX0f9yM408HfdGNIpmkAKFUz0RfH90V4WBt1Hnwzoy8=", "vendorSha256": null, - "version": "2.15.0" + "version": "2.15.1" }, "ct": { "owner": "poseidon", @@ -302,10 +303,10 @@ "owner": "dnsimple", "provider-source-address": "registry.terraform.io/dnsimple/dnsimple", "repo": "terraform-provider-dnsimple", - "rev": "v0.11.1", - "sha256": "0jzw1kjykbka59kx30xm3qicjb6fdmm5l4f2dr8g7nxdaqnxri0s", - "vendorSha256": "06wggchs5khzyg6fd9s0qj76awnw28s7l278awanqimqgqajijkj", - "version": "0.11.1" + "rev": "v0.11.3", + "sha256": "sha256-fUs54xIecPgeQucuQmlpF2iHGonx4OsqFbhkMnO7d0c=", + "vendorSha256": "sha256-csooFX64RmwVV+gIejQS3HJljsRAp+bM8x/OoiF7jxs=", + "version": "0.11.3" }, "docker": { "owner": "kreuzwerker", @@ -383,10 +384,10 @@ "owner": "go-gandi", "provider-source-address": "registry.terraform.io/go-gandi/gandi", "repo": "terraform-provider-gandi", - "rev": "v2.0.0", - "sha256": "0xvdnjadcddrrfhhp198mraf2bm01xfy7gapjay441dbzffynw1m", - "vendorSha256": "1yccjnz6xw3b51xqmiaw78m87y2xmlp9z5z3gx5dbzz0lkj1k523", - "version": "2.0.0" + "rev": "v2.0.1", + "sha256": "sha256-lcJoDBVoNvNbB5V1rSk09d7pnfVN+FHROtyZCNmZfBk=", + "vendorSha256": "sha256-sloRWqk8j8UWM7gVFaiJ3SmBgnWN/BbFfATQWzpXI7k=", + "version": "2.0.1" }, "github": { "owner": "integrations", @@ -411,20 +412,20 @@ "provider-source-address": "registry.terraform.io/hashicorp/google", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.16.0", - "sha256": "sha256-kp6AldlkjiNd3R3hz+wB2uBQ37TyZ0hoEhxQYiFmO7g=", + "rev": "v4.17.0", + "sha256": "sha256-7yGZpCErpriLrqHpCnXmkJkrGMQPkD70NmzuZ0ghF7o=", "vendorSha256": "sha256-l2OviwplP/Sg2ShaEA88pMwVTkREnLkFAzterjr2kvU=", - "version": "4.16.0" + "version": "4.17.0" }, "google-beta": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google-beta", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.16.0", - "sha256": "sha256-m5K2q83WbWVfjG7vhlh71k14GEXNs+2JfK/S1GnC5c0=", + "rev": "v4.17.0", + "sha256": "sha256-JaZZRjQR9+aH9KTJrazLXlbQ1drIOfE8sOVYi29F1fs=", "vendorSha256": "sha256-l2OviwplP/Sg2ShaEA88pMwVTkREnLkFAzterjr2kvU=", - "version": "4.16.0" + "version": "4.17.0" }, "grafana": { "owner": "grafana", @@ -457,10 +458,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/helm", "repo": "terraform-provider-helm", - "rev": "v2.5.0", - "sha256": "sha256-stJO23B/DNOvAU71S/N3iML1PVQrpmbhoh7e31MI+BY=", + "rev": "v2.5.1", + "sha256": "sha256-PX8mls0m/7B5WULEDVHutzvjAr0a54vg734mBbRQZNA=", "vendorSha256": null, - "version": "2.5.0" + "version": "2.5.1" }, "heroku": { "owner": "heroku", @@ -493,10 +494,10 @@ "owner": "huaweicloud", "provider-source-address": "registry.terraform.io/huaweicloud/huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.35.0", - "sha256": "sha256-OQGrxnXeYSGLnfD8NuWncag1sSGlSZCipe0CykzzupU=", + "rev": "v1.35.1", + "sha256": "sha256-EC2o+olQaGCAX/0JGlXNMF8QE1k6BjC/4SttbGOxFFw=", "vendorSha256": null, - "version": "1.35.0" + "version": "1.35.1" }, "huaweicloudstack": { "owner": "huaweicloud", @@ -601,10 +602,10 @@ "owner": "launchdarkly", "provider-source-address": "registry.terraform.io/launchdarkly/launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.6.0", - "sha256": "sha256-Mf7oV5G5XjnE+3m8EDczDvrtn2s4nrNCTdAJz1n9v2Y=", + "rev": "v2.6.1", + "sha256": "sha256-pdANr7W4d6+8WdAxcqSTpyEIshd6FVYy0+25wfDt4d8=", "vendorSha256": "sha256-HKea86ck97uc/Gv6geJm9TTRfG6bnpB+q8cuU/jubI8=", - "version": "2.6.0" + "version": "2.6.1" }, "libvirt": { "owner": "dmacvicar", @@ -682,10 +683,10 @@ "owner": "equinix", "provider-source-address": "registry.terraform.io/equinix/metal", "repo": "terraform-provider-metal", - "rev": "v3.3.0-alpha.2", - "sha256": "sha256-RUD4BJy0/s23+OWlQfFEh59BEhhtobW7zDOOcosC0l4=", + "rev": "v3.3.0-alpha.3", + "sha256": "sha256-wuZp0Be8a84y7JqpCGnBDPXgNG8JJcNWsIICP3ZjSVk=", "vendorSha256": "sha256-Ln9EyycPduVuj+JefH9f+Q5KlNGvbcwcEDgaqH2M0So=", - "version": "3.3.0-alpha.2" + "version": "3.3.0-alpha.3" }, "minio": { "owner": "aminueza", @@ -736,10 +737,10 @@ "owner": "newrelic", "provider-source-address": "registry.terraform.io/newrelic/newrelic", "repo": "terraform-provider-newrelic", - "rev": "v2.42.0", - "sha256": "sha256-OD0wahsEw86E7TbUxIqEhoZ85An9yRwgTENtdoYnFB0=", + "rev": "v2.42.1", + "sha256": "sha256-3lrO3BOP3X6Pr9wPnWsuQenesRTEDHzlkenIia6YiS8=", "vendorSha256": "sha256-G/GWIE+XeLiHW0xxyjbIpncAnpBmC/+iZnI8MFmi80k=", - "version": "2.42.0" + "version": "2.42.1" }, "nomad": { "owner": "hashicorp", @@ -754,10 +755,10 @@ "owner": "ns1-terraform", "provider-source-address": "registry.terraform.io/ns1-terraform/ns1", "repo": "terraform-provider-ns1", - "rev": "v1.12.5", - "sha256": "0g69jr96ns2h578cmh5zz27m5dkgygrfr6shvx79wal26fpr8413", - "vendorSha256": "0s70626ng7pvqxnx0a4rp22b8spy45y011bvvm77fndm8fc1w9zn", - "version": "1.12.5" + "rev": "v1.12.6", + "sha256": "sha256-nP951YipGzsweJvV2PE0UlWGP+cAM6s18F5MCcxTxeo=", + "vendorSha256": "sha256-MaJHCxvD9BM5G8wJbSo06+TIPvJTlXzQ+l9Kdbg0QQw=", + "version": "1.12.6" }, "nsxt": { "owner": "vmware", @@ -782,19 +783,19 @@ "owner": "nutanix", "provider-source-address": "registry.terraform.io/nutanix/nutanix", "repo": "terraform-provider-nutanix", - "rev": "v1.5.0-beta", - "sha256": "sha256-Luu0myRCzlVpKouFnE7MXESzkxCXxNe2ZfxFUCpGpiU=", + "rev": "v1.5.0-beta.2", + "sha256": "sha256-eC42HXh8Tk3TXWtdeVbv4UGMss3lh4vYyGPypB353X0=", "vendorSha256": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=", - "version": "1.5.0-beta" + "version": "1.5.0-beta.2" }, "oci": { "owner": "oracle", "provider-source-address": "registry.terraform.io/oracle/oci", "repo": "terraform-provider-oci", - "rev": "v4.70.0", - "sha256": "sha256-KgpYl1DllCkpXbxYp8cqKE28l4digmaB75BoL6CpkQA=", + "rev": "v4.71.0", + "sha256": "sha256-8v9zfYlWqeKQlk1hNL7iif/AfEjI5lC0clUwgpA132U=", "vendorSha256": null, - "version": "4.70.0" + "version": "4.71.0" }, "okta": { "owner": "okta", @@ -845,10 +846,10 @@ "owner": "opentelekomcloud", "provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.29.0", - "sha256": "sha256-jhG2TyinnlPPIVA2K+ckOcxlqxeUFkp+WFJcJqYQ13k=", - "vendorSha256": "sha256-qNJ1jkbGgFUxvHYUMPX9kBAwQSx4vfOr7eS0Z6J7X8Q=", - "version": "1.29.0" + "rev": "v1.29.1", + "sha256": "sha256-c7kRS3c+n/5oN3PDKsJzkiK8ravRjBTJHhhqLHy9nhQ=", + "vendorSha256": "sha256-kSZvxbovF2/oCqFY/0zpGmAhLFuCw6nWG3B4ppyxzLY=", + "version": "1.29.1" }, "opsgenie": { "owner": "opsgenie", @@ -962,10 +963,10 @@ "owner": "scaleway", "provider-source-address": "registry.terraform.io/scaleway/scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.2.1-rc.2", - "sha256": "sha256-7T+J4T0qm7QMGWWjIT0nKHkHzd6wfFNP3suF7GitErc=", - "vendorSha256": "sha256-kfr8YqLr8CXntkiMEHA5kosZqkloV4rGjEmdXosT7WU=", - "version": "2.2.1-rc.2" + "rev": "v2.2.1-rc.3", + "sha256": "sha256-XprfY4Zy3PIrIJA2F1tnwafg4wYuzrm9nwVZULdX1D0=", + "vendorSha256": "sha256-H5KAo2rpgFGYmOgGOx9Z5LuApmftuYA6PfYCjnr7zC0=", + "version": "2.2.1-rc.3" }, "secret": { "owner": "numtide", @@ -980,10 +981,10 @@ "owner": "selectel", "provider-source-address": "registry.terraform.io/selectel/selectel", "repo": "terraform-provider-selectel", - "rev": "v3.8.0", - "sha256": "0qc08v217cv2i43cxcx854rvhihrlhlakfark37vcdrh9z6swf1n", - "vendorSha256": "1mjp5yqwl1nya82yf5v6l3sq7iv0m94xy5w7y5avn8h40dl1wfnf", - "version": "3.8.0" + "rev": "v3.8.1", + "sha256": "sha256-542fWLMJ9nO3Pu/QpUFZtu2eQoQOaAjaaK3aqtyoJPQ=", + "vendorSha256": "sha256-kmsO9jFoR/93PkOeIo0pkS/OjE+m3QbIspobAv/9+KI=", + "version": "3.8.1" }, "sentry": { "owner": "jianyuan", @@ -1007,10 +1008,10 @@ "owner": "splunk-terraform", "provider-source-address": "registry.terraform.io/splunk-terraform/signalfx", "repo": "terraform-provider-signalfx", - "rev": "v6.11.1", - "sha256": "sha256-37D4nblpGK8duohDiyY4UR0jn+T6QX7LnCfGtPdYQ3k=", - "vendorSha256": "sha256-PVbqS37MBkIrr8CO6LxB0NjWWiTI5NFDipX6GvokrnY=", - "version": "6.11.1" + "rev": "v6.12.0", + "sha256": "sha256-mTPiJc2AbtSAHM5J9Wr9fb/M/GDFMCIHod0DAT9DDvI=", + "vendorSha256": "sha256-hI0yz796+xxAFQg+O/2g5ueNx/wrx/40DlQyxtx11aQ=", + "version": "6.12.0" }, "skytap": { "owner": "skytap", @@ -1025,10 +1026,10 @@ "owner": "chanzuckerberg", "provider-source-address": "registry.terraform.io/chanzuckerberg/snowflake", "repo": "terraform-provider-snowflake", - "rev": "v0.30.0", - "sha256": "sha256-JHpwqMyt/oMZv6P4xEOlyV0pL32HQselDg+dP9JGRpg=", - "vendorSha256": "sha256-G/UIKuKtolLY7RIQF06wzn/ZYTMihEmJZ1DqVcHFGdg=", - "version": "0.30.0" + "rev": "v0.31.0", + "sha256": "sha256-KYgvtdGkzju1qpECVX5vtY7U8JNa8anSmaTq8PwJEl8=", + "vendorSha256": "sha256-l++IzY3/W4qsdFJY7ik0xF6tZWluLb4EcW5KQtBVY5s=", + "version": "0.31.0" }, "sops": { "owner": "carlpett", @@ -1043,10 +1044,10 @@ "owner": "spotinst", "provider-source-address": "registry.terraform.io/spotinst/spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.71.0", - "sha256": "sha256-Fcx0KHTAAOQE/Qa+84p5l5ve5nrWXZHgRyc3xNYBJoQ=", + "rev": "v1.72.0", + "sha256": "sha256-h70Tcp+VODMgUDBBcR4Vhqvln76rhwgnfKjIK2+hphw=", "vendorSha256": "sha256-pI9jX/Wp6Nu1ix82ZE2CBZYu0j4S+HH2+dD5G679VrE=", - "version": "1.71.0" + "version": "1.72.0" }, "stackpath": { "owner": "stackpath", @@ -1088,10 +1089,10 @@ "owner": "tencentcloudstack", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.67.0", - "sha256": "sha256-61Fhh/BW1Iv/7wMU0lDMxPdB86Wqf43F90ZoWM990K0=", + "rev": "v1.69.0", + "sha256": "sha256-GArlBMlQdEjITqvAAcnhurJtYjs03U8pAzcdbuXzbss=", "vendorSha256": null, - "version": "1.67.0" + "version": "1.69.0" }, "tfe": { "owner": "hashicorp", @@ -1161,10 +1162,10 @@ "owner": "cloudposse", "provider-source-address": "registry.terraform.io/cloudposse/utils", "repo": "terraform-provider-utils", - "rev": "0.17.19", - "sha256": "sha256-FTZyri4/6QWkLKKectzx3av8fnoDkOIyAkAPasFU8sU=", - "vendorSha256": "sha256-FA2Hev7RS3ZJ/cDTgyZ7uMFlQB/VdJ19GZUpkWTEPV8=", - "version": "0.17.19" + "rev": "0.17.20", + "sha256": "sha256-+pk2cUmYzQsa40iMvbdkYmZtoXOb5ALU/p0EEZx2AIw=", + "vendorSha256": "sha256-cb8Hqe3lGfjNpGmhrJ64x6w/iFW22Ma4AJo2w29kjR0=", + "version": "0.17.20" }, "vault": { "owner": "hashicorp", @@ -1179,19 +1180,19 @@ "owner": "vmware", "provider-source-address": "registry.terraform.io/vmware/vcd", "repo": "terraform-provider-vcd", - "rev": "v3.5.1", - "sha256": "1fwkbsgnxn0jl84nji57grasdsbw0ydd7vzcllpv7r1z3jpa545q", - "vendorSha256": "0bzp6807l4hspk1c1pmgnzk0axk0nir3v0lqmw9xvkij4c5rnz9s", - "version": "3.5.1" + "rev": "v3.6.0", + "sha256": "sha256-vtqlT3cfrEsbTmsKY6SVYUgyo+zIiX0cK080H03C1d0=", + "vendorSha256": "sha256-g5qcT4xaXQMih4WN3ysk+xGwd3ux8XjMceXgmw8gYB0=", + "version": "3.6.0" }, "venafi": { "owner": "Venafi", "provider-source-address": "registry.terraform.io/Venafi/venafi", "repo": "terraform-provider-venafi", - "rev": "v0.15.3", - "sha256": "sha256-qucPKnzUNYnnEe0rJoe3RhzBYIJJJroz3qTo8VlQBAE=", - "vendorSha256": "sha256-lj8cuv9jR+3P7OiO/eW8poHcX+LsQo+kOyspiqdMXRY=", - "version": "0.15.3" + "rev": "v0.15.5", + "sha256": "sha256-aNh9P7QqhmdywP47mddcGSDRxkwkrus14tku/xrQcz8=", + "vendorSha256": "sha256-SKdSjBXLX344zt0GeGBLNp8cFw+PO9ObT9jC+dHp/h8=", + "version": "0.15.5" }, "vercel": { "owner": "ondrejsika", diff --git a/pkgs/applications/networking/instant-messengers/chatty/default.nix b/pkgs/applications/networking/instant-messengers/chatty/default.nix index 34b525a98a6..586d49cf96f 100644 --- a/pkgs/applications/networking/instant-messengers/chatty/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatty/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { pname = "chatty"; - version = "0.6.1"; + version = "0.6.3"; src = fetchFromGitLab { domain = "source.puri.sm"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { repo = "chatty"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-AufxwuOibTx5OvLBVbJqay/mYLmcDpE2BgwVv6Y5IlY="; + hash = "sha256-BILi3+i7SCiK7dVbckv3cNMNyEwgKMf0ct0z/J1xysI="; }; postPatch = '' diff --git a/pkgs/applications/networking/ping/default.nix b/pkgs/applications/networking/ping/default.nix deleted file mode 100644 index 6074b1a51cc..00000000000 --- a/pkgs/applications/networking/ping/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, nix-update-script -, meson -, ninja -, vala -, pkg-config -, pantheon -, python3 -, glib -, gtk3 -, gtksourceview -, json-glib -, libsoup -, libgee -, wrapGAppsHook -}: - -stdenv.mkDerivation rec { - pname = "ping"; - version = "0.6.0"; - - src = fetchFromGitHub { - owner = "jeremyvaartjes"; - repo = "ping"; - rev = version; - sha256 = "1h9cdy2jxa2ffykjg89j21hazls32z9yyv3g0x07x3vizzl5xcij"; - }; - - nativeBuildInputs = [ - meson - ninja - vala - pkg-config - python3 - wrapGAppsHook - ]; - - buildInputs = [ - glib - gtk3 - gtksourceview - json-glib - libgee - libsoup - pantheon.granite - ]; - - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - - passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; - }; - - meta = with lib; { - description = "A helpful tool that lets you debug what part of your API is causing you issues"; - homepage = "https://github.com/jeremyvaartjes/ping"; - maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; - platforms = platforms.linux; - license = licenses.gpl3; - mainProgram = "com.github.jeremyvaartjes.ping"; - # Does not build with vala 0.48 or later - # ../src/Application.vala:696.46-696.57: error: Assignment: Cannot convert from - # `GLib.HashTable<weak string,weak string>' to `GLib.HashTable<string,string>?' - # HashTable<string,string> tempDataList = Soup.Form.decode(testObjs[id].data); - # ^^^^^^^^^^^^ - # Upstream has no activity since 28 Dec 2020 - broken = true; - }; -} diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index 175f9b48080..6406337541f 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, openssl, libsamplerate, alsa-lib, AppKit }: +{ lib, stdenv, fetchFromGitHub, openssl, libsamplerate, alsa-lib, AppKit, fetchpatch }: stdenv.mkDerivation rec { pname = "pjsip"; @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { patches = [ ./fix-aarch64.patch + (fetchpatch { + name = "CVE-2022-24764.patch"; + url = "https://github.com/pjsip/pjproject/commit/560a1346f87aabe126509bb24930106dea292b00.patch"; + sha256 = "1fy78v3clm0gby7qcq3ny6f7d7f4qnn01lkqq67bf2s85k2phisg"; + }) ]; buildInputs = [ openssl libsamplerate ] diff --git a/pkgs/applications/networking/synology-drive-client/default.nix b/pkgs/applications/networking/synology-drive-client/default.nix index 459e38970dd..3184c192b12 100644 --- a/pkgs/applications/networking/synology-drive-client/default.nix +++ b/pkgs/applications/networking/synology-drive-client/default.nix @@ -1,9 +1,9 @@ { stdenv, lib, qt5, fetchurl, autoPatchelfHook, dpkg, glibc, cpio, xar, undmg, gtk3, pango }: let pname = "synology-drive-client"; - buildNumber = "12682"; - version = "3.0.2"; baseUrl = "https://global.download.synology.com/download/Utility/SynologyDriveClient"; + buildNumber = "12920"; + version = "3.1.0"; meta = with lib; { description = "Desktop application to synchronize files and folders between the computer and the Synology Drive server."; homepage = "https://www.synology.com/en-global/dsm/feature/drive"; @@ -17,7 +17,7 @@ let src = fetchurl { url = "${baseUrl}/${version}-${buildNumber}/Ubuntu/Installer/x86_64/synology-drive-client-${buildNumber}.x86_64.deb"; - sha256 = "19fd2r39lb7bb6vkxfxyq0gp3l7pk5wy9fl0r7qwhym2jpi8yv6l"; + sha256 = "sha256-UAO/LwqPchIMhjdQP4METjVorMJsbvIDRkp4JxtZgOs="; }; nativeBuildInputs = [ autoPatchelfHook dpkg ]; @@ -47,7 +47,7 @@ let src = fetchurl { url = "${baseUrl}/${version}-${buildNumber}/Mac/Installer/synology-drive-client-${buildNumber}.dmg"; - sha256 = "1mlv8gxzivgxm59mw1pd63yq9d7as79ihm7166qyy0h0b0m04q2m"; + sha256 = "15wici8ycil1mfh5cf89rfan4kb93wfkdsd4kmpvzjj4bnddwlxa"; }; nativeBuildInputs = [ cpio xar undmg ]; diff --git a/pkgs/applications/video/ffmpeg-normalize/default.nix b/pkgs/applications/video/ffmpeg-normalize/default.nix index a2f802c6e87..9331471c747 100644 --- a/pkgs/applications/video/ffmpeg-normalize/default.nix +++ b/pkgs/applications/video/ffmpeg-normalize/default.nix @@ -7,11 +7,11 @@ buildPythonApplication rec { pname = "ffmpeg-normalize"; - version = "1.22.8"; + version = "1.22.9"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vxiq6q8fPh8ZLKnxYdIN591UQW73FWsoke1PvKTkko8="; + sha256 = "sha256-RBrCIDinPXbXKqrrhqVf3rV4rfi+2PttIaYxUKOk7hs="; }; propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ]; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 472a5685518..83514923331 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -46,13 +46,13 @@ let in mkDerivation rec { pname = "obs-studio"; - version = "27.2.2"; + version = "27.2.4"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; rev = version; - sha256 = "sha256-iZekhsqvtlMeKX2bQ+w/womkOTDLbbP0MmoTzbvpNtU="; + sha256 = "sha256-OiSejQovSmhItrnrQlcVp9PCDRgAhuxTinSpXbH8bo0="; fetchSubmodules = true; }; diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index aa225c1d173..99299ce31f9 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, python3, intltool, file, wrapGAppsHook, gtk-vnc , vte, avahi, dconf, gobject-introspection, libvirt-glib, system-libvirt , gsettings-desktop-schemas, libosinfo, gnome, gtksourceview4, docutils, cpio -, e2fsprogs, findutils, gzip, cdrtools, xorriso +, e2fsprogs, findutils, gzip, cdrtools, xorriso, fetchpatch , spiceSupport ? true, spice-gtk ? null }: @@ -35,11 +35,21 @@ python3.pkgs.buildPythonApplication rec { pygobject3 ipaddress libvirt libxml2 requests cdrtools ]; - patchPhase = '' + prePatch = '' sed -i 's|/usr/share/libvirt/cpu_map.xml|${system-libvirt}/share/libvirt/cpu_map.xml|g' virtinst/capabilities.py sed -i "/'install_egg_info'/d" setup.py ''; + patches = [ + # due to a recent change in setuptools-61, "packages=[]" needs to be included + # this patch can hopefully be removed, once virt-manager has an upstream version bump + (fetchpatch { + name = "fix-for-setuptools-61.patch"; + url = "https://github.com/virt-manager/virt-manager/commit/46dc0616308a73d1ce3ccc6d716cf8bbcaac6474.patch"; + sha256 = "sha256-/RZG+7Pmd7rmxMZf8Fvg09dUggs2MqXZahfRQ5cLcuM="; + }) + ]; + postConfigure = '' ${python3.interpreter} setup.py configure --prefix=$out ''; diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 954c88d1baf..2c6ba2b0244 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -18,6 +18,7 @@ # Apache apache = [ + "https://dlcdn.apache.org/" "https://www-eu.apache.org/dist/" "https://ftp.wayne.edu/apache/" "https://www.apache.org/dist/" diff --git a/pkgs/build-support/setup-hooks/postgresql-test-hook/default.nix b/pkgs/build-support/setup-hooks/postgresql-test-hook/default.nix new file mode 100644 index 00000000000..d0031c93c10 --- /dev/null +++ b/pkgs/build-support/setup-hooks/postgresql-test-hook/default.nix @@ -0,0 +1,9 @@ +{ callPackage, makeSetupHook }: + +(makeSetupHook { + name = "postgresql-test-hook"; +} ./postgresql-test-hook.sh).overrideAttrs (o: { + passthru.tests = { + simple = callPackage ./test.nix { }; + }; +}) diff --git a/pkgs/build-support/setup-hooks/postgresql-test-hook/postgresql-test-hook.sh b/pkgs/build-support/setup-hooks/postgresql-test-hook/postgresql-test-hook.sh new file mode 100644 index 00000000000..041a3f56533 --- /dev/null +++ b/pkgs/build-support/setup-hooks/postgresql-test-hook/postgresql-test-hook.sh @@ -0,0 +1,79 @@ +preCheckHooks+=('postgresqlStart') +postCheckHooks+=('postgresqlStop') + + +postgresqlStart() { + + # Add default environment variable values + # + # Client variables: + # - https://www.postgresql.org/docs/current/libpq-envars.html + # + # Server variables: + # - only PGDATA: https://www.postgresql.org/docs/current/creating-cluster.html + + if [[ "${PGDATA:-}" == "" ]]; then + PGDATA="$NIX_BUILD_TOP/postgresql" + fi + export PGDATA + + if [[ "${PGHOST:-}" == "" ]]; then + mkdir -p "$NIX_BUILD_TOP/run/postgresql" + PGHOST="$NIX_BUILD_TOP/run/postgresql" + fi + export PGHOST + + if [[ "${PGUSER:-}" == "" ]]; then + PGUSER="test_user" + fi + export PGUSER + + if [[ "${PGDATABASE:-}" == "" ]]; then + PGDATABASE="test_db" + fi + export PGDATABASE + + if [[ "${postgresqlTestUserOptions:-}" == "" ]]; then + postgresqlTestUserOptions="LOGIN" + fi + + if [[ "${postgresqlTestSetupSQL:-}" == "" ]]; then + postgresqlTestSetupSQL="$(cat <<EOF + CREATE ROLE "$PGUSER" $postgresqlTestUserOptions; + CREATE DATABASE "$PGDATABASE" OWNER '$PGUSER'; +EOF + )" + fi + + if [[ "${postgresqlTestSetupCommands:-}" == "" ]]; then + postgresqlTestSetupCommands='echo "$postgresqlTestSetupSQL" | PGUSER=postgres psql postgres' + fi + + if ! type initdb >/dev/null; then + echo >&2 'initdb not found. Did you add postgresql to the checkInputs?' + false + fi + header 'initializing postgresql' + initdb -U postgres + + # Move the socket + echo "unix_socket_directories = '$NIX_BUILD_TOP/run/postgresql'" >>"$PGDATA/postgresql.conf" + + # TCP ports can be a problem in some sandboxes, + # so we disable tcp listening by default + if ! [[ "${postgresqlEnableTCP:-}" = 1 ]]; then + echo "listen_addresses = ''" >>"$PGDATA/postgresql.conf" + fi + + header 'starting postgresql' + eval "${postgresqlStartCommands:-pg_ctl start}" + + header 'setting up postgresql' + eval "$postgresqlTestSetupCommands" + +} + +postgresqlStop() { + header 'stopping postgresql' + pg_ctl stop +} diff --git a/pkgs/build-support/setup-hooks/postgresql-test-hook/test.nix b/pkgs/build-support/setup-hooks/postgresql-test-hook/test.nix new file mode 100644 index 00000000000..6d8ad6c8c7e --- /dev/null +++ b/pkgs/build-support/setup-hooks/postgresql-test-hook/test.nix @@ -0,0 +1,27 @@ +{ postgresql, postgresqlTestHook, stdenv }: + +stdenv.mkDerivation { + name = "postgresql-test-hook-test"; + buildInputs = [ postgresqlTestHook ]; + checkInputs = [ postgresql ]; + dontUnpack = true; + doCheck = true; + passAsFile = ["sql"]; + sql = '' + CREATE TABLE hello ( + message text + ); + INSERT INTO hello VALUES ('it '||'worked'); + SELECT * FROM hello; + ''; + checkPhase = '' + runHook preCheck + psql <$sqlPath | grep 'it worked' + TEST_RAN=1 + runHook postCheck + ''; + installPhase = '' + [[ $TEST_RAN == 1 ]] + touch $out + ''; +} diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 124ade8cfa0..1f9543f808e 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -814,7 +814,11 @@ rec { command ? "${package.meta.mainProgram or package.pname or package.name} --version", version ? package.version, }: runCommand "${package.name}-test-version" { nativeBuildInputs = [ package ]; meta.timeout = 60; } '' - ${command} |& grep -Fw ${version} - touch $out + if output=$(${command} 2>&1); then + grep -Fw "${version}" - <<< "$output" + touch $out + else + echo "$output" >&2 && exit 1 + fi ''; } diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix index 18451ce239f..cda0abaf2f7 100644 --- a/pkgs/desktops/gnome/core/evince/default.nix +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "42.1"; + version = "42.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "skdnuz1RA7TjWw4VzwM9viSI+IcAzdiC0ipDre7C6Ao="; + sha256 = "/3+B8wjPjUlW7Zf7ckp+SUSMIUvuq5mIEu+e+7ON+K4="; }; postPatch = '' diff --git a/pkgs/development/compilers/open-watcom/v2.nix b/pkgs/development/compilers/open-watcom/v2.nix index dc2af6e7835..79973f761c5 100644 --- a/pkgs/development/compilers/open-watcom/v2.nix +++ b/pkgs/development/compilers/open-watcom/v2.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { pname = "open-watcom-v2"; - version = "unstable-2022-03-14"; + version = "unstable-2022-04-18"; name = "${pname}-unwrapped-${version}"; src = fetchFromGitHub { owner = "open-watcom"; repo = "open-watcom-v2"; - rev = "22627ccc1bd3de70aff9ac056e0dc9ecf7f7b6ec"; - sha256 = "khy/fhmQjTGKfx6iOUBt+ySwpEx0df/7meyNvBnJAPY="; + rev = "3e762ff7342f9d82b7d8df54db9558158332ac02"; + sha256 = "KMFvLIUqor2wxeO03Uh/jycvnCTOd1ySxYTq4PJ0tHk="; }; postPatch = '' diff --git a/pkgs/development/compilers/tinygo/default.nix b/pkgs/development/compilers/tinygo/default.nix index 218b207f243..935260dbcab 100644 --- a/pkgs/development/compilers/tinygo/default.nix +++ b/pkgs/development/compilers/tinygo/default.nix @@ -59,6 +59,6 @@ buildGoModule rec { homepage = "https://tinygo.org/"; description = "Go compiler for small places"; license = licenses.bsd3; - maintainers = with maintainers; [ chiiruno ]; + maintainers = with maintainers; [ Madouura ]; }; } diff --git a/pkgs/development/compilers/vlang/default.nix b/pkgs/development/compilers/vlang/default.nix index 1786c54ac7e..0c24e67123c 100644 --- a/pkgs/development/compilers/vlang/default.nix +++ b/pkgs/development/compilers/vlang/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { homepage = "https://vlang.io/"; description = "Simple, fast, safe, compiled language for developing maintainable software"; license = licenses.mit; - maintainers = with maintainers; [ chiiruno ]; + maintainers = with maintainers; [ Madouura ]; platforms = platforms.all; }; } diff --git a/pkgs/development/embedded/stm32/stm32flash/default.nix b/pkgs/development/embedded/stm32/stm32flash/default.nix index 52b30115499..d6e8d459896 100644 --- a/pkgs/development/embedded/stm32/stm32flash/default.nix +++ b/pkgs/development/embedded/stm32/stm32flash/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "stm32flash"; - version = "0.6"; + version = "0.7"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-7ptA1NPlzSi5k+CK4qLDxVm2vqhzDNfh1Acn3tsd2gk="; + sha256 = "sha256-xMnNi+x52mOxEdFXE+9cws2UfeykEdNdbjBl4ifcQUo="; }; buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7bc823b3e84..66bd34bdbc0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1190,8 +1190,29 @@ self: super: { # Fix build with attr-2.4.48 (see #53716) xattr = appendPatch ./patches/xattr-fix-build.patch super.xattr; - # Some tests depend on a postgresql instance - esqueleto = dontCheck super.esqueleto; + esqueleto = + overrideCabal + (drv: { + postPatch = drv.postPatch or "" + '' + # patch out TCP usage: https://nixos.org/manual/nixpkgs/stable/#sec-postgresqlTestHook-tcp + sed -i test/PostgreSQL/Test.hs \ + -e s^host=localhost^^ + ''; + # Match the test suite defaults (or hardcoded values?) + preCheck = drv.preCheck or "" + '' + PGUSER=esqutest + PGDATABASE=esqutest + ''; + testFlags = drv.testFlags or [] ++ [ + # We don't have a MySQL test hook yet + "--skip=/Esqueleto/MySQL" + ]; + testToolDepends = drv.testToolDepends or [] ++ [ + pkgs.postgresql + pkgs.postgresqlTestHook + ]; + }) + super.esqueleto; # Requires API keys to run tests algolia = dontCheck super.algolia; @@ -1310,7 +1331,25 @@ self: super: { # Test suite requires database persistent-mysql = dontCheck super.persistent-mysql; - persistent-postgresql = dontCheck super.persistent-postgresql; + persistent-postgresql = + overrideCabal + (drv: { + postPatch = drv.postPath or "" + '' + # patch out TCP usage: https://nixos.org/manual/nixpkgs/stable/#sec-postgresqlTestHook-tcp + # NOTE: upstream host variable takes only two values... + sed -i test/PgInit.hs \ + -e s^'host=" <> host <> "'^^ + ''; + preCheck = drv.preCheck or "" + '' + PGDATABASE=test + PGUSER=test + ''; + testToolDepends = drv.testToolDepends or [] ++ [ + pkgs.postgresql + pkgs.postgresqlTestHook + ]; + }) + super.persistent-postgresql; # Fix EdisonAPI and EdisonCore for GHC 8.8: # https://github.com/robdockins/edison/pull/16 @@ -1515,8 +1554,13 @@ self: super: { }; pg-client = overrideCabal (drv: { librarySystemDepends = with pkgs; [ postgresql krb5.dev openssl.dev ]; - # wants a running DB to check against - doCheck = false; + testToolDepends = drv.testToolDepends or [] ++ [ + pkgs.postgresql pkgs.postgresqlTestHook + ]; + preCheck = drv.preCheck or "" + '' + # empty string means use default connection + export DATABASE_URL="" + ''; }) (super.pg-client.override { resource-pool = self.hasura-resource-pool; ekg-core = self.hasura-ekg-core; diff --git a/pkgs/development/libraries/argagg/0001-catch.diff b/pkgs/development/libraries/argagg/0001-catch.diff new file mode 100644 index 00000000000..f99649d5681 --- /dev/null +++ b/pkgs/development/libraries/argagg/0001-catch.diff @@ -0,0 +1,20 @@ +--- old/test/doctest.h 2019-03-05 18:04:06.143740733 +0300 ++++ new/test/doctest.h 2019-03-05 18:04:43.577284916 +0300 +@@ -1307,7 +1307,7 @@ + __FILE__, __LINE__, #expr, #as); \ + try { \ + expr; \ +- } catch(as) { \ ++ } catch(as e) { \ + _DOCTEST_RB.m_threw = true; \ + _DOCTEST_RB.m_threw_as = true; \ + } catch(...) { _DOCTEST_RB.m_threw = true; } \ +@@ -1332,7 +1332,7 @@ + #define DOCTEST_REQUIRE_THROWS(expr) DOCTEST_ASSERT_THROWS(expr, DT_REQUIRE_THROWS) + + #define DOCTEST_WARN_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, ex, DT_WARN_THROWS_AS) +-#define DOCTEST_CHECK_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, ex, DT_CHECK_THROWS_AS) ++#define DOCTEST_CHECK_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, const ex &, DT_CHECK_THROWS_AS) + #define DOCTEST_REQUIRE_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, ex, DT_REQUIRE_THROWS_AS) + + #define DOCTEST_WARN_NOTHROW(expr) DOCTEST_ASSERT_NOTHROW(expr, DT_WARN_NOTHROW) diff --git a/pkgs/development/libraries/argagg/default.nix b/pkgs/development/libraries/argagg/default.nix new file mode 100644 index 00000000000..7ff9eaac1e3 --- /dev/null +++ b/pkgs/development/libraries/argagg/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "argagg"; + version = "0.4.6"; + + src = fetchFromGitHub { + owner = "vietjtnguyen"; + repo = pname; + rev = version; + hash = "sha256-MCtlAPfwdJpgfS8IH+zlcgaaxZ5AsP4hJvbZAFtOa4o="; + }; + + patches = [ + # Fix compilation of macro catch statement + ./0001-catch.diff + ]; + + nativeBuildInputs = [ + cmake + ]; + + meta = with lib; { + homepage = "https://github.com/vietjtnguyen/argagg"; + description = "Argument Aggregator"; + longDescription = '' + argagg is yet another C++ command line argument/option parser. It was + written as a simple and idiomatic alternative to other frameworks like + getopt, Boost program options, TCLAP, and others. The goal is to achieve + the majority of argument parsing needs in a simple manner with an easy to + use API. It operates as a single pass over all arguments, recognizing + flags prefixed by - (short) or -- (long) and aggregating them into easy to + access structures with lots of convenience functions. It defers processing + types until you access them, so the result structures end up just being + pointers into the original command line argument C-strings. + ''; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; all; + badPlatforms = [ "aarch64-darwin" ]; + }; +} diff --git a/pkgs/development/ocaml-modules/bjack/default.nix b/pkgs/development/ocaml-modules/bjack/default.nix new file mode 100644 index 00000000000..fa03194bde4 --- /dev/null +++ b/pkgs/development/ocaml-modules/bjack/default.nix @@ -0,0 +1,25 @@ +{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, libsamplerate, libjack2 }: + +buildDunePackage rec { + pname = "bjack"; + version = "0.1.6"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-bjack"; + rev = "v${version}"; + sha256 = "1gf31a8i9byp6npn0x6gydcickn6sf5dnzmqr2c1b9jn2nl7334c"; + }; + + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ libsamplerate libjack2 ]; + + meta = with lib; { + homepage = "https://github.com/savonet/ocaml-bjack"; + description = "Blocking API for the jack audio connection kit"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/development/ocaml-modules/coin/default.nix b/pkgs/development/ocaml-modules/coin/default.nix index f2e0919bdee..0ff2ce94041 100644 --- a/pkgs/development/ocaml-modules/coin/default.nix +++ b/pkgs/development/ocaml-modules/coin/default.nix @@ -1,20 +1,19 @@ { buildDunePackage -, fetchzip +, fetchurl , findlib , lib -, menhir , ocaml , re }: buildDunePackage rec { pname = "coin"; - version = "0.1.3"; + version = "0.1.4"; minimalOCamlVersion = "4.03"; - src = fetchzip { - url = "https://github.com/mirage/coin/releases/download/v${version}/coin-v${version}.tbz"; - sha256 = "06bfidvglyp9hzvr2xwbdx8wf26is2xrzc31fldzjf5ab0vd076p"; + src = fetchurl { + url = "https://github.com/mirage/coin/releases/download/v${version}/coin-${version}.tbz"; + sha256 = "sha256:0069qqswd1ik5ay3d5q1v1pz0ql31kblfsnv0ax0z8jwvacp3ack"; }; postPatch = '' @@ -22,9 +21,7 @@ buildDunePackage rec { 'ocaml} -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib ' ''; - useDune2 = true; - - nativeBuildInputs = [ menhir findlib ]; + nativeBuildInputs = [ findlib ]; buildInputs = [ re ]; strictDeps = true; diff --git a/pkgs/development/ocaml-modules/dssi/default.nix b/pkgs/development/ocaml-modules/dssi/default.nix new file mode 100644 index 00000000000..b8235cef969 --- /dev/null +++ b/pkgs/development/ocaml-modules/dssi/default.nix @@ -0,0 +1,25 @@ +{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, ladspa, alsa-lib }: + +buildDunePackage rec { + pname = "dssi"; + version = "0.1.5"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-dssi"; + rev = "v${version}"; + sha256 = "1frbmx1aznwp60r6bkx1whqyr6mkflvd9ysmjg7s7b80mh0s4ix6"; + }; + + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ ladspa alsa-lib ]; + + meta = with lib; { + homepage = "https://github.com/savonet/ocaml-dssi"; + description = "Bindings for the DSSI API which provides audio synthesizers"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/development/ocaml-modules/gen_js_api/default.nix b/pkgs/development/ocaml-modules/gen_js_api/default.nix new file mode 100644 index 00000000000..e0474cdac6a --- /dev/null +++ b/pkgs/development/ocaml-modules/gen_js_api/default.nix @@ -0,0 +1,41 @@ +{ buildDunePackage +, lib +, ppxlib +, fetchFromGitHub +, ojs +, js_of_ocaml-compiler +, nodejs +}: + +buildDunePackage rec { + pname = "gen_js_api"; + version = "1.0.9"; + + src = fetchFromGitHub { + owner = "LexiFi"; + repo = pname; + rev = "v${version}"; + sha256 = "1qx6if1avr484bl9x1h0cksdc6gqw5i4pwzdr27h46hppnnvi8y8"; + }; + + minimalOCamlVersion = "4.08"; + + propagatedBuildInputs = [ ojs ppxlib ]; + checkInputs = [ js_of_ocaml-compiler nodejs ]; + doCheck = true; + + meta = { + homepage = "https://github.com/LexiFi/gen_js_api"; + description = "Easy OCaml bindings for JavaScript libraries"; + longDescription = '' + gen_js_api aims at simplifying the creation of OCaml bindings for + JavaScript libraries. Authors of bindings write OCaml signatures for + JavaScript libraries and the tool generates the actual binding code with a + combination of implicit conventions and explicit annotations. + + gen_js_api is to be used with the js_of_ocaml compiler. + ''; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.bcc32 ]; + }; +} diff --git a/pkgs/development/ocaml-modules/gen_js_api/ojs.nix b/pkgs/development/ocaml-modules/gen_js_api/ojs.nix new file mode 100644 index 00000000000..722f9fa7f6e --- /dev/null +++ b/pkgs/development/ocaml-modules/gen_js_api/ojs.nix @@ -0,0 +1,21 @@ +{ buildDunePackage +, gen_js_api +}: + +buildDunePackage rec { + pname = "ojs"; + + inherit (gen_js_api) version src; + + doCheck = false; # checks depend on gen_js_api, which is a cycle + + minimalOCamlVersion = "4.08"; + + meta = { + inherit (gen_js_api.meta) homepage license maintainers; + description = "Runtime Library for gen_js_api generated libraries"; + longDescription = '' + To be used in conjunction with gen_js_api + ''; + }; +} diff --git a/pkgs/development/ocaml-modules/ladspa/default.nix b/pkgs/development/ocaml-modules/ladspa/default.nix new file mode 100644 index 00000000000..b037a61a0fb --- /dev/null +++ b/pkgs/development/ocaml-modules/ladspa/default.nix @@ -0,0 +1,25 @@ +{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, ladspaH }: + +buildDunePackage rec { + pname = "ladspa"; + version = "0.2.2"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-ladspa"; + rev = "v${version}"; + sha256 = "1y83infjaz9apzyvaaqw331zqdysmn3bpidfab061v3bczv4jzbz"; + }; + + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ ladspaH ]; + + meta = with lib; { + homepage = "https://github.com/savonet/ocaml-alsa"; + description = "Bindings for the LADSPA API which provides audio effects"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/development/ocaml-modules/lastfm/default.nix b/pkgs/development/ocaml-modules/lastfm/default.nix new file mode 100644 index 00000000000..41bdac459b3 --- /dev/null +++ b/pkgs/development/ocaml-modules/lastfm/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildDunePackage +, fetchFromGitHub +, pkg-config +, dune-configurator +, xmlplaylist +, ocaml_pcre +, ocamlnet +}: + +buildDunePackage rec { + pname = "lastfm"; + version = "0.3.3"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-lastfm"; + rev = "v${version}"; + sha256 = "1sz400ny9h7fs20k7600q475q164x49ba30ls3q9y35rhm3g2y2b"; + }; + + propagatedBuildInputs = [ xmlplaylist ocaml_pcre ocamlnet ]; + + meta = with lib; { + homepage = "https://github.com/savonet/ocaml-lastfm"; + description = "OCaml API to lastfm radio and audioscrobbler"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/development/ocaml-modules/samplerate/default.nix b/pkgs/development/ocaml-modules/samplerate/default.nix new file mode 100644 index 00000000000..c101cfc0c27 --- /dev/null +++ b/pkgs/development/ocaml-modules/samplerate/default.nix @@ -0,0 +1,25 @@ +{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, libsamplerate }: + +buildDunePackage rec { + pname = "samplerate"; + version = "0.1.6"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-samplerate"; + rev = "v${version}"; + sha256 = "0h0i9v9p9n2givv3wys8qrfi1i7vp8kq7lnkf14s7d3m4r8x4wrp"; + }; + + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ libsamplerate ]; + + meta = with lib; { + homepage = "https://github.com/savonet/ocaml-samplerate"; + description = "Interface for libsamplerate"; + license = licenses.bsd2; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/development/ocaml-modules/xmlplaylist/default.nix b/pkgs/development/ocaml-modules/xmlplaylist/default.nix new file mode 100644 index 00000000000..a3017257350 --- /dev/null +++ b/pkgs/development/ocaml-modules/xmlplaylist/default.nix @@ -0,0 +1,25 @@ +{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, xmlm }: + +buildDunePackage rec { + pname = "xmlplaylist"; + version = "0.1.5"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-xmlplaylist"; + rev = "v${version}"; + sha256 = "1x5lbwkr2ip00x8vyfbl8936yy79j138vx8a16ix7g9p2j5qsfcq"; + }; + + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ xmlm ]; + + meta = with lib; { + homepage = "https://github.com/savonet/ocaml-xmlplaylist"; + description = "Module to parse various RSS playlist formats"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/development/python-modules/add-trailing-comma/default.nix b/pkgs/development/python-modules/add-trailing-comma/default.nix index c38a4f06143..5b0131576cd 100644 --- a/pkgs/development/python-modules/add-trailing-comma/default.nix +++ b/pkgs/development/python-modules/add-trailing-comma/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "add-trailing-comma"; - version = "2.2.1"; + version = "2.2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "asottile"; repo = pname; rev = "v${version}"; - sha256 = "RBOL4mM9VciHHNmCTlRBIoXqeln19MKYxgv9p6GCNvU="; + sha256 = "sha256-hJVVRhaElroZ1GVlbGK49gzts2tozLqp9xfoaPdbb3I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 00e24a2d9f1..4a502ac65db 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "18.0.0"; + version = "19.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-b4AwcnSp6JOtG8VaBbUN7d/NIhHN2TPnyjzCUVhMOzg="; + sha256 = "sha256-UHkSUoNzXWomr4vczGRRXVJplVRfqDjwFczkOP2Jwsc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index eed367c2206..d26033c414f 100644 --- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -5,18 +5,20 @@ , msrestazure , azure-common , azure-mgmt-core -, azure-mgmt-nspkg -, isPy3k +, pythonOlder }: buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "2.3.0"; + version = "2.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-pjBjFPkKhKd8XI6wmzX/rAssHINMzDAZa+XRqG/pLYo="; + hash = "sha256-oCDh7tWsBA6z/auQm3AtkRzT9IUrq8HJ+R//HDJ+1nw="; }; propagatedBuildInputs = [ @@ -24,8 +26,6 @@ buildPythonPackage rec { msrestazure azure-common azure-mgmt-core - ] ++ lib.optionals (!isPy3k) [ - azure-mgmt-nspkg ]; # has no tests diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 12ea06a5c4f..433b7644e7a 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.15.4"; + version = "1.15.5"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = pname; repo = "pycasbin"; - rev = "v${version}"; - sha256 = "0vczml14dvvrj401r08d6b0rfn5p5kfm1wr0vrfi8rqk2z5x1w0g"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-7q9zTuqdIUAiipA5kh8CwQa/TeiXGsKuGGvYYwTjObw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/enaml/default.nix b/pkgs/development/python-modules/enaml/default.nix index 9e6a910b2ba..ccd8bb497d1 100644 --- a/pkgs/development/python-modules/enaml/default.nix +++ b/pkgs/development/python-modules/enaml/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools-scm , atom , ply , kiwisolver @@ -12,13 +13,13 @@ buildPythonPackage rec { pname = "enaml"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "nucleic"; repo = pname; - rev = version; - sha256 = "sha256-QfI7cwl2c5HOlFNNdG+oOv48X9jJZnZNU/kWgutWe6k="; + rev = "refs/tags/${version}"; + sha256 = "sha256-xSMgT8VooDS5kvf4BCcVbv/MNfRDTVnPKU3Ou+/Gq7I="; }; # qt bindings cannot be found during tests @@ -39,6 +40,7 @@ buildPythonPackage rec { "enaml.workbench" ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ atom ply @@ -48,6 +50,7 @@ buildPythonPackage rec { cppy bytecode ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; meta = with lib; { homepage = "https://github.com/nucleic/enaml"; diff --git a/pkgs/development/python-modules/findpython/default.nix b/pkgs/development/python-modules/findpython/default.nix index 877637344d4..06fd963cf2f 100644 --- a/pkgs/development/python-modules/findpython/default.nix +++ b/pkgs/development/python-modules/findpython/default.nix @@ -15,7 +15,7 @@ let pname = "findpython"; - version = "0.1.4"; + version = "0.1.5"; in buildPythonPackage { inherit pname version; @@ -25,7 +25,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-TOGYRUaW7lOcp5kNTq3NBHHKXvA7XE7y+SWJGsZPgok="; + hash = "sha256-AjTmTKIhWhl39O18S2XRVxeDiIzCpKH2qdjkY2h+i8M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index 43566843ab6..e4e9139216e 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -3,6 +3,7 @@ , blas , buildPythonPackage , fetchFromGitHub +, fetchpatch , jaxlib , lapack , numpy @@ -19,7 +20,7 @@ let in buildPythonPackage rec { pname = "jax"; - version = "0.3.5"; + version = "0.3.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -28,12 +29,18 @@ buildPythonPackage rec { owner = "google"; repo = pname; rev = "jax-v${version}"; - hash = "sha256-c+5r0Xvd2zrIVF9VG+yve5QDvCcfMiOYp6JqaabowhA="; + hash = "sha256-eGdAEZFHadNTHgciP4KMYHdwksz9g6un0Ar+A/KV5TE="; }; patches = [ # See https://github.com/google/jax/issues/7944 ./cache-fix.patch + + # See https://github.com/google/jax/issues/10292 + (fetchpatch { + url = "https://github.com/google/jax/commit/cadc8046d56e0c1433cf48a2f106947d5f4ecbfd.patch"; + hash = "sha256-jrpIqt4LzWAswt/Cpwtfa5d1Yn31HcXkVH3ETmaigA0="; + }) ]; # jaxlib is _not_ included in propagatedBuildInputs because there are diff --git a/pkgs/development/python-modules/lightwave2/default.nix b/pkgs/development/python-modules/lightwave2/default.nix index f840a2186cf..4501eb664e9 100644 --- a/pkgs/development/python-modules/lightwave2/default.nix +++ b/pkgs/development/python-modules/lightwave2/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "lightwave2"; - version = "0.8.1"; + version = "0.8.4"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-UULOQawsY2N0xxYlgIZKs8Xyl0XDqC6fSSKvo8ZBEcY="; + sha256 = "sha256-WB5U8VjUKx2hCcJX2JeFgEiwzweGzROEK3pox3l/wrE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/merkletools/default.nix b/pkgs/development/python-modules/merkletools/default.nix index 92acdaf58ed..a57f926a615 100644 --- a/pkgs/development/python-modules/merkletools/default.nix +++ b/pkgs/development/python-modules/merkletools/default.nix @@ -15,6 +15,6 @@ buildPythonPackage rec { description = "Python tools for creating Merkle trees, generating Merkle proofs, and verification of Merkle proofs"; homepage = "https://github.com/Tierion/pymerkletools"; license = licenses.mit; - maintainers = with maintainers; [ chiiruno ]; + maintainers = with maintainers; [ Madouura ]; }; } diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index 29ab17c8ba8..2b55ced1171 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.24.2"; + version = "1.25.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-q3/ASKVvysTZwkeyKoNW5gjdmgPUg18ch/ui5PJihKU="; + sha256 = "sha256-i8/HmxxqoFj1OEwtXjF/u+yOmQ33RJbVHYmx78/d9Ng="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 391afabf931..508e6f71d11 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -1,20 +1,36 @@ -{ lib, buildPythonPackage, fetchPypi, aiohttp, requests }: +{ lib +, buildPythonPackage +, fetchPypi +, aiohttp +, requests +, pythonOlder +}: buildPythonPackage rec { pname = "pyTelegramBotAPI"; - version = "4.4.0"; + version = "4.4.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5vIjVqvr/+Cok9z3L+CaDIve2tb0mMVaMMPdMs5Ijmo="; + hash = "sha256-3Qppp/UDKiGChnvMOgW8EKygI75gYzv37c0ctExmK+g="; }; - propagatedBuildInputs = [ aiohttp requests ]; + propagatedBuildInputs = [ + aiohttp + requests + ]; + + pythonImportsCheck = [ + "telebot" + ]; meta = with lib; { homepage = "https://github.com/eternnoir/pyTelegramBotAPI"; description = "A simple, but extensible Python implementation for the Telegram Bot API"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ das_j ]; }; } diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index d1173e4cbf3..1a7d7807d69 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,13 +32,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.1065"; + version = "2.0.1067"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-q51do9Kbl85p+wOMnFM4QpjezHll8sTmw8vffWcQrRE="; + hash = "sha256-WK6fot5YAC5l/0EiJuIQ5Xvz5NiEWnU+BfzsKv+caJ8="; }; nativeBuildInputs = with py.pkgs; [ diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index e4a616f9995..8978a0635c8 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -48,6 +48,13 @@ let newPython = python3.override { sha256 = "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b"; }; }); + distro = super.distro.overridePythonAttrs (oldAttrs: rec { + version = "1.5.0"; + src = oldAttrs.src.override { + inherit version; + sha256 = "14nz51cqlnxmgfqqilxyvjwwa5xfivdvlm0d0b1qzgcgwdm7an0f"; + }; + }); }; }; diff --git a/pkgs/development/tools/easyjson/default.nix b/pkgs/development/tools/easyjson/default.nix index 75bfc1d4c14..270d63ed2a7 100644 --- a/pkgs/development/tools/easyjson/default.nix +++ b/pkgs/development/tools/easyjson/default.nix @@ -1,21 +1,22 @@ { lib, buildGoPackage, fetchFromGitHub }: -buildGoPackage { +buildGoPackage rec { pname = "easyjson"; - version = "unstable-2019-06-26"; + version = "0.7.7"; goPackagePath = "github.com/mailru/easyjson"; + goDeps = ./deps.nix; src = fetchFromGitHub { owner = "mailru"; repo = "easyjson"; - rev = "b2ccc519800e761ac8000b95e5d57c80a897ff9e"; - sha256 = "0q85h383mhbkcjm2vqm72bi8n2252fv3c56q3lclzb8n2crnjcdk"; + rev = "v${version}"; + sha256 = "0clifkvvy8f45rv3cdyv58dglzagyvfcqb63wl6rij30c5j2pzc1"; }; meta = with lib; { homepage = "https://github.com/mailru/easyjson"; description = "Fast JSON serializer for golang"; license = licenses.mit; - maintainers = with maintainers; [ chiiruno ]; + maintainers = with maintainers; [ Madouura ]; }; } diff --git a/pkgs/development/tools/easyjson/deps.nix b/pkgs/development/tools/easyjson/deps.nix new file mode 100644 index 00000000000..d5d7e1f15bc --- /dev/null +++ b/pkgs/development/tools/easyjson/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "github.com/josharian/intern"; + fetch = { + type = "git"; + url = "https://github.com/josharian/intern"; + rev = "8e6ff32b3e7c0b018c43953085fe2ac330fe9acd"; + sha256 = "1za48ppvwd5vg8vv25ldmwz1biwpb3p6qhf8vazhsfdg9m07951c"; + }; + } +] diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix index 752cefad3c2..31d1c635512 100644 --- a/pkgs/development/tools/git-series/default.nix +++ b/pkgs/development/tools/git-series/default.nix @@ -1,54 +1,36 @@ -{ lib, fetchFromGitHub, fetchpatch, rustPlatform -, openssl, cmake, perl, pkg-config, zlib, curl, libgit2, libssh2 +{ lib, rustPlatform, fetchFromGitHub +, pkg-config, openssl, zlib, curl, libgit2, libssh2 }: -with rustPlatform; - -buildRustPackage rec { - version = "0.9.1"; +rustPlatform.buildRustPackage rec { pname = "git-series"; + version = "unstable-2019-10-15"; src = fetchFromGitHub { owner = "git-series"; repo = "git-series"; - rev = version; - sha256 = "07mgq5h6r1gf3jflbv2khcz32bdazw7z1s8xcsafdarnm13ps014"; + rev = "c570a015e15214be46a7fd06ba08526622738e20"; + sha256 = "1i0m2b7ma6xvkg95k57gaj1wpc1rfvka6h8jr5hglxmqqbz6cb6w"; }; - cargoSha256 = "0870f4rd98fbmyl8524ivfg3xf4qpzb1x68q1idnl47mmf68pyx8"; - - cargoPatches = [ - (fetchpatch { - url = "https://github.com/Mic92/git-series/commit/3aa30a47d74ebf90b444dccdf8c153f07f119483.patch"; - sha256 = "06v8br9skvy75kcw2zgbswxyk82sqzc8smkbqpzmivxlc2i9rnh0"; - }) - # Update Cargo.lock to allow using OpenSSL 1.1 - (fetchpatch { - url = "https://github.com/edef1c/git-series/commit/11fe70ffcc18200e5f2a159c36aab070e8ff4228.patch"; - sha256 = "0clwllf9mrhq86dhzyyhkw1q2ggpgqpw7s05dvp3gj9zhfsyya4s"; - }) - # Cargo.lock: Update url, which fixes incompatibility with NLL - (fetchpatch { - url = "https://github.com/edef1c/git-series/commit/27ff2ecf2d615dae1113709eca0e43596de12ac4.patch"; - sha256 = "1byjbdcx56nd0bbwz078bl340rk334mb34cvaa58h76byvhpkw10"; - }) - ]; + cargoSha256 = "1hmx14z3098c98achgii0jkcm4474iw762rmib77amcsxj73zzdh"; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl zlib curl libgit2 libssh2 ]; LIBGIT2_SYS_USE_PKG_CONFIG = true; LIBSSH2_SYS_USE_PKG_CONFIG = true; - nativeBuildInputs = [ cmake pkg-config perl ]; - buildInputs = [ openssl zlib curl libgit2 libssh2 ]; - postBuild = '' + postInstall = '' install -D "$src/git-series.1" "$out/man/man1/git-series.1" ''; meta = with lib; { description = "A tool to help with formatting git patches for review on mailing lists"; longDescription = '' - git series tracks changes to a patch series over time. git - series also tracks a cover letter for the patch series, - formats the series for email, and prepares pull requests. + git series tracks changes to a patch series over time. git + series also tracks a cover letter for the patch series, + formats the series for email, and prepares pull requests. ''; homepage = "https://github.com/git-series/git-series"; diff --git a/pkgs/development/tools/quicktemplate/default.nix b/pkgs/development/tools/quicktemplate/default.nix index 747a82740f4..2086464d7b3 100644 --- a/pkgs/development/tools/quicktemplate/default.nix +++ b/pkgs/development/tools/quicktemplate/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "quicktemplate"; - version = "1.6.3"; + version = "1.7.0"; src = fetchFromGitHub { owner = "valyala"; repo = "quicktemplate"; rev = "v${version}"; - sha256 = "mQhrQcKRDtcXha7FIwCIUwWfoPGIJ5YLbA4HdatIdn8="; + sha256 = "0xzsvhpllmzmyfg8sj1dpp02826j1plmyrdvqbwryzhf2ci33nqr"; }; vendorSha256 = null; @@ -17,7 +17,7 @@ buildGoModule rec { homepage = "https://github.com/valyala/quicktemplate"; description = "Fast, powerful, yet easy to use template engine for Go"; license = licenses.mit; - maintainers = with maintainers; [ chiiruno ]; + maintainers = with maintainers; [ Madouura ]; mainProgram = "qtc"; }; } diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index f6717b36b20..3fd4f768384 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "racer"; - version = "2.1.48"; + version = "2.2.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-lat5s9+AMFI3VXiWqjLESZrtq3IwOZhlt+5BhYoonfA="; + sha256 = "sha256-uAVtJwOyhe1lPz+MUUFCgHJPVGuIk/lNUkQWiNdOZ5Y="; }; - cargoSha256 = "sha256-jGsvCmrPGVzWdx7V3J4bBK+SF2o+icORmVKuwqYxdh4="; + cargoSha256 = "sha256-U2mI1y6t8CwxW/iPcPzxAafu61GNm/XLCKVGuyybV/4="; nativeBuildInputs = [ makeWrapper ]; buildInputs = lib.optional stdenv.isDarwin Security; @@ -32,6 +32,10 @@ rustPlatform.buildRustPackage rec { "--skip test_resolve_global_path_in_modules" ]; + # [2022-04-06] Its test suite contains two function calls with the + # wrong number of arguments, breaking its build. + doCheck = false; + doInstallCheck = true; installCheckPhase = '' $out/bin/racer --version @@ -42,7 +46,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/racer-rust/racer"; license = licenses.mit; maintainers = with maintainers; [ jagajaga ]; - # error[E0199]: implementing the trait `Step` is not unsafe - broken = true; }; } diff --git a/pkgs/development/tools/statik/default.nix b/pkgs/development/tools/statik/default.nix index 48ceea24b70..6befb42c24d 100644 --- a/pkgs/development/tools/statik/default.nix +++ b/pkgs/development/tools/statik/default.nix @@ -24,6 +24,6 @@ buildGoModule rec { homepage = "https://github.com/rakyll/statik"; description = "Embed files into a Go executable "; license = licenses.asl20; - maintainers = with maintainers; [ chiiruno ]; + maintainers = with maintainers; [ Madouura ]; }; } diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index 3d58b865126..0a726d18b1b 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "cypress"; - version = "9.5.3"; + version = "9.5.4"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "qK1TvAGiTVmEQ4MpqICDSP9swnpAcE6iGkGJOrPQ1bI="; + sha256 = "F4BSIA3ImXwmmki8/FK0t08Gf5S8KMpXNNBIPPJQNsM="; }; # don't remove runtime deps diff --git a/pkgs/misc/dumb/default.nix b/pkgs/misc/dumb/default.nix index 9b733e00f69..2a554d99b28 100644 --- a/pkgs/misc/dumb/default.nix +++ b/pkgs/misc/dumb/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/kode54/dumb"; description = "Module/tracker based music format parser and player library"; license = licenses.free; # Derivative of GPL - maintainers = with maintainers; [ chiiruno ]; + maintainers = with maintainers; [ Madouura ]; platforms = platforms.all; }; } diff --git a/pkgs/misc/sndio/default.nix b/pkgs/misc/sndio/default.nix index 786c3c3a40a..7b5774d8054 100644 --- a/pkgs/misc/sndio/default.nix +++ b/pkgs/misc/sndio/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = "https://www.sndio.org"; description = "Small audio and MIDI framework part of the OpenBSD project"; license = licenses.isc; - maintainers = with maintainers; [ chiiruno ]; + maintainers = with maintainers; [ Madouura ]; platforms = platforms.all; }; } diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 123c42e8397..79dc48a6ea9 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchurl, kernel }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, kernel +}: let cfg = import ./version.nix; in @@ -11,6 +16,19 @@ stdenv.mkDerivation rec { sha256 = cfg.sha256.${pname}; }; + patches = [ + # batman-adv: make mc_forwarding atomic + (fetchpatch { + url = "https://git.open-mesh.org/batman-adv.git/blobdiff_plain/c142c00f6b1a2ad5f5d74202fb1249e6a6575407..56db7c0540e733a1f063ccd6bab1b537a80857eb:/net/batman-adv/multicast.c"; + hash = "sha256-2zXg8mZ3/iK9E/kyn+wHSrlLq87HuK72xuXojQ9KjkI="; + }) + # batman-adv: compat: Add atomic mc_fowarding support for stable kernels + (fetchpatch { + url = "https://git.open-mesh.org/batman-adv.git/blobdiff_plain/f07a0c37ab278fb6a9e95cad89429b1282f1ab59..350adcaec82fbaa358a2406343b6130ac8dad126:/net/batman-adv/multicast.c"; + hash = "sha256-r/Xp5bmDo9GVfAF6bn2Xq+cOq5ddQe+D5s/h37uI6bM="; + }) + ]; + nativeBuildInputs = kernel.moduleBuildDependencies; makeFlags = kernel.makeFlags ++ [ "KERNELPATH=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" diff --git a/pkgs/os-specific/linux/batman-adv/version.nix b/pkgs/os-specific/linux/batman-adv/version.nix index 048318e3e33..12a7f26a336 100644 --- a/pkgs/os-specific/linux/batman-adv/version.nix +++ b/pkgs/os-specific/linux/batman-adv/version.nix @@ -1,9 +1,9 @@ { - version = "2021.4"; + version = "2022.0"; sha256 = { - batman-adv = "06zbyf8s7njn6wdm1fdq3kl8kx1vx4spxkgiy7dx0pq4c3qs5xyg"; - alfred = "15fbw80ix95zy8i4c6acm1631vxlz2hakjv4zv5wig74bp2bcyac"; - batctl = "1ryqz90av2p5pgmmpi1afmycd18zhpwz1i4f7r0s359jis86xndn"; + batman-adv = "sha256-STOHBbwgdwmshNdmaI5wJXEAnIJ8CjIHiOpR+4h3FKo="; + alfred = "sha256-q7odrGHsz81jKeczHQVV/syTd2D7NsbPVc5sHXUc/Zg="; + batctl = "sha256-iTlm+aLWpQch3hJM5i2l096cIOBVdspIK8VwTMWm9z0="; }; } diff --git a/pkgs/os-specific/linux/unscd/0001-adjust-socket-paths-for-nixos.patch b/pkgs/os-specific/linux/unscd/0001-adjust-socket-paths-for-nixos.patch new file mode 100644 index 00000000000..941b5c90a62 --- /dev/null +++ b/pkgs/os-specific/linux/unscd/0001-adjust-socket-paths-for-nixos.patch @@ -0,0 +1,41 @@ +From 9d76d183a97cb667a1ab6d95af69d6db745215df Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <milan@petabyte.dev> +Date: Tue, 1 Jun 2021 16:55:45 +0200 +Subject: [PATCH] adjust socket paths for nixos + +The original unscd would crash, because it is not allowed to create its +legacy socket at /var/run/.nscd_socket. + +This socket is only required for very old glibc versions, but removing it +is currently non-trivial, so we just move it somewhere, where it is +allowed to be created. A patch has been submitted upstream to make this +hack unnecessary. + +Also change /var/run to /run, since we shouldn't be using /var/run +anymore. +--- + nscd.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/nscd.c b/nscd.c +index a71e474..0cd7106 100644 +--- a/nscd.c ++++ b/nscd.c +@@ -2100,10 +2100,10 @@ static void main_loop(void) + ** Initialization + */ + +-#define NSCD_PIDFILE "/var/run/nscd/nscd.pid" +-#define NSCD_DIR "/var/run/nscd" +-#define NSCD_SOCKET "/var/run/nscd/socket" +-#define NSCD_SOCKET_OLD "/var/run/.nscd_socket" ++#define NSCD_PIDFILE "/run/nscd/nscd.pid" ++#define NSCD_DIR "/run/nscd" ++#define NSCD_SOCKET "/run/nscd/socket" ++#define NSCD_SOCKET_OLD "/run/nscd/socket_legacy" + + static smallint wrote_pidfile; + +-- +2.31.1 + diff --git a/pkgs/os-specific/linux/unscd/default.nix b/pkgs/os-specific/linux/unscd/default.nix new file mode 100644 index 00000000000..1f974029b01 --- /dev/null +++ b/pkgs/os-specific/linux/unscd/default.nix @@ -0,0 +1,76 @@ +{ fetchurl, fetchpatch, stdenv, systemd, lib }: + +stdenv.mkDerivation rec { + pname = "unscd"; + version = "0.54"; + + src = fetchurl { + url = "https://busybox.net/~vda/unscd/nscd-${version}.c"; + sha256 = "0iv4iwgs3sjnqnwd7dpcw6s7i4ar9q89vgsms32clx14fdqjrqch"; + }; + + unpackPhase = '' + runHook preUnpack + cp $src nscd.c + chmod u+w nscd.c + runHook postUnpack + ''; + + patches = [ + # Patches from Debian that have not (yet) been included upstream, but are useful to us + (fetchpatch { + url = "https://sources.debian.org/data/main/u/${pname}/${version}-1/debian/patches/change_invalidate_request_info_output"; + sha256 = "17whakazpisiq9nnw3zybaf7v3lqkww7n6jkx0igxv4z2r3mby6l"; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/u/${pname}/${version}-1/debian/patches/support_large_numbers_in_config"; + sha256 = "0jrqb4cwclwirpqfb6cvnmiff3sm2jhxnjwxa7h0wx78sg0y3bpp"; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/u/${pname}/${version}-1/debian/patches/no_debug_on_invalidate"; + sha256 = "0znwzb522zgikb0mm7awzpvvmy0wf5z7l3jgjlkdpgj0scxgz86w"; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/u/${pname}/${version}-1/debian/patches/notify_systemd_about_successful_startup"; + sha256 = "1ipwmbfwm65yisy74nig9960vxpjx683l3skgxfgssfx1jb9z2mc"; + }) + + # The original unscd would crash, because it is not allowed to create its + # legacy socket at /var/run/.nscd_socket. + # This socket is only required for very old glibc versions, but removing it + # is currently non-trivial, so we just move it somewhere, where it is + # allowed to be created. A patch has been submitted upstream to make this + # hack unnecessary. + # Also change /var/run to /run, since we shouldn't be using /var/run + # anymore. + # See also: http://lists.busybox.net/pipermail/busybox/2021-June/088866.html + ./0001-adjust-socket-paths-for-nixos.patch + ]; + + buildInputs = [ systemd ]; + + buildPhase = '' + runHook preBuild + gcc -Wall \ + -Wl,--sort-section -Wl,alignment \ + -Wl,--sort-common \ + -fomit-frame-pointer \ + -lsystemd \ + -o nscd nscd.c + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -Dm755 -t $out/bin nscd + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://busybox.net/~vda/unscd/"; + description = "Less buggy replacement for the glibc name service cache daemon"; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = with maintainers; [ petabyteboy ]; + }; +} diff --git a/pkgs/pkgs-lib/tests/formats.nix b/pkgs/pkgs-lib/tests/formats.nix index 6ace13044b4..aa51e2c5842 100644 --- a/pkgs/pkgs-lib/tests/formats.nix +++ b/pkgs/pkgs-lib/tests/formats.nix @@ -165,6 +165,7 @@ in runBuildTests { [attrs] foo = "foo" + [level1.level2.level3] level4 = "deep" ''; diff --git a/pkgs/servers/hbase/default.nix b/pkgs/servers/hbase/default.nix index 32d2c09de97..46521da8853 100644 --- a/pkgs/servers/hbase/default.nix +++ b/pkgs/servers/hbase/default.nix @@ -1,22 +1,55 @@ -{ lib, stdenv, fetchurl, makeWrapper }: -stdenv.mkDerivation rec { - pname = "hbase"; - version = "0.98.24"; +{ lib +, stdenv +, fetchurl +, makeWrapper +, jdk8_headless +, jdk11_headless +, nixosTests +}: - src = fetchurl { - url = "mirror://apache/hbase/${version}/hbase-${version}-hadoop2-bin.tar.gz"; - sha256 = "0kz72wqsii09v9hxkw10mzyvjhji5sx3l6aijjalgbybavpcxglb"; - }; +let common = { version, hash, jdk ? jdk11_headless, tests }: + stdenv.mkDerivation rec { + pname = "hbase"; + inherit version; + + src = fetchurl { + url = "mirror://apache/hbase/${version}/hbase-${version}-bin.tar.gz"; + inherit hash; + }; + + nativeBuildInputs = [ makeWrapper ]; + installPhase = '' + mkdir -p $out + cp -R * $out + wrapProgram $out/bin/hbase --set-default JAVA_HOME ${jdk.home} + ''; + + passthru = { inherit tests; }; - nativeBuildInputs = [ makeWrapper ]; - installPhase = '' - mkdir -p $out - cp -R * $out - ''; - meta = with lib; { - description = "A distributed, scalable, big data store"; - homepage = "https://hbase.apache.org"; - license = licenses.asl20; - platforms = lib.platforms.linux; + meta = with lib; { + description = "A distributed, scalable, big data store"; + homepage = "https://hbase.apache.org"; + license = licenses.asl20; + maintainers = with lib.maintainers; [ illustris ]; + platforms = lib.platforms.linux; + }; + }; +in +{ + hbase_1_7 = common { + version = "1.7.1"; + hash = "sha256-DrH2G79QLT8L0YTTmAGC9pUWU8semSaTOsrsQRCI2rY="; + jdk = jdk8_headless; + tests.standalone = nixosTests.hbase1; + }; + hbase_2_4 = common { + version = "2.4.11"; + hash = "sha256-m0vjUtPaj8czHHh+rQNJJgrFAM744cHd06KE0ut7QeU="; + tests.standalone = nixosTests.hbase2; + }; + hbase_3_0 = common { + version = "3.0.0-alpha-2"; + hash = "sha256-QPvgO1BeFWvMT5PdUm/SL92ZgvSvYIuJbzolbBTenz4="; + tests.standalone = nixosTests.hbase3; }; } diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/servers/hqplayerd/default.nix index 64a5fd18381..e2b3abc6c0a 100644 --- a/pkgs/servers/hqplayerd/default.nix +++ b/pkgs/servers/hqplayerd/default.nix @@ -21,36 +21,13 @@ , meson , ninja }: -let - # hqplayerd relies on some package versions available for the fc34 release, - # which has out-of-date pkgs compared to nixpkgs. The following drvs - # can/should be removed when the fc35 hqplayer rpm is made available. - gupnp_1_2 = gupnp.overrideAttrs (old: rec { - pname = "gupnp"; - version = "1.2.7"; - src = fetchurl { - url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-hEEnbxr9AXbm9ZUCajpQfu0YCav6BAJrrT8hYis1I+w="; - }; - }); - - gupnp-av_0_12 = gupnp-av.overrideAttrs (old: rec { - pname = "gupnp-av"; - version = "0.12.11"; - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-aJ3PFJKriZHa6ikTZaMlSKd9GiKU2FszYitVzKnOb9w="; - }; - nativeBuildInputs = lib.subtractLists [ meson ninja ] old.nativeBuildInputs; - }); -in stdenv.mkDerivation rec { pname = "hqplayerd"; version = "4.30.3-87"; src = fetchurl { - url = "https://www.signalyst.eu/bins/${pname}/fc34/${pname}-${version}sse42.fc34.x86_64.rpm"; - hash = "sha256-RX9KI+4HGDUJ3y3An1zTMJTz28Of2Awn7COeX6EQc38="; + url = "https://www.signalyst.eu/bins/${pname}/fc35/${pname}-${version}.fc35.x86_64.rpm"; + hash = "sha256-fEze4aScWDwHDTXU0GatdopQf6FWcywWCGhR/7zXK7A="; }; unpackPhase = '' @@ -66,8 +43,8 @@ stdenv.mkDerivation rec { gcc11.cc.lib gnome.rygel gssdp - gupnp_1_2 - gupnp-av_0_12 + gupnp + gupnp-av lame libgmpris llvmPackages_10.openmp diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix index ba163a719b1..03236b41082 100644 --- a/pkgs/servers/hydron/default.nix +++ b/pkgs/servers/hydron/default.nix @@ -2,26 +2,24 @@ buildGoModule rec { pname = "hydron"; - version = "3.0.4"; + version = "3.3.5"; src = fetchFromGitHub { owner = "bakape"; repo = "hydron"; rev = "v${version}"; - sha256 = "BfMkKwz7ITEnAIMGUHlBH/Dn9yLjWKoqFWupPo1s2cs="; + sha256 = "0c958dsw5pq9z8n1b9q9j8y6vgiqf6mmlsf77ncb7yrlilhbrz6s"; }; - nativeBuildInputs = [ pkg-config ]; - - vendorSha256 = "sha256-hvmIOCqVZTfV7EnkDUWiChynGkwTpHClMbW4LpbdAgo="; + vendorSha256 = "0cc8ar8p7lgg6rj76vhfp6bzrxyn5yaqjwj8i1bn0zp6sj6zcfam"; proxyVendor = true; - + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ffmpeg ]; meta = with lib; { homepage = "https://github.com/bakape/hydron"; description = "High performance media tagger and organizer"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ chiiruno ]; + maintainers = with maintainers; [ Madouura ]; }; } diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index d0f37c2b96d..a96bc951bcc 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2022-04-13"; + version = "2022-04-14"; pname = "oh-my-zsh"; - rev = "7ea6ff8d04acd665ebcd151d183ec67af5be1281"; + rev = "eb00b95d26e8f264af80f508d50ac32e50619027"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "xi/jhaOLYggoI/xkfcX1f+1/puWtcZ4WqlC105oYvF8="; + sha256 = "kEyvSBVgHuTaBQu2X9OJ+eu2serHq9IyfJHxTmpv2BU="; }; installPhase = '' diff --git a/pkgs/tools/audio/spotdl/default.nix b/pkgs/tools/audio/spotdl/default.nix index e407a5f9907..7753818fb1f 100644 --- a/pkgs/tools/audio/spotdl/default.nix +++ b/pkgs/tools/audio/spotdl/default.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "spotdl"; - version = "3.9.4"; + version = "3.9.5"; src = fetchFromGitHub { owner = "spotDL"; repo = "spotify-downloader"; rev = "v${version}"; - sha256 = "sha256-PJ9m+697bdrhHZ80wJvL6V366Vn3tmPfioK1sZAyB/Q="; + hash = "sha256-Zdm+OVcFgOO8kbJDNQSVDLnIHzhvm9EPbcG95mNrnTk="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -22,10 +22,11 @@ python3.pkgs.buildPythonApplication rec { rapidfuzz mutagen ytmusicapi + yt-dlp beautifulsoup4 requests unidecode - yt-dlp + setuptools ]; checkInputs = with python3.pkgs; [ diff --git a/pkgs/tools/compression/advancecomp/default.nix b/pkgs/tools/compression/advancecomp/default.nix index 00ce6af1d59..e7db524e729 100644 --- a/pkgs/tools/compression/advancecomp/default.nix +++ b/pkgs/tools/compression/advancecomp/default.nix @@ -1,40 +1,23 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , autoreconfHook , zlib }: stdenv.mkDerivation rec { pname = "advancecomp"; - version = "2.1"; + version = "2.3"; src = fetchFromGitHub { owner = "amadvance"; repo = "advancecomp"; rev = "v${version}"; - sha256 = "1pd6czamamrd0ppk5a3a65hcgdlqwja98aandhqiajhnibwldv8x"; + hash = "sha256-klyTqqZs5TwadgDP8LJ1wUhXlO+/kQPM6qhiSki31Q8="; }; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ zlib ]; - patches = [ - (fetchpatch { - name = "CVE-2019-9210.patch"; - url = "https://github.com/amadvance/advancecomp/commit/fcf71a89265c78fc26243574dda3a872574a5c02.patch"; - sha256 = "0cdv9g87c1y8zwhqkd9ba2zjw4slcvg7yzcqv43idvnwb5fl29n7"; - excludes = [ "doc/history.d" ]; - }) - - # Pull upstream fix for gcc-11: - (fetchpatch { - name = "gcc-11.patch"; - url = "https://github.com/amadvance/advancecomp/commit/7b08f7a2af3f66ab95437e4490499cebb20e5e41.patch"; - sha256 = "0gpppq6b760m1429g7d808ipdgb4lrqc1b6xk2457y66pbaiwc9s"; - }) - ]; - # autover.sh relies on 'git describe', which obviously doesn't work as we're not cloning # the full git repo. so we have to put the version number in `.version`, otherwise # the binaries get built reporting "none" as their version number. diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index 3d7608ac094..beaf2c1f213 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation { url = "https://raw.githubusercontent.com/archlinux/svntogit-community/a2ec92f05de006b56d16ac6a6c370d54a554861a/cuneiform/trunk/build-fix.patch"; sha256 = "19cmrlx4khn30qqrpyayn7bicg8yi0wpz1x1bvqqrbvr3kwldxyj"; }) + (fetchurl { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-text/cuneiform/files/cuneiform-1.1.0-gcc11.patch"; + sha256 = "14bp2f4dvlgxnpdza1rgszhkbxhp6p7lhgnb1s7c1x7vwdrx0ri7"; + }) ]; postPatch = '' diff --git a/pkgs/tools/misc/cht.sh/default.nix b/pkgs/tools/misc/cht.sh/default.nix index 08769893272..0364065be24 100644 --- a/pkgs/tools/misc/cht.sh/default.nix +++ b/pkgs/tools/misc/cht.sh/default.nix @@ -10,15 +10,15 @@ stdenv.mkDerivation { pname = "cht.sh"; - version = "unstable-2022-01-01"; + version = "unstable-2022-04-17"; nativeBuildInputs = [ makeWrapper ]; src = fetchFromGitHub { owner = "chubin"; repo = "cheat.sh"; - rev = "46d1a5f73c6b88da15d809154245dbf234e9479e"; - sha256 = "6uEbxkkNV5EGhiCSoWJgfRUUqUS3OFTVOZFlVyMp/x8="; + rev = "7f769d6f3697541e55fd3ea9b71f190296529e48"; + sha256 = "+V3q71neW9X0JPJHqvNGopvIJfUv0VD9GKkz7YqN6Eo="; }; # Fix ".cht.sh-wrapped" in the help message diff --git a/pkgs/tools/misc/edid-decode/default.nix b/pkgs/tools/misc/edid-decode/default.nix index f39fc1b5524..2e8af7bcd9c 100644 --- a/pkgs/tools/misc/edid-decode/default.nix +++ b/pkgs/tools/misc/edid-decode/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { cp edid-decode $out/bin ''; - meta = { + meta = with lib; { description = "EDID decoder and conformance tester"; homepage = "https://cgit.freedesktop.org/xorg/app/edid-decode/"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.chiiruno ]; + license = licenses.mit; + maintainers = with maintainers; [ Madouura ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/misc/tewisay/default.nix b/pkgs/tools/misc/tewisay/default.nix index 3434ac110b3..3ff7259b9e0 100644 --- a/pkgs/tools/misc/tewisay/default.nix +++ b/pkgs/tools/misc/tewisay/default.nix @@ -26,10 +26,10 @@ buildGoPackage rec { --prefix COWPATH : $out/share/tewisay/cows ''; - meta = { + meta = with lib; { homepage = "https://github.com/lucy/tewisay"; description = "Cowsay replacement with unicode and partial ansi escape support"; - license = lib.licenses.cc0; - maintainers = [ lib.maintainers.chiiruno ]; + license = licenses.cc0; + maintainers = with maintainers; [ Madouura ]; }; } diff --git a/pkgs/tools/networking/ssmtp/default.nix b/pkgs/tools/networking/ssmtp/default.nix deleted file mode 100644 index ec309a4a2ce..00000000000 --- a/pkgs/tools/networking/ssmtp/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, stdenv, fetchurl, tlsSupport ? true, openssl }: - -stdenv.mkDerivation rec { - pname = "ssmtp"; - version = "2.64"; - - src = fetchurl { - url = "mirror://debian/pool/main/s/ssmtp/ssmtp_${version}.orig.tar.bz2"; - sha256 = "0dps8s87ag4g3jr6dk88hs9zl46h3790marc5c2qw7l71k4pvhr2"; - }; - - # A request has been made to merge this patch into ssmtp. - # See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=858781 - patches = [ ./ssmtp_support_AuthPassFile_parameter.patch ]; - - configureFlags = [ - "--sysconfdir=/etc" - (lib.enableFeature tlsSupport "ssl") - ]; - - postConfigure = '' - # Don't run the script that interactively generates a config file. - # Also don't install the broken, cyclic symlink /lib/sendmail. - sed -e '/INSTALLED_CONFIGURATION_FILE/d' \ - -e 's|/lib/sendmail|$(TMPDIR)/sendmail|' \ - -i Makefile - substituteInPlace Makefile \ - --replace '$(INSTALL) -s' '$(INSTALL) -s --strip-program $(STRIP)' - ''; - - installFlags = [ "etcdir=$(out)/etc" ]; - - installTargets = [ "install" "install-sendmail" ]; - - buildInputs = lib.optional tlsSupport openssl; - - NIX_LDFLAGS = lib.optionalString tlsSupport "-lcrypto"; - - meta = with lib; { - description = "simple MTA to deliver mail from a computer to a mail hub"; - platforms = platforms.linux; - license = licenses.gpl2; - maintainers = with maintainers; [ basvandijk ]; - }; -} diff --git a/pkgs/tools/networking/ssmtp/ssmtp_support_AuthPassFile_parameter.patch b/pkgs/tools/networking/ssmtp/ssmtp_support_AuthPassFile_parameter.patch deleted file mode 100644 index 371c0f6de2b..00000000000 --- a/pkgs/tools/networking/ssmtp/ssmtp_support_AuthPassFile_parameter.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -Naurb a/ssmtp.c b/ssmtp.c ---- a/ssmtp.c 2009-11-23 10:55:11.000000000 +0100 -+++ b/ssmtp.c 2017-03-25 03:00:26.508283016 +0100 -@@ -57,6 +57,7 @@ - char arpadate[ARPADATE_LENGTH]; - char *auth_user = (char)NULL; - char *auth_pass = (char)NULL; -+char *auth_passfile = (char)NULL; - char *auth_method = (char)NULL; /* Mechanism for SMTP authentication */ - char *mail_domain = (char)NULL; - char *from = (char)NULL; /* Use this as the From: address */ -@@ -1053,6 +1054,15 @@ - log_event(LOG_INFO, "Set AuthPass=\"%s\"\n", auth_pass); - } - } -+ else if(strcasecmp(p, "AuthPassFile") == 0 && !auth_passfile) { -+ if((auth_passfile = strdup(q)) == (char *)NULL) { -+ die("parse_config() -- strdup() failed"); -+ } -+ -+ if(log_level > 0) { -+ log_event(LOG_INFO, "Set AuthPassFile=\"%s\"\n", auth_passfile); -+ } -+ } - else if(strcasecmp(p, "AuthMethod") == 0 && !auth_method) { - if((auth_method = strdup(q)) == (char *)NULL) { - die("parse_config() -- strdup() failed"); -@@ -1415,6 +1425,8 @@ - struct passwd *pw; - int i, sock; - uid_t uid; -+ FILE *fp; -+ char pass_buf[BUF_SZ+1]; - bool_t minus_v_save, leadingdot, linestart = True; - int timeout = 0; - int bufsize = sizeof(b)-1; -@@ -1433,6 +1445,17 @@ - log_event(LOG_INFO, "%s not found", config_file); - } - -+ if(auth_passfile != (char *)NULL) { -+ if((fp = fopen(auth_passfile, "r")) == (FILE *)NULL) { -+ die("Could not open the AuthPassFile %s", auth_passfile); -+ } -+ if (fgets(pass_buf, BUF_SZ, fp) == NULL) { -+ die("Error while reading a line from the AuthPassFile %s, or it is empty", auth_passfile); -+ } -+ fclose(fp); -+ auth_pass = strdup(pass_buf); -+ } -+ - if((p = strtok(pw->pw_gecos, ";,"))) { - if((gecos = strdup(p)) == (char *)NULL) { - die("ssmtp() -- strdup() failed"); -diff -Naurb a/ssmtp.conf.5 b/ssmtp.conf.5 ---- a/ssmtp.conf.5 2008-02-29 03:50:15.000000000 +0100 -+++ b/ssmtp.conf.5 2017-03-25 01:45:52.890165426 +0100 -@@ -61,6 +61,11 @@ - .Pp - .It Cm AuthPass - The password to use for SMTP AUTH. -+It is recommended to use AuthPassFile which also takes precedence over AuthPass. -+.Pp -+.It Cm AuthPassFile -+A file that should contain the password to use for SMTP AUTH. -+This takes precedence over AuthPass. - .Pp - .It Cm AuthMethod - The authorization method to use. diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix index ac0d3fe196f..80ef87217d8 100644 --- a/pkgs/tools/package-management/home-manager/default.nix +++ b/pkgs/tools/package-management/home-manager/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "home-manager"; - version = "2021-12-25"; + version = "2022-04-17"; src = fetchFromGitHub { owner = "nix-community"; repo = "home-manager"; - rev = "48f2b381dd397ec88040d3354ac9c036739ba139"; - sha256 = "1i9v94brh9vhyhzcqyfj64nzhaibdj0sw74pxgk4bcsp0hqawgcd"; + rev = "620ed197f3624dafa5f42e61d5c043f39b8df366"; + sha256 = "sha256-BoBvGT71yOfrNDTZQs7+FX0zb4yjMBETgIjtTsdJw+o="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/cryptomator/default.nix b/pkgs/tools/security/cryptomator/default.nix index 05e9f1ef384..57e420f8669 100644 --- a/pkgs/tools/security/cryptomator/default.nix +++ b/pkgs/tools/security/cryptomator/default.nix @@ -6,13 +6,13 @@ let pname = "cryptomator"; - version = "1.6.7"; + version = "1.6.8"; src = fetchFromGitHub { owner = "cryptomator"; repo = "cryptomator"; rev = version; - sha256 = "sha256-hOILOdVYBnS9XuEXaIJcf2bPF72Lcr7IBX4CFCIsC8k="; + sha256 = "sha256-2bvIjfutxfTPBtYiSXpgdEh63Eg74uqSf8CDo/Oma0U="; }; # perform fake build to make a fixed-output derivation out of the files downloaded from maven central (120MB) @@ -37,7 +37,7 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256-XFqXjNjPN2vwA3jay7TS79S4FHksjjrODdD/p4oTvpg="; + outputHash = "sha256-quYUJX/JErtWuUQBYXXee/uZGkO0UBr4qxcGticxGUc="; doCheck = false; }; @@ -46,9 +46,14 @@ in stdenv.mkDerivation rec { inherit pname version src; buildPhase = '' + VERSION=${version} + SEMVER_STR=${version} + mvn -Plinux package --offline -Dmaven.test.skip=true -Dmaven.repo.local=$(cp -dpR ${deps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 ''; + + # This is based on the instructins in https://github.com/cryptomator/cryptomator/blob/develop/dist/linux/appimage/build.sh installPhase = '' mkdir -p $out/bin/ $out/share/cryptomator/libs/ $out/share/cryptomator/mods/ @@ -63,10 +68,14 @@ in stdenv.mkDerivation rec { makeWrapper ${jre}/bin/java $out/bin/cryptomator \ --add-flags "--class-path '$out/share/cryptomator/libs/*'" \ --add-flags "--module-path '$out/share/cryptomator/mods'" \ + --add-flags "-Dcryptomator.logDir='~/.local/share/Cryptomator/logs'" \ + --add-flags "-Dcryptomator.pluginDir='~/.local/share/Cryptomator/plugins'" \ --add-flags "-Dcryptomator.settingsPath='~/.config/Cryptomator/settings.json'" \ --add-flags "-Dcryptomator.ipcSocketPath='~/.config/Cryptomator/ipc.socket'" \ - --add-flags "-Dcryptomator.logDir='~/.local/share/Cryptomator/logs'" \ --add-flags "-Dcryptomator.mountPointsDir='~/.local/share/Cryptomator/mnt'" \ + --add-flags "-Dcryptomator.showTrayIcon=false" \ + --add-flags "-Dcryptomator.buildNumber='nix'" \ + --add-flags "-Dcryptomator.appVersion='${version}'" \ --add-flags "-Djdk.gtk.version=3" \ --add-flags "-Xss20m" \ --add-flags "-Xmx512m" \ @@ -79,6 +88,14 @@ in stdenv.mkDerivation rec { # install desktop entry and icons cp -r ${src}/dist/linux/appimage/resources/AppDir/usr/* $out/ + # The directory is read only when copied, enable read to install additional files + chmod +w -R $out/ + cp ${src}/dist/linux/common/org.cryptomator.Cryptomator256.png $out/share/icons/hicolor/256x256/apps/org.cryptomator.Cryptomator.png + cp ${src}/dist/linux/common/org.cryptomator.Cryptomator512.png $out/share/icons/hicolor/512x512/apps/org.cryptomator.Cryptomator.png + cp ${src}/dist/linux/common/org.cryptomator.Cryptomator.svg $out/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg + cp ${src}/dist/linux/common/org.cryptomator.Cryptomator.desktop $out/share/applications/org.cryptomator.Cryptomator.desktop + cp ${src}/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml $out/share/metainfo/org.cryptomator.Cryptomator.metainfo.xml + cp ${src}/dist/linux/common/application-vnd.cryptomator.vault.xml $out/share/mime/packages/application-vnd.cryptomator.vault.xml ''; nativeBuildInputs = [ autoPatchelfHook maven makeWrapper wrapGAppsHook jdk ]; diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix index 626afe7706a..d8df6c98c1c 100644 --- a/pkgs/tools/security/gitleaks/default.nix +++ b/pkgs/tools/security/gitleaks/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.6.1"; + version = "8.7.0"; src = fetchFromGitHub { owner = "zricethezav"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rXnP9vU8kHkMPl7Xur4pf3rvw12ADtkZxZnBO1LaFzs="; + sha256 = "sha256-4ED7xmwbFXs6OnCtG+xrY50kBsgESxw/a8slhWOo+30="; }; - vendorSha256 = "sha256-gelUrZOYiThO0+COIv9cOgho/tjv7ZqSKOktWIbdADw="; + vendorSha256 = "sha256-ls6zuouCAmE3y9011CK1YADy/v87Ft8tb85LyJ4bEF4="; ldflags = [ "-s" diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index fc391ea8539..4bff8ab3ae3 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -38,11 +38,11 @@ in stdenv.mkDerivation rec { pname = "sile"; - version = "0.12.4"; + version = "0.12.5"; src = fetchurl { url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "1n46q7xwawz5nipmyz4gy0njaq5svidi9r54wxry6h95b70ax3r2"; + sha256 = "0z9wdiqwarysh3lhxss3w53vq58ml46bdi9ymr853kfl7m4gz5yy"; }; configureFlags = [ diff --git a/pkgs/tools/video/svt-av1/default.nix b/pkgs/tools/video/svt-av1/default.nix index 469f76fdc2b..3c45f2608eb 100644 --- a/pkgs/tools/video/svt-av1/default.nix +++ b/pkgs/tools/video/svt-av1/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { ]; platforms = platforms.unix; broken = stdenv.isAarch64; # undefined reference to `cpuinfo_arm_linux_init' - maintainers = with maintainers; [ chiiruno ]; + maintainers = with maintainers; [ Madouura ]; }; } diff --git a/pkgs/tools/wayland/wl-mirror/default.nix b/pkgs/tools/wayland/wl-mirror/default.nix index c1d67489829..02907ba8d23 100644 --- a/pkgs/tools/wayland/wl-mirror/default.nix +++ b/pkgs/tools/wayland/wl-mirror/default.nix @@ -26,16 +26,17 @@ in stdenv.mkDerivation rec { pname = "wl-mirror"; - version = "0.10.0"; + version = "0.11.2"; src = fetchFromGitHub { owner = "Ferdi265"; repo = "wl-mirror"; rev = "v${version}"; - hash = "sha256-ygzSLbzn4P/BdYbqUDduUGwSbRHeU/OBYOX2uznVy1g="; + hash = "sha256-D5uUKaepcSW9v2x6uBeLGXAyuLorlt4Lb6lZD/prfp8="; }; - patchPhase = '' + postPatch = '' + echo 'v${version}' > version.txt substituteInPlace CMakeLists.txt \ --replace 'WL_PROTOCOL_DIR "/usr' 'WL_PROTOCOL_DIR "${wayland-protocols}' \ --replace 'WLR_PROTOCOL_DIR "/usr' 'WLR_PROTOCOL_DIR "${wlr-protocols}' diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 62e809c01a6..1e5688a453e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1207,6 +1207,7 @@ mapAliases ({ sqliteInteractive = throw "'sqliteInteractive' has been renamed to/replaced by 'sqlite-interactive'"; # Converted to throw 2022-02-22 squid4 = squid; # added 2019-08-22 sshfsFuse = throw "'sshfsFuse' has been renamed to/replaced by 'sshfs-fuse'"; # Converted to throw 2022-02-22 + ssmtp = throw "'ssmtp' has been removed due to the software being unmaintained. 'msmtp' can be used as a replacement"; # Added 2022-04-17 stanchion = throw "Stanchion was part of riak-cs which is not maintained anymore"; # added 2020-10-14 steam-run-native = steam-run; # added 2022-02-21 stumpwm-git = throw "stumpwm-git has been broken for a long time and lispPackages.stumpwm follows Quicklisp that is close to git version"; # Added 2021-05-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c818f46df93..5f4fc54285d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -277,12 +277,8 @@ with pkgs; catatonit = callPackage ../applications/virtualization/catatonit { }; - cen64 = callPackage ../applications/emulators/cen64 { }; - btdu = callPackage ../tools/misc/btdu { }; - uxn = callPackage ../applications/emulators/uxn { }; - cereal = callPackage ../development/libraries/cereal { }; certgraph = callPackage ../tools/security/certgraph { }; @@ -413,8 +409,6 @@ with pkgs; protoc-gen-validate = callPackage ../development/tools/protoc-gen-validate { }; - proton-caller = callPackage ../applications/emulators/proton-caller { }; - ptags = callPackage ../development/tools/misc/ptags { }; ptouch-print = callPackage ../misc/ptouch-print { }; @@ -1194,6 +1188,262 @@ with pkgs; breitbandmessung = callPackage ../applications/networking/breitbandmessung { }; + ### APPLICATIONS/EMULATORS + + atari800 = callPackage ../applications/emulators/atari800 { }; + + ataripp = callPackage ../applications/emulators/atari++ { }; + + attract-mode = callPackage ../applications/emulators/attract-mode { }; + + basiliskii = callPackage ../applications/emulators/basiliskii { }; + + bochs = callPackage ../applications/emulators/bochs { + wxGTK = wxGTK30; + }; + + caprice32 = callPackage ../applications/emulators/caprice32 { }; + + ccemux = callPackage ../applications/emulators/ccemux { }; + + cdemu-client = callPackage ../applications/emulators/cdemu/client.nix { }; + + cdemu-daemon = callPackage ../applications/emulators/cdemu/daemon.nix { }; + + cen64 = callPackage ../applications/emulators/cen64 { }; + + citra = libsForQt5.callPackage ../applications/emulators/citra { }; + + collapseos-cvm = callPackage ../applications/emulators/collapseos-cvm { }; + + craftos-pc = callPackage ../applications/emulators/craftos-pc { }; + + darcnes = callPackage ../applications/emulators/darcnes { }; + + desmume = callPackage ../applications/emulators/desmume { }; + + dgen-sdl = callPackage ../applications/emulators/dgen-sdl { }; + + dlx = callPackage ../applications/emulators/dlx { }; + + dosbox = callPackage ../applications/emulators/dosbox { }; + + dosbox-staging = callPackage ../applications/emulators/dosbox-staging { }; + + duckstation = libsForQt5.callPackage ../applications/emulators/duckstation {}; + + dynamips = callPackage ../applications/emulators/dynamips { }; + + emu2 = callPackage ../applications/emulators/emu2 { }; + + emulationstation = callPackage ../applications/emulators/emulationstation { }; + + fceux = libsForQt5.callPackage ../applications/emulators/fceux { }; + + firebird-emu = libsForQt5.callPackage ../applications/emulators/firebird-emu { }; + + flycast = callPackage ../applications/emulators/flycast { }; + + fsuae = callPackage ../applications/emulators/fs-uae { }; + + fsuae-launcher = callPackage ../applications/emulators/fs-uae/launcher.nix { }; + + fuse-emulator = callPackage ../applications/emulators/fuse-emulator {}; + + gcdemu = callPackage ../applications/emulators/cdemu/gui.nix { }; + + gensgs = pkgsi686Linux.callPackage ../applications/emulators/gens-gs { }; + + goldberg-emu = callPackage ../applications/emulators/goldberg-emu { }; + + gxemul = callPackage ../applications/emulators/gxemul { }; + + hatari = callPackage ../applications/emulators/hatari { }; + + hercules = callPackage ../applications/emulators/hercules { }; + + image-analyzer = callPackage ../applications/emulators/cdemu/analyzer.nix { }; + + kega-fusion = pkgsi686Linux.callPackage ../applications/emulators/kega-fusion { }; + + lambda-delta = callPackage ../applications/emulators/lambda-delta { }; + + libdsk = callPackage ../applications/emulators/libdsk { }; + + libmirage = callPackage ../applications/emulators/cdemu/libmirage.nix { }; + + maiko = callPackage ../applications/emulators/maiko { + inherit (xorg) libX11; + }; + + mame = libsForQt514.callPackage ../applications/emulators/mame { + inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback; + }; + + mednafen = callPackage ../applications/emulators/mednafen { + inherit (darwin) libiconv; + }; + + mednafen-server = callPackage ../applications/emulators/mednafen/server.nix { }; + + mednaffe = callPackage ../applications/emulators/mednaffe { }; + + melonDS = libsForQt5.callPackage ../applications/emulators/melonDS { }; + + mgba = libsForQt5.callPackage ../applications/emulators/mgba { }; + + mupen64plus = callPackage ../applications/emulators/mupen64plus { }; + + nestopia = callPackage ../applications/emulators/nestopia { }; + + np2kai = callPackage ../applications/emulators/np2kai { }; + + oberon-risc-emu = callPackage ../applications/emulators/oberon-risc-emu { }; + + openmsx = callPackage ../applications/emulators/openmsx { + python = python3; + }; + + pcem = callPackage ../applications/emulators/pcem { }; + + pcsx2 = callPackage ../applications/emulators/pcsx2 { + wxGTK = wxGTK30-gtk3; + }; + + pcsxr = callPackage ../applications/emulators/pcsxr { }; + + ppsspp = libsForQt5.callPackage ../applications/emulators/ppsspp { }; + + proton-caller = callPackage ../applications/emulators/proton-caller { }; + + punes = libsForQt5.callPackage ../applications/emulators/punes { }; + + py65 = python3Packages.callPackage ../applications/emulators/py65 { }; + + resim = callPackage ../applications/emulators/resim {}; + + retrofe = callPackage ../applications/emulators/retrofe { }; + + rpcs3 = libsForQt5.callPackage ../applications/emulators/rpcs3 { }; + + ruffle = callPackage ../applications/emulators/ruffle { }; + + ryujinx = callPackage ../applications/emulators/ryujinx { }; + + sameboy = callPackage ../applications/emulators/sameboy { }; + + simh = callPackage ../applications/emulators/simh { }; + + simplenes = callPackage ../applications/emulators/simplenes { }; + + snes9x-gtk = callPackage ../applications/emulators/snes9x-gtk { }; + + stella = callPackage ../applications/emulators/stella { }; + + termtekst = callPackage ../applications/emulators/termtekst { }; + + tilem = callPackage ../applications/emulators/tilem { }; + + tiny8086 = callPackage ../applications/emulators/tiny8086 { }; + + tinyemu = callPackage ../applications/emulators/tinyemu { }; + + uae = callPackage ../applications/emulators/uae { }; + + uxn = callPackage ../applications/emulators/uxn { }; + + vbam = callPackage ../applications/emulators/vbam { }; + + vice = callPackage ../applications/emulators/vice { }; + + winetricks = callPackage ../applications/emulators/wine/winetricks.nix { + inherit (gnome) zenity; + }; + + xcpc = callPackage ../applications/emulators/xcpc { }; + + yapesdl = callPackage ../applications/emulators/yapesdl { }; + + zesarux = callPackage ../applications/emulators/zesarux { }; + + zsnes = pkgsi686Linux.callPackage ../applications/emulators/zsnes { }; + + ### APPLICATIONS/EMULATORS/BSNES + + ares = callPackage ../applications/emulators/bsnes/ares { }; + + bsnes-hd = callPackage ../applications/emulators/bsnes/bsnes-hd { + inherit (gnome2) gtksourceview; + inherit (darwin.apple_sdk.frameworks) Cocoa OpenAL; + }; + + higan = callPackage ../applications/emulators/bsnes/higan { }; + + ### APPLICATIONS/EMULATORS/DOLPHIN-EMU + + dolphin-emu = callPackage ../applications/emulators/dolphin-emu { }; + + dolphin-emu-beta = qt5.callPackage ../applications/emulators/dolphin-emu/master.nix { + inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; + }; + + dolphin-emu-primehack = qt5.callPackage ../applications/emulators/dolphin-emu/primehack.nix { + inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; + }; + + ### APPLICATIONS/EMULATORS/RETROARCH + + retroarchBare = callPackage ../applications/emulators/retroarch { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) AppKit Foundation; + }; + + retroarchFull = retroarch.override { + cores = builtins.filter + # Remove cores not supported on platform + (c: c ? libretroCore && (lib.meta.availableOn stdenv.hostPlatform c)) + (builtins.attrValues libretro); + }; + + wrapRetroArch = { retroarch }: + callPackage ../applications/emulators/retroarch/wrapper.nix + { inherit retroarch; }; + + retroarch = wrapRetroArch { retroarch = retroarchBare; }; + + libretro = recurseIntoAttrs + (callPackage ../applications/emulators/retroarch/cores.nix { + retroarch = retroarchBare; + }); + + kodi-retroarch-advanced-launchers = + callPackage ../applications/emulators/retroarch/kodi-advanced-launchers.nix { }; + + ### APPLICATIONS/EMULATORS/YUZU + + yuzu-mainline = import ../applications/emulators/yuzu { + branch = "mainline"; + inherit libsForQt5 fetchFromGitHub; + }; + yuzu-ea = import ../applications/emulators/yuzu { + branch = "early-access"; + inherit libsForQt5 fetchFromGitHub; + }; + + ### APPLICATIONS/EMULATORS/COMMANDERX16 + + x16-emulator = callPackage ../applications/emulators/commanderx16/emulator.nix { }; + x16-rom = callPackage ../applications/emulators/commanderx16/rom.nix { }; + x16-run = (callPackage ../applications/emulators/commanderx16/run.nix { }) { + emulator = x16-emulator; + rom = x16-rom; + }; + + yabause = libsForQt5.callPackage ../applications/emulators/yabause { + freeglut = null; + openal = null; + }; + ### APPLICATIONS/TERMINAL-EMULATORS alacritty = callPackage ../applications/terminal-emulators/alacritty { @@ -1459,6 +1709,8 @@ with pkgs; apitrace = libsForQt514.callPackage ../applications/graphics/apitrace {}; + argagg = callPackage ../development/libraries/argagg { }; + argtable = callPackage ../development/libraries/argtable { }; arguments = callPackage ../development/libraries/arguments { }; @@ -2409,10 +2661,6 @@ with pkgs; boca = callPackage ../development/libraries/boca { }; - bochs = callPackage ../applications/emulators/bochs { - wxGTK = wxGTK30; - }; - bubblewrap = callPackage ../tools/admin/bubblewrap { }; borgbackup = callPackage ../tools/backup/borgbackup { }; @@ -2467,10 +2715,6 @@ with pkgs; breakpointHook = assert stdenv.isLinux; makeSetupHook { } ../build-support/setup-hooks/breakpoint-hook.sh; - py65 = python3Packages.callPackage ../applications/emulators/py65 { }; - - simh = callPackage ../applications/emulators/simh { }; - btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { }; btrfs-snap = callPackage ../tools/filesystems/btrfs-snap { }; @@ -2592,20 +2836,10 @@ with pkgs; cde = callPackage ../tools/package-management/cde { }; - cdemu-daemon = callPackage ../applications/emulators/cdemu/daemon.nix { }; - - cdemu-client = callPackage ../applications/emulators/cdemu/client.nix { }; - ceres-solver = callPackage ../development/libraries/ceres-solver { gflags = null; # only required for examples/tests }; - craftos-pc = callPackage ../applications/emulators/craftos-pc { }; - - gcdemu = callPackage ../applications/emulators/cdemu/gui.nix { }; - - image-analyzer = callPackage ../applications/emulators/cdemu/analyzer.nix { }; - cbor-diag = callPackage ../development/tools/cbor-diag { }; cassowary = callPackage ../tools/networking/cassowary { }; @@ -2995,10 +3229,6 @@ with pkgs; djv = callPackage ../applications/graphics/djv { }; - dlx = callPackage ../applications/emulators/dlx { }; - - dgen-sdl = callPackage ../applications/emulators/dgen-sdl { }; - dnschef = python3Packages.callPackage ../tools/networking/dnschef { }; doitlive = callPackage ../tools/misc/doitlive { }; @@ -3816,8 +4046,6 @@ with pkgs; ropgadget = with python3Packages; toPythonApplication ropgadget; - ryujinx = callPackage ../applications/emulators/ryujinx { }; - scour = with python3Packages; toPythonApplication scour; s2png = callPackage ../tools/graphics/s2png { }; @@ -3840,8 +4068,6 @@ with pkgs; simg2img = callPackage ../tools/filesystems/simg2img { }; - simplenes = callPackage ../applications/emulators/simplenes { }; - snippetpixie = callPackage ../tools/text/snippetpixie { }; snowcat = callPackage ../tools/security/snowcat { }; @@ -4298,8 +4524,6 @@ with pkgs; citrix_workspace_21_12_0 ; - citra = libsForQt5.callPackage ../applications/emulators/citra { }; - cmigemo = callPackage ../tools/text/cmigemo { }; cmst = libsForQt5.callPackage ../tools/networking/cmst { }; @@ -4910,14 +5134,6 @@ with pkgs; dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { }; - dolphin-emu = callPackage ../applications/emulators/dolphin-emu { }; - dolphin-emu-beta = qt5.callPackage ../applications/emulators/dolphin-emu/master.nix { - inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; - }; - dolphin-emu-primehack = qt5.callPackage ../applications/emulators/dolphin-emu/primehack.nix { - inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; - }; - domoticz = callPackage ../servers/domoticz { }; doomseeker = qt5.callPackage ../applications/misc/doomseeker { }; @@ -5524,8 +5740,6 @@ with pkgs; fio = callPackage ../tools/system/fio { }; - firebird-emu = libsForQt5.callPackage ../applications/emulators/firebird-emu { }; - flamerobin = callPackage ../applications/misc/flamerobin { }; flashrom = callPackage ../tools/misc/flashrom { }; @@ -7513,8 +7727,6 @@ with pkgs; node2nix = nodePackages.node2nix; - np2kai = callPackage ../applications/emulators/np2kai { }; - openipmi = callPackage ../tools/system/openipmi { }; ox = callPackage ../applications/editors/ox { }; @@ -7942,14 +8154,6 @@ with pkgs; mdp = callPackage ../applications/misc/mdp { }; - mednafen = callPackage ../applications/emulators/mednafen { - inherit (darwin) libiconv; - }; - - mednafen-server = callPackage ../applications/emulators/mednafen/server.nix { }; - - mednaffe = callPackage ../applications/emulators/mednaffe { }; - megacli = callPackage ../tools/misc/megacli { }; megatools = callPackage ../tools/networking/megatools { }; @@ -7964,8 +8168,6 @@ with pkgs; mfoc = callPackage ../tools/security/mfoc { }; - mgba = libsForQt5.callPackage ../applications/emulators/mgba { }; - microdnf = callPackage ../tools/package-management/microdnf { }; microplane = callPackage ../tools/misc/microplane { }; @@ -8184,8 +8386,6 @@ with pkgs; nerdfonts = callPackage ../data/fonts/nerdfonts { }; - nestopia = callPackage ../applications/emulators/nestopia { }; - netatalk = callPackage ../tools/filesystems/netatalk { }; netavark = callPackage ../tools/networking/netavark { }; @@ -9636,8 +9836,6 @@ with pkgs; rubocop = rubyPackages.rubocop; - ruffle = callPackage ../applications/emulators/ruffle { }; - runningx = callPackage ../tools/X11/runningx { }; rund = callPackage ../development/tools/rund { }; @@ -10231,8 +10429,6 @@ with pkgs; sshoogr = callPackage ../tools/networking/sshoogr { }; - ssmtp = callPackage ../tools/networking/ssmtp { }; - ssocr = callPackage ../applications/misc/ssocr { }; ssss = callPackage ../tools/security/ssss { }; @@ -10518,8 +10714,6 @@ with pkgs; tiledb = callPackage ../development/libraries/tiledb { }; - tilem = callPackage ../applications/emulators/tilem { }; - timemachine = callPackage ../applications/audio/timemachine { }; timelapse-deflicker = callPackage ../applications/graphics/timelapse-deflicker { }; @@ -10542,10 +10736,6 @@ with pkgs; tinycbor = callPackage ../development/libraries/tinycbor { }; - tiny8086 = callPackage ../applications/emulators/tiny8086 { }; - - tinyemu = callPackage ../applications/emulators/tinyemu { }; - tinyfecvpn = callPackage ../tools/networking/tinyfecvpn { }; tinygltf = callPackage ../development/libraries/tinygltf { }; @@ -12119,8 +12309,6 @@ with pkgs; flasm = callPackage ../development/compilers/flasm { }; - flycast = callPackage ../applications/emulators/flycast { }; - flyctl = callPackage ../development/web/flyctl { }; fluidd = callPackage ../applications/misc/fluidd { }; @@ -14342,7 +14530,6 @@ with pkgs; mspdebug = callPackage ../development/misc/msp430/mspdebug.nix { }; vc4-newlib = callPackage ../development/misc/vc4/newlib.nix {}; - resim = callPackage ../applications/emulators/resim {}; or1k-newlib = callPackage ../development/misc/or1k/newlib.nix {}; @@ -16652,8 +16839,6 @@ with pkgs; duckdb = callPackage ../development/libraries/duckdb {}; - duckstation = libsForQt5.callPackage ../applications/emulators/duckstation {}; - easyloggingpp = callPackage ../development/libraries/easyloggingpp {}; eccodes = callPackage ../development/libraries/eccodes { @@ -18581,8 +18766,6 @@ with pkgs; hdf5 = hdf5_1_10; }; - libmirage = callPackage ../applications/emulators/cdemu/libmirage.nix { }; - libmkv = callPackage ../development/libraries/libmkv { }; libmms = callPackage ../development/libraries/libmms { }; @@ -21416,7 +21599,11 @@ with pkgs; hasura-cli = callPackage ../servers/hasura/cli.nix { }; - hbase = callPackage ../servers/hbase {}; + inherit (callPackage ../servers/hbase {}) hbase_1_7 hbase_2_4 hbase_3_0; + hbase1 = hbase_1_7; + hbase2 = hbase_2_4; + hbase3 = hbase_3_0; + hbase = hbase2; # when updating, point to the latest stable release headphones = callPackage ../servers/headphones {}; @@ -21994,6 +22181,8 @@ with pkgs; postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; + postgresqlTestHook = callPackage ../build-support/setup-hooks/postgresql-test-hook { }; + prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { }; prometheus = callPackage ../servers/monitoring/prometheus { }; prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { }; @@ -23518,6 +23707,8 @@ with pkgs; ugtrain = callPackage ../tools/misc/ugtrain { }; + unscd = callPackage ../os-specific/linux/unscd { }; + untie = callPackage ../os-specific/linux/untie { }; upower = callPackage ../os-specific/linux/upower { }; @@ -24485,8 +24676,6 @@ with pkgs; fonts = [ "Terminus" ]; }; - termtekst = callPackage ../applications/emulators/termtekst { }; - tex-gyre = callPackages ../data/fonts/tex-gyre { }; tex-gyre-math = callPackages ../data/fonts/tex-gyre-math { }; @@ -25454,8 +25643,6 @@ with pkgs; dwm-status = callPackage ../applications/window-managers/dwm/dwm-status.nix { }; - dynamips = callPackage ../applications/emulators/dynamips { }; - exploitdb = callPackage ../tools/security/exploitdb { }; evilwm = callPackage ../applications/window-managers/evilwm { @@ -25913,8 +26100,6 @@ with pkgs; tuigreet = callPackage ../os-specific/linux/tuigreet { }; }; - goldberg-emu = callPackage ../applications/emulators/goldberg-emu { }; - goldendict = libsForQt5.callPackage ../applications/misc/goldendict { inherit (darwin) libiconv; }; @@ -26515,8 +26700,6 @@ with pkgs; herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { }; - hercules = callPackage ../applications/emulators/hercules { }; - hexchat = callPackage ../applications/networking/irc/hexchat { }; hexcurse = callPackage ../applications/editors/hexcurse { }; @@ -26613,6 +26796,8 @@ with pkgs; jackline = callPackage ../applications/networking/instant-messengers/jackline { }; + keylight-controller-mschneider82 = callPackage ../applications/misc/keylight-controller-mschneider82 { }; + leftwm = callPackage ../applications/window-managers/leftwm { }; levant = callPackage ../applications/networking/cluster/levant { }; @@ -27061,8 +27246,6 @@ with pkgs; kdevelop = libsForQt5.callPackage ../applications/editors/kdevelop5/wrapper.nix { }; - kega-fusion = pkgsi686Linux.callPackage ../applications/emulators/kega-fusion { }; - kepubify = callPackage ../tools/misc/kepubify { }; kermit = callPackage ../tools/misc/kermit { }; @@ -27256,8 +27439,6 @@ with pkgs; kvirc = libsForQt514.callPackage ../applications/networking/irc/kvirc { }; - lambda-delta = callPackage ../applications/emulators/lambda-delta { }; - lame = callPackage ../development/libraries/lame { }; labwc = callPackage ../applications/window-managers/labwc { @@ -27389,8 +27570,6 @@ with pkgs; lighttable = callPackage ../applications/editors/lighttable {}; - libdsk = callPackage ../applications/emulators/libdsk { }; - liblinphone = callPackage ../development/libraries/liblinphone { }; links2 = callPackage ../applications/networking/browsers/links2 { }; @@ -27581,8 +27760,6 @@ with pkgs; melody = callPackage ../tools/misc/melody { }; - melonDS = libsForQt5.callPackage ../applications/emulators/melonDS { }; - meme-image-generator = callPackage ../applications/graphics/meme-image-generator { }; meme-suite = callPackage ../applications/science/biology/meme-suite { }; @@ -28008,8 +28185,6 @@ with pkgs; pinegrow = callPackage ../applications/editors/pinegrow { }; - ping = callPackage ../applications/networking/ping { }; - piper = callPackage ../os-specific/linux/piper { }; pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer {}; @@ -28241,8 +28416,6 @@ with pkgs; obconf = callPackage ../tools/X11/obconf { }; - oberon-risc-emu = callPackage ../applications/emulators/oberon-risc-emu { }; - gnome-obfuscate = callPackage ../applications/graphics/gnome-obfuscate { }; obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { @@ -28410,12 +28583,6 @@ with pkgs; pcloud = callPackage ../applications/networking/pcloud { }; - pcsxr = callPackage ../applications/emulators/pcsxr { }; - - pcsx2 = callPackage ../applications/emulators/pcsx2 { - wxGTK = wxGTK30-gtk3; - }; - jpsxdec = callPackage ../tools/games/jpsxdec { jdk = openjdk8; }; @@ -28942,8 +29109,6 @@ with pkgs; rootlesskit = callPackage ../tools/virtualization/rootlesskit {}; - rpcs3 = libsForQt5.callPackage ../applications/emulators/rpcs3 { }; - rsclock = callPackage ../applications/misc/rsclock { }; rstudio = libsForQt5.callPackage ../applications/editors/rstudio { @@ -28983,8 +29148,6 @@ with pkgs; sacc = callPackage ../applications/networking/gopher/sacc { }; - sameboy = callPackage ../applications/emulators/sameboy { }; - sayonara = libsForQt514.callPackage ../applications/audio/sayonara { }; sbagen = callPackage ../applications/misc/sbagen { }; @@ -29121,8 +29284,6 @@ with pkgs; curses = ncurses; }; - stella = callPackage ../applications/emulators/stella { }; - linuxstopmotion = libsForQt5.callPackage ../applications/video/linuxstopmotion { }; sweethome3d = recurseIntoAttrs ( @@ -30258,9 +30419,6 @@ with pkgs; kodi-cli = callPackage ../tools/misc/kodi-cli { }; - kodi-retroarch-advanced-launchers = - callPackage ../applications/emulators/retroarch/kodi-advanced-launchers.nix { }; - xca = libsForQt5.callPackage ../applications/misc/xca { }; xcalib = callPackage ../tools/X11/xcalib { }; @@ -30476,6 +30634,8 @@ with pkgs; ydiff = with python3.pkgs; toPythonApplication ydiff; + ydict = callPackage ../applications/misc/ydict {}; + yed = callPackage ../applications/graphics/yed {}; yeetgif = callPackage ../applications/graphics/yeetgif { }; @@ -32748,8 +32908,6 @@ with pkgs; crypto-org-wallet = callPackage ../applications/blockchains/crypto-org-wallet { }; - caprice32 = callPackage ../applications/emulators/caprice32 { }; - cubicle = callPackage ../applications/science/logic/cubicle { ocamlPackages = ocaml-ng.ocamlPackages_4_05; }; @@ -33273,12 +33431,6 @@ with pkgs; antimicrox = libsForQt5.callPackage ../tools/misc/antimicrox { }; - ares = callPackage ../applications/emulators/ares { }; - - atari800 = callPackage ../applications/emulators/atari800 { }; - - ataripp = callPackage ../applications/emulators/atari++ { }; - atlantis = callPackage ../applications/networking/cluster/atlantis { }; fn-cli = callPackage ../applications/networking/cluster/fn-cli { }; @@ -33293,14 +33445,10 @@ with pkgs; argononed = callPackage ../misc/drivers/argononed { }; - attract-mode = callPackage ../applications/emulators/attract-mode { }; - autotiling = python3Packages.callPackage ../misc/autotiling { }; avell-unofficial-control-center = python3Packages.callPackage ../applications/misc/avell-unofficial-control-center { }; - basiliskii = callPackage ../applications/emulators/basiliskii { }; - beep = callPackage ../misc/beep { }; bees = callPackage ../tools/filesystems/bees { }; @@ -33317,8 +33465,6 @@ with pkgs; calaos_installer = libsForQt5.callPackage ../misc/calaos/installer {}; - ccemux = callPackage ../applications/emulators/ccemux { }; - click = callPackage ../applications/networking/cluster/click { }; clinfo = callPackage ../tools/system/clinfo { @@ -33327,8 +33473,6 @@ with pkgs; clpeak = callPackage ../tools/misc/clpeak { }; - collapseos-cvm = callPackage ../applications/emulators/collapseos-cvm { }; - cups = callPackage ../misc/cups { }; cups-filters = callPackage ../misc/cups/filters.nix { }; @@ -33399,14 +33543,10 @@ with pkgs; cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 { }; - darcnes = callPackage ../applications/emulators/darcnes { }; - darling-dmg = callPackage ../tools/filesystems/darling-dmg { }; depotdownloader = callPackage ../tools/misc/depotdownloader { }; - desmume = callPackage ../applications/emulators/desmume { }; - dbacl = callPackage ../tools/misc/dbacl { }; dblatex = callPackage ../tools/typesetting/tex/dblatex { }; @@ -33419,14 +33559,8 @@ with pkgs; dockutil = callPackage ../os-specific/darwin/dockutil { }; - dosbox = callPackage ../applications/emulators/dosbox { }; - - dosbox-staging = callPackage ../applications/emulators/dosbox-staging { }; - eiciel = callPackage ../tools/filesystems/eiciel { }; - emu2 = callPackage ../applications/emulators/emu2 { }; - apt = callPackage ../tools/package-management/apt { }; dpkg = callPackage ../tools/package-management/dpkg { }; @@ -33439,8 +33573,6 @@ with pkgs; ecdsatool = callPackage ../tools/security/ecdsatool { }; - emulationstation = callPackage ../applications/emulators/emulationstation { }; - electricsheep = callPackage ../misc/screensavers/electricsheep { }; aaphoto = callPackage ../tools/graphics/aaphoto {}; @@ -33481,8 +33613,6 @@ with pkgs; faustStk = callPackage ../applications/audio/faustStk { }; - fceux = libsForQt5.callPackage ../applications/emulators/fceux { }; - flockit = callPackage ../tools/backup/flockit { }; fahclient = callPackage ../applications/science/misc/foldingathome/client.nix {}; @@ -33497,8 +33627,6 @@ with pkgs; foomatic-filters = callPackage ../misc/drivers/foomatic-filters {}; - fuse-emulator = callPackage ../applications/emulators/fuse-emulator {}; - gajim = callPackage ../applications/networking/instant-messengers/gajim { inherit (gst_all_1) gstreamer gst-plugins-base gst-libav; gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; }; @@ -33506,8 +33634,6 @@ with pkgs; gammu = callPackage ../applications/misc/gammu { }; - gensgs = pkgsi686Linux.callPackage ../applications/emulators/gens-gs { }; - ghostscript = callPackage ../misc/ghostscript { }; ghostscriptX = ghostscript.override { @@ -33534,10 +33660,6 @@ with pkgs; gummy = callPackage ../tools/misc/gummy { }; - gxemul = callPackage ../applications/emulators/gxemul { }; - - hatari = callPackage ../applications/emulators/hatari { }; - hck = callPackage ../tools/text/hck { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; @@ -33651,18 +33773,12 @@ with pkgs; loop = callPackage ../tools/misc/loop { }; - maiko = callPackage ../applications/emulators/maiko { inherit (xorg) libX11; }; - mailcore2 = callPackage ../development/libraries/mailcore2 { icu = icu58; }; mamba = callPackage ../applications/audio/mamba { }; - mame = libsForQt514.callPackage ../applications/emulators/mame { - inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback; - }; - martyr = callPackage ../development/libraries/martyr { }; mas = callPackage ../os-specific/darwin/mas { }; @@ -33679,8 +33795,6 @@ with pkgs; morph = callPackage ../tools/package-management/morph { }; - mupen64plus = callPackage ../applications/emulators/mupen64plus { }; - muse = libsForQt5.callPackage ../applications/audio/muse { }; musly = callPackage ../applications/audio/musly { }; @@ -34017,8 +34131,6 @@ with pkgs; OSCAR = qt5.callPackage ../applications/misc/OSCAR { }; - pcem = callPackage ../applications/emulators/pcem { }; - pgmanage = callPackage ../applications/misc/pgmanage { }; pgadmin4 = callPackage ../tools/admin/pgadmin { }; @@ -34045,14 +34157,10 @@ with pkgs; pounce = callPackage ../servers/pounce { }; - ppsspp = libsForQt5.callPackage ../applications/emulators/ppsspp { }; - pt = callPackage ../applications/misc/pt { }; protocol = python3Packages.callPackage ../applications/networking/protocol { }; - punes = libsForQt5.callPackage ../applications/emulators/punes { }; - pykms = callPackage ../tools/networking/pykms { }; pyupgrade = with python3Packages; toPythonApplication pyupgrade; @@ -34061,12 +34169,6 @@ with pkgs; pwntools = with python3Packages; toPythonApplication pwntools; - uae = callPackage ../applications/emulators/uae { }; - - fsuae = callPackage ../applications/emulators/fs-uae { }; - - fsuae-launcher = callPackage ../applications/emulators/fs-uae/launcher.nix { }; - putty = callPackage ../applications/networking/remote/putty { gtk2 = gtk2-x11; }; @@ -34095,30 +34197,6 @@ with pkgs; renderizer = callPackage ../development/tools/renderizer {}; - retroarchBare = callPackage ../applications/emulators/retroarch { - inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) AppKit Foundation; - }; - - wrapRetroArch = { retroarch }: callPackage ../applications/emulators/retroarch/wrapper.nix { - inherit retroarch; - }; - - retroarch = wrapRetroArch { retroarch = retroarchBare; }; - - retroarchFull = retroarch.override { - cores = builtins.filter - # Remove cores not supported on platform - (c: c ? libretroCore && (lib.meta.availableOn stdenv.hostPlatform c)) - (builtins.attrValues libretro); - }; - - libretro = recurseIntoAttrs (callPackage ../applications/emulators/retroarch/cores.nix { - retroarch = retroarchBare; - }); - - retrofe = callPackage ../applications/emulators/retrofe { }; - rfc-bibtex = python3Packages.callPackage ../development/python-modules/rfc-bibtex { }; pick-colour-picker = python3Packages.callPackage ../applications/graphics/pick-colour-picker { @@ -34426,12 +34504,8 @@ with pkgs; vazir-fonts = callPackage ../data/fonts/vazir-fonts { }; - vbam = callPackage ../applications/emulators/vbam { }; - vgmstream = callPackage ../applications/audio/vgmstream { }; - vice = callPackage ../applications/emulators/vice { }; - viddy = callPackage ../tools/misc/viddy { }; ViennaRNA = callPackage ../applications/science/molecular-dynamics/viennarna { }; @@ -34528,10 +34602,6 @@ with pkgs; wineRelease = "wayland"; }); - winetricks = callPackage ../applications/emulators/wine/winetricks.nix { - inherit (gnome) zenity; - }; - wishbone-tool = callPackage ../development/tools/misc/wishbone-tool { }; with-shell = callPackage ../applications/misc/with-shell { }; @@ -34620,11 +34690,6 @@ with pkgs; yabai = callPackage ../os-specific/darwin/yabai { }; - yabause = libsForQt5.callPackage ../applications/emulators/yabause { - freeglut = null; - openal = null; - }; - yacreader = libsForQt5.callPackage ../applications/graphics/yacreader { }; yadm = callPackage ../applications/version-management/yadm { }; @@ -34643,15 +34708,6 @@ with pkgs; yaxg = callPackage ../tools/graphics/yaxg {}; - yuzu-mainline = import ../applications/emulators/yuzu { - branch = "mainline"; - inherit libsForQt5 fetchFromGitHub; - }; - yuzu-ea = import ../applications/emulators/yuzu { - branch = "early-access"; - inherit libsForQt5 fetchFromGitHub; - }; - zap = callPackage ../tools/networking/zap { }; zigbee2mqtt = callPackage ../servers/zigbee2mqtt { }; @@ -34670,38 +34726,12 @@ with pkgs; zoneminder = callPackage ../servers/zoneminder { }; - zsnes = pkgsi686Linux.callPackage ../applications/emulators/zsnes { }; - xcp = callPackage ../tools/misc/xcp { }; - xcpc = callPackage ../applications/emulators/xcpc { }; - zxcvbn-c = callPackage ../development/libraries/zxcvbn-c { }; zxing-cpp = callPackage ../development/libraries/zxing-cpp { }; - snes9x-gtk = callPackage ../applications/emulators/snes9x-gtk { }; - - openmsx = callPackage ../applications/emulators/openmsx { - python = python3; - }; - - higan = callPackage ../applications/emulators/higan { }; - - bsnes-hd = callPackage ../applications/emulators/bsnes-hd { - inherit (gnome2) gtksourceview; - inherit (darwin.apple_sdk.frameworks) Cocoa OpenAL; - }; - - yapesdl = callPackage ../applications/emulators/yapesdl { }; - - x16-emulator = callPackage ../applications/emulators/commanderx16/emulator.nix { }; - x16-rom = callPackage ../applications/emulators/commanderx16/rom.nix { }; - x16-run = (callPackage ../applications/emulators/commanderx16/run.nix { }) { - emulator = x16-emulator; - rom = x16-rom; - }; - bullet = callPackage ../development/libraries/bullet { inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; }; @@ -35061,7 +35091,6 @@ with pkgs; xsos = callPackage ../os-specific/linux/xsos { }; - zesarux = callPackage ../applications/emulators/zesarux { }; zk = callPackage ../applications/office/zk {}; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 17015119cd9..a56b366dca1 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -78,6 +78,8 @@ let bitv = callPackage ../development/ocaml-modules/bitv { }; + bjack = callPackage ../development/ocaml-modules/bjack { }; + bls12-381 = callPackage ../development/ocaml-modules/bls12-381 { }; bls12-381-gen = callPackage ../development/ocaml-modules/bls12-381/gen.nix { }; bls12-381-unix = callPackage ../development/ocaml-modules/bls12-381/unix.nix { }; @@ -293,6 +295,8 @@ let dose3 = callPackage ../development/ocaml-modules/dose3 { }; + dssi = callPackage ../development/ocaml-modules/dssi { }; + dtoa = callPackage ../development/ocaml-modules/dtoa { }; duff = callPackage ../development/ocaml-modules/duff { }; @@ -508,6 +512,8 @@ let gapi_ocaml = callPackage ../development/ocaml-modules/gapi-ocaml { }; + gen_js_api = callPackage ../development/ocaml-modules/gen_js_api { }; + gg = callPackage ../development/ocaml-modules/gg { }; git = callPackage ../development/ocaml-modules/git { @@ -641,10 +647,14 @@ let lacaml = callPackage ../development/ocaml-modules/lacaml { }; + ladspa = callPackage ../development/ocaml-modules/ladspa { }; + lambdasoup = callPackage ../development/ocaml-modules/lambdasoup { }; lambda-term = callPackage ../development/ocaml-modules/lambda-term { }; + lastfm = callPackage ../development/ocaml-modules/lastfm { }; + lens = callPackage ../development/ocaml-modules/lens { }; letsencrypt = callPackage ../development/ocaml-modules/letsencrypt { }; @@ -998,6 +1008,8 @@ let odoc-parser = callPackage ../development/ocaml-modules/odoc-parser { }; + ojs = callPackage ../development/ocaml-modules/gen_js_api/ojs.nix { }; + omd = callPackage ../development/ocaml-modules/omd { }; opam-core = callPackage ../development/ocaml-modules/opam-core { @@ -1102,6 +1114,8 @@ let result = callPackage ../development/ocaml-modules/ocaml-result { }; + samplerate = callPackage ../development/ocaml-modules/samplerate { }; + secp256k1 = callPackage ../development/ocaml-modules/secp256k1 { inherit (pkgs) secp256k1; }; @@ -1455,6 +1469,8 @@ let xmlm = callPackage ../development/ocaml-modules/xmlm { }; + xmlplaylist = callPackage ../development/ocaml-modules/xmlplaylist { }; + xml-light = callPackage ../development/ocaml-modules/xml-light { }; xtmpl = callPackage ../development/ocaml-modules/xtmpl { }; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index a267b20d667..7bf4a234bb6 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -124,7 +124,7 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; }; smartmontools = all; sqlite = unix; # Cygwin builds fail squid = linux; - ssmtp = linux; + msmtp = linux; stdenv = all; strace = linux; su = linux; |