diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 9de9a06465f8..71f197af53da 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -20,7 +20,7 @@ or use Mozilla's [Rust nightlies overlay](#using-the-rust-nightlies-overlay). Rust applications are packaged by using the `buildRustPackage` helper from `rustPlatform`: ```nix -{ lib, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "ripgrep"; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 21268ba1a39d..bdce9f9c93ed 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4565,6 +4565,16 @@ githubId = 2789926; name = "Imran Hossain"; }; + iagoq = { + email = "18238046+iagocq@users.noreply.github.com"; + github = "iagocq"; + githubId = 18238046; + name = "Iago Manoel Brito"; + keys = [{ + longkeyid = "rsa4096/0x35D39F9A9A1BC8DA"; + fingerprint = "DF90 9D58 BEE4 E73A 1B8C 5AF3 35D3 9F9A 9A1B C8DA"; + }]; + }; iammrinal0 = { email = "nixpkgs@mrinalpurohit.in"; github = "iammrinal0"; diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 9e4fecfbd426..7aaf9bd37efc 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -138,6 +138,13 @@ services.vikunja. + + + opensnitch, + an application firewall. Available as + services.opensnitch. + + snapraid, a @@ -283,11 +290,28 @@ services.touchegg. + + + pantheon-tweaks, + an unofficial system settings panel for Pantheon. Available as + programs.pantheon-tweaks. + +
Backward Incompatibilities + + + The security.wrappers option now requires + to always specify an owner, group and whether the + setuid/setgid bit should be set. This is motivated by the fact + that before NixOS 21.11, specifying either setuid or setgid + but not owner/group resulted in wrappers owned by + nobody/nogroup, which is unsafe. + + The paperless module and package have been @@ -1049,6 +1073,14 @@ Superuser created successfully. attempts from the SSH logs. + + + The + services.xserver.extraLayouts + no longer cause additional rebuilds when a layout is added or + modified. + + Sway: The terminal emulator rxvt-unicode is @@ -1100,6 +1132,22 @@ Superuser created successfully. be removed in 22.05. + + + The dokuwiki module provides a new interface which allows to + use different webservers with the new option + services.dokuwiki.webserver. + Currently caddy and + nginx are supported. The definitions of + dokuwiki sites should now be set in + services.dokuwiki.sites. + + + Sites definitions that use the old interface are automatically + migrated in the new option. This backward compatibility will + be removed in 22.05. + + The order of NSS (host) modules has been brought in line with diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 08b382ae05ce..8719f7871d51 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -45,6 +45,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [vikunja](https://vikunja.io), a to-do list app. Available as [services.vikunja](#opt-services.vikunja.enable). +- [opensnitch](https://github.com/evilsocket/opensnitch), an application firewall. Available as [services.opensnitch](#opt-services.opensnitch.enable). + - [snapraid](https://www.snapraid.it/), a backup program for disk arrays. Available as [snapraid](#opt-snapraid.enable). @@ -90,8 +92,13 @@ In addition to numerous new and upgraded packages, this release has the followin - [touchegg](https://github.com/JoseExposito/touchegg), a multi-touch gesture recognizer. Available as [services.touchegg](#opt-services.touchegg.enable). +- [pantheon-tweaks](https://github.com/pantheon-tweaks/pantheon-tweaks), an unofficial system settings panel for Pantheon. Available as [programs.pantheon-tweaks](#opt-programs.pantheon-tweaks.enable). + ## Backward Incompatibilities {#sec-release-21.11-incompatibilities} +- The `security.wrappers` option now requires to always specify an owner, group and whether the setuid/setgid bit should be set. + This is motivated by the fact that before NixOS 21.11, specifying either setuid or setgid but not owner/group resulted in wrappers owned by nobody/nogroup, which is unsafe. + - The `paperless` module and package have been removed. All users should migrate to the successor `paperless-ng` instead. The Paperless project [has been archived](https://github.com/the-paperless-project/paperless/commit/9b0063c9731f7c5f65b1852cb8caff97f5e40ba4) @@ -328,6 +335,8 @@ In addition to numerous new and upgraded packages, this release has the followin However, if [`services.fail2ban.enable`](options.html#opt-services.fail2ban.enable) is `true`, the `fail2ban` will override the verbosity to `"VERBOSE"`, so that `fail2ban` can observe the failed login attempts from the SSH logs. +- The [`services.xserver.extraLayouts`](options.html#opt-services.xserver.extraLayouts) no longer cause additional rebuilds when a layout is added or modified. + - Sway: The terminal emulator `rxvt-unicode` is no longer installed by default via `programs.sway.extraPackages`. The current default configuration uses `alacritty` (and soon `foot`) so this is only an issue when using a customized configuration and not installing `rxvt-unicode` explicitly. - `python3` now defaults to Python 3.9. Python 3.9 introduces many deprecation warnings, please look at the [What's New In Python 3.9 post](https://docs.python.org/3/whatsnew/3.9.html) for more information. @@ -340,6 +349,10 @@ In addition to numerous new and upgraded packages, this release has the followin Sites definitions that use the old interface are automatically migrated in the new option. This backward compatibility will be removed in 22.05. +- The dokuwiki module provides a new interface which allows to use different webservers with the new option [`services.dokuwiki.webserver`](options.html#opt-services.dokuwiki.webserver). Currently `caddy` and `nginx` are supported. The definitions of dokuwiki sites should now be set in [`services.dokuwiki.sites`](options.html#opt-services.dokuwiki.sites). + + Sites definitions that use the old interface are automatically migrated in the new option. This backward compatibility will be removed in 22.05. + - The order of NSS (host) modules has been brought in line with upstream recommendations: diff --git a/nixos/modules/config/console.nix b/nixos/modules/config/console.nix index c5150305bd85..98f942ee63f5 100644 --- a/nixos/modules/config/console.nix +++ b/nixos/modules/config/console.nix @@ -116,7 +116,11 @@ in { console.keyMap = with config.services.xserver; mkIf cfg.useXkbConfig (pkgs.runCommand "xkb-console-keymap" { preferLocalBuild = true; } '' - '${pkgs.ckbcomp}/bin/ckbcomp' -model '${xkbModel}' -layout '${layout}' \ + '${pkgs.ckbcomp}/bin/ckbcomp' \ + ${optionalString (config.environment.sessionVariables ? XKB_CONFIG_ROOT) + "-I${config.environment.sessionVariables.XKB_CONFIG_ROOT}" + } \ + -model '${xkbModel}' -layout '${layout}' \ -option '${xkbOptions}' -variant '${xkbVariant}' > "$out" ''); } diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index b556afae653a..b07b30c8c3e0 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -171,6 +171,7 @@ ./programs/npm.nix ./programs/noisetorch.nix ./programs/oblogout.nix + ./programs/pantheon-tweaks.nix ./programs/partition-manager.nix ./programs/plotinus.nix ./programs/proxychains.nix @@ -914,6 +915,7 @@ ./services/security/nginx-sso.nix ./services/security/oauth2_proxy.nix ./services/security/oauth2_proxy_nginx.nix + ./services/security/opensnitch.nix ./services/security/privacyidea.nix ./services/security/physlock.nix ./services/security/shibboleth-sp.nix diff --git a/nixos/modules/programs/bandwhich.nix b/nixos/modules/programs/bandwhich.nix index 1cffb5fa2765..610d602ad2cc 100644 --- a/nixos/modules/programs/bandwhich.nix +++ b/nixos/modules/programs/bandwhich.nix @@ -22,8 +22,10 @@ in { config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ bandwhich ]; security.wrappers.bandwhich = { - source = "${pkgs.bandwhich}/bin/bandwhich"; + owner = "root"; + group = "root"; capabilities = "cap_net_raw,cap_net_admin+ep"; + source = "${pkgs.bandwhich}/bin/bandwhich"; }; }; } diff --git a/nixos/modules/programs/captive-browser.nix b/nixos/modules/programs/captive-browser.nix index d7684d08c6c7..4e8abdeecf0b 100644 --- a/nixos/modules/programs/captive-browser.nix +++ b/nixos/modules/programs/captive-browser.nix @@ -105,11 +105,15 @@ in ); security.wrappers.udhcpc = { + owner = "root"; + group = "root"; capabilities = "cap_net_raw+p"; source = "${pkgs.busybox}/bin/udhcpc"; }; security.wrappers.captive-browser = { + owner = "root"; + group = "root"; capabilities = "cap_net_raw+p"; source = pkgs.writeShellScript "captive-browser" '' export PREV_CONFIG_HOME="$XDG_CONFIG_HOME" diff --git a/nixos/modules/programs/ccache.nix b/nixos/modules/programs/ccache.nix index d672e1da017a..35a4373f6128 100644 --- a/nixos/modules/programs/ccache.nix +++ b/nixos/modules/programs/ccache.nix @@ -28,7 +28,9 @@ in { # "nix-ccache --show-stats" and "nix-ccache --clear" security.wrappers.nix-ccache = { + owner = "nobody"; group = "nixbld"; + setuid = false; setgid = true; source = pkgs.writeScript "nix-ccache.pl" '' #!${pkgs.perl}/bin/perl diff --git a/nixos/modules/programs/firejail.nix b/nixos/modules/programs/firejail.nix index ad4ef1a39459..9384b01b3674 100644 --- a/nixos/modules/programs/firejail.nix +++ b/nixos/modules/programs/firejail.nix @@ -81,7 +81,12 @@ in { }; config = mkIf cfg.enable { - security.wrappers.firejail.source = "${lib.getBin pkgs.firejail}/bin/firejail"; + security.wrappers.firejail = + { setuid = true; + owner = "root"; + group = "root"; + source = "${lib.getBin pkgs.firejail}/bin/firejail"; + }; environment.systemPackages = [ pkgs.firejail ] ++ [ wrappedBins ]; }; diff --git a/nixos/modules/programs/gamemode.nix b/nixos/modules/programs/gamemode.nix index 03949bf98df6..102788f5b019 100644 --- a/nixos/modules/programs/gamemode.nix +++ b/nixos/modules/programs/gamemode.nix @@ -56,6 +56,8 @@ in polkit.enable = true; wrappers = mkIf cfg.enableRenice { gamemoded = { + owner = "root"; + group = "root"; source = "${pkgs.gamemode}/bin/gamemoded"; capabilities = "cap_sys_nice+ep"; }; diff --git a/nixos/modules/programs/iftop.nix b/nixos/modules/programs/iftop.nix index a98a9a8187d4..c74714a9a6d6 100644 --- a/nixos/modules/programs/iftop.nix +++ b/nixos/modules/programs/iftop.nix @@ -11,8 +11,10 @@ in { config = mkIf cfg.enable { environment.systemPackages = [ pkgs.iftop ]; security.wrappers.iftop = { - source = "${pkgs.iftop}/bin/iftop"; + owner = "root"; + group = "root"; capabilities = "cap_net_raw+p"; + source = "${pkgs.iftop}/bin/iftop"; }; }; } diff --git a/nixos/modules/programs/iotop.nix b/nixos/modules/programs/iotop.nix index 5512dbc62f72..b7c1c69f9ddd 100644 --- a/nixos/modules/programs/iotop.nix +++ b/nixos/modules/programs/iotop.nix @@ -10,8 +10,10 @@ in { }; config = mkIf cfg.enable { security.wrappers.iotop = { - source = "${pkgs.iotop}/bin/iotop"; + owner = "root"; + group = "root"; capabilities = "cap_net_admin+p"; + source = "${pkgs.iotop}/bin/iotop"; }; }; } diff --git a/nixos/modules/programs/kbdlight.nix b/nixos/modules/programs/kbdlight.nix index 58e45872fac8..8a2a0057cf2d 100644 --- a/nixos/modules/programs/kbdlight.nix +++ b/nixos/modules/programs/kbdlight.nix @@ -11,6 +11,11 @@ in config = mkIf cfg.enable { environment.systemPackages = [ pkgs.kbdlight ]; - security.wrappers.kbdlight.source = "${pkgs.kbdlight.out}/bin/kbdlight"; + security.wrappers.kbdlight = + { setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.kbdlight.out}/bin/kbdlight"; + }; }; } diff --git a/nixos/modules/programs/liboping.nix b/nixos/modules/programs/liboping.nix index 4e4c235ccde4..4433f9767d6e 100644 --- a/nixos/modules/programs/liboping.nix +++ b/nixos/modules/programs/liboping.nix @@ -13,8 +13,10 @@ in { security.wrappers = mkMerge (map ( exec: { "${exec}" = { - source = "${pkgs.liboping}/bin/${exec}"; + owner = "root"; + group = "root"; capabilities = "cap_net_raw+p"; + source = "${pkgs.liboping}/bin/${exec}"; }; } ) [ "oping" "noping" ]); diff --git a/nixos/modules/programs/msmtp.nix b/nixos/modules/programs/msmtp.nix index 217060e6b3b3..9c067bdc9695 100644 --- a/nixos/modules/programs/msmtp.nix +++ b/nixos/modules/programs/msmtp.nix @@ -78,6 +78,8 @@ in { source = "${pkgs.msmtp}/bin/sendmail"; setuid = false; setgid = false; + owner = "root"; + group = "root"; }; environment.etc."msmtprc".text = let diff --git a/nixos/modules/programs/mtr.nix b/nixos/modules/programs/mtr.nix index 75b710c1584f..63516c58440e 100644 --- a/nixos/modules/programs/mtr.nix +++ b/nixos/modules/programs/mtr.nix @@ -31,8 +31,10 @@ in { environment.systemPackages = with pkgs; [ cfg.package ]; security.wrappers.mtr-packet = { - source = "${cfg.package}/bin/mtr-packet"; + owner = "root"; + group = "root"; capabilities = "cap_net_raw+p"; + source = "${cfg.package}/bin/mtr-packet"; }; }; } diff --git a/nixos/modules/programs/noisetorch.nix b/nixos/modules/programs/noisetorch.nix index 5f3b0c8f5d1e..bca68b0064c0 100644 --- a/nixos/modules/programs/noisetorch.nix +++ b/nixos/modules/programs/noisetorch.nix @@ -18,8 +18,10 @@ in { config = mkIf cfg.enable { security.wrappers.noisetorch = { - source = "${cfg.package}/bin/noisetorch"; + owner = "root"; + group = "root"; capabilities = "cap_sys_resource=+ep"; + source = "${cfg.package}/bin/noisetorch"; }; }; } diff --git a/nixos/modules/programs/pantheon-tweaks.nix b/nixos/modules/programs/pantheon-tweaks.nix new file mode 100644 index 000000000000..0b8a19ea22c0 --- /dev/null +++ b/nixos/modules/programs/pantheon-tweaks.nix @@ -0,0 +1,19 @@ +{ config, lib, pkgs, ... }: + +with lib; + +{ + meta = { + maintainers = teams.pantheon.members; + }; + + ###### interface + options = { + programs.pantheon-tweaks.enable = mkEnableOption "Pantheon Tweaks, an unofficial system settings panel for Pantheon"; + }; + + ###### implementation + config = mkIf config.programs.pantheon-tweaks.enable { + services.xserver.desktopManager.pantheon.extraSwitchboardPlugs = [ pkgs.pantheon-tweaks ]; + }; +} diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix index 386ded9d98b6..e021f184179d 100644 --- a/nixos/modules/programs/shadow.nix +++ b/nixos/modules/programs/shadow.nix @@ -43,6 +43,13 @@ let ''; + mkSetuidRoot = source: + { setuid = true; + owner = "root"; + group = "root"; + inherit source; + }; + in { @@ -109,14 +116,14 @@ in }; security.wrappers = { - su.source = "${pkgs.shadow.su}/bin/su"; - sg.source = "${pkgs.shadow.out}/bin/sg"; - newgrp.source = "${pkgs.shadow.out}/bin/newgrp"; - newuidmap.source = "${pkgs.shadow.out}/bin/newuidmap"; - newgidmap.source = "${pkgs.shadow.out}/bin/newgidmap"; + su = mkSetuidRoot "${pkgs.shadow.su}/bin/su"; + sg = mkSetuidRoot "${pkgs.shadow.out}/bin/sg"; + newgrp = mkSetuidRoot "${pkgs.shadow.out}/bin/newgrp"; + newuidmap = mkSetuidRoot "${pkgs.shadow.out}/bin/newuidmap"; + newgidmap = mkSetuidRoot "${pkgs.shadow.out}/bin/newgidmap"; } // lib.optionalAttrs config.users.mutableUsers { - chsh.source = "${pkgs.shadow.out}/bin/chsh"; - passwd.source = "${pkgs.shadow.out}/bin/passwd"; + chsh = mkSetuidRoot "${pkgs.shadow.out}/bin/chsh"; + passwd = mkSetuidRoot "${pkgs.shadow.out}/bin/passwd"; }; }; } diff --git a/nixos/modules/programs/singularity.nix b/nixos/modules/programs/singularity.nix index 6ac64a81fc24..db935abe4bb4 100644 --- a/nixos/modules/programs/singularity.nix +++ b/nixos/modules/programs/singularity.nix @@ -16,7 +16,12 @@ in { config = mkIf cfg.enable { environment.systemPackages = [ singularity ]; - security.wrappers.singularity-suid.source = "${singularity}/libexec/singularity/bin/starter-suid.orig"; + security.wrappers.singularity-suid = + { setuid = true; + owner = "root"; + group = "root"; + source = "${singularity}/libexec/singularity/bin/starter-suid.orig"; + }; systemd.tmpfiles.rules = [ "d /var/singularity/mnt/session 0770 root root -" "d /var/singularity/mnt/final 0770 root root -" diff --git a/nixos/modules/programs/slock.nix b/nixos/modules/programs/slock.nix index 0e1281e62cd7..ce80fcc5d4a8 100644 --- a/nixos/modules/programs/slock.nix +++ b/nixos/modules/programs/slock.nix @@ -21,6 +21,11 @@ in config = mkIf cfg.enable { environment.systemPackages = [ pkgs.slock ]; - security.wrappers.slock.source = "${pkgs.slock.out}/bin/slock"; + security.wrappers.slock = + { setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.slock.out}/bin/slock"; + }; }; } diff --git a/nixos/modules/programs/ssmtp.nix b/nixos/modules/programs/ssmtp.nix index 8b500f0383f4..e28a14538ecd 100644 --- a/nixos/modules/programs/ssmtp.nix +++ b/nixos/modules/programs/ssmtp.nix @@ -181,6 +181,8 @@ in source = "${pkgs.ssmtp}/bin/sendmail"; setuid = false; setgid = false; + owner = "root"; + group = "root"; }; }; diff --git a/nixos/modules/programs/traceroute.nix b/nixos/modules/programs/traceroute.nix index 4eb0be3f0e0b..6e04057ac503 100644 --- a/nixos/modules/programs/traceroute.nix +++ b/nixos/modules/programs/traceroute.nix @@ -19,8 +19,10 @@ in { config = mkIf cfg.enable { security.wrappers.traceroute = { - source = "${pkgs.traceroute}/bin/traceroute"; + owner = "root"; + group = "root"; capabilities = "cap_net_raw+p"; + source = "${pkgs.traceroute}/bin/traceroute"; }; }; } diff --git a/nixos/modules/programs/udevil.nix b/nixos/modules/programs/udevil.nix index ba5670f9dfe9..0dc08c435df4 100644 --- a/nixos/modules/programs/udevil.nix +++ b/nixos/modules/programs/udevil.nix @@ -9,6 +9,11 @@ in { options.programs.udevil.enable = mkEnableOption "udevil"; config = mkIf cfg.enable { - security.wrappers.udevil.source = "${lib.getBin pkgs.udevil}/bin/udevil"; + security.wrappers.udevil = + { setuid = true; + owner = "root"; + group = "root"; + source = "${lib.getBin pkgs.udevil}/bin/udevil"; + }; }; } diff --git a/nixos/modules/programs/wavemon.nix b/nixos/modules/programs/wavemon.nix index ac665fe4a023..e5ccacba75d4 100644 --- a/nixos/modules/programs/wavemon.nix +++ b/nixos/modules/programs/wavemon.nix @@ -21,8 +21,10 @@ in { config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ wavemon ]; security.wrappers.wavemon = { - source = "${pkgs.wavemon}/bin/wavemon"; + owner = "root"; + group = "root"; capabilities = "cap_net_admin+ep"; + source = "${pkgs.wavemon}/bin/wavemon"; }; }; } diff --git a/nixos/modules/programs/wshowkeys.nix b/nixos/modules/programs/wshowkeys.nix index 09b008af1d5d..f7b71d2bb0c8 100644 --- a/nixos/modules/programs/wshowkeys.nix +++ b/nixos/modules/programs/wshowkeys.nix @@ -17,6 +17,11 @@ in { }; config = mkIf cfg.enable { - security.wrappers.wshowkeys.source = "${pkgs.wshowkeys}/bin/wshowkeys"; + security.wrappers.wshowkeys = + { setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.wshowkeys}/bin/wshowkeys"; + }; }; } diff --git a/nixos/modules/security/chromium-suid-sandbox.nix b/nixos/modules/security/chromium-suid-sandbox.nix index b83dbc4202a8..bb99c053f718 100644 --- a/nixos/modules/security/chromium-suid-sandbox.nix +++ b/nixos/modules/security/chromium-suid-sandbox.nix @@ -28,6 +28,11 @@ in config = mkIf cfg.enable { environment.systemPackages = [ sandbox ]; - security.wrappers.${sandbox.passthru.sandboxExecutableName}.source = "${sandbox}/bin/${sandbox.passthru.sandboxExecutableName}"; + security.wrappers.${sandbox.passthru.sandboxExecutableName} = + { setuid = true; + owner = "root"; + group = "root"; + source = "${sandbox}/bin/${sandbox.passthru.sandboxExecutableName}"; + }; }; } diff --git a/nixos/modules/security/doas.nix b/nixos/modules/security/doas.nix index 27f6870aaf37..35f618b03e8e 100644 --- a/nixos/modules/security/doas.nix +++ b/nixos/modules/security/doas.nix @@ -241,9 +241,12 @@ in } ]; - security.wrappers = { - doas.source = "${doas}/bin/doas"; - }; + security.wrappers.doas = + { setuid = true; + owner = "root"; + group = "root"; + source = "${doas}/bin/doas"; + }; environment.systemPackages = [ doas diff --git a/nixos/modules/security/duosec.nix b/nixos/modules/security/duosec.nix index c47be80b9dc3..bbe246fe229e 100644 --- a/nixos/modules/security/duosec.nix +++ b/nixos/modules/security/duosec.nix @@ -186,7 +186,12 @@ in config = mkIf (cfg.ssh.enable || cfg.pam.enable) { environment.systemPackages = [ pkgs.duo-unix ]; - security.wrappers.login_duo.source = "${pkgs.duo-unix.out}/bin/login_duo"; + security.wrappers.login_duo = + { setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.duo-unix.out}/bin/login_duo"; + }; system.activationScripts = { login_duo = mkIf cfg.ssh.enable '' diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 163d75d7caf2..8b1f653d4e2c 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -869,9 +869,10 @@ in security.wrappers = { unix_chkpwd = { - source = "${pkgs.pam}/sbin/unix_chkpwd.orig"; - owner = "root"; setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.pam}/sbin/unix_chkpwd.orig"; }; }; diff --git a/nixos/modules/security/pam_usb.nix b/nixos/modules/security/pam_usb.nix index c695ba075ca9..51d81e823f86 100644 --- a/nixos/modules/security/pam_usb.nix +++ b/nixos/modules/security/pam_usb.nix @@ -32,8 +32,18 @@ in # Make sure pmount and pumount are setuid wrapped. security.wrappers = { - pmount.source = "${pkgs.pmount.out}/bin/pmount"; - pumount.source = "${pkgs.pmount.out}/bin/pumount"; + pmount = + { setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.pmount.out}/bin/pmount"; + }; + pumount = + { setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.pmount.out}/bin/pumount"; + }; }; environment.systemPackages = [ pkgs.pmount ]; diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix index f556cca23cdc..d9c58152f1fa 100644 --- a/nixos/modules/security/polkit.nix +++ b/nixos/modules/security/polkit.nix @@ -83,8 +83,18 @@ in security.pam.services.polkit-1 = {}; security.wrappers = { - pkexec.source = "${pkgs.polkit.bin}/bin/pkexec"; - polkit-agent-helper-1.source = "${pkgs.polkit.out}/lib/polkit-1/polkit-agent-helper-1"; + pkexec = + { setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.polkit.bin}/bin/pkexec"; + }; + polkit-agent-helper-1 = + { setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.polkit.out}/lib/polkit-1/polkit-agent-helper-1"; + }; }; systemd.tmpfiles.rules = [ diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix index 1e65f4515155..2697ab0bde8f 100644 --- a/nixos/modules/security/wrappers/default.nix +++ b/nixos/modules/security/wrappers/default.nix @@ -5,85 +5,140 @@ let parentWrapperDir = dirOf wrapperDir; - programs = - (lib.mapAttrsToList - (n: v: (if v ? program then v else v // {program=n;})) - wrappers); - securityWrapper = pkgs.callPackage ./wrapper.nix { inherit parentWrapperDir; }; + fileModeType = + let + # taken from the chmod(1) man page + symbolic = "[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+"; + numeric = "[-+=]?[0-7]{0,4}"; + mode = "((${symbolic})(,${symbolic})*)|(${numeric})"; + in + lib.types.strMatching mode + // { description = "file mode string"; }; + + wrapperType = lib.types.submodule ({ name, config, ... }: { + options.source = lib.mkOption + { type = lib.types.path; + description = "The absolute path to the program to be wrapped."; + }; + options.program = lib.mkOption + { type = with lib.types; nullOr str; + default = name; + description = '' + The name of the wrapper program. Defaults to the attribute name. + ''; + }; + options.owner = lib.mkOption + { type = lib.types.str; + description = "The owner of the wrapper program."; + }; + options.group = lib.mkOption + { type = lib.types.str; + description = "The group of the wrapper program."; + }; + options.permissions = lib.mkOption + { type = fileModeType; + default = "u+rx,g+x,o+x"; + example = "a+rx"; + description = '' + The permissions of the wrapper program. The format is that of a + symbolic or numeric file mode understood by chmod. + ''; + }; + options.capabilities = lib.mkOption + { type = lib.types.commas; + default = ""; + description = '' + A comma-separated list of capabilities to be given to the wrapper + program. For capabilities supported by the system check the + + capabilities + 7 + + manual page. + + + cap_setpcap, which is required for the wrapper + program to be able to raise caps into the Ambient set is NOT raised + to the Ambient set so that the real program cannot modify its own + capabilities!! This may be too restrictive for cases in which the + real program needs cap_setpcap but it at least leans on the side + security paranoid vs. too relaxed. + + ''; + }; + options.setuid = lib.mkOption + { type = lib.types.bool; + default = false; + description = "Whether to add the setuid bit the wrapper program."; + }; + options.setgid = lib.mkOption + { type = lib.types.bool; + default = false; + description = "Whether to add the setgid bit the wrapper program."; + }; + }); + ###### Activation script for the setcap wrappers mkSetcapProgram = { program , capabilities , source - , owner ? "nobody" - , group ? "nogroup" - , permissions ? "u+rx,g+x,o+x" + , owner + , group + , permissions , ... }: assert (lib.versionAtLeast (lib.getVersion config.boot.kernelPackages.kernel) "4.3"); '' - cp ${securityWrapper}/bin/security-wrapper $wrapperDir/${program} - echo -n "${source}" > $wrapperDir/${program}.real + cp ${securityWrapper}/bin/security-wrapper "$wrapperDir/${program}" + echo -n "${source}" > "$wrapperDir/${program}.real" # Prevent races - chmod 0000 $wrapperDir/${program} - chown ${owner}.${group} $wrapperDir/${program} + chmod 0000 "$wrapperDir/${program}" + chown ${owner}.${group} "$wrapperDir/${program}" # Set desired capabilities on the file plus cap_setpcap so # the wrapper program can elevate the capabilities set on # its file into the Ambient set. - ${pkgs.libcap.out}/bin/setcap "cap_setpcap,${capabilities}" $wrapperDir/${program} + ${pkgs.libcap.out}/bin/setcap "cap_setpcap,${capabilities}" "$wrapperDir/${program}" # Set the executable bit - chmod ${permissions} $wrapperDir/${program} + chmod ${permissions} "$wrapperDir/${program}" ''; ###### Activation script for the setuid wrappers mkSetuidProgram = { program , source - , owner ? "nobody" - , group ? "nogroup" - , setuid ? false - , setgid ? false - , permissions ? "u+rx,g+x,o+x" + , owner + , group + , setuid + , setgid + , permissions , ... }: '' - cp ${securityWrapper}/bin/security-wrapper $wrapperDir/${program} - echo -n "${source}" > $wrapperDir/${program}.real + cp ${securityWrapper}/bin/security-wrapper "$wrapperDir/${program}" + echo -n "${source}" > "$wrapperDir/${program}.real" # Prevent races - chmod 0000 $wrapperDir/${program} - chown ${owner}.${group} $wrapperDir/${program} + chmod 0000 "$wrapperDir/${program}" + chown ${owner}.${group} "$wrapperDir/${program}" - chmod "u${if setuid then "+" else "-"}s,g${if setgid then "+" else "-"}s,${permissions}" $wrapperDir/${program} + chmod "u${if setuid then "+" else "-"}s,g${if setgid then "+" else "-"}s,${permissions}" "$wrapperDir/${program}" ''; mkWrappedPrograms = builtins.map - (s: if (s ? capabilities) - then mkSetcapProgram - ({ owner = "root"; - group = "root"; - } // s) - else if - (s ? setuid && s.setuid) || - (s ? setgid && s.setgid) || - (s ? permissions) - then mkSetuidProgram s - else mkSetuidProgram - ({ owner = "root"; - group = "root"; - setuid = true; - setgid = false; - permissions = "u+rx,g+x,o+x"; - } // s) - ) programs; + (opts: + if opts.capabilities != "" + then mkSetcapProgram opts + else mkSetuidProgram opts + ) (lib.attrValues wrappers); in { imports = [ @@ -95,45 +150,42 @@ in options = { security.wrappers = lib.mkOption { - type = lib.types.attrs; + type = lib.types.attrsOf wrapperType; default = {}; example = lib.literalExample '' - { sendmail.source = "/nix/store/.../bin/sendmail"; - ping = { - source = "${pkgs.iputils.out}/bin/ping"; - owner = "nobody"; - group = "nogroup"; - capabilities = "cap_net_raw+ep"; - }; + { + # a setuid root program + doas = + { setuid = true; + owner = "root"; + group = "root"; + source = "''${pkgs.doas}/bin/doas"; + }; + + # a setgid program + locate = + { setgid = true; + owner = "root"; + group = "mlocate"; + source = "''${pkgs.locate}/bin/locate"; + }; + + # a program with the CAP_NET_RAW capability + ping = + { owner = "root"; + group = "root"; + capabilities = "cap_net_raw+ep"; + source = "''${pkgs.iputils.out}/bin/ping"; + }; } ''; description = '' - This option allows the ownership and permissions on the setuid - wrappers for specific programs to be overridden from the - default (setuid root, but not setgid root). - - - The sub-attribute source is mandatory, - it must be the absolute path to the program to be wrapped. - - - The sub-attribute program is optional and - can give the wrapper program a new name. The default name is the same - as the attribute name itself. - - Additionally, this option can set capabilities on a - wrapper program that propagates those capabilities down to the - wrapped, real program. - - NOTE: cap_setpcap, which is required for the wrapper - program to be able to raise caps into the Ambient set is NOT - raised to the Ambient set so that the real program cannot - modify its own capabilities!! This may be too restrictive for - cases in which the real program needs cap_setpcap but it at - least leans on the side security paranoid vs. too - relaxed. - + This option effectively allows adding setuid/setgid bits, capabilities, + changing file ownership and permissions of a program without directly + modifying it. This works by creating a wrapper program under the + directory, which is then added to + the shell PATH. ''; }; @@ -151,13 +203,31 @@ in ###### implementation config = { - security.wrappers = { - # These are mount related wrappers that require the +s permission. - fusermount.source = "${pkgs.fuse}/bin/fusermount"; - fusermount3.source = "${pkgs.fuse3}/bin/fusermount3"; - mount.source = "${lib.getBin pkgs.util-linux}/bin/mount"; - umount.source = "${lib.getBin pkgs.util-linux}/bin/umount"; - }; + assertions = lib.mapAttrsToList + (name: opts: + { assertion = opts.setuid || opts.setgid -> opts.capabilities == ""; + message = '' + The security.wrappers.${name} wrapper is not valid: + setuid/setgid and capabilities are mutually exclusive. + ''; + } + ) wrappers; + + security.wrappers = + let + mkSetuidRoot = source: + { setuid = true; + owner = "root"; + group = "root"; + inherit source; + }; + in + { # These are mount related wrappers that require the +s permission. + fusermount = mkSetuidRoot "${pkgs.fuse}/bin/fusermount"; + fusermount3 = mkSetuidRoot "${pkgs.fuse3}/bin/fusermount3"; + mount = mkSetuidRoot "${lib.getBin pkgs.util-linux}/bin/mount"; + umount = mkSetuidRoot "${lib.getBin pkgs.util-linux}/bin/umount"; + }; boot.specialFileSystems.${parentWrapperDir} = { fsType = "tmpfs"; @@ -179,19 +249,15 @@ in ]}" ''; - ###### setcap activation script + ###### wrappers activation script system.activationScripts.wrappers = lib.stringAfter [ "specialfs" "users" ] '' - # Look in the system path and in the default profile for - # programs to be wrapped. - WRAPPER_PATH=${config.system.path}/bin:${config.system.path}/sbin - chmod 755 "${parentWrapperDir}" # We want to place the tmpdirs for the wrappers to the parent dir. wrapperDir=$(mktemp --directory --tmpdir="${parentWrapperDir}" wrappers.XXXXXXXXXX) - chmod a+rx $wrapperDir + chmod a+rx "$wrapperDir" ${lib.concatStringsSep "\n" mkWrappedPrograms} @@ -199,16 +265,44 @@ in # Atomically replace the symlink # See https://axialcorps.com/2013/07/03/atomically-replacing-files-and-directories/ old=$(readlink -f ${wrapperDir}) - if [ -e ${wrapperDir}-tmp ]; then - rm --force --recursive ${wrapperDir}-tmp + if [ -e "${wrapperDir}-tmp" ]; then + rm --force --recursive "${wrapperDir}-tmp" fi - ln --symbolic --force --no-dereference $wrapperDir ${wrapperDir}-tmp - mv --no-target-directory ${wrapperDir}-tmp ${wrapperDir} - rm --force --recursive $old + ln --symbolic --force --no-dereference "$wrapperDir" "${wrapperDir}-tmp" + mv --no-target-directory "${wrapperDir}-tmp" "${wrapperDir}" + rm --force --recursive "$old" else # For initial setup - ln --symbolic $wrapperDir ${wrapperDir} + ln --symbolic "$wrapperDir" "${wrapperDir}" fi ''; + + ###### wrappers consistency checks + system.extraDependencies = lib.singleton (pkgs.runCommandLocal + "ensure-all-wrappers-paths-exist" { } + '' + # make sure we produce output + mkdir -p $out + + echo -n "Checking that Nix store paths of all wrapped programs exist... " + + declare -A wrappers + ${lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: + "wrappers['${n}']='${v.source}'") wrappers)} + + for name in "''${!wrappers[@]}"; do + path="''${wrappers[$name]}" + if [[ "$path" =~ /nix/store ]] && [ ! -e "$path" ]; then + test -t 1 && echo -ne '\033[1;31m' + echo "FAIL" + echo "The path $path does not exist!" + echo 'Please, check the value of `security.wrappers."'$name'".source`.' + test -t 1 && echo -ne '\033[0m' + exit 1 + fi + done + + echo "OK" + ''); }; } diff --git a/nixos/modules/services/desktops/gnome/gnome-keyring.nix b/nixos/modules/services/desktops/gnome/gnome-keyring.nix index cda44bab8bfa..d821da164beb 100644 --- a/nixos/modules/services/desktops/gnome/gnome-keyring.nix +++ b/nixos/modules/services/desktops/gnome/gnome-keyring.nix @@ -52,8 +52,10 @@ with lib; security.pam.services.login.enableGnomeKeyring = true; security.wrappers.gnome-keyring-daemon = { - source = "${pkgs.gnome.gnome-keyring}/bin/gnome-keyring-daemon"; + owner = "root"; + group = "root"; capabilities = "cap_ipc_lock=ep"; + source = "${pkgs.gnome.gnome-keyring}/bin/gnome-keyring-daemon"; }; }; diff --git a/nixos/modules/services/desktops/gsignond.nix b/nixos/modules/services/desktops/gsignond.nix index 5ab9add9f32d..465acd73fa64 100644 --- a/nixos/modules/services/desktops/gsignond.nix +++ b/nixos/modules/services/desktops/gsignond.nix @@ -9,7 +9,7 @@ let in { - meta.maintainers = pkgs.pantheon.maintainers; + meta.maintainers = teams.pantheon.members; ###### interface diff --git a/nixos/modules/services/mail/exim.nix b/nixos/modules/services/mail/exim.nix index 8927d84b478c..25b533578c94 100644 --- a/nixos/modules/services/mail/exim.nix +++ b/nixos/modules/services/mail/exim.nix @@ -104,7 +104,12 @@ in gid = config.ids.gids.exim; }; - security.wrappers.exim.source = "${cfg.package}/bin/exim"; + security.wrappers.exim = + { setuid = true; + owner = "root"; + group = "root"; + source = "${cfg.package}/bin/exim"; + }; systemd.services.exim = { description = "Exim Mail Daemon"; diff --git a/nixos/modules/services/mail/mail.nix b/nixos/modules/services/mail/mail.nix index fed313e4738e..fcc7ff6db91b 100644 --- a/nixos/modules/services/mail/mail.nix +++ b/nixos/modules/services/mail/mail.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, options, lib, ... }: with lib; @@ -11,6 +11,7 @@ with lib; services.mail = { sendmailSetuidWrapper = mkOption { + type = types.nullOr options.security.wrappers.type.nestedTypes.elemType; default = null; internal = true; description = '' diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix index c838d3b949db..dc209e8add4e 100644 --- a/nixos/modules/services/mail/opensmtpd.nix +++ b/nixos/modules/services/mail/opensmtpd.nix @@ -103,12 +103,15 @@ in { }; security.wrappers.smtpctl = { + owner = "nobody"; group = "smtpq"; + setuid = false; setgid = true; source = "${cfg.package}/bin/smtpctl"; }; - services.mail.sendmailSetuidWrapper = mkIf cfg.setSendmail security.wrappers.smtpctl; + services.mail.sendmailSetuidWrapper = mkIf cfg.setSendmail + security.wrappers.smtpctl // { program = "sendmail"; }; systemd.tmpfiles.rules = [ "d /var/spool/smtpd 711 root - - -" diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 9b0a5bba2feb..2b8edb9c51f8 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -673,6 +673,7 @@ in services.mail.sendmailSetuidWrapper = mkIf config.services.postfix.setSendmail { program = "sendmail"; source = "${pkgs.postfix}/bin/sendmail"; + owner = "nobody"; group = setgidGroup; setuid = false; setgid = true; @@ -681,6 +682,7 @@ in security.wrappers.mailq = { program = "mailq"; source = "${pkgs.postfix}/bin/mailq"; + owner = "nobody"; group = setgidGroup; setuid = false; setgid = true; @@ -689,6 +691,7 @@ in security.wrappers.postqueue = { program = "postqueue"; source = "${pkgs.postfix}/bin/postqueue"; + owner = "nobody"; group = setgidGroup; setuid = false; setgid = true; @@ -697,6 +700,7 @@ in security.wrappers.postdrop = { program = "postdrop"; source = "${pkgs.postfix}/bin/postdrop"; + owner = "nobody"; group = setgidGroup; setuid = false; setgid = true; diff --git a/nixos/modules/services/misc/mame.nix b/nixos/modules/services/misc/mame.nix index 4b9a04be7c29..dd6c5ef9aa00 100644 --- a/nixos/modules/services/misc/mame.nix +++ b/nixos/modules/services/misc/mame.nix @@ -45,8 +45,10 @@ in environment.systemPackages = [ pkgs.mame ]; security.wrappers."${mame}" = { - source = "${pkgs.mame}/bin/${mame}"; + owner = "root"; + group = "root"; capabilities = "cap_net_admin,cap_net_raw+eip"; + source = "${pkgs.mame}/bin/${mame}"; }; systemd.services.mame = { diff --git a/nixos/modules/services/misc/weechat.nix b/nixos/modules/services/misc/weechat.nix index b71250f62e0f..9ac2b0ea490c 100644 --- a/nixos/modules/services/misc/weechat.nix +++ b/nixos/modules/services/misc/weechat.nix @@ -52,7 +52,12 @@ in wants = [ "network.target" ]; }; - security.wrappers.screen.source = "${pkgs.screen}/bin/screen"; + security.wrappers.screen = + { setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.screen}/bin/screen"; + }; }; meta.doc = ./weechat.xml; diff --git a/nixos/modules/services/monitoring/incron.nix b/nixos/modules/services/monitoring/incron.nix index dc97af58562e..255e1d9e30ba 100644 --- a/nixos/modules/services/monitoring/incron.nix +++ b/nixos/modules/services/monitoring/incron.nix @@ -71,7 +71,12 @@ in environment.systemPackages = [ pkgs.incron ]; - security.wrappers.incrontab.source = "${pkgs.incron}/bin/incrontab"; + security.wrappers.incrontab = + { setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.incron}/bin/incrontab"; + }; # incron won't read symlinks environment.etc."incron.d/system" = { diff --git a/nixos/modules/services/monitoring/zabbix-proxy.nix b/nixos/modules/services/monitoring/zabbix-proxy.nix index 2c8b8b92cb38..8c7a2970e9b3 100644 --- a/nixos/modules/services/monitoring/zabbix-proxy.nix +++ b/nixos/modules/services/monitoring/zabbix-proxy.nix @@ -262,7 +262,12 @@ in }; security.wrappers = { - fping.source = "${pkgs.fping}/bin/fping"; + fping = + { setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.fping}/bin/fping"; + }; }; systemd.services.zabbix-proxy = { diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix index ef411767a946..12d7ffe86758 100644 --- a/nixos/modules/services/networking/smokeping.nix +++ b/nixos/modules/services/networking/smokeping.nix @@ -278,8 +278,18 @@ in } ]; security.wrappers = { - fping.source = "${pkgs.fping}/bin/fping"; - fping6.source = "${pkgs.fping}/bin/fping6"; + fping = + { setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.fping}/bin/fping"; + }; + fping6 = + { setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.fping}/bin/fping6"; + }; }; environment.systemPackages = [ pkgs.fping ]; users.users.${cfg.user} = { diff --git a/nixos/modules/services/networking/x2goserver.nix b/nixos/modules/services/networking/x2goserver.nix index 48020fc1ceca..554e51f9d4ff 100644 --- a/nixos/modules/services/networking/x2goserver.nix +++ b/nixos/modules/services/networking/x2goserver.nix @@ -88,12 +88,14 @@ in { source = "${pkgs.x2goserver}/lib/x2go/libx2go-server-db-sqlite3-wrapper.pl"; owner = "x2go"; group = "x2go"; + setuid = false; setgid = true; }; security.wrappers.x2goprintWrapper = { source = "${pkgs.x2goserver}/bin/x2goprint"; owner = "x2go"; group = "x2go"; + setuid = false; setgid = true; }; diff --git a/nixos/modules/services/scheduling/cron.nix b/nixos/modules/services/scheduling/cron.nix index 3bc31832946b..c28956b3bfeb 100644 --- a/nixos/modules/services/scheduling/cron.nix +++ b/nixos/modules/services/scheduling/cron.nix @@ -93,7 +93,12 @@ in { services.cron.enable = mkDefault (allFiles != []); } (mkIf (config.services.cron.enable) { - security.wrappers.crontab.source = "${cronNixosPkg}/bin/crontab"; + security.wrappers.crontab = + { setuid = true; + owner = "root"; + group = "root"; + source = "${cronNixosPkg}/bin/crontab"; + }; environment.systemPackages = [ cronNixosPkg ]; environment.etc.crontab = { source = pkgs.runCommand "crontabs" { inherit allFiles; preferLocalBuild = true; } diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix index 42bed21bf25b..acaa995f7395 100644 --- a/nixos/modules/services/scheduling/fcron.nix +++ b/nixos/modules/services/scheduling/fcron.nix @@ -136,10 +136,13 @@ in owner = "fcron"; group = "fcron"; setgid = true; + setuid = false; }; fcronsighup = { source = "${pkgs.fcron}/bin/fcronsighup"; + owner = "root"; group = "fcron"; + setuid = true; }; }; systemd.services.fcron = { diff --git a/nixos/modules/services/security/opensnitch.nix b/nixos/modules/services/security/opensnitch.nix new file mode 100644 index 000000000000..919346cf2bb1 --- /dev/null +++ b/nixos/modules/services/security/opensnitch.nix @@ -0,0 +1,24 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + name = "opensnitch"; + cfg = config.services.opensnitch; +in { + options = { + services.opensnitch = { + enable = mkEnableOption "Opensnitch application firewall"; + }; + }; + + config = mkIf cfg.enable { + + systemd = { + packages = [ pkgs.opensnitch ]; + services.opensnitchd.wantedBy = [ "multi-user.target" ]; + }; + + }; +} + diff --git a/nixos/modules/services/security/physlock.nix b/nixos/modules/services/security/physlock.nix index da5c22a90a09..760e80f147f7 100644 --- a/nixos/modules/services/security/physlock.nix +++ b/nixos/modules/services/security/physlock.nix @@ -38,9 +38,6 @@ in setuid wrapper to allow any user to start physlock as root, which is a minor security risk. Call the physlock binary to use this instead of using the systemd service. - - Note that you might need to relog to have the correct binary in your - PATH upon changing this option. ''; }; @@ -129,7 +126,12 @@ in (mkIf cfg.allowAnyUser { - security.wrappers.physlock = { source = "${pkgs.physlock}/bin/physlock"; user = "root"; }; + security.wrappers.physlock = + { setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.physlock}/bin/physlock"; + }; }) ]); diff --git a/nixos/modules/services/video/replay-sorcery.nix b/nixos/modules/services/video/replay-sorcery.nix index d78e782c7968..7ce5be8a5a1c 100644 --- a/nixos/modules/services/video/replay-sorcery.nix +++ b/nixos/modules/services/video/replay-sorcery.nix @@ -44,8 +44,10 @@ in security.wrappers = mkIf cfg.enableSysAdminCapability { replay-sorcery = { - source = "${pkgs.replay-sorcery}/bin/replay-sorcery"; + owner = "root"; + group = "root"; capabilities = "cap_sys_admin+ep"; + source = "${pkgs.replay-sorcery}/bin/replay-sorcery"; }; }; diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index 685cb4967030..964fef23addf 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -1,16 +1,21 @@ -{ config, lib, pkgs, ... }: +{ config, pkgs, lib, ... }: let + inherit (lib) mkDefault mkEnableOption mkForce mkIf mkMerge mkOption types maintainers recursiveUpdate; + inherit (lib) any attrValues concatMapStrings concatMapStringsSep flatten literalExample; + inherit (lib) filterAttrs mapAttrs mapAttrs' mapAttrsToList nameValuePair optional optionalAttrs optionalString; - inherit (lib) mkEnableOption mkForce mkIf mkMerge mkOption optionalAttrs recursiveUpdate types maintainers; - inherit (lib) concatMapStringsSep flatten mapAttrs mapAttrs' mapAttrsToList nameValuePair concatMapStringSep; - - eachSite = config.services.dokuwiki; - + cfg = migrateOldAttrs config.services.dokuwiki; + eachSite = cfg.sites; user = "dokuwiki"; - group = config.services.nginx.group; + webserver = config.services.${cfg.webserver}; + stateDir = hostName: "/var/lib/dokuwiki/${hostName}/data"; - dokuwikiAclAuthConfig = cfg: pkgs.writeText "acl.auth.php" '' + # Migrate config.services.dokuwiki. to config.services.dokuwiki.sites. + oldSites = filterAttrs (o: _: o != "sites" && o != "webserver"); + migrateOldAttrs = cfg: cfg // { sites = cfg.sites // oldSites cfg; }; + + dokuwikiAclAuthConfig = hostName: cfg: pkgs.writeText "acl.auth-${hostName}.php" '' # acl.auth.php # # @@ -19,7 +24,7 @@ let ${toString cfg.acl} ''; - dokuwikiLocalConfig = cfg: pkgs.writeText "local.php" '' + dokuwikiLocalConfig = hostName: cfg: pkgs.writeText "local-${hostName}.php" '' + Mutually exclusive with services.dokuwiki.aclFile + Set this to a value other than null to take precedence over aclFile option. - stateDir = mkOption { - type = types.path; - default = "/var/lib/dokuwiki/${name}/data"; - description = "Location of the dokuwiki state directory."; - }; - - acl = mkOption { - type = types.nullOr types.lines; - default = null; - example = "* @ALL 8"; - description = '' - Access Control Lists: see - Mutually exclusive with services.dokuwiki.aclFile - Set this to a value other than null to take precedence over aclFile option. - - Warning: Consider using aclFile instead if you do not - want to store the ACL in the world-readable Nix store. - ''; - }; - - aclFile = mkOption { - type = with types; nullOr str; - default = if (config.aclUse && config.acl == null) then "/var/lib/dokuwiki/${name}/acl.auth.php" else null; - description = '' - Location of the dokuwiki acl rules. Mutually exclusive with services.dokuwiki.acl - Mutually exclusive with services.dokuwiki.acl which is preferred. - Consult documentation for further instructions. - Example: - ''; - example = "/var/lib/dokuwiki/${name}/acl.auth.php"; - }; - - aclUse = mkOption { - type = types.bool; - default = true; - description = '' - Necessary for users to log in into the system. - Also limits anonymous users. When disabled, - everyone is able to create and edit content. - ''; - }; - - pluginsConfig = mkOption { - type = types.lines; - default = '' - $plugins['authad'] = 0; - $plugins['authldap'] = 0; - $plugins['authmysql'] = 0; - $plugins['authpgsql'] = 0; - ''; - description = '' - List of the dokuwiki (un)loaded plugins. - ''; - }; - - superUser = mkOption { - type = types.nullOr types.str; - default = "@admin"; - description = '' - You can set either a username, a list of usernames (“admin1,admin2”), - or the name of a group by prepending an @ char to the groupname - Consult documentation for further instructions. - ''; - }; - - usersFile = mkOption { - type = with types; nullOr str; - default = if config.aclUse then "/var/lib/dokuwiki/${name}/users.auth.php" else null; - description = '' - Location of the dokuwiki users file. List of users. Format: - login:passwordhash:Real Name:email:groups,comma,separated - Create passwordHash easily by using:$ mkpasswd -5 password `pwgen 8 1` - Example: + Warning: Consider using aclFile instead if you do not + want to store the ACL in the world-readable Nix store. ''; - example = "/var/lib/dokuwiki/${name}/users.auth.php"; - }; - - disableActions = mkOption { - type = types.nullOr types.str; - default = ""; - example = "search,register"; - description = '' - Disable individual action modes. Refer to - - for details on supported values. - ''; - }; - - extraConfig = mkOption { - type = types.nullOr types.lines; - default = null; - example = '' - $conf['title'] = 'My Wiki'; - $conf['userewrite'] = 1; - ''; - description = '' - DokuWiki configuration. Refer to - - for details on supported values. - ''; - }; - - plugins = mkOption { - type = types.listOf types.path; - default = []; - description = '' - List of path(s) to respective plugin(s) which are copied from the 'plugin' directory. - These plugins need to be packaged before use, see example. - ''; - example = '' - # Let's package the icalevents plugin - plugin-icalevents = pkgs.stdenv.mkDerivation { - name = "icalevents"; - # Download the plugin from the dokuwiki site - src = pkgs.fetchurl { - url = "https://github.com/real-or-random/dokuwiki-plugin-icalevents/releases/download/2017-06-16/dokuwiki-plugin-icalevents-2017-06-16.zip"; - sha256 = "e40ed7dd6bbe7fe3363bbbecb4de481d5e42385b5a0f62f6a6ce6bf3a1f9dfa8"; - }; - sourceRoot = "."; - # We need unzip to build this package - nativeBuildInputs = [ pkgs.unzip ]; - # Installing simply means copying all files to the output directory - installPhase = "mkdir -p $out; cp -R * $out/"; - }; - - # And then pass this theme to the plugin list like this: - plugins = [ plugin-icalevents ]; - ''; - }; - - templates = mkOption { - type = types.listOf types.path; - default = []; - description = '' - List of path(s) to respective template(s) which are copied from the 'tpl' directory. - These templates need to be packaged before use, see example. - ''; - example = '' - # Let's package the bootstrap3 theme - template-bootstrap3 = pkgs.stdenv.mkDerivation { - name = "bootstrap3"; - # Download the theme from the dokuwiki site - src = pkgs.fetchurl { - url = "https://github.com/giterlizzi/dokuwiki-template-bootstrap3/archive/v2019-05-22.zip"; - sha256 = "4de5ff31d54dd61bbccaf092c9e74c1af3a4c53e07aa59f60457a8f00cfb23a6"; - }; - # We need unzip to build this package - nativeBuildInputs = [ pkgs.unzip ]; - # Installing simply means copying all files to the output directory - installPhase = "mkdir -p $out; cp -R * $out/"; - }; - - # And then pass this theme to the template list like this: - templates = [ template-bootstrap3 ]; - ''; - }; - - poolConfig = mkOption { - type = with types; attrsOf (oneOf [ str int bool ]); - default = { - "pm" = "dynamic"; - "pm.max_children" = 32; - "pm.start_servers" = 2; - "pm.min_spare_servers" = 2; - "pm.max_spare_servers" = 4; - "pm.max_requests" = 500; }; - description = '' - Options for the dokuwiki PHP pool. See the documentation on php-fpm.conf - for details on configuration directives. - ''; + + aclFile = mkOption { + type = with types; nullOr str; + default = if (config.aclUse && config.acl == null) then "/var/lib/dokuwiki/${name}/acl.auth.php" else null; + description = '' + Location of the dokuwiki acl rules. Mutually exclusive with services.dokuwiki.acl + Mutually exclusive with services.dokuwiki.acl which is preferred. + Consult documentation for further instructions. + Example: + ''; + example = "/var/lib/dokuwiki/${name}/acl.auth.php"; + }; + + aclUse = mkOption { + type = types.bool; + default = true; + description = '' + Necessary for users to log in into the system. + Also limits anonymous users. When disabled, + everyone is able to create and edit content. + ''; + }; + + pluginsConfig = mkOption { + type = types.lines; + default = '' + $plugins['authad'] = 0; + $plugins['authldap'] = 0; + $plugins['authmysql'] = 0; + $plugins['authpgsql'] = 0; + ''; + description = '' + List of the dokuwiki (un)loaded plugins. + ''; + }; + + superUser = mkOption { + type = types.nullOr types.str; + default = "@admin"; + description = '' + You can set either a username, a list of usernames (“admin1,admin2”), + or the name of a group by prepending an @ char to the groupname + Consult documentation for further instructions. + ''; + }; + + usersFile = mkOption { + type = with types; nullOr str; + default = if config.aclUse then "/var/lib/dokuwiki/${name}/users.auth.php" else null; + description = '' + Location of the dokuwiki users file. List of users. Format: + login:passwordhash:Real Name:email:groups,comma,separated + Create passwordHash easily by using:$ mkpasswd -5 password `pwgen 8 1` + Example: + ''; + example = "/var/lib/dokuwiki/${name}/users.auth.php"; + }; + + disableActions = mkOption { + type = types.nullOr types.str; + default = ""; + example = "search,register"; + description = '' + Disable individual action modes. Refer to + + for details on supported values. + ''; + }; + + plugins = mkOption { + type = types.listOf types.path; + default = []; + description = '' + List of path(s) to respective plugin(s) which are copied from the 'plugin' directory. + These plugins need to be packaged before use, see example. + ''; + example = '' + # Let's package the icalevents plugin + plugin-icalevents = pkgs.stdenv.mkDerivation { + name = "icalevents"; + # Download the plugin from the dokuwiki site + src = pkgs.fetchurl { + url = "https://github.com/real-or-random/dokuwiki-plugin-icalevents/releases/download/2017-06-16/dokuwiki-plugin-icalevents-2017-06-16.zip"; + sha256 = "e40ed7dd6bbe7fe3363bbbecb4de481d5e42385b5a0f62f6a6ce6bf3a1f9dfa8"; + }; + sourceRoot = "."; + # We need unzip to build this package + buildInputs = [ pkgs.unzip ]; + # Installing simply means copying all files to the output directory + installPhase = "mkdir -p $out; cp -R * $out/"; + }; + + # And then pass this theme to the plugin list like this: + plugins = [ plugin-icalevents ]; + ''; + }; + + templates = mkOption { + type = types.listOf types.path; + default = []; + description = '' + List of path(s) to respective template(s) which are copied from the 'tpl' directory. + These templates need to be packaged before use, see example. + ''; + example = '' + # Let's package the bootstrap3 theme + template-bootstrap3 = pkgs.stdenv.mkDerivation { + name = "bootstrap3"; + # Download the theme from the dokuwiki site + src = pkgs.fetchurl { + url = "https://github.com/giterlizzi/dokuwiki-template-bootstrap3/archive/v2019-05-22.zip"; + sha256 = "4de5ff31d54dd61bbccaf092c9e74c1af3a4c53e07aa59f60457a8f00cfb23a6"; + }; + # We need unzip to build this package + buildInputs = [ pkgs.unzip ]; + # Installing simply means copying all files to the output directory + installPhase = "mkdir -p $out; cp -R * $out/"; + }; + + # And then pass this theme to the template list like this: + templates = [ template-bootstrap3 ]; + ''; + }; + + poolConfig = mkOption { + type = with types; attrsOf (oneOf [ str int bool ]); + default = { + "pm" = "dynamic"; + "pm.max_children" = 32; + "pm.start_servers" = 2; + "pm.min_spare_servers" = 2; + "pm.max_spare_servers" = 4; + "pm.max_requests" = 500; + }; + description = '' + Options for the DokuWiki PHP pool. See the documentation on php-fpm.conf + for details on configuration directives. + ''; + }; + + extraConfig = mkOption { + type = types.nullOr types.lines; + default = null; + example = '' + $conf['title'] = 'My Wiki'; + $conf['userewrite'] = 1; + ''; + description = '' + DokuWiki configuration. Refer to + + for details on supported values. + ''; + }; + }; - nginx = mkOption { - type = types.submodule ( - recursiveUpdate - (import ../web-servers/nginx/vhost-options.nix { inherit config lib; }) {} - ); - default = {}; - example = { - serverAliases = [ - "wiki.\${config.networking.domain}" - ]; - # To enable encryption and let let's encrypt take care of certificate - forceSSL = true; - enableACME = true; - }; - description = '' - With this option, you can customize the nginx virtualHost settings. - ''; - }; }; - }; in { # interface options = { services.dokuwiki = mkOption { - type = types.attrsOf (types.submodule siteOpts); + type = types.submodule { + # Used to support old interface + freeformType = types.attrsOf (types.submodule siteOpts); + + # New interface + options.sites = mkOption { + type = types.attrsOf (types.submodule siteOpts); + default = {}; + description = "Specification of one or more DokuWiki sites to serve"; + }; + + options.webserver = mkOption { + type = types.enum [ "nginx" "caddy" ]; + default = "nginx"; + description = '' + Whether to use nginx or caddy for virtual host management. + + Further nginx configuration can be done by adapting services.nginx.virtualHosts.<name>. + See for further information. + + Further apache2 configuration can be done by adapting services.httpd.virtualHosts.<name>. + See for further information. + ''; + }; + }; default = {}; - description = "Sepcification of one or more dokuwiki sites to serve."; + description = "DokuWiki configuration"; }; + }; # implementation - - config = mkIf (eachSite != {}) { - - warnings = mapAttrsToList (hostName: cfg: mkIf (cfg.superUser == null) "Not setting services.dokuwiki.${hostName} superUser will impair your ability to administer DokuWiki") eachSite; + config = mkIf (eachSite != {}) (mkMerge [{ assertions = flatten (mapAttrsToList (hostName: cfg: [{ assertion = cfg.aclUse -> (cfg.acl != null || cfg.aclFile != null); - message = "Either services.dokuwiki.${hostName}.acl or services.dokuwiki.${hostName}.aclFile is mandatory if aclUse true"; + message = "Either services.dokuwiki.sites.${hostName}.acl or services.dokuwiki.sites.${hostName}.aclFile is mandatory if aclUse true"; } { assertion = cfg.usersFile != null -> cfg.aclUse != false; - message = "services.dokuwiki.${hostName}.aclUse must must be true if usersFile is not null"; + message = "services.dokuwiki.sites.${hostName}.aclUse must must be true if usersFile is not null"; } ]) eachSite); + warnings = mapAttrsToList (hostName: _: ''services.dokuwiki."${hostName}" is deprecated use services.dokuwiki.sites."${hostName}"'') (oldSites cfg); + services.phpfpm.pools = mapAttrs' (hostName: cfg: ( nameValuePair "dokuwiki-${hostName}" { inherit user; - inherit group; + group = webserver.group; + phpEnv = { - DOKUWIKI_LOCAL_CONFIG = "${dokuwikiLocalConfig cfg}"; - DOKUWIKI_PLUGINS_LOCAL_CONFIG = "${dokuwikiPluginsLocalConfig cfg}"; + DOKUWIKI_LOCAL_CONFIG = "${dokuwikiLocalConfig hostName cfg}"; + DOKUWIKI_PLUGINS_LOCAL_CONFIG = "${dokuwikiPluginsLocalConfig hostName cfg}"; } // optionalAttrs (cfg.usersFile != null) { DOKUWIKI_USERS_AUTH_CONFIG = "${cfg.usersFile}"; } //optionalAttrs (cfg.aclUse) { - DOKUWIKI_ACL_AUTH_CONFIG = if (cfg.acl != null) then "${dokuwikiAclAuthConfig cfg}" else "${toString cfg.aclFile}"; + DOKUWIKI_ACL_AUTH_CONFIG = if (cfg.acl != null) then "${dokuwikiAclAuthConfig hostName cfg}" else "${toString cfg.aclFile}"; }; settings = { - "listen.mode" = "0660"; - "listen.owner" = user; - "listen.group" = group; + "listen.owner" = webserver.user; + "listen.group" = webserver.group; } // cfg.poolConfig; - })) eachSite; + } + )) eachSite; + } + + { + systemd.tmpfiles.rules = flatten (mapAttrsToList (hostName: cfg: [ + "d ${stateDir hostName}/attic 0750 ${user} ${webserver.group} - -" + "d ${stateDir hostName}/cache 0750 ${user} ${webserver.group} - -" + "d ${stateDir hostName}/index 0750 ${user} ${webserver.group} - -" + "d ${stateDir hostName}/locks 0750 ${user} ${webserver.group} - -" + "d ${stateDir hostName}/media 0750 ${user} ${webserver.group} - -" + "d ${stateDir hostName}/media_attic 0750 ${user} ${webserver.group} - -" + "d ${stateDir hostName}/media_meta 0750 ${user} ${webserver.group} - -" + "d ${stateDir hostName}/meta 0750 ${user} ${webserver.group} - -" + "d ${stateDir hostName}/pages 0750 ${user} ${webserver.group} - -" + "d ${stateDir hostName}/tmp 0750 ${user} ${webserver.group} - -" + ] ++ lib.optional (cfg.aclFile != null) "C ${cfg.aclFile} 0640 ${user} ${webserver.group} - ${pkg hostName cfg}/share/dokuwiki/conf/acl.auth.php.dist" + ++ lib.optional (cfg.usersFile != null) "C ${cfg.usersFile} 0640 ${user} ${webserver.group} - ${pkg hostName cfg}/share/dokuwiki/conf/users.auth.php.dist" + ) eachSite); + + users.users.${user} = { + group = webserver.group; + isSystemUser = true; + }; + } + + (mkIf (cfg.webserver == "nginx") { services.nginx = { enable = true; - virtualHosts = mapAttrs (hostName: cfg: mkMerge [ cfg.nginx { - root = mkForce "${pkg hostName cfg}/share/dokuwiki"; - extraConfig = lib.optionalString (cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME) "fastcgi_param HTTPS on;"; + virtualHosts = mapAttrs (hostName: cfg: { + serverName = mkDefault hostName; + root = "${pkg hostName cfg}/share/dokuwiki"; - locations."~ /(conf/|bin/|inc/|install.php)" = { - extraConfig = "deny all;"; - }; + locations = { + "~ /(conf/|bin/|inc/|install.php)" = { + extraConfig = "deny all;"; + }; - locations."~ ^/data/" = { - root = "${cfg.stateDir}"; - extraConfig = "internal;"; - }; + "~ ^/data/" = { + root = "${stateDir hostName}"; + extraConfig = "internal;"; + }; - locations."~ ^/lib.*\\.(js|css|gif|png|ico|jpg|jpeg)$" = { - extraConfig = "expires 365d;"; - }; + "~ ^/lib.*\.(js|css|gif|png|ico|jpg|jpeg)$" = { + extraConfig = "expires 365d;"; + }; - locations."/" = { - priority = 1; - index = "doku.php"; - extraConfig = "try_files $uri $uri/ @dokuwiki;"; - }; + "/" = { + priority = 1; + index = "doku.php"; + extraConfig = ''try_files $uri $uri/ @dokuwiki;''; + }; - locations."@dokuwiki" = { - extraConfig = '' + "@dokuwiki" = { + extraConfig = '' # rewrites "doku.php/" out of the URLs if you set the userwrite setting to .htaccess in dokuwiki config page rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; rewrite ^/(.*) /doku.php?id=$1&$args last; - ''; - }; + ''; + }; - locations."~ \\.php$" = { - extraConfig = '' + "~ \\.php$" = { + extraConfig = '' try_files $uri $uri/ /doku.php; include ${pkgs.nginx}/conf/fastcgi_params; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param REDIRECT_STATUS 200; fastcgi_pass unix:${config.services.phpfpm.pools."dokuwiki-${hostName}".socket}; - ${lib.optionalString (cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME) "fastcgi_param HTTPS on;"} - ''; + ''; + }; + }; - }]) eachSite; + }) eachSite; }; + }) - systemd.tmpfiles.rules = flatten (mapAttrsToList (hostName: cfg: [ - "d ${cfg.stateDir}/attic 0750 ${user} ${group} - -" - "d ${cfg.stateDir}/cache 0750 ${user} ${group} - -" - "d ${cfg.stateDir}/index 0750 ${user} ${group} - -" - "d ${cfg.stateDir}/locks 0750 ${user} ${group} - -" - "d ${cfg.stateDir}/media 0750 ${user} ${group} - -" - "d ${cfg.stateDir}/media_attic 0750 ${user} ${group} - -" - "d ${cfg.stateDir}/media_meta 0750 ${user} ${group} - -" - "d ${cfg.stateDir}/meta 0750 ${user} ${group} - -" - "d ${cfg.stateDir}/pages 0750 ${user} ${group} - -" - "d ${cfg.stateDir}/tmp 0750 ${user} ${group} - -" - ] ++ lib.optional (cfg.aclFile != null) "C ${cfg.aclFile} 0640 ${user} ${group} - ${pkg hostName cfg}/share/dokuwiki/conf/acl.auth.php.dist" - ++ lib.optional (cfg.usersFile != null) "C ${cfg.usersFile} 0640 ${user} ${group} - ${pkg hostName cfg}/share/dokuwiki/conf/users.auth.php.dist" - ) eachSite); + (mkIf (cfg.webserver == "caddy") { + services.caddy = { + enable = true; + virtualHosts = mapAttrs' (hostName: cfg: ( + nameValuePair "http://${hostName}" { + extraConfig = '' + root * ${pkg hostName cfg}/share/dokuwiki + file_server - users.users.${user} = { - group = group; - isSystemUser = true; + encode zstd gzip + php_fastcgi unix/${config.services.phpfpm.pools."dokuwiki-${hostName}".socket} + + @restrict_files { + path /data/* /conf/* /bin/* /inc/* /vendor/* /install.php + } + + respond @restrict_files 404 + + @allow_media { + path_regexp path ^/_media/(.*)$ + } + rewrite @allow_media /lib/exe/fetch.php?media=/{http.regexp.path.1} + + @allow_detail { + path /_detail* + } + rewrite @allow_detail /lib/exe/detail.php?media={path} + + @allow_export { + path /_export* + path_regexp export /([^/]+)/(.*) + } + rewrite @allow_export /doku.php?do=export_{http.regexp.export.1}&id={http.regexp.export.2} + + try_files {path} {path}/ /doku.php?id={path}&{query} + ''; + } + )) eachSite; }; - }; + }) - meta.maintainers = with maintainers; [ _1000101 ]; + ]); + meta.maintainers = with maintainers; [ + _1000101 + onny + ]; } diff --git a/nixos/modules/services/x11/desktop-managers/cde.nix b/nixos/modules/services/x11/desktop-managers/cde.nix index 3f1575a0ca63..24ca82fca796 100644 --- a/nixos/modules/services/x11/desktop-managers/cde.nix +++ b/nixos/modules/services/x11/desktop-managers/cde.nix @@ -49,9 +49,10 @@ in { users.groups.mail = {}; security.wrappers = { dtmail = { - source = "${pkgs.cdesktopenv}/bin/dtmail"; - group = "mail"; setgid = true; + owner = "nobody"; + group = "mail"; + source = "${pkgs.cdesktopenv}/bin/dtmail"; }; }; diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index 3a7ab64510b5..e3d876e82fdd 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -65,9 +65,24 @@ in # Wrappers for programs installed by enlightenment that should be setuid security.wrappers = { - enlightenment_ckpasswd.source = "${pkgs.enlightenment.enlightenment}/lib/enlightenment/utils/enlightenment_ckpasswd"; - enlightenment_sys.source = "${pkgs.enlightenment.enlightenment}/lib/enlightenment/utils/enlightenment_sys"; - enlightenment_system.source = "${pkgs.enlightenment.enlightenment}/lib/enlightenment/utils/enlightenment_system"; + enlightenment_ckpasswd = + { setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.enlightenment.enlightenment}/lib/enlightenment/utils/enlightenment_ckpasswd"; + }; + enlightenment_sys = + { setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.enlightenment.enlightenment}/lib/enlightenment/utils/enlightenment_sys"; + }; + enlightenment_system = + { setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.enlightenment.enlightenment}/lib/enlightenment/utils/enlightenment_system"; + }; }; environment.etc."X11/xkb".source = xcfg.xkbDir; diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 1e9fb269a261..887d6c91e83b 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -18,7 +18,7 @@ in meta = { doc = ./pantheon.xml; - maintainers = pkgs.pantheon.maintainers; + maintainers = teams.pantheon.members; }; options = { diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index aac905fea437..d8dc2675f068 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -197,12 +197,24 @@ in }; security.wrappers = { - kcheckpass.source = "${lib.getBin libsForQt5.kscreenlocker}/libexec/kcheckpass"; - start_kdeinit.source = "${lib.getBin libsForQt5.kinit}/libexec/kf5/start_kdeinit"; - kwin_wayland = { - source = "${lib.getBin plasma5.kwin}/bin/kwin_wayland"; - capabilities = "cap_sys_nice+ep"; - }; + kcheckpass = + { setuid = true; + owner = "root"; + group = "root"; + source = "${lib.getBin libsForQt5.kscreenlocker}/libexec/kcheckpass"; + }; + start_kdeinit = + { setuid = true; + owner = "root"; + group = "root"; + source = "${lib.getBin libsForQt5.kinit}/libexec/kf5/start_kdeinit"; + }; + kwin_wayland = + { owner = "root"; + group = "root"; + capabilities = "cap_sys_nice+ep"; + source = "${lib.getBin plasma5.kwin}/bin/kwin_wayland"; + }; }; # DDC support diff --git a/nixos/modules/services/x11/extra-layouts.nix b/nixos/modules/services/x11/extra-layouts.nix index 0e2edc6a5309..b1c4e04975f9 100644 --- a/nixos/modules/services/x11/extra-layouts.nix +++ b/nixos/modules/services/x11/extra-layouts.nix @@ -79,6 +79,10 @@ let }; }; + xkb_patched = pkgs.xorg.xkeyboardconfig_custom { + layouts = config.services.xserver.extraLayouts; + }; + in { @@ -114,58 +118,14 @@ in config = mkIf (layouts != { }) { - # We don't override xkeyboard_config directly to - # reduce the amount of packages to be recompiled. - # Only the following packages are necessary to set - # a custom layout anyway: - nixpkgs.overlays = lib.singleton (self: super: { - - xkb_patched = self.xorg.xkeyboardconfig_custom { - layouts = config.services.xserver.extraLayouts; - }; - - xorg = super.xorg // { - xorgserver = super.xorg.xorgserver.overrideAttrs (old: { - configureFlags = old.configureFlags ++ [ - "--with-xkb-bin-directory=${self.xorg.xkbcomp}/bin" - "--with-xkb-path=${self.xkb_patched}/share/X11/xkb" - ]; - }); - - setxkbmap = super.xorg.setxkbmap.overrideAttrs (old: { - postInstall = - '' - mkdir -p $out/share - ln -sfn ${self.xkb_patched}/etc/X11 $out/share/X11 - ''; - }); - - xkbcomp = super.xorg.xkbcomp.overrideAttrs (old: { - configureFlags = [ "--with-xkb-config-root=${self.xkb_patched}/share/X11/xkb" ]; - }); - - }; - - ckbcomp = super.ckbcomp.override { - xkeyboard_config = self.xkb_patched; - }; - - xkbvalidate = super.xkbvalidate.override { - libxkbcommon = self.libxkbcommon.override { - xkeyboard_config = self.xkb_patched; - }; - }; - - }); - environment.sessionVariables = { # runtime override supported by multiple libraries e. g. libxkbcommon # https://xkbcommon.org/doc/current/group__include-path.html - XKB_CONFIG_ROOT = "${pkgs.xkb_patched}/etc/X11/xkb"; + XKB_CONFIG_ROOT = "${xkb_patched}/etc/X11/xkb"; }; services.xserver = { - xkbDir = "${pkgs.xkb_patched}/etc/X11/xkb"; + xkbDir = "${xkb_patched}/etc/X11/xkb"; exportConfiguration = config.services.xserver.displayManager.startx.enable || config.services.xserver.displayManager.sx.enable; }; diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index ad9bd88f98aa..ee190ac3cc44 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -738,6 +738,9 @@ in nativeBuildInputs = with pkgs.buildPackages; [ xkbvalidate ]; preferLocalBuild = true; } '' + ${optionalString (config.environment.sessionVariables ? XKB_CONFIG_ROOT) + "export XKB_CONFIG_ROOT=${config.environment.sessionVariables.XKB_CONFIG_ROOT}" + } xkbvalidate "$xkbModel" "$layout" "$xkbVariant" "$xkbOptions" touch "$out" ''); diff --git a/nixos/modules/tasks/filesystems/ecryptfs.nix b/nixos/modules/tasks/filesystems/ecryptfs.nix index 12a407cabbfb..8138e6591610 100644 --- a/nixos/modules/tasks/filesystems/ecryptfs.nix +++ b/nixos/modules/tasks/filesystems/ecryptfs.nix @@ -7,8 +7,18 @@ with lib; config = mkIf (any (fs: fs == "ecryptfs") config.boot.supportedFilesystems) { system.fsPackages = [ pkgs.ecryptfs ]; security.wrappers = { - "mount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/mount.ecryptfs_private"; - "umount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/umount.ecryptfs_private"; + "mount.ecryptfs_private" = + { setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.ecryptfs.out}/bin/mount.ecryptfs_private"; + }; + "umount.ecryptfs_private" = + { setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.ecryptfs.out}/bin/umount.ecryptfs_private"; + }; }; }; } diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 8f9c66b01572..d934e3cf0224 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -1133,11 +1133,16 @@ in # kernel because we need the ambient capability security.wrappers = if (versionAtLeast (getVersion config.boot.kernelPackages.kernel) "4.3") then { ping = { - source = "${pkgs.iputils.out}/bin/ping"; + owner = "root"; + group = "root"; capabilities = "cap_net_raw+p"; + source = "${pkgs.iputils.out}/bin/ping"; }; } else { - ping.source = "${pkgs.iputils.out}/bin/ping"; + setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.iputils.out}/bin/ping"; }; security.apparmor.policies."bin.ping".profile = lib.mkIf config.security.apparmor.policies."bin.ping".enable (lib.mkAfter '' /run/wrappers/bin/ping { diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index f45f1802d91c..3c291397a998 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -183,6 +183,9 @@ in { }; security.wrappers.qemu-bridge-helper = { + setuid = true; + owner = "root"; + group = "root"; source = "/run/${dirName}/nix-helpers/qemu-bridge-helper"; }; diff --git a/nixos/modules/virtualisation/spice-usb-redirection.nix b/nixos/modules/virtualisation/spice-usb-redirection.nix index 4168cebe79b1..255327f2622c 100644 --- a/nixos/modules/virtualisation/spice-usb-redirection.nix +++ b/nixos/modules/virtualisation/spice-usb-redirection.nix @@ -14,9 +14,11 @@ config = lib.mkIf config.virtualisation.spiceUSBRedirection.enable { environment.systemPackages = [ pkgs.spice-gtk ]; # For polkit actions - security.wrappers.spice-client-glib-usb-acl-helper ={ - source = "${pkgs.spice-gtk}/bin/spice-client-glib-usb-acl-helper"; + security.wrappers.spice-client-glib-usb-acl-helper = { + owner = "root"; + group = "root"; capabilities = "cap_fowner+ep"; + source = "${pkgs.spice-gtk}/bin/spice-client-glib-usb-acl-helper"; }; }; diff --git a/nixos/modules/virtualisation/vmware-guest.nix b/nixos/modules/virtualisation/vmware-guest.nix index 9465a8d6800d..9f5e183c7c58 100644 --- a/nixos/modules/virtualisation/vmware-guest.nix +++ b/nixos/modules/virtualisation/vmware-guest.nix @@ -37,6 +37,23 @@ in serviceConfig.ExecStart = "${open-vm-tools}/bin/vmtoolsd"; }; + # Mount the vmblock for drag-and-drop and copy-and-paste. + systemd.mounts = [ + { + description = "VMware vmblock fuse mount"; + documentation = [ "https://github.com/vmware/open-vm-tools/blob/master/open-vm-tools/vmblock-fuse/design.txt" ]; + before = [ "vmware.service" ]; + wants = [ "vmware.service" ]; + what = "${open-vm-tools}/bin/vmware-vmblock-fuse"; + where = "/run/vmblock-fuse"; + type = "fuse"; + options = "subtype=vmware-vmblock,default_permissions,allow_other"; + wantedBy = [ "multi-user.target" ]; + } + ]; + + security.wrappers.vmware-user-suid-wrapper.source = "${open-vm-tools}/bin/vmware-user-suid-wrapper"; + environment.etc.vmware-tools.source = "${open-vm-tools}/etc/vmware-tools/*"; services.xserver = mkIf (!cfg.headless) { diff --git a/nixos/tests/dokuwiki.nix b/nixos/tests/dokuwiki.nix index 2664e1500ea4..67657e89f74c 100644 --- a/nixos/tests/dokuwiki.nix +++ b/nixos/tests/dokuwiki.nix @@ -33,44 +33,79 @@ let in { name = "dokuwiki"; meta = with pkgs.lib; { - maintainers = with maintainers; [ _1000101 ]; + maintainers = with maintainers; [ + _1000101 + onny + ]; }; - machine = { ... }: { - services.dokuwiki."site1.local" = { - aclUse = false; - superUser = "admin"; + + nodes = { + dokuwiki_nginx = {...}: { + services.dokuwiki = { + sites = { + "site1.local" = { + aclUse = false; + superUser = "admin"; + }; + "site2.local" = { + usersFile = "/var/lib/dokuwiki/site2.local/users.auth.php"; + superUser = "admin"; + templates = [ template-bootstrap3 ]; + plugins = [ plugin-icalevents ]; + }; + }; + }; + + networking.firewall.allowedTCPPorts = [ 80 ]; + networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ]; }; - services.dokuwiki."site2.local" = { - usersFile = "/var/lib/dokuwiki/site2.local/users.auth.php"; - superUser = "admin"; - templates = [ template-bootstrap3 ]; - plugins = [ plugin-icalevents ]; + + dokuwiki_caddy = {...}: { + services.dokuwiki = { + webserver = "caddy"; + sites = { + "site1.local" = { + aclUse = false; + superUser = "admin"; + }; + "site2.local" = { + usersFile = "/var/lib/dokuwiki/site2.local/users.auth.php"; + superUser = "admin"; + templates = [ template-bootstrap3 ]; + plugins = [ plugin-icalevents ]; + }; + }; + }; + + networking.firewall.allowedTCPPorts = [ 80 ]; + networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ]; }; - networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ]; + }; testScript = '' - site_names = ["site1.local", "site2.local"] start_all() - machine.wait_for_unit("phpfpm-dokuwiki-site1.local.service") - machine.wait_for_unit("phpfpm-dokuwiki-site2.local.service") + dokuwiki_nginx.wait_for_unit("nginx") + dokuwiki_caddy.wait_for_unit("caddy") - machine.wait_for_unit("nginx.service") + site_names = ["site1.local", "site2.local"] - machine.wait_for_open_port(80) + for machine in (dokuwiki_nginx, dokuwiki_caddy): + for site_name in site_names: + machine.wait_for_unit(f"phpfpm-dokuwiki-{site_name}") - machine.succeed("curl -sSfL http://site1.local/ | grep 'DokuWiki'") - machine.fail("curl -sSfL 'http://site1.local/doku.php?do=login' | grep 'Login'") + machine.succeed("curl -sSfL http://site1.local/ | grep 'DokuWiki'") + machine.fail("curl -sSfL 'http://site1.local/doku.php?do=login' | grep 'Login'") - machine.succeed("curl -sSfL http://site2.local/ | grep 'DokuWiki'") - machine.succeed("curl -sSfL 'http://site2.local/doku.php?do=login' | grep 'Login'") + machine.succeed("curl -sSfL http://site2.local/ | grep 'DokuWiki'") + machine.succeed("curl -sSfL 'http://site2.local/doku.php?do=login' | grep 'Login'") - machine.succeed( - "echo 'admin:$2y$10$ijdBQMzSVV20SrKtCna8gue36vnsbVm2wItAXvdm876sshI4uwy6S:Admin:admin@example.test:user' >> /var/lib/dokuwiki/site2.local/users.auth.php", - "curl -sSfL -d 'u=admin&p=password' --cookie-jar cjar 'http://site2.local/doku.php?do=login'", - "curl -sSfL --cookie cjar --cookie-jar cjar 'http://site2.local/doku.php?do=login' | grep 'Logged in as: Admin'", - ) + machine.succeed( + "echo 'admin:$2y$10$ijdBQMzSVV20SrKtCna8gue36vnsbVm2wItAXvdm876sshI4uwy6S:Admin:admin@example.test:user' >> /var/lib/dokuwiki/site2.local/users.auth.php", + "curl -sSfL -d 'u=admin&p=password' --cookie-jar cjar 'http://site2.local/doku.php?do=login'", + "curl -sSfL --cookie cjar --cookie-jar cjar 'http://site2.local/doku.php?do=login' | grep 'Logged in as: Admin'", + ) ''; }) diff --git a/nixos/tests/pantheon.nix b/nixos/tests/pantheon.nix index 013ab441ab41..07588ddc3176 100644 --- a/nixos/tests/pantheon.nix +++ b/nixos/tests/pantheon.nix @@ -3,8 +3,8 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "pantheon"; - meta = with pkgs.lib.maintainers; { - maintainers = pkgs.pantheon.maintainers; + meta = with lib; { + maintainers = teams.pantheon.members; }; machine = { ... }: diff --git a/pkgs/applications/radio/pyradio/default.nix b/pkgs/applications/audio/pyradio/default.nix similarity index 100% rename from pkgs/applications/radio/pyradio/default.nix rename to pkgs/applications/audio/pyradio/default.nix diff --git a/pkgs/applications/audio/sidplayfp/default.nix b/pkgs/applications/audio/sidplayfp/default.nix index 18bd8170f1db..73f1f650677c 100644 --- a/pkgs/applications/audio/sidplayfp/default.nix +++ b/pkgs/applications/audio/sidplayfp/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "sidplayfp"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "sidplayfp"; rev = "v${version}"; - sha256 = "sha256-IlPZmZpWxMaArkRnqu6JCGxiHU7JczRxiySqzAopfxc="; + sha256 = "sha256-DBZZf3A0AYkeQxQvHGyHHbsQ2EDuxsZnZPbxkWTNcHA="; }; nativeBuildInputs = [ autoreconfHook perl pkg-config ]; diff --git a/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix b/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix index dba8ae330684..73fd2f4a0a92 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix @@ -9,7 +9,14 @@ trivialBuild { pname = "ement"; - version = "unstable-2021-09-08"; + version = "unstable-2021-09-16"; + + src = fetchFromGitHub { + owner = "alphapapa"; + repo = "ement.el"; + rev = "c07e914f077199c95b0e7941a421675c95d4687e"; + sha256 = "sha256-kYVb2NrHYC87mY/hFUMAjb4TLJ9A2L2RrHoiAXvRaGg="; + }; packageRequires = [ plz @@ -17,12 +24,9 @@ trivialBuild { ts ]; - src = fetchFromGitHub { - owner = "alphapapa"; - repo = "ement.el"; - rev = "468aa9b0526aaa054f059c63797aa3d9ea13611d"; - sha256 = "sha256-0FCAu253iTSf9qcsmoJxKlzfd5eYc8eJXUxG6+0eg/I="; - }; + patches = [ + ./handle-nil-images.patch + ]; meta = { description = "Ement.el is a Matrix client for Emacs"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/ement/handle-nil-images.patch b/pkgs/applications/editors/emacs/elisp-packages/ement/handle-nil-images.patch new file mode 100644 index 000000000000..547fee164056 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/ement/handle-nil-images.patch @@ -0,0 +1,28 @@ +diff --git a/ement.el b/ement.el +index c9596a7..1b33045 100644 +--- a/ement.el ++++ b/ement.el +@@ -682,14 +682,15 @@ can cause undesirable underlining." + "Return a copy of IMAGE set to MAX-WIDTH and MAX-HEIGHT. + IMAGE should be one as created by, e.g. `create-image'." + ;; It would be nice if the image library had some simple functions to do this sort of thing. +- (let ((new-image (cl-copy-list image))) +- (when (fboundp 'imagemagick-types) +- ;; Only do this when ImageMagick is supported. +- ;; FIXME: When requiring Emacs 27+, remove this (I guess?). +- (setf (image-property new-image :type) 'imagemagick)) +- (setf (image-property new-image :max-width) max-width +- (image-property new-image :max-height) max-height) +- new-image)) ++ (when image ++ (let ((new-image (cl-copy-list image))) ++ (when (fboundp 'imagemagick-types) ++ ;; Only do this when ImageMagick is supported. ++ ;; FIXME: When requiring Emacs 27+, remove this (I guess?). ++ (setf (image-property new-image :type) 'imagemagick)) ++ (setf (image-property new-image :max-width) max-width ++ (image-property new-image :max-height) max-height) ++ new-image))) + + ;;;;; Reading/writing sessions + diff --git a/pkgs/applications/graphics/akira/default.nix b/pkgs/applications/graphics/akira/default.nix index 46e4de27547f..430c582dd793 100644 --- a/pkgs/applications/graphics/akira/default.nix +++ b/pkgs/applications/graphics/akira/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { description = "Native Linux Design application built in Vala and GTK"; homepage = "https://github.com/akiraux/Akira"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ Br1ght0ne neonfuz ] ++ pantheon.maintainers; + maintainers = with maintainers; [ Br1ght0ne neonfuz ] ++ teams.pantheon.members; platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/ideogram/default.nix b/pkgs/applications/graphics/ideogram/default.nix index f78170fde34a..f9b123ddb40b 100644 --- a/pkgs/applications/graphics/ideogram/default.nix +++ b/pkgs/applications/graphics/ideogram/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { description = "Insert emoji anywhere, even in non-native apps - designed for elementary OS"; homepage = "https://github.com/cassidyjames/ideogram"; license = licenses.gpl2Plus; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/appeditor/default.nix b/pkgs/applications/misc/appeditor/default.nix index a715681ae9f2..f8e709e423fd 100644 --- a/pkgs/applications/misc/appeditor/default.nix +++ b/pkgs/applications/misc/appeditor/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Edit the Pantheon desktop application menu"; homepage = "https://github.com/donadigo/appeditor"; - maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; license = licenses.gpl3Plus; }; diff --git a/pkgs/applications/misc/cipher/default.nix b/pkgs/applications/misc/cipher/default.nix index eab1185edd81..5675676d9519 100644 --- a/pkgs/applications/misc/cipher/default.nix +++ b/pkgs/applications/misc/cipher/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple application for encoding and decoding text, designed for elementary OS"; homepage = "https://github.com/arshubham/cipher"; - maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; license = licenses.gpl3Plus; }; diff --git a/pkgs/applications/misc/formatter/default.nix b/pkgs/applications/misc/formatter/default.nix index e8f329ecb0da..4532b766f47b 100644 --- a/pkgs/applications/misc/formatter/default.nix +++ b/pkgs/applications/misc/formatter/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple formatter designed for elementary OS"; homepage = "https://github.com/Djaler/Formatter"; - maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; license = licenses.lgpl2Plus; }; diff --git a/pkgs/applications/misc/mnamer/default.nix b/pkgs/applications/misc/mnamer/default.nix index dd634ae7f137..cad389bf0b9e 100644 --- a/pkgs/applications/misc/mnamer/default.nix +++ b/pkgs/applications/misc/mnamer/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "mnamer"; - version = "2.5.3"; + version = "2.5.4"; src = fetchFromGitHub { owner = "jkwill87"; repo = "mnamer"; rev = version; - sha256 = "1frrvfhp85fh82yw9yb6n61by8qp1v7f3c0f623njxk1afawhccd"; + sha256 = "sha256-fONQq/RboWHFuEFU7HP1ThUpSjOIlkg54c2WlMUKwuk="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 616596ed9b18..966f2adea55b 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -147,6 +147,25 @@ in { }; }; + ender3v2tempfix = buildPlugin rec { + pname = "OctoPrintPlugin-ender3v2tempfix"; + version = "unstable-2021-04-27"; + + src = fetchFromGitHub { + owner = "SimplyPrint"; + repo = "OctoPrint-Creality2xTemperatureReportingFix"; + rev = "2c4183b6a0242a24ebf646d7ac717cd7a2db2bcf"; + sha256 = "03bc2zbffw4ksk8if90kxhs3179nbhb4xikp4f0adm3lrnvxkd3s"; + }; + + meta = with lib; { + description = "Fixes the double temperature reporting from the Creality Ender-3 v2 printer"; + homepage = "https://github.com/SimplyPrint/OctoPrint-Creality2xTemperatureReportingFix"; + license = licenses.mit; + maintainers = with maintainers; [ illustris ]; + }; + }; + gcodeeditor = buildPlugin rec { pname = "GcodeEditor"; version = "0.2.12"; diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/applications/misc/plank/default.nix index 85e3bb48119c..1a8f0df5e41c 100644 --- a/pkgs/applications/misc/plank/default.nix +++ b/pkgs/applications/misc/plank/default.nix @@ -23,7 +23,6 @@ , libgee , wrapGAppsHook , autoreconfHook -, pantheon }: stdenv.mkDerivation rec { @@ -84,6 +83,6 @@ stdenv.mkDerivation rec { homepage = "https://launchpad.net/plank"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ davidak ] ++ pantheon.maintainers; + maintainers = with maintainers; [ davidak ] ++ teams.pantheon.members; }; } diff --git a/pkgs/applications/misc/portfolio-filemanager/default.nix b/pkgs/applications/misc/portfolio-filemanager/default.nix index 6b4946976bf6..b7cd7c0e1170 100644 --- a/pkgs/applications/misc/portfolio-filemanager/default.nix +++ b/pkgs/applications/misc/portfolio-filemanager/default.nix @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { pname = "portfolio"; - version = "0.9.10"; + version = "0.9.12"; format = "other"; @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { owner = "tchx84"; repo = "Portfolio"; rev = "v${version}"; - sha256 = "06hk0kx6h8w263qa71bik68rg4r8qs94b6s60pyhzicfc822k0j4"; + sha256 = "sha256-P+XQRIL2DepoOSVElxVxMihqxdxwLVnvXuraZN8L7z8="; }; postPatch = '' diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix index 5fd5176c95f8..123e01fe798a 100644 --- a/pkgs/applications/misc/sequeler/default.nix +++ b/pkgs/applications/misc/sequeler/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { ''; homepage = "https://github.com/Alecaddd/sequeler"; license = licenses.gpl3; - maintainers = [ maintainers.etu ] ++ pantheon.maintainers; + maintainers = with maintainers; [ etu ] ++ teams.pantheon.members; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index be3eff9bd955..09b4cefa7ae8 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -88,6 +88,8 @@ let gnSystemLibraries = lib.optionals (!chromiumVersionAtLeast "93") [ "ffmpeg" "snappy" + ] ++ lib.optionals (!chromiumVersionAtLeast "95") [ + "zlib" ] ++ [ "flac" "libjpeg" @@ -95,7 +97,6 @@ let "libwebp" "libxslt" "opus" - "zlib" ]; opusWithCustomModes = libopus.override { diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix index 64e261425755..1fea44e66279 100644 --- a/pkgs/applications/networking/browsers/ephemeral/default.nix +++ b/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The always-incognito web browser"; homepage = "https://github.com/cassidyjames/ephemeral"; - maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 78ccc8cb83a1..13b15da38cde 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.22.1"; + version = "1.22.2"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "sha256-coiDKczX5kWw/5A9+p0atPbn2nR0wBBdfXKTw6FYywo="; + sha256 = "sha256-O+FY9wJ0fztO7i5qJfw+cfhfBgaMWKX7IBBXJV4uuCk="; }; nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync installShellFiles ]; @@ -60,6 +60,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall for p in $WHAT; do install -D _output/local/go/bin/''${p##*/} -t $out/bin done @@ -83,6 +84,7 @@ stdenv.mkDerivation rec { --bash <($out/bin/$tool completion bash) \ --zsh <($out/bin/$tool completion zsh) done + runHook postInstall ''; preFixup = '' diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index c4647b4cdfee..07ac0730face 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -20,13 +20,13 @@ let "${electron}/bin/electron"; in nodePackages.deltachat-desktop.override rec { pname = "deltachat-desktop"; - version = "1.21.0"; + version = "1.21.1"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; rev = "v${version}"; - sha256 = "1fwnv77qa9p50js98byb26ms7mhv7rfwhfv21f282a74pbqsar45"; + sha256 = "0d59z0mvi70i26d79s4h0sssclwcakidhvhq56zi78bkfqlx7xf1"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json b/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json index a6355fde2b24..19cb53f6daa0 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json @@ -1,6 +1,6 @@ { "name": "deltachat-desktop", - "version": "1.21.0", + "version": "1.21.1", "dependencies": { "@blueprintjs/core": "^3.22.3", "@mapbox/geojson-extent": "^1.0.0", diff --git a/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/pkgs/applications/networking/instant-messengers/ferdi/default.nix index 1b6bcd6758f8..05ba66f93703 100644 --- a/pkgs/applications/networking/instant-messengers/ferdi/default.nix +++ b/pkgs/applications/networking/instant-messengers/ferdi/default.nix @@ -17,10 +17,10 @@ in mkFranzDerivation' rec { pname = "ferdi"; name = "Ferdi"; - version = "5.6.0"; + version = "5.6.2"; src = fetchurl { url = "https://github.com/getferdi/ferdi/releases/download/v${version}/ferdi_${version}_amd64.deb"; - sha256 = "sha256-yaAYNQAvbtArw9qAtbTDD11a9nH2OQEPE8QLg1E79Yc="; + sha256 = "sha256-8rB7SnaIaeCXAaKELNO1CnxpV8TyeKRCVamwpATeia4="; }; extraBuildInputs = [ xorg.libxshmfence ]; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index d14422fa9ef0..4c9a1b30e670 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -25,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.17.1"; # Please backport all updates to the stable channel. + version = "5.17.2"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "sha256-gJ5jDMdEx2YSmPtNfv2gKKAgPfRJcb3Aabti/DgHaIU="; + sha256 = "1fmn2i6k3zh3d37234yxbawzf85fa66xybcli7xffli39czxbcj3"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 3054775e2d7a..de453c4d19f3 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,655 +1,655 @@ { - version = "91.1.0"; + version = "91.1.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/af/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/af/thunderbird-91.1.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "6b355e9b1e5c467b51aecf697d776014f52a4b71c3b67afae34e64cb8af4155c"; + sha256 = "ba98ba0ac513e9f8ca047bd08b38e2391d5b67b4195c2c1ac7d90498e148ad6b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ar/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ar/thunderbird-91.1.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "1fa1acd3b21db46e70ad0295ed95be4b3839b8029de09a42d11a8523df0e4573"; + sha256 = "3514eadb52d000429f16417d3af5ce648cfdeaa583bb3602623f40abfca72fec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ast/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ast/thunderbird-91.1.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "aa3c7ba15bd18ab420c028571fa472b25d4ffc11f5789e4330d49a787442a2f9"; + sha256 = "c630ab402c6f166181474b0e7299dc24ff0de5ce92fa0894adbc3dbaf8878f59"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/be/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/be/thunderbird-91.1.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "24a39668aaadec7a77bd75dbb9174d4865776d55c33d3b6a8fd63cb6589a176c"; + sha256 = "9f484652940fec35d9adad996e80092cedabc789952e083107b405992b1ecf9d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/bg/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/bg/thunderbird-91.1.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "aed38cd5384c6e7df097fca8b37e866e0e432ea37f636c2306d2c1534b1013a7"; + sha256 = "f784957e36cb9a92083c275eec887d3a6847439281e94346e5bf0e065ec23366"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/br/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/br/thunderbird-91.1.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "6e8558c74d7bd0fc827bae6fc948d20a8bf3a8cd1b60784bc9e45c101b781bf2"; + sha256 = "2817bf350195954464db3a936db3a3730c2d33dfea9333165e69418b627d575d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ca/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ca/thunderbird-91.1.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "35f23617e5a62dbb2732688add158818c9f33d1c38555c1035ebdf1511a58ba4"; + sha256 = "176b8f2463267ad2aed07ca6966609c600615763caba662ac68c45b5d36e367c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/cak/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/cak/thunderbird-91.1.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "6029b2ec2581997916575e73e88c01068f48a6b72e606882936be5ee4d6bb69a"; + sha256 = "7ff8fc736dd4232801d0e50b154747827cc818fe76782b219d683a8b2bba8969"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/cs/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/cs/thunderbird-91.1.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "6e7d2c6fdf864c7a9951f805a867c8d2b300d31f011e8e36e7f914c269ace27f"; + sha256 = "b6763048e3fab66a4f08fd8c868d7c9c51258c540801546546b7da3b2ea64693"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/cy/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/cy/thunderbird-91.1.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "7933796c5db473ca10f3633ca8f4d7d8fc6b8042e5fab2c18e45a0f1cfe542cd"; + sha256 = "810213d5f90387bd6f46436b1479b977248ec043235f2f97b7e8d0a3b296eaec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/da/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/da/thunderbird-91.1.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "fbce1763012fbb3395668cc88cd9562ca7cb19ecaa0f4eee81def9983106b97d"; + sha256 = "2c85f4ea05fb03aaf88f4cb028375a628061f2699adde13f78cf6e76b7564e7d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/de/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/de/thunderbird-91.1.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "8e62c8f447cf509b31f4f54bd8537d8ff9e525ba065e225a1e1c0acdadff0d3e"; + sha256 = "9a05ca5400224fbf0923a331e1ba986d38038df24340c6aee695c24f96f75e0e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/dsb/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/dsb/thunderbird-91.1.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "4c3064d94f70ed5d80ee091127de862f700904c7ea267a9f225d3e770472d0cc"; + sha256 = "e06a84821ba0354e4d5efe0e080734e39f376ba3e1f1c385ab939fd4cb84301c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/el/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/el/thunderbird-91.1.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "5307684da1676cec690ecbd47159d99f8034f4f1dd7f2785bbd673b4bde88760"; + sha256 = "32a1de995a05495721a4c6a6a74ec27b68c03d7b2121ea7d6ce6d295ceb8d328"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/en-CA/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/en-CA/thunderbird-91.1.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "a411b006a7589c7798cf6e23d32c1096c8587904b8dec0c77c59a4864d94d077"; + sha256 = "95f2dd81dc1958f2acd8a801fe7a87dfa0a00c6b91b8bd669f8e3caf6d90aad2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/en-GB/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/en-GB/thunderbird-91.1.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "430b01b92d52940bfc37f5d6179da4cddf36884b3b26ece298a24b7743f72833"; + sha256 = "3177bce52669f44ae58ca447b54a86329cdb5b8006199e86fa66b5bfe96ac8a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/en-US/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/en-US/thunderbird-91.1.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "d19eb0214c17b9738124fd196cfc64e8c98df092d7777e59ebff2fd6304ccdad"; + sha256 = "c0331b86ef72bae3d769ca977b0c9adeb9a29145dab1eb0013f4d88fa9caeedc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/es-AR/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/es-AR/thunderbird-91.1.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "1614a42f7cff6e7c8d82cb7be3cbb13b056242206fb4e9b4765576d1a048c764"; + sha256 = "e2aee8223131a46bf99140ebdb56ab76ca03eb5eb66dfbee75f23520d95d1971"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/es-ES/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/es-ES/thunderbird-91.1.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "36fa6d30f6a743fba64cb3c7087143d9ba270b75b9c68e2bd9f305c0dba72a36"; + sha256 = "c8e189dc7a57d47c6dba9e4cda3068b327fa10cff3818e97a4942c71c1d0cc87"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/et/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/et/thunderbird-91.1.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "c3ccde17967aca822bf70ad836c412315c4f8315126d000369344e19d3f5e4f5"; + sha256 = "76e094d63467fb36622b64361f86041f0e6361a4fb1f1702c8a0e88bc57cfc96"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/eu/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/eu/thunderbird-91.1.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "799a10b1d0d59087dcbc36ea584e7b5bd0bf6e824b8b54fd4805693a86d8a5eb"; + sha256 = "8f09dc4bbbb76b660acf4664f4fb083a50de6523842171b4fe9558e7255c8bbf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/fi/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/fi/thunderbird-91.1.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "9d4ff3871c76453ee24ecca614c2b3ee74ccec34653758cb0d6814c6cb880cf2"; + sha256 = "d7dba3916342bfefe549ad21a70a438c8f2031fc5f0085fc4e236d0f8d07c948"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/fr/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/fr/thunderbird-91.1.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "8ecd58d5e078b3764805962a5b79c34cd967b671e83bf1d4eb986dbb6a0ce01f"; + sha256 = "4088b924197a6baf7ea3ee233d566b9799cbab955a135bc870eaf6e08ce70915"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/fy-NL/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/fy-NL/thunderbird-91.1.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "0f06c52b5acb30787df11994c816bacbb639d52f69490ce0d14f1dcea3393522"; + sha256 = "59cd7d50cdbb7867f746b137ec8f70407ae649b03e86a73a2be642eab9256be4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ga-IE/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ga-IE/thunderbird-91.1.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "ed49900c65dcc82db483f6ed25aa84d8df4ac2ef961857e2e04581a39fd2614c"; + sha256 = "10936f6c941d8c94eea200c1c3bb8919066714129eb3b34d67df87c9b93f331c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/gd/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/gd/thunderbird-91.1.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "a5c60e5ec859ec7b3f3c5415e2aadbe0d934808c3ed2fd05832bdba9100f3906"; + sha256 = "4ee24daec40780a8148092c96140575e7e5d1169fd37ffc6d46879f76f976f80"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/gl/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/gl/thunderbird-91.1.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "952b19e3c2b228102340803095c5c3854f1e726bf3bde05a5a5706cd536f6dfb"; + sha256 = "0126bc6b167b8bcb2135e02c289f26aed82e4ab8dc820fa9468ebb41fd05604d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/he/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/he/thunderbird-91.1.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "33121f9612d938b8f8dc040cfff99c6e76db956bf5cbd8823e8ec5488d6fb154"; + sha256 = "58ae78aee2da5f8a33edf8c87a743ea7f3da6702f25682869db9bbfcb53d4df5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/hr/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/hr/thunderbird-91.1.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "62060cc1b62831543bab9d8d6e63d8cc8ec755e51b463adf3823987828037196"; + sha256 = "c4543e54a9fa59906c64b8830e4ce6218279872e6beafeb67d13250159eca8f0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/hsb/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/hsb/thunderbird-91.1.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "24f8af584f7f882a2a6e80ef704e58fdf1893c4690eaa9b9a6cc03fc786c6865"; + sha256 = "cded10c83585c5d6ebdae4a0740262f43203b7a9252144a6f97eb6b329cea95a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/hu/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/hu/thunderbird-91.1.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "33b17c2920312de96f9e7158b9659ab5afe8fdd09454b535b2b84f72e9797669"; + sha256 = "f6dcdab2dad04a9210f509a62da49ec5269bf5c9f40e74cf9d2f43edb0abd422"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/hy-AM/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/hy-AM/thunderbird-91.1.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "608cbb5ce32eef21489000f92857ac45e73adbf618f44e7fc36d8d323432504c"; + sha256 = "b3f8a1b6d4576dbf660bee6404b97babeb04bf0c1c6ff27aab25a073436f43a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/id/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/id/thunderbird-91.1.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "29e8a54b74a6ea8e8eed88b00c833bd6b6e90c9da62090a7162642627c04cd25"; + sha256 = "e1bfada3b7d33e01462cc303b22298850c5923f42e8ca656cdf5b2dc72c00745"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/is/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/is/thunderbird-91.1.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "5d8fc62ba40847027b9dc497294fd4a6a1ca34b1aadb934388d32942f0e47b47"; + sha256 = "602ee80721bfa921805c1fff2b0802d7845d7970645cbb839e5d0f6e25b5fe65"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/it/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/it/thunderbird-91.1.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "f5f0b1101e4ac664af9b4acf63d40d9cd1109653ce4f397a22f0d61f13576261"; + sha256 = "7e55d0b20027e23d3340a593beeebac0fead2dd0d048133b2e42dbb33288c4c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ja/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ja/thunderbird-91.1.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "7be97e12f05418cb82d86731130f0c2ebfc0c8aacc7f4120be2ec11d53b5980d"; + sha256 = "df67309b344f46f9ead5939a2f0f7bc34b90bf4cfa4cc28a662391146951c4a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ka/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ka/thunderbird-91.1.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "47438a6fa2bad17d57f90fb083f70ec023d65a9a344fd4ffa137cec9ceb1b29d"; + sha256 = "0992f5884dec1431a1c82e289195db7561a8089e7cd7d8fb940c0435e365b6f2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/kab/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/kab/thunderbird-91.1.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "0037b1e8514c25fcbd05fb8dbb66880cbbf22d2bee443d14cca4acb3ef994982"; + sha256 = "37eb0b67bb564762f8c88fac75c9ef8a51ad4ca302e3bc5f4d99ff799a141309"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/kk/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/kk/thunderbird-91.1.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "749e22fb529f7d710a6a2ebeae9eb5019fad8cfda8f6678da9749bb2709fccd5"; + sha256 = "16fcf81dd18c51826d3a93e6393c820227322ad4cceaa668a22fcf79d9fe0773"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ko/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ko/thunderbird-91.1.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "d69205bc220de204535569d058230b9888d58cae8f8c44ff1fcec78a6443223a"; + sha256 = "4e6b0bb94ae1442b987b5e98ef287f6cdd354d13ecbb14dfc25b04ba17b3961d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/lt/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/lt/thunderbird-91.1.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "8d670513f40d04e73cab28bf2cbed5865c11c9ca22abd7b0c7f8e823e0d1553a"; + sha256 = "03364e6f6104f083bd38dbd65c1d451186757e07460840a1fc8ed8d71f00cc8b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/lv/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/lv/thunderbird-91.1.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "1e8f6b5189b289b7538b4d49ab79e384f721c90279dbafb74fa797eed3144a00"; + sha256 = "4da6a4e457aadb58819c3b44432c5a5ff17f2be378fb461d859a92768e2c4b7e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ms/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ms/thunderbird-91.1.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "6c29d08a31ddf074afe987864fd597822d70438b27b4f3ba09637235d387c4c6"; + sha256 = "8aae1245c40ba4b7682f5d26f3b90d9b5cfe53fbd00a755e699ddcea6ac5164f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/nb-NO/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/nb-NO/thunderbird-91.1.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "b0427494aa505bc4fb0dbd22881c480d9b3b0003a1768010ae277403964cc069"; + sha256 = "d279ee97817a87a87b8848f6cce8e1b0a9643095dbf46e3632df6242f9b05b23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/nl/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/nl/thunderbird-91.1.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "b690288643ecdda0f92c74ea1e27555dcbbfb5600e4b96c5f09fc6d438a07904"; + sha256 = "f1d58f439aa8276b5baa475e696a6eedb484059eef66ed8ab6ea27f66182d53a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/nn-NO/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/nn-NO/thunderbird-91.1.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "2d75277596380c477334f81ef75a20216502a767c307b50b29b1e9fb9c859c44"; + sha256 = "703745b4b07778058a8ed8d4072700033f268ea513abc9f4dc7d1cdcf07c9c2c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/pa-IN/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/pa-IN/thunderbird-91.1.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "1ab4a0c67f0ece7263b5aa67ff83e525b22aff82577ee80c422ebe8dc3df88e0"; + sha256 = "46d756ecb4d5e566dc4a72115874b32bce8eba5de141448d461d795b0c81e78c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/pl/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/pl/thunderbird-91.1.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "d4ef5d8678c8ef56bfc29362ef1745daef81ae7f8769eef6dcb38e9c2575f694"; + sha256 = "7384fd09796d727f82dd9f92b3faa67d53c415c01b44c885a998039eda703545"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/pt-BR/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/pt-BR/thunderbird-91.1.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "e29a8f74c456c3bb74e2c32aeb8b33b2e43a44f34ebdb965c62c26899c209b3e"; + sha256 = "dcd97601965c25f43fc10bf59c5ccd3d62439ad3f1ed724c379951d2b514df72"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/pt-PT/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/pt-PT/thunderbird-91.1.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "2e4af178f24ef709d770e53511da6c9445b4c68f8326a820839dccc1c7f5f018"; + sha256 = "225c2c87e5e18a987c1cad74622ace48bcda9dac7d420694f91c0c30757bfa23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/rm/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/rm/thunderbird-91.1.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "720067814b8b2ebcf4e4befffca4b64a2b3ede35a52cfbe155eacaaa55e3751f"; + sha256 = "07ca0312828ee92b9d04ca5e62f6f4f65260faba80da1da5365a2614edd43dae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ro/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ro/thunderbird-91.1.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "c1c86c6e702182eb058abda2e3aae249f2baa84b8c920216d82b02dd93336736"; + sha256 = "3cee1abefb6bcd9508a14e0b03e14f30b6aba95245ba79993d293fc92a3f7bb4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ru/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ru/thunderbird-91.1.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "79fa279c4b384c82952a8622c1fdbdd380f5c7c8519739daae923fe68a008168"; + sha256 = "e6491ab33fa05012206b22223f78e2f6f575f9e99d33159f0c853b538c3ab9ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/sk/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/sk/thunderbird-91.1.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "dcc35cf4d23ad70e58378d9ce85d6cb627601ba1b6703bfa91b1350d7c9db460"; + sha256 = "b4cc3471da1cd3f1f9146bf5ba9d33f706df6d2988375a7f148223eba2cb88e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/sl/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/sl/thunderbird-91.1.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "ffd4fd2047d6be06763c7e5d64936ed781ac55a6412236d3f4373e740f3effe2"; + sha256 = "a83b61af2283d3c694ede815faaa0abfb3e6b7a346d9d984dbf3e50856532473"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/sq/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/sq/thunderbird-91.1.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "db989f096cfbb11451877f7a55b89ecc3d95f3920716f3c094272f7f606350f7"; + sha256 = "6562243bd3ca68b6b09c12745111c36a269e60593c5c458e04da12a9f1cfe7dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/sr/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/sr/thunderbird-91.1.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "bc63020249bd66abcf17dd86daf72960c80fdfa334257031f88060d610b7b420"; + sha256 = "2b8dee91bfe25480f1a7b12b3825e2445b369d6125df9a13271ef6a6af015db8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/sv-SE/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/sv-SE/thunderbird-91.1.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "018f169ef69d4d43c860fa0b31102f87001035cdebbdaf9a296a5a9a42ffd351"; + sha256 = "113e0ebd096ef5ea225c76e930cbdc58f2b529b39fe799310098abefa4652ee1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/th/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/th/thunderbird-91.1.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "10a062c36ee778f9fb16cc90b27e51a00efc143008ea11c4e04a0261bcfd2001"; + sha256 = "71b62b60167d06a02fcc90017b33d65c757d18d05fbf689607631ff1783941ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/tr/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/tr/thunderbird-91.1.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "bbafbc16b0437fd507db0c72cdd0f13f40485329a1f6b238daf7f77c21290acb"; + sha256 = "ab7f254131c8fdcc040d06d29ffdb0da6d95b9970f7640851bbdad337af0bd0a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/uk/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/uk/thunderbird-91.1.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "fb7488a541f284eda5862cf3f1f16e274fc3604d1ab3ec03c39c4779c9900c8d"; + sha256 = "6da1aa51763b3acb2015eb78b50d5d6cc080bd606e2afdcf181d84095b0cedc3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/uz/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/uz/thunderbird-91.1.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "c8238bb841b37e4f468c95e07c714caacb2c028969d10ed88027b89ebd12f11a"; + sha256 = "933513bdc1b1137dc627ec4895c3299d3633a105eadf2216b682fe36554c5f5b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/vi/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/vi/thunderbird-91.1.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "34bb1df38a05b37a0e8f976bf45aa2b95295e54d3cea32a199ac1a3b623086c4"; + sha256 = "8f3eb2210a070983d87e6d5ec9908cabfdd012a4691443c39cbf2212d79e2394"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/zh-CN/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/zh-CN/thunderbird-91.1.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "e30dbf4980e33684f2011ce5fb938b1c78e106bf9f0386e720674e494e78b3a7"; + sha256 = "0faa621dba2d2725bcd6b2a337feac5ee2d6bf66900ce30e1e5abbcddc15ca45"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/zh-TW/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/zh-TW/thunderbird-91.1.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "09e33501f8df2889820bea4ece53edd3a732b94cfad1a5006aca2f0930db80d4"; + sha256 = "e236b7d2b9187a0ac780d7e0821cf29138d5f03321248e4edab0d1f2a7267cc7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/af/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/af/thunderbird-91.1.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "def6badfd1fc47bcaf39eb729b32b7b18b60644d30ce1851e3c05a4e434aa55a"; + sha256 = "624e9894eba97eafff7241dd73c2edd685e0786ba3e12f525980012d7dbae0e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ar/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ar/thunderbird-91.1.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "53d0a95c544e619a25ac6cc7cc6679b1acee486e9c421a1daddbf8654b887afd"; + sha256 = "62f250a1925e8b3cf2c98fe877b7b5a6d559d3fafb1320312fc765630c23a71b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ast/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ast/thunderbird-91.1.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "887af3d430ae6a9f8ab8c4e8660ad3ee96b7bdd0a20b97382e2ee19c75881907"; + sha256 = "102b2e3d812eb4737f3d4ab63e2b696cb7cc2478ad438bed5c19299d65dc5ac6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/be/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/be/thunderbird-91.1.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "b1c98702341cb8250518226dc6ce1403ff6e8c4d693d6e2c71216b8448fa8685"; + sha256 = "ed15b0cc8c4d0dcc4071ccdc602fd796c5dc42a027f26595d1d8df2ab10267ba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/bg/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/bg/thunderbird-91.1.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "77637e9d2e135116f2136ba04a48e787b1c44f137430255126f9d45ecb1fb56b"; + sha256 = "234f8ff03dbf19bd9100663ee517fa1630d0e7bd00953a056d5085021fa90324"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/br/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/br/thunderbird-91.1.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "f05f6536e425685296d257a7dabe838a9e09e3663d8315ac3f810a2f434e7087"; + sha256 = "34c578de385448cad19dc368a04d0285cfb1520c31477f6eacc10ffa2e81a02d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ca/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ca/thunderbird-91.1.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "0509d0cde2a0fe2d6ac8dc2d5b850ddff7815145673dd2ee5a121dea95253f2c"; + sha256 = "c3d3dfdeaa72254d02b12f72c83a95a2904a13f2e0c721d3baa5da0dd76bc2c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/cak/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/cak/thunderbird-91.1.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "9838e298051a41e26f07b4b3fe2b986f17dae2a28abe6d6f1117c6f0a07a3792"; + sha256 = "7cf60b8ecc692696081115f1df65f9976613ef34b57d412a6d3333a18400aa3c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/cs/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/cs/thunderbird-91.1.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "c480356bed2203f20c2e56b84a4f57782d8c439ee6f760a7bf71f6b635ff30fd"; + sha256 = "59f01da4722c4317f80a7174f85fff9ba60a8341d589ef2cc27c565a529af2f5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/cy/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/cy/thunderbird-91.1.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "0b3787a4b535630cd18be5bd643f8a26bbe92b2a0d43a20638572bafd0ce7725"; + sha256 = "470e65ebf016cd8fdcba1ad405df36d556c6fa43c23856b88d6da3fc58f80d81"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/da/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/da/thunderbird-91.1.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "83be22576ad41fa1c8cad84c7f7236f810248ecdf5cb0d1605693fe0193b28d7"; + sha256 = "d1e95c7744d5058354e8626c361b7d529fefb2032cf380f8f129e84243221b9d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/de/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/de/thunderbird-91.1.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "3edc194f461c6785f71353917a7e8451b838066238ac178031f0584b0c44c23d"; + sha256 = "dbb632f5fe3a3ea2ffce78ef8984e78debf2b0d09ec42bfd1b642a7fd68dc93a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/dsb/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/dsb/thunderbird-91.1.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "4d11e2475112e28836d08e091a4a42a6bb6cffc2ef91a5daa909af0559c564cf"; + sha256 = "ab5d84870b77376fee50b082e14f2d5ce915f9041a63f09519ea5b8ab2c8c990"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/el/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/el/thunderbird-91.1.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "d4d1e9c7ab327bacfa0077cd1935660c7e49adba24be2be1af91ba5661872e65"; + sha256 = "a96a8d96484b441210b98e768462237ad2e4306bcb20412028613f480160fcd3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/en-CA/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/en-CA/thunderbird-91.1.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "4ea129ba96f00ad35e727af252d864b5b7b5d299cd4d75961c399a1b112638b2"; + sha256 = "f43fa2abb60bdeb571ec665d8f5779b049d3270f05e01e43795408e450240d85"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/en-GB/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/en-GB/thunderbird-91.1.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "a8fb21782b4556d9f050b471c6de8871cd156b83bf3453e3fb1d5845d8cadc7f"; + sha256 = "6c3c9f1c8f4e3f6cc6008cec83e5c234f797762ae05cdfe7dd7e95794f3fa007"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/en-US/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/en-US/thunderbird-91.1.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "46e6de8047c63b877ca7a34f2154851060833502d5bced598873d3f8d89cb099"; + sha256 = "a6c3f8b935f8c5e185e621aed1725b82db1007c977949fb9f786b86bf024dffb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/es-AR/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/es-AR/thunderbird-91.1.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "d24b1067cc6249b7d89fbcfedf18e390939c7aa3c1e009554ae4a3e980ce8605"; + sha256 = "e431f72359b602e4bb784626bda3f4526eda6ee5bddbe51d5c67fb62325da237"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/es-ES/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/es-ES/thunderbird-91.1.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "5ab7cbff3a0bb6684eeed6698826f7c417fef3a774a08995b087dbb069768e37"; + sha256 = "3f7ccfb4b86b11583289036792e78d080f558d8d58d1b11929664952076ed152"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/et/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/et/thunderbird-91.1.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "fd0a1e89d8c045e7858828c384ec9c1d805424b6d54cb46de7b45bec1266b89f"; + sha256 = "4d224ed49c4cc300e22add49b79931b753155f5052d7d0572a3b99833351feb3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/eu/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/eu/thunderbird-91.1.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "02ddc8a6dc782d7148dcd799b87d10fe9d6417199bf4c245bf1baccfa173d6c1"; + sha256 = "84ec201b40080de068c9a2d9ca4effb360102d34970964813f4335187fa0c472"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/fi/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/fi/thunderbird-91.1.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "ede8df4035b3fbeb7a2dcd49fbfcf56d9be4c152e57d7bcffcf66b35eb02e8ee"; + sha256 = "633a45dd1dd870dd0d486715328152ee092a5297f95f35ad4ac8c1a0fa59caba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/fr/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/fr/thunderbird-91.1.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "c343bc336f4c556af1ceaa597391608edcbc4f970f1fc6af6699853331d6b574"; + sha256 = "1a5e668cdfc500652d3429ecddd987993c60032de0dd570c14256642927910e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/fy-NL/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/fy-NL/thunderbird-91.1.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "2f2d2e7b47ea8b38379b883f4c3296110f82450d5dd5e64b76588b4bb8de6462"; + sha256 = "86d52dfe0a63c7f066f4d6b677d1b2d1025b60d7ca556f2cce074ac529d49948"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ga-IE/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ga-IE/thunderbird-91.1.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "3b60ca04b46298c5e560a9a85d01bdb1e2254b25b1592f78c616822f07454bc8"; + sha256 = "0a116945f0ce9f51feb9658756bbb706830709155d21f4d32be5bb9c2ba3924b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/gd/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/gd/thunderbird-91.1.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "bc07c4aaa55fb554fbf5a5ff5f7f03360ba048047e3e3365e28b995d40c60372"; + sha256 = "ddf29128560baf824d5ab984cc4c219318d62d1f6946c83f1e281bf59dfde046"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/gl/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/gl/thunderbird-91.1.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "b5ce738aeff507c8aa9dd3f7d0303d877188e0f51a99291ab8090b3af7e92a2c"; + sha256 = "28e291c985d8b618bb88a65995f0c523d18a231bd9e3020b743815754d2f761a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/he/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/he/thunderbird-91.1.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "3fe4505d46483e73e165185b449633169f8d3507c4c1a30d99e3442269907f79"; + sha256 = "daecfd126e4e7f7eed943c715b7e0e17fb1b17b55963211130a2326bdeaf2fa9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/hr/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/hr/thunderbird-91.1.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "87d7a3dce52e7fe0ea9d8fe610bd6683e14c0e65cfc6c4c25e5b258a468ff9ec"; + sha256 = "f685cf4629e13337795d25f7e75bf2f24abca87e35e41c62b0f48613a2e57365"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/hsb/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/hsb/thunderbird-91.1.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "4befc38910d18cc91b27ccbcd54a04cc87f709a7a5908f48c16b90fa5118b833"; + sha256 = "d9161bb816887e1fc2296dcd942f0fb4736f86bc8a8122f61caeffac75b0c19f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/hu/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/hu/thunderbird-91.1.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "9ae438b5b09d2390e3d934c85cad39d7a5dc733b1ad3add74c1700faff19bc6f"; + sha256 = "80e69465e6afd1b50a695b30fcfdc13ad2c051e75fcec666276935874e79d5fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/hy-AM/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/hy-AM/thunderbird-91.1.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "f0bf9acdc4f7b7b5b9e0d1a6005bb4919f10474a19aa9c54a4696ec3b6ec6853"; + sha256 = "a1aff21e7b07bcc20685d906d69d6b2515983263d90d2a2533e58d6c74046fbf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/id/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/id/thunderbird-91.1.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "3b266327a9681e5b2299b860f4ba6153c49d2417c3f506bb721dad4e6bebf21f"; + sha256 = "e911dd870b7a33d50278597a6cd1970c15578716f97a1ca90bac2813c4aabcb6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/is/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/is/thunderbird-91.1.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "63c5947e73d86ccda38e2f600b2bf17378e44c8ef0137fc8cf788d9fd04c90b8"; + sha256 = "ec91be584ef82def938d295925b1231f7ea50bf9e171d90ce74ae575970c5e5b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/it/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/it/thunderbird-91.1.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "de701cb3aa59f540e7fe9cb364a34ad7b6072ef407530555e9bcde1799cf1afe"; + sha256 = "971d7ff2f20926b9148ac6386f2d5824a1443b3a4618e67cf4c30c14f126d711"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ja/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ja/thunderbird-91.1.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "16ddb5bf1cb3338a511b0e22f7b48e4dee43c364e0d8f1df5dca4354946c6d41"; + sha256 = "17526869e3234f885f2078c98a8442b2dd5a019a529d31e0bb6df5b6be24be8b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ka/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ka/thunderbird-91.1.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "4fa177e0e9f4227bb389fb784a491730da682331161b6716caa64f9859756a96"; + sha256 = "945beaab6b2bac56b13f7329b98fe6bf621fa9f3c022b3568dfa43bdce6e422c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/kab/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/kab/thunderbird-91.1.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "79ece60db326d24b0672c518356c5af52f4bc32955d9e9df3d342d5179768f2c"; + sha256 = "39b6835112c58cba3b5e4b2f6964dbd9982c8146f0290aed9b13b10ae159bdd5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/kk/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/kk/thunderbird-91.1.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "cdd426bf11206588de80d4b8d68498748444e0536da9e6cc62f1b066faf195dd"; + sha256 = "a5c4fcd5d4e91c52814b2e8c6b0b239e0c430ea6169b351b33beb2b0736fa94b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ko/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ko/thunderbird-91.1.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "4b18853761c82122d814d95a57c161647f97de344e57f2600fa562332b56362e"; + sha256 = "97e5ae5cd2def5410de5b8a3194f77c53fc4ecb17572e9925a4bff56cb2ca73e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/lt/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/lt/thunderbird-91.1.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "dc44e61c6bbc3efe61310cf8541e33b04f2ad4a38a70826704706dba50622658"; + sha256 = "2fc8d9d3fe286efa337d98d033b43d9d0b1c7fec15e566ed6ae98272df6adbb3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/lv/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/lv/thunderbird-91.1.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "1ed31684fd7279c051c47a9d032c4c4e77e2ff396977dcd223a0608fc3ecc400"; + sha256 = "3a480801c29e7661b73a01d1d29455bbaa4f228a749da467400ebe0c973c5150"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ms/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ms/thunderbird-91.1.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "da27a3e094394650fb86ce53e737502628c12dd7a3c7d179367f7e5f4810bd13"; + sha256 = "143e04a636d4e3df7ebab4a26419f0df6131a911c7b158848a1a0f4a51b8c6f5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/nb-NO/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/nb-NO/thunderbird-91.1.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "ac7acf9de057d8beded959c557ee1fb42513191c1580784cb710118ff9bbb919"; + sha256 = "4f3f731b0a9b2dd7496b9cf9e3df7c54924f821b8afd404848b8bee4c37db7c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/nl/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/nl/thunderbird-91.1.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "6311048f81b579cc49cac62b6b21c138d5d91c8ad3bebbf1c27c63cb1e60afc1"; + sha256 = "d6b758c9a5aff775088ebfe3c696d6275ecb2b2a4b7129ab3b79b23fe773e49a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/nn-NO/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/nn-NO/thunderbird-91.1.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "840c272897c1bd36e7e182acaf7eb1adda59c59c4b9809fbfe5fe71c14a67074"; + sha256 = "89bdee0a436d53cba1acddc9187b8bf7036d3f8b2d6f8a60a1f7d1e7aae4687a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/pa-IN/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/pa-IN/thunderbird-91.1.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "b56782bbd782840b9a1e4b9eb721539881443e7cf99f521078f86a220f425ad1"; + sha256 = "9def18033f40abd87764ee12a0c9a104df9ffbf5813b398251d86b26676aa57a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/pl/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/pl/thunderbird-91.1.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "e8883f496b67b9689e28d9313e038141876cd95e539b05fe020760f62057e934"; + sha256 = "e69e2f319a7691af209e517f7624a10e942c052fbff40cbe3e0cf057d5e8ce60"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/pt-BR/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/pt-BR/thunderbird-91.1.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "b5f24053b799799b161a572ad51b591c8145743c6d00ece95a7c9f57753fbb98"; + sha256 = "ce0a025976a058e01dcec3c7c22005cc8061dd118cbb5766e34e1fa2e2d24ee6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/pt-PT/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/pt-PT/thunderbird-91.1.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "83e4a41dab8ba18dd4bf14adcbc5cd27ea3fd9a3c5ad7d49c696eaa7159ec536"; + sha256 = "0e46088f48739f26d94f92aeef401f136006f0cfc67b9445573539f08e9175fa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/rm/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/rm/thunderbird-91.1.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "079756fde88f2701a044b553b5c3076988951efed9029dc4e7a5b4e0e8ba4e93"; + sha256 = "7efd235fd88601a74d2e6a2d9e481fbb011e4a3695128997754d97917a94669d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ro/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ro/thunderbird-91.1.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "8c30ba26f8e8cd684bd72394164e4f9dc1ebc0d8186e78ab39a6ea8fa5119f66"; + sha256 = "9ada46d39f4eedb097b177d2c443dccc05af71a12f370b202aa0bf259c0cd7c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ru/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ru/thunderbird-91.1.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "718c94a9a7879dcde959665d1b78d8ac78e6e4ff1fa047178587b543cdcdc046"; + sha256 = "0e4d029183f9125a4d1efe81cba348155336a37267db346436698430808a3da6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/sk/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/sk/thunderbird-91.1.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "46e0a7046c1b87ee70122a499778af86cc7d0af01995a081e8a6f1e9ff3bcbae"; + sha256 = "a4712e2e477bb96bcb69eb8ea96200f81b1eb829db3675844380f68b1d264915"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/sl/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/sl/thunderbird-91.1.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "bb789aefaefa4c12276dd26e97684fd3ef2294b67ca6950f8acbf515377b0848"; + sha256 = "46f4f3dfe12614ceb8a249a4d38df2b40728082ce0448af03c2949f0d81d1969"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/sq/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/sq/thunderbird-91.1.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "47a05b2db86bd268a44fe7a77a8960f11142ecdca16ffcee427603801add1c33"; + sha256 = "c5209bea51a081b6707ee79640ab663b3975af8c1bb26df05e480f5ad6dba723"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/sr/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/sr/thunderbird-91.1.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "cf9789eb0f84697c66ed3ceccdbbe6a9e13fea2c27768e822f4e24a90950dfab"; + sha256 = "8cb6bb676a7143f10d5c666e41398b4045f32ca13bfd6a322d308f6b05dda441"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/sv-SE/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/sv-SE/thunderbird-91.1.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "bf3482ee0f9203acc262984ee886ab32da27f2a75c7681028bc0b3ab1f0a0c71"; + sha256 = "33736665f7c38a62ed65340acead5435599dcbb8c7892ce939664662168078cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/th/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/th/thunderbird-91.1.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "167a81fc42ef0bd51f149695c6acc36ab7df04c10ff727b119c295b7046481f9"; + sha256 = "0fd5af0ffc983f58c85756274d9d94f26a44c32aff3852b22ac0554375b8eac3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/tr/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/tr/thunderbird-91.1.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "f508d7a071fd6c641cbd70944b784e553ab7bd4ec8e084e0ece6746b7ad149ca"; + sha256 = "6f8318a023062b306a64cc615bbffb96d06b608c625a0134f28d60629f5986c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/uk/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/uk/thunderbird-91.1.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "2505fe82a01770c279a0c3c9a29d8eb02c3078ea3c6f3be956b531277a6125aa"; + sha256 = "fede0c129370c93df5cb9e9f5e9bef69c6ad6bb96db11bdb520c743183ea2b41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/uz/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/uz/thunderbird-91.1.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "25ffeef15ef2f0f9d939ce09edc9a5e8d58f23c94c0cfd4bf952e2ad5a373fd1"; + sha256 = "23db48eaf9101a4a838487ab4f31d7504036b0204a1624e0ac750bba6de24437"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/vi/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/vi/thunderbird-91.1.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "fab7cdf7def4e8f34d891275c914b42a75d174e5fe807642c6d47ad09622dd07"; + sha256 = "55ec78e15967365bc41fc2b1469af78cc9300a0365587ec72463e9e97958020b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/zh-CN/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/zh-CN/thunderbird-91.1.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "e113f02eba4e13ce2a17098576b87a2b64b969d97c11a4dd8bb561467bf26f3b"; + sha256 = "008216b04c79fb96686a747f9756caa2cc02aa052e7e682b0ba9bef0138d2ef6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/zh-TW/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/zh-TW/thunderbird-91.1.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "0a3733c11855cd48504e82c32172e7cedb1a57d402e8f1f4a6e8a305b9eda3ec"; + sha256 = "bb222c6f9c8e5ed7681fa920ff6bb6e9d1262e16efb994dd5976e575e4f54a7c"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/D124361.diff b/pkgs/applications/networking/mailreaders/thunderbird/D124361.diff deleted file mode 100644 index 42dee06a26bf..000000000000 --- a/pkgs/applications/networking/mailreaders/thunderbird/D124361.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/comm/mail/config/mozconfigs/common b/comm/mail/config/mozconfigs/common ---- a/comm/mail/config/mozconfigs/common -+++ b/comm/mail/config/mozconfigs/common -@@ -1,6 +1,3 @@ - ac_add_options --enable-application=comm/mail - --# Disable enforcing that add-ons are signed by the trusted root. --MOZ_REQUIRE_SIGNING= -- - . "$topsrcdir/build/mozconfig.common.override" -diff --git a/comm/mail/moz.configure b/comm/mail/moz.configure ---- a/comm/mail/moz.configure -+++ b/comm/mail/moz.configure -@@ -12,6 +12,7 @@ - imply_option("MOZ_CRASHREPORTER_URL", "https://crash-reports.thunderbird.net/") - - imply_option("--enable-default-browser-agent", False) -+imply_option("MOZ_REQUIRE_SIGNING", False) - - - @depends(target_is_windows, target_is_linux) - diff --git a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-90.patch b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-90.patch deleted file mode 100644 index c4e29f6355cf..000000000000 --- a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-90.patch +++ /dev/null @@ -1,13 +0,0 @@ -Remove about:buildconfig. If used as-is, it would add unnecessary runtime dependencies. ---- a/comm/mail/base/jar.mn -+++ b/comm/mail/base/jar.mn -@@ -119,9 +119,6 @@ messenger.jar: - % override chrome://mozapps/content/profile/profileDowngrade.js chrome://messenger/content/profileDowngrade.js - % override chrome://mozapps/content/profile/profileDowngrade.xhtml chrome://messenger/content/profileDowngrade.xhtml - --* content/messenger/buildconfig.html (content/buildconfig.html) --% override chrome://global/content/buildconfig.html chrome://messenger/content/buildconfig.html -- - # L10n resources and overrides. - % override chrome://mozapps/locale/profile/profileDowngrade.dtd chrome://messenger/locale/profileDowngrade.dtd - % override chrome://global/locale/netError.dtd chrome://messenger/locale/netError.dtd diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 0be69104a5fe..1aca35d56b19 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -10,21 +10,14 @@ in rec { thunderbird = common rec { pname = "thunderbird"; - version = "91.1.0"; + version = "91.1.1"; application = "comm/mail"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "c465ff25d67c5c28db53d3b1ccda10a743276e58c693406bf31bde0253f34123348180ae18765bd60b958c050e3a874dd69ac82d7612007a8c7a2e25939840ff"; + sha512 = "2da102f9ec42489fc785ccdabcc7fdbc826f2df5e8e76c65866a44a221e762f59647ea265fe4907c18f0d3f1e04199e809235b4587ea17bdc1155e829f57ff2f"; }; patches = [ - ./no-buildconfig-90.patch - - # There is a bug in Thunderbird 91 where add-ons are required - # to be signed when the build is run with default settings. - # https://bugzilla.mozilla.org/show_bug.cgi?id=1727113 - # https://phabricator.services.mozilla.com/D124361 - ./D124361.diff ]; meta = with lib; { diff --git a/pkgs/applications/networking/ping/default.nix b/pkgs/applications/networking/ping/default.nix index 40240565973d..82194e38eae7 100644 --- a/pkgs/applications/networking/ping/default.nix +++ b/pkgs/applications/networking/ping/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { 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 ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/pkgs/applications/networking/qv2ray/default.nix b/pkgs/applications/networking/qv2ray/default.nix index 7b97bd8543df..62327a8e9a89 100644 --- a/pkgs/applications/networking/qv2ray/default.nix +++ b/pkgs/applications/networking/qv2ray/default.nix @@ -1,10 +1,11 @@ { lib +, stdenv , mkDerivation , fetchFromGitHub , qmake , qttools , cmake -, clang +, clang_8 , grpc , protobuf , openssl @@ -13,20 +14,26 @@ , abseil-cpp , libGL , zlib +, curl }: mkDerivation rec { pname = "qv2ray"; - version = "2.6.3"; + version = "2.7.0"; src = fetchFromGitHub { owner = "Qv2ray"; repo = "Qv2ray"; rev = "v${version}"; - sha256 = "sha256-zf3IlpRbZGDZMEny0jp7S+kWtcE1Z10U9GzKC0W0mZI="; + sha256 = "sha256-afFTGX/zrnwq/p5p1kj+ANU4WeN7jNq3ieeW+c+GO5M="; fetchSubmodules = true; }; + patchPhase = lib.optionals stdenv.isDarwin '' + substituteInPlace cmake/platforms/macos.cmake \ + --replace \''${QV2RAY_QtX_DIR}/../../../bin/macdeployqt macdeployqt + ''; + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DQV2RAY_DISABLE_AUTO_UPDATE=on" @@ -50,10 +57,14 @@ mkDerivation rec { nativeBuildInputs = [ cmake - clang + + # The default clang_7 will result in reproducible ICE. + clang_8 + pkg-config qmake qttools + curl ]; meta = with lib; { diff --git a/pkgs/applications/office/agenda/default.nix b/pkgs/applications/office/agenda/default.nix index 6654ed529fc3..c42052e5f7d4 100644 --- a/pkgs/applications/office/agenda/default.nix +++ b/pkgs/applications/office/agenda/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple, fast, no-nonsense to-do (task) list designed for elementary OS"; homepage = "https://github.com/dahenson/agenda"; - maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/pkgs/applications/office/elementary-planner/default.nix b/pkgs/applications/office/elementary-planner/default.nix index 73888fbfe3d2..550316b82c55 100644 --- a/pkgs/applications/office/elementary-planner/default.nix +++ b/pkgs/applications/office/elementary-planner/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { description = "Task manager with Todoist support designed for GNU/Linux 🚀️"; homepage = "https://planner-todo.web.app"; license = licenses.gpl3; - maintainers = with maintainers; [ dtzWill ] ++ pantheon.maintainers; + maintainers = with maintainers; [ dtzWill ] ++ teams.pantheon.members; }; } diff --git a/pkgs/applications/office/khronos/default.nix b/pkgs/applications/office/khronos/default.nix index 0238388d7eab..b3a38905531e 100644 --- a/pkgs/applications/office/khronos/default.nix +++ b/pkgs/applications/office/khronos/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Track each task's time in a simple inobtrusive way"; homepage = "https://github.com/lainsce/khronos"; - maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; license = licenses.gpl3Plus; }; diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix index 28e35d08e917..b51eeb1ad954 100644 --- a/pkgs/applications/office/spice-up/default.nix +++ b/pkgs/applications/office/spice-up/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Create simple and beautiful presentations"; homepage = "https://github.com/Philip-Scott/Spice-up"; - maintainers = with maintainers; [ samdroid-apps xiorcale ] ++ pantheon.maintainers; + maintainers = with maintainers; [ samdroid-apps xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; # The COPYING file has GPLv3; some files have GPLv2+ and some have GPLv3+ license = licenses.gpl3Plus; diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix index 431668f0c583..dffbdaa23aa8 100644 --- a/pkgs/applications/science/math/nasc/default.nix +++ b/pkgs/applications/science/math/nasc/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { the equations it’s used in. ''; homepage = "https://github.com/parnold-x/nasc"; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; platforms = platforms.linux; license = licenses.gpl3Plus; }; diff --git a/pkgs/applications/system/monitor/default.nix b/pkgs/applications/system/monitor/default.nix index 588839b859da..afe18c399a3a 100644 --- a/pkgs/applications/system/monitor/default.nix +++ b/pkgs/applications/system/monitor/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "monitor"; - version = "0.8.1"; + version = "0.9.5"; src = fetchFromGitHub { owner = "stsdc"; repo = "monitor"; rev = version; - sha256 = "111g2f3y5lmz91m755jz0x8yx5cx9ym484gch8wcv80dmr7ilb1y"; + sha256 = "sha256-eTsPn2Z1++KsZnnBnZ2s9fKK2HguPw+JqaRRkxQDiAk="; fetchSubmodules = true; }; @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { section in the NixOS manual. ''; homepage = "https://github.com/stsdc/monitor"; - maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/pkgs/applications/system/pantheon-tweaks/default.nix b/pkgs/applications/system/pantheon-tweaks/default.nix new file mode 100644 index 000000000000..5834e8d96308 --- /dev/null +++ b/pkgs/applications/system/pantheon-tweaks/default.nix @@ -0,0 +1,68 @@ +{ lib +, stdenv +, fetchFromGitHub +, nix-update-script +, meson +, ninja +, pkg-config +, python3 +, vala +, gtk3 +, libgee +, pantheon +}: + +stdenv.mkDerivation rec { + pname = "pantheon-tweaks"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "pantheon-tweaks"; + repo = pname; + rev = version; + sha256 = "sha256-tAfDxX/RD7pO5PN/LaZ92Cj/iZtBI/EHb0+pORfYnPM="; + }; + + patches = [ + ./fix-paths.patch + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + python3 + vala + ]; + + buildInputs = [ + gtk3 + libgee + pantheon.granite + pantheon.switchboard + ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + meta = with lib; { + description = "Unofficial system settings panel for Pantheon"; + longDescription = '' + Unofficial system settings panel for Pantheon + that lets you easily and safely customise your desktop's appearance. + Use programs.pantheon-tweaks.enable to add this to your switchboard. + ''; + homepage = "https://github.com/pantheon-tweaks/pantheon-tweaks"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.pantheon.members; + }; +} diff --git a/pkgs/applications/system/pantheon-tweaks/fix-paths.patch b/pkgs/applications/system/pantheon-tweaks/fix-paths.patch new file mode 100644 index 000000000000..b2e0e0a7b4c8 --- /dev/null +++ b/pkgs/applications/system/pantheon-tweaks/fix-paths.patch @@ -0,0 +1,13 @@ +diff --git a/src/Settings/ThemeSettings.vala b/src/Settings/ThemeSettings.vala +index 589121b..8e9c81e 100644 +--- a/src/Settings/ThemeSettings.vala ++++ b/src/Settings/ThemeSettings.vala +@@ -29,7 +29,7 @@ public class PantheonTweaks.ThemeSettings { + var themes = new Gee.ArrayList (); + + string[] dirs = { +- "/usr/share/" + path + "/", ++ "/run/current-system/sw/share/" + path + "/", + Environment.get_home_dir () + "/." + path + "/", + Environment.get_home_dir () + "/.local/share/" + path + "/"}; + diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index 1f798e33eb89..b4bc0db4bac4 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -1,22 +1,22 @@ { lib, stdenv, rustPlatform, cmake, fetchFromGitHub, pkg-config, openssl -, libiconv, Security }: +, libiconv, Security, SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "gitoxide"; - version = "0.7.0"; + version = "0.8.4"; src = fetchFromGitHub { owner = "Byron"; repo = "gitoxide"; rev = "v${version}"; - sha256 = "12f5qrrfjfqp1aph2nmfi9nyzs1ndvgrb3y53mrszm9kf7fa6pyg"; + sha256 = "WH8YiW1X7TkURjncm0OefxrZhnhGHaGLwxRNxe17g/0="; }; - cargoSha256 = "0gw19zdxbkgnj1kcyqn1naj1dnhsx10j860m0xgs5z7bbvfg82p6"; + cargoSha256 = "eTPJMYl9m81o4PJKfpDs61KmehSvKnY+bgybEodOhAM="; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = if stdenv.isDarwin - then [ libiconv Security ] + then [ libiconv Security SystemConfiguration] else [ openssl ]; # Needed to get openssl-sys to use pkg-config. diff --git a/pkgs/applications/virtualization/catatonit/default.nix b/pkgs/applications/virtualization/catatonit/default.nix index c44db31f50cb..e311be68ab8c 100644 --- a/pkgs/applications/virtualization/catatonit/default.nix +++ b/pkgs/applications/virtualization/catatonit/default.nix @@ -1,24 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, glibc, nixosTests }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, glibc, nixosTests }: stdenv.mkDerivation rec { pname = "catatonit"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "openSUSE"; repo = pname; rev = "v${version}"; - sha256 = "ciJ1MI7jr5P2PgxIykQ+BiwNUO8lQHGt0+U8CNbc5bI="; + sha256 = "sha256-hokG6o7toZxU984EvIlne33Aa2EZVZ3qu1jTZMm5nt4="; }; - patches = [ - # Fix compilation with musl - (fetchpatch { - url = "https://github.com/openSUSE/catatonit/commit/75014b1c3099245b7d0f44f24d7f6dc4888a45fd.patch"; - sha256 = "sha256-9VMNUT1U90ocjvE7EXYfLxuodDwTXXHYg89qqa5Jq0g="; - }) - ]; - nativeBuildInputs = [ autoreconfHook ]; buildInputs = lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ]; diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index adff564a3c9a..ba056920e849 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "lima"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3Bc8F8L4ac0YoUp2zoQYPsj7hcXKf8SVkE7q6q0MNSs="; + sha256 = "sha256-u4XLWDJ35jEKKr98eEoUUsT3gawM/qNqXPXrhlQlugg="; }; - vendorSha256 = "sha256-vYeHv6sSiO6fY+oXR8bFFs/NAhivtnkc15pXEu+reZQ="; + vendorSha256 = "sha256-ivKudP0SlArfD+wXHmqNRmW8UGu0o2SJqURrjPhK2hs="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix index 06a560380537..de48b72faca4 100644 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { description = "GNOME Settings Daemon"; homepage = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/"; license = licenses.gpl2Plus; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome/core/mutter/3.38/default.nix b/pkgs/desktops/gnome/core/mutter/3.38/default.nix index 2d3f9f7bb75a..3c2d30b813ba 100644 --- a/pkgs/desktops/gnome/core/mutter/3.38/default.nix +++ b/pkgs/desktops/gnome/core/mutter/3.38/default.nix @@ -157,7 +157,7 @@ let self = stdenv.mkDerivation rec { description = "A window manager for GNOME"; homepage = "https://gitlab.gnome.org/GNOME/mutter"; license = licenses.gpl2Plus; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; platforms = platforms.linux; }; }; diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index b88d8f5518ef..441ef51b8f6f 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -97,6 +97,6 @@ stdenv.mkDerivation rec { description = "An open, pay-what-you-want app store for indie developers, designed for elementary OS"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix index b2f0bc906ca5..7fbaa32dc39f 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix @@ -68,6 +68,6 @@ stdenv.mkDerivation rec { description = "Calculator app designed for elementary OS"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index d9f8cc69c16e..6afd44018314 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -83,6 +83,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/calendar"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix index 838bd5ae862e..432e5fdf00e7 100644 --- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix @@ -80,6 +80,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/camera"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 96071e0c77c4..8516133b18d8 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -107,6 +107,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/code"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix index e0347e509c68..4de65108c564 100644 --- a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix @@ -75,6 +75,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/dock"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ davidak ] ++ pantheon.maintainers; + maintainers = with maintainers; [ davidak ] ++ teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix index a06188fa6960..e65e45809c45 100644 --- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix @@ -79,6 +79,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/feedback"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 3b9b0648c4d0..dcdd1bb9acec 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -99,6 +99,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/files"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix index 88c9b983b455..6d0b752c1d1d 100644 --- a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix @@ -84,6 +84,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/mail"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers ++ [ maintainers.ethancedwards8 ]; + maintainers = with maintainers; [ ethancedwards8 ] ++ teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix index 3a865967ac3d..300e7919dced 100644 --- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix @@ -107,6 +107,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/music"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index 897b62d2a381..d1206c9d0ae0 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -113,6 +113,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/photos"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix index a7f2489da45e..4eb574d69f26 100644 --- a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix @@ -65,6 +65,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/screenshot"; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix index 20e6b576483f..bec0556a377d 100644 --- a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix @@ -79,6 +79,6 @@ stdenv.mkDerivation rec { description = "Synced tasks and reminders on elementary OS"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index 370dcad9bdff..cd0e39628023 100644 --- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -90,6 +90,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/terminal"; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index e0f076719aaf..0c06e7b24439 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -82,6 +82,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/videos"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/sideload/default.nix b/pkgs/desktops/pantheon/apps/sideload/default.nix index 5f233f04bc42..fad1186578cf 100644 --- a/pkgs/desktops/pantheon/apps/sideload/default.nix +++ b/pkgs/desktops/pantheon/apps/sideload/default.nix @@ -71,6 +71,6 @@ stdenv.mkDerivation rec { description = "Flatpak installer, designed for elementary OS"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix index 5a0ab7a856d7..949f1ecc3d0b 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix @@ -66,6 +66,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-a11y"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index cb12f5b8cc20..c1144dd4ecd6 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-about"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix index 325ad3b96fec..3b3cbf64ef85 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-applications"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix index 2ddd6ab696ea..2238125fe2f6 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-bluetooth"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix index cfd3402edc1c..b4518ea1e440 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix @@ -66,6 +66,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-datetime"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix index 82477c80a0b4..0fbb1eb81e7c 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-display"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix index 9188e91d6baa..d8023a1bf37c 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -74,6 +74,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-keyboard"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix index a86a526366f9..ca0319a5498d 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix @@ -73,6 +73,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-mouse-touchpad"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix index 5337d39fe0e7..7ccfb265e9e9 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix @@ -62,6 +62,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-network"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix index 7c2583105cf9..42cddfd2d67f 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-notifications"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix index 5c59a48289d4..9aa9d7e6780a 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-onlineaccounts"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix index e4e461f4baae..69242e8132f1 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix @@ -78,6 +78,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-pantheon-shell"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix index 98a9c039ef4f..a9c60600f045 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix @@ -58,6 +58,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-power"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix index 2c870d12c2d9..cae5b570547f 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-printers"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix index 58c8266f16a9..986aa171e920 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-security-privacy"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix index faedee81f5cd..2eacf5585109 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix @@ -58,6 +58,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-sharing"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix index ddcb81e154ed..7719477ce702 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix @@ -62,6 +62,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-sound"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix index 1c80659bc526..9268fa76aefc 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix @@ -67,6 +67,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-wacom"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix index 9580f063ba04..bdab9b0d7662 100644 --- a/pkgs/desktops/pantheon/apps/switchboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix @@ -74,6 +74,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix index 657e1c3e116f..e0299767ef3f 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/stylesheet"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix index bd4845172c52..abaf8d6c31c5 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix @@ -65,6 +65,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/icons"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix index 6a9d1b0aca36..b9c51f5688c2 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { description = "Font for concealing text"; homepage = "https://github.com/png2378/redacted-elementary"; license = licenses.ofl; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix index d273f03f4bda..6fe18119b458 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/sound-theme"; license = licenses.unlicense; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix index f2f89ea1eacf..9fd0a4d1a4e8 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/wallpapers"; license = licenses.publicDomain; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index 1518c06a2650..1751636da008 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -85,6 +85,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/default-settings"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 541faf2474b5..86b71ab49930 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -134,6 +134,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/greeter"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix index 05e92e127a3c..e7b0248ad425 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix @@ -76,6 +76,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/onboarding"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix index 7b821f883ce9..c64cfced0c55 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/print"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index eab14403bd7c..e3d0cb8c7282 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -155,6 +155,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/session-settings"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix index ef4fdf80cef2..3a6fbc194772 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix @@ -70,6 +70,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/shortcut-overlay"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 9e0229be5b23..280a6a07576d 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -94,6 +94,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/gala"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix index ff89c2de3304..7e185ece23ac 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix @@ -65,6 +65,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/wingpanel-indicator-a11y"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index 3e2163d877fe..29432bf19656 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -95,6 +95,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/applications-menu"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix index e2129de263f3..a9b13650ddba 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix @@ -62,6 +62,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/wingpanel-indicator-bluetooth"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index a892339fd10c..ad030277463c 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -83,6 +83,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/wingpanel-indicator-datetime"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix index cd5b51a560ff..6d5227b7139f 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix @@ -70,6 +70,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/wingpanel-indicator-keyboard"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix index 3b599e455f6f..92738df7b355 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix @@ -68,6 +68,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/wingpanel-indicator-network"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix index 8d454cd51ee3..23f9e400c01b 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/wingpanel-indicator-nightlight"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix index 77b0aabef64d..1a101a8a886d 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix @@ -62,6 +62,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/wingpanel-indicator-notifications"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix index 8d0afb560c2e..f3d3ac0e46d5 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix @@ -72,6 +72,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/wingpanel-indicator-power"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix index e9c77a8d45da..eaccad35aa0b 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix @@ -62,6 +62,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/wingpanel-indicator-session"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix index 00ae9bfc4b60..fcaf06de0113 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix @@ -73,6 +73,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/wingpanel-indicator-sound"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index 7ed4adf29c7c..1ae9f9f4aaa5 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -84,6 +84,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/wingpanel"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/granite/default.nix b/pkgs/desktops/pantheon/granite/default.nix index c7c5351bb28b..0e6d14d2425a 100644 --- a/pkgs/desktops/pantheon/granite/default.nix +++ b/pkgs/desktops/pantheon/granite/default.nix @@ -67,6 +67,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/granite"; license = licenses.lgpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/services/contractor/default.nix b/pkgs/desktops/pantheon/services/contractor/default.nix index f503e26b8452..666e17362ac2 100644 --- a/pkgs/desktops/pantheon/services/contractor/default.nix +++ b/pkgs/desktops/pantheon/services/contractor/default.nix @@ -54,6 +54,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/contractor"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix index ce30afac3cb7..0b904a112177 100644 --- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix @@ -70,6 +70,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/capnet-assist"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix index ac484c3a0592..15ae6840e454 100644 --- a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { description = "GTK notification server for Pantheon"; homepage = "https://github.com/elementary/notifications"; license = licenses.gpl3Plus; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index e7dad3c2ccfd..d1aaad42e2f3 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { description = "Settings daemon for Pantheon"; homepage = "https://github.com/elementary/settings-daemon"; license = licenses.gpl3Plus; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix index d62bc275ed9f..e2053ebf6a31 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix @@ -56,6 +56,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/pantheon-agent-geoclue2"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix index 1a8fb8047598..4bef7fd5e08e 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/pantheon-agent-polkit"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix index f53ea0d705cc..406ff81fe8ee 100644 --- a/pkgs/development/libraries/bamf/default.nix +++ b/pkgs/development/libraries/bamf/default.nix @@ -94,6 +94,6 @@ stdenv.mkDerivation rec { homepage = "https://launchpad.net/bamf"; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = with maintainers; [ davidak ] ++ pantheon.maintainers; + maintainers = with maintainers; [ davidak ] ++ teams.pantheon.members; }; } diff --git a/pkgs/development/libraries/cmark-gfm/default.nix b/pkgs/development/libraries/cmark-gfm/default.nix index 9768175a4999..b25688acfa15 100644 --- a/pkgs/development/libraries/cmark-gfm/default.nix +++ b/pkgs/development/libraries/cmark-gfm/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "cmark-gfm"; - version = "0.29.0.gfm.1"; + version = "0.29.0.gfm.2"; src = fetchFromGitHub { owner = "github"; repo = "cmark-gfm"; rev = version; - sha256 = "sha256-GxWA5CjdXPBh1BJzENIijPDCoth0BTNu5ayX0cXT5z0="; + sha256 = "sha256-8PjG87hR66ozKx+PSuKi0vHIoKICHSLdl2cKUYf+5m8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 71c1efe3f914..5d7e04e75966 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "21.2.2"; + version = "21.3.1"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "${pname}-${version}"; - sha256 = "134l0d74ai4mqlp244nvkvg3mgzbzy20mjd274yay8g8hvb1g90v"; + sha256 = "0dzqfgbd0fxl8rxgf5nmj1jd4izzaqfb0s53l96qwz1j57q5ybj5"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/md4c/default.nix b/pkgs/development/libraries/md4c/default.nix index a29b521a2de5..2ad77b2d2fd8 100644 --- a/pkgs/development/libraries/md4c/default.nix +++ b/pkgs/development/libraries/md4c/default.nix @@ -16,6 +16,13 @@ stdenv.mkDerivation rec { hash = "sha256-+LObAD5JB8Vb4Rt4hTo1Z4ispxzfFkkXA2sw6TKB7Yo="; }; + patches = [ + # We set CMAKE_INSTALL_LIBDIR to the absolute path in $out, so + # prefix and exec_prefix cannot be $out, too + # Use CMake's _FULL_ variables instead of `prefix` concatenation. + ./fix-pkgconfig.patch + ]; + nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/development/libraries/md4c/fix-pkgconfig.patch b/pkgs/development/libraries/md4c/fix-pkgconfig.patch new file mode 100644 index 000000000000..e0e9f3d96b2b --- /dev/null +++ b/pkgs/development/libraries/md4c/fix-pkgconfig.patch @@ -0,0 +1,44 @@ +From 0ab8f5a6ee305cf4edcebfdc7b9eb5f98302de75 Mon Sep 17 00:00:00 2001 +From: Leif Middelschulte +Date: Fri, 17 Sep 2021 16:16:17 +0200 +Subject: [PATCH] pc.in: use _FULL_ variable variants + +Nix' cmake packaging handler replaces the CMAKE_INSTALL_INCLUDEDIR +with the absolute path. Which break package +portability (i.e. `prefix`-usage). +--- + src/md4c-html.pc.in | 6 ++---- + src/md4c.pc.in | 6 ++---- + 2 files changed, 4 insertions(+), 8 deletions(-) + +diff --git a/src/md4c-html.pc.in b/src/md4c-html.pc.in +index 504bb52..fec7df4 100644 +--- a/src/md4c-html.pc.in ++++ b/src/md4c-html.pc.in +@@ -1,7 +1,5 @@ +-prefix=@CMAKE_INSTALL_PREFIX@ +-exec_prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: @PROJECT_NAME@ HTML renderer + Description: Markdown to HTML converter library. +diff --git a/src/md4c.pc.in b/src/md4c.pc.in +index cd8842d..b5d81f8 100644 +--- a/src/md4c.pc.in ++++ b/src/md4c.pc.in +@@ -1,7 +1,5 @@ +-prefix=@CMAKE_INSTALL_PREFIX@ +-exec_prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: @PROJECT_NAME@ + Description: Markdown parser library with a SAX-like callback-based interface. +-- +2.31.0 + diff --git a/pkgs/development/libraries/memorymapping/default.nix b/pkgs/development/libraries/memorymapping/default.nix index ebab23fe471e..91af205f0320 100644 --- a/pkgs/development/libraries/memorymapping/default.nix +++ b/pkgs/development/libraries/memorymapping/default.nix @@ -37,7 +37,9 @@ stdenv.mkDerivation { description = "fmemopen for Mac OS and iOS"; license = licenses.asl20; maintainers = with maintainers; [ veprbl ]; - platforms = platforms.unix; + # Uses BSD-style funopen() to implement glibc-style fmemopen(). + # Add more BSDs if you need to. + platforms = platforms.darwin; broken = stdenv.isAarch64; }; } diff --git a/pkgs/development/libraries/orocos-kdl/default.nix b/pkgs/development/libraries/orocos-kdl/default.nix index 4eb18c347c09..c60d79fd492f 100644 --- a/pkgs/development/libraries/orocos-kdl/default.nix +++ b/pkgs/development/libraries/orocos-kdl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "orocos-kdl"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "orocos"; repo = "orocos_kinematics_dynamics"; rev = "v${version}"; - sha256 = "181w2q6lsrfcvrgqwi6m0xrydjlblj1b654apf2d7zjc7qqgd6ca"; + sha256 = "15ky7vw461005axx96d0f4zxdnb9dxl3h082igyd68sbdb8r1419"; # Needed to build Python bindings fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix index a3146da188c0..f4d1541a1398 100644 --- a/pkgs/development/python-modules/aioswitcher/default.nix +++ b/pkgs/development/python-modules/aioswitcher/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "aioswitcher"; - version = "2.0.5"; + version = "2.0.6"; format = "pyproject"; src = fetchFromGitHub { owner = "TomerFi"; repo = pname; rev = version; - sha256 = "sha256-q1toEKEqTJuZbsrqDjfbUWsQmrwiu2MtcoWqKKRUEJA="; + sha256 = "sha256-zgfgM3orhm2ZPp3Cf803adNzPeMOdRGX+sN6rhK1OT4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/intensity-normalization/default.nix b/pkgs/development/python-modules/intensity-normalization/default.nix new file mode 100644 index 000000000000..d050bd1c8d15 --- /dev/null +++ b/pkgs/development/python-modules/intensity-normalization/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, pytestCheckHook +, matplotlib +, nibabel +, numpy +, scikit-fuzzy +, scikitimage +, scikit-learn +, scipy +, statsmodels +}: + +buildPythonPackage rec { + pname = "intensity-normalization"; + version = "2.0.1"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1c6inlhpxarvkniq8j5j2pgl32dmggn14s8c3c0xx15j7cg90413"; + }; + + postPatch = '' + substituteInPlace setup.cfg --replace "pytest-runner" "" + ''; + + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ + "intensity_normalization" + "intensity_normalization.normalize" + "intensity_normalization.plot" + "intensity_normalization.util" + ]; + propagatedBuildInputs = [ + matplotlib + nibabel + numpy + scikit-fuzzy + scikitimage + scikit-learn + scipy + statsmodels + ]; + + meta = with lib; { + homepage = "https://github.com/jcreinhold/intensity-normalization"; + description = "MRI intensity normalization tools"; + maintainers = with maintainers; [ bcdarwin ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix new file mode 100644 index 000000000000..55fbb2df8e25 --- /dev/null +++ b/pkgs/development/python-modules/orjson/default.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, pythonOlder +, rustPlatform +, fetchFromGitHub +, buildPythonPackage +, libiconv +, numpy +, psutil +, pytestCheckHook +, python-dateutil +, pytz +, xxhash +}: + +buildPythonPackage rec { + pname = "orjson"; + version = "3.6.3"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "ijl"; + repo = pname; + rev = version; + sha256 = "10clf13bp3fqd9b7n1isrfwz7sngcl1j6birqc1xyg9wzfw1kslj"; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + sha256 = "163rf8k7qb1whjf78i8v5dlyif1sgvd9xkj8li81j45abgzkq86w"; + }; + + format = "pyproject"; + + nativeBuildInputs = with rustPlatform; [ + cargoSetupHook + maturinBuildHook + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + + checkInputs = [ + numpy + psutil + pytestCheckHook + python-dateutil + pytz + xxhash + ]; + + pythonImportsCheck = [ pname ]; + + meta = with lib; { + description = "Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy"; + homepage = "https://github.com/ijl/orjson"; + license = with licenses; [ asl20 mit ]; + platforms = platforms.unix; + maintainers = with maintainers; [ misuzu ]; + }; +} diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index 2df3e3a17c84..eba416fd3562 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plexapi"; - version = "4.7.0"; + version = "4.7.1"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "pkkid"; repo = "python-plexapi"; rev = version; - sha256 = "1gh36ln9ki69rs7ml9syqq956i996rdi145qffjwb3736zylrzkp"; + sha256 = "sha256-kZREcjLBSWXGULEKfWiherRCl5UXLOw4f3JFaqs8dXw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index 6c97b3e3f440..e01c5e181981 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyChromecast"; - version = "9.2.0"; + version = "9.2.1"; src = fetchPypi { inherit pname version; - sha256 = "6d34593575cf77565df47af4c75dd47c6a65831ec18a8c10b5367b2f1c172f0a"; + sha256 = "sha256-iD1ug2/18QaKi9ADZKFbTJhUKTCGSV6f2crNm01UwL8="; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/pykodi/default.nix b/pkgs/development/python-modules/pykodi/default.nix index a0ca9a4c5737..d754a44ffd38 100644 --- a/pkgs/development/python-modules/pykodi/default.nix +++ b/pkgs/development/python-modules/pykodi/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pykodi"; - version = "0.2.5"; + version = "0.2.6"; src = fetchPypi { inherit pname version; - sha256 = "1al2q4jiqxjnz0j2xvs2hqzrz6fm3hmda5zjnkp8gdvgchd1cmn7"; + sha256 = "sha256-SDp2S9HeqejRM3cf4x+5RLUQMPhjieQaXoubwf9Q/d4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyopenuv/default.nix b/pkgs/development/python-modules/pyopenuv/default.nix index 15f8cf8883e8..f30f3758f31b 100644 --- a/pkgs/development/python-modules/pyopenuv/default.nix +++ b/pkgs/development/python-modules/pyopenuv/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pyopenuv"; - version = "2.2.0"; + version = "2.2.1"; format = "pyproject"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-WYCIQTQbDh9U4nB+dgLXbBJXErC4l5Hnk8K5n4CctCw="; + sha256 = "sha256-9hpXVKCpVbUAoTxd5mHP9NK1dZxbrQUxrQrOEVHpaPo="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pyturbojpeg/default.nix b/pkgs/development/python-modules/pyturbojpeg/default.nix index 50f5c4559e4e..c9c97ad621f8 100644 --- a/pkgs/development/python-modules/pyturbojpeg/default.nix +++ b/pkgs/development/python-modules/pyturbojpeg/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pyturbojpeg"; - version = "1.5.1"; + version = "1.5.4"; src = fetchPypi { pname = "PyTurboJPEG"; inherit version; - sha256 = "sha256-56FnJpnQzFPlz0v506CrwIHf9uV3R1LibnuEL7RcFCg="; + sha256 = "sha256-KU24J6iU2y8iLyxjJiuh6Zqx+t1PVBrleOf/mWnfA4I="; }; patches = [ diff --git a/pkgs/development/python-modules/scikit-fuzzy/default.nix b/pkgs/development/python-modules/scikit-fuzzy/default.nix index 7923565c3f4f..ef921c543e1f 100644 --- a/pkgs/development/python-modules/scikit-fuzzy/default.nix +++ b/pkgs/development/python-modules/scikit-fuzzy/default.nix @@ -12,19 +12,22 @@ buildPythonPackage rec { pname = "scikit-fuzzy"; - version = "unstable-2020-10-03"; + version = "unstable-2021-03-31"; disabled = isPy27; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "eecf303b701e3efacdc9b9066207ef605d4facaa"; - sha256 = "18dl0017iqwc7446hqgabhibgjwdakhmycpis6zpvvkkv4ip5062"; + rev = "92ad3c382ac19707086204ac6cdf6e81353345a7"; + sha256 = "0q89p385nsg3lymlsqm3mw6y45vgrk6w9p30igbm59b7r9mkgdj8"; }; propagatedBuildInputs = [ networkx numpy scipy ]; checkInputs = [ matplotlib nose pytestCheckHook ]; + # test error: "ValueError: could not convert string to float: '2.6.2'" + disabledTestPaths = [ "skfuzzy/control/tests/test_controlsystem.py" ]; + meta = with lib; { homepage = "https://github.com/scikit-fuzzy/scikit-fuzzy"; description = "Fuzzy logic toolkit for scientific Python"; diff --git a/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/pkgs/development/python-modules/scikit-hep-testdata/default.nix index ae982e4d3755..d4e31966da2c 100644 --- a/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "scikit-hep-testdata"; - version = "0.4.7"; + version = "0.4.8"; format = "pyproject"; # fetch from github as we want the data files @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = pname; rev = "v${version}"; - sha256 = "0bydqgl7pxmj7nb952p08q64d15d8hbvfdnzkbx9wr71mw7cf3vm"; + sha256 = "0x5p42c9iqwdx15gdvccddlx4a5a8aix7h01345afrlgpnnpqcv4"; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index d89f9bff5232..2058980fe993 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "conftest"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "conftest"; rev = "v${version}"; - sha256 = "sha256-Yc/aejGLMbAqpIRTVQQ3lv7/oyr7tVAy41Gx6198Eos="; + sha256 = "1fb2i2pkpf0dv2g17zii68hkxk2ni6xn5xyrhb3gmkc6afz96ni0"; }; - vendorSha256 = "sha256-jI5bX6S2C0ckiiieVlaRNEsLS/5gGkC3o/xauDtCOjA="; + vendorSha256 = "sha256-jt1gQDtbZiBm5o5qwkRNeZDJJoRbXnRUcQ4GoTp+otc="; ldflags = [ "-s" diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index 9acd39b7448e..01108d1501aa 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -3,10 +3,13 @@ tree-sitter-bash = (builtins.fromJSON (builtins.readFile ./tree-sitter-bash.json)); tree-sitter-c = (builtins.fromJSON (builtins.readFile ./tree-sitter-c.json)); tree-sitter-c-sharp = (builtins.fromJSON (builtins.readFile ./tree-sitter-c-sharp.json)); + tree-sitter-clojure = (builtins.fromJSON (builtins.readFile ./tree-sitter-clojure.json)); tree-sitter-comment = (builtins.fromJSON (builtins.readFile ./tree-sitter-comment.json)); tree-sitter-cpp = (builtins.fromJSON (builtins.readFile ./tree-sitter-cpp.json)); tree-sitter-css = (builtins.fromJSON (builtins.readFile ./tree-sitter-css.json)); + tree-sitter-dart = (builtins.fromJSON (builtins.readFile ./tree-sitter-dart.json)); tree-sitter-dot = (builtins.fromJSON (builtins.readFile ./tree-sitter-dot.json)); + tree-sitter-elisp = (builtins.fromJSON (builtins.readFile ./tree-sitter-elisp.json)); tree-sitter-embedded-template = (builtins.fromJSON (builtins.readFile ./tree-sitter-embedded-template.json)); tree-sitter-fennel = (builtins.fromJSON (builtins.readFile ./tree-sitter-fennel.json)); tree-sitter-fish = (builtins.fromJSON (builtins.readFile ./tree-sitter-fish.json)); @@ -28,6 +31,7 @@ tree-sitter-python = (builtins.fromJSON (builtins.readFile ./tree-sitter-python.json)); tree-sitter-ql = (builtins.fromJSON (builtins.readFile ./tree-sitter-ql.json)); tree-sitter-regex = (builtins.fromJSON (builtins.readFile ./tree-sitter-regex.json)); + tree-sitter-rst = (builtins.fromJSON (builtins.readFile ./tree-sitter-rst.json)); tree-sitter-ruby = (builtins.fromJSON (builtins.readFile ./tree-sitter-ruby.json)); tree-sitter-rust = (builtins.fromJSON (builtins.readFile ./tree-sitter-rust.json)); tree-sitter-scala = (builtins.fromJSON (builtins.readFile ./tree-sitter-scala.json)); @@ -37,6 +41,7 @@ tree-sitter-tsq = (builtins.fromJSON (builtins.readFile ./tree-sitter-tsq.json)); tree-sitter-typescript = (builtins.fromJSON (builtins.readFile ./tree-sitter-typescript.json)); tree-sitter-verilog = (builtins.fromJSON (builtins.readFile ./tree-sitter-verilog.json)); + tree-sitter-vim = (builtins.fromJSON (builtins.readFile ./tree-sitter-vim.json)); tree-sitter-yaml = (builtins.fromJSON (builtins.readFile ./tree-sitter-yaml.json)); tree-sitter-zig = (builtins.fromJSON (builtins.readFile ./tree-sitter-zig.json)); } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json index 4e8c4521613f..2f589a92d2d8 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-c", - "rev": "d09ab34013de8a30d97a1912fc30811f1172515f", - "date": "2021-08-16T09:37:46-07:00", - "path": "/nix/store/94lp3b3hgap1baci006329zl2i168scm-tree-sitter-c", - "sha256": "0wf85g82p5j1vlw7rphfcpwch4b8sbvp4kk095aqmmcsm7d7dxl4", + "rev": "f71e80b9f20c3968c131518ae8d272a3cf81a60b", + "date": "2021-09-18T14:26:00-05:00", + "path": "/nix/store/22iw8rdpmvxmyrsmxxbyx8yi44jq05qd-tree-sitter-c", + "sha256": "13qr8ms8w7y92a33p0wisg4kzj4q3dzi2bn7wd6x815j8hfz627q", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json new file mode 100644 index 000000000000..3fccfc5f7b01 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json @@ -0,0 +1,11 @@ +{ + "url": "https://github.com/sogaiu/tree-sitter-clojure", + "rev": "39bf0977d223879436c1425fe6bfeb3bcfd86f92", + "date": "2021-08-15T13:16:31+09:00", + "path": "/nix/store/7kpf74gw4a68fby6jiw4n7lc4jfkgcf4-tree-sitter-clojure", + "sha256": "0ryj75znysvyvv4qaghygx1srrhlwhfmzmdilm652prkgj6yzh6b", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json index 1d7b15b99dce..394040a79da0 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-cpp", - "rev": "f53c3c013a1c223f7ca4614895bef4fe05928101", - "date": "2021-09-14T15:11:36-05:00", - "path": "/nix/store/lc1jjys6lgp19d52n6qgymfqx9pwg0xa-tree-sitter-cpp", - "sha256": "05al4yrb39cfa96cf4armv47ja5qccmc3mvbmzfwc7hh1rq621n7", + "rev": "8b112a131b910ec009853fc9dd1c27eae267a7a6", + "date": "2021-09-18T10:53:12-05:00", + "path": "/nix/store/bpfw6wckk0yfpr99nrv473g3r3b84vbv-tree-sitter-cpp", + "sha256": "0rskvx5krakfkkcmiv9qd0zf8rf63iaigv76x3dq7v00sj8m0xsn", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json index 9b67d955eeb5..d1d55711895c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-css", - "rev": "7c390622166517b01445e0bb08f72831731d3088", - "date": "2021-08-17T11:20:41-07:00", - "path": "/nix/store/wx5dzm92k2zv53r5p2s3jv1sak8xdk57-tree-sitter-css", - "sha256": "01r63dqxhgvsc1gkfy0mqsq98dmvc2hdw3c5zdkzdbry8zqpyn8s", + "rev": "a03f1d2d1dfbf6f8e0fdca5f9ff030228241eb57", + "date": "2021-09-15T14:32:51-07:00", + "path": "/nix/store/zamdl9ixsmgi7rdsb7mx2a1g0i8gfvdy-tree-sitter-css", + "sha256": "0i5xf97m6vxgcpa21h2gzlgj9n5rlv9mz3w738bwvcz5k6nbx6np", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json new file mode 100644 index 000000000000..6d79d851fd4d --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json @@ -0,0 +1,11 @@ +{ + "url": "https://github.com/usernobody14/tree-sitter-dart", + "rev": "6a25376685d1d47968c2cef06d4db8d84a70025e", + "date": "2021-06-04T09:39:40-06:00", + "path": "/nix/store/vdygn1702kn92k222kygk9i50h10z9km-tree-sitter-dart", + "sha256": "0z06sphmgjggx5j2rjfy3f85fh1m9s79sql8a7d4kvsamz9rwakl", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elisp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elisp.json new file mode 100644 index 000000000000..43d38746c46f --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elisp.json @@ -0,0 +1,11 @@ +{ + "url": "https://github.com/wilfred/tree-sitter-elisp", + "rev": "166777abacfe5821d3b7b6873e6d2fd70a99f348", + "date": "2021-09-05T23:34:46-07:00", + "path": "/nix/store/gfyr8hl9pj2i0dj0qqpwh53jphff2bcd-tree-sitter-elisp", + "sha256": "18798jb3cisrvhkmzhq2qxly19hxvznf9k1n5pzl8l1dhw1yvl2a", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json index e4d5751ab8b2..df550680b451 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json @@ -1,9 +1,9 @@ { "url": "https://github.com/travonted/tree-sitter-fennel", - "rev": "e10b04389094d9b96aa8489121c1f285562d701d", - "date": "2021-08-18T16:21:04-04:00", - "path": "/nix/store/rmlldcr0yq9c87lp96jrajbf5n4xin6r-tree-sitter-fennel", - "sha256": "1bavjjy8wbp1hkj1nps1lsqa9ihwhnj039hfi1fvgxv5j7il74ir", + "rev": "42823442a18dd2aa7b0b22dc719abb54abb3fe2e", + "date": "2021-09-08T19:22:08-04:00", + "path": "/nix/store/2v174r3fc3cqsy8yanq2kdcjqvzl1jx9-tree-sitter-fennel", + "sha256": "0a59hgx7mmdicw9fq2q8dcd2ffmcgjdkk3rpwj84ya1qiyvs5x5s", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json index 0ba8de4a09cf..67800f5081a5 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-python", - "rev": "d6210ceab11e8d812d4ab59c07c81458ec6e5184", - "date": "2021-03-27T09:41:53-07:00", - "path": "/nix/store/4v24ahydid4hr7kj0xi41mgbpglfnnki-tree-sitter-python", - "sha256": "173lpxi4vqa42dcdr9aj5phg5g6ny9ns04djw9n86pasx2w66dhk", + "rev": "9b84b7fd9da1aa74c8a8afae58b7dcc4c109cda4", + "date": "2021-09-16T13:02:06+02:00", + "path": "/nix/store/vxh1bdkdqj3n6knlz6bbdyl5l4qj2a2v-tree-sitter-python", + "sha256": "0r5daw3pbqcaf08gnhghjr15n7vv43njvh4ky6vz985sjzdnjz02", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json new file mode 100644 index 000000000000..3e2a463b54f4 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json @@ -0,0 +1,11 @@ +{ + "url": "https://github.com/stsewd/tree-sitter-rst", + "rev": "a9281c2250e0d32750de159413cdd87120407389", + "date": "2021-09-17T19:21:59-05:00", + "path": "/nix/store/3cnj1q9xfl0yh096pahqvlrf66azyhsr-tree-sitter-rst", + "sha256": "1fxknsmkn3pz1km77mii3w917fdl6h57h4mnw20b0syn4v1ag07d", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json index 3f08de7bcc4b..47dea4c92cd2 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-typescript", - "rev": "98ef311701c51f72c83e5285366e00adb7a446c8", - "date": "2021-09-14T18:18:35-07:00", - "path": "/nix/store/fcl3abkk7blcq8hfk7l70j32nhx4ka24-tree-sitter-typescript", - "sha256": "1jpfmpisyz020h3vj7i4km8ha9axl6kqn75ikd26bvyxqir38cnr", + "rev": "3383cebec9c9546587d9fe00c2e565d91163014a", + "date": "2021-09-16T13:01:51-07:00", + "path": "/nix/store/ml188xckf51g1r6gw380svxsg639kjgc-tree-sitter-typescript", + "sha256": "0vgkhn36cyg134ygx5wzld3ic9rd4lq9s2rp2dkxh0zg610ilcms", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json new file mode 100644 index 000000000000..7302892c6bd2 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json @@ -0,0 +1,11 @@ +{ + "url": "https://github.com/vigoux/tree-sitter-viml", + "rev": "59595443fb486449f42db839934117221358a85f", + "date": "2021-08-31T08:57:29+02:00", + "path": "/nix/store/9sixkkk37c2bl09aik32cd1jd322ywri-tree-sitter-viml", + "sha256": "1kh3il5vwlz5qxi9553ks7a0dpwx1n7wnqkv5v8jhslhn7w1c1l1", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json index 538edddce644..e7a9dfc82677 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json @@ -1,9 +1,9 @@ { - "url": "https://github.com/GrayJack/tree-sitter-zig", - "rev": "41bbc7f7b94bde3e948e41e4d42673945238ff03", - "date": "2021-03-30T12:55:10-03:00", - "path": "/nix/store/av4xgzr3c1rhr7v4fa9mm68krd2qv1lg-tree-sitter-zig", - "sha256": "0gjxac43qpqc4332bp3mpdbvh7rqv0q3hvw8834b30ml5q0r0qr0", + "url": "https://github.com/maxxnino/tree-sitter-zig", + "rev": "5ca53bb7bd649069a6af48f4dfd32f3187491db1", + "date": "2021-09-06T21:30:14+09:00", + "path": "/nix/store/x2dfgc97jmvyq5fnbyg9w7rsjz8cknj6-tree-sitter-zig", + "sha256": "1c50pvza6l4snmvgj3by053j4z7asy828i9pi1zwm6121sl7ffpd", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index c5771a565306..c6e819465a54 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -70,10 +70,22 @@ let # If you need a grammar that already exists in the official orga, # make sure to give it a different name. otherGrammars = { + "tree-sitter-clojure" = { + orga = "sogaiu"; + repo = "tree-sitter-clojure"; + }; "tree-sitter-comment" = { orga = "stsewd"; repo = "tree-sitter-comment"; }; + "tree-sitter-dart" = { + orga = "usernobody14"; + repo = "tree-sitter-dart"; + }; + "tree-sitter-elisp" = { + orga = "wilfred"; + repo = "tree-sitter-elisp"; + }; "tree-sitter-nix" = { orga = "cstrahan"; repo = "tree-sitter-nix"; @@ -94,10 +106,18 @@ let orga = "ikatyang"; repo = "tree-sitter-markdown"; }; + "tree-sitter-rst" = { + orga = "stsewd"; + repo = "tree-sitter-rst"; + }; "tree-sitter-svelte" = { orga = "Himujjal"; repo = "tree-sitter-svelte"; }; + "tree-sitter-vim" = { + orga = "vigoux"; + repo = "tree-sitter-viml"; + }; "tree-sitter-yaml" = { orga = "ikatyang"; repo = "tree-sitter-yaml"; @@ -107,7 +127,7 @@ let repo = "tree-sitter-toml"; }; "tree-sitter-zig" = { - orga = "GrayJack"; + orga = "maxxnino"; repo = "tree-sitter-zig"; }; "tree-sitter-fish" = { diff --git a/pkgs/development/tools/rust/cargo-spellcheck/default.nix b/pkgs/development/tools/rust/cargo-spellcheck/default.nix new file mode 100644 index 000000000000..836b959f1023 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-spellcheck/default.nix @@ -0,0 +1,32 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, libclang +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-spellcheck"; + version = "0.8.13"; + + src = fetchFromGitHub { + owner = "drahnr"; + repo = pname; + rev = "v${version}"; + sha256 = "0k88ma00gj8wjdvd7ysbbvqnf5sk1w8d3wqbi6qfxnqrc1k3hlv2"; + }; + + cargoSha256 = "0mmk0igm2s8sxi65zvikxhz52xhkyd3ljqy61mij7zlx95rf639x"; + + LIBCLANG_PATH = "${libclang.lib}/lib"; + + checkFlags = [ + "--skip checker::hunspell::tests::hunspell_binding_is_sane" + ]; + + meta = with lib; { + description = "Checks rust documentation for spelling and grammar mistakes"; + homepage = "https://github.com/drahnr/cargo-spellcheck"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ newam ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index 0a76ae0202c4..c08a714ce357 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.22"; + version = "0.1.23"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "sha256-z92q0uwL832Ph7sTpWpaa8e9Xrik9wnjQ7LBy/hY8KE="; + sha256 = "sha256-SDB2Xk2bEheXT0Lc1lrTkOyJAcAEsmUPU5R8Hy1SAUE="; }; - cargoSha256 = "sha256-4HguNyPIjpFqa80dDVFgXDK7pHOuFJdpFNxLARXxT2g="; + cargoSha256 = "sha256-gCGOXEjhT9bx3FYvtu3AoIOmgsU2WO1rmi/cKvD9WMY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/stylua/default.nix b/pkgs/development/tools/stylua/default.nix index 6d299ce6ece5..1dcb32401283 100644 --- a/pkgs/development/tools/stylua/default.nix +++ b/pkgs/development/tools/stylua/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "stylua"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = pname; rev = "v${version}"; - sha256 = "12vflwk1h5ahamxiiaznx3k1ldi8il0adwb2rl58swmvfzbcm7y9"; + sha256 = "sha256-mHmLwgAyLEWfhSVy7WmJN1Z5BdA+3hoHujbKn2Q9fxI="; }; - cargoSha256 = "1glkfxz9apmsqbyl8fy5gwywbr6k7cv0l47w2nfimg92qn9xzgks"; + cargoSha256 = "sha256-1aze1U6NrL8KPK5v5NYCdyTTqoczkg32xR5V0jApQWw="; cargoBuildFlags = lib.optionals lua52Support [ "--features" "lua52" ] ++ lib.optionals luauSupport [ "--features" "luau" ]; diff --git a/pkgs/development/tools/vala-lint/default.nix b/pkgs/development/tools/vala-lint/default.nix index 3c91880e16ed..e91bceeae7a3 100644 --- a/pkgs/development/tools/vala-lint/default.nix +++ b/pkgs/development/tools/vala-lint/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/development/tools/vendir/default.nix b/pkgs/development/tools/vendir/default.nix index d45a5828c1ed..a58a0e95a38f 100644 --- a/pkgs/development/tools/vendir/default.nix +++ b/pkgs/development/tools/vendir/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vendir"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-vendir"; rev = "v${version}"; - sha256 = "sha256-LvpzynT+ibrE1F1uv7X0pVtzOrVFIxFqbZwM04e1Do0="; + sha256 = "sha256-6f9UF0UgwKG3Mdgy85pW2KVjC8nbnMTwQJqIWxA3Jp4="; }; vendorSha256 = null; diff --git a/pkgs/games/cataclysm-dda/stable.nix b/pkgs/games/cataclysm-dda/stable.nix index a11837447f79..1429cdbf180e 100644 --- a/pkgs/games/cataclysm-dda/stable.nix +++ b/pkgs/games/cataclysm-dda/stable.nix @@ -10,17 +10,17 @@ let }; self = common.overrideAttrs (common: rec { - version = "0.F-1"; + version = "0.F-2"; src = fetchFromGitHub { owner = "CleverRaven"; repo = "Cataclysm-DDA"; rev = version; - sha256 = "sha256-bVIln8cLZ15qXpW5iB8Odqk0OQbNLLM8OiKybTzARA0="; + sha256 = "sha256-8AZOrO/Wxui+LqAZo8hURktMTycecIgOONUJmE3M+vM="; }; makeFlags = common.makeFlags ++ [ - # Makefile declares version as 0.F, even under 0.F-1 + # Makefile declares version as 0.F, even under 0.F-2 "VERSION=${version}" ]; diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix index ef1143f41430..0ad2c77dc7ef 100644 --- a/pkgs/misc/screensavers/light-locker/default.nix +++ b/pkgs/misc/screensavers/light-locker/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { ConsoleKit/UPower or logind/systemd. ''; license = licenses.gpl2; - maintainers = with maintainers; [ obadz ] ++ pantheon.maintainers; + maintainers = with maintainers; [ obadz ] ++ teams.pantheon.members; platforms = platforms.linux; }; } diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index b81398046391..bdf84ef91134 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -77,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-09-11"; + version = "2021-09-17"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "19437e25d05950ab83dce285b4b8ec5166e06dba"; - sha256 = "1pc99l00ir145b0i7g1m857v1318ji1p8bzhs0cmql0hdp4cvyd3"; + rev = "2f72a3ed1972d23a5ef50c78715ec68f090932e8"; + sha256 = "1vjg0y02cnnknjgj0zp9f4s84y7dbcy80aw1jp6qizb6cfbkv39v"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -197,12 +197,12 @@ final: prev: aurora = buildVimPluginFrom2Nix { pname = "aurora"; - version = "2021-07-17"; + version = "2021-09-18"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "af110b7f6080bdc4685cdd5551ba1f79a81910f1"; - sha256 = "1h2czb183lliib95jn4dxq8cn713s22dc4hd1cj19bzqy4j39qhi"; + rev = "cd4c8ceff0109e76b9c919267e1791f505a75815"; + sha256 = "172653xjmyz9a1m0zx3l5njybra5dmsv7b6i01s4w5dzlha5c2jn"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -389,12 +389,12 @@ final: prev: bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2021-09-12"; + version = "2021-09-16"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "15923279b719ce77911caf34e5f4c83a0b5397c9"; - sha256 = "0rmmr0c2jxsl4b4dzs0jdp3dinldczw3s6mnf80k4jvswy28rd9h"; + rev = "be5866b77c713d92cf3d383a387bec1d55e3f798"; + sha256 = "1v4fw3idhbhnnnn08zw92g7pyb2x5ss8zbi7hfbxvn5jkpzyqz6p"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -413,12 +413,12 @@ final: prev: calendar-vim = buildVimPluginFrom2Nix { pname = "calendar.vim"; - version = "2021-01-30"; + version = "2021-09-18"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "4e454c2ca9a489f2631df24845615744bd594b61"; - sha256 = "12vmysyvavvf1173i0m7jfzh2jsfqx5p7mdm3iafg4iv0209rz66"; + rev = "eebee3aa5da63188b70c4fd75509dcfce77e2030"; + sha256 = "0n8i5jg3hvx6mj6grxcvdsanbyvg67gjiq18aq6kpdb1rcip0270"; }; meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; @@ -437,24 +437,24 @@ final: prev: caw-vim = buildVimPluginFrom2Nix { pname = "caw.vim"; - version = "2021-08-21"; + version = "2021-09-16"; src = fetchFromGitHub { owner = "tyru"; repo = "caw.vim"; - rev = "2c0cd18aa113cc255daf4366f1d01a7a25ce0110"; - sha256 = "1sa7mhqvfgyr3fsdyl9bjb7scw8ii4y9ig4n3qq77lm4k7snzp2v"; + rev = "8978f977a2a80396ab3a536a0df0a3727fca9882"; + sha256 = "0rskyi56rhq6l3iv1695xl049ji2l3y5y7fm272hyb18ggq1rzja"; }; meta.homepage = "https://github.com/tyru/caw.vim/"; }; chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-09-13"; + version = "2021-09-18"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "356863bbe896fbea6450b652c60a27b0a1cb3dbd"; - sha256 = "0s4vhw8qkg89a9afy9mqa42sl95dmapaqqhzz6gxvamqbk6kgj6y"; + rev = "566ed3821410954826e2e5b55b3cbdd1333f1723"; + sha256 = "1f1k1hqvjjip0i6hqdhaaihw57krb6bafaaq4xh1dk3h83gkx96m"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -581,24 +581,24 @@ final: prev: cmp-conjure = buildVimPluginFrom2Nix { pname = "cmp-conjure"; - version = "2021-08-29"; + version = "2021-09-10"; src = fetchFromGitHub { owner = "PaterJason"; repo = "cmp-conjure"; - rev = "4c2a2233de7d2c8ccbf8652b4c741921498ceaec"; - sha256 = "1ivrag7gch7mc72rim939z5gh7v532j29hgiy0pxgw3m6lvxdhwq"; + rev = "27cfdac78ec099a8d1e82b7a810f451ff0f80a30"; + sha256 = "1hbkafpqpzf4bzy8cyzg1zxnnpmhfkpz2vj8v8by5ym4qx8b747p"; }; meta.homepage = "https://github.com/PaterJason/cmp-conjure/"; }; cmp-emoji = buildVimPluginFrom2Nix { pname = "cmp-emoji"; - version = "2021-08-25"; + version = "2021-09-18"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-emoji"; - rev = "bbdcc00ecbae3bba18c648a6520d78f354853ce0"; - sha256 = "0zsda2dhhvqd1968xr6p8ndpai4vhb8xmk08nv038zg9csrqkqac"; + rev = "49f33af4609b0c306176e4f1408b3d7d845411a6"; + sha256 = "0x5yihz6b5shsz5kkwh95xqw6y66bhlvfwcp207khqk5vmvrk4mk"; }; meta.homepage = "https://github.com/hrsh7th/cmp-emoji/"; }; @@ -617,12 +617,12 @@ final: prev: cmp-nvim-lsp = buildVimPluginFrom2Nix { pname = "cmp-nvim-lsp"; - version = "2021-09-03"; + version = "2021-09-17"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lsp"; - rev = "f6f471898bc4b45eacd36eef9887847b73130e0e"; - sha256 = "1asr32w5q618pqggq9jwrbqs4kjp3ssbw5pca5wc7j2496vm2lhg"; + rev = "246a41c55668d5f84afcd805ee73b6e419375ae0"; + sha256 = "0ybnrs31i61l6z02fjz65ankxccd5587pnky4lsczcz12kpj6s4n"; }; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/"; }; @@ -689,24 +689,24 @@ final: prev: cmp_luasnip = buildVimPluginFrom2Nix { pname = "cmp_luasnip"; - version = "2021-09-11"; + version = "2021-09-13"; src = fetchFromGitHub { owner = "saadparwaiz1"; repo = "cmp_luasnip"; - rev = "7284dd6ee87b05203932db6f9d28516efa5dc981"; - sha256 = "0wffibd4vfmgrhwzymfqkqn8klvv0mhgbjkzjgxl15hpxhz62i5d"; + rev = "e22fe57aec4f9e7029b8e547657fbee1b16cbaf7"; + sha256 = "0fkzxhs8gj5vbcbs2s8n66fjzmrxvzh1bn3kxijszmcm706d3nyq"; }; meta.homepage = "https://github.com/saadparwaiz1/cmp_luasnip/"; }; coc-clap = buildVimPluginFrom2Nix { pname = "coc-clap"; - version = "2021-05-10"; + version = "2021-09-18"; src = fetchFromGitHub { owner = "vn-ki"; repo = "coc-clap"; - rev = "8622be2674f3197bec8a0c4cfd177eb8455f45e6"; - sha256 = "063azqsibg25iv2c9smn4k6933frrwarqz640b14c041sgi6h8cx"; + rev = "0f43b736899b9444704b11bd1835fa337f31ac11"; + sha256 = "03glw1mz1pbn2paj7bhmmwcb7f25p1fqm755mpzrs9phra8bnyis"; }; meta.homepage = "https://github.com/vn-ki/coc-clap/"; }; @@ -882,12 +882,12 @@ final: prev: compe-tabnine = buildVimPluginFrom2Nix { pname = "compe-tabnine"; - version = "2021-09-04"; + version = "2021-09-14"; src = fetchFromGitHub { owner = "tzachar"; repo = "compe-tabnine"; - rev = "b00e1f9d597673bfcba39b6bfc620cea9e6c815a"; - sha256 = "0ryj8b60vvxb1q58xyv4hgrc1d7rjsbr21wn677xr13836knb5bw"; + rev = "33e4af509c27da9ef2c9c3002c01e3ec031797d4"; + sha256 = "1lzyia2s66kcxpr6d3db4rcgxlcddfg6gpz8rbg333hdasly383w"; }; meta.homepage = "https://github.com/tzachar/compe-tabnine/"; }; @@ -1026,12 +1026,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-08-29"; + version = "2021-09-17"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "13147545ffe61def7d3bb1123c5c843715e9565c"; - sha256 = "0jr6c0s7g54ra8w5r5b8j6hx16ch7cg9rj60jakbqfc1qdi5y9jm"; + rev = "ca2ca0d874670ae78192b465501e9a061f9f8f06"; + sha256 = "07hg0sf2k1f3n67pj5abvalnd33vr1sdhyh1i7syk201a3kzj57n"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -1062,12 +1062,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2021-09-06"; + version = "2021-09-18"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "736033d59b2940e35565ae37c3fd5cb024c2a134"; - sha256 = "09v5frr2mlqgvdw1kswv0r683xvg0j3k4wm3h00m0r929prqd6ll"; + rev = "89d1032cc53fc7f846af98d1c63a0bdb6d9b5a34"; + sha256 = "01xqkadd85a91z1did0d7mj1m805ilm88bsk0a893s66viyvqx57"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -1194,12 +1194,12 @@ final: prev: defx-nvim = buildVimPluginFrom2Nix { pname = "defx.nvim"; - version = "2021-09-09"; + version = "2021-09-18"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "7db19db1b1b6a82b763331b1719151a927d494e6"; - sha256 = "1v435j2qm395kvrq1vcrg4i76av2nzp5vywlhq4mk54q9gmb5xlp"; + rev = "9983f2cee6374da84be1d0189cc9add7605eeb56"; + sha256 = "0r7illv3v53fqq9xvic10hgqgd2863gv0s0x94i8vj6y04g3h2lj"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -1254,12 +1254,12 @@ final: prev: deol-nvim = buildVimPluginFrom2Nix { pname = "deol.nvim"; - version = "2021-09-09"; + version = "2021-09-13"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "9859e06d7a478eb3c2d26ca0270501581bd95a0b"; - sha256 = "1r6hr0lfbhdl86a5k2vy3vaiqnnl9pgvgpak0lvswrjzjkz4nn7h"; + rev = "03b772ed3e91b8bdbf5260d76f84c5e90a42a8f0"; + sha256 = "0nbwb2kcmd88zqk1v1zndbrjfpsj5jy99bzm81sx5k9yslhl854n"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -1592,24 +1592,24 @@ final: prev: echodoc-vim = buildVimPluginFrom2Nix { pname = "echodoc.vim"; - version = "2021-08-12"; + version = "2021-09-16"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; - rev = "3e907e05d0495f999149f50a1e6cd72972ee7cbe"; - sha256 = "0bdiz108l4aa5ma49lbmmp8ks8n17i6wzjsawd94rgsyl3j4j3ri"; + rev = "b77548dcebf3a3324fec44ba361f3cd8dbe89f18"; + sha256 = "0fqd3fqfg7zri0y4mm0d4rpp87wjf8kpy0gphkha5r4lpd2mjgv4"; }; meta.homepage = "https://github.com/Shougo/echodoc.vim/"; }; edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2021-09-03"; + version = "2021-09-18"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "9653ebf5bf63c4ea31c3b6cf758d6253c672a838"; - sha256 = "0qmpk36brpwl8wi7jw3sv3mvlrrzlww1kn5sa669g3sbdjkk7zpj"; + rev = "25fbb8d382aa43432ae76ac8c4725de3e4ce3551"; + sha256 = "0s2vihz6z33h5r1nly9h40s5yvrgpm8maa9xfbxqk6xf960kydi2"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -1629,12 +1629,12 @@ final: prev: editorconfig-nvim = buildVimPluginFrom2Nix { pname = "editorconfig.nvim"; - version = "2021-09-02"; + version = "2021-09-15"; src = fetchFromGitHub { owner = "gpanders"; repo = "editorconfig.nvim"; - rev = "d9df2225615071bec85e5956a146ae0fabc960f6"; - sha256 = "02jjzmgjcaqvgnfnc81xnqfsgfnyyv9mv1xjz6s4vm823gmhi2li"; + rev = "4ebcc2fa7c2663d29df6ccffa5be95b8f266a138"; + sha256 = "13lwv7f0c6sgmpgxx07dpqc59czv69qz30jkgz2dsvjdnd6rvzif"; }; meta.homepage = "https://github.com/gpanders/editorconfig.nvim/"; }; @@ -1762,12 +1762,12 @@ final: prev: feline-nvim = buildVimPluginFrom2Nix { pname = "feline.nvim"; - version = "2021-09-12"; + version = "2021-09-17"; src = fetchFromGitHub { owner = "famiu"; repo = "feline.nvim"; - rev = "0506b42b11e9ef6c5c9a3710cb29f8829b33aaa8"; - sha256 = "17c8fm8yjzic6ys5p6cy3dkpxjlqp1ziqx537wdqylfa9q177gbg"; + rev = "5d152e2cc28c172b42f4caba8baf0973f6a6ece6"; + sha256 = "0mzvh62zphb35kjzx9d09k7sak6fqsk1lcmycgjxk4kydjiw68za"; }; meta.homepage = "https://github.com/famiu/feline.nvim/"; }; @@ -1883,12 +1883,12 @@ final: prev: formatter-nvim = buildVimPluginFrom2Nix { pname = "formatter.nvim"; - version = "2021-08-27"; + version = "2021-09-15"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "c80405aca78fda2f8da586d7d087c13fdd500d85"; - sha256 = "07s7yw0l9xbf55x67yqcxi5r1y9nj5pjx69rl38jffw1l6lnnbgj"; + rev = "42aa771f34843f1583be98bfabc8f4a71f20a001"; + sha256 = "0zrrsisil9z1w6xcf9r5f52w0mnhv9qcl3zsl5c2hkw8ar7im27j"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; @@ -1907,12 +1907,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2021-09-11"; + version = "2021-09-16"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "9b1804bf6b6db18b1e056a92e0e03ddecff8e721"; - sha256 = "08gvxbq8i6hw4s2h6d68bdb27gm97sxj00zcamhpj6gi2h4wbzwl"; + rev = "31cdf6ab00898ae80e2bfe870378a499697da725"; + sha256 = "0iafqh05h3v5bnvigrb6bnv0sn6lps64blqfnksr35i60yljw878"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -1931,16 +1931,28 @@ final: prev: fugitive-gitlab-vim = buildVimPluginFrom2Nix { pname = "fugitive-gitlab.vim"; - version = "2021-09-07"; + version = "2021-09-14"; src = fetchFromGitHub { owner = "shumphrey"; repo = "fugitive-gitlab.vim"; - rev = "befd5438ad55a80c6abb415f6c5a9a44275550bc"; - sha256 = "1m57c11b7q1sv6va0xzikha19bck6rgr539sjhnhppdy7nlk55lw"; + rev = "36155d4b9f7a7abc2e6e94936952c661314f141f"; + sha256 = "1y0fpzgrqvnk2bgks1icbidc60z07syiaf8912rncmx4pdc2gzv1"; }; meta.homepage = "https://github.com/shumphrey/fugitive-gitlab.vim/"; }; + futhark-vim = buildVimPluginFrom2Nix { + pname = "futhark-vim"; + version = "2021-08-24"; + src = fetchFromGitHub { + owner = "BeneCollyridam"; + repo = "futhark-vim"; + rev = "fd7d053c74f150712eaa73999f44a3f95c8f08ff"; + sha256 = "17iwpqxkvflcimc066n5ljjbx603hpaqzk271r37qxdvk58jpn0w"; + }; + meta.homepage = "https://github.com/BeneCollyridam/futhark-vim/"; + }; + fwatch-nvim = buildVimPluginFrom2Nix { pname = "fwatch.nvim"; version = "2021-07-25"; @@ -1967,24 +1979,24 @@ final: prev: fzf-lsp-nvim = buildVimPluginFrom2Nix { pname = "fzf-lsp.nvim"; - version = "2021-09-11"; + version = "2021-09-14"; src = fetchFromGitHub { owner = "gfanto"; repo = "fzf-lsp.nvim"; - rev = "a08c0417fb910e06ad08d13bc8f9c12848722618"; - sha256 = "1m5khwj4mbhrhzs5yxipnzja1av9vvnpb460axswcdji9w0niv9y"; + rev = "8757eccc3948aa6107448d7fee2de226f0b7040b"; + sha256 = "0fjjwqkb5xl2prk8im8ndci73zlaaazr5x92aa69qvsjkbzvq7fw"; }; meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/"; }; fzf-vim = buildVimPluginFrom2Nix { pname = "fzf.vim"; - version = "2021-09-02"; + version = "2021-09-16"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "980cd074395110964b66bfbc5c1f1ee237be3c86"; - sha256 = "0wpih3xcyr6nnmpqfikp47ay2pmxp1lr0fp7fxwql8sfjc29i76r"; + rev = "bd703a7a7d7afd113634a346290acc27dd314bfc"; + sha256 = "1q4kdcnwyivwddgn3svvi0zp9n1hbx0bfnfrzdfn327kgljsdfnr"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -2123,12 +2135,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2021-09-11"; + version = "2021-09-14"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "cef4e6f26cd52f6a9725f0af4798b35cf6807404"; - sha256 = "01asl51liflhpdgmcmqw1djq24wpyhb051y87fxq6nnlyg92smpc"; + rev = "42acbae18327c53b8a82011074bcb529c3c75c8a"; + sha256 = "1m5wczqigx3a73a97p0qgqj5121mjawslj596jd18v5scbr39gv0"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2195,12 +2207,12 @@ final: prev: goto-preview = buildVimPluginFrom2Nix { pname = "goto-preview"; - version = "2021-09-06"; + version = "2021-09-17"; src = fetchFromGitHub { owner = "rmagatti"; repo = "goto-preview"; - rev = "8093ded366e2e71e87f5e40da29994187c06fce1"; - sha256 = "0mm7vrmibcdsxn9b89q7skc0xcm9z5fi1bv0gg3cc8kb1gislnwf"; + rev = "88ebcb56214ace7f52f2a846b40ff1f3e098af35"; + sha256 = "17xpdh5q62d97v5akq52b7qpfqmnvai5ggn46c0ysgl0r5cdycrv"; }; meta.homepage = "https://github.com/rmagatti/goto-preview/"; }; @@ -2255,12 +2267,12 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2021-09-03"; + version = "2021-09-18"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "99260ca49fa587e4e3c75da429f6c76866651a6a"; - sha256 = "0rx2ma52q8pwwq8yr61wg3v0z3s7nb5zr5p15i596aa69a84a9pn"; + rev = "94477f86aba2eef070497c1624c7b8d06e183b15"; + sha256 = "1wpmk6addq754172fp4pxcad6sik85kssqzg23asjvk0sviaf9i7"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; @@ -2447,12 +2459,12 @@ final: prev: increment-activator = buildVimPluginFrom2Nix { pname = "increment-activator"; - version = "2020-03-09"; + version = "2021-09-16"; src = fetchFromGitHub { owner = "nishigori"; repo = "increment-activator"; - rev = "bff5516da9103fb093ffc0dc993b8d535eacbceb"; - sha256 = "1swlv1mrck9s3n7fdg10c2nmlasf2fx8yfk01x3vii7l4aaa9w2y"; + rev = "55efcff88be45bd98cfdf7333dd718399373d10c"; + sha256 = "0q8990q9yxc85h69hssk4lry01qiqyi0hlnnx8l1kk218yar4q6h"; }; meta.homepage = "https://github.com/nishigori/increment-activator/"; }; @@ -2483,12 +2495,12 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline.nvim"; - version = "2021-09-12"; + version = "2021-09-15"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "0a3792cfc978ce30632bb0b10968849f1b9604eb"; - sha256 = "0ggxdcsdwb686rqwqga34cic94i45zp9aykqrqy13iv49gvspyxv"; + rev = "aed095e367bead0784a72e946ddfa2337b59ace8"; + sha256 = "0w90k6zd26a5zsfni10m509gcv7w5gfrcwx9xazhkz4bqwzc8jjr"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -2868,12 +2880,12 @@ final: prev: lightline-bufferline = buildVimPluginFrom2Nix { pname = "lightline-bufferline"; - version = "2021-08-19"; + version = "2021-09-17"; src = fetchFromGitHub { owner = "mengelbrecht"; repo = "lightline-bufferline"; - rev = "0b1ec6fbb1fceebd88694e99fbc905d916c8b30a"; - sha256 = "19mwdnnvps3dr5125al5yqlbziirl100xz11jkp2rbk250pc5h8d"; + rev = "4d1ddf0508069395ed54e7eb38a47f04fb03a387"; + sha256 = "06x3zdfss58ky5z8kgca1gq2zvdqv1nfw3mgnlsj0qq52mj0jwgj"; }; meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; @@ -2904,12 +2916,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed.nvim"; - version = "2021-09-11"; + version = "2021-09-17"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "01909f4e4e46777ca808ce91dc1088f8aba40b45"; - sha256 = "00szivifmkngq14s3n58hdc3mws0hs2h4ypcykyxc9sypc44ygzs"; + rev = "6ca32a155406d11093f64fa97e0ba8c6802fb7e1"; + sha256 = "0f886hldkv4ws18m492lhymp92mxympp2maqr8zy4hh06i7k123a"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -2976,12 +2988,12 @@ final: prev: lsp-status-nvim = buildVimPluginFrom2Nix { pname = "lsp-status.nvim"; - version = "2021-09-11"; + version = "2021-09-15"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "lsp-status.nvim"; - rev = "d12d7c62efdfd9151aa1b11bebe8cd8655a61368"; - sha256 = "0vsfih3dn0rmnwbmrd2p0y5fw1h5ii62a9fzjvpjkgw7i9s8d4lp"; + rev = "e8e5303f9ee3d8dc327c97891eaa1257ba5d4eee"; + sha256 = "106l23n01czd8ndzfixggj8ifv80w0n19mjakac575sjrxhwbl52"; }; meta.homepage = "https://github.com/nvim-lua/lsp-status.nvim/"; }; @@ -3000,12 +3012,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2021-09-12"; + version = "2021-09-17"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "5668ffc9b8cbe472cf0c85938e51c4a22a183da1"; - sha256 = "1dqy6m4lwb77zizncr0kyyra3a2ylmgiwr2hrxl3s8f4asggiy6z"; + rev = "5ee2b1fff09463e22679f5f3f8040d1200d6f848"; + sha256 = "18pa21ia9mvla19glf0k20l73mm8kam81xqq73ns16ww9mmql51z"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -3060,12 +3072,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-09-12"; + version = "2021-09-18"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "80085bcf4a0f5b6a1008cac29eda9c9242b11520"; - sha256 = "0jlc2vnyqplzjns3av1h74kfl1jh36aqbffggd59xz2bp10jmwh3"; + rev = "ccf8d5da2370877ccf7b3ea164d0530ff1f59a87"; + sha256 = "04646vmfkpzby0dimxs2xaim4isjnvfivildjskl8frbabkfwkrw"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3168,12 +3180,12 @@ final: prev: minsnip-nvim = buildVimPluginFrom2Nix { pname = "minsnip.nvim"; - version = "2021-09-06"; + version = "2021-09-16"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "minsnip.nvim"; - rev = "0bcc73cb716b07d4286ef714f5a07d94204d484c"; - sha256 = "0k6dmqmw52scvwfr5w8dg7388cy95vdvgfw3f4prwyls60i9x55w"; + rev = "f145d2d01103eb2e1f895f9baf438f042ad3509e"; + sha256 = "03b20cb4cifrwfsnw2zgpgd9n5wx731ygkg2x2fj5n6hw1klbfzj"; }; meta.homepage = "https://github.com/jose-elias-alvarez/minsnip.nvim/"; }; @@ -3480,24 +3492,24 @@ final: prev: neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2021-09-12"; + version = "2021-09-14"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "88570b2f9c42fbf7ecbaeac3c52d941c461e65b0"; - sha256 = "13blkgc1sfkpkrr15vgx8s2nz7np358qv9sr10znv8wjdn9wp2dd"; + rev = "f072ef425be8a51d2130edeb7d773a1f8dc20313"; + sha256 = "0av57z1smv6nj64d5hdqgvzcrd3h0bypi1hcl22k5zpwmaqf40m2"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2021-09-12"; + version = "2021-09-16"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "8d0adf5420314e98577c9a1974cf0f0f34ec16eb"; - sha256 = "0fl7zk81z54166428ff42dbhzz347scqaajr5qzgin20sydj66qk"; + rev = "28e652d110e7bda263bd4b0cb3c1484dce89cd93"; + sha256 = "0106iy1zkd13i26dviv6w8jgm9hapimpj97passh2khac3ajln5c"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -3516,12 +3528,12 @@ final: prev: neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2021-09-07"; + version = "2021-09-17"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "053d6bd3605a64f05de11a179cbab423fe759ebe"; - sha256 = "0qk3bhpjqi06jj1haydalvvsj7f7jbxbb168jc6i949694v406zj"; + rev = "8df876172fd9b8f6c023fcd5b84728a675cbdf91"; + sha256 = "0dqr9b2h0f2rxiw4lvws2gamwxdmnqb2qsk2ish47v7lnc772l2l"; }; meta.homepage = "https://github.com/neomake/neomake/"; }; @@ -3588,12 +3600,12 @@ final: prev: neosnippet-vim = buildVimPluginFrom2Nix { pname = "neosnippet.vim"; - version = "2021-08-22"; + version = "2021-09-15"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "3f6f5f8ad34d63ecb1060dbd6d7e2513238da528"; - sha256 = "14f0ksrn4grkpjfn766hxg1p19dryngxai33b2322dy0qaw244d2"; + rev = "5d07842911b485240719b781dfd7817b85c8eb96"; + sha256 = "0igrsgvaa36p42gp375w17dp9iz652lr91mmbznbbbb71d7y7l1y"; }; meta.homepage = "https://github.com/Shougo/neosnippet.vim/"; }; @@ -3624,12 +3636,12 @@ final: prev: neovim-ayu = buildVimPluginFrom2Nix { pname = "neovim-ayu"; - version = "2021-09-10"; + version = "2021-09-13"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "441d9db65ef7fb3ced17d0d88b2114b925302ec2"; - sha256 = "1wmvclkrkdmx5ng6hs4yyvlvhwbbv767shsn2yqg6p5hx67sa4d2"; + rev = "9841e30f2cff5b1929620565c9289eb561bae75a"; + sha256 = "0h25wgv5fvkycfsvw6jb82jl3fb94fvay1ii91yqiailpwa2ig76"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -3684,12 +3696,12 @@ final: prev: nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2021-09-11"; + version = "2021-09-15"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "aa7e97b7ff2ace7ed434b09bd33f3ad449d294e9"; - sha256 = "0ylfls91m65hhargnv1gqlqak61qv63zldh6ri91h7nidrxi7m1m"; + rev = "7eee457efae1bf9b96d7a266ac097639720a68fe"; + sha256 = "0lm58labs6jr1yyax839ks67ij30ijlknf0lnwijv2alf5rzqsc2"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; @@ -3756,12 +3768,12 @@ final: prev: nnn-vim = buildVimPluginFrom2Nix { pname = "nnn.vim"; - version = "2021-09-11"; + version = "2021-09-14"; src = fetchFromGitHub { owner = "mcchrish"; repo = "nnn.vim"; - rev = "07c3ccda0f4b579aa26f882bf771c6096e783e30"; - sha256 = "19f4m4djfs5szwc5v9zwc0ki8w59glxcv5mxps88gyns1c07qbvn"; + rev = "8833bbfa7b341896cbb9f3ed9a3b4687461e6aad"; + sha256 = "0ilkspfnlqflp0854gmha4v6zlnmslb83laab25a972svpqrg8pf"; }; meta.homepage = "https://github.com/mcchrish/nnn.vim/"; }; @@ -3816,12 +3828,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2021-09-10"; + version = "2021-09-17"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "da8bb757c630b96fd26030df56fd3a070fbf16a1"; - sha256 = "1n6gqikw4fsypchvb5hna1l7b54638qrhny0w84xamadmv4nj4kr"; + rev = "2c6a20434de6b1d09f76c20eea34e37e7432e06c"; + sha256 = "1z58wqvw8xslz9yzbrnmsjn0mdn9kpvrrv7hmydfc2a8vir55mlk"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -3864,12 +3876,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-09-11"; + version = "2021-09-18"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "c80b4ac3faec6fa60637f1ac785b311c26b06b1f"; - sha256 = "1w2m278g0hl3yc32x8rr4wxmhshsv53a6k59ihgjdk703n66cp7a"; + rev = "e465f581f9dce556a37366587ab1fabd2bb75fbf"; + sha256 = "0l4r3ba7rqiab47fqzbzbxvkxirpw7f9lsvif4agm1hdm5hqpgxi"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -3924,12 +3936,12 @@ final: prev: nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2021-09-13"; + version = "2021-09-18"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "e46ae3b62e11704ace7f1f14c1398bcfaf70b217"; - sha256 = "1nb0insrhsa0d2mwhk42b07wkfb28j7ylscj0hqr6n69jg5jc0vz"; + rev = "7c8876330df6e11cf91ca42ab6e52f37d81cc003"; + sha256 = "1z0kyffycwrl7izdmss9k9ldqqynhq1j2js4izbgpp1660iqsfja"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -3972,12 +3984,12 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-09-10"; + version = "2021-09-18"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "55971c4f5cf83177a38bdec9de7bea6711c94880"; - sha256 = "149zhqwfv8ciw1ik5c258gwx71y7i0517qzqzw9qq5p66bxsxsdx"; + rev = "5ecabb093c360786321bce1b618c324bde3dae70"; + sha256 = "1gxp0x6b4f08xbvl8w5s17v665b59r8nqky27vvz0pmwwnkjxwlp"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -4044,24 +4056,24 @@ final: prev: nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2021-09-10"; + version = "2021-09-18"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "6b06fdec591ff93ce47b0489ad524929a323ff59"; - sha256 = "10wfs6s76f2vx47q48ihx5y6fxgq0iq3ixifv2z0l1r6n9x5rkr6"; + rev = "d380c831f7d0cb65d3ec3fc468392f79a79f678a"; + sha256 = "10s6qzma4fk8yd9yvfq52lslr2kzj7skl91yz0b19vv7mg9pclb1"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2021-09-09"; + version = "2021-09-16"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "df0eb031cdc0688381f6c059ecd3545ecfffe89b"; - sha256 = "03mv11724jx5s811gisl6xc62qc31xknydsg67nz81mrya3559jb"; + rev = "fc8a5a3dfafd703a454a5a294ef8cc69d17b4ee6"; + sha256 = "1jn3ay74sf1z7mwm4sv4nz7lcq7qpyr2vx6h8j844nkb0azvhi5q"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -4092,48 +4104,48 @@ final: prev: nvim-lightbulb = buildVimPluginFrom2Nix { pname = "nvim-lightbulb"; - version = "2021-09-09"; + version = "2021-09-18"; src = fetchFromGitHub { owner = "kosayoda"; repo = "nvim-lightbulb"; - rev = "7411586f6b431a9c49a50fa962b6d6eae25aeb20"; - sha256 = "0maba6mzkpvnjdz8x0lifdqlbw55bd58ggavbhyxd8279887bph6"; + rev = "7180e64d7f8dcde0fd162d6ca55b73e2d9d9621b"; + sha256 = "1sv3xgjgbm3d9v1mwln9zfwllxjn37virzb9fmr6m1axc2vn5lj4"; }; meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/"; }; nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-09-12"; + version = "2021-09-16"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "974d15fa2809dff691d6a50a6759bf2c8bf39b4a"; - sha256 = "1nb5k8hsxm8anjmvavxniv4k0rgrgl068czczs9x8z6dsd2865il"; + rev = "aa0b9fd746d73a5ebbc72c732c645e96423d4504"; + sha256 = "01jgxf8bgra4sgh63zpb5xga9lyb3bvpqcdzjk3vp6gyks66fb6h"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; nvim-lsputils = buildVimPluginFrom2Nix { pname = "nvim-lsputils"; - version = "2021-09-07"; + version = "2021-09-17"; src = fetchFromGitHub { owner = "RishabhRD"; repo = "nvim-lsputils"; - rev = "0800dfa7307a64a3e195e62b775f20bb14f557af"; - sha256 = "0s9pp4azvvss8h38hx6r0b5a2nvsf72iqckmzhjnqnxs2w14b839"; + rev = "e09390daebda810e24c7feb060fde2ea51f99a6c"; + sha256 = "1638an4mx5z0w9w3sinr4s3h6y3wsmymqh59pb5s6rx9pimqw7b2"; }; meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/"; }; nvim-nonicons = buildVimPluginFrom2Nix { pname = "nvim-nonicons"; - version = "2021-07-03"; + version = "2021-09-14"; src = fetchFromGitHub { owner = "yamatsum"; repo = "nvim-nonicons"; - rev = "93450b02533516231e16ddc71f8ab1caf5005eaa"; - sha256 = "1mfvi3mzid0fwhgwrg8w4bjy0x6hz78jij60h0ivblvlfai6w0qr"; + rev = "c38ff086e0157b91d0951f83741170bdcf501a9d"; + sha256 = "1vjh82kjs4ki61r0lnidd8xpj6zvc0j4k76fbs7fy0ndzsbph6gw"; }; meta.homepage = "https://github.com/yamatsum/nvim-nonicons/"; }; @@ -4224,12 +4236,12 @@ final: prev: nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-07-18"; + version = "2021-09-17"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "27f5e99cdd1b4e7f6a5cc30016d990ebf81a561c"; - sha256 = "1msnzijwz4bj7hv8zkzp0x3y3dwwm3v5n63pmdx865d8ggb8dln6"; + rev = "47cfda2c6711077625c90902d7722238a8294982"; + sha256 = "14di7qm37m176r0qsbb0vmc3csya72rd5bszm6yk7lby8izfnqxa"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -4404,12 +4416,12 @@ final: prev: onedark-nvim = buildVimPluginFrom2Nix { pname = "onedark.nvim"; - version = "2021-08-30"; + version = "2021-09-16"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedark.nvim"; - rev = "7dc9734260e8af794ab69d6976a693e8c631d617"; - sha256 = "1hw9m6fasbpy67a4h2a0zw7231gpc4995aj6p4ljk4kw6672mnlw"; + rev = "8eceb078f8093c10b4a68d68203f4edf99db112a"; + sha256 = "1wnhgbi8hgrsnsq78iz7z1v7acfjrbhs08dykf0g4km03s4wa7qb"; }; meta.homepage = "https://github.com/olimorris/onedark.nvim/"; }; @@ -4464,24 +4476,24 @@ final: prev: orgmode-nvim = buildVimPluginFrom2Nix { pname = "orgmode.nvim"; - version = "2021-09-10"; + version = "2021-09-17"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "orgmode.nvim"; - rev = "e7fff702db42ed1d90bc9fa46c3b3a102024041f"; - sha256 = "0fxz0j7mjbs64x18kx3jsj3h8l124ndxf576k8vh9cwgz1g66bcj"; + rev = "09ecdefb8f7a6d13a2dde1efe271e406ffa407c6"; + sha256 = "1s1mg8hvlz4n3fjfdhakihwpqcnrs1p5hdnwin6fx3wifbb55gp3"; }; meta.homepage = "https://github.com/kristijanhusak/orgmode.nvim/"; }; packer-nvim = buildVimPluginFrom2Nix { pname = "packer.nvim"; - version = "2021-09-10"; + version = "2021-09-17"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "0dc37ac2e93895d0adc872b7ce69ad864a1fa45a"; - sha256 = "0a4mnfhrv4g5zqvjj3mv3bv5l7py9s4iqwy0f9xnh0f92c631q0b"; + rev = "b6b568cb790b10bd2a83c2af27af8393ddc4832d"; + sha256 = "07pyvf4gqwr2qjdq5yjf5zgxx9g173jv6nlx2qwa01pp0jxca0x1"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -4500,12 +4512,12 @@ final: prev: papercolor-theme = buildVimPluginFrom2Nix { pname = "papercolor-theme"; - version = "2020-12-04"; + version = "2021-09-17"; src = fetchFromGitHub { owner = "NLKNguyen"; repo = "papercolor-theme"; - rev = "845cfa94d95d404ff59e0bdc578b299279e1dc07"; - sha256 = "1r6p9ll3bfblz9sfzg0391zjswvmi8wwcc010w8mjsayjclmpwf8"; + rev = "643afbb7158b77cbd491fd9874a8758d0484255a"; + sha256 = "14dzmavrak99i2ahwwccxcqkkj9a1b7ch9mlmpg56y6y4v65ss1h"; }; meta.homepage = "https://github.com/NLKNguyen/papercolor-theme/"; }; @@ -4572,24 +4584,24 @@ final: prev: playground = buildVimPluginFrom2Nix { pname = "playground"; - version = "2021-07-27"; + version = "2021-09-15"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "deb887b3f49d66654d9faa9778e8949fe0d80bc3"; - sha256 = "10jlgsqkplisa1fd7i36yb46fdsa0cx069bpwp2yl4ki2jys953j"; + rev = "787a7a8d4444e58467d6b3d4b88a497e7d494643"; + sha256 = "1y4dwbs40qn942x0hd93yrk04yiphy73b45vcjrknmxq9szhvhk0"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary.nvim"; - version = "2021-09-12"; + version = "2021-09-16"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "6c80b83cd57ff3b029fae37b6145bcaeb4f69ee3"; - sha256 = "1jzyxnjs2zg02ib7h2vshhiq873n04bsg4g829v7d46bsw1337kw"; + rev = "ce8f7fa999b5c091d3e7badcc2340df62b94abf9"; + sha256 = "0v7yidq75yhcghg7bz86r3r59aj6ls7n9w5dhj1s4zskbmqvr94h"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -4837,24 +4849,24 @@ final: prev: Recover-vim = buildVimPluginFrom2Nix { pname = "Recover.vim"; - version = "2021-07-22"; + version = "2021-09-16"; src = fetchFromGitHub { owner = "chrisbra"; repo = "Recover.vim"; - rev = "48b6bc12b560d3013cd30c7959e235993374c24b"; - sha256 = "1ia2bv7yigcv944rkqy7jlrzi71m3k9kzj1hjhyrk0c2rg738r94"; + rev = "222c311cd9495ee2fce8945eb5b846832f14ccac"; + sha256 = "0xmzm88fyf7z4crc6gadnxyaagzskgpvfd54ddcchfw90jl47n6a"; }; meta.homepage = "https://github.com/chrisbra/Recover.vim/"; }; refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2021-09-10"; + version = "2021-09-16"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "dcb0c790f20c4970a9d0e9b1f1c0c5f71b613547"; - sha256 = "1adjalqqa27f27nlwkj8pybk6sp8l9fic9fikvlqgnfg7v1r8gkw"; + rev = "fbea6d958aa337194d4c4fbcac9a983d7b99815e"; + sha256 = "0wpdy8ng64c0nn6fakg4yc4z8wrkligwfg70sdlyfcg2qi1skj87"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -4957,12 +4969,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools.nvim"; - version = "2021-09-07"; + version = "2021-09-18"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "cd5105d76fc124634b53039c02ea253cc06bc9b9"; - sha256 = "1bhjzng02yfnlfr3kvh6lkl5vbpcmcd51kpgg7yjxmlzlga5k2k3"; + rev = "83bf0cabe040a6e02b59296622c838831a2b5c4f"; + sha256 = "0d2gl768rgd5l1wh9sq2z24rdmg5g27ib6fjfdcvxdlc2s5g333l"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -5113,12 +5125,12 @@ final: prev: sideways-vim = buildVimPluginFrom2Nix { pname = "sideways.vim"; - version = "2021-07-15"; + version = "2021-09-18"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "960afef88aef374d3525e1536bdd505727b42d67"; - sha256 = "08yj3p31d5gnd3qyv6dcpz87s3kwz1kgcb5h92w83wf64r6fzq61"; + rev = "56296bd82973139e6fc394689854b959e35c7cdd"; + sha256 = "1x93bnrywypqlywj5f70y5aaici5yqlpky456w15psfs84piyil7"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; @@ -5198,12 +5210,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2021-09-03"; + version = "2021-09-18"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "61b796d94e7b0110f1bdf321cc1d19a841697a42"; - sha256 = "1jan5ahp3rpr71qvjnd4jf4kxl7ijknaw3d3h0svlzhqd0pbq92p"; + rev = "7722b4b25bd6319ed059ecebeb7857471b8357c9"; + sha256 = "129lcawsg31xbbw0h63f92g0dy5idgdb4v8sd1rl5sp9qqvzfp5a"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -5319,12 +5331,12 @@ final: prev: sqlite-lua = buildVimPluginFrom2Nix { pname = "sqlite.lua"; - version = "2021-09-09"; + version = "2021-09-18"; src = fetchFromGitHub { owner = "tami5"; repo = "sqlite.lua"; - rev = "92ebda8bfd719668279ea82f84e5c2e13db5b658"; - sha256 = "0yxcak88lvmsxji6wai23wycwj0mmc95jwhh29i916jsk0xc20n5"; + rev = "edf642e2f2088a7a4bafa5a3850fd2b338566c2c"; + sha256 = "06l604b2jfj1735dpgprkd00f02mfwbl43bjj08nsnpbjsd541mn"; }; meta.homepage = "https://github.com/tami5/sqlite.lua/"; }; @@ -5439,12 +5451,12 @@ final: prev: symbols-outline-nvim = buildVimPluginFrom2Nix { pname = "symbols-outline.nvim"; - version = "2021-09-07"; + version = "2021-09-15"; src = fetchFromGitHub { owner = "simrat39"; repo = "symbols-outline.nvim"; - rev = "02ce2dab138a12a36c422ac58fabe9f5a35c664c"; - sha256 = "0z5a5q49csfgz0zdad11q75r8ck150ypj866199cl4j1mzb0xdgv"; + rev = "a8cab53271c97ff6d2a0c18756d7b4e71012d41c"; + sha256 = "1nkc0qj4birsydd278hkkjyvkyi69gva367h8fpnk0ss2i621rcc"; }; meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/"; }; @@ -5475,12 +5487,12 @@ final: prev: tabnine-vim = buildVimPluginFrom2Nix { pname = "tabnine-vim"; - version = "2021-09-12"; + version = "2021-09-14"; src = fetchFromGitHub { owner = "codota"; repo = "tabnine-vim"; - rev = "25b1afe68ab77097fc029389f0b46a1f2a606c57"; - sha256 = "1n3714zywqkw3a3wdyp3vnlgly2i51b8f4csyk7nd8giwg3c1428"; + rev = "b7fdf200d309f024bb035a65611422d22abe8710"; + sha256 = "1bvky5gsxhh9ldxk1l9fsaqmqvi7m248dgpwc4f6hh1xdyi9gvcf"; fetchSubmodules = true; }; meta.homepage = "https://github.com/codota/tabnine-vim/"; @@ -5572,12 +5584,12 @@ final: prev: taskwiki = buildVimPluginFrom2Nix { pname = "taskwiki"; - version = "2021-08-13"; + version = "2021-09-18"; src = fetchFromGitHub { owner = "tools-life"; repo = "taskwiki"; - rev = "832293f9f797ce56a35be1a9c28ed8ddc3113364"; - sha256 = "0568xnfhf7kd31nf0l10rxd5gnp90wph3623wrxrg3al5ix7jy6n"; + rev = "146d0891a62e6f9202d3d4795668626cb0f79494"; + sha256 = "1js1sq8arr9c8bzcyga64vblpq5qfy8dx16xvkyahakz2fk7rz40"; }; meta.homepage = "https://github.com/tools-life/taskwiki/"; }; @@ -5596,12 +5608,12 @@ final: prev: telescope-coc-nvim = buildVimPluginFrom2Nix { pname = "telescope-coc.nvim"; - version = "2021-08-26"; + version = "2021-09-14"; src = fetchFromGitHub { owner = "fannheyward"; repo = "telescope-coc.nvim"; - rev = "1037a9186b5889dc3145ce9494956006c8b20f17"; - sha256 = "0i2g168q57pfbm63idl054sdbflkgd8a754pvk0q9w7w1mzpql2q"; + rev = "7b8aa399b31998b7adf3da505a1952b1310d429c"; + sha256 = "1x1m13yk222lay6j4w76y9ydbvn52022gif34d452n2x7jk0cvbf"; }; meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/"; }; @@ -5632,12 +5644,12 @@ final: prev: telescope-fzf-native-nvim = buildVimPluginFrom2Nix { pname = "telescope-fzf-native.nvim"; - version = "2021-09-12"; + version = "2021-09-15"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-fzf-native.nvim"; - rev = "c507c54786e8ce389a6a6aca1f406522fa3d88d3"; - sha256 = "1v4gr1bgb1li8xdz78sjn4gms72pa615h5cy2af0zx0akhbk28ql"; + rev = "59e38e1661ffdd586cb7fc22ca0b5a05c7caf988"; + sha256 = "0ipdrzivz04921i1l81bc1xck5smi0c61isfj5g8zyl0mwa0dvrm"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/"; }; @@ -5705,12 +5717,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2021-09-12"; + version = "2021-09-17"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "1d17cc4abc493d20b4aba36569e8805c2382ea7b"; - sha256 = "1ycq09ip2dhlzf2bmjayb3zj9zhl1scznls2krzvmzfq46g93ira"; + rev = "2e7584f1cfdffb32bf26039a050cd2cf74ede4cd"; + sha256 = "16gdsx9yv5kwg8girmf51l6wb4v2kzg5snc1d2lhilizhs35qzmw"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -5850,12 +5862,12 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2021-08-24"; + version = "2021-09-18"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "ef7a882a818d1bf2598bc58ca0bc158d097d499d"; - sha256 = "0sdp260jnal7qmdqskxwk5cg1c846fz65xr66b18s0y0lm5z53c2"; + rev = "f725433e59422d0514ffa2582c534da965b0e44f"; + sha256 = "0pd7cjzyiygybalqh7a0x84jdir8lrd2q5x7q9yjjnwy936k89c1"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; @@ -6426,12 +6438,12 @@ final: prev: vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2021-07-22"; + version = "2021-09-13"; src = fetchFromGitHub { owner = "vim-autoformat"; repo = "vim-autoformat"; - rev = "80ba8b13a9699db20754623a0933095be65fc203"; - sha256 = "0crlkxc55lk37vy52yxwpp84bc3rd7a5am71xj9zl29a4xap5mdp"; + rev = "a65a58db77ad1b5889a68bedbea890c8161b7f8c"; + sha256 = "1frvyb3xpd4njh7ixg1ywj8x11ga343kqrmrgncb45scv12i7hx4"; }; meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/"; }; @@ -6498,12 +6510,12 @@ final: prev: vim-better-whitespace = buildVimPluginFrom2Nix { pname = "vim-better-whitespace"; - version = "2021-09-12"; + version = "2021-09-18"; src = fetchFromGitHub { owner = "ntpeters"; repo = "vim-better-whitespace"; - rev = "c63394d4da842b6fd547d072a4f22dbd3a0e3168"; - sha256 = "1kpq5bjp8wr8r1kfkq4dx3ypgv9jn3y91bfi2sszbn4i882j4ka7"; + rev = "c5afbe91d29c5e3be81d5125ddcdc276fd1f1322"; + sha256 = "10xzxavz010a8ildkfmikyi0ly6rqi5d6a2ndzr0frd9ingbk79r"; }; meta.homepage = "https://github.com/ntpeters/vim-better-whitespace/"; }; @@ -6630,12 +6642,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-09-11"; + version = "2021-09-15"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "33f194a70ec85dd493449f730030167c213b41e0"; - sha256 = "0bqvis6nkgfld8vs20k95vlpg28rigv9pjbqp58lqrjhk5h5lab0"; + rev = "c88f7fdd1c9a394a203785ed791261e7f9e159c7"; + sha256 = "1y7mzlns37a62zys87zd0zbzkwhb7216arjym9bf1n5gfllfbgcl"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -6774,12 +6786,12 @@ final: prev: vim-commentary = buildVimPluginFrom2Nix { pname = "vim-commentary"; - version = "2021-03-23"; + version = "2021-09-14"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-commentary"; - rev = "349340debb34f6302931f0eb7139b2c11dfdf427"; - sha256 = "01lpfcn2hmvxddcf97f4qx5vksxj1hwrxb0c8ri59z9lb9z2hgjd"; + rev = "627308e30639be3e2d5402808ce18690557e8292"; + sha256 = "0d056h2vh3bzc3mcijq90y5c7rvg01zzxyfc826h4f79y1fz8jnp"; }; meta.homepage = "https://github.com/tpope/vim-commentary/"; }; @@ -7422,12 +7434,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-09-10"; + version = "2021-09-17"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "e2927fb4676b499931a3c27a2dc8a8a8bc52ab55"; - sha256 = "0bqnq5ayws8dlg4zmp4ra0y9343dncg2v588311kxb3vc5m42vp2"; + rev = "a67e1f8189938c44f295fc97e6c9dd13b727b1e3"; + sha256 = "1r9z936myiasyvx8v838kfjgk1ymwdznsm7w629wchjm2zlxy4by"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -7578,12 +7590,12 @@ final: prev: vim-graphql = buildVimPluginFrom2Nix { pname = "vim-graphql"; - version = "2021-03-19"; + version = "2021-09-18"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-graphql"; - rev = "de5753e3fbd89f2939a43cfc2c6a2313ff129a21"; - sha256 = "15qy6adhgfwjh6jrw9902hl67qzhdi72kqgzdk5shgfyndzar25g"; + rev = "9a9fe186a73fce636398ee7f851466ef60c9fde5"; + sha256 = "0npqcpciq1pwm1ac6ldlyvrg7mhjg4ybrpmmld9b4nysiws97cnq"; }; meta.homepage = "https://github.com/jparise/vim-graphql/"; }; @@ -9501,12 +9513,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2021-09-11"; + version = "2021-09-17"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "89ff074400256ce7a58bb88ff0c5cc27e6fbe222"; - sha256 = "0gzxvlq3mbzx4iiiikibzxpfllzkkzlx0p2fgj7j244z2mjv7h8y"; + rev = "1648b3acf193682668f1ee8e566b03cfed2ac797"; + sha256 = "17db1v36mbhys1zhq9rv7g3gi3gdrl2b9x0gx4g5ffqh7nssw6wf"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -9742,12 +9754,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2021-08-13"; + version = "2021-09-15"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "b980e646e5f91d6e65659737b584e484ef918984"; - sha256 = "073lpxmrs41zm0mqxf6pmf88xvkq1fngryl8rp1lcgkrwbl7isg4"; + rev = "bf200532aa8e2097af0f26e73b4f00c0cadb3118"; + sha256 = "1s6qqpj1iyrm2cxig3vhxmpb4mcg0d82j1ai7iz4r2rq008m2aqv"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -9958,12 +9970,12 @@ final: prev: vim-twiggy = buildVimPluginFrom2Nix { pname = "vim-twiggy"; - version = "2021-08-25"; + version = "2021-09-16"; src = fetchFromGitHub { owner = "sodapopcan"; repo = "vim-twiggy"; - rev = "3561237047481c212b55942d9507c937841d3bc8"; - sha256 = "1099bnpagw6sv5j2rigsp2b9qc58dcyi4520hb0xz48zdvynkaac"; + rev = "16287d2261be67872870899744fd04a6802a9b87"; + sha256 = "0cfqvq2was7jdhcixnlrzh9qdm2n2sv17l7a2sys8slzl04v2c61"; }; meta.homepage = "https://github.com/sodapopcan/vim-twiggy/"; }; @@ -9994,12 +10006,12 @@ final: prev: vim-unimpaired = buildVimPluginFrom2Nix { pname = "vim-unimpaired"; - version = "2021-09-11"; + version = "2021-09-17"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-unimpaired"; - rev = "58e4434f5ecadd4f28a521bcabc690e39186a98f"; - sha256 = "10ylvziwr61djc2jp20a8k2pl8qqn9rff5n4ncc8jcib58lq9r62"; + rev = "c51ed445182334aabd392f295708ebe8677bd8e8"; + sha256 = "0j5q11czlkhm4x78z6idbj6am29nfcg3yzli2l5607s60lvxnc0j"; }; meta.homepage = "https://github.com/tpope/vim-unimpaired/"; }; @@ -10066,24 +10078,24 @@ final: prev: vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2021-08-14"; + version = "2021-09-14"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "87d144b7451deb3ab55f1a3e3c5124cfab2b02fa"; - sha256 = "17gw992xvxsa6wyirah17xbsdi2gl4lif8ibvbs7dwagnkv01vyb"; + rev = "9ac8044206d32bea4dba34e77b6a3b7b87f65df6"; + sha256 = "0m488cfpl7yszyhgz12binrmxysa05wxypdgy83cdxb0npka20ff"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; vim-vsnip-integ = buildVimPluginFrom2Nix { pname = "vim-vsnip-integ"; - version = "2021-09-09"; + version = "2021-09-13"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip-integ"; - rev = "1b7259510486e825e61c461362578aa15afe3507"; - sha256 = "0ig1dgyyqdzcrrgsbjaa4308ar04xlcgpygc0fbg27xj7ppiy2f5"; + rev = "a570685fc5f691e2323cb2e3c267355b8f72527f"; + sha256 = "0ib7zmvwp46lacay0xq30sxx8jf2d5afzsrsyjkrzkzlvx8c40qh"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/"; }; @@ -10390,12 +10402,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-09-09"; + version = "2021-09-18"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "2bb8561eb622b6316d2fc7f3fa56d8199da6cc3f"; - sha256 = "0a1prybnmfr5iqmdbhrvlcw66fvl426mgv5in3wf4kfxqy2pg9dr"; + rev = "66c5a3d08ca5f481851d360d4b39860b00fc8e00"; + sha256 = "1lrvzsy3grv2klm47diklhdx2i94h8hdxhzpcxr2ymnjl91c9isq"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -10403,12 +10415,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-09-12"; + version = "2021-09-16"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "4989653b88dd94cf23395894123f3d37138f9f52"; - sha256 = "0abgkw1sgbnm12hlsg23i01laza3yamxgssxm5sb22gn1pmq0l51"; + rev = "43ba45fe94e6b162c36f06ee80ecd8b225d7c703"; + sha256 = "12c1drvpiwg1jffgar057p9vk7jkcn8ijfxl5hhl9gp2jsy29xzv"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -10535,12 +10547,12 @@ final: prev: wilder-nvim = buildVimPluginFrom2Nix { pname = "wilder.nvim"; - version = "2021-09-11"; + version = "2021-09-14"; src = fetchFromGitHub { owner = "gelguy"; repo = "wilder.nvim"; - rev = "558bf9380df27d4be2e690f5da1958d02052987a"; - sha256 = "1cy30b56rjbhvmk44y10zgg8x1f9ghiz3jxm7cmwjisv3bv8n73j"; + rev = "15ff3a0e6fa1882fb4a2391d880c6465652718f5"; + sha256 = "15rb1g0hyp942s9hgpfzf27yz7w5aaym2phrvr51aybnjz6lm9ff"; }; meta.homepage = "https://github.com/gelguy/wilder.nvim/"; }; @@ -10656,12 +10668,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2021-08-05"; + version = "2021-09-13"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "518275b599ab6dd7844c24022f6aec505fb4b07c"; - sha256 = "0wkd83xlzfbk3h19gn3jhp6lpkb1wnxrhcdnczhdwhy81lizfq4w"; + rev = "bb9ebb5b25be3534e33a585c77a14c77f15e8bc8"; + sha256 = "1pqa4j7i0qv5k5mxwdwmqrxb2jhqllv1s9rdyvji4qqpdfs6q343"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -10693,12 +10705,12 @@ final: prev: zenburn = buildVimPluginFrom2Nix { pname = "zenburn"; - version = "2020-09-08"; + version = "2021-09-15"; src = fetchFromGitHub { owner = "jnurmine"; repo = "zenburn"; - rev = "4ec3795d81fc83b6f43389a6291bfa99394473a8"; - sha256 = "148s2szjx61rp93nxa95552m87mn4n4ga00dlbvvv7sm607mvxd8"; + rev = "de2fa06a93fe1494638ec7b2fdd565898be25de6"; + sha256 = "0pmmc16gkypb3y87d5wg5g8c3cxhj01ah9khl82hfw564yw4ipqs"; }; meta.homepage = "https://github.com/jnurmine/zenburn/"; }; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 77cd302d13ab..86cfdfb03243 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -686,7 +686,7 @@ self: super: { libiconv ]; - cargoSha256 = "1hmbgqd22fy68n05vdb93wsdvws91m4i6nm1kq6bwwbhzhkvd7js"; + cargoSha256 = "083v2bnnjyf9j923p6bidgbvmwnh8sfv5ai70qfffzrysi5gvzdf"; }; in '' diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index d96fd7d72ffa..199bb6c6f3cb 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -40,6 +40,7 @@ b3nj5m1n/kommentary@main bakpakin/fennel.vim bazelbuild/vim-bazel bbchung/clighter8 +BeneCollyridam/futhark-vim benizi/vim-automkdir bhurlow/vim-parinfer bitc/vim-hdevtools diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 3bf5dcd9a816..10295ab6b2b0 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -198,8 +198,8 @@ let ''; linkVimlPlugin = plugin: packageName: dir: '' - mkdir -p $out/pack/${packageName}/${dir}/${plugin.pname} - ln -sf ${plugin}/${rtpPath}/* $out/pack/${packageName}/${dir}/${plugin.pname} + mkdir -p $out/pack/${packageName}/${dir}/${lib.getName plugin} + ln -sf ${plugin}/${rtpPath}/* $out/pack/${packageName}/${dir}/${lib.getName plugin} ''; link = pluginPath: if hasLuaModule pluginPath diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 0a8174689577..8e78a28f79d2 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -823,8 +823,8 @@ let mktplcRef = { name = "haskell"; publisher = "haskell"; - version = "1.1.0"; - sha256 = "1wg06lyk0qn9jd6gi007sg7v0z9z8gwq7x2449d4ihs9n3w5l0gb"; + version = "1.6.1"; + sha256 = "1l6nrbqkq1p62dkmzs4sy0rxbid3qa1104s3fd9fzkmc1sldzgsn"; }; meta = with lib; { license = licenses.mit; @@ -972,8 +972,8 @@ let mktplcRef = { name = "language-haskell"; publisher = "justusadam"; - version = "3.2.1"; - sha256 = "0lxp8xz17ciy93nj4lzxqvz71vw1zdyamrnh2n792yair8890rr6"; + version = "3.4.0"; + sha256 = "0ab7m5jzxakjxaiwmg0jcck53vnn183589bbxh3iiylkpicrv67y"; }; meta = { license = lib.licenses.bsd3; diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 221f38faa879..929981df4706 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , makeWrapper, cmake, llvmPackages, kernel , flex, bison, elfutils, python, luajit, netperf, iperf, libelf , systemtap, bash, libbpf @@ -29,6 +29,12 @@ python.pkgs.buildPythonApplication rec { # This is needed until we fix # https://github.com/NixOS/nixpkgs/issues/40427 ./fix-deadlock-detector-import.patch + # Add definition for BTF_KIND_FLOAT, added in Linux 5.14 + # Can be removed once linuxHeaders (used here via glibc) are bumped to 5.14+. + (fetchpatch { + url = "https://salsa.debian.org/debian/bpfcc/-/raw/71136ef5b66a2ecefd635a7aca2e0e835ff09095/debian/patches/0004-compat-defs.patch"; + sha256 = "05s1zxihwkvbl2r2mqc5dj7fpcipqyvwr11v8b9hqbwjkm3qpz40"; + }) ]; propagatedBuildInputs = [ python.pkgs.netaddr ]; diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index 1a9b7e34f5a2..47fce3df5332 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -20,6 +20,9 @@ stdenv.mkDerivation rec { # By default fbuilder hardcodes the firejail binary to the install path. # On NixOS the firejail binary is a setuid wrapper available in $PATH. ./fbuilder-call-firejail-on-path.patch + # Disable symlink check on /etc/hosts, see + # https://github.com/netblue30/firejail/issues/2758#issuecomment-805174951 + ./remove-link-check.patch ]; prePatch = '' diff --git a/pkgs/os-specific/linux/firejail/remove-link-check.patch b/pkgs/os-specific/linux/firejail/remove-link-check.patch new file mode 100644 index 000000000000..477df57a2411 --- /dev/null +++ b/pkgs/os-specific/linux/firejail/remove-link-check.patch @@ -0,0 +1,48 @@ +From ccc726f8ec877d8cda720daa2498e43629b6dd48 Mon Sep 17 00:00:00 2001 +From: Jonas Heinrich +Date: Sun, 19 Sep 2021 11:48:06 +0200 +Subject: [PATCH 1/2] remove hosts file link check + +--- + src/firejail/fs_hostname.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/src/firejail/fs_hostname.c b/src/firejail/fs_hostname.c +index 42255070c4..97ce70f9c1 100644 +--- a/src/firejail/fs_hostname.c ++++ b/src/firejail/fs_hostname.c +@@ -132,10 +132,6 @@ char *fs_check_hosts_file(const char *fname) { + invalid_filename(fname); + char *rv = expand_home(fname, cfg.homedir); + +- // no a link +- if (is_link(rv)) +- goto errexit; +- + // the user has read access to the file + if (access(rv, R_OK)) + goto errexit; + +From c2c51e7ca56075e7388b4f50922b148615d1b125 Mon Sep 17 00:00:00 2001 +From: Jonas Heinrich +Date: Sun, 19 Sep 2021 11:49:08 +0200 +Subject: [PATCH 2/2] remove hosts file link check + +--- + src/firejail/fs_hostname.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/firejail/fs_hostname.c b/src/firejail/fs_hostname.c +index 97ce70f9c1..b228707131 100644 +--- a/src/firejail/fs_hostname.c ++++ b/src/firejail/fs_hostname.c +@@ -154,9 +154,6 @@ void fs_mount_hosts_file(void) { + struct stat s; + if (stat("/etc/hosts", &s) == -1) + goto errexit; +- // not a link +- if (is_link("/etc/hosts")) +- goto errexit; + // owned by root + if (s.st_uid != 0) + goto errexit; diff --git a/pkgs/os-specific/linux/procdump/default.nix b/pkgs/os-specific/linux/procdump/default.nix index 75ca2cb165e0..0b40a4dd0365 100644 --- a/pkgs/os-specific/linux/procdump/default.nix +++ b/pkgs/os-specific/linux/procdump/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "procdump"; - version = "1.1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "Microsoft"; repo = "ProcDump-for-Linux"; rev = version; - sha256 = "0h5fhk39d10kjbinzw1yp6nr8w8l300mn9qxrkpivdkyfn6bpq2f"; + sha256 = "sha256-gVswAezHl7E2cBTJEQhPFXhHkzhWVHSpPF8m0s8+ekc="; }; nativeBuildInputs = [ zlib ]; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index e4c6faa94749..c9f0438c86f5 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -196,6 +196,7 @@ let license = licenses.cddl; platforms = platforms.linux; maintainers = with maintainers; [ hmenke jcumming jonringer wizeman fpletz globin mic92 ]; + mainProgram = "zfs"; # If your Linux kernel version is not yet supported by zfs, try zfsUnstable. # On NixOS set the option boot.zfs.enableUnstable. broken = buildKernel && (kernelCompatible != null) && !kernelCompatible; @@ -222,10 +223,13 @@ in { latestCompatibleLinuxPackages = linuxPackages_5_14; # this package should point to a version / git revision compatible with the latest kernel release + # IMPORTANT: Always use a tagged release candidate or commits from the + # zfs--staging branch, because this is tested by the OpenZFS + # maintainers. version = "2.1.1"; # rev = "0000000000000000000000000000000000000000"; - sha256 = "sha256-wVbjpVrPQmhJmMqdGUf0IwlCIoOsT7Zfj5lxSKcOsgg="; + sha256 = "sha256-UUuJa5w/GsEvsgH/BnXFsP/dsOt9wwmPqKzDxLPrhiY="; isUnstable = true; }; diff --git a/pkgs/servers/adguardhome/bins.nix b/pkgs/servers/adguardhome/bins.nix new file mode 100644 index 000000000000..2489bd7a79d4 --- /dev/null +++ b/pkgs/servers/adguardhome/bins.nix @@ -0,0 +1,19 @@ +{ fetchurl, fetchzip }: +{ +"x86_64-darwin" = fetchzip { + sha256 = "sha256-ec1l4KxKJH4Iwg9hW+xlxLADGLN1vParYaWIw7nCfKA="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.106.3/AdGuardHome_darwin_amd64.zip"; +}; +"i686-linux" = fetchurl { + sha256 = "sha256-9aGyC76WyzwHlAkR72kuNcd/68XdWWC3gfT92IuW2LY="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.106.3/AdGuardHome_linux_386.tar.gz"; +}; +"x86_64-linux" = fetchurl { + sha256 = "sha256-qJMymTxmoPlIhuJD6zFBWWwzz+CFx+9+MOrRiFtA4IY="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.106.3/AdGuardHome_linux_amd64.tar.gz"; +}; +"aarch64-linux" = fetchurl { + sha256 = "sha256-Z5hekNxeemqWsMu7n3UTmYCzdKp5Xsp9ku0G2LOqC80="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.106.3/AdGuardHome_linux_arm64.tar.gz"; +}; +} diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix index 009b64666002..34f64edc6ba3 100644 --- a/pkgs/servers/adguardhome/default.nix +++ b/pkgs/servers/adguardhome/default.nix @@ -1,23 +1,24 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, fetchzip, system ? stdenv.targetPlatform }: stdenv.mkDerivation rec { pname = "adguardhome"; version = "0.106.3"; - src = fetchurl { - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v${version}/AdGuardHome_linux_amd64.tar.gz"; - sha256 = "11p081dqilga61zfziw5w37k6v2r84qynhz2hr4gk8367jck54x8"; - }; + src = (import ./bins.nix { inherit fetchurl fetchzip; }).${system}; installPhase = '' install -m755 -D ./AdGuardHome $out/bin/adguardhome ''; + passthru = { + updateScript = ./update.sh; + }; + meta = with lib; { homepage = "https://github.com/AdguardTeam/AdGuardHome"; description = "Network-wide ads & trackers blocking DNS server"; - platforms = platforms.linux; - maintainers = with maintainers; [ numkem ]; - license = licenses.gpl3; + platforms = [ "x86_64-linux" "aarch64-linux" "i686-linux" "x86_64-darwin" ]; + maintainers = with maintainers; [ numkem iagoq ]; + license = licenses.gpl3Only; }; } diff --git a/pkgs/servers/adguardhome/update.sh b/pkgs/servers/adguardhome/update.sh new file mode 100755 index 000000000000..69f1d8e97fde --- /dev/null +++ b/pkgs/servers/adguardhome/update.sh @@ -0,0 +1,38 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p curl gnugrep nix-prefetch jq + +# This file is based on /pkgs/servers/gotify/update.sh + +set -euo pipefail + +dirname="$(dirname "$0")" +bins="$dirname/bins.nix" + +latest_release=$(curl --silent https://api.github.com/repos/AdguardTeam/AdGuardHome/releases/latest) +version=$(jq -r '.tag_name' <<<"$latest_release") + +echo "got version $version" + +declare -A systems +systems[linux_386]=i686-linux +systems[linux_amd64]=x86_64-linux +systems[linux_arm64]=aarch64-linux +systems[darwin_amd64]=x86_64-darwin + +echo '{ fetchurl, fetchzip }:' > "$bins" +echo '{' >> "$bins" + +for asset in $(curl --silent https://api.github.com/repos/AdguardTeam/AdGuardHome/releases/latest | jq -c '.assets[]') ; do + url="$(jq -r '.browser_download_url' <<< "$asset")" + adg_system="$(grep -Eo '(darwin|linux)_(386|amd64|arm64)' <<< "$url" || true)" + if [ -n "$adg_system" ]; then + fetch="$(grep '\.zip$' <<< "$url" > /dev/null && echo fetchzip || echo fetchurl)" + nix_system=${systems[$adg_system]} + nix_src="$(nix-prefetch -s --output nix $fetch --url $url)" + echo "\"$nix_system\" = $fetch $nix_src;" >> $bins + fi +done + +echo '}' >> "$bins" + +sed -i -r -e "s/version\s*?=\s*?.*?;/version = \"${version#v}\";/" "$dirname/default.nix" diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index d1d70bff7ab4..287f19e52bbc 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.9.6"; + version = "2021.9.7"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 866bbe25a866..70adadedc245 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -145,7 +145,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.9.6"; + hassVersion = "2021.9.7"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -162,7 +162,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1ac56gdnhzkf19h29g0f54camw6v1cg5wx0crhm23r45qlfsjacs"; + sha256 = "1vcdnxh671iqhlbf6811j537by2i03fhryp9r9x77477y2y0xd6k"; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -175,7 +175,6 @@ in with py.pkgs; buildPythonApplication rec { --replace "awesomeversion==21.4.0" "awesomeversion" \ --replace "bcrypt==3.1.7" "bcrypt" \ --replace "cryptography==3.3.2" "cryptography" \ - --replace "httpx==0.18.2" "httpx>=0.18.2" \ --replace "pip>=8.0.3,<20.3" "pip" \ --replace "requests==2.25.1" "requests>=2.25.1" \ --replace "ruamel.yaml==0.15.100" "ruamel.yaml" @@ -790,6 +789,8 @@ in with py.pkgs; buildPythonApplication rec { # wemo/test_sensor.py: KeyError for various power attributes "--deselect tests/components/wemo/test_sensor.py::TestInsightTodayEnergy::test_state_unavailable" "--deselect tests/components/wemo/test_sensor.py::TestInsightCurrentPower::test_state_unavailable" + # tado/test_climate.py: Tries to connect to my.tado.com + "--deselect tests/components/tado/test_climate.py::test_air_con[" # helpers/test_system_info.py: AssertionError: assert 'Unknown' == 'Home Assistant Container' "--deselect tests/helpers/test_system_info.py::test_container_installationtype" # tests are located in tests/ diff --git a/pkgs/servers/maddy/default.nix b/pkgs/servers/maddy/default.nix index 88631112fa1c..658d5e34fb33 100644 --- a/pkgs/servers/maddy/default.nix +++ b/pkgs/servers/maddy/default.nix @@ -31,8 +31,8 @@ buildGoModule rec { meta = with lib; { description = "Composable all-in-one mail server"; - homepage = "https://foxcpp.dev/maddy"; + homepage = "https://maddy.email"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ lxea ]; + maintainers = with maintainers; []; }; } diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix index 71c8c4a45dc6..2ceb4afc0cd0 100644 --- a/pkgs/servers/nosql/apache-jena/binary.nix +++ b/pkgs/servers/nosql/apache-jena/binary.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="apache-jena"; - version = "3.7.0"; + version = "4.2.0"; name="${baseName}-${version}"; url="http://archive.apache.org/dist/jena/binaries/apache-jena-${version}.tar.gz"; - sha256 = "12w125hlhcib23cckk77cx7p9rzs57dbmmn90f7v8107d437j4mq"; + sha256 = "1yiqlsp1g2fladal8mj164b9s0qsl5csllg54p7x7w63wf7gixnq"; }; buildInputs = [ makeWrapper diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix index 7084130eaef8..9be009f3b1f1 100644 --- a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix +++ b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="apache-jena-fuseki"; - version = "3.13.1"; + version = "4.2.0"; name="${baseName}-${version}"; url="http://archive.apache.org/dist/jena/binaries/apache-jena-fuseki-${version}.tar.gz"; - sha256 = "018b07icvjhd44c046rxfjiczcs63cic77cymgg4w8pd3na06c7y"; + sha256 = "1x3va4yqmxh55lhr6ms85ks9v0lqkl3y41h0bpjdycp8j96lsy3h"; }; buildInputs = [ makeWrapper @@ -20,7 +20,8 @@ stdenv.mkDerivation { }; installPhase = '' cp -r . "$out" - ln -s "$out"/{fuseki-server,fuseki} "$out/bin" + chmod +x $out/fuseki + ln -s "$out"/{fuseki-backup,fuseki-server,fuseki} "$out/bin" for i in "$out"/bin/*; do wrapProgram "$i" \ --prefix "PATH" : "${java}/bin/" \ diff --git a/pkgs/servers/sql/materialize/default.nix b/pkgs/servers/sql/materialize/default.nix index 184c3cc1ebc8..0aba7f758c66 100644 --- a/pkgs/servers/sql/materialize/default.nix +++ b/pkgs/servers/sql/materialize/default.nix @@ -40,22 +40,25 @@ let in rustPlatform.buildRustPackage rec { pname = "materialize"; - version = "0.8.3"; - rev = "3e47d280945f0ddbdc263fc643f067649f66eda1"; + version = "0.9.4"; + rev = "29d003cae5e9d46f8b11b2102ff0b9abf6608c2f"; src = fetchFromGitHub { owner = "MaterializeInc"; repo = pname; rev = "v${version}"; - sha256 = "15635hcw04nms133k9l5582xbk7frc86nka91yaafl63q6pwbdvg"; + sha256 = "021n05csyvza9ifq09qaxypgmlbp3a7xn6r1m4jn8d4rnz38wag6"; }; - cargoSha256 = "1fxqjhjs4bqq6nzax7xrhwjpv57dk90iw9fl8ilp41wzg7yvyhcm"; + cargoSha256 = "12fysxzmqnx7y7yg6fjcv1952s77d46pwi32vnsv62icgqfpw0j4"; nativeBuildInputs = [ cmake perl pkg-config ] # Provides the mig command used by the krb5-src build script ++ lib.optional stdenv.isDarwin bootstrap_cmds; + # Needed to get openssl-sys to use pkg-config. + OPENSSL_NO_VENDOR = 1; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv DiskArbitration Foundation ]; diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index e4007cb6c2d0..f392e56a2486 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tailscale"; - version = "1.14.0"; + version = "1.14.3"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "sha256-FlPb7PtX/q34I7DZBLB9RIlg9tjKqktwn7N8Pv02hYc="; + sha256 = "sha256-IXnkKKyjnktGjz3Osi2qYnrcDHC3Xfcr1oku/P0s0xk="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 0b7be59231ca..4206136ec6d6 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -11,12 +11,12 @@ let }; }); botocore = super.botocore.overridePythonAttrs (oldAttrs: rec { - version = "2.0.0dev138"; + version = "2.0.0dev147"; src = fetchFromGitHub { owner = "boto"; repo = "botocore"; - rev = "5f1971d2d9d2cf7090a8b71650ab40712319bca3"; - sha256 = "sha256-onptN++MDJrit3sIEXCX9oRJ0qQ5xzmI6J2iABiK7RA"; + rev = "afa015418df6b3aeef0f5645e8704de64adea3d7"; + sha256 = "sha256-ypqDhCQXPqG8JCsLWt1V/4s95Hm+lClz+eOA2GnIhYg="; }; propagatedBuildInputs = super.botocore.propagatedBuildInputs ++ [py.pkgs.awscrt]; }); @@ -33,13 +33,13 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.2.30"; # N.B: if you change this, change botocore to a matching version too + version = "2.2.39"; # N.B: if you change this, change botocore to a matching version too src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - sha256 = "sha256-OPxo5RjdDCTPntiJInUtgcU43Nn5JEUbwRJXeBl/yYQ"; + sha256 = "sha256-3GYj6+08J05Lu17jjydmzlypI5TUuV+5HA398oExkiU="; }; patches = [ @@ -55,6 +55,7 @@ with py.pkgs; buildPythonApplication rec { --replace "cryptography>=3.3.2,<3.4.0" "cryptography" \ --replace "docutils>=0.10,<0.16" "docutils" \ --replace "ruamel.yaml>=0.15.0,<0.16.0" "ruamel.yaml" \ + --replace "s3transfer>=0.4.2,<0.5.0" "s3transfer" \ --replace "wcwidth<0.2.0" "wcwidth" \ --replace "distro>=1.5.0,<1.6.0" "distro" ''; diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index d4a45dd8d194..d15a03bc83ee 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -16,13 +16,13 @@ python3.pkgs.buildPythonApplication rec { pname = "tts"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "coqui-ai"; repo = "TTS"; rev = "v${version}"; - sha256 = "sha256-LiH056h7eIaikBr6sm5A4T/lF7nVroxaZSYzrES7+zk="; + sha256 = "sha256-/CeetLm3jgS5Q69zTVkLm+Wh4nD7D4c6j9MTujMc3fU="; }; postPatch = '' diff --git a/pkgs/tools/inputmethods/touchegg/default.nix b/pkgs/tools/inputmethods/touchegg/default.nix index d1df32199545..69d05ceaed1e 100644 --- a/pkgs/tools/inputmethods/touchegg/default.nix +++ b/pkgs/tools/inputmethods/touchegg/default.nix @@ -62,6 +62,6 @@ stdenv.mkDerivation rec { description = "Linux multi-touch gesture recognizer"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/tools/misc/cicero-tui/default.nix b/pkgs/tools/misc/cicero-tui/default.nix index 249e814fd303..a3f5c7b076c2 100644 --- a/pkgs/tools/misc/cicero-tui/default.nix +++ b/pkgs/tools/misc/cicero-tui/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "cicero-tui"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "eyeplum"; repo = "cicero-tui"; rev = "v${version}"; - sha256 = "sha256-j/AIuNE5WBNdUeXuKvvc4NqsVVk252tm4KR3w0e6bT8="; + sha256 = "sha256-5/yH5ZK/JgMsRUcJ0qQEShEqxrtKJa+P6pcHAn5Jx0c="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { freetype ]; - cargoSha256 = "sha256-yup6hluGF2x+0XDwK+JETyNu4TFNPmqD4Y0Wthxrbcc="; + cargoSha256 = "sha256-AraisWGTPEj+tHcLonEwfevBu+mMTPkq3O9zNYgI9X8="; meta = with lib; { description = "Unicode tool with a terminal user interface"; diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index 8182c9a09ede..719bb90b43dd 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.14.6"; + version = "2.14.7"; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "sha256-8hEJJl1FkRU+2lbzNQWep2NavRTFtYT1Qpe0FI6p13A="; + sha256 = "sha256-HkNWFWdyjpnJJANfnRDhmnhYbZIhrM9aIVN/Ov3/hK0="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-dkr5yJLi0rPclfz8NuR2ewDkqhrthZ+yu09aA61ND/E="; + cargoSha256 = "sha256-nfQGAjekd6cegvKPDxyOfcIhgagH61MT+2YVB2WppvQ="; doCheck = false; diff --git a/pkgs/tools/misc/hashit/default.nix b/pkgs/tools/misc/hashit/default.nix index edda48bdc924..e26a0abbde3a 100644 --- a/pkgs/tools/misc/hashit/default.nix +++ b/pkgs/tools/misc/hashit/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { description = "A simple app for checking usual checksums - Designed for elementary OS"; homepage = "https://github.com/artemanufrij/hashit"; license = licenses.gpl2Plus; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/mmv-go/default.nix b/pkgs/tools/misc/mmv-go/default.nix index 640b0d611e47..efca64bdc44a 100644 --- a/pkgs/tools/misc/mmv-go/default.nix +++ b/pkgs/tools/misc/mmv-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mmv-go"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "itchyny"; repo = "mmv"; rev = "v${version}"; - sha256 = "12k5zzyr0lhjadc9kza04v0zgb20v7m4syaqwc7qvn3kfvv1mz8s"; + sha256 = "sha256-n7yW+0cabJGDgppt6Qcj7ID3sD85094NDOPk2o9xDwY="; }; - vendorSha256 = "0xnrai15ww9lfk02bc9p5ssycwnqkyjj5ch1srh7yvnbw3fakx68"; + vendorSha256 = "sha256-3Xk8S2Em28r5R7894Ubo2OOlGhrKplV/gY4ftCjPvMo="; ldflags = [ "-s" "-w" "-X main.revision=${src.rev}" ]; diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix index 971f924faaac..f0f20d4b3a7b 100644 --- a/pkgs/tools/misc/phoronix-test-suite/default.nix +++ b/pkgs/tools/misc/phoronix-test-suite/default.nix @@ -13,10 +13,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which gnused makeWrapper ]; installPhase = '' + runHook preInstall + ./install-sh $out wrapProgram $out/bin/phoronix-test-suite \ --set PHP_BIN ${php}/bin/php \ --prefix PATH : ${lib.makeBinPath [ gnumake gcc ]} + + runHook postInstall ''; passthru.tests = { diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 6c559ada9632..cf76462eb612 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -55,13 +55,15 @@ rustPlatform.buildRustPackage rec { doCheck = !stdenv.isDarwin; # healthcheck_grafana_cloud is trying to make a network access # test_stream_errors is flaky on linux-aarch64 + # tcp_with_tls_intermediate_ca is flaky on linux-x86_64 checkPhase = '' TZDIR=${tzdata}/share/zoneinfo cargo test \ --no-default-features \ --features ${lib.concatStringsSep "," features} \ -- --test-threads 1 \ --skip=sinks::loki::tests::healthcheck_grafana_cloud \ - --skip=kubernetes::api_watcher::tests::test_stream_errors + --skip=kubernetes::api_watcher::tests::test_stream_errors \ + --skip=sources::socket::test::tcp_with_tls_intermediate_ca ''; # recent overhauls of DNS support in 0.9 mean that we try to resolve diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix index 0e76cb94346b..ca06afe7bdbf 100644 --- a/pkgs/tools/networking/atftp/default.nix +++ b/pkgs/tools/networking/atftp/default.nix @@ -1,21 +1,27 @@ -{ lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper, gcc }: +{ lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper, gcc, ps }: stdenv.mkDerivation rec { pname = "atftp"; - version = "0.7.4"; + version = "0.7.5"; src = fetchurl { url = "mirror://sourceforge/atftp/${pname}-${version}.tar.gz"; - sha256 = "sha256-08nNDZcd/Hhtel9AVcNdTmaq/IECrANHPvIlvfftsmo="; + sha256 = "12h3sgkd25j4nfagil2jqyj1n8yxvaawj0cf01742642n57pmj4k"; }; + # fix test script + postPatch = '' + patchShebangs . + ''; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ readline tcp_wrappers pcre gcc ]; # Expects pre-GCC5 inline semantics NIX_CFLAGS_COMPILE = "-std=gnu89"; - doCheck = false; # fails + doCheck = true; + checkInputs = [ ps ]; meta = { description = "Advanced tftp tools"; diff --git a/pkgs/tools/networking/innernet/default.nix b/pkgs/tools/networking/innernet/default.nix index a00164670e1a..cf63342fbb65 100644 --- a/pkgs/tools/networking/innernet/default.nix +++ b/pkgs/tools/networking/innernet/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "innernet"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "tonarino"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ss3BtwRnRAUPfM6yjl14rQrYZ7PHAT3s/MEHnbV7IEU="; + sha256 = "sha256-9oL91jacfUADaPvdTTvvXhpwzr9OnNnVLwy1okORss4="; }; - cargoSha256 = "sha256-hhsRLm8wsmvnu3wRK9s4Fjdy0bKLboAKw6qS2XQ1nsI="; + cargoSha256 = "sha256-jHWt7Jqv4B7u6Mvo3q69Omcn8kdnXGJSyzod1lDzvKE="; nativeBuildInputs = with llvmPackages; [ llvm diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix index 40011a14c893..eaa42039dbaa 100644 --- a/pkgs/tools/networking/openssh/common.nix +++ b/pkgs/tools/networking/openssh/common.nix @@ -123,5 +123,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; platforms = platforms.unix ++ platforms.windows; maintainers = with maintainers; [ eelco aneeshusa ]; + mainProgram = "ssh"; } // extraMeta; } diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index efdd16e630bc..423363b56c28 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "wget"; - version = "1.21.1"; + version = "1.21.2"; src = fetchurl { url = "mirror://gnu/wget/${pname}-${version}.tar.lz"; - sha256 = "sha256-25u+U0fm+qBvx4gF7rgIsmiXlFXq2QA6YIVpydT8kK0="; + sha256 = "sha256-FyejMKhqyss+V2Fc4mj18pl4v3rexKvmow03Age8kbM="; }; patches = [ diff --git a/pkgs/tools/package-management/libdnf/default.nix b/pkgs/tools/package-management/libdnf/default.nix index 5e1562fa431b..47ce3dad62d6 100644 --- a/pkgs/tools/package-management/libdnf/default.nix +++ b/pkgs/tools/package-management/libdnf/default.nix @@ -1,7 +1,7 @@ -{ gcc9Stdenv, lib, stdenv, fetchFromGitHub, cmake, gettext, pkg-config, gpgme, libsolv, openssl, check +{ lib, stdenv, fetchFromGitHub, cmake, gettext, pkg-config, gpgme, libsolv, openssl, check , json_c, libmodulemd, libsmartcols, sqlite, librepo, libyaml, rpm, zchunk }: -gcc9Stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "libdnf"; version = "0.63.1"; diff --git a/pkgs/tools/security/kubesec/default.nix b/pkgs/tools/security/kubesec/default.nix index 5d634630128d..09feb829bf09 100644 --- a/pkgs/tools/security/kubesec/default.nix +++ b/pkgs/tools/security/kubesec/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "kubesec"; - version = "2.11.2"; + version = "2.11.3"; src = fetchFromGitHub { owner = "controlplaneio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-W9c3L8lYjF1W0kwSODhMldlqX1h+2mZIRtElZ20skn4="; + sha256 = "sha256-ntDkkw1mOb3oAs/UX9uazKv1+smVy2qtg6ZqCLEbRNQ="; }; - vendorSha256 = "sha256-zfQu1EdwvR+LGmsbE8RA4pcOGgsukG1TMTCgPyNoVsc="; + vendorSha256 = "sha256-1qDi8Ij+uweZggE9fbi50uCqlPzdGOwiO3WPuAxnils="; # Tests wants to download the kubernetes schema for use with kubeval doCheck = false; diff --git a/pkgs/tools/security/prs/default.nix b/pkgs/tools/security/prs/default.nix index 30e12467f830..5a020dde9cc4 100644 --- a/pkgs/tools/security/prs/default.nix +++ b/pkgs/tools/security/prs/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "prs"; - version = "0.2.13"; + version = "0.3.2"; src = fetchFromGitLab { owner = "timvisee"; repo = "prs"; rev = "v${version}"; - sha256 = "sha256-UZm147oNBbgagGKgJcaT5354Tl+MXkK+/bB+tuncH5o="; + sha256 = "sha256-90Ed/mafACSJvH+DjCbdXs3eeyT+pGflRzDD9l3b0/s="; }; - cargoSha256 = "sha256-u31xzgZVlXbraq2lTRJCKZVoHqRg8iH2kE3tkq5NwLk="; + cargoSha256 = "sha256-5teiF8s11Ml8UtbVn6fXur2OQzE52JZnsgyDihbEFTQ="; postPatch = '' # The GPGME backend is recommended diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index 42a9d913dd20..c5a661af1153 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -60,6 +60,7 @@ stdenv.mkDerivation { maintainers = [ maintainers.eelco ]; platforms = platforms.all; + mainProgram = "grep"; }; passthru = {inherit pcre;}; diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix index 0dff6d76fffe..4292c275a7f1 100644 --- a/pkgs/tools/text/ocrmypdf/default.nix +++ b/pkgs/tools/text/ocrmypdf/default.nix @@ -30,13 +30,13 @@ let in buildPythonApplication rec { pname = "ocrmypdf"; - version = "12.3.0"; + version = "12.5.0"; src = fetchFromGitHub { owner = "jbarlow83"; repo = "OCRmyPDF"; rev = "v${version}"; - sha256 = "122yv3p0v4fbx30zgppcznwnm7svg97gv0sa103xb6zcld68ggn2"; + sha256 = "sha256-g80WedX+TGHE9EJ/RSgOc53PM17V3WZslUNaHoqKTo0="; }; nativeBuildInputs = with python3Packages; [ @@ -47,9 +47,9 @@ buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ cffi - chardet coloredlogs img2pdf + importlib-resources pdfminer pluggy pikepdf @@ -84,6 +84,6 @@ buildPythonApplication rec { license = with licenses; [ mpl20 mit ]; platforms = platforms.linux; maintainers = [ maintainers.kiwi ]; - changelog = "https://github.com/jbarlow83/OCRmyPDF/blob/v${version}/docs/release_notes.rst"; + changelog = "https://github.com/jbarlow83/OCRmyPDF/blob/v${version}/docs/release_notes.rst"; }; } diff --git a/pkgs/tools/text/snippetpixie/default.nix b/pkgs/tools/text/snippetpixie/default.nix index 301831d1a830..e66a5404f439 100644 --- a/pkgs/tools/text/snippetpixie/default.nix +++ b/pkgs/tools/text/snippetpixie/default.nix @@ -86,9 +86,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.snippetpixie.com"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ - ianmjones - ] ++ pantheon.maintainers; + maintainers = with maintainers; [ ianmjones ] ++ teams.pantheon.members; platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb555741b36f..446b7e31c407 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2993,6 +2993,8 @@ with pkgs; inklecate = callPackage ../development/compilers/inklecate {}; + intensity-normalization = with python3Packages; toPythonApplication intensity-normalization; + interactsh = callPackage ../tools/misc/interactsh { }; interlock = callPackage ../servers/interlock {}; @@ -8023,6 +8025,8 @@ with pkgs; pamtester = callPackage ../tools/security/pamtester { }; + pantheon-tweaks = callPackage ../applications/system/pantheon-tweaks { }; + paperless-ng = callPackage ../applications/office/paperless-ng { }; paperwork = callPackage ../applications/office/paperwork/paperwork-gtk.nix { }; @@ -12426,6 +12430,7 @@ with pkgs; }; cargo-readme = callPackage ../development/tools/rust/cargo-readme {}; cargo-sort = callPackage ../development/tools/rust/cargo-sort { }; + cargo-spellcheck = callPackage ../development/tools/rust/cargo-spellcheck { }; cargo-sweep = callPackage ../development/tools/rust/cargo-sweep { }; cargo-sync-readme = callPackage ../development/tools/rust/cargo-sync-readme {}; cargo-udeps = callPackage ../development/tools/rust/cargo-udeps { @@ -13063,7 +13068,7 @@ with pkgs; pipewire = callPackage ../development/libraries/pipewire {}; pipewire_0_2 = callPackage ../development/libraries/pipewire/0.2.nix {}; - pyradio = callPackage ../applications/radio/pyradio {}; + pyradio = callPackage ../applications/audio/pyradio {}; pyrex = pyrex095; @@ -19894,11 +19899,11 @@ with pkgs; cassandra = cassandra_3_11; apache-jena = callPackage ../servers/nosql/apache-jena/binary.nix { - java = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + java = jre; }; apache-jena-fuseki = callPackage ../servers/nosql/apache-jena/fuseki-binary.nix { - java = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + java = jre; }; apcupsd = callPackage ../servers/apcupsd { }; @@ -24584,7 +24589,7 @@ with pkgs; gitolite = callPackage ../applications/version-management/gitolite { }; gitoxide = callPackage ../applications/version-management/gitoxide { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; inherit (gnome) gitg; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 19ee538be2d8..934e2d87f780 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3648,6 +3648,8 @@ in { intelhex = callPackage ../development/python-modules/intelhex { }; + intensity-normalization = callPackage ../development/python-modules/intensity-normalization { }; + internetarchive = callPackage ../development/python-modules/internetarchive { }; interruptingcow = callPackage ../development/python-modules/interruptingcow { }; @@ -5162,6 +5164,8 @@ in { orderedset = callPackage ../development/python-modules/orderedset { }; + orjson = callPackage ../development/python-modules/orjson { }; + orm = callPackage ../development/python-modules/orm { }; ortools = (toPythonModule (pkgs.or-tools.override { inherit (self) python; })).python;