From faec169f0d0beb660ec6a2cea452c38e5430cdf8 Mon Sep 17 00:00:00 2001 From: Ingo Blechschmidt Date: Mon, 4 May 2020 21:56:08 +0200 Subject: [PATCH 001/293] tuxpaint: install desktop file --- pkgs/games/tuxpaint/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/games/tuxpaint/default.nix b/pkgs/games/tuxpaint/default.nix index b9d7f1b8c28..30b0e16291f 100644 --- a/pkgs/games/tuxpaint/default.nix +++ b/pkgs/games/tuxpaint/default.nix @@ -30,6 +30,12 @@ stdenv.mkDerivation rec { }; postInstall = '' + # Install desktop file + mkdir -p $out/share/applications + cp hildon/tuxpaint.xpm $out/share/pixmaps + sed -e "s+Exec=tuxpaint+Exec=$out/bin/tuxpaint+" < src/tuxpaint.desktop > $out/share/applications/tuxpaint.desktop + + # Install stamps tar xzf $stamps cd tuxpaint-stamps-2014.08.23 make install-all PREFIX=$out From 92ad9e9dc4e2f656e5f15103eaa851e9916a0335 Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Fri, 17 Jul 2020 08:21:09 +0200 Subject: [PATCH 002/293] docs.stdenv: remove reference to replace tool --- doc/stdenv/stdenv.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/doc/stdenv/stdenv.xml b/doc/stdenv/stdenv.xml index 818e6c5da00..5641978ab16 100644 --- a/doc/stdenv/stdenv.xml +++ b/doc/stdenv/stdenv.xml @@ -1636,10 +1636,6 @@ substitute ./foo.in ./foo.out \ --subst-var someVar - - substitute is implemented using the replace command. Unlike with the sed command, you don’t have to worry about escaping special characters. It supports performing substitutions on binary files (such as executables), though there you’ll probably want to make sure that the replacement string is as long as the replaced string. - From a04e96d9387a0c6e71f774f5d71bc279a206a0b9 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 26 Feb 2020 13:28:13 +0100 Subject: [PATCH 003/293] swappy: init at 1.2.1 Signed-off-by: Matthias Beyer --- pkgs/applications/misc/swappy/default.nix | 45 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/applications/misc/swappy/default.nix diff --git a/pkgs/applications/misc/swappy/default.nix b/pkgs/applications/misc/swappy/default.nix new file mode 100644 index 00000000000..ddd9b434852 --- /dev/null +++ b/pkgs/applications/misc/swappy/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitHub +, meson +, ninja +, wayland +, cairo +, pango +, gtk +, pkgconfig +, cmake +, scdoc +, libnotify +, gio-sharp +, glib +}: + +stdenv.mkDerivation rec { + name = "swappy-${version}"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "jtheoof"; + repo = "swappy"; + rev = "v${version}"; + sha256 = "14ac2jmnak7avcz0jhqjm30vk7pv3gq5aq5rdyh84k8c613kkicf"; + }; + + nativeBuildInputs = [ glib meson ninja pkgconfig cmake scdoc ]; + + buildInputs = [ cairo pango gtk libnotify wayland glib ]; + + strictDeps = true; + + mesonFlags = [ + # TODO: https://github.com/NixOS/nixpkgs/issues/36468 + "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/jtheoof/swappy"; + description = "A Wayland native snapshot editing tool, inspired by Snappy on macOS "; + license = licenses.mit; + maintainers = [ maintainers.matthiasbeyer ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 52af1b91e4e..39f59a69107 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2303,6 +2303,8 @@ in bash-supergenpass = callPackage ../tools/security/bash-supergenpass { }; + swappy = callPackage ../applications/misc/swappy { gtk = gtk3; }; + sweep-visualizer = callPackage ../tools/misc/sweep-visualizer { }; syscall_limiter = callPackage ../os-specific/linux/syscall_limiter {}; From 5703813f78863b5dfcb782e6d1a8b4c3e7778f8d Mon Sep 17 00:00:00 2001 From: claudiiii Date: Thu, 20 Aug 2020 12:41:44 +0200 Subject: [PATCH 004/293] nextcloud-client: 2.6.5 -> 3.0.0 --- pkgs/applications/networking/nextcloud-client/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index bc678cd1644..d5b384e0dda 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -12,18 +12,20 @@ , qtkeychain , qttools , qtwebengine +, qtquickcontrols2 +, qtgraphicaleffects , sqlite }: mkDerivation rec { pname = "nextcloud-client"; - version = "2.6.5"; + version = "3.0.0"; src = fetchFromGitHub { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "0r2n9l383drnnzbyywnbqljh9kxm3kz4g0mv7bnrp6b10b2ma3pg"; + sha256 = "0ikya1s3zrh16hm2cmrqvd2vsxcllyg0grl37k6n9v5lygz3li4h"; }; patches = [ @@ -44,6 +46,8 @@ mkDerivation rec { qtkeychain qttools qtwebengine + qtquickcontrols2 + qtgraphicaleffects sqlite ]; From 5e1cb57bf89d6bb087b5c74207a747d46ede7add Mon Sep 17 00:00:00 2001 From: Andrew Fontaine Date: Fri, 7 Aug 2020 11:39:45 -0400 Subject: [PATCH 005/293] minio: support building on darwin Modified build command and flags to allow successful build on Darwin systems. Based on flags in GitHub issue from minio project [0] [0]: https://github.com/minio/minio/issues/10188#issuecomment-668223207 --- pkgs/servers/minio/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 19e228b1624..4a14dca660b 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -23,6 +23,15 @@ buildGoModule rec { sed -i "s/CommitID.*/CommitID = \"${src.rev}\"/g" cmd/build-constants.go ''; + postConfigure = '' + export CGO_ENABLED=0 + ''; + + buildFlagsArray = [ + "-tags=kqueue" + "-trimpath" + ]; + passthru.tests.minio = nixosTests.minio; meta = with stdenv.lib; { From 539ae5c93299cadc0664cfff2ffc69a9386caf6d Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Sat, 5 Sep 2020 01:46:12 +0200 Subject: [PATCH 006/293] Revert "apparmor: add apparmor_parser config file" This reverts commit 2259fbdf4b703ca823ff390f63a39d6b80163e56. --- nixos/modules/security/apparmor.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix index 2ee10454fd2..cfc65b347bc 100644 --- a/nixos/modules/security/apparmor.nix +++ b/nixos/modules/security/apparmor.nix @@ -23,17 +23,11 @@ in default = []; description = "List of packages to be added to apparmor's include path"; }; - parserConfig = mkOption { - type = types.str; - default = ""; - description = "AppArmor parser configuration file content"; - }; }; }; config = mkIf cfg.enable { environment.systemPackages = [ pkgs.apparmor-utils ]; - environment.etc."apparmor/parser.conf".text = cfg.parserConfig; boot.kernelParams = [ "apparmor=1" "security=apparmor" ]; From fb6d63f3fdd95a5468d43a0693c8ca7c1894363f Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Sat, 8 Aug 2020 02:01:35 +0200 Subject: [PATCH 007/293] apparmor: fix and improve the service --- maintainers/maintainer-list.nix | 2 +- nixos/doc/manual/release-notes/rl-2009.xml | 18 ++ nixos/modules/config/fonts/fontconfig.nix | 34 ++ nixos/modules/config/malloc.nix | 7 + nixos/modules/module-list.nix | 1 - nixos/modules/security/apparmor-suid.nix | 49 --- nixos/modules/security/apparmor.nix | 235 +++++++++++--- nixos/modules/security/apparmor/includes.nix | 301 ++++++++++++++++++ nixos/modules/security/apparmor/profiles.nix | 11 + nixos/modules/security/pam.nix | 57 ++++ nixos/modules/security/wrappers/default.nix | 8 + .../modules/services/torrent/transmission.nix | 63 +--- nixos/modules/tasks/network-interfaces.nix | 15 + nixos/modules/virtualisation/lxc.nix | 12 +- nixos/modules/virtualisation/lxd.nix | 12 +- pkgs/os-specific/linux/apparmor/default.nix | 54 +++- .../apparmor/fix-rc.apparmor.functions.sh | 32 ++ pkgs/os-specific/linux/iputils/default.nix | 22 ++ pkgs/tools/networking/inetutils/default.nix | 22 +- pkgs/top-level/all-packages.nix | 2 +- 20 files changed, 793 insertions(+), 164 deletions(-) delete mode 100644 nixos/modules/security/apparmor-suid.nix create mode 100644 nixos/modules/security/apparmor/includes.nix create mode 100644 nixos/modules/security/apparmor/profiles.nix create mode 100644 pkgs/os-specific/linux/apparmor/fix-rc.apparmor.functions.sh diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a35b7956d3c..f6dc8c12d4e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4169,7 +4169,7 @@ name = "Julien Dehos"; }; julm = { - email = "julm+nix@sourcephile.fr"; + email = "julm+nixpkgs@sourcephile.fr"; github = "ju1m"; githubId = 21160136; name = "Julien Moutinho"; diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 0a76bffd5c9..799ddb95667 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -910,6 +910,24 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0"; to get the previous behavior of listening on all network interfaces. + + + The security.apparmor module, + for the AppArmor + Mandatory Access Control system, + has been substantialy improved along with related tools, + so that module maintainers can now more easily write AppArmor profiles for NixOS. + The most notable change on the user-side is the new option , + replacing the previous profiles option + to provide a way to disable a profile + and to select whether to confine in enforce mode (default) + or in complain mode (see journalctl -b --grep apparmor). + Before enabling this module, either directly + or by importing <nixpkgs/nixos/modules/profiles/hardened.nix>, + please be sure to read the documentation of security.apparmor.enable, + and especially the part about . + + With this release systemd-networkd (when enabled through ) diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index 1f1044bc5af..3b081deb815 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -449,6 +449,40 @@ in (mkIf cfg.enable { environment.systemPackages = [ pkgs.fontconfig ]; environment.etc.fonts.source = "${fontconfigEtc}/etc/fonts/"; + security.apparmor.includes."abstractions/fonts" = '' + # fonts.conf + r ${pkg.out}/etc/fonts/fonts.conf, + + # fontconfig default config files + r ${pkg.out}/etc/fonts/conf.d/*.conf, + + # 00-nixos-cache.conf + r ${cacheConf}, + + # 10-nixos-rendering.conf + r ${renderConf}, + + # 50-user.conf + ${optionalString cfg.includeUserConf '' + r ${pkg.out}/etc/fonts/conf.d.bak/50-user.conf, + ''} + + # local.conf (indirect priority 51) + ${optionalString (cfg.localConf != "") '' + r ${localConf}, + ''} + + # 52-nixos-default-fonts.conf + r ${defaultFontsConf}, + + # 53-no-bitmaps.conf + r ${rejectBitmaps}, + + ${optionalString (!cfg.allowType1) '' + # 53-nixos-reject-type1.conf + r ${rejectType1}, + ''} + ''; }) (mkIf cfg.enable { fonts.fontconfig.confPackages = [ confPkg ]; diff --git a/nixos/modules/config/malloc.nix b/nixos/modules/config/malloc.nix index 31a659ee83f..5c5752ef515 100644 --- a/nixos/modules/config/malloc.nix +++ b/nixos/modules/config/malloc.nix @@ -87,5 +87,12 @@ in environment.etc."ld-nix.so.preload".text = '' ${providerLibPath} ''; + security.apparmor.includes = { + "abstractions/base" = '' + r /etc/ld-nix.so.preload, + r ${config.environment.etc."ld-nix.so.preload".source}, + mr ${providerLibPath}, + ''; + }; }; } diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index b516b178519..0f9e6e36547 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -183,7 +183,6 @@ ./rename.nix ./security/acme.nix ./security/apparmor.nix - ./security/apparmor-suid.nix ./security/audit.nix ./security/auditd.nix ./security/ca.nix diff --git a/nixos/modules/security/apparmor-suid.nix b/nixos/modules/security/apparmor-suid.nix deleted file mode 100644 index 6c479e070e2..00000000000 --- a/nixos/modules/security/apparmor-suid.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ config, lib, pkgs, ... }: -let - cfg = config.security.apparmor; -in -with lib; -{ - imports = [ - (mkRenamedOptionModule [ "security" "virtualization" "flushL1DataCache" ] [ "security" "virtualisation" "flushL1DataCache" ]) - ]; - - options.security.apparmor.confineSUIDApplications = mkOption { - type = types.bool; - default = true; - description = '' - Install AppArmor profiles for commonly-used SUID application - to mitigate potential privilege escalation attacks due to bugs - in such applications. - - Currently available profiles: ping - ''; - }; - - config = mkIf (cfg.confineSUIDApplications) { - security.apparmor.profiles = [ (pkgs.writeText "ping" '' - #include - /run/wrappers/bin/ping { - #include - #include - #include - - capability net_raw, - capability setuid, - network inet raw, - - ${pkgs.stdenv.cc.libc.out}/lib/*.so mr, - ${pkgs.libcap.lib}/lib/libcap.so* mr, - ${pkgs.attr.out}/lib/libattr.so* mr, - - ${pkgs.iputils}/bin/ping mixr, - - #/etc/modules.conf r, - - ## Site-specific additions and overrides. See local/README for details. - ##include - } - '') ]; - }; - -} diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix index cfc65b347bc..3bf1e0fefc3 100644 --- a/nixos/modules/security/apparmor.nix +++ b/nixos/modules/security/apparmor.nix @@ -1,59 +1,198 @@ { config, lib, pkgs, ... }: let - inherit (lib) mkIf mkOption types concatMapStrings; + inherit (builtins) attrNames head map match readFile; + inherit (lib) types; + inherit (config.environment) etc; cfg = config.security.apparmor; + mkDisableOption = name: lib.mkEnableOption name // { + default = true; + example = false; + }; + enabledPolicies = lib.filterAttrs (n: p: p.enable) cfg.policies; in { - options = { - security.apparmor = { - enable = mkOption { - type = types.bool; - default = false; - description = "Enable the AppArmor Mandatory Access Control system."; - }; - profiles = mkOption { - type = types.listOf types.path; - default = []; - description = "List of files containing AppArmor profiles."; - }; - packages = mkOption { - type = types.listOf types.package; - default = []; - description = "List of packages to be added to apparmor's include path"; - }; - }; - }; + imports = [ + (lib.mkRenamedOptionModule [ "security" "virtualization" "flushL1DataCache" ] [ "security" "virtualisation" "flushL1DataCache" ]) + (lib.mkRemovedOptionModule [ "security" "apparmor" "confineSUIDApplications" ] "Please use the new options: `security.apparmor.policies..enable'.") + (lib.mkRemovedOptionModule [ "security" "apparmor" "profiles" ] "Please use the new option: `security.apparmor.policies'.") + apparmor/includes.nix + apparmor/profiles.nix + ]; - config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.apparmor-utils ]; + options = { + security.apparmor = { + enable = lib.mkEnableOption ''the AppArmor Mandatory Access Control system. - boot.kernelParams = [ "apparmor=1" "security=apparmor" ]; + If you're enabling this module on a running system, + note that a reboot will be required to activate AppArmor in the kernel. - systemd.services.apparmor = let - paths = concatMapStrings (s: " -I ${s}/etc/apparmor.d") - ([ pkgs.apparmor-profiles ] ++ cfg.packages); - in { - after = [ "local-fs.target" ]; - before = [ "sysinit.target" ]; - wantedBy = [ "multi-user.target" ]; - unitConfig = { - DefaultDependencies = "no"; - }; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = "yes"; - ExecStart = map (p: - ''${pkgs.apparmor-parser}/bin/apparmor_parser -rKv ${paths} "${p}"'' - ) cfg.profiles; - ExecStop = map (p: - ''${pkgs.apparmor-parser}/bin/apparmor_parser -Rv "${p}"'' - ) cfg.profiles; - ExecReload = map (p: - ''${pkgs.apparmor-parser}/bin/apparmor_parser --reload ${paths} "${p}"'' - ) cfg.profiles; - }; - }; - }; + Also, beware that enabling this module will by default + try to kill unconfined but confinable running processes, + in order to obtain a confinement matching what is declared in the NixOS configuration. + This will happen when upgrading to a NixOS revision + introducing an AppArmor profile for the executable of a running process. + This is because enabling an AppArmor profile for an executable + can only confine new or already confined processes of that executable, + but leaves already running processes unconfined. + Set killUnconfinedConfinables + to false if you prefer to leave those processes running''; + policies = lib.mkOption { + description = '' + AppArmor policies. + ''; + type = types.attrsOf (types.submodule ({ name, config, ... }: { + options = { + enable = mkDisableOption "loading of the profile into the kernel"; + enforce = mkDisableOption "enforcing of the policy or only complain in the logs"; + profile = lib.mkOption { + description = "The policy of the profile."; + type = types.lines; + apply = pkgs.writeText name; + }; + }; + })); + default = {}; + }; + includes = lib.mkOption { + type = types.attrsOf types.lines; + default = {}; + description = '' + List of paths to be added to AppArmor's searched paths + when resolving include directives. + ''; + apply = lib.mapAttrs pkgs.writeText; + }; + packages = lib.mkOption { + type = types.listOf types.package; + default = []; + description = "List of packages to be added to AppArmor's include path"; + }; + enableCache = lib.mkEnableOption ''caching of AppArmor policies + in /var/cache/apparmor/. + + Beware that AppArmor policies almost always contain Nix store paths, + and thus produce at each change of these paths + a new cached version accumulating in the cache''; + killUnconfinedConfinables = mkDisableOption ''killing of processes + which have an AppArmor profile enabled + (in policies) + but are not confined (because AppArmor can only confine new processes). + Beware that due to a current limitation of AppArmor, + only profiles with exact paths (and no name) can enable such kills''; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = map (policy: + { assertion = match ".*/.*" policy == null; + message = "`security.apparmor.policies.\"${policy}\"' must not contain a slash."; + # Because, for instance, aa-remove-unknown uses profiles_names_list() in rc.apparmor.functions + # which does not recurse into sub-directories. + } + ) (attrNames cfg.policies); + + environment.systemPackages = [ pkgs.apparmor-utils ]; + environment.etc."apparmor.d".source = pkgs.linkFarm "apparmor.d" ( + # It's important to put only enabledPolicies here and not all cfg.policies + # because aa-remove-unknown reads profiles from all /etc/apparmor.d/* + lib.mapAttrsToList (name: p: {inherit name; path=p.profile;}) enabledPolicies ++ + lib.mapAttrsToList (name: path: {inherit name path;}) cfg.includes + ); + environment.etc."apparmor/parser.conf".text = '' + ${if cfg.enableCache then "write-cache" else "skip-cache"} + cache-loc /var/cache/apparmor + Include /etc/apparmor.d + '' + + lib.concatMapStrings (p: "Include ${p}/etc/apparmor.d\n") cfg.packages; + # For aa-logprof + environment.etc."apparmor/apparmor.conf".text = '' + ''; + # For aa-logprof + environment.etc."apparmor/severity.db".source = pkgs.apparmor-utils + "/etc/apparmor/severity.db"; + environment.etc."apparmor/logprof.conf".text = '' + [settings] + # /etc/apparmor.d/ is read-only on NixOS + profiledir = /var/cache/apparmor/logprof + inactive_profiledir = /etc/apparmor.d/disable + # Use: journalctl -b --since today --grep audit: | aa-logprof + logfiles = /dev/stdin + + parser = ${pkgs.apparmor-parser}/bin/apparmor_parser + ldd = ${pkgs.glibc.bin}/bin/ldd + logger = ${pkgs.utillinux}/bin/logger + + # customize how file ownership permissions are presented + # 0 - off + # 1 - default of what ever mode the log reported + # 2 - force the new permissions to be user + # 3 - force all perms on the rule to be user + default_owner_prompt = 1 + + custom_includes = /etc/apparmor.d ${lib.concatMapStringsSep " " (p: "${p}/etc/apparmor.d") cfg.packages} + + [qualifiers] + ${pkgs.runtimeShell} = icnu + ${pkgs.bashInteractive}/bin/sh = icnu + ${pkgs.bashInteractive}/bin/bash = icnu + '' + head (match "^.*\\[qualifiers](.*)" # Drop the original [settings] section. + (readFile "${pkgs.apparmor-utils}/etc/apparmor/logprof.conf")); + + boot.kernelParams = [ "apparmor=1" "security=apparmor" ]; + + systemd.services.apparmor = { + after = [ + "local-fs.target" + "systemd-journald-audit.socket" + ]; + before = [ "sysinit.target" ]; + wantedBy = [ "multi-user.target" ]; + unitConfig = { + Description="Load AppArmor policies"; + DefaultDependencies = "no"; + ConditionSecurity = "apparmor"; + }; + # Reloading instead of restarting enables to load new AppArmor profiles + # without necessarily restarting all services which have Requires=apparmor.service + reloadIfChanged = true; + restartTriggers = [ + etc."apparmor/parser.conf".source + etc."apparmor.d".source + ]; + serviceConfig = let + killUnconfinedConfinables = pkgs.writeShellScript "apparmor-kill" '' + set -eu + ${pkgs.apparmor-utils}/bin/aa-status --json | + ${pkgs.jq}/bin/jq --raw-output '.processes | .[] | .[] | select (.status == "unconfined") | .pid' | + xargs --verbose --no-run-if-empty --delimiter='\n' \ + kill + ''; + commonOpts = p: "--verbose --show-cache ${lib.optionalString (!p.enforce) "--complain "}${p.profile}"; + in { + Type = "oneshot"; + RemainAfterExit = "yes"; + ExecStartPre = "${pkgs.apparmor-utils}/bin/aa-teardown"; + ExecStart = lib.mapAttrsToList (n: p: "${pkgs.apparmor-parser}/bin/apparmor_parser --add ${commonOpts p}") enabledPolicies; + ExecStartPost = lib.optional cfg.killUnconfinedConfinables killUnconfinedConfinables; + ExecReload = + # Add or replace into the kernel profiles in enabledPolicies + # (because AppArmor can do that without stopping the processes already confined). + lib.mapAttrsToList (n: p: "${pkgs.apparmor-parser}/bin/apparmor_parser --replace ${commonOpts p}") enabledPolicies ++ + # Remove from the kernel any profile whose name is not + # one of the names within the content of the profiles in enabledPolicies + # (indirectly read from /etc/apparmor.d/*, without recursing into sub-directory). + # Note that this does not remove profiles dynamically generated by libvirt. + [ "${pkgs.apparmor-utils}/bin/aa-remove-unknown" ] ++ + # Optionaly kill the processes which are unconfined but now have a profile loaded + # (because AppArmor can only start to confine new processes). + lib.optional cfg.killUnconfinedConfinables killUnconfinedConfinables; + ExecStop = "${pkgs.apparmor-utils}/bin/aa-teardown"; + CacheDirectory = [ "apparmor" "apparmor/logprof" ]; + CacheDirectoryMode = "0700"; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ julm ]; } diff --git a/nixos/modules/security/apparmor/includes.nix b/nixos/modules/security/apparmor/includes.nix new file mode 100644 index 00000000000..498d7e77650 --- /dev/null +++ b/nixos/modules/security/apparmor/includes.nix @@ -0,0 +1,301 @@ +{ config, lib, pkgs, ... }: +let + inherit (builtins) attrNames hasAttr isAttrs; + inherit (lib) getLib; + inherit (config.environment) etc; + etcRule = arg: + let go = {path ? null, mode ? "r", trail ? ""}: + lib.optionalString (hasAttr path etc) + "${mode} ${config.environment.etc.${path}.source}${trail},"; + in if isAttrs arg + then go arg + else go {path=arg;}; +in +{ +# FIXME: most of the etcRule calls below have been +# written systematically by converting from apparmor-profiles's profiles +# without testing nor deep understanding of their uses, +# and thus may need more rules or can have less rules; +# this remains to be determined case by case, +# some may even be completely useless. +config.security.apparmor.includes = { + # This one is included by + # which is usualy included before any profile. + "abstractions/tunables/alias" = '' + alias /bin -> /run/current-system/sw/bin, + alias /lib/modules -> /run/current-system/kernel/lib/modules, + alias /sbin -> /run/current-system/sw/sbin, + alias /usr -> /run/current-system/sw, + ''; + "abstractions/audio" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/audio" + ${etcRule "asound.conf"} + ${etcRule "esound/esd.conf"} + ${etcRule "libao.conf"} + ${etcRule {path="pulse"; trail="/";}} + ${etcRule {path="pulse"; trail="/**";}} + ${etcRule {path="sound"; trail="/";}} + ${etcRule {path="sound"; trail="/**";}} + ${etcRule {path="alsa/conf.d"; trail="/";}} + ${etcRule {path="alsa/conf.d"; trail="/*";}} + ${etcRule "openal/alsoft.conf"} + ${etcRule "wildmidi/wildmidi.conf"} + ''; + "abstractions/authentication" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/authentication" + # Defined in security.pam + include + ${etcRule "nologin"} + ${etcRule "securetty"} + ${etcRule {path="security"; trail="/*";}} + ${etcRule "shadow"} + ${etcRule "gshadow"} + ${etcRule "pwdb.conf"} + ${etcRule "default/passwd"} + ${etcRule "login.defs"} + ''; + "abstractions/base" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/base" + r ${pkgs.stdenv.cc.libc}/share/locale/**, + r ${pkgs.stdenv.cc.libc}/share/locale.alias, + ${lib.optionalString (pkgs.glibcLocales != null) "r ${pkgs.glibcLocales}/lib/locale/locale-archive,"} + ${etcRule "localtime"} + r ${pkgs.tzdata}/share/zoneinfo/**, + r ${pkgs.stdenv.cc.libc}/share/i18n/**, + ''; + "abstractions/bash" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/bash" + # system-wide bash configuration + ${etcRule "profile.dos"} + ${etcRule "profile"} + ${etcRule "profile.d"} + ${etcRule {path="profile.d"; trail="/*";}} + ${etcRule "bashrc"} + ${etcRule "bash.bashrc"} + ${etcRule "bash.bashrc.local"} + ${etcRule "bash_completion"} + ${etcRule "bash_completion.d"} + ${etcRule {path="bash_completion.d"; trail="/*";}} + # bash relies on system-wide readline configuration + ${etcRule "inputrc"} + # bash inspects filesystems at startup + # and /etc/mtab is linked to /proc/mounts + @{PROC}/mounts + + # run out of /etc/bash.bashrc + ${etcRule "DIR_COLORS"} + ''; + "abstractions/cups-client" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/cpus-client" + ${etcRule "cups/cups-client.conf"} + ''; + "abstractions/consoles" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/consoles" + ''; + "abstractions/dbus-session-strict" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/dbus-session-strict" + ${etcRule "machine-id"} + ''; + "abstractions/dconf" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/dconf" + ${etcRule {path="dconf"; trail="/**";}} + ''; + "abstractions/dri-common" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/dri-common" + ${etcRule "drirc"} + ''; + # The config.fonts.fontconfig NixOS module adds many files to /etc/fonts/ + # by symlinking them but without exporting them outside of its NixOS module, + # those are therefore added there to this "abstractions/fonts". + "abstractions/fonts" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/fonts" + ${etcRule {path="fonts"; trail="/**";}} + ''; + "abstractions/gnome" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/gnome" + ${etcRule {path="gnome"; trail="/gtkrc*";}} + ${etcRule {path="gtk"; trail="/*";}} + ${etcRule {path="gtk-2.0"; trail="/*";}} + ${etcRule {path="gtk-3.0"; trail="/*";}} + ${etcRule "orbitrc"} + include + ${etcRule {path="pango"; trail="/*";}} + ${etcRule {path="/etc/gnome-vfs-2.0"; trail="/modules/";}} + ${etcRule {path="/etc/gnome-vfs-2.0"; trail="/modules/*";}} + ${etcRule "papersize"} + ${etcRule {path="cups"; trail="/lpoptions";}} + ${etcRule {path="gnome"; trail="/defaults.list";}} + ${etcRule {path="xdg"; trail="/{,*-}mimeapps.list";}} + ${etcRule "xdg/mimeapps.list"} + ''; + "abstractions/kde" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/kde" + ${etcRule {path="qt3"; trail="/kstylerc";}} + ${etcRule {path="qt3"; trail="/qt_plugins_3.3rc";}} + ${etcRule {path="qt3"; trail="/qtrc";}} + ${etcRule "kderc"} + ${etcRule {path="kde3"; trail="/*";}} + ${etcRule "kde4rc"} + ${etcRule {path="xdg"; trail="/kdeglobals";}} + ${etcRule {path="xdg"; trail="/Trolltech.conf";}} + ''; + "abstractions/kerberosclient" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/kerberosclient" + ${etcRule {path="krb5.keytab"; mode="rk";}} + ${etcRule "krb5.conf"} + ${etcRule "krb5.conf.d"} + ${etcRule {path="krb5.conf.d"; trail="/*";}} + + # config files found via strings on libs + ${etcRule "krb.conf"} + ${etcRule "krb.realms"} + ${etcRule "srvtab"} + ''; + "abstractions/ldapclient" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/ldapclient" + ${etcRule "ldap.conf"} + ${etcRule "ldap.secret"} + ${etcRule {path="openldap"; trail="/*";}} + ${etcRule {path="openldap"; trail="/cacerts/*";}} + ${etcRule {path="sasl2"; trail="/*";}} + ''; + "abstractions/likewise" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/likewise" + ''; + "abstractions/mdns" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/mdns" + ${etcRule "nss_mdns.conf"} + ''; + "abstractions/nameservice" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/nameservice" + + # Many programs wish to perform nameservice-like operations, such as + # looking up users by name or id, groups by name or id, hosts by name + # or IP, etc. These operations may be performed through files, dns, + # NIS, NIS+, LDAP, hesiod, wins, etc. Allow them all here. + ${etcRule "group"} + ${etcRule "host.conf"} + ${etcRule "hosts"} + ${etcRule "nsswitch.conf"} + ${etcRule "gai.conf"} + ${etcRule "passwd"} + ${etcRule "protocols"} + + # libtirpc (used for NIS/YP login) needs this + ${etcRule "netconfig"} + + ${etcRule "resolv.conf"} + + ${etcRule {path="samba"; trail="/lmhosts";}} + ${etcRule "services"} + + ${etcRule "default/nss"} + + # libnl-3-200 via libnss-gw-name + ${etcRule {path="libnl"; trail="/classid";}} + ${etcRule {path="libnl-3"; trail="/classid";}} + + mr ${getLib pkgs.nss}/lib/libnss_*.so*, + mr ${getLib pkgs.nss}/lib64/libnss_*.so*, + ''; + "abstractions/nis" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/nis" + ''; + "abstractions/nvidia" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/nvidia" + ${etcRule "vdpau_wrapper.cfg"} + ''; + "abstractions/opencl-common" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/opencl-common" + ${etcRule {path="OpenCL"; trail="/**";}} + ''; + "abstractions/opencl-mesa" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/opencl-mesa" + ${etcRule "default/drirc"} + ''; + "abstractions/openssl" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/openssl" + ${etcRule {path="ssl"; trail="/openssl.cnf";}} + ''; + "abstractions/p11-kit" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/p11-kit" + ${etcRule {path="pkcs11"; trail="/";}} + ${etcRule {path="pkcs11"; trail="/pkcs11.conf";}} + ${etcRule {path="pkcs11"; trail="/modules/";}} + ${etcRule {path="pkcs11"; trail="/modules/*";}} + ''; + "abstractions/perl" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/perl" + ${etcRule {path="perl"; trail="/**";}} + ''; + "abstractions/php" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/php" + ${etcRule {path="php"; trail="/**/";}} + ${etcRule {path="php5"; trail="/**/";}} + ${etcRule {path="php7"; trail="/**/";}} + ${etcRule {path="php"; trail="/**.ini";}} + ${etcRule {path="php5"; trail="/**.ini";}} + ${etcRule {path="php7"; trail="/**.ini";}} + ''; + "abstractions/postfix-common" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/postfix-common" + ${etcRule "mailname"} + ${etcRule {path="postfix"; trail="/*.cf";}} + ${etcRule "postfix/main.cf"} + ${etcRule "postfix/master.cf"} + ''; + "abstractions/python" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/python" + ''; + "abstractions/qt5" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/qt5" + ${etcRule {path="xdg"; trail="/QtProject/qtlogging.ini";}} + ${etcRule {path="xdg/QtProject"; trail="/qtlogging.ini";}} + ${etcRule "xdg/QtProject/qtlogging.ini"} + ''; + "abstractions/samba" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/samba" + ${etcRule {path="samba"; trail="/*";}} + ''; + "abstractions/ssl_certs" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/ssl_certs" + ${etcRule "ssl/certs/ca-certificates.crt"} + ${etcRule "ssl/certs/ca-bundle.crt"} + ${etcRule "pki/tls/certs/ca-bundle.crt"} + + ${etcRule {path="ssl/trust"; trail="/";}} + ${etcRule {path="ssl/trust"; trail="/*";}} + ${etcRule {path="ssl/trust/anchors"; trail="/";}} + ${etcRule {path="ssl/trust/anchors"; trail="/**";}} + ${etcRule {path="pki/trust"; trail="/";}} + ${etcRule {path="pki/trust"; trail="/*";}} + ${etcRule {path="pki/trust/anchors"; trail="/";}} + ${etcRule {path="pki/trust/anchors"; trail="/**";}} + + # security.acme NixOS module + r /var/lib/acme/*/cert.pem, + r /var/lib/acme/*/chain.pem, + r /var/lib/acme/*/fullchain.pem, + ''; + "abstractions/ssl_keys" = '' + # security.acme NixOS module + r /var/lib/acme/*/full.pem, + r /var/lib/acme/*/key.pem, + ''; + "abstractions/vulkan" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/vulkan" + ${etcRule {path="vulkan/icd.d"; trail="/";}} + ${etcRule {path="vulkan/icd.d"; trail="/*.json";}} + ''; + "abstractions/winbind" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/winbind" + ${etcRule {path="samba"; trail="/smb.conf";}} + ${etcRule {path="samba"; trail="/dhcp.conf";}} + ''; + "abstractions/X" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/X" + ${etcRule {path="X11/cursors"; trail="/";}} + ${etcRule {path="X11/cursors"; trail="/**";}} + ''; +}; +} diff --git a/nixos/modules/security/apparmor/profiles.nix b/nixos/modules/security/apparmor/profiles.nix new file mode 100644 index 00000000000..8eb630b5a48 --- /dev/null +++ b/nixos/modules/security/apparmor/profiles.nix @@ -0,0 +1,11 @@ +{ config, lib, pkgs, ... }: +let apparmor = config.security.apparmor; in +{ +config.security.apparmor.packages = [ pkgs.apparmor-profiles ]; +config.security.apparmor.policies."bin.ping".profile = lib.mkIf apparmor.policies."bin.ping".enable '' + include "${pkgs.iputils.apparmor}/bin.ping" + include "${pkgs.inetutils.apparmor}/bin.ping" + # Note that including those two profiles in the same profile + # would not work if the second one were to re-include . +''; +} diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index ce74805ef41..c0830c28e2a 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -836,6 +836,63 @@ in runuser-l = { rootOK = true; unixAuth = false; }; }; + security.apparmor.includes."abstractions/pam" = let + isEnabled = test: fold or false (map test (attrValues config.security.pam.services)); + in '' + ${lib.concatMapStringsSep "\n" + (name: "r ${config.environment.etc."pam.d/${name}".source},") + (attrNames config.security.pam.services)} + mr ${getLib pkgs.pam}/lib/security/pam_filter/*, + mr ${getLib pkgs.pam}/lib/security/pam_*.so, + r ${getLib pkgs.pam}/lib/security/, + ${optionalString use_ldap + "mr ${pam_ldap}/lib/security/pam_ldap.so,"} + ${optionalString config.services.sssd.enable + "mr ${pkgs.sssd}/lib/security/pam_sss.so,"} + ${optionalString config.krb5.enable '' + mr ${pam_krb5}/lib/security/pam_krb5.so, + mr ${pam_ccreds}/lib/security/pam_ccreds.so, + ''} + ${optionalString (isEnabled (cfg: cfg.googleOsLoginAccountVerification)) '' + mr ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_login.so, + mr ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_admin.so, + ''} + ${optionalString (isEnabled (cfg: cfg.googleOsLoginAuthentication)) + "mr ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_login.so,"} + ${optionalString (config.security.pam.enableSSHAgentAuth && isEnabled (cfg: cfg.sshAgentAuth)) + "mr ${pkgs.pam_ssh_agent_auth}/libexec/pam_ssh_agent_auth.so,"} + ${optionalString (isEnabled (cfg: cfg.fprintAuth)) + "mr ${pkgs.fprintd}/lib/security/pam_fprintd.so,"} + ${optionalString (isEnabled (cfg: cfg.u2fAuth)) + "mr ${pkgs.pam_u2f}/lib/security/pam_u2f.so,"} + ${optionalString (isEnabled (cfg: cfg.usbAuth)) + "mr ${pkgs.pam_usb}/lib/security/pam_usb.so,"} + ${optionalString (isEnabled (cfg: cfg.oathAuth)) + "mr ${pkgs.oathToolkit}/lib/security/pam_oath.so,"} + ${optionalString (isEnabled (cfg: cfg.yubicoAuth)) + "mr ${pkgs.yubico-pam}/lib/security/pam_yubico.so,"} + ${optionalString (isEnabled (cfg: cfg.duoSecurity.enable)) + "mr ${pkgs.duo-unix}/lib/security/pam_duo.so,"} + ${optionalString (isEnabled (cfg: cfg.otpwAuth)) + "mr ${pkgs.otpw}/lib/security/pam_otpw.so,"} + ${optionalString config.security.pam.enableEcryptfs + "mr ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so,"} + ${optionalString (isEnabled (cfg: cfg.pamMount)) + "mr ${pkgs.pam_mount}/lib/security/pam_mount.so,"} + ${optionalString config.services.samba.syncPasswordsByPam + "mr ${pkgs.samba}/lib/security/pam_smbpass.so,"} + ${optionalString (isEnabled (cfg: cfg.enableGnomeKeyring)) + "mr ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so,"} + ${optionalString (isEnabled (cfg: cfg.startSession)) + "mr ${pkgs.systemd}/lib/security/pam_systemd.so,"} + ${optionalString (isEnabled (cfg: cfg.enableAppArmor) && config.security.apparmor.enable) + "mr ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so,"} + ${optionalString (isEnabled (cfg: cfg.enableKwallet)) + "mr ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so,"} + ${optionalString config.virtualisation.lxc.lxcfs.enable + "mr ${pkgs.lxc}/lib/security/pam_cgfs.so"} + ''; + }; } diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix index 2def74f8535..38fba96b25e 100644 --- a/nixos/modules/security/wrappers/default.nix +++ b/nixos/modules/security/wrappers/default.nix @@ -179,6 +179,14 @@ in export PATH="${wrapperDir}:$PATH" ''; + security.apparmor.includes."nixos/security.wrappers" = '' + include "${pkgs.apparmorRulesFromClosure {} [ + securityWrapper + pkgs.stdenv.cc.cc + pkgs.stdenv.cc.libc + ]}" + ''; + ###### setcap activation script system.activationScripts.wrappers = lib.stringAfter [ "specialfs" "users" ] diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 014a22bb5a8..57982c20ccd 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -5,7 +5,7 @@ with lib; let cfg = config.services.transmission; inherit (config.environment) etc; - apparmor = config.security.apparmor.enable; + apparmor = config.security.apparmor; rootDir = "/run/transmission"; homeDir = "/var/lib/transmission"; settingsDir = ".config/transmission-daemon"; @@ -184,8 +184,8 @@ in systemd.services.transmission = { description = "Transmission BitTorrent Service"; - after = [ "network.target" ] ++ optional apparmor "apparmor.service"; - requires = optional apparmor "apparmor.service"; + after = [ "network.target" ] ++ optional apparmor.enable "apparmor.service"; + requires = optional apparmor.enable "apparmor.service"; wantedBy = [ "multi-user.target" ]; environment.CURL_CA_BUNDLE = etc."ssl/certs/ca-certificates.crt".source; @@ -357,61 +357,21 @@ in }) ]; - security.apparmor.profiles = mkIf apparmor [ - (pkgs.writeText "apparmor-transmission-daemon" '' + security.apparmor.policies."bin.transmission-daemon".profile = '' include - ${pkgs.transmission}/bin/transmission-daemon { include include - - # NOTE: https://github.com/NixOS/nixpkgs/pull/93457 - # will remove the need for these by fixing - r ${etc."hosts".source}, - r /etc/ld-nix.so.preload, - ${lib.optionalString (builtins.hasAttr "ld-nix.so.preload" etc) '' - r ${etc."ld-nix.so.preload".source}, - ${concatMapStrings (p: optionalString (p != "") ("mr ${p},\n")) - (splitString "\n" config.environment.etc."ld-nix.so.preload".text)} - ''} - r ${etc."ssl/certs/ca-certificates.crt".source}, - r ${pkgs.tzdata}/share/zoneinfo/**, - r ${pkgs.stdenv.cc.libc}/share/i18n/**, - r ${pkgs.stdenv.cc.libc}/share/locale/**, - - mr ${getLib pkgs.stdenv.cc.cc}/lib/*.so*, - mr ${getLib pkgs.stdenv.cc.libc}/lib/*.so*, - mr ${getLib pkgs.attr}/lib/libattr*.so*, - mr ${getLib pkgs.c-ares}/lib/libcares*.so*, - mr ${getLib pkgs.curl}/lib/libcurl*.so*, - mr ${getLib pkgs.keyutils}/lib/libkeyutils*.so*, - mr ${getLib pkgs.libcap}/lib/libcap*.so*, - mr ${getLib pkgs.libevent}/lib/libevent*.so*, - mr ${getLib pkgs.libgcrypt}/lib/libgcrypt*.so*, - mr ${getLib pkgs.libgpgerror}/lib/libgpg-error*.so*, - mr ${getLib pkgs.libkrb5}/lib/lib*.so*, - mr ${getLib pkgs.libssh2}/lib/libssh2*.so*, - mr ${getLib pkgs.lz4}/lib/liblz4*.so*, - mr ${getLib pkgs.nghttp2}/lib/libnghttp2*.so*, - mr ${getLib pkgs.openssl}/lib/libcrypto*.so*, - mr ${getLib pkgs.openssl}/lib/libssl*.so*, - mr ${getLib pkgs.systemd}/lib/libsystemd*.so*, - mr ${getLib pkgs.utillinuxMinimal.out}/lib/libblkid.so*, - mr ${getLib pkgs.utillinuxMinimal.out}/lib/libmount.so*, - mr ${getLib pkgs.utillinuxMinimal.out}/lib/libuuid.so*, - mr ${getLib pkgs.xz}/lib/liblzma*.so*, - mr ${getLib pkgs.zlib}/lib/libz*.so*, + include + include "${pkgs.apparmorRulesFromClosure {} [pkgs.transmission]}" + include r @{PROC}/sys/kernel/random/uuid, r @{PROC}/sys/vm/overcommit_memory, - # @{pid} is not a kernel variable yet but a regexp - #r @{PROC}/@{pid}/environ, + r @{PROC}/@{pid}/environ, r @{PROC}/@{pid}/mounts, rwk /tmp/tr_session_id_*, - - r ${pkgs.openssl.out}/etc/**, r ${config.systemd.services.transmission.environment.CURL_CA_BUNDLE}, - r ${pkgs.transmission}/share/transmission/**, owner rw ${cfg.home}/${settingsDir}/**, rw ${cfg.settings.download-dir}/**, @@ -439,12 +399,9 @@ in # https://gitlab.com/apparmor/apparmor/-/wikis/AppArmorStacking#seccomp-and-no_new_privs px ${cfg.settings.script-torrent-done-filename} -> &@{dirs}, ''} - - # FIXME: enable customizing using https://github.com/NixOS/nixpkgs/pull/93457 - # include } - '') - ]; + ''; + security.apparmor.includes."local/bin.transmission-daemon" = ""; }; meta.maintainers = with lib.maintainers; [ julm ]; diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index c0e4d3979fd..9ff2326db1f 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -1089,6 +1089,21 @@ in } else { ping.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 { + include + include + rpx /run/wrappers/wrappers.*/ping, + } + /run/wrappers/wrappers.*/ping { + include + include + r /run/wrappers/wrappers.*/ping.real, + mrpx ${config.security.wrappers.ping.source}, + capability net_raw, + capability setpcap, + } + ''); # Set the host and domain names in the activation script. Don't # clear it if it's not configured in the NixOS configuration, diff --git a/nixos/modules/virtualisation/lxc.nix b/nixos/modules/virtualisation/lxc.nix index f484d5ee59a..0f8b22a45df 100644 --- a/nixos/modules/virtualisation/lxc.nix +++ b/nixos/modules/virtualisation/lxc.nix @@ -74,9 +74,13 @@ in systemd.tmpfiles.rules = [ "d /var/lib/lxc/rootfs 0755 root root -" ]; security.apparmor.packages = [ pkgs.lxc ]; - security.apparmor.profiles = [ - "${pkgs.lxc}/etc/apparmor.d/lxc-containers" - "${pkgs.lxc}/etc/apparmor.d/usr.bin.lxc-start" - ]; + security.apparmor.policies = { + "bin.lxc-start".profile = '' + include ${pkgs.lxc}/etc/apparmor.d/usr.bin.lxc-start + ''; + "lxc-containers".profile = '' + include ${pkgs.lxc}/etc/apparmor.d/lxc-containers + ''; + }; }; } diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix index 3958fc2c1d7..876956f654b 100644 --- a/nixos/modules/virtualisation/lxd.nix +++ b/nixos/modules/virtualisation/lxd.nix @@ -93,11 +93,15 @@ in security.apparmor = { enable = true; - profiles = [ - "${cfg.lxcPackage}/etc/apparmor.d/usr.bin.lxc-start" - "${cfg.lxcPackage}/etc/apparmor.d/lxc-containers" - ]; packages = [ cfg.lxcPackage ]; + policies = { + "bin.lxc-start".profile = '' + include ${cfg.lxcPackage}/etc/apparmor.d/usr.bin.lxc-start + ''; + "lxc-containers".profile = '' + include ${cfg.lxcPackage}/etc/apparmor.d/lxc-containers + ''; + }; }; systemd.services.lxd = { diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 0e10add5561..8806f6c50d3 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -10,6 +10,13 @@ , pam , libnotify , buildPackages +, coreutils +, gnugrep +, gnused +, kmod +, writeShellScript +, closureInfo +, runCommand }: let @@ -38,6 +45,12 @@ let sha256 = "0xw028iqp69j9mxv0kbwraplgkj5i5djdlgf0anpkc5cdbsf96r9"; }; + aa-teardown = writeShellScript "aa-teardown" '' + PATH="${lib.makeBinPath [coreutils gnused gnugrep]}:$PATH" + . ${apparmor-parser}/lib/apparmor/rc.apparmor.functions + remove_profiles + ''; + prePatchCommon = '' patch -p1 < ${gnumake43Patch} chmod a+x ./common/list_capabilities.sh ./common/list_af_names.sh @@ -149,6 +162,15 @@ let # aa-notify checks its name and does not work named ".aa-notify-wrapped" mv $out/bin/aa-notify $out/bin/aa-notify-wrapped makeWrapper ${perl}/bin/perl $out/bin/aa-notify --set PERL5LIB ${libapparmor}/${perl.libPrefix} --add-flags $out/bin/aa-notify-wrapped + + substituteInPlace $out/bin/aa-remove-unknown \ + --replace "/usr/bin/aa-status" "$out/bin/aa-status" \ + --replace "/sbin/modprobe" "${kmod}/bin/modprobe" \ + --replace "/lib/apparmor/rc.apparmor.functions" "${apparmor-parser}/lib/apparmor/rc.apparmor.functions" + wrapProgram $out/bin/aa-remove-unknown \ + --prefix PATH : ${lib.makeBinPath [gawk]} + + ln -s ${aa-teardown} $out/bin/aa-teardown ''; inherit doCheck; @@ -197,6 +219,9 @@ let substituteInPlace ./parser/Makefile --replace "/usr/include/linux/capability.h" "${linuxHeaders}/include/linux/capability.h" ## techdoc.pdf still doesn't build ... substituteInPlace ./parser/Makefile --replace "manpages htmlmanpages pdf" "manpages htmlmanpages" + substituteInPlace parser/rc.apparmor.functions \ + --replace "/sbin/apparmor_parser" "$out/bin/apparmor_parser" + sed -i parser/rc.apparmor.functions -e '2i . ${./fix-rc.apparmor.functions.sh}' ''; inherit patches; postPatch = "cd ./parser"; @@ -258,8 +283,32 @@ let meta = apparmor-meta "kernel patches"; }; + # Generate generic AppArmor rules in a file, + # from the closure of given rootPaths. + # To be included in an AppArmor profile like so: + # include "$(apparmorRulesFromClosure {} [pkgs.hello]}" + apparmorRulesFromClosure = + { # The store path of the derivation is given in $path + additionalRules ? [] + # TODO: factorize here some other common paths + # that may emerge from use cases. + , baseRules ? [ + "r $path" + "r $path/etc/**" + "r $path/share/**" + # Note that not all libraries are prefixed with "lib", + # eg. glibc-2.30/lib/ld-2.30.so + "mr $path/lib/**.so*" + # eg. glibc-2.30/lib/gconv/gconv-modules + "r $path/lib/**" + ] + }: rootPaths: runCommand "apparmor-closure-rules" {} '' + touch $out + while read -r path + do printf >>$out "%s,\n" ${lib.concatMapStringsSep " " (x: "\"${x}\"") (baseRules ++ additionalRules)} + done <${closureInfo {inherit rootPaths;}}/store-paths + ''; in - { inherit libapparmor @@ -268,5 +317,6 @@ in apparmor-parser apparmor-pam apparmor-profiles - apparmor-kernel-patches; + apparmor-kernel-patches + apparmorRulesFromClosure; } diff --git a/pkgs/os-specific/linux/apparmor/fix-rc.apparmor.functions.sh b/pkgs/os-specific/linux/apparmor/fix-rc.apparmor.functions.sh new file mode 100644 index 00000000000..ebc1baaa92d --- /dev/null +++ b/pkgs/os-specific/linux/apparmor/fix-rc.apparmor.functions.sh @@ -0,0 +1,32 @@ +aa_action() { + STRING=$1 + shift + $* + rc=$? + if [ $rc -eq 0 ] ; then + aa_log_success_msg $"$STRING " + else + aa_log_failure_msg $"$STRING " + fi + return $rc +} + +aa_log_success_msg() { + [ -n "$1" ] && echo -n $1 + echo ": done." +} + +aa_log_warning_msg() { + [ -n "$1" ] && echo -n $1 + echo ": Warning." +} + +aa_log_failure_msg() { + [ -n "$1" ] && echo -n $1 + echo ": Failed." +} + +aa_log_skipped_msg() { + [ -n "$1" ] && echo -n $1 + echo ": Skipped." +} diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index e12c44888a0..b005c65684d 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub , meson, ninja, pkgconfig, gettext, libxslt, docbook_xsl_ns , libcap, systemd, libidn2 +, apparmorRulesFromClosure }: with stdenv.lib; @@ -22,6 +23,8 @@ in stdenv.mkDerivation rec { sha256 = "1jhbcz75a4ij1myyyi110ma1d8d5hpm3scz9pyw7js6qym50xvh4"; }; + outputs = ["out" "apparmor"]; + mesonFlags = [ "-DBUILD_RARPD=true" "-DBUILD_TRACEROUTE6=true" @@ -35,6 +38,25 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext libxslt.bin docbook_xsl_ns ]; buildInputs = [ libcap systemd ] ++ optional (!stdenv.hostPlatform.isMusl) libidn2; + postInstall = '' + install -D /dev/stdin $apparmor/bin.ping < + $out/bin/ping { + include + include + include + include "${apparmorRulesFromClosure {} + ([libcap] ++ optional (!stdenv.hostPlatform.isMusl) libidn2)}" + include + capability net_raw, + network inet raw, + network inet6 raw, + mr $out/bin/ping, + r $out/share/locale/**, + r @{PROC}/@{pid}/environ, + } + EOF + ''; meta = { description = "A set of small useful utilities for Linux networking"; diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index 1290ec2bdb1..bcc4237f434 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, fetchurl, ncurses, perl, help2man }: +{ stdenv, lib, fetchurl, ncurses, perl, help2man +, apparmorRulesFromClosure +}: stdenv.mkDerivation rec { name = "inetutils-1.9.4"; @@ -8,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "05n65k4ixl85dc6rxc51b1b732gnmm8xnqi424dy9f1nz7ppb3xy"; }; + outputs = ["out" "apparmor"]; + patches = [ ./whois-Update-Canadian-TLD-server.patch ./service-name.patch @@ -41,6 +45,22 @@ stdenv.mkDerivation rec { installFlags = [ "SUIDMODE=" ]; + postInstall = '' + install -D /dev/stdin $apparmor/bin.ping < + include + include + include "${apparmorRulesFromClosure {} [stdenv.cc.libc]}" + include + capability net_raw, + network inet raw, + network inet6 raw, + mr $out/bin/ping, + } + EOF + ''; + meta = with lib; { description = "Collection of common network programs"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a5414477e9..1f521441e7e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17150,7 +17150,7 @@ in inherit (callPackages ../os-specific/linux/apparmor { python = python3; }) libapparmor apparmor-utils apparmor-bin-utils apparmor-parser apparmor-pam - apparmor-profiles apparmor-kernel-patches; + apparmor-profiles apparmor-kernel-patches apparmorRulesFromClosure; atop = callPackage ../os-specific/linux/atop { }; From b6139e58e3ae82a7574b1e99b0601f50d01a2aa1 Mon Sep 17 00:00:00 2001 From: Axel Forsman Date: Mon, 7 Sep 2020 20:52:31 +0200 Subject: [PATCH 008/293] nixos/picom: add experimentalBackends option This option is only available as a command-line flag and not from the config file, that is `services.picom.settings`. Therefore it is more important that it gets its own option. One reason one might need this set is that blur methods other than kernel do not work with the old backends, see yshui/picom#464. For reference, the home-manager picom module exposes this option too. --- nixos/modules/services/x11/picom.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/picom.nix b/nixos/modules/services/x11/picom.nix index 1289edd2904..977d0fea219 100644 --- a/nixos/modules/services/x11/picom.nix +++ b/nixos/modules/services/x11/picom.nix @@ -57,7 +57,15 @@ in { type = types.bool; default = false; description = '' - Whether of not to enable Picom as the X.org composite manager. + Whether or not to enable Picom as the X.org composite manager. + ''; + }; + + experimentalBackends = mkOption { + type = types.bool; + default = false; + description = '' + Whether to use the unstable new reimplementation of the backends. ''; }; @@ -302,7 +310,8 @@ in { }; serviceConfig = { - ExecStart = "${pkgs.picom}/bin/picom --config ${configFile}"; + ExecStart = "${pkgs.picom}/bin/picom --config ${configFile}" + + (optionalString cfg.experimentalBackends " --experimental-backends"); RestartSec = 3; Restart = "always"; }; From e1538e43b92c19465df62f3178c9262690b76c3b Mon Sep 17 00:00:00 2001 From: Magicloud <1886157+Magicloud@users.noreply.github.com> Date: Tue, 8 Sep 2020 08:54:06 +0800 Subject: [PATCH 009/293] virtualbox: 6.1.10 -> 6.1.14 6.1.14 is the latest release of Virtualbox. Also disabled VirtIO since the source tarball does not include necessary source code. --- .../virtualization/virtualbox/default.nix | 6 +++-- .../virtualization/virtualbox/extpack.nix | 2 +- .../virtualbox/extra_symbols.patch | 22 +++++++++++-------- .../virtualbox/guest-additions/default.nix | 2 +- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 7fb4f8b59d1..72cbb8b81f8 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -23,7 +23,7 @@ let buildType = "release"; # Use maintainers/scripts/update.nix to update the version and all related hashes or # change the hashes in extpack.nix and guest-additions/default.nix as well manually. - version = "6.1.10"; + version = "6.1.14"; iasl' = iasl.overrideAttrs (old: rec { inherit (old) pname; @@ -40,7 +40,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "37d8b30c0be82a50c858f3fc70cde967882239b6212bb32e138d3615b423c477"; + sha256 = "91fa05bcfce36316ca93e3927c9550ea66286fff4c5bec900b753fca278ce1a0"; }; outputs = [ "out" "modsrc" ]; @@ -120,6 +120,8 @@ in stdenv.mkDerivation { NIX_CFLAGS_COMPILE=$(echo "$NIX_CFLAGS_COMPILE" | sed 's,\-isystem ${lib.getDev stdenv.cc.libc}/include,,g') cat >> LocalConfig.kmk < Date: Fri, 11 Sep 2020 12:14:07 -0700 Subject: [PATCH 010/293] docs: add -L to remaining curl install commands --- default.nix | 2 +- nixos/doc/manual/installation/installing-from-other-distro.xml | 2 +- nixos/doc/manual/release-notes/rl-1903.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/default.nix b/default.nix index a74a01719c7..faed7e26354 100644 --- a/default.nix +++ b/default.nix @@ -14,7 +14,7 @@ if ! builtins ? nixVersion || builtins.compareVersions requiredVersion builtins. - If you installed Nix using the install script (https://nixos.org/nix/install), it is safe to upgrade by running it again: - curl https://nixos.org/nix/install | sh + curl -L https://nixos.org/nix/install | sh For more information, please see the NixOS release notes at https://nixos.org/nixos/manual or locally at diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixos/doc/manual/installation/installing-from-other-distro.xml index d2d1245c57a..c08aa0b22fc 100644 --- a/nixos/doc/manual/installation/installing-from-other-distro.xml +++ b/nixos/doc/manual/installation/installing-from-other-distro.xml @@ -47,7 +47,7 @@ Short version: -$ curl https://nixos.org/nix/install | sh +$ curl -L https://nixos.org/nix/install | sh $ . $HOME/.nix-profile/etc/profile.d/nix.sh # …or open a fresh shell More details in the diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index 8ff1681d3b4..5593cb3e5df 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -173,7 +173,7 @@ For users of a daemon-less Nix installation on Linux or macOS, you can - upgrade Nix by running curl https://nixos.org/nix/install | + upgrade Nix by running curl -L https://nixos.org/nix/install | sh, or prior to doing a channel update, running nix-env -iA nix. From 7b3d1d64f8d7e7a090d52dd2d2d801b2047c972c Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Fri, 11 Sep 2020 23:07:08 +0200 Subject: [PATCH 011/293] dotnetCorePackages.sdk_5_0: init at version 5.0.100-preview.8.20417.9 --- pkgs/development/compilers/dotnet/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index e04f7a03f94..2dd5088919d 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -102,4 +102,15 @@ rec { x86_64-darwin = "00xs87zj94v6yr6xs294bficp6lxpghyfswhnwqfkx62jy80qr5fa2y7s10ich3cbm2daa8dby56iizdvi7rnlvp23gfkq12gq4w1g8"; }; }; + + # v5.0.0 + + sdk_5_0 = buildNetCoreSdk { + version = "5.0.100-preview.8.20417.9"; + sha512 = { + x86_64-linux = "2a4m4jb75hc0l135pjpinawlc0jr3rz9hyfm22kkaqs5wacwj5d87lsds2wvp2jf7r1f445098sg65l6az9zqwg4da52qrvcv1ck1hd"; + aarch64-linux = "1zb5f3ihlcjbij6sa9nfvj9rn4frhdbiw0nplqm8lf8q2z2y7h210p8r4l1qwkkm080185kj7kgd2hja54hddgghva26jpq6r36b7hj"; + x86_64-darwin = "0c5cj6b0kc4nrsbxfmal4c1z5anqbxr6gd6knpqfb6m30z37qiks16xakacrm69313wmqpr9mmyiwpj38gcsw2dam9hgzawibwnv4fv"; + }; + }; } From 7977c1ac1c24a0fbcc52aedc58f2eb2d3ad99205 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Fri, 11 Sep 2020 23:26:05 +0200 Subject: [PATCH 012/293] dotnetCorePackages.sdk_5_0: add to all-packages.nix --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 211dcea5188..6bfd9224da0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -262,6 +262,8 @@ in dotnet-sdk_3 = dotnetCorePackages.sdk_3_1; + dotnet-sdk_5 = dotnetCorePackages.sdk_5_0; + dotnet-netcore = dotnetCorePackages.netcore_2_1; dotnet-aspnetcore = dotnetCorePackages.aspnetcore_2_1; From e8d1a486fb95435fb0274e89582bbca374f5ecea Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Fri, 11 Sep 2020 16:28:43 +0200 Subject: [PATCH 013/293] dvdbackup: fix build with libdvdread >= 6.1.0 --- pkgs/applications/video/dvdbackup/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/dvdbackup/default.nix b/pkgs/applications/video/dvdbackup/default.nix index e129031fd49..633eea3d282 100644 --- a/pkgs/applications/video/dvdbackup/default.nix +++ b/pkgs/applications/video/dvdbackup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libdvdread, libdvdcss, dvdauthor }: +{ stdenv, fetchurl, fetchpatch, libdvdread, libdvdcss, dvdauthor }: stdenv.mkDerivation rec { version = "0.4.2"; @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { buildInputs = [ libdvdread libdvdcss dvdauthor ]; + # see https://bugs.launchpad.net/dvdbackup/+bug/1869226 + patchFlags = [ "-p0" ]; + patches = [ (fetchpatch { + url = "https://git.slackbuilds.org/slackbuilds/plain/multimedia/dvdbackup/patches/dvdbackup-dvdread-6.1.patch"; + sha256 = "1v3xl01bwq1592i5x5dyh95r0mmm1zvvwf92fgjc0smr0k3davfz"; + })]; + meta = { description = "A tool to rip video DVDs from the command line"; homepage = "http://dvdbackup.sourceforge.net/"; From 3a7d037416374fad91b2decc8950745798188935 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 18 Sep 2020 12:15:18 -0300 Subject: [PATCH 014/293] mate.caja-extensions: 1.24.0 -> 1.24.1 --- pkgs/desktops/mate/caja-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix index 89191dc302b..d71d72ce188 100644 --- a/pkgs/desktops/mate/caja-extensions/default.nix +++ b/pkgs/desktops/mate/caja-extensions/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "caja-extensions"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "175v5c05nrdliya23rbqma49alldq67dklmvpq18nq71sfry4pp6"; + sha256 = "13jkynanqj8snys0if8lv6yx1y0jrm778s2152n4x65hsghc6cw5"; }; nativeBuildInputs = [ From 6ff9e73152ece6eab186c4b0a102dee1ba158844 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 18 Sep 2020 12:15:19 -0300 Subject: [PATCH 015/293] mate.engrampa: 1.24.0 -> 1.24.1 --- pkgs/desktops/mate/engrampa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index 1f1be3e2857..50abf9b4078 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "engrampa"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "13cak3qgrzqj74x9jq1sf155793v2bqqz4mk4i04g9f9xn3g85fl"; + sha256 = "0akjnz85qkpiqgj1ccn41rzbfid4l3r3nsm4s9s779ilzd7f097y"; }; nativeBuildInputs = [ From 70934c68214aabf730f584be2fdc990086a3a32f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 18 Sep 2020 12:15:19 -0300 Subject: [PATCH 016/293] mate.eom: 1.24.0 -> 1.24.1 --- pkgs/desktops/mate/eom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index d7c54604089..2824fba2dfe 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "eom"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0zzximp2534bky0vac219alafblw6m0lis0gncq92017s6c1mb77"; + sha256 = "0dralsc0dvs0l38cysdhx6kiaiqlb8qi6g9xz2cm6mjqyq3d3f9f"; }; nativeBuildInputs = [ From 8f6215df25e2e95c7b6cfa3523a0402ddc143d97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 18 Sep 2020 12:15:19 -0300 Subject: [PATCH 017/293] mate.libmatekbd: 1.24.0 -> 1.24.1 --- pkgs/desktops/mate/libmatekbd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix index 4c70c252806..f0e178ea9e8 100644 --- a/pkgs/desktops/mate/libmatekbd/default.nix +++ b/pkgs/desktops/mate/libmatekbd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmatekbd"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1sq7gwr9q3hq4q0vx32qqa68qcqf5by9mqyxnq6lwgaq8ydq16ab"; + sha256 = "17mcxfkvl14p04id3n5kbhpjwjq00c8wmbyciyy2hm7kwdln6zx8"; }; nativeBuildInputs = [ pkgconfig gettext ]; From aed2d108f1804475455873334e66e3036d2083eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 18 Sep 2020 12:15:20 -0300 Subject: [PATCH 018/293] mate.libmatemixer: 1.24.0 -> 1.24.1 --- pkgs/desktops/mate/libmatemixer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix index 6bc9fe54ec3..8b1e68e8b35 100644 --- a/pkgs/desktops/mate/libmatemixer/default.nix +++ b/pkgs/desktops/mate/libmatemixer/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "libmatemixer"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "08vkdp2kzy27xwscwp2jj5nz0yblrka2482l6cx3wl4dnk0rpznm"; + sha256 = "1n6rq7k66zvfd6sb7h92xihh021w9hysfa4yd1mzjcbb7c62ybqx"; }; nativeBuildInputs = [ pkgconfig gettext ]; From ff0679a45acf4bebc3ee6a83383c7da66ae59db6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 18 Sep 2020 12:15:20 -0300 Subject: [PATCH 019/293] mate.libmateweather: 1.24.0 -> 1.24.1 --- pkgs/desktops/mate/libmateweather/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix index 4774339db8b..3bfdfea06f1 100644 --- a/pkgs/desktops/mate/libmateweather/default.nix +++ b/pkgs/desktops/mate/libmateweather/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmateweather"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "094mnlczxq9crjj8z7dzs1zmwscdkbp54l3qjaf4a4bhd8lihv8d"; + sha256 = "02d7c59pami1fzxg73mp6risa9hvsdpgs68f62wkg09nrppzsk4v"; }; nativeBuildInputs = [ pkgconfig gettext ]; From 0f74404bd80a46dcc40741abf46ecb0738e83b78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 18 Sep 2020 12:15:20 -0300 Subject: [PATCH 020/293] mate.mate-applets: 1.24.0 -> 1.24.1 --- pkgs/desktops/mate/mate-applets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index 7f77a566807..2a97bc851da 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-applets"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0nm3amb3v458mxv1mbz9y8f4230gldmydmkkm7vqxsrxbccynkxq"; + sha256 = "0h70i4x3bk017pgv4zn280682wm58vwdjm7kni91ni8rmblnnvyp"; }; nativeBuildInputs = [ From ebdd1544b2dc077c2c3ae54c534fe4c0336c1269 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 18 Sep 2020 12:15:20 -0300 Subject: [PATCH 021/293] mate.mate-backgrounds: 1.24.1 -> 1.24.2 --- pkgs/desktops/mate/mate-backgrounds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix index e1f19ca8d69..8e2aa6933ff 100644 --- a/pkgs/desktops/mate/mate-backgrounds/default.nix +++ b/pkgs/desktops/mate/mate-backgrounds/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-backgrounds"; - version = "1.24.1"; + version = "1.24.2"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0b9yx68p9l867bqsl9z2g4wrs8p396ls673jgaliys5snmk8n8dn"; + sha256 = "1ixb2vlm3dr52ibp4ggrbkf38m3q6i5lxjg4ix82gxbb6h6a3gp5"; }; nativeBuildInputs = [ From 8c15e0b0cd7a988e050de4eb8bed855d0b425c2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 18 Sep 2020 12:15:20 -0300 Subject: [PATCH 022/293] mate.mate-calc: 1.24.0 -> 1.24.1 --- pkgs/desktops/mate/mate-calc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix index 2de156d02de..48c9f37c03a 100644 --- a/pkgs/desktops/mate/mate-calc/default.nix +++ b/pkgs/desktops/mate/mate-calc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-calc"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0f7hc1gg41kcwcyvsqqg79qylrp0qqymris8qizk2x3cfvvg7261"; + sha256 = "0imdimq5d5rjq8mkjcrsd683a2bn9acmhc0lmvyw71y0040inbaw"; }; nativeBuildInputs = [ From 9a3dd0797151586ca9e1061403245cf7941a718e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 18 Sep 2020 12:15:20 -0300 Subject: [PATCH 023/293] mate.mate-common: 1.24.1 -> 1.24.2 --- pkgs/desktops/mate/mate-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix index f8896ae0c2c..a491798147f 100644 --- a/pkgs/desktops/mate/mate-common/default.nix +++ b/pkgs/desktops/mate/mate-common/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-common"; - version = "1.24.1"; + version = "1.24.2"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1dgp6k2l6dz7x2lnqk4y5xfkld376726hda3mrc777f821kk99nr"; + sha256 = "0srb2ly5pjq1g0cs8m39nbfv33dvsc2j4g2gw081xis3awzh3lki"; }; enableParallelBuilding = true; From 2ffe5777faa09c94e9ccb0dc1c376c097aa25a14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 18 Sep 2020 12:15:20 -0300 Subject: [PATCH 024/293] mate.mate-control-center: 1.24.0 -> 1.24.1 --- pkgs/desktops/mate/mate-control-center/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index c8119a923d1..4c26961ba15 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "mate-control-center"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "192plsh83m2qz7jgakns2yvhqbj53v7i54iwb0z26i2awy0j9rcd"; + sha256 = "08bai47fsmbxlw2lhig9n6c8sxr24ixkd1spq3j0635yzcqighb0"; }; nativeBuildInputs = [ From 6893ac0bab2e25b15f3eea4db7830fa55433d287 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 18 Sep 2020 12:15:20 -0300 Subject: [PATCH 025/293] mate.mate-desktop: 1.24.0 -> 1.24.1 --- pkgs/desktops/mate/mate-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index 6a5f8b13bf1..2e298d14168 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-desktop"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0l4bbj6nz315s5ndq5sw1jcgi3s1whk59bj12c4mbpsvmlb33adg"; + sha256 = "1nd1dn8mm1z6x4r68a25q4vzys1a6fmbzc94ss1z1n1872pczs6i"; }; nativeBuildInputs = [ From 6602ba672fed63df40cad85f22be6211d1c40975 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 18 Sep 2020 12:15:20 -0300 Subject: [PATCH 026/293] mate.mate-media: 1.24.0 -> 1.24.1 --- pkgs/desktops/mate/mate-media/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index c02201c855f..458e4638ada 100644 --- a/pkgs/desktops/mate/mate-media/default.nix +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-media"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1d5dx79yfqghjaxrdrdh053nfnvkbx8p3ma7j87s7rsvy5irs963"; + sha256 = "118i4w2i2g3hfgbfn3hjzjkfq8vjj6049r7my3vna9js23b7ab92"; }; buildInputs = [ From ab6ec2d94a3426948c49033d5801b516ea207ab0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 18 Sep 2020 12:15:20 -0300 Subject: [PATCH 027/293] mate.mate-menus: 1.24.0 -> 1.24.1 --- pkgs/desktops/mate/mate-menus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix index 7d418c90b4a..73f8be24cc3 100644 --- a/pkgs/desktops/mate/mate-menus/default.nix +++ b/pkgs/desktops/mate/mate-menus/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-menus"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1vv4j38h7mrbfrsj99k25z6y7b5dg30fzd2qnhk7pl8ca8s1jhrd"; + sha256 = "17zc9fn14jykhn30z8iwlw0qwk32ivj6gxgww3xrqvqk0da5yaas"; }; nativeBuildInputs = [ pkgconfig gettext gobject-introspection ]; From 329d4d13e3c2489bae12ac974d03a98b3aef00ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 18 Sep 2020 12:15:21 -0300 Subject: [PATCH 028/293] mate.mate-notification-daemon: 1.24.0 -> 1.24.1 --- pkgs/desktops/mate/mate-notification-daemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index 32d0cc9ed8e..0a797f4defa 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "mate-notification-daemon"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0y362b51lb8nq2cw254qc39x8hpficn5rxddzp0fxqxakrh7vcif"; + sha256 = "1ybzr8mni5pgrspf8hqnisd0r0hwdlgk7n5mzsh7xisbkgivpw2b"; }; nativeBuildInputs = [ From f9e91684b5fcd6bf38ceb6f8d513f1ceec23818a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 18 Sep 2020 12:15:21 -0300 Subject: [PATCH 029/293] mate.mate-panel: 1.24.0 -> 1.24.1 --- pkgs/desktops/mate/mate-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index dce65675189..4b021bcc099 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-panel"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1hrh10pqk8mva1ix2nmsp3cbbn81cgqy0b9lqhsl0b5p0s40i7in"; + sha256 = "0xblqrhfazd01h0jdmx4hvavkb7f9anbd4rjsk5r6wxhp027l64l"; }; nativeBuildInputs = [ From 26df568a6e60d32729a36b6ba9bb04fdaf15a739 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 18 Sep 2020 12:15:21 -0300 Subject: [PATCH 030/293] mate.mate-power-manager: 1.24.1 -> 1.24.2 --- pkgs/desktops/mate/mate-power-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index 30f1c48fa5f..c6872cc5beb 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-power-manager"; - version = "1.24.1"; + version = "1.24.2"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "13ar40x5hs4d4h81q8qsy0agbx5wnarry3mbhws54zydcxd7j20a"; + sha256 = "0fni41p3kraxwjnx9l5mdspng0zib1gfdxwlaiyq31mh4g79yjyj"; }; nativeBuildInputs = [ From 2eb674140d7236c60ea5f8c242ed406812dd20a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 18 Sep 2020 12:15:21 -0300 Subject: [PATCH 031/293] mate.mate-screensaver: 1.24.0 -> 1.24.1 --- pkgs/desktops/mate/mate-screensaver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix index 1c80b19aa5b..f05d8a736d5 100644 --- a/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-screensaver"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0gpw6x9d0b77f14vjl7ghq5dya1mwcnvmgigg00manfwlksr5zby"; + sha256 = "0imb1z2yvz1h95dzq396c569kkxys9mb2dyc6qxxxcnc5w02a2dw"; }; nativeBuildInputs = [ From 696dd1533c5be0358fb628ed6bdc8bbdc0458a75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 18 Sep 2020 12:15:21 -0300 Subject: [PATCH 032/293] mate.mate-sensors-applet: 1.24.0 -> 1.24.1 --- pkgs/desktops/mate/mate-sensors-applet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix index c7b7d5ba191..babdbcb4da0 100644 --- a/pkgs/desktops/mate/mate-sensors-applet/default.nix +++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-sensors-applet"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1izjgzj3xb93arim8w891x8as85phdmlhdnr2yc8ixg7xpblsq2s"; + sha256 = "1nb4fy3mcymv7pmnc0czpxgp1sqvs533jwnqv1b5cqby415ljb16"; }; nativeBuildInputs = [ From cbee4e710bbb805257974ef4423da4edff4aea38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 18 Sep 2020 12:15:22 -0300 Subject: [PATCH 033/293] mate.mate-session-manager: 1.24.0 -> 1.24.1 --- pkgs/desktops/mate/mate-session-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index 09973e04bc0..b8b61324574 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "mate-session-manager"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "01scj5d1xlri9b2id8gm9kfni9nzhdjdf7rag7fvcxwqp7baz3h3"; + sha256 = "1zwq8symyp3ijs28pyrknsdi9byf4dpp9wp93ndwdhi0vaip5i51"; }; patches = [ From 57322d00e6024f3f310d20bbbc858e2e26e85a01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 18 Sep 2020 12:15:22 -0300 Subject: [PATCH 034/293] mate.mate-settings-daemon: 1.24.0 -> 1.24.1 --- pkgs/desktops/mate/mate-settings-daemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index 30db743c276..e0232385862 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "mate-settings-daemon"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1hc5a36wqpjv9i2lgrn1h12s8y910xab3phx5vzbzq47kj6m3gw9"; + sha256 = "0n1ywr3ir5p536s7azdbw2mh40ylqlpx3a74mjrivbms1rpjxyab"; }; nativeBuildInputs = [ From 74c5bae4c5f0e788e767fa739d826f7af24ea860 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 18 Sep 2020 12:15:22 -0300 Subject: [PATCH 035/293] mate.mate-system-monitor: 1.24.0 -> 1.24.1 --- pkgs/desktops/mate/mate-system-monitor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix index 480cf8de1de..38c6a041e43 100644 --- a/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-system-monitor"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1cb36lrsn4fhsryl2kl4yq0qhp1p4r7k21w3fc2ywjga8fdxx6y5"; + sha256 = "1i2r4lw6xsk972yp15g5hm8p8xx9pp6jmcvvzbdq80xyx3x898qz"; }; nativeBuildInputs = [ From c21113bf4486b028df37f635fd15f79eb8c2f06c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 18 Sep 2020 12:15:22 -0300 Subject: [PATCH 036/293] mate.mate-terminal: 1.24.0 -> 1.24.1 --- pkgs/desktops/mate/mate-terminal/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index fc030152bcd..c187aba8977 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, gettext, glib, itstool, libxml2, mate, dconf, gtk3, vte, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, glib, itstool, libxml2, mate, dconf, gtk3, vte, pcre2, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-terminal"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0nc23nmbkya2fgf7j65z85dcibwi5akkr8nscqrvk039ckirhk97"; + sha256 = "0qmyhxmarwkxad8k1m9q1iwx70zhfp6zc2mh74nv26nj4gr3h3am"; }; buildInputs = [ @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { vte gtk3 dconf + pcre2 ]; nativeBuildInputs = [ From ca50ceb2683469cc2ef56827011921a04994e0a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 18 Sep 2020 12:15:22 -0300 Subject: [PATCH 037/293] mate.pluma: 1.24.0 -> 1.24.1 --- pkgs/desktops/mate/pluma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index 5a12ffc3782..94a87f5d5f0 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pluma"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1vmndhlhy3qkf3xs5kkv0xhbv5ar25pqz0kp17hc4qhgjzycfr0r"; + sha256 = "1sgc5f480icr2ans6gd3akvcax58mr4jp3zjk3xn7bx1mw9i299f"; }; nativeBuildInputs = [ From 64916fe0776125e503898927a79c4d28fc68dadf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 18 Sep 2020 16:29:34 -0300 Subject: [PATCH 038/293] mate.engrampa: enable libmagic to detect file type --- pkgs/desktops/mate/engrampa/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index 50abf9b4078..fce62f9f016 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, itstool, libxml2, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, gettext, itstool, libxml2, gtk3, file, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "engrampa"; @@ -19,12 +19,16 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 gtk3 + file #libmagic mate.caja hicolor-icon-theme mate.mate-desktop ]; - configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" ]; + configureFlags = [ + "--with-cajadir=$$out/lib/caja/extensions-2.0" + "--enable-magic" + ]; enableParallelBuilding = true; From 074e05c6d8be92dca22a9096890bdb89cedbc6e8 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sat, 19 Sep 2020 17:24:53 +0200 Subject: [PATCH 039/293] dotnetCorePackages.sdk_5_0: init at version 5.0.100-rc.1.20452.10 Co-authored-by: Felix Tenley --- pkgs/development/compilers/dotnet/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index 2dd5088919d..ef8e4fd18f3 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -106,11 +106,11 @@ rec { # v5.0.0 sdk_5_0 = buildNetCoreSdk { - version = "5.0.100-preview.8.20417.9"; + version = "5.0.100-rc.1.20452.10"; sha512 = { - x86_64-linux = "2a4m4jb75hc0l135pjpinawlc0jr3rz9hyfm22kkaqs5wacwj5d87lsds2wvp2jf7r1f445098sg65l6az9zqwg4da52qrvcv1ck1hd"; - aarch64-linux = "1zb5f3ihlcjbij6sa9nfvj9rn4frhdbiw0nplqm8lf8q2z2y7h210p8r4l1qwkkm080185kj7kgd2hja54hddgghva26jpq6r36b7hj"; - x86_64-darwin = "0c5cj6b0kc4nrsbxfmal4c1z5anqbxr6gd6knpqfb6m30z37qiks16xakacrm69313wmqpr9mmyiwpj38gcsw2dam9hgzawibwnv4fv"; + x86_64-linux = "d7e709dacc4bb188c2380060d24bfb5b791240dc33af8499fb4a31e1885a9377dad1d1ebc76847432ea67d5e4ac832a31679dc293e09fa6dade28f5fbbe4db9b"; + aarch64-linux = "2d04890c71e845d1eb08f5dfbbb9c93024d7a52fb1cc3fd50bd51bc6bd44e455c5c82abc8f04eef23bd012984ae5f86143c600ceb49c4c733935d95d5b68785f"; + x86_64-darwin = "06bb40273071f3dd1e84ebf58abc7798795d5f1ac298f24bf7109d1597fd52ff31bcbf2b81f86d91d37ae293678d07f8da0469d7cbd318d19a8d718b6629dcac"; }; }; } From 85ece7792bb6a36ff7473364acf56b3d8600b094 Mon Sep 17 00:00:00 2001 From: Martin Puppe Date: Fri, 11 Sep 2020 11:30:44 +0200 Subject: [PATCH 040/293] nextcloud19: 19.0.1 -> 19.0.3 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index a6fcf632793..cec7a847fb4 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -38,7 +38,7 @@ in { }; nextcloud19 = generic { - version = "19.0.1"; - sha256 = "0bavwvjjgx62i150wqh4gqavjva3mnhx6k3im79ib6ck1ph13wsf"; + version = "19.0.3"; + sha256 = "0sc9cnsdh8kj60h7i3knh40ngdz1w1wmdqw2v2axfkmax22kjl7w"; }; } From 731d55baadb308663f581166accc161a255208cf Mon Sep 17 00:00:00 2001 From: Martin Puppe Date: Fri, 11 Sep 2020 11:30:17 +0200 Subject: [PATCH 041/293] nextcloud18: 18.0.7 -> 18.0.9 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index cec7a847fb4..061f1a1a394 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -33,8 +33,8 @@ in { }; nextcloud18 = generic { - version = "18.0.7"; - sha256 = "0pka87ccrds17n6n5w5a80mc1s5yrf8d4mf6wsfaypwjbm3wfb2b"; + version = "18.0.9"; + sha256 = "0rigg5pv2vnxgmjznlvxfc41s00raxa8jhib5vsznhj55qn99jm1"; }; nextcloud19 = generic { From 9ac89380311554c1b60695aa0e7de16b84d089d2 Mon Sep 17 00:00:00 2001 From: Jon Banafato Date: Sun, 20 Sep 2020 15:22:56 -0400 Subject: [PATCH 042/293] gnomeExtensions.appindicator: 33 -> 34 --- pkgs/desktops/gnome-3/extensions/appindicator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix index 5f34d079114..0638241df53 100644 --- a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix +++ b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-appindicator"; - version = "33"; + version = "34"; src = fetchFromGitHub { owner = "Ubuntu"; repo = "gnome-shell-extension-appindicator"; rev = "v${version}"; - sha256 = "0qm77s080nbf4gqnfzpwp8a7jf7lliz6fxbsd3lasvrr11pgsk87"; + sha256 = "0p9sk8cv2z242d5783gx2m4l1x9vg5fy1a7yr1wcfshvajlrj23m"; }; # This package has a Makefile, but it's used for building a zip for From 57597f605081e4b8daba937f68087840c02ca208 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 22 Sep 2020 14:54:17 +0200 Subject: [PATCH 043/293] tree-sitter: 0.16.4 -> 0.16.9 --- pkgs/development/tools/parsing/tree-sitter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index b91acdca688..7f48a6ad97d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -11,9 +11,9 @@ let # 1) change all these hashes # 2) nix-build -A tree-sitter.updater.update-all-grammars # 3) run the ./result script that is output by that (it updates ./grammars) - version = "0.16.4"; - sha256 = "1m0zxz7h4w2zny7yhrlxwqvizcf043cizg7ca5dn3h9k16adcxil"; - cargoSha256 = "0hxm73diwiybljm6yy3vmwfdpg33b4rlg0h7afq4xgccq2vkwafs"; + version = "0.16.9"; + sha256 = "sha256-e5Ft+jEpExLgBBFmiswW0VFrsKume4gmUiOiF4ODhhQ="; + cargoSha256 = "sha256-XbPLQEvf4JX517ddpx18eweiPrztS5E/X2pejkqmlCU="; src = fetchFromGitHub { owner = "tree-sitter"; From 51b854a25454987c25e12eb61ae69b365727d7e8 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 22 Sep 2020 14:54:30 +0200 Subject: [PATCH 044/293] tree-sitter.grammars: update initialize php grammar too. --- .../tools/parsing/tree-sitter/grammars/default.nix | 1 + .../tree-sitter/grammars/tree-sitter-bash.json | 11 +++++++---- .../parsing/tree-sitter/grammars/tree-sitter-c.json | 11 +++++++---- .../parsing/tree-sitter/grammars/tree-sitter-cpp.json | 11 +++++++---- .../grammars/tree-sitter-embedded-template.json | 11 +++++++---- .../parsing/tree-sitter/grammars/tree-sitter-go.json | 11 +++++++---- .../tree-sitter/grammars/tree-sitter-html.json | 11 +++++++---- .../tree-sitter/grammars/tree-sitter-javascript.json | 11 +++++++---- .../tree-sitter/grammars/tree-sitter-jsdoc.json | 11 +++++++---- .../tree-sitter/grammars/tree-sitter-json.json | 11 +++++++---- .../parsing/tree-sitter/grammars/tree-sitter-php.json | 10 ++++++++++ .../tree-sitter/grammars/tree-sitter-python.json | 11 +++++++---- .../tree-sitter/grammars/tree-sitter-ruby.json | 11 +++++++---- .../tree-sitter/grammars/tree-sitter-rust.json | 11 +++++++---- .../tree-sitter/grammars/tree-sitter-typescript.json | 11 +++++++---- 15 files changed, 102 insertions(+), 52 deletions(-) create mode 100644 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index ef0db9d68a9..5898997dd6e 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -8,6 +8,7 @@ javascript = (builtins.fromJSON (builtins.readFile ./tree-sitter-javascript.json)); jsdoc = (builtins.fromJSON (builtins.readFile ./tree-sitter-jsdoc.json)); json = (builtins.fromJSON (builtins.readFile ./tree-sitter-json.json)); + php = (builtins.fromJSON (builtins.readFile ./tree-sitter-php.json)); python = (builtins.fromJSON (builtins.readFile ./tree-sitter-python.json)); ruby = (builtins.fromJSON (builtins.readFile ./tree-sitter-ruby.json)); rust = (builtins.fromJSON (builtins.readFile ./tree-sitter-rust.json)); diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json index c367d24d09f..f1d5efbe7ea 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bash.json @@ -1,7 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-bash", - "rev": "7b8adcf484e27b6c1a707ce28123e55dd4b7a844", - "date": "2019-07-26T14:05:41-06:00", - "sha256": "047p51ab4fqm55xqss6z74iyj1hlndql97dv9fifckczx3d5xn5g", - "fetchSubmodules": false + "rev": "e213464b5062017dc058cfb7effe2fc7a2eebb04", + "date": "2020-03-02T14:55:46+01:00", + "path": "/nix/store/napdz7i4k0gz469zsszdlvr5hmj8y7i9-tree-sitter-bash", + "sha256": "0wz9rmpd36g88l2hhy1xl3i5d6a6di1jlw11qkvccgg16kb9p4h7", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json index c44bd0344b3..401bea63e0a 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,7 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-c", - "rev": "6002fcd5e86bb1e8670157bb008b97dbaf656d95", - "date": "2019-12-17T10:25:11-08:00", - "sha256": "0bcsgwyv9nskkh26hl4hylb03py98d2m565bgvq7fn3f8gyx5w7v", - "fetchSubmodules": false + "rev": "99151b1e9293c9e025498fee7e6691e1a52e1d03", + "date": "2020-05-14T11:39:30-07:00", + "path": "/nix/store/b5xqnw967s9a58wcpyspbkgbph6jxarv-tree-sitter-c", + "sha256": "07ax01r3npw13jlv20k15q2hdhqa0rwm2km6f5j50byqvmgfc6fm", + "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 b17af74ac8c..99af884be9f 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,7 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-cpp", - "rev": "c7b767ac5fce26301321f91fb83fe9392c02d51d", - "date": "2019-12-17T13:43:08-08:00", - "sha256": "16i9iggr7ff18bif81viy9rvn1z55ad6yaq6dj0znjgaq8q6aclx", - "fetchSubmodules": false + "rev": "5e7476bd014445abdae879661e9caf299215478a", + "date": "2020-05-14T11:46:56-07:00", + "path": "/nix/store/xz540ah1xx06n3wwmk3ym72nj0bz82hh-tree-sitter-cpp", + "sha256": "0v2l5269bhbpzcd929r3pn88gqcczx6spsq7p6ibsvsydbwj95wx", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json index a83a5a429e8..f0ef7079bf6 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json @@ -1,7 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-embedded-template", - "rev": "3ca7c50fd3dd02df88cf120d8ab5b7b1f2efb270", - "date": "2020-01-16T16:31:20-08:00", - "sha256": "0vhmfn7jr5hdzksw808z99scqcyjr0i3qiybiq0yb644ysdmai05", - "fetchSubmodules": false + "rev": "8269c1360e5b1b9ba3e04e7896d9dd2f060de12f", + "date": "2020-07-20T12:50:27-07:00", + "path": "/nix/store/9ijnzv72vc1n56k6f1xp3kb7lc9hvlhh-tree-sitter-embedded-template", + "sha256": "03symsaxp8m128cn5h14pnm30ihpc49syb4vybpdvgcvraa408qq", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json index bf8c4408b54..67d58d64063 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json @@ -1,7 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-go", - "rev": "689cc8fbdc0613d267434f221af85aff91a31f8c", - "date": "2020-01-23T10:27:48-08:00", - "sha256": "04gpzi125akwgww5smw5x4dqr6jv5sq1165qn86bz15hwcmnybfj", - "fetchSubmodules": false + "rev": "34181774b3e86b7801c939c79c7b80a82df91a2b", + "date": "2020-08-13T12:21:50-07:00", + "path": "/nix/store/3a5w7pz1m74y0lhbzq3bw3k2297lypqs-tree-sitter-go", + "sha256": "0cfi7ghs0m3iqwd4jvsqgsj4gnfikn1j2q0wbkdfvz2j25l0qwq0", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json index 40d124b8626..7e53e76c0de 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json @@ -1,7 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-html", - "rev": "2147dd298a2b2e9593bfcb51a14c289a0dc7eb87", - "date": "2020-01-16T12:47:09-08:00", - "sha256": "0acg9v940xq4sw7019z2izc9qs10wwqipyiki243dws6z0wmwhdq", - "fetchSubmodules": false + "rev": "7f442e1c6163d450c69c75c7a621badc3a0ea98f", + "date": "2020-07-20T12:46:52-07:00", + "path": "/nix/store/qklk97krsas1kjbh8dp6ii1gj9sqz8h9-tree-sitter-html", + "sha256": "0z249nnxlal8g6zbrys6kb80vksgcw2j5nd737m6yna2h5bhl126", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json index 04a6ae1056e..9020e8a40bc 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json @@ -1,7 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-javascript", - "rev": "6e3692292adf8750fece625fc06fc1503e00d75e", - "date": "2020-01-27T13:47:50-08:00", - "sha256": "1i8m7v0859109bf2dz0dhf4cnhqmwc4947z49g4rs07k8h8dfk99", - "fetchSubmodules": false + "rev": "3d5493495b62b4ff8e8c24aee7519dd904e25813", + "date": "2020-09-21T17:18:41-07:00", + "path": "/nix/store/bhjws8yif1ihhvhfsrdrp4inf03ks08r-tree-sitter-javascript", + "sha256": "10fscmclcgl1a0314ppkfy0s7pmiiz5vjipbmks76608kic8nzpp", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json index 9795f600c82..5dca4a5f961 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json @@ -1,7 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-jsdoc", - "rev": "7b2dc910126d553cddd3b2318f39604d205b3a21", - "date": "2020-01-27T13:06:46-08:00", - "sha256": "04ahmbwfx3238dbsvlpg8xgb1c4bazdd8yw7dk4vph9cp8rq0dj5", - "fetchSubmodules": false + "rev": "77e7785739ad3e90c3de8ed5a55418a5fd2b8225", + "date": "2020-05-14T14:58:51-07:00", + "path": "/nix/store/3wp3hff203z15fvbnizcqzic1pjxmpg4-tree-sitter-jsdoc", + "sha256": "0i2ac7i0vs46668q56dpmd9c02vcyy3f8rh4i0dbvd3rvihifbgc", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json index 282e28c9be8..a7080936988 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json @@ -1,7 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-json", - "rev": "7b6a33f300e3e88c3017e0a9d88c77b50ea6d149", - "date": "2019-12-10T10:27:22-08:00", - "sha256": "17yc7spn8v64ll684634zmjq3130yxvb5bfgjwg0agcaklpx71dp", - "fetchSubmodules": false + "rev": "d3976b27df8622ed17bef6dd5e358b398e73c676", + "date": "2020-05-14T14:59:27-07:00", + "path": "/nix/store/ds2wnlrh289rsnjx828h3jy1706g3x21-tree-sitter-json", + "sha256": "1cbhsmzbjni0mynjcai6gshhg16nls82v9lcihxf350dz57f7sax", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json new file mode 100644 index 00000000000..1fb2a079848 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json @@ -0,0 +1,10 @@ +{ + "url": "https://github.com/tree-sitter/tree-sitter-php", + "rev": "b0c0367d4b7058921fdc4ba11e257441a64ab809", + "date": "2020-07-29T16:56:25-07:00", + "path": "/nix/store/la06yzcv5w1dpp31s4clllkfic8rs98a-tree-sitter-php", + "sha256": "0a47rr1d5dg70kfvk257g7mhpcwslv6prxc7012spxcrfiwbx89l", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json index 4abdc3fe00a..1c057f51ea9 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,7 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-python", - "rev": "899ac8d5d6c883b2f05362c9953e14e78aac474c", - "date": "2020-01-16T16:30:41-08:00", - "sha256": "1mw23kfr33s6md701p0p2nrd04119204ir78i7j1s5cxiyvpjq33", - "fetchSubmodules": false + "rev": "30f538aa1f932a2864c102694761d3127a61dc68", + "date": "2020-09-21T13:21:51-07:00", + "path": "/nix/store/bxv85lm636xdsdqjf4n7sxjlhhh35qnv-tree-sitter-python", + "sha256": "0hzzz90pn1qwyl5xk03cah62rbvp1c1yp1pw2m3hifqflxg4rs1g", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json index db58c7eb3eb..06418942b4d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json @@ -1,7 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-ruby", - "rev": "6540da2a79ceb7dc7afe50e9ac01eaad4378702d", - "date": "2019-12-09T14:56:14-08:00", - "sha256": "1i0ab1rm5hba0nnbmi4m37fbs368hk6wyby09pfmcmjwpi9zs0f9", - "fetchSubmodules": false + "rev": "a6fcb529e9097a2efbbb3f4857e42773e7f2474f", + "date": "2020-05-26T16:18:48-07:00", + "path": "/nix/store/yqd5b7ky21scahnhrik9psalbkwi3ab3-tree-sitter-ruby", + "sha256": "0bxg5lfdazz5mlfnf0amcygvc8b2ydzl2blvbbhnziyx92r8di6q", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false } diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json index e3a906f076a..9f037cdc094 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json @@ -1,7 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-rust", - "rev": "1c37782a5528979a22991f8ed50dd3d3e423ac92", - "date": "2020-01-20T16:08:51-08:00", - "sha256": "04fzzn2rxpfg7pwymmarkdjabbp20yp10yzr4a5a1xcqx8hky9ix", - "fetchSubmodules": false + "rev": "40620bf4097cbc9cea79504d7e877865df43a19e", + "date": "2020-05-15T10:53:35-07:00", + "path": "/nix/store/r24bba6gxchb5zqzghna8yjvqnngbv4a-tree-sitter-rust", + "sha256": "0hjp6nsskw341g97x41481b3zfwh8g853fs9six6j1mh92irmv6y", + "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 9995665c7c6..7081d3036cf 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,7 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-typescript", - "rev": "aa950f58ea8aa112bc72f3481b98fc2d3c07b3e0", - "date": "2020-01-27T13:51:28-08:00", - "sha256": "0y64lls7hw7yc70d9i6p4n1kchg11sbgl2m6yafy7w2ymksb5iw5", - "fetchSubmodules": false + "rev": "5a38a5bd04364d9f48b902fd1514e075b98b0edc", + "date": "2020-09-17T10:19:01-07:00", + "path": "/nix/store/b3q7vz9zhgjdbv3c2xap4k2ghpdjp2yf-tree-sitter-typescript", + "sha256": "1mxwvzqbaaq11cz7zidiwr29fs0b6ycf3nadwdkgiz8c6x2xx398", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false } From a2dd66b087b83329e78d78ea6bb516892c177145 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Tue, 22 Sep 2020 15:37:42 +0200 Subject: [PATCH 045/293] micropython: 1.12 -> 1.13 --- pkgs/development/interpreters/micropython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/micropython/default.nix b/pkgs/development/interpreters/micropython/default.nix index 3293c4b9f58..8d5a0252944 100644 --- a/pkgs/development/interpreters/micropython/default.nix +++ b/pkgs/development/interpreters/micropython/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "micropython"; - version = "1.12"; + version = "1.13"; src = fetchFromGitHub { owner = "micropython"; repo = "micropython"; rev = "v${version}"; - sha256 = "1fsigdahnv5yn0mc7dr1y6h7g8ywg084pcgj6d64kb39w641n8j5"; + sha256 = "0m9g6isys4pnlnkdmrw7lxaxdrjn02j481wz5x5cdrmrbi4zi17z"; fetchSubmodules = true; }; From 0d9a6e2da5a51e4cada209159f7d8a23028e602d Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Thu, 10 Sep 2020 09:09:34 -0400 Subject: [PATCH 046/293] verilog: cleanup Meta attributes were out of date or not in current style, and some attributes of derivation were redundant. --- pkgs/applications/science/electronics/verilog/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix index 082d44ddc6e..37f7ca70a46 100644 --- a/pkgs/applications/science/electronics/verilog/default.nix +++ b/pkgs/applications/science/electronics/verilog/default.nix @@ -15,11 +15,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - prePatch = '' - substituteInPlace configure.in \ - --replace "AC_CHECK_LIB(termcap, tputs)" "AC_CHECK_LIB(termcap, tputs)" - ''; - preConfigure = '' chmod +x $PWD/autoconf.sh $PWD/autoconf.sh @@ -31,9 +26,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Icarus Verilog compiler"; - repositories.git = "https://github.com/steveicarus/iverilog.git"; homepage = "http://iverilog.icarus.com/"; - license = licenses.lgpl21; + license = with licenses; [ gpl2Plus lgpl21Plus] ; maintainers = with maintainers; [ winden ]; platforms = platforms.all; }; From ba886f7b1a7fd0de222cd58c99d3ec1e72245e91 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Thu, 10 Sep 2020 09:10:01 -0400 Subject: [PATCH 047/293] verilog: add tests Run recommended self-tests from iverilog's CI. Tests add about a minute to the build time on local machine (2 -> 3 mins). --- .../science/electronics/verilog/default.nix | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix index 37f7ca70a46..df1ce7b7235 100644 --- a/pkgs/applications/science/electronics/verilog/default.nix +++ b/pkgs/applications/science/electronics/verilog/default.nix @@ -1,7 +1,17 @@ { stdenv, fetchFromGitHub, autoconf, gperf, flex, bison, readline, ncurses , bzip2, zlib +# Test inputs +, perl }: +let + iverilog-test = fetchFromGitHub { + owner = "steveicarus"; + repo = "ivtest"; + rev = "6882cb8ec08926c4e356c6092f0c5f8c23328d5c"; + sha256 = "04sj5nqzwls1y760kgnd9c2whkcrr8kvj9lisd5rvk0w580kjb2x"; + }; +in stdenv.mkDerivation rec { pname = "iverilog"; version = "unstable-2020-08-24"; @@ -24,6 +34,28 @@ stdenv.mkDerivation rec { buildInputs = [ readline ncurses bzip2 zlib ]; + # tests from .travis.yml + doCheck = true; # runs ``make check`` + # most tests pass, but some that rely on exact text of floating-point numbers fail on aarch64. + doInstallCheck = !stdenv.isAarch64; + installCheckInputs = [ perl ]; + + installCheckPhase = '' + # copy tests to allow writing results + export TESTDIR=$(mktemp -d) + cp -r ${iverilog-test}/* $TESTDIR + + pushd $TESTDIR + + # Run & check tests + PATH=$out/bin:$PATH perl vvp_reg.pl + # Check the tests, will error if unexpected tests fail. Some failures MIGHT be normal. + diff regression_report-devel.txt regression_report.txt + PATH=$out/bin:$PATH perl vpi_reg.pl + + popd + ''; + meta = with stdenv.lib; { description = "Icarus Verilog compiler"; homepage = "http://iverilog.icarus.com/"; From be4832848d5cb28db7346e6ceb0cda1da35476af Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 22 Sep 2020 20:40:36 +0200 Subject: [PATCH 048/293] tree-sitter.grammars: compile scanner.cc if exists otherwise neovim's treesitter fails with for instance: `undefined symbol: tree_sitter_bash_external_scanner_create` --- pkgs/development/tools/parsing/tree-sitter/library.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/parsing/tree-sitter/library.nix b/pkgs/development/tools/parsing/tree-sitter/library.nix index 2d5d3e7d0b4..36245ff7d44 100644 --- a/pkgs/development/tools/parsing/tree-sitter/library.nix +++ b/pkgs/development/tools/parsing/tree-sitter/library.nix @@ -18,7 +18,11 @@ stdenv.mkDerivation { configurePhase= ":"; buildPhase = '' runHook preBuild - $CC -I$src/src/ -shared -o parser -Os $src/src/parser.c + scanner_cc="$src/src/scanner.cc" + if [ ! -f "$scanner_cc" ]; then + scanner_cc="" + fi + $CC -I$src/src/ -shared -o parser -Os $src/src/parser.c $scanner_cc -lstdc++ runHook postBuild ''; installPhase = '' From 29620dbaa90b17b5c265ec8825f536bfe7fc9b10 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 23 Sep 2020 08:16:13 +0100 Subject: [PATCH 049/293] skypeforlinux: 8.63.0.76 -> 8.64.0.81 --- .../networking/instant-messengers/skypeforlinux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index bdcaf3bd608..bc5fa0e1f12 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.63.0.76"; + version = "8.64.0.81"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -65,7 +65,7 @@ let "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" ]; - sha256 = "0gmrk1giabr53imiwdflf6ykwpcj2q5zn3bynvrncnhivsbvaavy"; + sha256 = "0p6sp45kabm97p3hp3wp087b3k42m26ji99kzhpsz3n9vzjiczjh"; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; From 2560a3bd5cffbe67d6a9558b859c3ddb0ef15dbf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 23 Sep 2020 11:06:00 +0000 Subject: [PATCH 050/293] icewm: 1.7.0 -> 1.8.1 --- pkgs/applications/window-managers/icewm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index 57f4a764c90..8043134f8c9 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -9,13 +9,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "icewm"; - version = "1.7.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "bbidulock"; repo = "icewm"; rev = version; - sha256 = "0x6axhwfwxxgnljf3201hvrwa90yacf3ln24lsywrk1bxq9am74b"; + sha256 = "0qd3cakhhjc7h6xr9q3ia9f8wln6q23dlqvw19khia26c0dgyd7b"; }; nativeBuildInputs = [ cmake pkgconfig perl asciidoc ]; From b7c64a1886dcc0c163531480e85c424ba8e5650d Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Wed, 23 Sep 2020 13:07:11 +0200 Subject: [PATCH 051/293] perlPackages.LinkEmbedder: 1.12 -> 1.14 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 64fc2011ff1..643ad059202 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10763,10 +10763,10 @@ let LinkEmbedder = buildPerlPackage { pname = "LinkEmbedder"; - version = "1.12"; + version = "1.14"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/LinkEmbedder-1.12.tar.gz"; - sha256 = "1fd25bd6047b45cdcb1ab71a3d3bb0b36c71ec844a8742dee0bb34f8587fbd08"; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/LinkEmbedder-1.14.tar.gz"; + sha256 = "1dzbh40g773ivawn1smii6jz3kisz07pcn9sbqarc857q5zaf8dq"; }; buildInputs = [ TestDeep ]; propagatedBuildInputs = [ Mojolicious ]; From 88c34acae3b27a8f779dd1f090e7970e8f9390df Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Wed, 23 Sep 2020 13:11:00 +0200 Subject: [PATCH 052/293] convos: 4.33 -> 4.40 --- pkgs/applications/networking/irc/convos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/convos/default.nix b/pkgs/applications/networking/irc/convos/default.nix index 7a30737c047..9487780634d 100644 --- a/pkgs/applications/networking/irc/convos/default.nix +++ b/pkgs/applications/networking/irc/convos/default.nix @@ -6,13 +6,13 @@ with stdenv.lib; perlPackages.buildPerlPackage rec { pname = "convos"; - version = "4.33"; + version = "4.40"; src = fetchFromGitHub { owner = "Nordaaker"; repo = pname; rev = version; - sha256 = "0mxq4jpjk4vvhi5lqslj614dvk84iq12rsdyykxr8h9cnjjs57im"; + sha256 = "0yyykr86d494xq1ga5ncr6jmdf0ny1r4gm0wzwn49bxn2x1l0xck"; }; nativeBuildInputs = [ makeWrapper ] From e4c71e6c6c7612f8e0d40ba5b79322f0883fa500 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 9 Sep 2020 21:39:23 +1000 Subject: [PATCH 053/293] buildRustPackage: support setting test-threads --- doc/languages-frameworks/rust.section.md | 12 ++++++++++++ pkgs/build-support/rust/default.nix | 5 ++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 7f9d93216ed..0e1d59e1a95 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -119,6 +119,18 @@ The above are just guidelines, and exceptions may be granted on a case-by-case b However, please check if it's possible to disable a problematic subset of the test suite and leave a comment explaining your reasoning. +#### Setting `test-threads` + +`buildRustPackage` will use parallel test threads by default, +sometimes it may be necessary to disable this so the tests run consecutively. + +```nix +rustPlatform.buildRustPackage { + /* ... */ + cargoParallelTestThreads = false; +} +``` + ### Building a package in `debug` mode By default, `buildRustPackage` will use `release` mode for builds. If a package diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 0103e064828..f6177ce198d 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -30,6 +30,8 @@ , cargoVendorDir ? null , checkType ? buildType , depsExtraArgs ? {} +, cargoParallelTestThreads ? true + # Needed to `pushd`/`popd` into a subdir of a tarball if this subdir # contains a Cargo.toml, but isn't part of a workspace (which is e.g. the # case for `rustfmt`/etc from the `rust-sources). @@ -204,11 +206,12 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // { checkPhase = args.checkPhase or (let argstr = "${stdenv.lib.optionalString (checkType == "release") "--release"} --target ${rustTarget} --frozen"; + threads = if cargoParallelTestThreads then "$NIX_BUILD_CORES" else "1"; in '' ${stdenv.lib.optionalString (buildAndTestSubdir != null) "pushd ${buildAndTestSubdir}"} runHook preCheck echo "Running cargo test ${argstr} -- ''${checkFlags} ''${checkFlagsArray+''${checkFlagsArray[@]}}" - cargo test -j $NIX_BUILD_CORES ${argstr} -- --test-threads=$NIX_BUILD_CORES ''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"} + cargo test -j $NIX_BUILD_CORES ${argstr} -- --test-threads=${threads} ''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"} runHook postCheck ${stdenv.lib.optionalString (buildAndTestSubdir != null) "popd"} ''); From f294531f17b6daddc7a9b44df6844bdf04405420 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 9 Sep 2020 21:39:23 +1000 Subject: [PATCH 054/293] castor: use cargoParallelTestThreads --- pkgs/applications/networking/browsers/castor/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/castor/default.nix b/pkgs/applications/networking/browsers/castor/default.nix index dd8ddd2dccb..c9ad213cf1d 100644 --- a/pkgs/applications/networking/browsers/castor/default.nix +++ b/pkgs/applications/networking/browsers/castor/default.nix @@ -39,8 +39,7 @@ rustPlatform.buildRustPackage rec { postInstall = "make PREFIX=$out copy-data"; # Sometimes tests fail when run in parallel - #checkFlags = [ "--test-threads=1" ]; - doCheck = false; + cargoParallelTestThreads = false; meta = with stdenv.lib; { description = "A graphical client for plain-text protocols written in Rust with GTK. It currently supports the Gemini, Gopher and Finger protocols"; @@ -49,4 +48,3 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ fgaz ]; }; } - From 664170166edb47028adb71f4edd3a1dc69873799 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 9 Sep 2020 21:39:23 +1000 Subject: [PATCH 055/293] gitAndTools.git-interactive-rebase-tool: use cargoParallelTestThreads --- .../git-and-tools/git-interactive-rebase-tool/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix index e6185ec8ab9..b656deaa716 100644 --- a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix @@ -15,8 +15,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ ncurses5 ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; - #checkFlagsArray = [ "--test-threads=1" ]; - doCheck = false; + cargoParallelTestThreads = false; meta = with stdenv.lib; { homepage = "https://github.com/MitMaro/git-interactive-rebase-tool"; From a6c17c9cdd23af192a811e6c7b3cfb37fcd986fb Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 9 Sep 2020 21:39:23 +1000 Subject: [PATCH 056/293] the-way: use cargoParallelTestThreads --- pkgs/development/tools/the-way/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/the-way/default.nix b/pkgs/development/tools/the-way/default.nix index dce18580577..6042f5f891a 100644 --- a/pkgs/development/tools/the-way/default.nix +++ b/pkgs/development/tools/the-way/default.nix @@ -16,8 +16,8 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ]; cargoSha256 = "0adhgp6blwx7s1hlwqzzsgkzc43q9avxx8a9ykvvv2s1w7m9ql78"; - #checkFlags = "--test-threads=1"; - doCheck = false; + checkFlagsArray = stdenv.lib.optionals stdenv.isDarwin [ "--skip=copy" ]; + cargoParallelTestThreads = false; postInstall = '' $out/bin/the-way config default tmp.toml From 357014e09c37776283b7dd6e2662c6f102e1b68b Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Wed, 23 Sep 2020 19:40:21 -0700 Subject: [PATCH 057/293] libkml: fix tests on darwin Darwin tests require rpath setup for libs in build dir --- pkgs/development/libraries/libkml/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/libkml/default.nix b/pkgs/development/libraries/libkml/default.nix index d619101c233..690d9b9801c 100644 --- a/pkgs/development/libraries/libkml/default.nix +++ b/pkgs/development/libraries/libkml/default.nix @@ -26,6 +26,9 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_TESTING=ON" + # Darwin tests require rpath for libs in build dir + ] ++ stdenv.lib.optional stdenv.isDarwin [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; buildInputs = [ From 6cc2d3e6f267ccc7c1a51a6ef3c63dc95f9482ce Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Wed, 23 Sep 2020 20:45:21 -0700 Subject: [PATCH 058/293] aragorn: fix build on darwin Use environment-specified $CC for C compiler --- pkgs/applications/science/biology/aragorn/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/biology/aragorn/default.nix b/pkgs/applications/science/biology/aragorn/default.nix index 956e4d88453..168bd5c6aa6 100644 --- a/pkgs/applications/science/biology/aragorn/default.nix +++ b/pkgs/applications/science/biology/aragorn/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildPhase = '' - gcc -O3 -ffast-math -finline-functions -o aragorn aragorn${version}.c + $CC -O3 -ffast-math -finline-functions -o aragorn aragorn${version}.c ''; installPhase = '' From 27733e2bf626741fea9c33f4f5474e959b37ef76 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 24 Sep 2020 04:20:00 +0000 Subject: [PATCH 059/293] postgresql_13: init at 13.0 https://www.postgresql.org/docs/13/release-13.html --- pkgs/servers/sql/postgresql/default.nix | 10 +++++++++- .../postgresql/patches/socketdir-in-run-13.patch | 13 +++++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 pkgs/servers/sql/postgresql/patches/socketdir-in-run-13.patch diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index e759a62c2eb..dbe792e5157 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -64,7 +64,7 @@ let (if atLeast "9.6" then ./patches/hardcode-pgxs-path-96.patch else ./patches/hardcode-pgxs-path.patch) ./patches/specify_pkglibdir_at_runtime.patch ./patches/findstring.patch - ] ++ lib.optional stdenv.isLinux ./patches/socketdir-in-run.patch; + ] ++ lib.optional stdenv.isLinux (if atLeast "13" then ./patches/socketdir-in-run-13.patch else ./patches/socketdir-in-run.patch); installTargets = [ "install-world" ]; @@ -221,4 +221,12 @@ in self: { inherit self; }; + postgresql_13 = self.callPackage generic { + version = "13.0"; + psqlSchema = "13"; + sha256 = "15i2b7m9a9430idqdgvrcyx66cpxz0v2d81nfqcm8ss3inz51rw0"; + this = self.postgresql_13; + inherit self; + }; + } diff --git a/pkgs/servers/sql/postgresql/patches/socketdir-in-run-13.patch b/pkgs/servers/sql/postgresql/patches/socketdir-in-run-13.patch new file mode 100644 index 00000000000..72c778b0758 --- /dev/null +++ b/pkgs/servers/sql/postgresql/patches/socketdir-in-run-13.patch @@ -0,0 +1,13 @@ +diff --git i/src/include/pg_config_manual.h w/src/include/pg_config_manual.h +index 8f3ec6bde1..4fc01e4a0a 100644 +--- i/src/include/pg_config_manual.h ++++ w/src/include/pg_config_manual.h +@@ -201,7 +201,7 @@ + * support them yet. + */ + #ifndef WIN32 +-#define DEFAULT_PGSOCKET_DIR "/tmp" ++#define DEFAULT_PGSOCKET_DIR "/run/postgresql" + #else + #define DEFAULT_PGSOCKET_DIR "" + #endif diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0db5bc2a53..2cfe30a8324 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16964,6 +16964,7 @@ in postgresql_10 postgresql_11 postgresql_12 + postgresql_13 ; postgresql = postgresql_11.override { this = postgresql; }; postgresqlPackages = recurseIntoAttrs postgresql.pkgs; From b61855498e9a7e71af6c2648348dcfa3559626ba Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 24 Sep 2020 04:20:00 +0000 Subject: [PATCH 060/293] tfsec: 0.25.0 -> 0.27.0 https://github.com/liamg/tfsec/releases/tag/v0.27.0 --- pkgs/development/tools/analysis/tfsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 61ed0e07af5..e10052203ed 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.25.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "liamg"; repo = pname; rev = "v${version}"; - sha256 = "06sr20zrbhyj35cyw64bk6sjj9q9lh52kc8wg1ryaimr3dc6lrn1"; + sha256 = "12n6l18g0kg28clzyzwc2lq9rnch3vshp07isgvfp7193bhf8hyv"; }; goPackagePath = "github.com/liamg/tfsec"; From 8f9d4f3fc68b6776edcafb99fd8a31cce31906b0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 24 Sep 2020 04:20:00 +0000 Subject: [PATCH 061/293] postgresql: add marsam as maintainer --- pkgs/servers/sql/postgresql/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index dbe792e5157..bc1108ad333 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -144,7 +144,7 @@ let homepage = "https://www.postgresql.org"; description = "A powerful, open source object-relational database system"; license = licenses.postgresql; - maintainers = with maintainers; [ ocharles thoughtpolice danbst globin ]; + maintainers = with maintainers; [ ocharles thoughtpolice danbst globin marsam ]; platforms = platforms.unix; knownVulnerabilities = optional (!atLeast "9.4") "PostgreSQL versions older than 9.4 are not maintained anymore!"; From de309756f304fffdc86b133d3c87628c49658616 Mon Sep 17 00:00:00 2001 From: taku0 Date: Thu, 24 Sep 2020 09:13:12 +0900 Subject: [PATCH 062/293] thunderbird: 78.2.2 -> 78.3.0 --- .../networking/mailreaders/thunderbird/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 06bfd92f5fb..fa68ef83a08 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -70,13 +70,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "78.2.2"; + version = "78.3.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "2cbpyx9jn23kc289z8ikzx3035g5z6p076izvld50mj3kqc0v4n3igih3rv1lsdwysik8c0ax5w3pa037lnrp6ridgbnix34gxr4nw6"; + "2jxwx7yli1f032bdz1d8gd724am8kjxla7d767p0dl1zcw761xnimhl41m4ik7cc9dhj8s6wfhjgrga70794c2dfd7c36dlhgjqp9mx"; }; nativeBuildInputs = [ @@ -147,13 +147,6 @@ stdenv.mkDerivation rec { patches = [ ./no-buildconfig.patch - (fetchpatch { # included in 78.3.0 - name = "empty-UI.patch"; - url = "https://hg.mozilla.org/releases/comm-esr78/raw-rev/f085dbd311bc"; - # paths: {a,b}/foo -> {a,b}/comm/foo - stripLen = 1; extraPrefix = "comm/"; - sha256 = "0x9pw62w93kyd99q9wi2d8llcfzbrqib7fp5kcrjidvhnkxpr6j7"; - }) ]; postPatch = '' From 7bcff2e0429fea8ad8f768ac511b5c0aa60e561a Mon Sep 17 00:00:00 2001 From: taku0 Date: Thu, 24 Sep 2020 16:35:48 +0900 Subject: [PATCH 063/293] thunderbird-bin: 78.2.2 -> 78.3.0 --- .../thunderbird-bin/release_sources.nix | 530 +++++++++--------- 1 file changed, 265 insertions(+), 265 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index a2ff6ce9636..2c7d1af6712 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "78.2.2"; + version = "78.3.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/af/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/af/thunderbird-78.3.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "12d8b417fe101e45460b66faa04e0c99bacd454b563c96b7bd7d5b77cabb8f2c"; + sha256 = "e8a584fc47b5a41338ca4f4938ce4ffb99b00ddc8e83b3b5baa19f778c784e2f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ar/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/ar/thunderbird-78.3.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "1fa7a01cd370114ce9dc65c2d48e001d6969f953ba138fc4005329b2fce7f1fc"; + sha256 = "7c6ca8a36571e2361f2d4a1d3c95e4061abaacaab9cc342ff095e0f7bbaad325"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ast/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/ast/thunderbird-78.3.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "c002ba6b4cded5b085abfad61daccad36a7936af40eacf77e4378caff42f9138"; + sha256 = "e7b47cb0ad29611611d201441ddc45e04823bad143cda1a5a94b9832382f9130"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/be/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/be/thunderbird-78.3.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "17021647dd58eb851f99e8f63e9d4a6ec302a7a7a1f5a0e561fe96bc63abb5f7"; + sha256 = "26f72664c546efb17bdccd244efdf7e86690550fe165155039530ffb0d4c2aaa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/bg/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/bg/thunderbird-78.3.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "e813d46a0ba8dccec07a1bc5201da859a8c23b1cb9140420d902ed9f3fa6f7fd"; + sha256 = "0e38d87d7eccc6af7f5894128b4b51418bc841802709693095ec5d7d1bb5b8a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/br/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/br/thunderbird-78.3.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "0bc12e80e5923271973a3037a26a2fd2702118deba326ab98a8a9d776d25c9ca"; + sha256 = "39fa92e9220c92016281340ba2f05cb04a62fa0ca6ed15f7e12e02ad143c1e0d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ca/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/ca/thunderbird-78.3.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "f8e6abea863956613d646af01ca09f53311e325d6006a28319cb3f9932a03eaf"; + sha256 = "80125296e56ebeaebf15e6b32724814e82e265dc7fe2394820d1880911ba82f0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/cak/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/cak/thunderbird-78.3.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "c7603bc86b2d86a9ceddc55a44f9a8a116ec67d1b23ea659f705ad78ecfc02e3"; + sha256 = "fef1db95465636c18c1c8340ac66ff88caad4ea35b51111c1cb8650d9deb795a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/cs/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/cs/thunderbird-78.3.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "058405304cf6523cbcb1d217ebb393a66067b5cbf839d0b588930b59c828d700"; + sha256 = "4ebc2e7d28fde8a9f6eb878406bfd981f56254008f3276cf8d17dd24e5c45a0a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/cy/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/cy/thunderbird-78.3.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "e6af1a50954e495bd3145513dd7b7c5b3129862cbe5aa2622229855133233e6c"; + sha256 = "4c4cd7ef87c9e83485678bcd1075912f36ac4a38a55b0fb9eac87e387f64de7a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/da/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/da/thunderbird-78.3.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "39a61048e47af6d96242291581ca29d016f4b667ff373167e7de9d5629f4e4d0"; + sha256 = "8209046080482641ce6866562c8bf89733bc008437f9cc88722f0a9653c46f0e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/de/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/de/thunderbird-78.3.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "9ab3e2dc60662d37ab7623fafc8dc586c9baa13819c753331539879463bd6b63"; + sha256 = "83d5532906fb8910ed177008633e073256f9a3fa8da37f0c6896c6d9a0547699"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/dsb/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/dsb/thunderbird-78.3.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "114cd0d19683c0b8c7a5ff0d258d2cf01304eb26f4c7dc466b895c460b129e5b"; + sha256 = "0e33d1505de3f434f6455f4c77b917fc7396652aeb1d961816bd0aa1e74a5bed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/el/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/el/thunderbird-78.3.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "011bb98710b5c6c371e122ada559ec010aa9b965da54bfbc73aef14681f39f97"; + sha256 = "4a1f21553fa491acb123ad6a9e7c1c65977c92d6f6ee578dbef48b953ea56408"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/en-CA/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/en-CA/thunderbird-78.3.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "ff39f524ffd7f455940df65c42a40c045cdae4ead311de5dae8c3d563e0e77fc"; + sha256 = "d01635ba46605d1a2589f2bc7627b43675374928240698305e5cf7cfc8392b2b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/en-GB/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/en-GB/thunderbird-78.3.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "ce353fc8e6e8e8d2ec1378f76879c0bebb55f867f39488fe48a1995685c85b00"; + sha256 = "d681790c0bb5aa4e8a81d002ec6d9003877c64e026a86f613fd649f2ad42af9e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/en-US/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/en-US/thunderbird-78.3.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "e3af4f4b1eaf21c3137047cb5190780fd51e4d27a620efeb6157ffab5ecca950"; + sha256 = "6ccada557f18f5adb4a540423b005a91a1f33ef5a92b17fd38eaa40b2e7197e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/es-AR/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/es-AR/thunderbird-78.3.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "30ba14c91750200fc8f4bb8c031fc7b9ecd3efc2d658d9debcafbe8f4b44ad22"; + sha256 = "51fbb813a209631769b1835773ee656a61a62c64f11357edd36ef2edc4b3758d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/es-ES/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/es-ES/thunderbird-78.3.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "0e3d5f0a0f6f505b52d958cf34f26ea98e716516a7f06664aa3806fb1ade55db"; + sha256 = "fa15cbe049dabaec8567234329d1c24bef726d6e8c09ebc33f19cfad157f5953"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/et/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/et/thunderbird-78.3.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "32acee8023857d5ed54ceb72acb0f5a621ce1884ecf114760f670a3166e7eea9"; + sha256 = "69bd8968d9d9cc9203263091c26955df9bab6682867f6c2da2ce95614a231054"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/eu/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/eu/thunderbird-78.3.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "8827e24c546ccf27c8a02e61794675e675c475a833621840152bc840964bce56"; + sha256 = "ecd39147ecd5271a4d6b48cfff46cc1434992359b68b63e9bb0a32fd20b1959f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/fa/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/fa/thunderbird-78.3.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "9b072f89cc4288443eb986cb6798d35e08ff003c73d0bbf54a2ccdfea1866d17"; + sha256 = "46dbd0ec795e63ba32a7a3d10a40fda43276c8c11a202d1688202cdf152f5862"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/fi/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/fi/thunderbird-78.3.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "9ba017f70955a1aa9c8ff2c94653be569ff0dcdd4784e8ea21e425e5e29140f7"; + sha256 = "88d502d3c96129f1ae092bbe40bdfd880fdc84c4bed593d027f904dbdb5cfec7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/fr/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/fr/thunderbird-78.3.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "7eea9eb22bd47467740e1fa22977dcddd326ca7e9ad7adc8cf7964b9db5da6ce"; + sha256 = "41074accb08f723accd88296f417ca9139eb338090ededf976e75f29b2433944"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/fy-NL/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/fy-NL/thunderbird-78.3.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "c0987516569372c9f98d5c8b6b90ad9a1468c4ed8a4b543130a023c25affbeb1"; + sha256 = "549182c4123fb95ef526c21badf7f5229afa14b9b48159ab7769cd615a4cd5d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ga-IE/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/ga-IE/thunderbird-78.3.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "344122ad4b549ce1610ce409e7f3ef2ab0144abb3c5ef1fe98a3e499ed292441"; + sha256 = "44e1144d9ece9328c74c7e8cabfb3660b004aee542d996e5ec1ad4404617371e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/gd/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/gd/thunderbird-78.3.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "7dc155a4a6bbf1b92822e23a7454e6021a3aa29b807bf9fb16327ecfb627b68f"; + sha256 = "a66ddc5474f2fd3857d83633972f6ad33cc23a4e371adb3de1ac063287f97e30"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/gl/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/gl/thunderbird-78.3.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "c99e642618e273f96ef102bafd61c8bd10b626c3ee2d7072c1bb4264a9653fd1"; + sha256 = "efe1bc2ab7a513f7ac4f41a5d963fdd2ecdc9fb7afa2a6f792efad46423cbf59"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/he/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/he/thunderbird-78.3.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "bbf0acf24c1f8e14833b801512b57d80cf5a07662cbfec841a6b7fa3de6facfb"; + sha256 = "df24d7d466c2ba2bd750ad5c55f9ce8c5ea5ce845a2f7040492a847dad4153e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/hr/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/hr/thunderbird-78.3.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "22237f9fa29556853af1d70343d6087f11b677a3648f521e215ffddf0a583407"; + sha256 = "32fa27101058422448b0d1d154611e71fd96df76ea19ac224ee57cb908409ca7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/hsb/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/hsb/thunderbird-78.3.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "2ed485f1cf5e431cfa561bd266624fdf7e14c725e36fa89f653f71a4a1249eda"; + sha256 = "ac2f378b764687e6eee65ffa3c6492cde6252811bccf91a41e9cc11110477593"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/hu/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/hu/thunderbird-78.3.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "8e3b4ad2fdbdd5f84be3a8c77e8c0f4ce09449190eb0d54fe693f5a619d27562"; + sha256 = "f53e70dc6080c60928419a4035052afec7a1a9c68d43ca34fb42ee9efc0078bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/hy-AM/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/hy-AM/thunderbird-78.3.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "bdd7a97b027d30804b60d86559b15b0bfde2f688bc166677d3762887020e2a1b"; + sha256 = "77a12d688294fc852a5edaafed5936475b25ed546cbbc4bc9cd36f3ec6ce7506"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/id/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/id/thunderbird-78.3.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "259e8fd126c426d8c5bb7c120ccfe28d41183551f41d49f20767e98f8f28d728"; + sha256 = "d2792ba2dc2735c97a3180af031a7da43cd16cbe5c256552c6d840b7afa2a136"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/is/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/is/thunderbird-78.3.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "1c74ec8e38bad9396faac387321608efb3463f539a91782db620ca73dfb26efd"; + sha256 = "92cdf6bfeb024e225efff05f555baf3013031496f565dd7ef658fdf9a3e7e230"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/it/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/it/thunderbird-78.3.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "659fca198575c52c5d90de4456368ea995b2e0dbf7dcb7578e310457142a2421"; + sha256 = "47e9be8bd47567b78965438a3eaffc7350fd3ab6ba1a126973e0f53d92adb57f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ja/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/ja/thunderbird-78.3.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "b9464e9364241e94f4e40286f1b0ffdbeb392d9986b9a9cb18c41f5b96baac6c"; + sha256 = "cbee18ab111ccf3b227ef91c38abed053f1e04bb29d263becb1864cdb4660c9c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ka/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/ka/thunderbird-78.3.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "7c73eb7efdca2e7648383c25ec3d0e2a4250b87908c9644e220eb16e1f5a0219"; + sha256 = "6956a89db0e0148deb82e1d550ecfc270ebf7a3856776c9c8b3bff889b0ef624"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/kab/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/kab/thunderbird-78.3.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "d4d44ccb61058423ed42767d519215bd169dd022d8aa460df7622091522300dc"; + sha256 = "37e011a3103adafe9a89883ba02d5aa91962b4449be9918f79a8dd75bed4c404"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/kk/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/kk/thunderbird-78.3.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "3b8af8f7eed6da665baf1ed477d5f5f1b797baf8c63f3af6ecdc257d66e446e2"; + sha256 = "4ac58a7e5acf773d0184aab3b32bf9e93e917d8fc0edbcae3fa1811d10b27cd4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ko/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/ko/thunderbird-78.3.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "4129db882fde4040e1e87b4aa724b055dadeee98c46e201d24e9f485f3c2b31a"; + sha256 = "a44e7fbc5914d6fb990a7cc248f395d5517df8f2878fee4d7c9488eee5b8e64d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/lt/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/lt/thunderbird-78.3.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "fb1d9fc89edbe4434ecfe18d7ccdeb33c4ced3ad5adb1853baf5b115a784a120"; + sha256 = "2f6c29fb552d3b577d77c14771bda5a99738d98659565fcca31694f85729319b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ms/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/ms/thunderbird-78.3.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "b6498d8ba9fbf63cd61cc968f375b0ecc50e3fadff993fa5070a249b679855da"; + sha256 = "8d95f02c8cdcc093de64cc602f3a4e43be467c0ad2d72065e0672c0f9395c3a8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/nb-NO/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/nb-NO/thunderbird-78.3.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "1d931fad5ca59c3eb29cb8155cbb15a578de28b365cb680e6aab3dc51274078b"; + sha256 = "e2b7fc129209f62a8c6147ce14bc84f54c362e149ca9dd4b6595b8bbb7f5f311"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/nl/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/nl/thunderbird-78.3.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "1378867782f5e0b9cb9efbcc78e5ce9c28d89baca0f353a027fc6878cbb6de58"; + sha256 = "3b2afba6b6841e09dc4db7af70e8fdaf7ccb820ec46e802911fc4b10dcd400b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/nn-NO/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/nn-NO/thunderbird-78.3.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "bbe5f3cc81eac55401ac4a3a2498906077b1e831d369f7f40a4ddca4dfc146bc"; + sha256 = "458fe7cf30621a83d950698a49ac937a14044af2f2ee5704926c0164cd5cc4bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/pa-IN/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/pa-IN/thunderbird-78.3.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "ea617550d8e2aa0b99d81ec8e39c587194a0b7978b3444261caf12fcc7a5b172"; + sha256 = "dba25eb862e80db5708334bea62e795511f0b769c0fafb0f48804f06ce835067"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/pl/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/pl/thunderbird-78.3.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "84b15d310cb1fb7217f21891ee24654b13effa4f004315811d3bb221a8fc54c7"; + sha256 = "b33eafd9ad827bb8b99c127dfcdd18c4c7063b672d06a2c04034f79c0453b062"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/pt-BR/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/pt-BR/thunderbird-78.3.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "2e5682b09d8c6f6d260dd47b2ac7ab0f710103b0b28755c58375ccb132aea464"; + sha256 = "3f0ad3c5f476c3c4fc284bf52cfca1bc8c9fefb3b0fb57a62bf0ead44e97f6a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/pt-PT/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/pt-PT/thunderbird-78.3.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "8a7f90d4ce1b9bdc2d117fabd19fd4f6ca362b89138c5470f7d76f7ec456df54"; + sha256 = "e00156246b5b370f21fa5c6c6f76a4f3f24450216deca01afb132a88a7685f31"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/rm/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/rm/thunderbird-78.3.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "c5a04ab8644dea990c938ab462eb8610471de524f78e09a2293ee9c79260339a"; + sha256 = "7645eec7772e33e14a11516493a54079923c459b25f327fef1d6056df12e041a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ro/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/ro/thunderbird-78.3.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "84b555842d0502dffa99e388bcc6d90355ac4731b66876c279c84c8735a78fd9"; + sha256 = "e63bd8695f12187af15089fdb367ac960ec5381d558a65508402680f20972271"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/ru/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/ru/thunderbird-78.3.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "d5bdde6bd4e155d78ef4fbc91718468406afc3888a80ab751647163aa087bef5"; + sha256 = "44944b2ae9838c49710a0b46411adf5ce39b25e1806c3e35de9fa631d79ea896"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/si/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/si/thunderbird-78.3.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "0311422b20df0b1081e889aa6301bb8930accd1c5b9b2e0e9850f4565f0ac5c3"; + sha256 = "7efd1c975f9b5dd84b2d18063df27a49ff483bbd9d6936c145c0fcf01ac8c14d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/sk/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/sk/thunderbird-78.3.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "b91e58219d46ab7770958ec34a54323b5f7af0cf2548be93de786b76fa92db45"; + sha256 = "1712840259b63c154a559bd579ffe149ee6320aa18cb1498275c5b5931028546"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/sl/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/sl/thunderbird-78.3.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "e993d4c974b00452696dc68037537e18c550c3b6a634cc2da3cd28014594934f"; + sha256 = "2b386674b7d0921d86bf1d4fe6e069464a47163dc9f64ac4ee781593a3956daa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/sq/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/sq/thunderbird-78.3.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "6b18bc35ad9127b6fb149aa71b7e93b556506820e661ddd3a1b9ab298c56ae14"; + sha256 = "fe4b55008a142aa45994d6c02778635e02cf65489a9c64e41c6f1ff44b2fe9b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/sr/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/sr/thunderbird-78.3.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "8fee447a4212f399645923c35de17d882a815adb81bd0b11f9fb1869b5dfaf39"; + sha256 = "486f90acae8688e5a4a7d60d84e7057bb6bb8af7d6d3715eb0940de0a951f9f0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/sv-SE/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/sv-SE/thunderbird-78.3.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "2500816667416a3e4af77098451b98b3e975a1f30e3f393c4e8ebf36ca7495bf"; + sha256 = "ee22d473baca639747ec4ecb05fa42937f6997c59e592b814bdbd4505c4b1be1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/th/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/th/thunderbird-78.3.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "b035f9424db935281a57a181ac1116e8fa137c27a31b9bfb515bb3fef4ca4c0e"; + sha256 = "31177d48dda461f8a0112cb62d157c9b49bca873f131a56af4940dab2fd1e514"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/tr/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/tr/thunderbird-78.3.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "c1cd6f9a2ebe163b8de18d26ecef4fe4beafe8e7212365c2aa71bba3b9fe0967"; + sha256 = "44bcd37c83bcb7105da60988b5b83cdfcf6b95db077226d4010e55c0944416af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/uk/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/uk/thunderbird-78.3.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "de843a0f9c09bc9d37b5d1bb1925075b80efdbe678f5009cd237cb91bc423b55"; + sha256 = "09e204a10698ae3626f459415ce5373cb69c8acdfeb89a6a585ba14a2db084ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/uz/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/uz/thunderbird-78.3.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "770bfd792effc548a619deeb0385f9c8cf6475d1233ce79e83028cfed8e41859"; + sha256 = "5cdd367adf77562e6515d81280511f777d71d24c1e5056e39a7e0aee68560ada"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/vi/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/vi/thunderbird-78.3.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "8183106b59c8999dc3054ead72dad3a14eabe3827ce3211278a35b20656efd62"; + sha256 = "6e898a570d1fab1154e9cc64938245e57fbda54c9a31a89206fb383171372ee5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/zh-CN/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/zh-CN/thunderbird-78.3.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "c35ec93bd0e24f2cafb6948546a46ccde62677e6f73e2afa1e378ed040582544"; + sha256 = "4da17de56b806ab6e76c01c58af87dcdfaf7215175c33af191a232875b4b2ed2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-x86_64/zh-TW/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/zh-TW/thunderbird-78.3.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "444861cc1fa351dce587725d67eec87eecb56a581ce94f812ccd4dbc4ae198bb"; + sha256 = "fba53ae0f767231c9e6bb567af6abe638366514edeeabbeefe087a1a3f37b31a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/af/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/af/thunderbird-78.3.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "05eb2e50d4129c39eb28e22f7b3922868d87d310261b765a4a2c721c4ed7c04a"; + sha256 = "6571f52bd52c84c24f023805cf6c8101102e6369b79e0b89602b0f80f8dff389"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ar/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/ar/thunderbird-78.3.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "264e3f57fed68ced27fb89bf8a1e5b715c465fc70a6fbaf8f161e69f80f46c68"; + sha256 = "ce2dac8ddda048faebb59a697af3041e0cdaf1acba3eb9eadf5d68fe68a87c4c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ast/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/ast/thunderbird-78.3.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "5bfbefd9be834682cc144c063f6bffd56a09d2ea7ec9e83f78f0e984350a4006"; + sha256 = "a75d47202663cf2be5266a5628dba37f377d360edd9f16c83681bf927a4a5271"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/be/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/be/thunderbird-78.3.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "fa1b7c0432320aa293f89529f23321066e2c4e0e474313d267650bba8b39ed90"; + sha256 = "2e001d467e265ed45e1edd2ca7be727c9519ab573be17bab30f9fe8e9e22f922"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/bg/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/bg/thunderbird-78.3.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "1d3f1a298d6ebda804e0aa2a9ad5491c0211dae96ec96e16a8816e5d3e202f63"; + sha256 = "831bc4d837ce1ca174c3811edb4b90b393568f4e0bda5f3766374c64d0be1d21"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/br/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/br/thunderbird-78.3.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "d7f71155d8696d9c17c4cb0e66b987652815761137578819fb4a137c32170347"; + sha256 = "bb15f981f5ae2b827951183623b9b05f9ed2e990f1085a13d604610b571438a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ca/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/ca/thunderbird-78.3.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "44e651bcd4010a00212ea3e295cc6e3e6e7de9e118078d5631c59158a132126c"; + sha256 = "9537779babc1ce1935ec83a968f4c86bdd8b07f780ab21858d2a38a2282873fa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/cak/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/cak/thunderbird-78.3.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "8f7849d17ae9a0d7f1b85b128a542d092c49b2b552369ce7de70ed108e4dc07e"; + sha256 = "3972d530a1074a3a2e62bb82c759df5711ac6c17d99fc82a15a70a22d81c2076"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/cs/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/cs/thunderbird-78.3.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "0426981c8c381227ec2dd19b59cc2c3a62b91f26541dbb8e57bc97b8f4cf3578"; + sha256 = "6723db160fbef3bba26ed9278a11b62940ae969a7969064ee96880271372c9fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/cy/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/cy/thunderbird-78.3.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "12629cfeafc74a979a621c0c8f4ebee0aa6f35dfd6fbda8a59f26e0a63311c17"; + sha256 = "9942e8a0c9767eae94f007976895b4f4815cb1fcf37f422e6217fbb8569f98de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/da/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/da/thunderbird-78.3.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "b280271248e99a68c2d38293275fb7ee5631bd96e7a2f67c96c60280e5148f13"; + sha256 = "7b99acc1d87ed91de39ac00f067fe1c1d7911105205f071a16b13ef43485fe6e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/de/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/de/thunderbird-78.3.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "1caeeaa0b096378b3cab2e41d832a5c60da4e0a3cf9f84230bfe65edde106536"; + sha256 = "f2f0bce89a03d00caa2087f837e3ad4ced3dc2429b1aa735be0a59d1be00dc29"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/dsb/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/dsb/thunderbird-78.3.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "d1822f534ee3d2e95cc412a7f51eabcdf3f56955650da8806f4acd5e48d19d83"; + sha256 = "cecde5b9cf4f998090a27aa2b6e2b4277eb4d49b655c8f2ad7168b2e6029031a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/el/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/el/thunderbird-78.3.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "7ec20a9b566728041394245ef5875be10b70fd04a58419fdf2150168aa86abad"; + sha256 = "d3782c3f62efad5a34eb4d8cbad7c79b8197237bbffd5c240a5201118a0e14c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/en-CA/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/en-CA/thunderbird-78.3.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "62f31fd438ec2e33d5a1d72c57769cea3323d318ed8ad82ebf01050f4ca84fa2"; + sha256 = "1a68fc861be0a410f9942d68fbeeeed6c4b4d22270016812d8555eaf42ac3400"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/en-GB/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/en-GB/thunderbird-78.3.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "e857efaa39cd409de86be87934896ecdf82d4e74dd615022995f708d18119a9c"; + sha256 = "c63897c877eba45ac3fe69807504bc1952d15229cb29d7cdbb2b22f467c3aeb0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/en-US/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/en-US/thunderbird-78.3.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "54589215c44e291a11e2cb2b2a3de682d4c48367fa8bdac59035b550a07551b6"; + sha256 = "108633517e71d5c1388f96c745e42e486018fbaa4cc231dc1a691be95da0cea8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/es-AR/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/es-AR/thunderbird-78.3.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "b4075d697d141aa13cbcefce1e7082752588d2fc3ba00074550d6e8c1156c5d1"; + sha256 = "019b78da554ffb83d5e7ebf513f57e70c6dd845e1fa2127df6cb35b8fa84199e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/es-ES/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/es-ES/thunderbird-78.3.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "7d5f59720037153e0fbf059b0b8aea0dbb5dd20f616deea7744de87ab183023d"; + sha256 = "1a56f90103ce912ea206ac9670027ea42e3e7c675cd9051e318613cedc0d5377"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/et/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/et/thunderbird-78.3.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "9c999d231cb404fcaf3614483e6c74801cd52f9c2ba7988cab50e1d690bc3551"; + sha256 = "3aa3d6dcc23270da0289c68df54938877a7e1c65528916886ccf1362378b19d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/eu/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/eu/thunderbird-78.3.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "79a74421f364e5d9a5db182d54058eb6c243418a1960b4a653f554584ecd05da"; + sha256 = "37f54a858ebc14a6044c5fa4a2f5114523764873f694a1013fe56ebebc500aef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/fa/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/fa/thunderbird-78.3.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "db6835853ceb2f597330c9e65c09df48ac308ab01d7320006b9943e3a10b471e"; + sha256 = "ab759709162643bdbbfa878df92232c3af15aee8692b6f105cb6e6ec6bcf657c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/fi/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/fi/thunderbird-78.3.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "e96ea32da9cfd941b037d0a6bf95d4a293be6f3f9800e4008c62088f06bdcf6b"; + sha256 = "f5342f80e9350dc7afdb0a56c63641a85efd1f588ad753ced3320e0f7a1fe13c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/fr/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/fr/thunderbird-78.3.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "dd6dacbffa7968596666615f52cac80e776f75b4e1943e218856ab80f902f950"; + sha256 = "fdb3b58430eb8200660dd893e1d1620d0b07dbad461ac428a23e46704b1d2fcc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/fy-NL/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/fy-NL/thunderbird-78.3.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "ed009214b863fa44048514870f835682944df010fcd5e1e1c149ec544fbfdaa8"; + sha256 = "ad84bbc708c96694389669d5845482604dbd6de579c4ecba975285c70fb25076"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ga-IE/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/ga-IE/thunderbird-78.3.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "fad826ef9820facc37bbd278c2bed11802f6b44b70416c803dc6b8fe50220c6b"; + sha256 = "040808951204a96b2990242c4adac630a036654de76f040ced8052db9ff7656c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/gd/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/gd/thunderbird-78.3.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "cccfdd4c3170969ca3f47c0a8398a257650fae0c64ecc375ab044eef969bfa8f"; + sha256 = "8f5ff190ad535f2fea08458f643fc13f11368049a8a0558e46743880fcc568b0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/gl/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/gl/thunderbird-78.3.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "dd40efa2751705b0f023a98c01b030c04eb6101fe43062b3607421b1efc462aa"; + sha256 = "3783bcb06cbaa7fb719f6fbe1a1a8cfa281fc5b589977e9a8478c3ba8d04c629"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/he/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/he/thunderbird-78.3.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "ff94efe5cd1fae04401d3d6fe364c309c24424c54b0e3787ad080ee1f468443e"; + sha256 = "32bd0c54176361e06007e8985630462575778e44a613b114b0c3a36a8a9f075f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/hr/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/hr/thunderbird-78.3.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "4109b3a8da687d2c4b8e9f6539f40e51475b43243ff1fcb19b78b5d6f6d7594d"; + sha256 = "983a8a2c55a34dc72cc2539fcfa17f92d83357d54d5113add5c8e54bf5f2a925"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/hsb/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/hsb/thunderbird-78.3.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "58fd8901df13d7f7fed552326553ce632d36d07f1a0eed63f1e8b671cf519e5e"; + sha256 = "ca1ec4a17990de8f4ce9a6c1596fd2f11bb711960c6abec9a75f23901c770d02"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/hu/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/hu/thunderbird-78.3.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "5145b3b137f6a905721a0cafe7b574b66f70891e75187fa082b852b67e195f03"; + sha256 = "e6fd79d68470234ebb2bb4b59c3def913e94157ed79081de210bd4502b910778"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/hy-AM/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/hy-AM/thunderbird-78.3.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "7c1e163a78dc5a0791a4a5a730a3ec9d58f24619f5274ce4d4b0197ca4936e5c"; + sha256 = "58218c4522ed635509e398d7918c449cc78b1354cf4290ab8d8b2cc03ee2acd9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/id/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/id/thunderbird-78.3.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "57254afb187662b15338b0133afa378432c9018af4d843ea2f81c1ab40ab4940"; + sha256 = "d8c70dbb59e214878907ec174417c2333fc739c615ef6edfb9db4fbd28c0dfb2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/is/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/is/thunderbird-78.3.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "ca0066237afa76925d294eb714bceeb7aaed0a512b9320ace604fcbe2d443f2c"; + sha256 = "b626a42e7f2d434d4dcac79462d39a1a94e5e2757431bac52f7c13f25a628e77"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/it/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/it/thunderbird-78.3.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "5c29da94a9408220824f4ab11a0f4e46bfa38230eaf1fef266372620ad9c4220"; + sha256 = "eb948fad64a889caf8d5ce92a92805c217de3a5db8b6d098bb7505e4e1b6cc7b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ja/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/ja/thunderbird-78.3.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "ab4685eae09e25018ab2a227d13642a47a0c0e8e6258975967449754bc16697a"; + sha256 = "d2c053cead7dd6dd3c77d6b1f7d32c9561bc3a4f172853ae5a3f329755eb467b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ka/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/ka/thunderbird-78.3.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "152394685517d4e3e2ddb39ac6e297d14b4ead115ead325175797bf85d88bedd"; + sha256 = "b93ce14fab022013e8350a46674fd3a1d1f069927c5f18e9382eb049f6c5336d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/kab/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/kab/thunderbird-78.3.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "2f3e1b7db83247add30da0372d1c1c125231e689b5005ed5a06359a02aed4180"; + sha256 = "fd410f8733cbced19e7e67bb6ad00fb4623dbbff45e0dded0955e9d19d144d35"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/kk/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/kk/thunderbird-78.3.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "d0d2caffb144d6f64cd73780267cea99dc54f4ae63a0fbcb5a86fc917674d0c8"; + sha256 = "68434c73c46a483eafe733e269e8a7444e4dc187cc75dde5d60e51135479ccae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ko/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/ko/thunderbird-78.3.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "f42bda1eb1f4a422d4f60345c7e6cda1b7bc57ac3d0899ab32fac16b394e4953"; + sha256 = "2f2654b33923e1c0fe56e190098aed6ba72e62f17c4721d770c9cbbc42525d5f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/lt/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/lt/thunderbird-78.3.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "da55137e808a9c64cd6534afe8579b9077b3cfaccce918fca34f07ae2d74e6d8"; + sha256 = "b0e4dad1b445254e8e7e216a158331be85d14f80126d3be3299842e5776f1bb7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ms/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/ms/thunderbird-78.3.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "65a44f52ae326b7ad777f4e66d29825f3cb7aae5e18e2c645b5889d664889f2e"; + sha256 = "be462abb580a1fff08dd481836bbbb0b975870e31d94b68f1116b8138d00290a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/nb-NO/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/nb-NO/thunderbird-78.3.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "6d3abd2b862d3fb1e0285eb6851388a079c129d3132865eb424191f8064798c9"; + sha256 = "aaa8f4838cb41d1760fc9aab268bea62e87fdaf1fcb574c93c9d0c80ecc00222"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/nl/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/nl/thunderbird-78.3.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "90f78511b8ecee01c8e441c4c18cb1b40f7f9e2de0350be365dc317d8c06415f"; + sha256 = "6075322c01ddf976848d6f38fabaf3c5ab76a8f8ce81335cc5b1d4eb7f831b6f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/nn-NO/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/nn-NO/thunderbird-78.3.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "2ec0103d3a89c3a57731542bd82e28e0da0b54c62ee0ab7755e395d991dfa5c5"; + sha256 = "d8ac0a301b41959150ec6bc53f3d28ddbde7d4936acf136de0ff0191fbfed3be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/pa-IN/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/pa-IN/thunderbird-78.3.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "d169f161bdb32a2ce6e25df9d5a643de9ac4e1345dc90cf1a54560b12bfb03ae"; + sha256 = "a0b254ab8f0cb5114fa5600ad0e03603f2df9d22c80c2264f78857b57d42a5b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/pl/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/pl/thunderbird-78.3.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "5e7fbd12291d16f98f996eb0d3660902c9cddf9849e7082a1963b73afe0e4ec2"; + sha256 = "630733fd1defa6fcb8b7fab780e47d33fa24262f17b81e2a15edeff70ba79f1f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/pt-BR/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/pt-BR/thunderbird-78.3.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "eed9d4a6378496dac0fefdf70f3c2f98d56c4daa1300bc041a3974d03303a0f6"; + sha256 = "17b709dc483f81a1b53ad3c4d12603c715c30f8577718a9e22555623abbc45d7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/pt-PT/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/pt-PT/thunderbird-78.3.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "7fef461f1a2b0239c2825a9fdd2dc5237b5b5b0cffa0c9675451449a9e69372c"; + sha256 = "3e028eafe3c2c790694a2e5d6102742f61dc0833adcf0c7c21c0dd9ff33ed8e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/rm/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/rm/thunderbird-78.3.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "f3cf46324d1f1e5ab7e858fb3f203ac6762ba98986f510486146fb745535123e"; + sha256 = "887f6910a03d0f479a510710ffc390d0faad8287c67c88e958214d187453637e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ro/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/ro/thunderbird-78.3.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "921285ad32ed408229b07d34d358cc6dd78bc519cb60370fff01525a7cb0e96e"; + sha256 = "a7fe5af31f241884f0b8a3781997396b18118e98b55ee298d335be263bdf533d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/ru/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/ru/thunderbird-78.3.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "37f28db57fc4d101df92ff5f2ca1ed800de35ecc6b3b00480bc8ee67805f47d0"; + sha256 = "68d7ca9978f743ea4e1fab5191fb3aeedcd9b448dc14ae3a9328cb61d3307ee8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/si/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/si/thunderbird-78.3.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "96d2ff616eae7bba706bd3af8fa5de0dc2444c0b57b612775e61b0e23007404c"; + sha256 = "88f84c3ef7f43a529d664693bd6c37b07b88121af64d7b2d8438e6fa6a8364fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/sk/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/sk/thunderbird-78.3.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "5f3ba3d2bcf1437373df7553dd4296511ea4845b87e0c02e7714f9838cadf281"; + sha256 = "af9513a838b0ccef884a7cfe852acdae6bb152997ac0cce220eea1a185f04ef4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/sl/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/sl/thunderbird-78.3.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "f00c798638bc88a107f4ebb0feb0156f2d7667a040ef8fe9104340997df83741"; + sha256 = "612d5ea2231e237942e56c12e8f833f39a2e0ac337965b32c49eadcb9f66dae8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/sq/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/sq/thunderbird-78.3.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "42e2fb9ed08ce138d50e0fdddfc67d9feccbf6e5aa4cfd50d81f2ed493cb2dee"; + sha256 = "5d62a217f4c91aa5cc81853ad608f963c68e6c7732fffc631aaf20b7599f353e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/sr/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/sr/thunderbird-78.3.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "72dc5e5f0024c17e4e1b30b3990d1cd1f1fd240da5c32ca4ddf2737290fa4bac"; + sha256 = "31901b595a8a5ccd6d114398a796f29e37c362f1c56688dc26df3b40c85e5710"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/sv-SE/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/sv-SE/thunderbird-78.3.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "2f3c882db2034adf74d638fc7a6055bb421fe08f890ac6d3c89433a818b06ca3"; + sha256 = "d8f22eac71cea9958750c7ea36002dc84b2ba6095982c068bd111b4bd68420c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/th/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/th/thunderbird-78.3.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "3830e09d6aab98fddec1e60fea92ec3c5ba51dee63225c219010a37bc80f633a"; + sha256 = "1379d5f81865bc0650da1d593e460838a08d03672ef10fe702ca02593c8a1d77"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/tr/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/tr/thunderbird-78.3.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "bdf2cf1a6a0c6cb8ae6d598adf30d84d1f43f399a2135cb041a17329fab78f73"; + sha256 = "fd58b2af0a6e2f590a44431a1eb2f8eb37e22fa3ae386cf40c7f390305694d08"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/uk/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/uk/thunderbird-78.3.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "4bd587d7bfcd2ec6bc7516b48199c92dac1f6feac4c66779cae231a7fd436df3"; + sha256 = "7a22516d75265f612c4fdd37e1adceb515137451654feba80d5061051d68fb84"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/uz/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/uz/thunderbird-78.3.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "5326d6b4f0dc90925bd26c3300ab5441a0edf706229cbde7121cfadeb6b1457f"; + sha256 = "bd0027e0a6db2b4334088ea86206854cc2df5e4804e3342d2f030b8de122665e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/vi/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/vi/thunderbird-78.3.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "ea8db723cb46c60182c4fd557fbb72872cd112c707af66fae20b59a50c595d80"; + sha256 = "2bb0f40007513364699b7a5b2b14559d4e6b7126bcbaab6a9c4517894004e61c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/zh-CN/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/zh-CN/thunderbird-78.3.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "f2d5b1463c426dad638480782473442b6208cefe8fdd0eb74a6e01f75fbe6a52"; + sha256 = "e8fcbc19671ee573343d69eacff419655c96dff50048c8fccdeed14f713f6482"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.2/linux-i686/zh-TW/thunderbird-78.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/zh-TW/thunderbird-78.3.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "3a0bff43f1b6b158ee8f5a80e5457fa17da09ba2270d84089a948b677f228ca7"; + sha256 = "73593d47d96de6d38cb14ea3be88ccd703c9161dfdb17620653f2ba85ed180a5"; } ]; } From 7b19957e30820de0890d1412996114f22199538c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 24 Sep 2020 08:18:36 +0000 Subject: [PATCH 064/293] libinsane: 1.0.4 -> 1.0.7 --- pkgs/development/libraries/libinsane/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libinsane/default.nix b/pkgs/development/libraries/libinsane/default.nix index 0b0f1b36edc..cbc4c001b15 100644 --- a/pkgs/development/libraries/libinsane/default.nix +++ b/pkgs/development/libraries/libinsane/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "libinsane"; - version = "1.0.4"; + version = "1.0.7"; outputs = [ "out" "dev" "devdoc" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { group = "World"; owner = "OpenPaperwork"; rev = version; - sha256 = "1qk0s4m87yqa75h27bl7m03g4gamln43wn4159h7dcnwc36hdzw6"; + sha256 = "03r6niyzfahnlpvhn68h59i6926ciwz88krqbf0akd9f42y9zf2k"; }; nativeBuildInputs = [ meson pkg-config ninja doxygen gtk-doc docbook_xsl gobject-introspection vala ]; From 00bf15f23c6d8e2f79dcd0a9f607065e6f0d9fab Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Wed, 23 Sep 2020 18:54:41 -0700 Subject: [PATCH 065/293] pciutils: fix build on darwin Add IOKit to macOS prereqs, and patch Makefile to use $CC --- pkgs/tools/system/pciutils/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 1814d4b9765..cf6616417ed 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, zlib, kmod, which , static ? stdenv.targetPlatform.isStatic +, darwin ? null }: stdenv.mkDerivation rec { @@ -11,7 +12,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ zlib kmod which ]; + buildInputs = [ zlib kmod which ] ++ + stdenv.lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit; + + preConfigure = if stdenv.cc.isGNU then null else '' + substituteInPlace Makefile --replace 'CC=$(CROSS_COMPILE)gcc' "" + ''; makeFlags = [ "SHARED=${if static then "no" else "yes"}" From 0a07c8c67e2ae46e91c9742cd05b29200321ded9 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Thu, 24 Sep 2020 11:32:58 +0200 Subject: [PATCH 066/293] dbeaver: 7.2.0 -> 7.2.1 --- pkgs/applications/misc/dbeaver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index e8a04aa2e14..3d7d7bb40af 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "dbeaver-ce"; - version = "7.2.0"; + version = "7.2.1"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "0zpxsdzhn5fsrlq04v5kvkrgf4dsj5zmpypj9awsd2mjcbp6yxd7"; + sha256 = "0vdwbgff55aq5l67fczdvw7kn7kf0dsz183x5lz2v1sb2blsjvjj"; }; installPhase = '' From 0d4f3ef1ab1b053fe896b00c82a81411289c23b0 Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Thu, 24 Sep 2020 12:25:27 +0200 Subject: [PATCH 067/293] ghc8102Binary: init, enable armv7l --- .../compilers/ghc/8.10.2-binary.nix | 173 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 10 + 2 files changed, 183 insertions(+) create mode 100644 pkgs/development/compilers/ghc/8.10.2-binary.nix diff --git a/pkgs/development/compilers/ghc/8.10.2-binary.nix b/pkgs/development/compilers/ghc/8.10.2-binary.nix new file mode 100644 index 00000000000..8dbe6bdae1a --- /dev/null +++ b/pkgs/development/compilers/ghc/8.10.2-binary.nix @@ -0,0 +1,173 @@ +{ stdenv +, fetchurl, perl, gcc +, ncurses6, gmp, glibc, libiconv +, llvmPackages +}: + +# Prebuilt only does native +assert stdenv.targetPlatform == stdenv.hostPlatform; + +let + useLLVM = !stdenv.targetPlatform.isx86; + + libPath = stdenv.lib.makeLibraryPath ([ + ncurses6 gmp + ] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv); + + libEnvVar = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "DY" + + "LD_LIBRARY_PATH"; + + glibcDynLinker = assert stdenv.isLinux; + if stdenv.hostPlatform.libc == "glibc" then + # Could be stdenv.cc.bintools.dynamicLinker, keeping as-is to avoid rebuild. + ''"$(cat $NIX_CC/nix-support/dynamic-linker)"'' + else + "${stdenv.lib.getLib glibc}/lib/ld-linux*"; + +in + +stdenv.mkDerivation rec { + version = "8.10.2"; + + name = "ghc-${version}-binary"; + + # https://downloads.haskell.org/~ghc/8.10.2/ + src = fetchurl ({ + i686-linux = { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-deb9-linux.tar.xz"; + sha256 = "0bvwisl4w0z5z8z0da10m9sv0mhm9na2qm43qxr8zl23mn32mblx"; + }; + x86_64-linux = { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-deb10-linux.tar.xz"; + sha256 = "0chnzy9j23b2wa8clx5arwz8wnjfxyjmz9qkj548z14cqf13slcl"; + }; + armv7l-linux = { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-armv7-deb10-linux.tar.xz"; + sha256 = "1j41cq5d3rmlgz7hzw8f908fs79gc5mn3q5wz277lk8zdf19g75v"; + }; + aarch64-linux = { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-aarch64-deb10-linux.tar.xz"; + sha256 = "14smwl3741ixnbgi0l51a7kh7xjkiannfqx15b72svky0y4l3wjw"; + }; + x86_64-darwin = { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; + sha256 = "1hngyq14l4f950hzhh2d204ca2gfc98pc9xdasxihzqd1jq75dzd"; + }; + }.${stdenv.hostPlatform.system} + or (throw "cannot bootstrap GHC on this platform")); + + nativeBuildInputs = [ perl ]; + propagatedBuildInputs = stdenv.lib.optionals useLLVM [ llvmPackages.llvm ]; + + # Cannot patchelf beforehand due to relative RPATHs that anticipate + # the final install location/ + ${libEnvVar} = libPath; + + postUnpack = + # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib + # during linking + stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + # not enough room in the object files for the full path to libiconv :( + for exe in $(find . -type f -executable); do + isScript $exe && continue + ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib + install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe + done + '' + + + # Some scripts used during the build need to have their shebangs patched + '' + patchShebangs ghc-${version}/utils/ + patchShebangs ghc-${version}/configure + '' + + + # We have to patch the GMP paths for the integer-gmp package. + '' + find . -name integer-gmp.buildinfo \ + -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \; + '' + stdenv.lib.optionalString stdenv.isDarwin '' + find . -name base.buildinfo \ + -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \; + '' + + # Rename needed libraries and binaries, fix interpreter + stdenv.lib.optionalString stdenv.isLinux '' + find . -type f -perm -0100 -exec patchelf \ + --replace-needed libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.6 libncurses.so \ + --interpreter ${glibcDynLinker} {} \; + + sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 + sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 + '' + + # We're kludging a glibc bindist into working with non-glibc... + # Here we patch up the use of `__strdup` (part of glibc binary ABI) + # to instead use `strdup` since musl doesn't provide __strdup + # (`__strdup` is defined to be an alias of `strdup` anyway[1]). + # [1] http://refspecs.linuxbase.org/LSB_4.0.0/LSB-Core-generic/LSB-Core-generic/baselib---strdup-1.html + # Use objcopy magic to make the change: + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + find ./ghc-${version}/rts -name "libHSrts*.a" -exec ''${OBJCOPY:-objcopy} --redefine-sym __strdup=strdup {} \; + ''; + + # fix for `configure: error: Your linker is affected by binutils #16177` + preConfigure = stdenv.lib.optionalString + stdenv.targetPlatform.isAarch32 + "LD=ld.gold"; + + configurePlatforms = [ ]; + configureFlags = [ + "--with-gmp-libraries=${stdenv.lib.getLib gmp}/lib" + "--with-gmp-includes=${stdenv.lib.getDev gmp}/include" + ] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" + ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; + + # No building is necessary, but calling make without flags ironically + # calls install-strip ... + dontBuild = true; + + # On Linux, use patchelf to modify the executables so that they can + # find editline/gmp. + postFixup = stdenv.lib.optionalString stdenv.isLinux '' + for p in $(find "$out" -type f -executable); do + if isELF "$p"; then + echo "Patchelfing $p" + patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p + fi + done + '' + stdenv.lib.optionalString stdenv.isDarwin '' + # not enough room in the object files for the full path to libiconv :( + for exe in $(find "$out" -type f -executable); do + isScript $exe && continue + ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib + install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe + done + + for file in $(find "$out" -name setup-config); do + substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)" + done + ''; + + doInstallCheck = true; + installCheckPhase = '' + unset ${libEnvVar} + # Sanity check, can ghc create executables? + cd $TMP + mkdir test-ghc; cd test-ghc + cat > main.hs << EOF + {-# LANGUAGE TemplateHaskell #-} + module Main where + main = putStrLn \$([|"yes"|]) + EOF + $out/bin/ghc --make main.hs || exit 1 + echo compilation ok + [ $(./main) == "yes" ] + ''; + + passthru = { + targetPrefix = ""; + enableShared = true; + }; + + meta.license = stdenv.lib.licenses.bsd3; + meta.platforms = ["x86_64-linux" "armv7l-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"]; +} diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3e85109527e..7a4ed975518 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -49,6 +49,10 @@ in { ghc865Binary = callPackage ../development/compilers/ghc/8.6.5-binary.nix { }; + ghc8102Binary = callPackage ../development/compilers/ghc/8.10.2-binary.nix { + llvmPackages = pkgs.llvmPackages_9; + }; + ghc865 = callPackage ../development/compilers/ghc/8.6.5.nix { bootPkgs = packages.ghc822Binary; inherit (buildPackages.python3Packages) sphinx; @@ -139,6 +143,12 @@ in { compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { }; packageSetConfig = bootstrapPackageSet; }; + ghc8102Binary = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc8102Binary; + ghc = bh.compiler.ghc8102Binary; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; + packageSetConfig = bootstrapPackageSet; + }; ghc865 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc865; ghc = bh.compiler.ghc865; From 25bef63de485ecff24c526466724ad625c5b6288 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 24 Sep 2020 12:35:14 +0000 Subject: [PATCH 068/293] libgpiod: 1.5.1 -> 1.5.2 --- pkgs/development/libraries/libgpiod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix index 6d77a28d55f..68078bbc9a0 100644 --- a/pkgs/development/libraries/libgpiod/default.nix +++ b/pkgs/development/libraries/libgpiod/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "libgpiod"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz"; - sha256 = "14iv8iwyvfznyifhkqz1bjh24dvb03gmpjn8v3fs6h734l93vvw5"; + sha256 = "1bknh7kn5gxc8xwf913lsdm9zgn1bwj42nsnp6kbkyn6ip7s6c4r"; }; buildInputs = [ kmod ] ++ lib.optionals enablePython [ python3 ncurses ]; From 3c379af10b8a5f75b1d7561d951aa49d628adf00 Mon Sep 17 00:00:00 2001 From: cw <789@webuhu.at> Date: Thu, 24 Sep 2020 15:14:52 +0200 Subject: [PATCH 069/293] elixir_1_6: remove Additionally removed the now obsolete rebar build dependency for elixir. --- pkgs/development/beam-modules/default.nix | 13 ++++--------- pkgs/development/interpreters/elixir/1.6.nix | 7 ------- .../interpreters/elixir/generic-builder.nix | 8 ++------ pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/beam-packages.nix | 2 +- 5 files changed, 8 insertions(+), 24 deletions(-) delete mode 100644 pkgs/development/interpreters/elixir/1.6.nix diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index efd68988c9b..7fbec79cbd4 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -39,27 +39,22 @@ let elixir = elixir_1_10; elixir_1_10 = lib.callElixir ../interpreters/elixir/1.10.nix { - inherit rebar erlang; + inherit erlang; debugInfo = true; }; elixir_1_9 = lib.callElixir ../interpreters/elixir/1.9.nix { - inherit rebar erlang; + inherit erlang; debugInfo = true; }; elixir_1_8 = lib.callElixir ../interpreters/elixir/1.8.nix { - inherit rebar erlang; + inherit erlang; debugInfo = true; }; elixir_1_7 = lib.callElixir ../interpreters/elixir/1.7.nix { - inherit rebar erlang; - debugInfo = true; - }; - - elixir_1_6 = lib.callElixir ../interpreters/elixir/1.6.nix { - inherit rebar erlang; + inherit erlang; debugInfo = true; }; diff --git a/pkgs/development/interpreters/elixir/1.6.nix b/pkgs/development/interpreters/elixir/1.6.nix deleted file mode 100644 index 94dffd1f763..00000000000 --- a/pkgs/development/interpreters/elixir/1.6.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ mkDerivation }: - -mkDerivation { - version = "1.6.6"; - sha256 = "1wl8rfpw0dxacq4f7xf6wjr8v2ww5691d0cfw9pzw7phd19vazgl"; - minimumOTPVersion = "19"; -} diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index 54b046beaab..f821baf66c5 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, fetchFromGitHub, erlang, rebar, makeWrapper, +{ pkgs, stdenv, fetchFromGitHub, erlang, makeWrapper, coreutils, curl, bash, debugInfo ? false }: { baseName ? "elixir" @@ -20,7 +20,7 @@ in inherit src version; - buildInputs = [ erlang rebar makeWrapper ]; + buildInputs = [ erlang makeWrapper ]; LANG = "C.UTF-8"; LC_TYPE = "C.UTF-8"; @@ -32,10 +32,6 @@ in buildFlags = optional debugInfo "ERL_COMPILER_OPTIONS=debug_info"; preBuild = '' - # The build process uses ./rebar. Link it to the nixpkgs rebar - rm -vf rebar - ln -s ${rebar}/bin/rebar rebar - patchShebangs lib/elixir/generate_app.escript || true substituteInPlace Makefile \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 220b3d43659..b5537d4ee4b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9627,7 +9627,7 @@ in inherit (beam.interpreters) erlang erlangR23 erlangR22 erlangR21 erlangR20 erlangR19 erlangR18 erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02 - elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7 elixir_1_6; + elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7; inherit (beam.packages.erlang) rebar rebar3 diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 84d2a4e3116..139749e7d39 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -97,7 +97,7 @@ rec { # Other Beam languages. These are built with `beam.interpreters.erlang`. To # access for example elixir built with different version of Erlang, use # `beam.packages.erlangR22.elixir`. - inherit (packages.erlang) elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7 elixir_1_6; + inherit (packages.erlang) elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7; inherit (packages.erlang) lfe lfe_1_2 lfe_1_3; }; From a922b0bf6fad2c7025de22a16ba12c911dd0be00 Mon Sep 17 00:00:00 2001 From: Geoffrey Huntley Date: Thu, 24 Sep 2020 14:02:12 +0000 Subject: [PATCH 070/293] pulumi: 2.6.1 -> 2.10.2 --- pkgs/tools/admin/pulumi/data.nix | 170 ++++++++++++++++++++++++---- pkgs/tools/admin/pulumi/default.nix | 1 + pkgs/tools/admin/pulumi/update.sh | 41 ++++--- 3 files changed, 174 insertions(+), 38 deletions(-) diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix index 77779c39f50..7d2523b4073 100644 --- a/pkgs/tools/admin/pulumi/data.nix +++ b/pkgs/tools/admin/pulumi/data.nix @@ -1,58 +1,178 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "2.6.1"; + version = "2.10.2"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v2.6.1-linux-x64.tar.gz"; - sha256 = "12f81wj8r3pmxj2l8qhcgnmy2m0a6bfzrvq9avl3444h2w29qpy2"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v2.10.2-linux-x64.tar.gz"; + sha256 = "0pxm90vmha265zc4b1ip2f3iryslkwxznn4kb8l3ma6gibz1zav3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v2.13.0-linux-amd64.tar.gz"; - sha256 = "03l7ybc9ca63vdm7a2zsvgc8zz8ip973sfxsjqf3bb277r04mnpb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.1.0-linux-amd64.tar.gz"; + sha256 = "1l4kszzw1w862sfd4jnz66lwnp02p4kl1fwvj5ab81qfwzwg0cfx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v3.13.0-linux-amd64.tar.gz"; - sha256 = "0ivdiib3a1c1r2ppxmj6blgq26s05s3081969j0j9jlscpa79lap"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.4.0-linux-amd64.tar.gz"; + sha256 = "1gzjdafx5zsqrb5r3amskak51ajcpqbbfw45939jdsdll8vclw7g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.2.0-linux-amd64.tar.gz"; - sha256 = "0w6ys5bmry1b8ndzj167cz3a8fc6mbl5v9v2almrmd3q6fycm4gj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.6.0-linux-amd64.tar.gz"; + sha256 = "0myvx2glqnx29l4wd5vx4gm773zrcmwcjvs2b1yv63fl10md9sv7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.4.0-linux-amd64.tar.gz"; - sha256 = "0id3mji08hk76kffz46dlbl2r11kgv5jvlmw869dssg2d0wliv82"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.5.0-linux-amd64.tar.gz"; + sha256 = "12cajd8jiqy11s880vsv20gqfm44g160x7fxm93agjl7wng32ad6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.2.2-linux-amd64.tar.gz"; - sha256 = "07asdmmacxazg65d5hphjxzb5j5d2dcc95wjbxx3wwc1swqma4aq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.8.0-linux-amd64.tar.gz"; + sha256 = "0k429fh477f84kmnhyl5s9p0yym7d6sdq7hy7wqx6psxp4rf5h9x"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v2.8.0-linux-amd64.tar.gz"; + sha256 = "045z7qj23bq71nxfjk1vvnfbjcnqfkcbxbpjz72q0hw4xn7dq6jz"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.3.0-linux-amd64.tar.gz"; + sha256 = "16d0jd3429pr4vlrzrv32w2fa53j7gyqq5lc78gw9j4v3mc3scvz"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v3.25.0-linux-amd64.tar.gz"; + sha256 = "0gz4kpddaf9p25lfnp70p6197wrfgsiys7s4vdy75z8dyd4sbiv0"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.0.0-linux-amd64.tar.gz"; + sha256 = "0n2532gfb5i53raya07rn8wcp15rc07jfg8wsm2lfzj7a4mp2p6c"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v2.6.0-linux-amd64.tar.gz"; + sha256 = "16l1a30rkg9l6yh68qv61dgm3h3gdgpsdacvnfg1ra0fvvfs9477"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.2.0-linux-amd64.tar.gz"; + sha256 = "1m2w8gsksr36pprxr6v3v4y3n7x5ycbcdfywv67yxmbi4lxyy3ar"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.6.1-linux-amd64.tar.gz"; + sha256 = "01vnbgck1ffj4jg8ghmkjp63xq3r9q3459vy03xpzm14l1i6agwv"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.2.0-linux-amd64.tar.gz"; + sha256 = "1g05kqymbkrxf48iskn9w12kxy880allhqm9a7p4g7mx0174yfhm"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.2.1-linux-amd64.tar.gz"; + sha256 = "1fa5i283nisa6cq02fcrsgwkw7bwnh2j3agjbqyvv2xiss34i7hw"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.6.0-linux-amd64.tar.gz"; + sha256 = "0ihiag248c30dz4z2b559689zqwp52p0m7pv7jqpk86xwvimbsn1"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.1.0-linux-amd64.tar.gz"; + sha256 = "0jwvdsb26bhsqcbrsw9ss54xgpccl830hhbwnbz8ql8yndd35srg"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.4.0-linux-amd64.tar.gz"; + sha256 = "1wr4p312xwqi0icn153iv2j88rp37wkf8hc5y4pmdr61vd0kpw7w"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.3.1-linux-amd64.tar.gz"; + sha256 = "0xq3as94i9ah9dv1cabgdqjg68yg7laksfzpf81s6kcv742cnnqi"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v2.4.0-linux-amd64.tar.gz"; + sha256 = "1av7fj1jlhhqplqq60d6hzzidlhsvr41z9p1x3mvz5frwijxr1ab"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.10.0-linux-amd64.tar.gz"; + sha256 = "1bgw5xw6f01whxlm5358xn6v9wqz9mxg3dvb5vi7rfs9wwxykr4g"; } ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v2.6.1-darwin-x64.tar.gz"; - sha256 = "17jf9xwpwpbqk5r20i14j1z4i4rbbx781k0zqyc9yskmv5q4mmwr"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v2.10.2-darwin-x64.tar.gz"; + sha256 = "1fzqylx7pmrpvsxrmhlx56v9i9zkid96zrj9hsc26qhx5w7k600w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v2.13.0-darwin-amd64.tar.gz"; - sha256 = "18mjf9gm8siskg9jh65x4qp4w8p4wnp19bxxk4jfbq27icdk7ws9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.1.0-darwin-amd64.tar.gz"; + sha256 = "05dxpdwdg8cd1a6d3xh8dkns5wkvpr0v11bb4zdzv38x6wxnqx0z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v3.13.0-darwin-amd64.tar.gz"; - sha256 = "14iwz1gm34irs9jlpwc4ig1wc8k4aaxq8mz3g22yrvwddrsc4rcw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.4.0-darwin-amd64.tar.gz"; + sha256 = "1jbnx1wpzh2k127ixh9j0ghlqhj3sc1s17cp3ax3q9gq3cadcl5i"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.2.0-darwin-amd64.tar.gz"; - sha256 = "0zaxp2n1w5djwyq1afhd3v887dh0yj53jz449riqp19dpyfqf7h7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.6.0-darwin-amd64.tar.gz"; + sha256 = "0lpf3cqi3kss7hmr8a3y6gmwjl854vmva4f9p9q7147rxr8aw5f9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.4.0-darwin-amd64.tar.gz"; - sha256 = "1kzs7k7as9r1vbj746wqz9iph13zfzzw8nsk3waq8aq1hmgh2g1q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.5.0-darwin-amd64.tar.gz"; + sha256 = "0qwjrhmspibjr17kgswfcgbdhmkicqrjd1md6azingdr5wp7cwwm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.2.2-darwin-amd64.tar.gz"; - sha256 = "0hwdghij7g9h58nwimfmaz91lz38wibkrdzwqhi7d426m53g6f5c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.8.0-darwin-amd64.tar.gz"; + sha256 = "0rwgbpif7l3ayh363cz0k2dir36a87x0bszspq3nm3xbwmd190f0"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v2.8.0-darwin-amd64.tar.gz"; + sha256 = "0943r8x70gxxkfn0rhcx2b9zya44k28j5s8z2m8jn2i1fvqvahq5"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.3.0-darwin-amd64.tar.gz"; + sha256 = "1nvqjc1zrxfn2r1wdh2sdr2vimar5836bhscqsiaw4i6mjdsggfy"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v3.25.0-darwin-amd64.tar.gz"; + sha256 = "05x0qlv3xkkvs71ixzmc21ck85w9f4a4dxrwmgkq6c0nhy3npbnj"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.0.0-darwin-amd64.tar.gz"; + sha256 = "1m80l75r2w46m7191igjan4ipfkhc9ld1xlybncd628qlcf2jpqz"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v2.6.0-darwin-amd64.tar.gz"; + sha256 = "0dan0qqvaxfh90db14s7adjjy670lz15bbm6a8fjfyj4fdhsbwyn"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.2.0-darwin-amd64.tar.gz"; + sha256 = "1gznv5d10pxbkyl4hbd4c9skkgkypfs1xg0jjmszkwxcjzvhc4l3"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.6.1-darwin-amd64.tar.gz"; + sha256 = "08w8by7h9nlgvyap2in6yy21dk46fxvl93h4ghaw7xxjjs2l3dfi"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.2.0-darwin-amd64.tar.gz"; + sha256 = "0qjszd30r3094p5m7v5gynx2kxh9xf9878mxdc2wnswpkpw3v5pb"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.2.1-darwin-amd64.tar.gz"; + sha256 = "1a19lmxi8r8h4yfll0k97kvq0lgkzwvrwf52ny4zl67bc9g4jr5p"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.6.0-darwin-amd64.tar.gz"; + sha256 = "11vfjkmhrq7q4j6h5d2sdzan3ziyhl5qhc0fhfnsz2pxss549zab"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.1.0-darwin-amd64.tar.gz"; + sha256 = "1ny1m6pb44k77gqf97km3gkb7dwhilkmqi2zy4hdl20js1ijsh7p"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.4.0-darwin-amd64.tar.gz"; + sha256 = "1vm2pfj93wi6q7kcrqwy9190mx0jn2p96algcd5gms48a4m8bgpb"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.3.1-darwin-amd64.tar.gz"; + sha256 = "0mnmlvyppfndq1rwy4k40j0syy590v2lg75kg0rnf16qlpffskn9"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v2.4.0-darwin-amd64.tar.gz"; + sha256 = "0q9qbqalask628cbi3347pjbnm3304c8qhx7h8icqxxh59mjnhr7"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.10.0-darwin-amd64.tar.gz"; + sha256 = "1gxiqq6hk77s1n3q3p92p0yykpihw2k8lv01dra015fjha6pyl19"; } ]; }; diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix index c0547f0c0c8..231bdc09965 100644 --- a/pkgs/tools/admin/pulumi/default.nix +++ b/pkgs/tools/admin/pulumi/default.nix @@ -29,6 +29,7 @@ in stdenv.mkDerivation { license = with licenses; [ asl20 ]; platforms = builtins.attrNames data.pulumiPkgs; maintainers = with maintainers; [ + ghuntley peterromfeldhk jlesquembre ]; diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh index cc31bce849b..5e0c721959c 100755 --- a/pkgs/tools/admin/pulumi/update.sh +++ b/pkgs/tools/admin/pulumi/update.sh @@ -1,19 +1,34 @@ #!/usr/bin/env bash - -VERSION="2.6.1" - # Bash 3 compatible for Darwin + +# Version of Pulumi from +# https://www.pulumi.com/docs/get-started/install/versions/ +VERSION="2.10.2" + +# Grab latest release ${VERSION} from +# https://github.com/pulumi/pulumi-${NAME}/releases plugins=( - # https://github.com/pulumi/pulumi-aws/releases - "aws=2.13.0" - # https://github.com/pulumi/pulumi-gcp/releases - "gcp=3.13.0" - # https://github.com/pulumi/pulumi-random/releases - "random=2.2.0" - # https://github.com/pulumi/pulumi-kubernetes/releases - "kubernetes=2.4.0" - # https://github.com/pulumi/pulumi-postgresql/releases - "postgresql=2.2.2"); + "auth0=1.1.0" + "aws=3.4.0" + "cloudflare=2.6.0" + "consul=2.5.0" + "datadog=2.8.0" + "digitalocean=2.8.0" + "docker=2.3.0" + "gcp=3.25.0" + "github=2.0.0" + "gitlab=2.6.0" + "hcloud=0.2.0" + "kubernetes=2.6.1" + "mailgun=2.2.0" + "mysql=2.2.1" + "openstack=2.6.0" + "packet=3.1.0" + "postgresql=2.4.0" + "random=2.3.1" + "vault=2.4.0" + "vsphere=2.10.0" + ); function genMainSrc() { local url="https://get.pulumi.com/releases/sdk/pulumi-v${VERSION}-$1-x64.tar.gz" From 4d89887f5b598f1f7b80ddc0de07cf8066843305 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 24 Sep 2020 18:38:27 +0000 Subject: [PATCH 071/293] bashmount: 4.3.1 -> 4.3.2 --- pkgs/tools/filesystems/bashmount/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/bashmount/default.nix b/pkgs/tools/filesystems/bashmount/default.nix index 70a4c1419c8..bab8df1280d 100644 --- a/pkgs/tools/filesystems/bashmount/default.nix +++ b/pkgs/tools/filesystems/bashmount/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bashmount"; - version = "4.3.1"; + version = "4.3.2"; src = fetchFromGitHub { owner = "jamielinux"; repo = "bashmount"; rev = version; - sha256 = "0pqjaib0qiwjq0ral5yjz4iq8hpaj9mqkhlihgfz0xigcn9lxwpf"; + sha256 = "1irw47s6i1qwxd20cymzlfw5sv579cw877l27j3p66qfhgadwxrl"; }; installPhase = '' From 30313a797d94f04bd068fdd10e04d1a9af59f8d9 Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Thu, 24 Sep 2020 14:54:36 -0400 Subject: [PATCH 072/293] emacs: fix paths for native compilation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The given paths gives rise to errors such as, ``` x86_64-unknown-linux-gnu-gcc-9.3.0: fatal error: cannot execute ‘as’: execvp: No such file or directory compilation terminated. ``` in the `*Async-native-compile-log*` buffer. Fixes --- pkgs/applications/editors/emacs/generic.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 71bb472d097..f2904f3e012 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -75,9 +75,9 @@ in stdenv.mkDerivation { "${lib.getLib stdenv.cc.libc}/lib" # Executable paths necessary for compilation (ld, as): - "${lib.getBin stdenv.cc.cc}" - "${lib.getBin stdenv.cc.bintools}" - "${lib.getBin stdenv.cc.bintools.bintools}" + "${lib.getBin stdenv.cc.cc}/bin" + "${lib.getBin stdenv.cc.bintools}/bin" + "${lib.getBin stdenv.cc.bintools.bintools}/bin" ])); in '' substituteInPlace lisp/emacs-lisp/comp.el --replace \ From 73133a6af02a65974f06a936615953784a20aecd Mon Sep 17 00:00:00 2001 From: Andrew Fontaine Date: Thu, 24 Sep 2020 16:27:10 -0400 Subject: [PATCH 073/293] plexamp: 3.1.1 -> 3.2.0 Adds remote control support for other plex players, as well as other changes. Release notes: https://forums.plex.tv/t/plexamp-release-notes/221280/16 --- pkgs/applications/audio/plexamp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index caa703f59ce..36462aa28bc 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -2,12 +2,12 @@ let pname = "plexamp"; - version = "3.1.1"; + version = "3.2.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; - sha256 = "11hgcysa1x9yqvha6ri4vl1zk8gf8vhcpnh3j38wg9ncd7nz5k2v"; + sha256 = "R1BhobnwoU7oJ7bNes8kH2neXqHlMPbRCNjcHyzUPqo="; name="${pname}-${version}.AppImage"; }; From 492b9af995bd9326f23ea2834188a155da4dde10 Mon Sep 17 00:00:00 2001 From: mlvzk Date: Thu, 24 Sep 2020 23:36:46 +0200 Subject: [PATCH 074/293] brotli: fix patch URL --- pkgs/tools/compression/brotli/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index 229c6c8b8e4..bf20e0119ec 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; patches = stdenv.lib.optional staticOnly (fetchpatch { - url = "https://github.com/google/brotli/pull/655/commits/7289e5a378ba13801996a84d89d8fe95c3fc4c11.patch"; + # from https://github.com/google/brotli/pull/655 + url = "https://github.com/google/brotli/commit/7289e5a378ba13801996a84d89d8fe95c3fc4c11.patch"; sha256 = "1bghbdvj24jrvb0sqfdif9vwg7wx6pn8dvl6flkrcjkhpj0gi0jg"; }); From 0a3987a63fd25c1101bf15ac957a14eefca8ffbe Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Fri, 25 Sep 2020 00:41:07 +0300 Subject: [PATCH 075/293] janet: 1.10.1 -> 1.12.2 (#98679) --- pkgs/development/interpreters/janet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index 52d0b371915..113a582392f 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.10.1"; + version = "1.12.2"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "18k6dzxzr149p0bby4r0z6kybylig87rwj7gk3z6a98zf6k4xmsw"; + sha256 = "0if514zdmbjvvrsa9x5yfvg2b14sz53yaka12g3yhwkq8ls3qk0c"; }; nativeBuildInputs = [ meson ninja ]; From fd7141afa30066ef3866decd993e5f3f3e373fe6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 24 Sep 2020 14:43:14 -0700 Subject: [PATCH 076/293] bitwarden: 1.20.1 -> 1.22.1 (#98674) --- pkgs/tools/security/bitwarden/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index d383a00a7f2..d10a938ea02 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -17,11 +17,11 @@ let pname = "bitwarden"; version = { - x86_64-linux = "1.20.1"; + x86_64-linux = "1.22.1"; }.${system} or ""; sha256 = { - x86_64-linux = "1lywslkpgg9rxwz7kwfknkgdi0r47j14i420r5yxgkaizb7ww27z"; + x86_64-linux = "1pbcrkafyjjcsd27s99g511llkz05d9qkny7g15wp6piyyv89k3n"; }.${system} or ""; meta = with stdenv.lib; { From e19d18f04d031ab2b33df654f8e9bc6d53a5ac89 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 24 Sep 2020 14:43:51 -0700 Subject: [PATCH 077/293] bitwarden_rs-vault: 2.15.1 -> 2.16.0b (#98675) --- pkgs/tools/security/bitwarden_rs/vault.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/bitwarden_rs/vault.nix b/pkgs/tools/security/bitwarden_rs/vault.nix index 2ac50912c05..8efa1e4bfd3 100644 --- a/pkgs/tools/security/bitwarden_rs/vault.nix +++ b/pkgs/tools/security/bitwarden_rs/vault.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bitwarden_rs-vault"; - version = "2.15.1"; + version = "2.16.0b"; src = fetchurl { url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"; - sha256 = "1wvpg2awdbpbzhxhrf1iv1mjjc1ah54kswnznc7w5zbh9512dyx8"; + sha256 = "1p10a5rp2ymx675sbigwrkkfjvpk1lz3d43l2p2i1vbw153py3p1"; }; buildCommand = '' From c099d421db58e5278682c329c5886ebbf09038f7 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Thu, 24 Sep 2020 23:44:54 +0200 Subject: [PATCH 078/293] ceph: 15.2.4 -> 15.2.5 (#98664) --- pkgs/tools/filesystems/ceph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 767730c4030..9b9fe9a5aaf 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -121,10 +121,10 @@ let ]); sitePackages = ceph-python-env.python.sitePackages; - version = "15.2.4"; + version = "15.2.5"; src = fetchurl { url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz"; - sha256 = "0jy5dp4r1bqk1l7nrv8l8zpl984k61p3vkvf73ygcn03bxyjjlax"; + sha256 = "05p7ssbfypf5x8bry361rrnyaihf89xzbqzhygdyrg7w1rxpna8d"; }; in rec { ceph = stdenv.mkDerivation { From fdae591c6870d357108afdd6fe6247f28013e614 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Thu, 24 Sep 2020 17:45:23 -0400 Subject: [PATCH 079/293] kopia: 0.7.0 -> 0.7.1 (#98658) --- pkgs/tools/backup/kopia/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/kopia/default.nix b/pkgs/tools/backup/kopia/default.nix index 47a6c457e5c..bfeafd0875f 100644 --- a/pkgs/tools/backup/kopia/default.nix +++ b/pkgs/tools/backup/kopia/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kopia"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0k0d9fb9f7zfyh7lifaviz8xnx1ansnh1f4q0rhc547m1y4kdw46"; + sha256 = "1ngm0vbx6ryks68bp0zarvncc36gbpkkqavxb3sfph9p959b9hif"; }; - vendorSha256 = "0br641lh2bqz18p5riv6dh01kr11vbbnrn4i5r80b0lgjy1774sl"; + vendorSha256 = "07p2ka5rbasrgjfd4k2jn0ffshjp39kilz9b714ykyi1qflczr9b"; doCheck = false; From 34133d5425f4adbf4e9337d3c2b0695e654a5082 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 25 Sep 2020 04:57:19 +0700 Subject: [PATCH 080/293] st: enable build on darwin (#98668) --- pkgs/applications/misc/st/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index a772629a7aa..5d496dedc2e 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -15,6 +15,9 @@ stdenv.mkDerivation rec { inherit patches; configFile = optionalString (conf!=null) (writeText "config.def.h" conf); + patchPhase = optionalString stdenv.isDarwin '' + substituteInPlace config.mk --replace "-lrt" "" + ''; postPatch = optionalString (conf!=null) "cp ${configFile} config.def.h"; nativeBuildInputs = [ pkgconfig ncurses ]; From 047484d7729d137442c484f2b59cfd13f6d0037e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 24 Sep 2020 14:58:51 -0700 Subject: [PATCH 081/293] argbash: 2.9.0 -> 2.10.0 (#98669) --- pkgs/development/tools/misc/argbash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/argbash/default.nix b/pkgs/development/tools/misc/argbash/default.nix index fc1d3550e82..0c0511ec792 100644 --- a/pkgs/development/tools/misc/argbash/default.nix +++ b/pkgs/development/tools/misc/argbash/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "argbash"; - version = "2.9.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "matejak"; repo = "argbash"; rev = "${version}"; - sha256 = "1h6kw510r43b6d6rjhkhw4d67nc7grak4mgqs9ngjjv07qj3qfqc"; + sha256 = "1xdhpbnc0xjv6ydcm122hhdjcl77jhiqnccjfqjp3cd1lfmzvg8v"; }; sourceRoot = "source/resources"; From 57883eea4a4d8fad22261c11820df6b8abc53f16 Mon Sep 17 00:00:00 2001 From: Andrew Fontaine Date: Thu, 24 Sep 2020 18:00:05 -0400 Subject: [PATCH 082/293] nextcloud-client: 3.0.0 -> 3.0.2 Contains upstream fix for maintaining folder links when upgrading from 2.x to 3.x. --- pkgs/applications/networking/nextcloud-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index d5b384e0dda..ed670be08a6 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -19,13 +19,13 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.0.0"; + version = "3.0.2"; src = fetchFromGitHub { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "0ikya1s3zrh16hm2cmrqvd2vsxcllyg0grl37k6n9v5lygz3li4h"; + sha256 = "ROzaiRa9Odq4lXuHL7nbE0S49d0wxmDgm01qI1WM+WM="; }; patches = [ From 7bfde4b33400c1a9b5655a5b13960011a0d6740c Mon Sep 17 00:00:00 2001 From: zimbatm Date: Fri, 25 Sep 2020 00:06:56 +0200 Subject: [PATCH 083/293] Revert "st: enable build on darwin (#98668)" This reverts commit 34133d5425f4adbf4e9337d3c2b0695e654a5082. --- pkgs/applications/misc/st/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index 5d496dedc2e..a772629a7aa 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -15,9 +15,6 @@ stdenv.mkDerivation rec { inherit patches; configFile = optionalString (conf!=null) (writeText "config.def.h" conf); - patchPhase = optionalString stdenv.isDarwin '' - substituteInPlace config.mk --replace "-lrt" "" - ''; postPatch = optionalString (conf!=null) "cp ${configFile} config.def.h"; nativeBuildInputs = [ pkgconfig ncurses ]; From 60fcc12970ee23aaaf06812fcb04b94f32b9b1a2 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 25 Sep 2020 09:06:45 +1000 Subject: [PATCH 084/293] caddy: 2.1.1 -> 2.2.0 https://github.com/caddyserver/caddy/releases/tag/v2.2.0 --- pkgs/servers/caddy/default.nix | 10 ++++++---- pkgs/top-level/all-packages.nix | 7 +++++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 1ed6fcd2d52..a4e787db739 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "caddy"; - version = "2.1.1"; + version = "2.2.0"; subPackages = [ "cmd/caddy" ]; @@ -10,10 +10,12 @@ buildGoModule rec { owner = "caddyserver"; repo = pname; rev = "v${version}"; - sha256 = "0c682zrivkawsxlps5hlx8js5zp4ddahg0zi5cr0861gnllbdll0"; + sha256 = "086zgbwb3v11gik2w024p7m7ywkzn0w27y6hrngd4rxylj7jq7c8"; }; - vendorSha256 = "0jzx00c2b8y7zwl73r2fh1826spcd15y39nfzr53s5lay3fvkybc"; + vendorSha256 = "1rm7v03v6rf9fdqrrl639z8a46cdzswjp8rdpygcsndqfznn5w7b"; + + passthru.tests = { inherit (nixosTests) caddy; }; meta = with stdenv.lib; { homepage = "https://caddyserver.com"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 434ce8371f7..5c76bbfa065 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1526,8 +1526,11 @@ in ''; }); - caddy = callPackage ../servers/caddy { buildGoModule = buildGo114Module; }; # https://github.com/lucas-clemente/quic-go/issues/2614 - caddy1 = callPackage ../servers/caddy/v1.nix { buildGoModule = buildGo114Module; }; + caddy = callPackage ../servers/caddy { }; + caddy1 = callPackage ../servers/caddy/v1.nix { + # https://github.com/lucas-clemente/quic-go/issues/2614 + buildGoModule = buildGo114Module; + }; # Traefik 2.2 uses go1.14, pinning can be removed with 2.3 # https://github.com/containous/traefik/issues/7234#issuecomment-684950612 From e512a29eb4b7ff05009f9acb461433cd7f55bb8e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 24 Sep 2020 23:19:01 +0000 Subject: [PATCH 085/293] catimg: 2.6.0 -> 2.7.0 --- pkgs/tools/misc/catimg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/catimg/default.nix b/pkgs/tools/misc/catimg/default.nix index ac2f3f3411a..30845759a28 100644 --- a/pkgs/tools/misc/catimg/default.nix +++ b/pkgs/tools/misc/catimg/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "catimg"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "posva"; repo = pname; rev = version; - sha256 = "0g9ywbgy162wiam9hc3yqpq5q4gyxa8fj4jskr3fdz8z8jjaabzz"; + sha256 = "0a2dswbv4xddb2l2d55hc43lzvjwrjs5z9am7v6i0p0mi2fmc89s"; }; nativeBuildInputs = [ cmake ]; From 22212571164eff6af18c5dec90ecf17cdc1387ce Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 25 Sep 2020 00:56:11 +0000 Subject: [PATCH 086/293] cddlib: 0.94j -> 0.94l --- pkgs/development/libraries/cddlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cddlib/default.nix b/pkgs/development/libraries/cddlib/default.nix index 76b5390fb69..a9a10fc6317 100644 --- a/pkgs/development/libraries/cddlib/default.nix +++ b/pkgs/development/libraries/cddlib/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { pname = "cddlib"; - version = "0.94j"; + version = "0.94l"; src = fetchFromGitHub { owner = "cddlib"; repo = "cddlib"; rev = version; - sha256 = "1z03ljy3rrr0qq5gq54vynnif6fn0xhn05g90nnv0dpyc3ps8lzp"; + sha256 = "0934a0i2m2bamlibi4cbrf1md1pz7dp35jbfamb0k7x644sayl4k"; }; buildInputs = [gmp]; nativeBuildInputs = [ From 8da7bd63ca2b2e84bf14540312ffc818715cfec6 Mon Sep 17 00:00:00 2001 From: Farid Zakaria Date: Thu, 24 Sep 2020 16:33:43 -0700 Subject: [PATCH 087/293] jruby: fix shebang for binaries in JRuby MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There are a variety of additional scripts that are included with the JRuby installation that use JRuby itself. For instance the `bin/gem` had the following contents: ```bash ❯ cat /nix/store/kglkqf56ii83yl6yrgcaj5r3s9m2fzr0-jruby-9.2.13.0/bin/gem load File.join(File.dirname(__FILE__), 'jgem') ``` This is clearly wrong. Patchshebangs was not picking up the fix as part of stdenv because the patch is not a build input but the final output itself. We have to rely on substituteInPlace so that we get the correct version. ```bash ❯ cat /nix/store/k4fnrn0dcsh2wzw81217r0ywsspb468f-jruby-9.2.13.0/bin/gem ``` --- pkgs/development/interpreters/jruby/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index e4511da498c..8d27bfb64f8 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -40,6 +40,10 @@ jruby = stdenv.mkDerivation rec { EOF ''; + postFixup = '' + PATH=$out/bin:$PATH patchShebangs $out/bin + ''; + passthru = rec { rubyEngine = "jruby"; gemPath = "lib/${rubyEngine}/gems/${rubyVersion.libDir}"; From e247ea75622a94766aaca655d460ec2e175abc29 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 25 Sep 2020 11:24:35 +1000 Subject: [PATCH 088/293] .editorconfig: add enpass/data.json --- .editorconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.editorconfig b/.editorconfig index f3489267888..129ef84df80 100644 --- a/.editorconfig +++ b/.editorconfig @@ -108,6 +108,10 @@ trim_trailing_whitespace = unset [pkgs/tools/misc/timidity/timidity.cfg] trim_trailing_whitespace = unset +[pkgs/tools/security/enpass/data.json] +insert_final_newline = unset +trim_trailing_whitespace = unset + [pkgs/top-level/emscripten-packages.nix] trim_trailing_whitespace = unset From ae421104f83358c8ee913e371052c136ae615057 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 25 Sep 2020 02:03:11 +0000 Subject: [PATCH 089/293] charliecloud: 0.18 -> 0.19 --- pkgs/applications/virtualization/charliecloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/charliecloud/default.nix b/pkgs/applications/virtualization/charliecloud/default.nix index 54663f9c5e6..a7e8260765f 100644 --- a/pkgs/applications/virtualization/charliecloud/default.nix +++ b/pkgs/applications/virtualization/charliecloud/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { - version = "0.18"; + version = "0.19"; pname = "charliecloud"; src = fetchFromGitHub { owner = "hpc"; repo = "charliecloud"; rev = "v${version}"; - sha256 = "0x2kvp95ld0yii93z9i0k9sknfx7jkgy4rkw9l369fl7f73ghsiq"; + sha256 = "1rmvm0s1jdpzfg32b3hwsbdkzws7gsy4xq227hmzv3n2dv64svm6"; }; nativeBuildInputs = [ autoreconfHook makeWrapper ]; From 91e5494dbf3845a1f991c1af059023d0e5da51d7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 25 Sep 2020 02:08:28 +0000 Subject: [PATCH 090/293] cheat: 4.0.4 -> 4.1.0 --- pkgs/applications/misc/cheat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index e3ffdef44d0..77717ff50a2 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "cheat"; - version = "4.0.4"; + version = "4.1.0"; src = fetchFromGitHub { owner = "cheat"; repo = "cheat"; rev = version; - sha256 = "0cracw6pja3d7z6ip6lbmpvfxlxcnh3fbgh5ba8c87bhfz99idqn"; + sha256 = "0x6msbbqkwxs6msqacpqw4wlw7c9ilf8n6jqmx297ij6isswgksh"; }; subPackages = [ "cmd/cheat" ]; From ced2c4a0ec8ef04d13ab8cd532151ef8ae689c35 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 25 Sep 2020 02:29:32 +0000 Subject: [PATCH 091/293] cliquer: 1.21 -> 1.22 --- pkgs/development/libraries/science/math/cliquer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/cliquer/default.nix b/pkgs/development/libraries/science/math/cliquer/default.nix index c473fcedde3..e56952abcb2 100644 --- a/pkgs/development/libraries/science/math/cliquer/default.nix +++ b/pkgs/development/libraries/science/math/cliquer/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - version = "1.21"; + version = "1.22"; pname = "cliquer"; # autotoolized version of the original cliquer @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "dimpase"; repo = "autocliquer"; rev = "v${version}"; - sha256 = "180i4qj1a25qfp75ig2d3144xfpb1dgcgpha0iqqghd7di4awg7z"; + sha256 = "00gcmrhi2fjn8b246w5a3b0pl7p6haxy5wjvd9kcqib1xanz59z4"; }; doCheck = true; From 9979d33ac7c4f2dcf182f50e63ee1957b869d46d Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 25 Sep 2020 12:37:21 +1000 Subject: [PATCH 092/293] mtr: 0.93 -> 0.94 https://github.com/traviscross/mtr/blob/v0.94/NEWS --- pkgs/tools/networking/mtr/default.nix | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index ae5695537af..6b8b2f92374 100644 --- a/pkgs/tools/networking/mtr/default.nix +++ b/pkgs/tools/networking/mtr/default.nix @@ -1,27 +1,19 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config , libcap, ncurses -, withGtk ? false, gtk2 ? null }: +, withGtk ? false, gtk3 ? null }: -assert withGtk -> gtk2 != null; +assert withGtk -> gtk3 != null; stdenv.mkDerivation rec { pname = "mtr${lib.optionalString withGtk "-gui"}"; - version = "0.93"; + version = "0.94"; src = fetchFromGitHub { owner = "traviscross"; repo = "mtr"; rev = "v${version}"; - sha256 = "0n0zr9k61w7a9psnzgp7xnc7ll1ic2xzcvqsbbbyndg3v9rff6bw"; + sha256 = "0wnz87cr2lcl74bj8qxq9xgai40az3pk9k0z893scyc8svd61xz6"; }; - - patches = [ - # https://github.com/traviscross/mtr/pull/315 - (fetchpatch { - url = "https://github.com/traviscross/mtr/pull/315.patch?full_index=1"; - sha256 = "18qcsj9058snc2qhq6v6gdbqhz021gi5fgw9h7vfczv45gf0qasa"; - }) - ]; # we need this before autoreconfHook does its thing postPatch = '' @@ -36,10 +28,10 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional (!withGtk) "--without-gtk"; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ ncurses ] - ++ stdenv.lib.optional withGtk gtk2 + ++ stdenv.lib.optional withGtk gtk3 ++ stdenv.lib.optional stdenv.isLinux libcap; enableParallelBuilding = true; From 625ba8ed5e2a5b98e01f0ac4decd9626918e148b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 25 Sep 2020 03:58:04 +0000 Subject: [PATCH 093/293] containerd: 1.4.0 -> 1.4.1 --- pkgs/applications/virtualization/containerd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index e6595a207b8..eded437a62d 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -4,7 +4,7 @@ with lib; buildGoPackage rec { pname = "containerd"; - version = "1.4.0"; + version = "1.4.1"; # git commit for the above version's tag commit = "7ad184331fa3e55e52b890ea95e65ba581ae3429"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "1ajns679ck5yp6vmf39pyshzf8jijw5fcg5biixkj54jhj3bv1sq"; + sha256 = "1k6dqaidnldf7kpxdszf0wn6xb8m6vaizm2aza81fri1q0051213"; }; goPackagePath = "github.com/containerd/containerd"; From e66a7e2fb79f1eb89b42a289d81ba096272157f3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 25 Sep 2020 04:38:49 +0000 Subject: [PATCH 094/293] cytoscape: 3.8.0 -> 3.8.1 --- pkgs/applications/science/misc/cytoscape/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/applications/science/misc/cytoscape/default.nix index 0db007f543f..12cdeb453d7 100644 --- a/pkgs/applications/science/misc/cytoscape/default.nix +++ b/pkgs/applications/science/misc/cytoscape/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cytoscape"; - version = "3.8.0"; + version = "3.8.1"; src = fetchurl { url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/${pname}-unix-${version}.tar.gz"; - sha256 = "0kksx12m83cjprdygmcc286990byf25yqfx5s7c07cizc21aavyg"; + sha256 = "006g0w29sccg5h0zlrxdp3lx4vx1bfdhx2cms6aah85r5b82wgkf"; }; patches = [ From ca1eb33f142b24e44d36029986a7b2d32c731878 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 25 Sep 2020 04:53:35 +0000 Subject: [PATCH 095/293] dasm: 2.20.13 -> 2.20.14 --- pkgs/development/compilers/dasm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/dasm/default.nix b/pkgs/development/compilers/dasm/default.nix index 1eb233b90b7..6ab729cd313 100644 --- a/pkgs/development/compilers/dasm/default.nix +++ b/pkgs/development/compilers/dasm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dasm"; - version = "2.20.13"; + version = "2.20.14"; src = fetchFromGitHub { owner = "dasm-assembler"; repo = "dasm"; rev = version; - sha256 = "1nr4kvw42vyc6i4p1c06jlih11rhbjjxc27dc7cx5qj635xf4jcf"; + sha256 = "09hzw228j43a78624bmq9cam7y1fjs48d3hpjqh2gn8iwnyk0pnp"; }; configurePhase = false; From 8976ee528ab68c8a32921157e310460531713886 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 25 Sep 2020 05:12:11 +0000 Subject: [PATCH 096/293] diskonaut: 0.9.0 -> 0.11.0 --- pkgs/tools/misc/diskonaut/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/diskonaut/default.nix b/pkgs/tools/misc/diskonaut/default.nix index 1eb3dd7a0f7..20b955f877e 100644 --- a/pkgs/tools/misc/diskonaut/default.nix +++ b/pkgs/tools/misc/diskonaut/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "diskonaut"; - version = "0.9.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "imsnif"; repo = "diskonaut"; rev = version; - sha256 = "125ba9qwh7j8bz74w2zbw729s1wfnjg6dg8yicqrp6559x9k7gq5"; + sha256 = "1pmbag3r2ka30zmy2rs9jps2qxj2zh0gy4a774v9yhf0b6qjid54"; }; - cargoSha256 = "0vvbrlmviyn9w8i416767vhvd1gqm3qjvia730m0rs0w5h8khiqf"; + cargoSha256 = "0y86ikf235lp5j85fgzawgp4vx66rmzqd6p5n8iy3mqwn3c1ggb8"; meta = with stdenv.lib; { description = "Terminal disk space navigator"; From 9962661ef3674245862ccf81a8b0fdf58112441c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 25 Sep 2020 05:27:01 +0000 Subject: [PATCH 097/293] drawio: 13.6.2 -> 13.7.3 --- pkgs/applications/graphics/drawio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 5d037bba5ba..5a5ce5d8b21 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "13.6.2"; + version = "13.7.3"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm"; - sha256 = "17nahdv06d41vyqkcqflf652wjp410i3hn4rhlv5cnd3jcr5vgih"; + sha256 = "14wcj9jbpv1rg0g7djihzzq088aj96mwys4rc9540ajbkbbm9d36"; }; nativeBuildInputs = [ From adf9fe19f5a45ae35641973617bc2401bcf83fd0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 25 Sep 2020 05:36:08 +0000 Subject: [PATCH 098/293] dstask: 0.20 -> 0.21 --- pkgs/applications/misc/dstask/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dstask/default.nix b/pkgs/applications/misc/dstask/default.nix index d0f84df7841..d5c02f69552 100644 --- a/pkgs/applications/misc/dstask/default.nix +++ b/pkgs/applications/misc/dstask/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dstask"; - version = "0.20"; + version = "0.21"; src = fetchFromGitHub { owner = "naggie"; repo = pname; rev = "v${version}"; - sha256 = "0hrhvfkqflr4wx1r2xbfbi566pglrp4rp5yq0cr2ml0x6kw3yz0j"; + sha256 = "0af85rs4s0wfnibdhn28qycvy90aafkczccs5vyh36y7cnyhvgkl"; }; # Set vendorSha256 to null because dstask vendors its dependencies (meaning From dc19de6009db3d854239c6c7801c115eeebe5181 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 21 Sep 2020 17:09:08 +1000 Subject: [PATCH 099/293] Revert "syncthing: pin to go 1.14" This reverts commit 384e56bbaac9938ede50fa45989a8f594ebf293f. Fixed in the 1.9.0 release. https://github.com/syncthing/syncthing/releases/tag/v1.9.0 --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 724b6f597c0..6d26173596f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23453,9 +23453,7 @@ in # this can be changed to python3 once pyside2 is updated to support the latest python version syncplay = python37.pkgs.callPackage ../applications/networking/syncplay { }; - inherit (callPackages ../applications/networking/syncthing { - buildGoModule = buildGo114Module; - }) + inherit (callPackages ../applications/networking/syncthing { }) syncthing syncthing-cli syncthing-discovery From d290b85d2c2f0e08c8a59de80d5f1b26c5b93220 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 25 Sep 2020 06:03:11 +0000 Subject: [PATCH 100/293] emplace: 0.3.6 -> 0.3.7 --- pkgs/tools/package-management/emplace/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/tools/package-management/emplace/default.nix index 5d3d8e15e3e..c794566e19f 100644 --- a/pkgs/tools/package-management/emplace/default.nix +++ b/pkgs/tools/package-management/emplace/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "emplace"; - version = "0.3.6"; + version = "0.3.7"; src = fetchFromGitHub { owner = "tversteeg"; repo = pname; rev = "v${version}"; - sha256 = "15d21qv8cbzwpz2gsq1cgvxdbqm45zq2wfphhjqq77z1kay43m3f"; + sha256 = "0ihx6hrzs7wkdz9wzgarmm73dz1fb2bhssmxrgv5nzmkhygn4xfy"; }; - cargoSha256 = "0xd1b0rfrf3a6j0xkyfqz2pd0lkb6dpqyyghli9a8kh0kdfxvndj"; + cargoSha256 = "0yqg2hagsjaxvrj96qg6k1llkmqdqp792c2844h7fhnhlx6v2wd2"; meta = with lib; { description = "Mirror installed software on multiple machines"; From 179360d4196f62d71be97088cce2bff0a8f06d43 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Wed, 23 Sep 2020 12:08:52 +0200 Subject: [PATCH 101/293] amber: init at unstable-2020-09-23 --- pkgs/tools/graphics/amber/default.nix | 95 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 97 insertions(+) create mode 100644 pkgs/tools/graphics/amber/default.nix diff --git a/pkgs/tools/graphics/amber/default.nix b/pkgs/tools/graphics/amber/default.nix new file mode 100644 index 00000000000..1b8c90c8fb7 --- /dev/null +++ b/pkgs/tools/graphics/amber/default.nix @@ -0,0 +1,95 @@ +{ stdenv +, fetchFromGitHub +, cmake +, pkg-config +, python3 +, vulkan-headers +, vulkan-loader +}: +let + glslang = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "glslang"; + rev = "3ee5f2f1d3316e228916788b300d786bb574d337"; + sha256 = "1l5h9d92mzd35pgs0wibqfg7vbl771lwnvdlcsyhf6999khn5dzv"; + }; + + lodepng = fetchFromGitHub { + owner = "lvandeve"; + repo = "lodepng"; + rev = "34628e89e80cd007179b25b0b2695e6af0f57fac"; + sha256 = "10yaf218xnmhv7rsq6dysqrps43r30cgrs1z63h47z40x43ikia0"; + }; + + shaderc = fetchFromGitHub { + owner = "google"; + repo = "shaderc"; + rev = "ba92b11e1fcaf4c38a64f84d643d6429175bf650"; + sha256 = "041hip43siy2sr7h6habk9sxdmd45ag4kqgi8jk0vm1b8pqzkhqn"; + }; + + spirv-headers = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Headers"; + rev = "3fdabd0da2932c276b25b9b4a988ba134eba1aa6"; + sha256 = "17h5cn4dyw8ixp1cpw8vf1z90m0fn1hhlvh0iycmknccbb1z34q7"; + }; + + spirv-tools = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Tools"; + rev = "fd3cabd8b5fc43ce83884ac06486c283b9902b4f"; + sha256 = "1h3smicw5gzpa17syb30085zccydzs4f41fl30bcmiipdn2xfpjr"; + }; + +in +stdenv.mkDerivation rec { + pname = "amber"; + version = "unstable-2020-09-23"; + + src = fetchFromGitHub { + owner = "google"; + repo = pname; + rev = "0eee2d45d053dfc566baa58442a9b1b708e4f2a7"; + sha256 = "1rrbvmn9hvhj7xj89yqvy9mx0vg1qapdm5fkca8mkd3516d9f5pw"; + }; + + buildInputs = [ + vulkan-headers + vulkan-loader + ]; + + nativeBuildInputs = [ + cmake + pkg-config + python3 + ]; + + # Tests are disabled so we do not have to pull in googletest and more dependencies + cmakeFlags = [ "-DAMBER_SKIP_TESTS=ON" ]; + + prePatch = '' + cp -r ${glslang}/ third_party/glslang + cp -r ${lodepng}/ third_party/lodepng + cp -r ${shaderc}/ third_party/shaderc + cp -r ${spirv-tools}/ third_party/spirv-tools + cp -r ${spirv-headers}/ third_party/spirv-headers + chmod u+w -R third_party + + substituteInPlace CMakeLists.txt \ + --replace "-Werror" "" + substituteInPlace tools/update_build_version.py \ + --replace "not os.path.exists(directory)" "True" + ''; + + installPhase = '' + install -Dm755 -t $out/bin amber image_diff + ''; + + meta = with stdenv.lib; { + description = "Multi-API shader test framework"; + homepage = "https://github.com/google/amber"; + license = licenses.asl20; + maintainers = with maintainers; [ Flakebi ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef348253cc6..a97d8c5413c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1099,6 +1099,8 @@ in glyr = callPackage ../tools/audio/glyr { }; + google-amber = callPackage ../tools/graphics/amber { }; + hpe-ltfs = callPackage ../tools/backup/hpe-ltfs { }; http2tcp = callPackage ../tools/networking/http2tcp { }; From b67fea5c668b51ba9bf7b892e471d76a36220fd5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 25 Sep 2020 06:12:28 +0000 Subject: [PATCH 102/293] ergo: 3.3.1 -> 3.3.3 --- pkgs/applications/blockchains/ergo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index 83a6cfaf05b..a61df3e91bd 100644 --- a/pkgs/applications/blockchains/ergo/default.nix +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "3.3.1"; + version = "3.3.3"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "1qr1vfb6mhm2hxl2ksydkhadm7phadn93lwm3f9zni01plk56bb5"; + sha256 = "1lsqshpbc5p5qm8kic8a90xmvd2zx2s7jf613j9ng4h3hh75wbff"; }; nativeBuildInputs = [ makeWrapper ]; From cef4bc9f8a70b1352b5499749190e06bc905adcf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 25 Sep 2020 06:32:31 +0000 Subject: [PATCH 103/293] fff: 2.1 -> 2.2 --- pkgs/applications/misc/fff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/fff/default.nix b/pkgs/applications/misc/fff/default.nix index 1397f0a057d..cf307afd1bd 100644 --- a/pkgs/applications/misc/fff/default.nix +++ b/pkgs/applications/misc/fff/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fff"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "dylanaraps"; repo = pname; rev = version; - sha256 = "0s5gi5ghwax5gc886pvbpcmsbmzhxzywajwzjsdxwjyd1v1iynwh"; + sha256 = "14ymdw6l6phnil0xf1frd5kgznaiwppcic0v4hb61s1zpf4wrshg"; }; pathAdd = stdenv.lib.makeSearchPath "bin" ([ xdg_utils file coreutils w3m xdotool ]); From 48e1befab803816b2ff2f71c29acf4d04f5b8368 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 25 Sep 2020 06:52:27 +0000 Subject: [PATCH 104/293] fluent-bit: 1.5.4 -> 1.5.6 --- pkgs/tools/misc/fluent-bit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index 2f49d0e57eb..455befa835d 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.5.4"; + version = "1.5.6"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "0w96f86i2jlzjk2plf8jbdw4q748khbhhjkbzfb8dkq2lhc9i80h"; + sha256 = "1s4yjcqpvvvmzv2gzx9hnma9dkrqspp9ds0w3d7mbqw0z5gc70x9"; }; nativeBuildInputs = [ cmake flex bison ]; From 3a5bcb313e7503569bc2039fe3c325de9023af81 Mon Sep 17 00:00:00 2001 From: Graham Bennett Date: Tue, 22 Sep 2020 21:56:46 +0100 Subject: [PATCH 105/293] octave: use qt-5 mkDerivation for wrapQtAppsHook This is to ensure QT_QPA_PLATFORM_PLUGIN_PATH is set on Darwin. --- pkgs/development/interpreters/octave/default.nix | 5 ++++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 06d69ed8117..d9766108596 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -1,4 +1,7 @@ { stdenv +# Note: either stdenv.mkDerivation or, for octaveFull, the qt-5 mkDerivation +# with wrapQtAppsHook (comes from libsForQt5.callPackage) +, mkDerivation , fetchurl , gfortran , ncurses @@ -55,7 +58,7 @@ assert (!blas.isILP64) && (!lapack.isILP64); -stdenv.mkDerivation rec { +mkDerivation rec { version = "5.2.0"; pname = "octave"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d26173596f..459dbc7a591 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10124,14 +10124,16 @@ in octave = callPackage ../development/interpreters/octave { python = python3; + mkDerivation = stdenv.mkDerivation; jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; octave-jit = callPackage ../development/interpreters/octave { python = python3; enableJIT = true; + mkDerivation = stdenv.mkDerivation; jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - octaveFull = (lowPrio (libsForQt512.callPackage ../development/interpreters/octave { + octaveFull = (lowPrio (libsForQt5.callPackage ../development/interpreters/octave { python = python3; enableQt = true; overridePlatforms = ["x86_64-linux" "x86_64-darwin"]; From 31cef85719bfeb1d5fa45d72feb14822a0cebcba Mon Sep 17 00:00:00 2001 From: Graham Bennett Date: Thu, 24 Sep 2020 22:58:20 +0100 Subject: [PATCH 106/293] Remove lowPrio from octaveFull --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 459dbc7a591..a323379bd05 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10133,12 +10133,12 @@ in mkDerivation = stdenv.mkDerivation; jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - octaveFull = (lowPrio (libsForQt5.callPackage ../development/interpreters/octave { + octaveFull = libsForQt5.callPackage ../development/interpreters/octave { python = python3; enableQt = true; overridePlatforms = ["x86_64-linux" "x86_64-darwin"]; jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - })); + }; ocropus = callPackage ../applications/misc/ocropus { }; From ff513a5b89b231ad0fc3daec659b13410c70aadb Mon Sep 17 00:00:00 2001 From: Philipp Date: Fri, 14 Aug 2020 12:36:39 +0200 Subject: [PATCH 107/293] gnunet_git: remove --- .../networking/p2p/gnunet/git.nix | 92 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 94 deletions(-) delete mode 100644 pkgs/applications/networking/p2p/gnunet/git.nix diff --git a/pkgs/applications/networking/p2p/gnunet/git.nix b/pkgs/applications/networking/p2p/gnunet/git.nix deleted file mode 100644 index b3d455599bf..00000000000 --- a/pkgs/applications/networking/p2p/gnunet/git.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ stdenv, fetchgit, libextractor, libmicrohttpd, libgcrypt -, zlib, gmp, curl, libtool, adns, sqlite, pkgconfig -, libxml2, ncurses, gettext, libunistring, libidn -, makeWrapper, autoconf, automake, texinfo, which -, withVerbose ? false }: - -let - rev = "ce2864cfaa27e55096b480bf35db5f8cee2a5e7e"; -in -stdenv.mkDerivation { - name = "gnunet-git-${rev}"; - - src = fetchgit { - url = "https://gnunet.org/git/gnunet.git"; - inherit rev; - sha256 = "0gbw920m9v4b3425c0d1h7drgl2m1fni1bwjn4fwqnyz7kdqzsgl"; - }; - - buildInputs = [ - libextractor libmicrohttpd libgcrypt gmp curl libtool - zlib adns sqlite libxml2 ncurses libidn - pkgconfig gettext libunistring makeWrapper - autoconf automake texinfo which - ]; - - configureFlags = stdenv.lib.optional withVerbose "--enable-logging=verbose "; - - preConfigure = '' - # Brute force: since nix-worker chroots don't provide - # /etc/{resolv.conf,hosts}, replace all references to `localhost' - # by their IPv4 equivalent. - for i in $(find . \( -name \*.c -or -name \*.conf \) \ - -exec grep -l '\' {} \;) - do - echo "$i: substituting \`127.0.0.1' to \`localhost'..." - sed -i "$i" -e's/\/127.0.0.1/g' - done - - # Make sure the tests don't rely on `/tmp', for the sake of chroot - # builds. - for i in $(find . \( -iname \*test\*.c -or -name \*.conf \) \ - -exec grep -l /tmp {} \;) - do - echo "$i: replacing references to \`/tmp' by \`$TMPDIR'..." - substituteInPlace "$i" --replace "/tmp" "$TMPDIR" - done - - # Ensure NSS installation works fine - configureFlags="$configureFlags --with-nssdir=$out/lib" - - sh contrib/pogen.sh - sh bootstrap - ''; - - doCheck = false; - - /* FIXME: Tests must be run this way, but there are still a couple of - failures. - - postInstall = - '' export GNUNET_PREFIX="$out" - export PATH="$out/bin:$PATH" - make -k check - ''; - */ - - meta = with stdenv.lib; { - description = "GNUnet, GNU's decentralized anonymous and censorship-resistant P2P framework"; - - longDescription = '' - GNUnet is a framework for secure peer-to-peer networking that - does not use any centralized or otherwise trusted services. A - first service implemented on top of the networking layer - allows anonymous censorship-resistant file-sharing. Anonymity - is provided by making messages originating from a peer - indistinguishable from messages that the peer is routing. All - peers act as routers and use link-encrypted connections with - stable bandwidth utilization to communicate with each other. - GNUnet uses a simple, excess-based economic model to allocate - resources. Peers in GNUnet monitor each others behavior with - respect to resource usage; peers that contribute to the - network are rewarded with better service. - ''; - - homepage = "https://gnunet.org/"; - - license = licenses.agpl3Plus; - - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = platforms.gnu ++ platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3df944635c1..eb7de7579aa 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -163,6 +163,7 @@ mapAliases ({ gnome-themes-standard = gnome-themes-extra; # added 2018-03-14 gnome_doc_utils = gnome-doc-utils; # added 2018-02-25 gnome_themes_standard = gnome-themes-standard; # added 2018-02-25 + gnunet_git = throw "gnunet_git was removed due to gnunet becoming stable"; # added 2019-05-27 gnuradio-nacl = gr-nacl; # added 2019-05-27 gnuradio-gsm = gr-gsm; # added 2019-05-27 gnuradio-ais = gr-ais; # added 2019-05-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41e7af4c09d..5daac29de10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20414,8 +20414,6 @@ in gnunet = callPackage ../applications/networking/p2p/gnunet { }; - gnunet_git = lowPrio (callPackage ../applications/networking/p2p/gnunet/git.nix { }); - gnunet-gtk = callPackage ../applications/networking/p2p/gnunet/gtk.nix { }; gocr = callPackage ../applications/graphics/gocr { }; From 3a4e082f7f2835b216e5577f7089fb1b0c18cf5e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 25 Sep 2020 07:16:46 +0000 Subject: [PATCH 108/293] frp: 0.33.0 -> 0.34.0 --- pkgs/tools/networking/frp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix index a998b25e3e7..6bc05139f8b 100644 --- a/pkgs/tools/networking/frp/default.nix +++ b/pkgs/tools/networking/frp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "frp"; - version = "0.33.0"; + version = "0.34.0"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - sha256 = "1z914p20n3i1bf4hx5iq2fylx1s49knb70cbg53ji2n7nrm1q33r"; + sha256 = "1f0cr7211wkam1204x6gsflhw7gc995lia3jq4v6n3ijfwy5vyvm"; }; - vendorSha256 = "0pi661mb5vwj16wwxnyx9b0ic7gzby6qfs3y4w00agn6sn5nahx2"; + vendorSha256 = "1ym4qcqgbbj6pa4cgmxmny7krxwjfl8l02hb3r5jh9qj886fwhdr"; doCheck = false; From 6deebfbbf22a2c629b572f91b42d8ebb7e8bfe0f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 25 Sep 2020 07:47:13 +0000 Subject: [PATCH 109/293] giada: 0.16.3.1 -> 0.16.4 --- pkgs/applications/audio/giada/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/giada/default.nix b/pkgs/applications/audio/giada/default.nix index ce3f3df84a4..1408deba97d 100644 --- a/pkgs/applications/audio/giada/default.nix +++ b/pkgs/applications/audio/giada/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "giada"; - version = "0.16.3.1"; + version = "0.16.4"; src = fetchFromGitHub { owner = "monocasual"; repo = pname; rev = "v${version}"; - sha256 = "0z1jrkggdn630i3j59j30apaa9s242y1wiawqp4g1n9dkg3r9a1j"; + sha256 = "0qyx0bvivlvly0vj5nnnbiks22xh13sqlw4mfgplq2lbbpgisigp"; }; configureFlags = [ From d2092a9dd44f4335d59aa47a2300a43a54202464 Mon Sep 17 00:00:00 2001 From: Sandro Date: Fri, 25 Sep 2020 09:53:58 +0200 Subject: [PATCH 110/293] duf: 0.1.0 -> 0.3.0 (#98683) --- pkgs/tools/misc/duf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/duf/default.nix b/pkgs/tools/misc/duf/default.nix index 70316399e97..2ed6f0ef7cb 100644 --- a/pkgs/tools/misc/duf/default.nix +++ b/pkgs/tools/misc/duf/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "duf"; - version = "0.1.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "muesli"; repo = "duf"; rev = "v${version}"; - sha256 = "1akziaa5wjszflyylvnw284pz1aqngl40civzfabjz94pvyjkp76"; + sha256 = "08vmhcvqn9g86iqwk42bj0i09lmchhdgha1xaj1jw1ci4k7s9vrf"; }; - vendorSha256 = "1aj7rxlylgvxdnnfnfzh20v2jvs8falvjjishxd8rdk1jgfpipl8"; + vendorSha256 = "1jmj46yami37r2wmiprpwyljcmj7dir9mcccx5is1jbiai6sx79i"; meta = with lib; { homepage = "https://github.com/muesli/duf/"; From a9e0dd08d164e2c40d1c1e143f36c492b4301546 Mon Sep 17 00:00:00 2001 From: Dan Callahan Date: Fri, 25 Sep 2020 09:06:48 +0100 Subject: [PATCH 111/293] digikam: 6.4.0 -> 7.1.0 --- pkgs/applications/graphics/digikam/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 2c0dbd5f3f0..4ac1a467b2e 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -26,6 +26,8 @@ , exiv2 , ffmpeg , flex +, graphviz +, imagemagick , lcms2 , lensfun , libgphoto2 @@ -39,6 +41,7 @@ , opencv3 , pcre , threadweaver +, x265 # For panorama and focus stacking , enblend-enfuse @@ -50,11 +53,11 @@ mkDerivation rec { pname = "digikam"; - version = "6.4.0"; + version = "7.1.0"; src = fetchurl { - url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "0vwd97zkxv30y8x0z76s4fsj4w9ysgsmpjclp2h2bpava7zi4l3p"; + url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz"; + sha256 = "1gmblnsm0aida3yynyddm6jdh59hx3w177hrhfar616z793ch0xi"; }; nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ]; @@ -66,6 +69,8 @@ mkDerivation rec { exiv2 ffmpeg flex + graphviz + imagemagick lcms2 lensfun libgphoto2 @@ -77,6 +82,7 @@ mkDerivation rec { libGLU opencv3 pcre + x265 qtbase qtxmlpatterns From e903c320234ce09d2744eb5b383e53fd9320e048 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 25 Sep 2020 08:09:31 +0000 Subject: [PATCH 112/293] go-toml: 1.8.0 -> 1.8.1 --- pkgs/development/tools/go-toml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/go-toml/default.nix b/pkgs/development/tools/go-toml/default.nix index 0cb16354b21..3d892378133 100644 --- a/pkgs/development/tools/go-toml/default.nix +++ b/pkgs/development/tools/go-toml/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "go-toml"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "pelletier"; repo = pname; rev = "v${version}"; - sha256 = "0fxmjm85c9h43lvqz71wr93fcc63bhj82nwby80222xx8ja63g7y"; + sha256 = "1pi1r9ds0vxjza4qrbk52y98wxrzh1ghwzc9c2v1w6i02pdwdcz9"; }; goPackagePath = "github.com/pelletier/go-toml"; From 74ccbf7c1b9400d2c5667679efb2045e21314de4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 25 Sep 2020 09:23:29 +0000 Subject: [PATCH 113/293] hcxdumptool: 6.1.1 -> 6.1.2 --- pkgs/tools/security/hcxdumptool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/hcxdumptool/default.nix b/pkgs/tools/security/hcxdumptool/default.nix index fc81a395078..63752b5f123 100644 --- a/pkgs/tools/security/hcxdumptool/default.nix +++ b/pkgs/tools/security/hcxdumptool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hcxdumptool"; - version = "6.1.1"; + version = "6.1.2"; src = fetchFromGitHub { owner = "ZerBea"; repo = "hcxdumptool"; rev = version; - sha256 = "0v6dq6x2mrmavazknmhb08ks53773sll367anfrrramild8350bh"; + sha256 = "0y73a5p23rg4zx6vkgpq1p3j2dzqcvzwn1ymswfkqm5zihbi17d7"; }; buildInputs = [ openssl ]; From 3765ae7ad5dd46ad880860ea0bec0af4f9993192 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 25 Sep 2020 09:39:22 +0000 Subject: [PATCH 114/293] hugo: 0.74.3 -> 0.75.1 --- pkgs/applications/misc/hugo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index a04c2bddaf9..37965fd6e3e 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.74.3"; + version = "0.75.1"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "0rikr4yrjvmrv8smvr8jdbcjqwf61y369wn875iywrj63pyr74r9"; + sha256 = "1c3l3q2xkibl1lz2mbvhgj94s6d9g5nakhpzj252s3m3cgk4w5wh"; }; - vendorSha256 = "17xn6bdy942g6nx5xky41ixmd5kaz68chj3rb02ibpyraamx04nm"; + vendorSha256 = "0gdd8fqd4mwg69wj8dxmm5wh1pjhdc189l2gy6njgpmwh93xbvdg"; doCheck = false; From f5dc64a3ef29cc9ea29c9c016b20e513efed760d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 25 Sep 2020 10:10:20 +0000 Subject: [PATCH 115/293] intermodal: 0.1.10 -> 0.1.11 --- pkgs/tools/misc/intermodal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/intermodal/default.nix b/pkgs/tools/misc/intermodal/default.nix index de52909a810..fe5d724e696 100644 --- a/pkgs/tools/misc/intermodal/default.nix +++ b/pkgs/tools/misc/intermodal/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "intermodal"; - version = "0.1.10"; + version = "0.1.11"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "v${version}"; - sha256 = "0vdla0vhvgj1yrg631jdm3kwdm1q0acw8sh2nz57dp3x7chq6ipx"; + sha256 = "1wqf227ljfys16jfbxi6mlkgdczgqrh15ixl9vi6higlxfi2wsj2"; }; - cargoSha256 = "1yl1chh243ixa9lhkmgi94w6mvnrnr7xmsh4kvj7ax693249pzjv"; + cargoSha256 = "0lx8y1y5mf8ga7iz74dnfyf2b9jx15wishw0khfxknmh96h2y99h"; # include_hidden test tries to use `chflags` on darwin checkFlagsArray = stdenv.lib.optionals stdenv.isDarwin [ "--skip=subcommand::torrent::create::tests::include_hidden" ]; From 579404c4a57e0c79c62fc1b1993485bb9c060a68 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 25 Sep 2020 12:37:39 +0200 Subject: [PATCH 116/293] virtualbox: re-add support for virtio For some reason the original source tarball for version 6.1.14 didn't bundle the sources for `virtio`-support causing a build-failure. After this was reported, a new tarball named `VirtualBox-6.1.14a.tar.bz2` was published which fixes the issue[1]. [1] https://www.virtualbox.org/ticket/19862 --- pkgs/applications/virtualization/virtualbox/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 72cbb8b81f8..c320eca0bbe 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -24,6 +24,7 @@ let # Use maintainers/scripts/update.nix to update the version and all related hashes or # change the hashes in extpack.nix and guest-additions/default.nix as well manually. version = "6.1.14"; + tarballVersion = "${version}a"; iasl' = iasl.overrideAttrs (old: rec { inherit (old) pname; @@ -39,8 +40,8 @@ in stdenv.mkDerivation { inherit version; src = fetchurl { - url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "91fa05bcfce36316ca93e3927c9550ea66286fff4c5bec900b753fca278ce1a0"; + url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${tarballVersion}.tar.bz2"; + sha256 = "16f3cb83ab3c4dacf2a9d3cc638cbd18db23767828bba6b8ba1c1b57abeb6aef"; }; outputs = [ "out" "modsrc" ]; @@ -120,8 +121,6 @@ in stdenv.mkDerivation { NIX_CFLAGS_COMPILE=$(echo "$NIX_CFLAGS_COMPILE" | sed 's,\-isystem ${lib.getDev stdenv.cc.libc}/include,,g') cat >> LocalConfig.kmk < Date: Fri, 25 Sep 2020 10:51:27 +0000 Subject: [PATCH 117/293] k6: 0.27.1 -> 0.28.0 --- pkgs/development/tools/k6/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/k6/default.nix b/pkgs/development/tools/k6/default.nix index bf4f83f9021..4dbd890df18 100644 --- a/pkgs/development/tools/k6/default.nix +++ b/pkgs/development/tools/k6/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "k6"; - version = "0.27.1"; + version = "0.28.0"; goPackagePath = "github.com/loadimpact/k6"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "loadimpact"; repo = pname; rev = "v${version}"; - sha256 = "0ni7x64al49adzy6kwzxyi56w556qy34888hxsldjrnndlchc0vz"; + sha256 = "0zpkavl6sg6kcb7wc92lzi4svvv3284xs20zbmgq4i9i5z1njdkx"; }; subPackages = [ "./" ]; From c16c21cb8450847ff2b20c63203a0d24c982d7cc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 25 Sep 2020 11:28:11 +0000 Subject: [PATCH 118/293] k9s: 0.21.7 -> 0.22.1 --- pkgs/applications/networking/cluster/k9s/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 3c793cc9ec3..c365bf1e7a9 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.21.7"; + version = "0.22.1"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "1rw1vzxfjzklzdpcxz7mplvlmggavaym260s7vzvbgvd1snf38cb"; + sha256 = "1qyibpvfbd8yahfmci431qd0zy4wwz03gwj1ak8rn3qxpv1cdbmk"; }; buildFlagsArray = '' @@ -18,7 +18,7 @@ buildGoModule rec { -X github.com/derailed/k9s/cmd.commit=${src.rev} ''; - vendorSha256 = "05rsbi40pihdh212d5zn6cchnkrqd6rsyl3vfsw77ksybwakrbf7"; + vendorSha256 = "1432ppgd3lc0h83i6vzklfhp95s2xwaf41mv4xfryzzszjfndmvl"; doCheck = false; From 5c0a2e8c60660b341843883988d28f49b65d795e Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 21 Sep 2019 14:50:08 +0200 Subject: [PATCH 119/293] nixos/prometheus: add retentionTime --- .../services/monitoring/prometheus/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index d7e06484b69..bc23606edf1 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -49,8 +49,8 @@ let "--web.listen-address=${cfg.listenAddress}:${builtins.toString cfg.port}" "--alertmanager.notification-queue-capacity=${toString cfg.alertmanagerNotificationQueueCapacity}" "--alertmanager.timeout=${toString cfg.alertmanagerTimeout}s" - ] ++ - optional (cfg.webExternalUrl != null) "--web.external-url=${cfg.webExternalUrl}"; + ] ++ optional (cfg.webExternalUrl != null) "--web.external-url=${cfg.webExternalUrl}" + ++ optional (cfg.retentionTime != null) "--storage.tsdb.retention.time=${cfg.retentionTime}"; filterValidPrometheus = filterAttrsListRecursive (n: v: !(n == "_module" || v == null)); filterAttrsListRecursive = pred: x: @@ -624,6 +624,15 @@ in { errors, despite a correct configuration. ''; }; + + retentionTime = mkOption { + type = types.nullOr types.str; + default = null; + example = "15d"; + description = '' + How long to retain samples in storage. + ''; + }; }; config = mkIf cfg.enable { From 6b0794caa5b73704080d91aa2b16111159d1e120 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 25 Sep 2020 13:42:08 +0200 Subject: [PATCH 120/293] signal-desktop: 1.36.1 -> 1.36.2 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 881d7458c09..87ca24db8b9 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 = "1.36.1"; # Please backport all updates to the stable channel. + version = "1.36.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 = "0lc56g09g2xfwxwm046bcykvxd0nq63zazamnp268z28lnn937mc"; + sha256 = "08273a395cjsiqkgalxj3flh268wi3c6dbz52kxrl6z9gkrnrp3r"; }; nativeBuildInputs = [ From f412df1f6bf9104e3444375946434fe3cd35de26 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Fri, 6 Jul 2018 21:13:13 +0200 Subject: [PATCH 121/293] nixos/prometheus-postfix-exporter: set default group The postfix exporter needs to access postfix's `queue/public/` directory to read the `showq` socket inside. Instead of making the public directory world accessible, this sets the postfix exporter's group to `postdrop` by default, when the postfix service is enabled. --- .../modules/services/monitoring/prometheus/exporters.nix | 2 ++ .../services/monitoring/prometheus/exporters/postfix.nix | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index cc71451bf20..4d15fb12ff7 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -229,6 +229,8 @@ in })] ++ [(mkIf config.services.nginx.enable { systemd.services.prometheus-nginx-exporter.after = [ "nginx.service" ]; systemd.services.prometheus-nginx-exporter.requires = [ "nginx.service" ]; + })] ++ [(mkIf config.services.postfix.enable { + services.prometheus.exporters.postfix.group = mkDefault config.services.postfix.setgidGroup; })] ++ (mapAttrsToList (name: conf: mkExporterConf { inherit name; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix b/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix index 3b6ef1631f8..e818b6e37b3 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix @@ -8,6 +8,15 @@ in { port = 9154; extraOpts = { + group = mkOption { + type = types.str; + description = '' + Group under which the postfix exporter shall be run. + It should match the group that is allowed to access the + showq socket in the queue/public/ directory. + Defaults to services.postfix.setgidGroup when postfix is enabled. + ''; + }; telemetryPath = mkOption { type = types.str; default = "/metrics"; From e9f6ff878aac656e672fc7fb39675f94a3d2281a Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 25 Sep 2020 14:14:56 +0200 Subject: [PATCH 122/293] =?UTF-8?q?chroma:=200.8.0=20=E2=86=92=200.8.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/text/chroma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/chroma/default.nix b/pkgs/tools/text/chroma/default.nix index ae4e26e2ca4..438681e1728 100644 --- a/pkgs/tools/text/chroma/default.nix +++ b/pkgs/tools/text/chroma/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "chroma"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "alecthomas"; repo = "chroma"; rev = "v${version}"; - sha256 = "066a6rdmf670d3v5sc7chbn7db09ldgxjympb03pcqwk644dixb1"; + sha256 = "1gwwfn26aipzzvyy466gi6r54ypfy3ylnbi8c4xwch9pkgw16w98"; }; vendorSha256 = "16cnc4scgkx8jan81ymha2q1kidm6hzsnip5mmgbxpqcc2h7hv9m"; From deaf9a86b21aaf9db83766d6f5b2a4408bcfbd12 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 25 Sep 2020 14:23:11 +0200 Subject: [PATCH 123/293] =?UTF-8?q?ocamlPackages.tls:=200.12.4=20=E2=86=92?= =?UTF-8?q?=200.12.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/tls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix index 807fb022e97..b52561d760e 100644 --- a/pkgs/development/ocaml-modules/tls/default.nix +++ b/pkgs/development/ocaml-modules/tls/default.nix @@ -6,12 +6,12 @@ buildDunePackage rec { minimumOCamlVersion = "4.08"; - version = "0.12.4"; + version = "0.12.5"; pname = "tls"; src = fetchurl { url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-v${version}.tbz"; - sha256 = "1m6ci98xg8axk1swrjx0q33ixinyjg8vzr7vwr65k9wljfgy10s9"; + sha256 = "1zsh3fx8l3d9lc9w516apzabqsix2ss8nv6kbbzjmp2d4hwh818b"; }; useDune2 = true; From 0e3f6318312f8510287b15f15b42823b0695883c Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Fri, 25 Sep 2020 14:27:29 +0200 Subject: [PATCH 124/293] prometheus postfix exporter test: check showq --- nixos/tests/prometheus-exporters.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index fdcc4072132..5b9fff5a4f2 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -466,10 +466,12 @@ let }; exporterTest = '' wait_for_unit("prometheus-postfix-exporter.service") + wait_for_file("/var/lib/postfix/queue/public/showq") wait_for_open_port(9154) succeed( "curl -sSf http://localhost:9154/metrics | grep -q 'postfix_smtpd_connects_total 0'" ) + succeed("curl -sSf http://localhost:9154/metrics | grep -q 'postfix_up{.*} 1'") ''; }; From e80fa279688262b3c3d390ba8e55eaed598eac24 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Fri, 25 Sep 2020 14:28:32 +0200 Subject: [PATCH 125/293] nixos/prometheus/postfix: correct default showqPath --- .../services/monitoring/prometheus/exporters/postfix.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix b/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix index e818b6e37b3..237620a6220 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix @@ -35,10 +35,10 @@ in }; showqPath = mkOption { type = types.path; - default = "/var/spool/postfix/public/showq"; - example = "/var/lib/postfix/queue/public/showq"; + default = "/var/lib/postfix/queue/public/showq"; + example = "/var/spool/postfix/public/showq"; description = '' - Path where Postfix places it's showq socket. + Path where Postfix places its showq socket. ''; }; systemd = { From edcb73f6b52d0b9f7f0208b089bdb05eb5b854c7 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Fri, 25 Sep 2020 14:29:16 +0200 Subject: [PATCH 126/293] nixos/prometheus/postfix: enable systemd by default --- .../monitoring/prometheus/exporters/postfix.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix b/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix index 237620a6220..f57589a59c7 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix @@ -42,9 +42,13 @@ in ''; }; systemd = { - enable = mkEnableOption '' - reading metrics from the systemd-journal instead of from a logfile - ''; + enable = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable reading metrics from the systemd journal instead of from a logfile + ''; + }; unit = mkOption { type = types.str; default = "postfix.service"; From 228b37d74e00d7af7443a2f42b23bed0c198bfa1 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 25 Sep 2020 19:06:34 +1000 Subject: [PATCH 127/293] skopeo: 1.1.1 -> 1.2.0 https://github.com/containers/skopeo/releases/tag/v1.2.0 --- pkgs/development/tools/skopeo/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 32b9c61f5d4..69744509748 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -1,7 +1,6 @@ { stdenv , buildGoModule , fetchFromGitHub -, runCommand , gpgme , lvm2 , btrfs-progs @@ -10,18 +9,17 @@ , installShellFiles , makeWrapper , fuse-overlayfs -, nixosTests }: buildGoModule rec { pname = "skopeo"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "0wkpw8fizxjpfypflp7rs1q128dg4hadwzdvn8k41h7f8cbcb39x"; + sha256 = "1v7k3ki10i6082r7zswblyirx6zck674y6bw3plssw4p1l2611rd"; }; outputs = [ "out" "man" ]; @@ -37,12 +35,12 @@ buildGoModule rec { buildPhase = '' patchShebangs . - make binary-local + make bin/skopeo docs ''; installPhase = '' - make install-binary PREFIX=$out - make install-docs MANINSTALLDIR="$man/share/man" + install -Dm755 bin/skopeo -t $out/bin + installManPage docs/*.[1-9] installShellCompletion --bash completions/bash/skopeo ''; @@ -51,8 +49,6 @@ buildGoModule rec { --prefix PATH : ${stdenv.lib.makeBinPath [ fuse-overlayfs ]} ''; - passthru.tests.docker-tools = nixosTests.docker-tools; - meta = with stdenv.lib; { description = "A command line utility for various operations on container images and image repositories"; homepage = "https://github.com/containers/skopeo"; From 1d916fab56fa96bd8c8b3d2fdeef9130590dac0f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 25 Sep 2020 08:53:06 -0400 Subject: [PATCH 128/293] linux: 5.9-rc5 -> 5.9-rc6 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index b9db2f103e8..3a96013abdf 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.9-rc5"; + version = "5.9-rc6"; extraMeta.branch = "5.9"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1f410hkrk1b5g9wkh6078ph03fiyxpmbd5kdl9w592afphcddbrc"; + sha256 = "1zg93k1fl73qd46kbvz2y4ahsm208d63dj89jdlnb64gfpppf373"; }; # Should the testing kernels ever be built on Hydra? From 88c8a3c69f97b1dda4f1b8f4c47f07b11bd9f6d1 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Fri, 25 Sep 2020 14:57:49 +0200 Subject: [PATCH 129/293] rsibreak: 0.12.8 -> 0.12.13 --- pkgs/applications/misc/rsibreak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/rsibreak/default.nix b/pkgs/applications/misc/rsibreak/default.nix index eefc0a0c577..432cbfb9b69 100644 --- a/pkgs/applications/misc/rsibreak/default.nix +++ b/pkgs/applications/misc/rsibreak/default.nix @@ -7,13 +7,13 @@ let pname = "rsibreak"; version = "0.12"; - revision = ".8"; + revision = ".13"; in mkDerivation rec { name = "rsibreak-${version}${revision}"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${version}/${name}.tar.xz"; - sha256 = "1qn9xdjx9zzw47jsj7f4nkqmrangfhdgafm2jxm7cm6z6kcvzr28"; + sha256 = "N0C+f788fq5yotSC54H2K4WDc6PnGi8Nh/vXL4v0fxo="; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; From 66446f153fe04e21fd4f64cdee097a2da56ec1ab Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 23 Sep 2020 07:57:23 +0200 Subject: [PATCH 130/293] geonkick: 2.3.7 -> 2.3.8 --- pkgs/applications/audio/geonkick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/geonkick/default.nix b/pkgs/applications/audio/geonkick/default.nix index dcfb5426034..e32bef008d9 100644 --- a/pkgs/applications/audio/geonkick/default.nix +++ b/pkgs/applications/audio/geonkick/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "geonkick"; - version = "2.3.7"; + version = "2.3.8"; src = fetchFromGitLab { owner = "iurie-sw"; repo = pname; rev = "v${version}"; - sha256 = "1wdcbwiyy6i5agq5lffkyilyc8mv1cc4mp9h0nybn240vb2flqc2"; + sha256 = "07809yy2q7dd6fcp0yndlg1vw2ca2zisnsplb3xrxvzdvrqlw910"; }; nativeBuildInputs = [ cmake pkg-config ]; From 91c74eeae3330a42b3d825a588a598440ec2802f Mon Sep 17 00:00:00 2001 From: Hongchang Wu Date: Wed, 23 Sep 2020 01:13:51 -0400 Subject: [PATCH 131/293] ocamlPackages.dot-merlin-reader: init at 3.4.0 --- maintainers/maintainer-list.nix | 6 +++++ .../tools/ocaml/merlin/dot-merlin-reader.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 32 insertions(+) create mode 100644 pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7928b6d2ab5..cbff5670550 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3467,6 +3467,12 @@ githubId = 896431; name = "Chris Hodapp"; }; + hongchangwu = { + email = "wuhc85@gmail.com"; + github = "hongchangwu"; + githubId = 362833; + name = "Hongchang Wu"; + }; hrdinka = { email = "c.nix@hrdinka.at"; github = "hrdinka"; diff --git a/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix new file mode 100644 index 00000000000..7af1b4513a8 --- /dev/null +++ b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix @@ -0,0 +1,24 @@ +{ lib, fetchurl, ocamlPackages }: + +with ocamlPackages; + +buildDunePackage rec { + pname = "dot-merlin-reader"; + version = "3.4.0"; + + minimumOCamlVersion = "4.02.1"; + + src = fetchurl { + url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz"; + sha256 = "048rkpbvayksv8mgmkgi17vv0y9xplv7v2ww4d1hs7bkm5zzsvg2"; + }; + + buildInputs = [ yojson csexp result ]; + + meta = with lib; { + description = "Reads config files for merlin"; + homepage = "https://github.com/ocaml/merlin"; + license = licenses.mit; + maintainers = [ maintainers.hongchangwu ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0db5bc2a53..a56aeb9efd7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1846,6 +1846,8 @@ in dosage = callPackage ../applications/graphics/dosage { }; + dot-merlin-reader = callPackage ../development/tools/ocaml/merlin/dot-merlin-reader.nix { }; + dozenal = callPackage ../applications/misc/dozenal { }; dpic = callPackage ../tools/graphics/dpic { }; From 7db8abb774ee2a80afa162507de8f36ea428d0b4 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Fri, 25 Sep 2020 15:16:38 +0200 Subject: [PATCH 132/293] rpm-ostree: 2020.4 -> 2020.5 --- pkgs/tools/misc/rpm-ostree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index d1aaf23a6ec..456798d816f 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "rpm-ostree"; - version = "2020.4"; + version = "2020.5"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "019hjmfjhnvlrnb056fvznnsasnyw5awd594aa2126nbsi1j45dc"; + sha256 = "MLLCmnStvGuSbVBdfOm2Sdzzz7LvPQkgDt9G0CDqCkA="; }; nativeBuildInputs = [ From 5a1c55f9110087fa26f4c405e39307780ef37a18 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 25 Sep 2020 13:53:44 +0000 Subject: [PATCH 133/293] wireshark: 3.2.5 -> 3.2.7 https://www.wireshark.org/docs/relnotes/wireshark-3.2.7.html https://www.wireshark.org/docs/relnotes/wireshark-3.2.6.html --- pkgs/applications/networking/sniffers/wireshark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 8d4a6d73120..e9f676eae55 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -10,7 +10,7 @@ assert withQt -> qt5 != null; with stdenv.lib; let - version = "3.2.5"; + version = "3.2.7"; variant = if withQt then "qt" else "cli"; pcap = libpcap.override { withBluez = stdenv.isLinux; }; @@ -21,7 +21,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "0h69m9maq6w5gik4gamv4kfqrr37hmi4kpwh225y1k36awm0b2dx"; + sha256 = "1nkhglzxj05hwhgzrgan4glv0z67rmasf9djx1dmqicwdnw2z0xy"; }; cmakeFlags = [ From 2ab6756314b6df55030c6a43535299fb060c5ba3 Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Fri, 25 Sep 2020 16:31:16 +0200 Subject: [PATCH 134/293] youtube-viewer: 3.7.5 -> 3.7.9 --- pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix index dc48c9931a8..ccc59980dd1 100644 --- a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix +++ b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix @@ -2,13 +2,13 @@ buildPerlPackage rec { pname = "WWW-YoutubeViewer"; - version = "3.7.5"; + version = "3.7.9"; src = fetchFromGitHub { owner = "trizen"; repo = "youtube-viewer"; rev = version; - sha256 = "1caz56sxy554avz2vdv9gm7gyqcq0gyixzrh5v9ixmg6vxif5d4f"; + sha256 = "16p0sa91h0zpqdpqmy348g6b9qj5f6qrbzrljn157vk00cg6mx18"; }; nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; From 1a08a381a0a8ca639bb410aaf7658c748fc34e78 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 25 Sep 2020 16:53:33 +0200 Subject: [PATCH 135/293] lnav: 0.8.5 -> 0.9.0 https://github.com/tstack/lnav/releases/tag/v0.9.0 --- pkgs/tools/misc/lnav/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/lnav/default.nix b/pkgs/tools/misc/lnav/default.nix index aab980d76e7..9e5fad26988 100644 --- a/pkgs/tools/misc/lnav/default.nix +++ b/pkgs/tools/misc/lnav/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "tstack"; repo = "lnav"; rev = "v${meta.version}"; - sha256 = "0z8bsr0falxlkmd1b5gy871vyafyih0sw7lgg858lqnbsy0q2m4i"; + sha256 = "1frdrr3yjlk2fns3ny0qbr30rpswhwlvv3kyhdl3l6a0q5cqaqsg"; inherit name; }; @@ -25,6 +25,10 @@ stdenv.mkDerivation rec { curl ]; + postPatch = '' + sed -ie '/DUMP_INTERNALS/d' src/Makefile.am + ''; + preConfigure = '' ./autogen.sh ''; @@ -43,7 +47,7 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/tstack/lnav/releases"; license = licenses.bsd2; - version = "0.8.5"; + version = "0.9.0"; maintainers = with maintainers; [ dochang ma27 ]; platforms = platforms.unix; }; From 2d94370264e5963ec94bcd8603a7c3a99249362e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 25 Sep 2020 16:54:01 +0200 Subject: [PATCH 136/293] neomutt: 20200821 -> 20200925 https://github.com/neomutt/neomutt/releases/tag/20200925 --- pkgs/applications/networking/mailreaders/neomutt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 84c81ecff64..699d08536fb 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - version = "20200821"; + version = "20200925"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "0l66xf6qp2fdhm5h2v58bbc73pwj72c80mriqac9pfyjh5padir5"; + sha256 = "1q931n9sijq1iin3swzk57rz7qmy485hvr1fahy5i2wd1xx9yhb2"; }; buildInputs = [ From d9a93852d4edbf875e71598416cd3e04654faba0 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 25 Sep 2020 11:22:11 -0400 Subject: [PATCH 137/293] nixos-rebuild: support --upgrade-all and document --upgrade (#83327) --- nixos/doc/manual/man-nixos-rebuild.xml | 34 +++++++++++++++---- .../modules/installer/tools/nixos-rebuild.sh | 24 +++++++++---- 2 files changed, 46 insertions(+), 12 deletions(-) diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml index 7dab5c69dfb..1fd3a1c5664 100644 --- a/nixos/doc/manual/man-nixos-rebuild.xml +++ b/nixos/doc/manual/man-nixos-rebuild.xml @@ -52,10 +52,18 @@ - - - - + + + + + + + + + + + + @@ -334,9 +342,23 @@ + + + - - Fetch the latest version of NixOS from the NixOS channel. + + Update the root user's channel named nixos + before rebuilding the system. + + + In addition to the nixos channel, the root + user's channels which have a file named + .update-on-nixos-rebuild in their base + directory will also be updated. + + + Passing updates all of the root + user's channels. diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 909e8b229c8..08813d17ff9 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -23,6 +23,7 @@ buildNix=1 fast= rollback= upgrade= +upgrade_all= repair= profile=/nix/var/nix/profiles/system buildHost= @@ -55,6 +56,10 @@ while [ "$#" -gt 0 ]; do --upgrade) upgrade=1 ;; + --upgrade-all) + upgrade=1 + upgrade_all=1 + ;; --repair) repair=1 extraBuildFlags+=("$i") @@ -223,15 +228,22 @@ if [ "$action" = switch -o "$action" = boot -o "$action" = test ]; then fi -# If ‘--upgrade’ is given, run ‘nix-channel --update nixos’. +# If ‘--upgrade’ or `--upgrade-all` is given, +# run ‘nix-channel --update nixos’. if [[ -n $upgrade && -z $_NIXOS_REBUILD_REEXEC && -z $flake ]]; then - nix-channel --update nixos + # If --upgrade-all is passed, or there are other channels that + # contain a file called ".update-on-nixos-rebuild", update them as + # well. Also upgrade the nixos channel. - # If there are other channels that contain a file called - # ".update-on-nixos-rebuild", update them as well. for channelpath in /nix/var/nix/profiles/per-user/root/channels/*; do - if [ -e "$channelpath/.update-on-nixos-rebuild" ]; then - nix-channel --update "$(basename "$channelpath")" + channel_name=$(basename "$channelpath") + + if [[ "$channel_name" == "nixos" ]]; then + nix-channel --update "$channel_name" + elif [ -e "$channelpath/.update-on-nixos-rebuild" ]; then + nix-channel --update "$channel_name" + elif [[ -n $upgrade_all ]] ; then + nix-channel --update "$channel_name" fi done fi From 9e8f8c2cf8d8c4aa0e30ec8598aca3a3acf9dd3b Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 25 Sep 2020 18:32:20 +0300 Subject: [PATCH 138/293] all-packages.nix: Fix a mis-indented `};` And thereby fix a confusion for parenthesis based Vim folding. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a56aeb9efd7..7b1d6353b04 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22385,7 +22385,7 @@ in imapfilter = callPackage ../applications/networking/mailreaders/imapfilter.nix { lua = lua5; - }; + }; maxlib = callPackage ../applications/audio/pd-plugins/maxlib { }; From 631d92d8dc018e25dc7f261294b6611d57cead44 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 22 Sep 2020 18:34:54 +0200 Subject: [PATCH 139/293] matrix-synapse: 1.19.3 -> 1.20.1 https://github.com/matrix-org/synapse/releases/tag/v1.20.0 https://github.com/matrix-org/synapse/releases/tag/v1.20.1 --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index cc4447914c4..8ac43f01811 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -9,11 +9,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.19.3"; + version = "1.20.1"; src = fetchPypi { inherit pname version; - sha256 = "1r63gw9a4n2sd3520zadpn05zxfk45nqrgwxp3zky5nkyrh4qbys"; + sha256 = "1sf36vwvy2f9jy6dldq6gqfmh60384i5j64s7yc131b4dp0n7lcw"; }; patches = [ From 4cc2cdfb83ca11b652be912110e3d872468745ac Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 25 Sep 2020 05:33:18 -0500 Subject: [PATCH 140/293] libvlc: init at 3.0.11.1 --- pkgs/top-level/all-packages.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b1d6353b04..068ddee1f88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23930,6 +23930,15 @@ in vlc_qt5 = vlc; + libvlc = vlc.override { + withQt5 = false; + qtbase = null; + qtsvg = null; + qtx11extras = null; + wrapQtAppsHook = null; + onlyLibVLC = true; + }; + vmpk = callPackage ../applications/audio/vmpk { }; vocproc = callPackage ../applications/audio/vocproc { }; From 9eb4c70c74e6cc22bf59a1157eb23e4e9d7bfb84 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 25 Sep 2020 05:34:24 -0500 Subject: [PATCH 141/293] vlc: do not build with every Qt version It is no longer necessary to build vlc with every Qt version now that we have a Qt-less libvlc. --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 068ddee1f88..4d1bd25da33 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15144,8 +15144,6 @@ in telepathy = callPackage ../development/libraries/telepathy/qt { }; - vlc = callPackage ../applications/video/vlc {}; - qtwebkit-plugins = callPackage ../development/libraries/qtwebkit-plugins { }; }; @@ -23926,7 +23924,7 @@ in vkeybd = callPackage ../applications/audio/vkeybd {}; - vlc = libsForQt514.vlc; + vlc = libsForQt514.callPackage ../applications/video/vlc {}; vlc_qt5 = vlc; From fff4504bc9b4d4a9e487b56c8f73b77eb98ae519 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 25 Sep 2020 05:35:52 -0500 Subject: [PATCH 142/293] phonon-backend-vlc: use libvlc --- pkgs/development/libraries/phonon/backends/vlc.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix index d152afd4534..d54ee6e5630 100644 --- a/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/pkgs/development/libraries/phonon/backends/vlc.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, cmake, phonon, pkgconfig, vlc +{ stdenv, lib, fetchurl, cmake, phonon, pkgconfig, libvlc , extra-cmake-modules, qttools, qtbase, qtx11extras , debug ? false }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ phonon - vlc + libvlc qtbase qtx11extras ]; From c3d08d652df1b5adc71f91a56065a709b089974e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 25 Sep 2020 05:36:03 -0500 Subject: [PATCH 143/293] elisa: use libvlc --- pkgs/applications/kde/elisa.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde/elisa.nix b/pkgs/applications/kde/elisa.nix index a2bfa88f812..bd2cd529473 100644 --- a/pkgs/applications/kde/elisa.nix +++ b/pkgs/applications/kde/elisa.nix @@ -14,13 +14,13 @@ , kinit , kirigami2 , baloo -, vlc +, libvlc }: mkDerivation rec { name = "elisa"; - buildInputs = [ vlc ]; + buildInputs = [ libvlc ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; From d752cc4d7165acb9f3ae536baeb9d701d60d9c59 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 25 Sep 2020 05:37:12 -0500 Subject: [PATCH 144/293] python-vlc: use libvlc --- pkgs/development/python-modules/python-vlc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-vlc/default.nix b/pkgs/development/python-modules/python-vlc/default.nix index a66b4cc522f..6f83f587f58 100644 --- a/pkgs/development/python-modules/python-vlc/default.nix +++ b/pkgs/development/python-modules/python-vlc/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , setuptools -, vlc +, libvlc , substituteAll }: @@ -22,7 +22,7 @@ buildPythonPackage rec { patches = [ (substituteAll { src = ./vlc-paths.patch; - libvlcPath="${vlc}/lib/libvlc.so.5"; + libvlcPath="${libvlc}/lib/libvlc.so.5"; }) ]; From 937359fcf1e4b6ed826aba34179ab714377546da Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Thu, 24 Sep 2020 13:28:52 -0700 Subject: [PATCH 145/293] nixos/update-users-groups: /etc/shadow owned by root:shadow --- nixos/modules/config/update-users-groups.pl | 6 ++++++ nixos/modules/config/users-groups.nix | 1 + nixos/modules/misc/ids.nix | 2 ++ 3 files changed, 9 insertions(+) diff --git a/nixos/modules/config/update-users-groups.pl b/nixos/modules/config/update-users-groups.pl index e1c7a46e430..e220aa61090 100644 --- a/nixos/modules/config/update-users-groups.pl +++ b/nixos/modules/config/update-users-groups.pl @@ -281,6 +281,12 @@ foreach my $u (values %usersOut) { } updateFile("/etc/shadow", \@shadowNew, 0600); +{ + my $uid = getpwnam "root"; + my $gid = getgrnam "shadow"; + my $path = "/etc/shadow"; + chown($uid, $gid, $path) || die "Failed to change ownership of $path: $!"; +} # Rewrite /etc/subuid & /etc/subgid to include default container mappings diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 0ab303d0ae4..1bb1317a8e8 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -537,6 +537,7 @@ in { input.gid = ids.gids.input; kvm.gid = ids.gids.kvm; render.gid = ids.gids.render; + shadow.gid = ids.gids.shadow; }; system.activationScripts.users = stringAfter [ "stdio" ] diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 3fabe8b42c9..81d5d04fa5e 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -346,6 +346,7 @@ in paperless = 315; #mailman = 316; # removed 2019-08-30 zigbee2mqtt = 317; + # shadow = 318; # unused # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -647,6 +648,7 @@ in paperless = 315; #mailman = 316; # removed 2019-08-30 zigbee2mqtt = 317; + shadow = 318; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal From be4bdb358882a470ddcb9a980308a377594392e1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 25 Sep 2020 18:20:05 +0000 Subject: [PATCH 146/293] kube3d: 3.0.1 -> 3.0.2 --- pkgs/applications/networking/cluster/kube3d/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix index 0c1f452ea5b..bb3b7aedd8a 100644 --- a/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/pkgs/applications/networking/cluster/kube3d/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kube3d"; - version = "3.0.1"; + version = "3.0.2"; k3sVersion = "1.18.6-k3s1"; excludedPackages = ''tools''; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "1l6mh0dpf2bw9sxpn14iivv3pr8mj4favzx2hhn8k1j71cm1w4rj"; + sha256 = "182n4kggwr6z75vsagfd0rl89ixcw5h13whf56jh4cd38dj8is5l"; }; buildFlagsArray = '' From f175cb4478a48bcc9e60276b269843f061b97e54 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 25 Sep 2020 18:52:32 +0000 Subject: [PATCH 147/293] libbraiding: 1.0 -> 1.1 --- .../libraries/science/math/libbraiding/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/libbraiding/default.nix b/pkgs/development/libraries/science/math/libbraiding/default.nix index aac66e4fe05..2c6bc4c8711 100644 --- a/pkgs/development/libraries/science/math/libbraiding/default.nix +++ b/pkgs/development/libraries/science/math/libbraiding/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "1.0"; + version = "1.1"; pname = "libbraiding"; src = fetchFromGitHub { owner = "miguelmarco"; repo = "libbraiding"; rev = version; - sha256 = "0l68rikfr7k2l547gb3pp3g8cj5zzxwipm79xrb5r8ffj466ydxg"; + sha256 = "1n1j58y9jaiv0ya0y4fpfb3b05wv0h6k2babpnk2zifjw26xr366"; }; nativeBuildInputs = [ From d7ae8ab35f1df62c72d4a47940bf296f0de19b0b Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 24 Sep 2020 08:32:34 +0200 Subject: [PATCH 148/293] nixos/tests/ncdns: more tests and disable DNSSEC - DNSSEC is currently disable because it's failing - Separately test .bit domain on ncdns and pdns-recursor - Test for the SOA record of the bit. zone --- nixos/tests/ncdns.nix | 53 +++++++++++++++++++++++++++++-------------- 1 file changed, 36 insertions(+), 17 deletions(-) diff --git a/nixos/tests/ncdns.nix b/nixos/tests/ncdns.nix index 507e20fe7cc..9960ac63e26 100644 --- a/nixos/tests/ncdns.nix +++ b/nixos/tests/ncdns.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ pkgs, ... }: +import ./make-test-python.nix ({ lib, pkgs, ... }: let fakeReply = pkgs.writeText "namecoin-reply.json" '' { "error": null, @@ -15,10 +15,18 @@ let } } ''; + + # Disabled because DNSSEC does not currently validate, + # see https://github.com/namecoin/ncdns/issues/127 + dnssec = false; + in { name = "ncdns"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ rnhmjoj ]; + }; nodes.server = { ... }: { networking.nameservers = [ "127.0.0.1" ]; @@ -44,13 +52,15 @@ in services.ncdns = { enable = true; - dnssec.enable = true; + dnssec.enable = dnssec; + identity.hostname = "example.com"; + identity.hostmaster = "root@example.com"; + identity.address = "1.0.0.1"; }; services.pdns-recursor = { enable = true; dns.allowFrom = [ "127.0.0.0/8" ]; - settings.loglevel = 8; resolveNamecoin = true; }; @@ -58,20 +68,29 @@ in }; - testScript = '' - with subtest("DNSSEC keys have been generated"): - server.wait_for_unit("ncdns") - server.wait_for_file("/var/lib/ncdns/bit.key") - server.wait_for_file("/var/lib/ncdns/bit-zone.key") + testScript = + (lib.optionalString dnssec '' + with subtest("DNSSEC keys have been generated"): + server.wait_for_unit("ncdns") + server.wait_for_file("/var/lib/ncdns/bit.key") + server.wait_for_file("/var/lib/ncdns/bit-zone.key") - with subtest("DNSKEY bit record is present"): - server.wait_for_unit("pdns-recursor") - server.wait_for_open_port("53") - server.succeed("host -t DNSKEY bit") + with subtest("DNSKEY bit record is present"): + server.wait_for_unit("pdns-recursor") + server.wait_for_open_port("53") + server.succeed("host -t DNSKEY bit") + '') + + '' + with subtest("can resolve a .bit name"): + server.wait_for_unit("namecoind") + server.wait_for_unit("ncdns") + server.wait_for_open_port("8332") + assert "1.2.3.4" in server.succeed("dig @localhost -p 5333 test.bit") - with subtest("can resolve a .bit name"): - server.wait_for_unit("namecoind") - server.wait_for_open_port("8332") - assert "1.2.3.4" in server.succeed("host -t A test.bit") - ''; + with subtest("SOA record has identity information"): + assert "example.com" in server.succeed("dig SOA @localhost -p 5333 bit") + + with subtest("bit. zone forwarding works"): + assert "1.2.3.4" in server.succeed("host test.bit") + ''; }) From 515cf9c40516932f1819ef7795b243f2ec77ce26 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 22 Sep 2020 14:11:48 +0200 Subject: [PATCH 149/293] haskellPackages: unbreak --- .../development/haskell-modules/configuration-hackage2nix.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 541356d9b32..734e8546338 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3581,7 +3581,6 @@ broken-packages: - buster - buster-gtk - buster-network - - bustle - butter - butterflies - bv-sized @@ -7439,8 +7438,6 @@ broken-packages: - llvm-general - llvm-general-pure - llvm-general-quote - - llvm-hs - - llvm-hs-pretty - llvm-ht - llvm-pkg-config - llvm-pretty From 5bdac7b6cc554ffa02c5b04db9c9d9edc7be79ab Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Sun, 20 Sep 2020 21:01:39 +0300 Subject: [PATCH 150/293] [haskell-updates] haskellPackages: Mark unbroken summoner{,tui} morley lorentz M pkgs/development/haskell-modules/configuration-hackage2nix.yaml --- .../haskell-modules/configuration-hackage2nix.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 734e8546338..4cb83e86491 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -7499,7 +7499,6 @@ broken-packages: - loopy - lord - lorem - - lorentz - loris - loshadka - lostcities @@ -7874,7 +7873,6 @@ broken-packages: - moo - morfette - morfeusz - - morley - morpheus-graphql-cli - morpheus-graphql-client - morphisms-functors @@ -10108,8 +10106,6 @@ broken-packages: - SuffixStructures - sugarhaskell - suitable - - summoner - - summoner-tui - sump - sunlight - sunroof-compiler From 88c3b66cff7a5e37ba1c1f2f677af3884c236186 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 25 Sep 2020 20:12:05 +0200 Subject: [PATCH 151/293] hackage2nix: update list of broken builds to avoid evaluation errors --- .../haskell-modules/configuration-hackage2nix.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 4cb83e86491..40776fb73eb 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3977,9 +3977,11 @@ broken-packages: - complexity - compose-trans - composite-aeson + - composite-aeson-cofree-list - composite-aeson-path - composite-aeson-refined - composite-aeson-throw + - composite-aeson-writeonly - composite-binary - composite-ekg - composite-opaleye @@ -8182,6 +8184,8 @@ broken-packages: - np-extras - np-linear - nptools + - nri-env-parser + - nri-prelude - ntp-control - ntrip-client - null-canvas @@ -8827,6 +8831,7 @@ broken-packages: - prolog-graph - prolog-graph-lib - prologue + - prolude - prometheus-effect - promise - pronounce @@ -10215,6 +10220,7 @@ broken-packages: - tagsoup-navigate - tagsoup-parsec - tagsoup-selection + - tagstew - tagstream-conduit - tai64 - takahashi From fe67f997b6ec6a5dcc29542b4f9bd3ed5f08f1d0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 20 Sep 2020 02:30:29 +0200 Subject: [PATCH 152/293] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-17-g25ee725 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/513c2f50baa5338bbe40a93cb328e1fe973df09c. --- .../haskell-modules/hackage-packages.nix | 1280 +++++++++++++---- 1 file changed, 987 insertions(+), 293 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 4bdd2471708..88da4767fbb 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -17037,6 +17037,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Rasterific_0_7_5_3" = callPackage + ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity + , free, JuicyPixels, mtl, primitive, transformers, vector + , vector-algorithms + }: + mkDerivation { + pname = "Rasterific"; + version = "0.7.5.3"; + sha256 = "164ivzwrla90baqz6gapmcmi1yg5bk0sczqv4xawx3l7dzkz8ghv"; + libraryHaskellDepends = [ + base bytestring containers dlist FontyFruity free JuicyPixels mtl + primitive transformers vector vector-algorithms + ]; + description = "A pure haskell drawing engine"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Rattus" = callPackage ({ mkDerivation, base, Cabal, containers, ghc, simple-affine-space }: @@ -21047,12 +21065,12 @@ self: { platforms = stdenv.lib.platforms.none; }) {}; - "Win32_2_9_0_0" = callPackage + "Win32_2_10_0_0" = callPackage ({ mkDerivation }: mkDerivation { pname = "Win32"; - version = "2.9.0.0"; - sha256 = "1m9v1qimqi19siy1a7mzb52f3jdj5zs81085nybnyj7yk9988s1p"; + version = "2.10.0.0"; + sha256 = "09g61dgw3xvg066qdydw7nxn8vk1nxxwzi1wwr19rkaxhz43149n"; description = "A binding to Windows Win32 API"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.none; @@ -21829,8 +21847,8 @@ self: { }: mkDerivation { pname = "Z-Data"; - version = "0.1.1.0"; - sha256 = "0z7cri6mkmj22ffwg3mz8yyjr81z4ww7kkmi7m9ilmbbpssma5fw"; + version = "0.1.3.1"; + sha256 = "1iz8yszzxqssd1aqnslglj3wzzrljidflzrb1ywh25rd69sxvh19"; libraryHaskellDepends = [ base case-insensitive deepseq ghc-prim hashable integer-gmp primitive QuickCheck scientific tagged template-haskell @@ -21841,10 +21859,32 @@ self: { base hashable hspec HUnit integer-gmp primitive QuickCheck quickcheck-instances scientific word8 ]; - description = "array, vector and text"; + description = "Array, vector and text"; license = stdenv.lib.licenses.bsd3; }) {}; + "Z-IO" = callPackage + ({ mkDerivation, base, bytestring, exceptions, ghc-prim, hashable + , hspec, hspec-discover, HUnit, libuv, primitive, QuickCheck + , quickcheck-instances, scientific, stm, time, word8, Z-Data, zlib + }: + mkDerivation { + pname = "Z-IO"; + version = "0.1.1.2"; + sha256 = "112gfs89dqpy0yfdqkxfid9fxfdq5zhfxjw38hzlpp1j862y8h7h"; + libraryHaskellDepends = [ + base exceptions ghc-prim primitive stm time Z-Data + ]; + libraryPkgconfigDepends = [ libuv ]; + libraryToolDepends = [ hspec-discover ]; + testHaskellDepends = [ + base bytestring hashable hspec HUnit primitive QuickCheck + quickcheck-instances scientific word8 Z-Data zlib + ]; + description = "Simple and high performance IO toolkit for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) libuv;}; + "ZEBEDDE" = callPackage ({ mkDerivation, base, vect }: mkDerivation { @@ -24909,6 +24949,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson-schemas_1_3_0" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, criterion, deepseq + , first-class-families, hashable, hint, interpolate, megaparsec + , QuickCheck, raw-strings-qq, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, template-haskell, text, th-orphans + , th-test-utils, unordered-containers + }: + mkDerivation { + pname = "aeson-schemas"; + version = "1.3.0"; + sha256 = "03x9nhbj3ksiy5zg1a4mna279kp26f35zwv7h8iqmzgf59liklbc"; + libraryHaskellDepends = [ + aeson base first-class-families hashable megaparsec + template-haskell text unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-qq base deepseq first-class-families hashable hint + interpolate megaparsec QuickCheck raw-strings-qq tasty tasty-golden + tasty-hunit tasty-quickcheck template-haskell text th-orphans + th-test-utils unordered-containers + ]; + benchmarkHaskellDepends = [ + aeson base criterion deepseq first-class-families hashable + megaparsec template-haskell text th-test-utils unordered-containers + ]; + description = "Easily consume JSON data on-demand with type-safety"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-serialize" = callPackage ({ mkDerivation, aeson, base, cereal, hspec, HUnit }: mkDerivation { @@ -30403,8 +30473,8 @@ self: { }: mkDerivation { pname = "antlr-haskell"; - version = "0.1.0.0"; - sha256 = "057mr0vw299hjjxlcpmwpbpwn6snzdvr73gmwxhh1gqgbh9g4bx4"; + version = "0.1.0.1"; + sha256 = "1z796wgc4jnqc2mnrg5lwjazx07355f6jl02s5cq1zycxrlc7ry9"; libraryHaskellDepends = [ base containers deepseq hashable haskell-src-meta mtl template-haskell text th-lift transformers unordered-containers @@ -31969,6 +32039,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "arch-hs" = callPackage + ({ mkDerivation, aeson, algebraic-graphs, base, bytestring, Cabal + , colourista, conduit, conduit-extra, containers, deepseq + , directory, filepath, hackage-db, megaparsec, microlens + , microlens-th, neat-interpolation, optparse-applicative, polysemy + , process, req, split, tar-conduit, template-haskell, text + }: + mkDerivation { + pname = "arch-hs"; + version = "0.0.0.0"; + sha256 = "0vf27caahc7mm2c8ihffj3p0fxwwig3bjy7raqa6vyh9dgh5pijs"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson algebraic-graphs base bytestring Cabal colourista conduit + conduit-extra containers deepseq directory filepath hackage-db + megaparsec microlens microlens-th neat-interpolation + optparse-applicative polysemy req split tar-conduit + template-haskell text + ]; + executableHaskellDepends = [ + aeson algebraic-graphs base bytestring Cabal colourista conduit + conduit-extra containers deepseq directory filepath hackage-db + megaparsec microlens microlens-th neat-interpolation + optparse-applicative polysemy process req split tar-conduit + template-haskell text + ]; + description = "A program generating PKGBUILD for hackage packages"; + license = stdenv.lib.licenses.mit; + }) {}; + "archive" = callPackage ({ mkDerivation, base, bytestring, debian, debian-mirror, directory , Extra, filepath, help, HUnit, mtl, network, old-locale, pretty @@ -34603,6 +34704,8 @@ self: { pname = "attoparsec"; version = "0.13.2.4"; sha256 = "1cpgxc17lh4lnpblb3cimpq4ka23bf89q6yvd0jwk7klw5nwsrms"; + revision = "1"; + editedCabalFile = "0jlipzz2b1jb8yw22rvnhvbnadzcdf3wkwn4svl3j4m6858s0har"; libraryHaskellDepends = [ array base bytestring containers deepseq scientific text transformers @@ -37658,8 +37761,8 @@ self: { pname = "base16-bytestring"; version = "1.0.0.0"; sha256 = "12bnl2fs0h4hcjpr69xqqngjh0117dlvkv56lxski6g6fnbwps2r"; - revision = "1"; - editedCabalFile = "0k47j9csaqizvbk3v7zm05l3z23v359h3w079chzbf44z99hkphc"; + revision = "2"; + editedCabalFile = "16nmmf3mmkdrssx6i77drh7ac7r6cfb1dnbna62z32h11yyyk49j"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring HUnit QuickCheck test-framework @@ -39883,8 +39986,8 @@ self: { pname = "binary"; version = "0.7.6.1"; sha256 = "0rqhz349w72h1bi79lga5x1d95g59h15srlahxbhfrmy2pycm1cg"; - revision = "2"; - editedCabalFile = "0kk10dhawx3lravnlxi2f3n430k0qz3i5p8mpmi0bi6j72ihlddw"; + revision = "3"; + editedCabalFile = "0j9wsnqs0hymwwnp4n5qsqnz7lwcvblj3xa1b0yg0h8zwfsrfkci"; libraryHaskellDepends = [ array base bytestring containers ]; testHaskellDepends = [ array base bytestring Cabal containers directory filepath HUnit @@ -40458,8 +40561,8 @@ self: { ({ mkDerivation, base, binaryen }: mkDerivation { pname = "binaryen"; - version = "0.0.3.0"; - sha256 = "08pdk57q4n49l3wyd9zbda4w5ci65ifq4yxscq61kkdqz8i4ggjs"; + version = "0.0.4.0"; + sha256 = "1kgvzn5m2pq7ncid27n68p9axrdganna08wlp8csg9c22jixg7rg"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ binaryen ]; description = "Haskell bindings to binaryen"; @@ -42868,10 +42971,10 @@ self: { }: mkDerivation { pname = "blank-canvas"; - version = "0.7.1"; - sha256 = "02w428jpb49yaqzw93121lf1m4pjxi8wniqhnrvqh2zh63gsfws1"; - revision = "3"; - editedCabalFile = "1l2xcvms2jw10c4jvnc3kldk21vqcchckms0bawrcf908yhq525g"; + version = "0.7.2"; + sha256 = "1i35z9q122my8vl5iyfn7ys3vqki9rscwpkyaka763qrfj94fvhk"; + revision = "1"; + editedCabalFile = "053vfv23ifyi12bh3xzz9qqi59w5ji8yyfmc59398px780bw9w77"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat-batteries base64-bytestring bytestring @@ -43067,6 +43170,8 @@ self: { pname = "blaze-builder"; version = "0.4.1.0"; sha256 = "05681dih2d8s96an945wkbwl05w8ddbcfx8n3r3ck79ydyb8pz4i"; + revision = "1"; + editedCabalFile = "1p66mh9z3aqgind755xzf39pvl2hwjnwrlwiwyj653yzb1gn6c9j"; libraryHaskellDepends = [ base bytestring deepseq text ]; testHaskellDepends = [ base bytestring HUnit QuickCheck test-framework @@ -45585,8 +45690,8 @@ self: { pname = "bsb-http-chunked"; version = "0.0.0.4"; sha256 = "0z0f18yc6zlwh29c6175ivfcin325lvi4irpvv0n3cmq7vi0k0ql"; - revision = "2"; - editedCabalFile = "0bz62lxdbnwkfr1d4ngm8xi4y1ndpdflbv71s6h43vp5lbd546hr"; + revision = "3"; + editedCabalFile = "15hg352id2f4x0dnvv47bdiz6gv5hp5a2mki9yzmhc7ajpk31mdd"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ attoparsec base blaze-builder bytestring doctest hedgehog tasty @@ -46455,8 +46560,6 @@ self: { testPkgconfigDepends = [ gio-unix ]; description = "Draw sequence diagrams of D-Bus traffic"; license = stdenv.lib.licenses.lgpl21Plus; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {gio-unix = null; inherit (pkgs) libpcap; system-glib = pkgs.glib;}; @@ -46867,14 +46970,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "bytestring_0_10_12_0" = callPackage + "bytestring_0_11_0_0" = callPackage ({ mkDerivation, base, deepseq, ghc-prim, integer-gmp }: mkDerivation { pname = "bytestring"; - version = "0.10.12.0"; - sha256 = "1s1kgnqb8ybz223sf2838mmxnlhwsd3lnakng6ap38m058bzzj7d"; - revision = "1"; - editedCabalFile = "10d0n2k8zhlw0bbrm2na9zchlggm8ix2wi2lav6vkbd98sg96mip"; + version = "0.11.0.0"; + sha256 = "03fwkbn52946y2l1ddrqq1jp8l9bhgi0gwxpz1wqqsn6n2vz5rrj"; libraryHaskellDepends = [ base deepseq ghc-prim integer-gmp ]; description = "Fast, compact, strict and lazy byte strings with a list interface"; license = stdenv.lib.licenses.bsd3; @@ -47070,6 +47171,8 @@ self: { pname = "bytestring-lexing"; version = "0.5.0.2"; sha256 = "0wrzniawhgpphc6yx1v972gyqxdbv0pizaz9bafahrshyb9svy81"; + revision = "1"; + editedCabalFile = "0icnbv83h542vkmn51ykzc4w1g7nl4w6d6lj79909hnwr2g10616"; libraryHaskellDepends = [ base bytestring ]; description = "Parse and produce literals efficiently from strict or lazy bytestrings"; license = stdenv.lib.licenses.bsd2; @@ -47860,10 +47963,8 @@ self: { }: mkDerivation { pname = "cabal-cache"; - version = "1.0.1.8"; - sha256 = "0yxq73bdw1ai0yv54prcxpm1ygkpa8m0jnznwm975b82qlmplynw"; - revision = "2"; - editedCabalFile = "1y4zfnr2a5w8kvwvk1dbzv0ik5b2wdlx8z2p6n9k5mzax952s689"; + version = "1.0.1.9"; + sha256 = "1s28h1lnzdgzg0h3d85rzjrg885qpbvw0998bxiani4kf9xx6nkp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -58128,8 +58229,8 @@ self: { }: mkDerivation { pname = "commonmark-pandoc"; - version = "0.2.0.0"; - sha256 = "1dis51lknwfk7ka0n6pbw03hwn4y5zk23kypkl84iwg2ydxvwbxh"; + version = "0.2.0.1"; + sha256 = "12s20s64qad3varxr9bxpvdzx3ajdw58ssmssj9rqqq8k2nlnqh3"; libraryHaskellDepends = [ base commonmark commonmark-extensions containers pandoc-types text ]; @@ -58821,6 +58922,23 @@ self: { broken = true; }) {}; + "composite-aeson-cofree-list" = callPackage + ({ mkDerivation, aeson, base, composite-aeson + , composite-aeson-writeonly, free, vector + }: + mkDerivation { + pname = "composite-aeson-cofree-list"; + version = "0.1.0.0"; + sha256 = "0jxfisk3zqzhknc2kraq9chh2gx9q00f5lkh0401s0fb4qgdfd0a"; + libraryHaskellDepends = [ + aeson base composite-aeson composite-aeson-writeonly free vector + ]; + description = "Print a Cofree [] as a JSON value"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "composite-aeson-path" = callPackage ({ mkDerivation, base, composite-aeson, path }: mkDerivation { @@ -58868,6 +58986,22 @@ self: { broken = true; }) {}; + "composite-aeson-writeonly" = callPackage + ({ mkDerivation, aeson, aeson-better-errors, base, composite-aeson + }: + mkDerivation { + pname = "composite-aeson-writeonly"; + version = "0.1.0.0"; + sha256 = "1fr235g96i35ygpvbbvrpyz87d6q7h2bjnlf4asv2dn4a6x40dic"; + libraryHaskellDepends = [ + aeson aeson-better-errors base composite-aeson + ]; + description = "WriteOnly indicators for composite-aeson"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "composite-base" = callPackage ({ mkDerivation, base, deepseq, exceptions, hspec, lens , monad-control, mtl, profunctors, QuickCheck, template-haskell @@ -58982,8 +59116,8 @@ self: { ({ mkDerivation, base, composite-base }: mkDerivation { pname = "composite-tuple"; - version = "0.1.1.0"; - sha256 = "0ykxf17zlyjrs8nhj02r0k3l20x7ih1k1z5byxdvw7gxjwsqwq2d"; + version = "0.1.2.0"; + sha256 = "0y5xz4q5z2lw3jy3fdm5rl19sd969cdpq1a44ar45dpab0qffr41"; libraryHaskellDepends = [ base composite-base ]; description = "Tuple functions for composite records"; license = stdenv.lib.licenses.mit; @@ -61732,12 +61866,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "containers_0_6_3_1" = callPackage + "containers_0_6_4_1" = callPackage ({ mkDerivation, array, base, deepseq }: mkDerivation { pname = "containers"; - version = "0.6.3.1"; - sha256 = "04v59j9xnaq4bab08b3b0m5lwpkjm2awdhd4q9i8rwmxf8977acg"; + version = "0.6.4.1"; + sha256 = "0vn43a7bf49pih9b65b359xf3658d96dpm9j35i8x8j61vlrcsid"; libraryHaskellDepends = [ array base deepseq ]; description = "Assorted concrete container types"; license = stdenv.lib.licenses.bsd3; @@ -69647,8 +69781,8 @@ self: { }: mkDerivation { pname = "dawg-ord"; - version = "0.5.1.0"; - sha256 = "1s92i5z63maq74ni49l282pqbz0r0c22miyjjilipr0wnz7rl4nr"; + version = "0.5.1.2"; + sha256 = "1wsxlzljxydcvilkdf8xj21sac0y2ph18vmbznd7psvbwk2q45kf"; libraryHaskellDepends = [ base containers mtl transformers vector ]; @@ -71889,22 +72023,16 @@ self: { }) {}; "derive-topdown" = callPackage - ({ mkDerivation, base, binary, derive, GenericPretty, haskell-src - , mtl, primitive, QuickCheck, simple-sql-parser, syb - , template-haskell, th-expand-syns, transformers + ({ mkDerivation, base, mtl, primitive, syb, template-haskell + , th-expand-syns, transformers }: mkDerivation { pname = "derive-topdown"; - version = "0.0.2.0"; - sha256 = "0vs21aq0mcl1p9fwmwvqf61x5ndgfl4i32g9x40x1safj5c594s6"; + version = "0.0.2.1"; + sha256 = "05vbbndyx5xw01vk3bs3vk9bmnqq7nlj817jk8ggv23x5yg87daf"; libraryHaskellDepends = [ base mtl primitive syb template-haskell th-expand-syns transformers ]; - testHaskellDepends = [ - base binary derive GenericPretty haskell-src mtl primitive - QuickCheck simple-sql-parser syb template-haskell th-expand-syns - transformers - ]; description = "Help Haskellers derive class instances for composited data types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -77180,6 +77308,32 @@ self: { broken = true; }) {}; + "doctest-exitcode-stdio" = callPackage + ({ mkDerivation, base, doctest-lib, QuickCheck, semigroups + , transformers + }: + mkDerivation { + pname = "doctest-exitcode-stdio"; + version = "0.0"; + sha256 = "1g3c7yrqq2mwqbmvs8vkx1a3cf0p0x74b7fnn344dsk7bsfpgv0x"; + libraryHaskellDepends = [ + base doctest-lib QuickCheck semigroups transformers + ]; + description = "Run doctest's in a Cabal.Test.exitcode-stdio environment"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "doctest-lib" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "doctest-lib"; + version = "0.1"; + sha256 = "1vswam0dhw52dihgnzirh18gqs8rj8h6jd7pl6y1mg2f9f9zmih2"; + libraryHaskellDepends = [ base ]; + description = "Parts of doctest exposed as library"; + license = stdenv.lib.licenses.mit; + }) {}; + "doctest-prop" = callPackage ({ mkDerivation, base, doctest, HUnit, QuickCheck }: mkDerivation { @@ -86317,20 +86471,20 @@ self: { "extensible" = callPackage ({ mkDerivation, aeson, base, bytestring, cassava, comonad - , constraints, deepseq, ghc-prim, hashable, lens, membership - , monad-skeleton, prettyprinter, primitive, profunctors, QuickCheck - , StateVar, tagged, template-haskell, text, th-lift, transformers - , unordered-containers, vector + , constraints, deepseq, ghc-prim, hashable, incremental, lens + , membership, monad-skeleton, prettyprinter, primitive, profunctors + , QuickCheck, StateVar, tagged, template-haskell, text, th-lift + , transformers, unordered-containers, vector }: mkDerivation { pname = "extensible"; - version = "0.8"; - sha256 = "1p5mnzk4x6dk8gyr3n47wlndnqf8w7112whr872355zqyvcxlsq6"; + version = "0.8.1"; + sha256 = "189svxwh54zzczrrirlnfyqmv2f12h8qxw9rqq47mn55ch40xnw3"; libraryHaskellDepends = [ aeson base bytestring cassava comonad constraints deepseq ghc-prim - hashable membership monad-skeleton prettyprinter primitive - profunctors QuickCheck StateVar tagged template-haskell text - th-lift transformers unordered-containers vector + hashable incremental membership monad-skeleton prettyprinter + primitive profunctors QuickCheck StateVar tagged template-haskell + text th-lift transformers unordered-containers vector ]; testHaskellDepends = [ base lens QuickCheck template-haskell ]; description = "Extensible, efficient, optics-friendly data types and effects"; @@ -90975,6 +91129,27 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "flink-statefulfun" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, either + , http-media, http-types, lens-family, mtl, proto-lens + , proto-lens-protobuf-types, proto-lens-protoc, proto-lens-runtime + , proto-lens-setup, servant, servant-server, text, wai, warp + }: + mkDerivation { + pname = "flink-statefulfun"; + version = "0.2.0.0"; + sha256 = "1h1pd9yandk1kpcmz3186306001fxjm0g9qmw8ndaq4m4fknj3q6"; + setupHaskellDepends = [ base Cabal proto-lens-setup ]; + libraryHaskellDepends = [ + base bytestring containers either http-media http-types lens-family + mtl proto-lens proto-lens-protobuf-types proto-lens-runtime servant + servant-server text wai warp + ]; + libraryToolDepends = [ proto-lens-protoc ]; + description = "Flink stateful functions SDK"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "flip-cmd" = callPackage ({ mkDerivation, base, process, safe-exceptions }: mkDerivation { @@ -91121,8 +91296,8 @@ self: { }: mkDerivation { pname = "floskell"; - version = "0.10.4"; - sha256 = "14cwby2xyv2cviknpji6117jz6zfjrayrfvc75481g229yhcx156"; + version = "0.10.5"; + sha256 = "0cm12krcri332yw0zb3k4kakpq30xlfxkyc8i67bniwm7h973hnh"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -95379,10 +95554,8 @@ self: { }: mkDerivation { pname = "fused-effects-th"; - version = "0.1.0.1"; - sha256 = "0yr9gymqna0q47cv9j17cwgbbjc8sjf7f1lm8fbig5zybb6ycpm9"; - revision = "1"; - editedCabalFile = "0slildsx3al8gn9s8w1dqq55pwsizjbkwmkm1vl742zk0kivax8c"; + version = "0.1.0.2"; + sha256 = "0p1fiy34388154cmj849x5pvrbz3zmrl3dj525wrkj0c10gi234i"; libraryHaskellDepends = [ base fused-effects template-haskell ]; testHaskellDepends = [ base fused-effects tasty tasty-hunit template-haskell @@ -95444,16 +95617,16 @@ self: { , directory-tree, dlist, file-embed, filepath, free, gitrev, happy , haskeline, language-c-quote, mainland-pretty, megaparsec, mtl , neat-interpolation, parallel, parser-combinators, pcg-random - , process, process-extras, QuickCheck, regex-tdfa, srcloc, tasty - , tasty-hunit, tasty-quickcheck, template-haskell, temporary - , terminal-size, text, time, transformers, unordered-containers - , utf8-string, vector, vector-binary-instances, versions - , zip-archive, zlib + , process, process-extras, QuickCheck, regex-tdfa, sexp-grammar + , srcloc, tasty, tasty-hunit, tasty-quickcheck, template-haskell + , temporary, terminal-size, text, time, transformers + , unordered-containers, utf8-string, vector + , vector-binary-instances, versions, zip-archive, zlib }: mkDerivation { pname = "futhark"; - version = "0.16.4"; - sha256 = "14k682phqdp2scmv064i6jyymf3j2f3bs25yw1qff76bkymv02vd"; + version = "0.17.2"; + sha256 = "16h0s6m6mnzxfbijd979zqbbrdma6gpm7yvg4lxnl5xcw26k57w4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95461,21 +95634,35 @@ self: { cmark-gfm containers directory directory-tree dlist file-embed filepath free gitrev haskeline language-c-quote mainland-pretty megaparsec mtl neat-interpolation parallel pcg-random process - process-extras regex-tdfa srcloc template-haskell temporary - terminal-size text time transformers unordered-containers + process-extras regex-tdfa sexp-grammar srcloc template-haskell + temporary terminal-size text time transformers unordered-containers utf8-string vector vector-binary-instances versions zip-archive zlib ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base text ]; testHaskellDepends = [ - base containers megaparsec mtl parser-combinators QuickCheck tasty - tasty-hunit tasty-quickcheck text + base containers megaparsec mtl parser-combinators QuickCheck + sexp-grammar tasty tasty-hunit tasty-quickcheck text ]; description = "An optimising compiler for a functional, array-oriented language"; license = stdenv.lib.licenses.isc; }) {}; + "futhask" = callPackage + ({ mkDerivation, base, directory, raw-strings-qq, split }: + mkDerivation { + pname = "futhask"; + version = "0.1.0"; + sha256 = "11cgnalnywm0xrjhzygd9vvff8yd46s886ljvdbmpl01py97kpwx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory raw-strings-qq split ]; + executableHaskellDepends = [ base directory raw-strings-qq split ]; + description = "Generate Haskell wrappers for Futhark libraries"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "futun" = callPackage ({ mkDerivation, base, bytestring, network, unix }: mkDerivation { @@ -101683,8 +101870,8 @@ self: { }: mkDerivation { pname = "gi-poppler"; - version = "0.18.23"; - sha256 = "0dn6qnsrgnvbz9nbv0ig9hyjmswrq6v3z1bcnf0pybcdwr8j1zrw"; + version = "0.18.24"; + sha256 = "1n69xzw5w3y27x0vz4i4hi7ypr714ilj9i985ym713kvdfdyz12g"; setupHaskellDepends = [ base Cabal gi-cairo gi-gio gi-glib gi-gobject haskell-gi ]; @@ -108563,8 +108750,8 @@ self: { }: mkDerivation { pname = "graphql-client"; - version = "1.0.0"; - sha256 = "1qzrlk3vkvavi14zz7dkndz8qh449s6rpbrd5phqclgbrah1hj3a"; + version = "1.1.0"; + sha256 = "0yk6nfyyynydrgwc1cdy5235121gw5q4iaapbvixpckz2diidxx7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111153,8 +111340,8 @@ self: { }: mkDerivation { pname = "hablog"; - version = "0.6.0"; - sha256 = "0373kjd67iivrrr6kcjrhcqkk2wrxfx9zz3qn58mhycp8w78biaq"; + version = "0.7.0"; + sha256 = "0zz1nhbajxg0nzgrx78xvwj5p4h6b0wjg37hjx58ahlfcxc6gvl6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -113660,8 +113847,8 @@ self: { ({ mkDerivation, base, containers, random }: mkDerivation { pname = "hanabi-dealer"; - version = "0.10.1.0"; - sha256 = "09kaxb2930synwwcwgk1xhbdmsd3zzr69i0ss4swasw4zlx8n0sh"; + version = "0.10.2.0"; + sha256 = "0axqpa1p7lzxym8nyppc3nhbfzis8y71ywi444v3w6syyvh06ygf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers random ]; @@ -126990,19 +127177,19 @@ self: { }) {}; "hlatex" = callPackage - ({ mkDerivation, base, base-unicode-symbols, containers, derive - , directory, filepath, mtl, process, template-haskell, transformers - , uniplate, utf8-string + ({ mkDerivation, base, base-unicode-symbols, containers, directory + , filepath, mtl, process, template-haskell, transformers, uniplate + , utf8-string }: mkDerivation { pname = "hlatex"; - version = "0.3.1"; - sha256 = "13ldla8y8nw8fg4xrlqr60xqgs2n5sm72gzx99lqp0a4f84s3a0y"; + version = "0.3.2"; + sha256 = "0r4wdnps7m3j94xqab1lf8za5mning132h0micbqp86pnhlqn8g5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base base-unicode-symbols containers derive directory filepath mtl - process template-haskell transformers uniplate utf8-string + base base-unicode-symbols containers directory filepath mtl process + template-haskell transformers uniplate utf8-string ]; description = "A library to build valid LaTeX files"; license = stdenv.lib.licenses.bsd3; @@ -127213,6 +127400,8 @@ self: { pname = "hledger-iadd"; version = "1.3.12"; sha256 = "0klrqss2ch4yi50m1rybznzsjg4ahbx7rg9n8w5svpf34fdlp048"; + revision = "1"; + editedCabalFile = "0amfrcwklqzpjkgr714d0as57m5ndaywi04d44ygvq2p5jd0h129"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128668,6 +128857,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hoauth2_1_15_0" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, exceptions + , http-conduit, http-types, microlens, text, unordered-containers + , uri-bytestring, uri-bytestring-aeson + }: + mkDerivation { + pname = "hoauth2"; + version = "1.15.0"; + sha256 = "12f564jcma8pl1qbc8g258jb92q5bdv3xzl6xr3bin8hln86sz1f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base binary bytestring exceptions http-conduit http-types + microlens text unordered-containers uri-bytestring + uri-bytestring-aeson + ]; + description = "Haskell OAuth2 authentication client"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hob" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , glib, gtk-largeTreeStore, gtk3, gtksourceview3, hspec, mtl, pango @@ -137440,6 +137650,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-date_0_0_9" = callPackage + ({ mkDerivation, array, attoparsec, base, bytestring, doctest + , hspec, old-locale, time + }: + mkDerivation { + pname = "http-date"; + version = "0.0.9"; + sha256 = "0dxrlwaqdimgxr8nziyzgqsrg44dl9gxa060cg0k7ndpnlpcbjwa"; + libraryHaskellDepends = [ array attoparsec base bytestring time ]; + testHaskellDepends = [ + base bytestring doctest hspec old-locale time + ]; + description = "HTTP Date parser/formatter"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-directory" = callPackage ({ mkDerivation, base, bytestring, hspec, html-conduit, http-client , http-client-tls, http-date, http-types, network-uri, text, time @@ -143278,8 +143505,8 @@ self: { }: mkDerivation { pname = "implicit-hie-cradle"; - version = "0.2.0.0"; - sha256 = "1rzif3hzayqhm6spmynvw7ynkymsycaiycf6z9h18382vsd53qrk"; + version = "0.2.0.1"; + sha256 = "1l2i05w547sdgh7dhvwvc8x6i100lb2l3zwr6bhjmapdj5sjnqd1"; libraryHaskellDepends = [ base base16-bytestring bytestring containers directory extra filepath hie-bios hslogger implicit-hie process temporary text time @@ -143545,8 +143772,8 @@ self: { }: mkDerivation { pname = "incremental"; - version = "0.3"; - sha256 = "0l433m75m89iyb8djfzk7nfysmy11p75a852ib48n4gzkgyvi3mh"; + version = "0.3.1"; + sha256 = "0s2hlhszk8aj5zbl64il5c9gccda64bfbgwfl5fvzsdr79qylv40"; libraryHaskellDepends = [ aeson base bytestring containers deepseq semigroups text ]; @@ -144466,6 +144693,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "inline-c_0_9_1_2" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers + , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq + , regex-posix, split, template-haskell, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "inline-c"; + version = "0.9.1.2"; + sha256 = "1lvsjjxnjwfnqlq4i5mz2xizpx052nq25wjgm47302akpjzpym6n"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint base bytestring containers hashable mtl parsec + parsers template-haskell transformers unordered-containers vector + ]; + testHaskellDepends = [ + ansi-wl-pprint base containers hashable hspec parsers QuickCheck + raw-strings-qq regex-posix split template-haskell transformers + unordered-containers vector + ]; + description = "Write Haskell source files including C code inline. No FFI required."; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "inline-c-cpp_0_1_0_0" = callPackage ({ mkDerivation, base, inline-c, template-haskell }: mkDerivation { @@ -144963,8 +145216,8 @@ self: { pname = "intcode"; version = "0.3.0.0"; sha256 = "0qcws15hn03wnsv1rg93sw9zhwsyvwpiafrmwnyv9v990qap1x8y"; - revision = "1"; - editedCabalFile = "1ad9fm65l8rnkm7236ak7v9j7hvj1jswwdcaw0xcsn9znn4xawl0"; + revision = "2"; + editedCabalFile = "1yd0i90i910ysc7xflpdnkp4bgp1k6cdcl8p3qwqi07vlngkscxw"; libraryHaskellDepends = [ base containers primitive ]; testHaskellDepends = [ base containers doctest primitive ]; description = "Advent of Code 2019 intcode interpreter"; @@ -148901,12 +149154,12 @@ self: { }) {}; "joint" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, transformers }: mkDerivation { pname = "joint"; - version = "0.1.6"; - sha256 = "17vqr8r338ikvqsvrqqs7k93z54g60ibg9x4by34aqjahh5l5gby"; - libraryHaskellDepends = [ base ]; + version = "0.1.7"; + sha256 = "193ygi06hfn1smdhh7fz74lz2gffcvg66cxp6qlvi7m3rbhm1f1l"; + libraryHaskellDepends = [ base transformers ]; description = "Trying to compose non-composable"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -148929,16 +149182,19 @@ self: { }) {}; "jord" = callPackage - ({ mkDerivation, base, criterion, hspec, HUnit }: + ({ mkDerivation, base, criterion, hspec, hspec-discover, HUnit + , markdown-unlit + }: mkDerivation { pname = "jord"; - version = "1.0.0.0"; - sha256 = "0fqc74l2n6z79rdg22svk94k5a2yw8r8djdbd94afjqpyq05dbcq"; + version = "2.0.0.0"; + sha256 = "0f4x7di0qjngglyjqgfczvlji5hmk7wr16laxdjr2cyp81aa3vgj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base criterion ]; - testHaskellDepends = [ base hspec HUnit ]; + testHaskellDepends = [ base hspec HUnit markdown-unlit ]; + testToolDepends = [ hspec-discover markdown-unlit ]; description = "Geographical Position Calculations"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -154764,8 +155020,8 @@ self: { }: mkDerivation { pname = "language-dickinson"; - version = "1.3.0.3"; - sha256 = "1bgcczk8v3gfrh44hsqmw7an7998yvn0dgla3rc0kr0xs7zsgp62"; + version = "1.3.0.4"; + sha256 = "0ip4ydx174xaykh6jc7jay7jgkwnmzj3vf76l094cjipphr29vam"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -155780,24 +156036,28 @@ self: { "lapack" = callPackage ({ mkDerivation, base, blas-ffi, blaze-html, boxes, ChasingBottoms - , comfort-array, data-ref, deepseq, fixed-length - , guarded-allocation, hyper, lapack-ffi, lazyio, monoid-transformer - , netlib-ffi, non-empty, QuickCheck, quickcheck-transformer, random - , semigroups, text, tfp, transformers, unique-logic-tf, utility-ht + , comfort-array, data-ref, deepseq, doctest-exitcode-stdio + , fixed-length, guarded-allocation, hyper, lapack-ffi, lazyio + , monoid-transformer, netlib-ffi, non-empty, QuickCheck + , quickcheck-transformer, random, semigroups, text, tfp + , transformers, unique-logic-tf, utility-ht }: mkDerivation { pname = "lapack"; - version = "0.3.1"; - sha256 = "1w8nndh3gj6vrildxjn13lmi7aqjwbhpqkdj7d21fsfbmhjlgwvr"; + version = "0.3.2"; + sha256 = "12h9k8hx3qpfa3ma24glngpk1x9m8h17qzv86sfq54br19ikz5y0"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base blas-ffi blaze-html boxes comfort-array deepseq fixed-length guarded-allocation hyper lapack-ffi lazyio netlib-ffi non-empty semigroups text tfp transformers utility-ht ]; testHaskellDepends = [ - base ChasingBottoms comfort-array data-ref monoid-transformer - netlib-ffi non-empty QuickCheck quickcheck-transformer random - semigroups tfp transformers unique-logic-tf utility-ht + base ChasingBottoms comfort-array data-ref doctest-exitcode-stdio + monoid-transformer netlib-ffi non-empty QuickCheck + quickcheck-transformer random semigroups tfp transformers + unique-logic-tf utility-ht ]; description = "Numerical Linear Algebra using LAPACK"; license = stdenv.lib.licenses.bsd3; @@ -157379,39 +157639,14 @@ self: { }) {}; "lens-core" = callPackage - ({ mkDerivation, array, base, base-compat, base-orphans, bytestring - , Cabal, cabal-doctest, call-stack, comonad, containers, criterion - , deepseq, directory, doctest, dual, filepath, foldable1 - , generic-deriving, ghc-prim, hs-functors, HUnit, mtl, nats - , parallel, QuickCheck, semigroups, simple-reflect, tagged - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , test-framework-th, text, transformers, unordered-containers, util - , vector - }: + ({ mkDerivation, base }: mkDerivation { pname = "lens-core"; - version = "0.1.0.3"; - sha256 = "0bnjnnfavgxy600yzmhqcj91awgk420ybr8wi4pghj2pi8z0581v"; - revision = "1"; - editedCabalFile = "0dalyxy1a0dkywm9mziiqhg4vcpkmw7g4lvahkw4mi371jkgvb4b"; - setupHaskellDepends = [ base Cabal cabal-doctest filepath ]; - libraryHaskellDepends = [ - array base base-orphans call-stack containers dual foldable1 - ghc-prim hs-functors mtl tagged transformers util vector - ]; - testHaskellDepends = [ - base bytestring containers deepseq directory doctest filepath - generic-deriving HUnit mtl nats parallel QuickCheck semigroups - simple-reflect test-framework test-framework-hunit - test-framework-quickcheck2 test-framework-th text transformers - unordered-containers vector - ]; - benchmarkHaskellDepends = [ - base base-compat bytestring comonad containers criterion deepseq - generic-deriving transformers unordered-containers vector - ]; - description = "Lenses, Folds and Traversals"; - license = stdenv.lib.licenses.bsd2; + version = "0.2"; + sha256 = "1q8290h588qbkylig6m7zp899pb8prbdz9k1ynr7f4g8wnjbzbbv"; + libraryHaskellDepends = [ base ]; + description = "A placeholder for a future lens core package"; + license = "(BSD-2-Clause OR Apache-2.0)"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -158530,8 +158765,8 @@ self: { }: mkDerivation { pname = "libjwt-typed"; - version = "0.1"; - sha256 = "0w0snz2gbdx6csp85bwwga57v1dpz53q2dkhkmmmzrl29jbix9h3"; + version = "0.2"; + sha256 = "0fcxp5v1rak0gazw1vfnc6rjz77xiqr91c78kybw5ca76q0hj005"; libraryHaskellDepends = [ base bytestring case-insensitive casing data-default either exceptions extra monad-time proxied text time transformers @@ -159085,8 +159320,8 @@ self: { }: mkDerivation { pname = "libsystemd-journal"; - version = "1.4.4"; - sha256 = "1114fv3dvljxkwgxyx9ycpks8bwzj401d4ziri80rkf2ycl0pxc7"; + version = "1.4.5"; + sha256 = "01lgfysjclmjhfd1vl36r6xb7zl5i1pzzivzi1qwnih01laa5ix8"; libraryHaskellDepends = [ base bytestring hashable hsyslog pipes pipes-safe semigroups text transformers uniplate unix-bytestring unordered-containers uuid @@ -160629,8 +160864,8 @@ self: { ({ mkDerivation, base, bytestring, containers, hashable }: mkDerivation { pname = "lio"; - version = "0.11.7.0"; - sha256 = "17ckrv1ksm2ab91x63h5ia65hckw0zcxfr2mdl6aa2xxscnm4k8h"; + version = "0.11.7.1"; + sha256 = "04hcbvxskjji04sxx4jydac62sh6h7jlggn7kfwm8axmwjczjjqs"; libraryHaskellDepends = [ base bytestring containers hashable ]; description = "Labeled IO Information Flow Control Library"; license = stdenv.lib.licenses.mit; @@ -161921,8 +162156,6 @@ self: { ]; description = "General purpose LLVM bindings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {llvm-config = null;}; "llvm-hs-pretty" = callPackage @@ -161943,8 +162176,6 @@ self: { ]; description = "A pretty printer for LLVM IR"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "llvm-hs-pure" = callPackage @@ -163621,8 +163852,6 @@ self: { ]; description = "EDSL for the Michelson Language"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "loris" = callPackage @@ -163888,7 +164117,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "lsp-test_0_11_0_5" = callPackage + "lsp-test_0_11_0_6" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-parse, containers, data-default , Diff, directory, filepath, Glob, haskell-lsp, hspec, lens, mtl @@ -163897,8 +164126,8 @@ self: { }: mkDerivation { pname = "lsp-test"; - version = "0.11.0.5"; - sha256 = "0r038x65lc0ij6hs8klgj8v8f0fqqrn12dyxc0k8zf9pan9bwnph"; + version = "0.11.0.6"; + sha256 = "0f32i582rw6b1a3lr3jlddl7ry8v7xnfwhhd5vhhw71kqwafrrbs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -163994,8 +164223,8 @@ self: { }: mkDerivation { pname = "lti13"; - version = "0.1.2.1"; - sha256 = "0fs8hj07b9p8m4y8jzmh0ny5x8fnxx75yb8kyk8slc6fjg8ybzlm"; + version = "0.1.2.2"; + sha256 = "18l5sj2rv3lfis6hcaymn8vv7w6dbsnzl9wsfml5vfmlpb4jw8fw"; libraryHaskellDepends = [ aeson base bytestring containers http-client http-types jose-jwt oidc-client safe-exceptions text @@ -169752,8 +169981,8 @@ self: { }: mkDerivation { pname = "metro"; - version = "0.1.0.1"; - sha256 = "1snivs6zf3pjkh6p29wafjnrw8sfcrakl5s8ksn20hr1y8780v9k"; + version = "0.1.0.2"; + sha256 = "10633v6325sj08aa825ccj793pp50akj1zpwsg097jdb93w30n4s"; libraryHaskellDepends = [ base binary bytestring hashable hslogger mtl transformers unix-time unliftio unordered-containers @@ -172029,8 +172258,8 @@ self: { }: mkDerivation { pname = "mmsyn6ukr"; - version = "0.8.0.0"; - sha256 = "0cs4mi9ia3l3v19hldbaygsywvjcfx66plbyh6311j2qzbrqaq93"; + version = "0.8.1.0"; + sha256 = "0r5lnx1m57kjfb1cfm9a22l9kn552y6vpfbkxpffi03ni407q65q"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -172339,8 +172568,8 @@ self: { pname = "modern-uri"; version = "0.3.2.0"; sha256 = "162s88yayalh4vlngman5gz3k0gnszxrksh1wk5227qihbpsiwhb"; - revision = "2"; - editedCabalFile = "14qxgpv72ybxrv08591ipsn5x5sdf9iflc94n9liagv5rjriy09x"; + revision = "3"; + editedCabalFile = "1md8x7ql885g3n55yfd2kgs4np74d7s6rdzlw69bs4zk8074b4q0"; libraryHaskellDepends = [ base bytestring containers contravariant deepseq exceptions megaparsec mtl profunctors QuickCheck reflection tagged @@ -173345,6 +173574,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monad-memo_0_5_3" = callPackage + ({ mkDerivation, array, base, containers, criterion, primitive + , QuickCheck, random, test-framework, test-framework-quickcheck2 + , transformers, vector + }: + mkDerivation { + pname = "monad-memo"; + version = "0.5.3"; + sha256 = "1fqdqqv6gp14vf2kkac34bbn3vaxq80yjz2dgp6n89dcfdkc9y0n"; + libraryHaskellDepends = [ + array base containers primitive transformers vector + ]; + testHaskellDepends = [ + array base containers primitive QuickCheck random test-framework + test-framework-quickcheck2 transformers vector + ]; + benchmarkHaskellDepends = [ + array base containers criterion primitive transformers vector + ]; + description = "Memoization monad transformer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-mersenne-random" = callPackage ({ mkDerivation, base, mersenne-random-pure64 }: mkDerivation { @@ -174938,8 +175191,6 @@ self: { ]; description = "Developer tools for the Michelson Language"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "morley-prelude" = callPackage @@ -184141,6 +184392,51 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "nri-env-parser" = callPackage + ({ mkDerivation, base, modern-uri, network-uri, nri-prelude, text + }: + mkDerivation { + pname = "nri-env-parser"; + version = "0.1.0.0"; + sha256 = "0y9wwwcnghglxqqa6r0zafvfwcm9vpfzda8f1xacg395vh7v8cnm"; + libraryHaskellDepends = [ + base modern-uri network-uri nri-prelude text + ]; + description = "Read environment variables as settings to build 12-factor apps"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "nri-prelude" = callPackage + ({ mkDerivation, aeson, ansi-terminal, async, auto-update, base + , bytestring, concurrent-output, containers, directory, exceptions + , filepath, hedgehog, junit-xml, pretty-diff, pretty-show + , resourcet, safe-exceptions, tasty, tasty-test-reporter + , terminal-size, text, time, vector + }: + mkDerivation { + pname = "nri-prelude"; + version = "0.1.0.0"; + sha256 = "1p0hi1j478sgj1ha2psz4dxv9i5bm6n2d3qvzw9lhqd1xd2dib3a"; + libraryHaskellDepends = [ + aeson ansi-terminal async auto-update base bytestring + concurrent-output containers directory exceptions filepath hedgehog + junit-xml pretty-diff pretty-show resourcet safe-exceptions tasty + tasty-test-reporter terminal-size text time vector + ]; + testHaskellDepends = [ + aeson ansi-terminal async auto-update base bytestring + concurrent-output containers directory exceptions filepath hedgehog + junit-xml pretty-diff pretty-show resourcet safe-exceptions tasty + tasty-test-reporter terminal-size text time vector + ]; + description = "A Prelude inspired by the Elm programming language"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "nsis" = callPackage ({ mkDerivation, base, directory, process, transformers, uniplate }: @@ -186642,8 +186938,8 @@ self: { }: mkDerivation { pname = "open-witness"; - version = "0.4.0.1"; - sha256 = "04a10cv0iddnvp5my4h00bmmpc2mxz6c5gih5p4iyc7bdq6m0w07"; + version = "0.5"; + sha256 = "1p3dd7s7zzjxp29w4n6yrfvlmcnrllz07lgnf2mjdv9lspynids0"; libraryHaskellDepends = [ base constraints hashable random template-haskell transformers witness @@ -188847,6 +189143,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ormolu_0_1_3_0" = callPackage + ({ mkDerivation, base, bytestring, containers, dlist, exceptions + , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover, mtl + , optparse-applicative, path, path-io, syb, text + }: + mkDerivation { + pname = "ormolu"; + version = "0.1.3.0"; + sha256 = "13s8irk1w7yrh9algbnvv5hjvnxmi3fndz34rncp33cyfnjv18j7"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers dlist exceptions ghc-lib-parser mtl syb + text + ]; + executableHaskellDepends = [ + base ghc-lib-parser gitrev optparse-applicative text + ]; + testHaskellDepends = [ + base containers filepath hspec path path-io text + ]; + testToolDepends = [ hspec-discover ]; + description = "A formatter for Haskell source code"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "orthotope" = callPackage ({ mkDerivation, base, deepseq, dlist, HUnit, pretty, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -190308,7 +190632,7 @@ self: { broken = true; }) {}; - "pandoc-plot_0_9_2_0" = callPackage + "pandoc-plot_0_9_3_0" = callPackage ({ mkDerivation, base, bytestring, containers, criterion , data-default, directory, filepath, githash, hashable, hspec , hspec-expectations, lifted-async, mtl, optparse-applicative @@ -190317,8 +190641,8 @@ self: { }: mkDerivation { pname = "pandoc-plot"; - version = "0.9.2.0"; - sha256 = "0fryriyqlmfc82nqbqw7a8n7325wwag29v3ag61s600jw66i9fsc"; + version = "0.9.3.0"; + sha256 = "0zhxniymm9szgv0xczq570s0pziiwhm2sbry0jxxqq8d0vdimxyq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -190444,7 +190768,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pandoc-types_1_21" = callPackage + "pandoc-types_1_22" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -190452,8 +190776,8 @@ self: { }: mkDerivation { pname = "pandoc-types"; - version = "1.21"; - sha256 = "1wbb0hhjiw0b66kj1ck3qipwgdac5v7qvjaqszsz5fll3cqp4sna"; + version = "1.22"; + sha256 = "0kr5n9yw59513pw2rjc65qs55iq0prn16prk4781arqdh7g7a09q"; libraryHaskellDepends = [ aeson base bytestring containers deepseq ghc-prim QuickCheck syb text transformers @@ -190770,7 +191094,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pantry_0_5_1_2" = callPackage + "pantry_0_5_1_3" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal , casa-client, casa-types, conduit, conduit-extra, containers , cryptonite, cryptonite-conduit, digest, exceptions, filelock @@ -190784,8 +191108,8 @@ self: { }: mkDerivation { pname = "pantry"; - version = "0.5.1.2"; - sha256 = "1ix1y334l4a7zcqm8i849g67mgvkqzikbhcbkqc1d6hg1lhc7xzr"; + version = "0.5.1.3"; + sha256 = "0yx30zhyq0wbda6z8a9lvp8c83b3nj4l2s8lcxnvwgnzkanvlkss"; libraryHaskellDepends = [ aeson ansi-terminal base bytestring Cabal casa-client casa-types conduit conduit-extra containers cryptonite cryptonite-conduit @@ -196079,8 +196403,8 @@ self: { ({ mkDerivation, base, mmsyn2, mmsyn5, vector }: mkDerivation { pname = "phonetic-languages-ukrainian"; - version = "0.2.0.0"; - sha256 = "0lx1br8az752lnnwqm3qp3z27z78922d5i03bxgzd4v6zx78iksp"; + version = "0.2.2.0"; + sha256 = "0f59pzl4309hx65djnzn6wm3pkapzr2rkkcr41b65smlxh4pzzs7"; libraryHaskellDepends = [ base mmsyn2 mmsyn5 vector ]; description = "Prepares Ukrainian text to be used as a phonetic language text"; license = stdenv.lib.licenses.mit; @@ -199707,8 +200031,8 @@ self: { }: mkDerivation { pname = "polysemy-http"; - version = "0.2.0.3"; - sha256 = "10a0sihivgxn7w1m9rj6dbs9wiw6gmcf7qg0s2bnd3d4ipxxy89q"; + version = "0.2.0.4"; + sha256 = "1qznm0r7yc831hlgnyf2rmdd6nk2865qcjhzyc2djqv0mw4yg6ak"; libraryHaskellDepends = [ aeson ansi-terminal base bytestring case-insensitive co-log-core co-log-polysemy composition containers data-default either @@ -199766,21 +200090,23 @@ self: { }) {}; "polysemy-test" = callPackage - ({ mkDerivation, base-noprelude, containers, either, hedgehog, path - , path-io, polysemy, polysemy-plugin, relude, string-interpolate - , tasty, tasty-hedgehog, text + ({ mkDerivation, base, containers, either, hedgehog, path, path-io + , polysemy, polysemy-plugin, relude, string-interpolate, tasty + , tasty-hedgehog, text, transformers }: mkDerivation { pname = "polysemy-test"; - version = "0.2.0.0"; - sha256 = "10kakaipasw1gbipjl4x23cma9f6iv3ma547a26b70ysap6c41ys"; + version = "0.3.0.1"; + sha256 = "0xy5ax03qy7936jxhbx3wi341z8r00bmjifha83izgi664hzb5fs"; libraryHaskellDepends = [ - base-noprelude containers either hedgehog path path-io polysemy + base containers either hedgehog path path-io polysemy polysemy-plugin relude string-interpolate tasty tasty-hedgehog text + transformers ]; testHaskellDepends = [ - base-noprelude containers either hedgehog path path-io polysemy + base containers either hedgehog path path-io polysemy polysemy-plugin relude string-interpolate tasty tasty-hedgehog text + transformers ]; description = "Polysemy effects for testing"; license = "BSD-2-Clause-Patent"; @@ -200206,6 +200532,8 @@ self: { pname = "popkey"; version = "0.1.0.1"; sha256 = "1nlbd54q7npxm9hk4f289md6rch0sqnl236iimwsrwllpq6rbxbz"; + revision = "2"; + editedCabalFile = "1wpbwyya9fcdiyqs6lrbcxw7d64vn12kc7n63h2wjxrizjhfs6n6"; libraryHaskellDepends = [ base bitvec bytestring containers hw-bits hw-prim hw-rankselect hw-rankselect-base store text vector @@ -201680,8 +202008,8 @@ self: { pname = "postgrest"; version = "7.0.1"; sha256 = "1cn69dinfv3y8ymsa364b9b0ly3dg80and902gamymb9v89jpsgf"; - revision = "2"; - editedCabalFile = "061lr5hy3xf1nx7yqjpspxqdccmhvvfkyzd3qxzsg5s041hy4krs"; + revision = "3"; + editedCabalFile = "0nqj6m3i6n4lwvpaavs76rbqb2gmc01sz9nl2hqd3vry9acxyvkf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -203477,8 +203805,8 @@ self: { }: mkDerivation { pname = "primal"; - version = "0.1.0.0"; - sha256 = "0y60m1249n5mzglmbkhv98lzzmmkxs2k0mn882kqs89h04hfx546"; + version = "0.2.0.0"; + sha256 = "1vr6rrg4hapivlny2bi47swhm2rwjdzrsxz4r97d4gdydr5vphln"; libraryHaskellDepends = [ base deepseq transformers ]; testHaskellDepends = [ base doctest template-haskell ]; description = "Primeval world of Haskell"; @@ -203488,14 +203816,17 @@ self: { }) {}; "primal-memory" = callPackage - ({ mkDerivation, base, bytestring, criterion, deepseq, primal - , primitive, random + ({ mkDerivation, base, bytestring, criterion, deepseq, doctest + , primal, primitive, QuickCheck, random, template-haskell, text }: mkDerivation { pname = "primal-memory"; - version = "0.1.0.0"; - sha256 = "0lvz5kj6bvlgz1jykcv8dri77pjmy6fzppvk9vlvh4cx22zh9y5m"; - libraryHaskellDepends = [ base bytestring deepseq primal ]; + version = "0.2.0.0"; + sha256 = "00yw3m0bjgm3pns60clfy6g905ylwkipw82rwqx3aacgny1hbjy0"; + libraryHaskellDepends = [ base bytestring deepseq primal text ]; + testHaskellDepends = [ + base bytestring doctest primal QuickCheck template-haskell + ]; benchmarkHaskellDepends = [ base criterion deepseq primal primitive random ]; @@ -205024,6 +205355,24 @@ self: { broken = true; }) {}; + "prolude" = callPackage + ({ mkDerivation, aeson, base, bytestring, mongoDB, safe-exceptions + , scientific, text, time, vector + }: + mkDerivation { + pname = "prolude"; + version = "0.0.0.0"; + sha256 = "0ys3hx9924giy008ddm0z6m20wf9b4i893wkjpxx4jkda9m155x2"; + libraryHaskellDepends = [ + aeson base bytestring mongoDB safe-exceptions scientific text time + vector + ]; + description = "ITProTV's custom prelude"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "prometheus" = callPackage ({ mkDerivation, atomic-primops, base, bytestring, containers , http-client, http-client-tls, http-types, network-uri, text @@ -212271,7 +212620,7 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "reanimate_0_5_0_1" = callPackage + "reanimate_1_0_0_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, attoparsec, base , base64-bytestring, bytestring, cassava, cereal, colour , containers, cubicbezier, directory, filelock, filepath @@ -212285,8 +212634,8 @@ self: { }: mkDerivation { pname = "reanimate"; - version = "0.5.0.1"; - sha256 = "1rk28hwz30dq2162fzl98sa0kz1vpy4r3a00npw30vv3ywjm2sgz"; + version = "1.0.0.0"; + sha256 = "0abjz0yw2d4i84j37hx24k3nmjz946fj200v43hhpwbjiydb1cnn"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-terminal array attoparsec base base64-bytestring @@ -212413,22 +212762,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "rebase_1_7_3" = callPackage + "rebase_1_9" = callPackage ({ mkDerivation, base, bifunctors, bytestring, comonad, containers , contravariant, contravariant-extras, deepseq, dlist, either - , hashable, mtl, profunctors, scientific, selective, semigroupoids - , stm, text, time, transformers, unordered-containers, uuid, vector - , void + , hashable, hashable-time, mtl, profunctors, scientific, selective + , semigroupoids, stm, text, time, transformers + , unordered-containers, uuid, vector, vector-instances, void }: mkDerivation { pname = "rebase"; - version = "1.7.3"; - sha256 = "0w5ywvwq4m2jw5rrlvxwnczwnxx5gkzdlbji85n0crcsqkhkmn1i"; + version = "1.9"; + sha256 = "0ab6qds4r0m7sj821mggpcj4xc5mrqsqn6ammlxm5ifis8k9rxma"; libraryHaskellDepends = [ base bifunctors bytestring comonad containers contravariant - contravariant-extras deepseq dlist either hashable mtl profunctors - scientific selective semigroupoids stm text time transformers - unordered-containers uuid vector void + contravariant-extras deepseq dlist either hashable hashable-time + mtl profunctors scientific selective semigroupoids stm text time + transformers unordered-containers uuid vector vector-instances void ]; description = "A more progressive alternative to the \"base\" package"; license = stdenv.lib.licenses.mit; @@ -216649,12 +216998,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "rerebase_1_7_3" = callPackage + "rerebase_1_9" = callPackage ({ mkDerivation, rebase }: mkDerivation { pname = "rerebase"; - version = "1.7.3"; - sha256 = "0ynvpawhjwbw3231nlwpk5x5wwbzpx1iw66vs97wpk5b8p1bhrld"; + version = "1.9"; + sha256 = "0r5c5rg6k7ampphi3amqrvca3sh9p99947mx0fkqg4rqbwij3274"; libraryHaskellDepends = [ rebase ]; description = "Reexports from \"base\" with a bunch of other standard libraries"; license = stdenv.lib.licenses.mit; @@ -218799,8 +219148,8 @@ self: { }: mkDerivation { pname = "rng-utils"; - version = "0.3.0"; - sha256 = "1fj6x5ihjsbw1cypdifccv2nkbx5gvax9aclypanlv5fw2qsr1h8"; + version = "0.3.1"; + sha256 = "0wpyq1lxqcxkzvswfq9sc916alck68g3z5xb04brzxhvwzgppwnq"; libraryHaskellDepends = [ base bytestring random ]; testHaskellDepends = [ base bytestring hedgehog tasty tasty-hedgehog @@ -219961,15 +220310,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "rpmbuild-order_0_4_3" = callPackage + "rpmbuild-order_0_4_3_1" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , directory, extra, fgl, filepath, hspec, optparse-applicative , process, simple-cmd, simple-cmd-args, unix }: mkDerivation { pname = "rpmbuild-order"; - version = "0.4.3"; - sha256 = "19aszn4fcsxbzciswrb80qvm6r3x28kyl7g5m3c1569f0ib3rbg6"; + version = "0.4.3.1"; + sha256 = "01k1lw0gxxsnl4wqzsynl6xkrnim5fjmdj6jb6b0bgd5jd1y0fyj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -223137,8 +223486,8 @@ self: { pname = "scotty"; version = "0.12"; sha256 = "1lpggpdzgjk23mq7aa64yylds5dbm4ynhcvbarqihjxabvh7xmz1"; - revision = "1"; - editedCabalFile = "1g1j4v3hvvbi48pn32d671x3vg41x2pjbpj9vgagiqlqmz9pkrn5"; + revision = "2"; + editedCabalFile = "1a5xv44fkjxw6ggp415543zbb1mrkdi05kprf5y8rv3wc8avnssd"; libraryHaskellDepends = [ aeson base base-compat-batteries blaze-builder bytestring case-insensitive data-default-class exceptions fail http-types @@ -225428,7 +225777,7 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "sequence-formats_1_5_1_1" = callPackage + "sequence-formats_1_5_1_3" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, errors , exceptions, foldl, hspec, lens-family, pipes, pipes-attoparsec , pipes-bytestring, pipes-safe, tasty, tasty-hunit, transformers @@ -225436,8 +225785,8 @@ self: { }: mkDerivation { pname = "sequence-formats"; - version = "1.5.1.1"; - sha256 = "1gfss5fnv16xg6qxsazh1r7jd9qv5klpnjl6fbmk8p4n7cy5rsxx"; + version = "1.5.1.3"; + sha256 = "1662lfwmss1zrz357r1rm6spyb81fnsf2gzg54yrrx55lq3zki1m"; libraryHaskellDepends = [ attoparsec base bytestring containers errors exceptions foldl lens-family pipes pipes-attoparsec pipes-bytestring pipes-safe @@ -229822,8 +230171,8 @@ self: { }: mkDerivation { pname = "shake-futhark"; - version = "0.1.0.2"; - sha256 = "1npkzgixkkkb611hhlrl1xjyp5xl27rlfqyh6q8vz4lg8fmsxsyh"; + version = "0.2.0.0"; + sha256 = "1lal2dwgiw9c9k8lpcqagx5hy9bs8mqciiy5ghndahpf1fwf510m"; libraryHaskellDepends = [ base containers directory filepath futhark shake text ]; @@ -229979,8 +230328,8 @@ self: { }: mkDerivation { pname = "shake-plus-extended"; - version = "0.4.0.0"; - sha256 = "1y12hcsyp8slzacjz8dim64m9sr09z7ppv3s4l30wyha9r395x8i"; + version = "0.4.1.0"; + sha256 = "18gicl8l3biw4xnhlp3sxp19a5s3fry766d7mq7j5q9fzidq31rb"; libraryHaskellDepends = [ aeson base binary-instances comonad extra http-conduit ixset-typed ixset-typed-binary-instance ixset-typed-hashable-instance path @@ -231396,6 +231745,53 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "signable" = callPackage + ({ mkDerivation, aeson, asn1-encoding, asn1-types, base + , base64-bytestring, binary, bytestring, casing, cryptonite + , directory, generic-arbitrary, hspec, memory, microlens, pem + , proto-lens, proto-lens-arbitrary, proto-lens-runtime, QuickCheck + , quickcheck-instances, secp256k1-haskell, text, universum + , unordered-containers + }: + mkDerivation { + pname = "signable"; + version = "0.2"; + sha256 = "1p1g6jhxgskl890g84nw8d465pan9d3prbc4jvyn8502bx00w01s"; + libraryHaskellDepends = [ + asn1-encoding asn1-types base binary bytestring casing cryptonite + memory microlens pem proto-lens proto-lens-runtime + secp256k1-haskell text universum + ]; + testHaskellDepends = [ + aeson asn1-encoding asn1-types base base64-bytestring binary + bytestring casing cryptonite directory generic-arbitrary hspec + memory microlens pem proto-lens proto-lens-arbitrary + proto-lens-runtime QuickCheck quickcheck-instances + secp256k1-haskell text universum unordered-containers + ]; + description = "Deterministic serialisation and signatures with proto-lens support"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "signable-haskell-protoc" = callPackage + ({ mkDerivation, base, bytestring, casing, containers, ghc + , ghc-paths, ghc-source-gen, lens-family, proto-lens + , proto-lens-protoc, proto-lens-runtime, text + }: + mkDerivation { + pname = "signable-haskell-protoc"; + version = "0.2"; + sha256 = "1qipgv7xihnnj0mbw8469cj2vsyb367msc3lk1dfy8gjlfdl6nc3"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring casing containers ghc ghc-paths ghc-source-gen + lens-family proto-lens proto-lens-protoc proto-lens-runtime text + ]; + description = "Deterministic serialisation and signatures with proto-lens support"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "signal" = callPackage ({ mkDerivation, base, unix }: mkDerivation { @@ -233093,19 +233489,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "sized_0_6_0_0" = callPackage + "sized_0_8_0_0" = callPackage ({ mkDerivation, base, constraints, containers, deepseq - , equational-reasoning, ghc-typelits-presburger, hashable, lens - , ListLike, mono-traversable, singletons, type-natural, vector + , equational-reasoning, ghc-typelits-knownnat + , ghc-typelits-presburger, hashable, hspec, inspection-testing + , lens, mono-traversable, singletons, subcategories + , template-haskell, th-lift, these, type-natural, vector }: mkDerivation { pname = "sized"; - version = "0.6.0.0"; - sha256 = "0441ip04gmnyd6wxs1kkmwgz0v936bw95gxc9x00c7z0byd3q6hg"; + version = "0.8.0.0"; + sha256 = "1jwarhc0xi4h5860whi6s9n36qijlh6j6rnxx71dnlsrinfdsn2m"; libraryHaskellDepends = [ base constraints containers deepseq equational-reasoning - ghc-typelits-presburger hashable lens ListLike mono-traversable - singletons type-natural vector + ghc-typelits-knownnat ghc-typelits-presburger hashable lens + mono-traversable singletons subcategories these type-natural vector + ]; + testHaskellDepends = [ + base containers hspec inspection-testing mono-traversable + singletons subcategories template-haskell th-lift vector ]; description = "Sized sequence data-types"; license = stdenv.lib.licenses.bsd3; @@ -234895,8 +235297,8 @@ self: { }: mkDerivation { pname = "snap"; - version = "1.1.3.0"; - sha256 = "09iwyam3k9a90xm99pm54h74f8llfz2jm0i8rrdqwayjy5xq2w3i"; + version = "1.1.3.1"; + sha256 = "1zq7yz5w9ms8zm5z4c05awkdarqbmb7pp13y9c1x04qfd5ba4c47"; libraryHaskellDepends = [ aeson attoparsec base bytestring cereal clientsession configurator containers directory directory-tree dlist fail filepath hashable @@ -235141,8 +235543,8 @@ self: { }: mkDerivation { pname = "snap-loader-dynamic"; - version = "1.0.0.1"; - sha256 = "1z0f0lsrqdsw7fmfaq8n0jcam8nh5nmpg72q4lapqazlna78ww7x"; + version = "1.0.0.2"; + sha256 = "170a40fv9ary6lpllys95fby2xbpq3cg33sswk92vwpr4wjhx1lw"; libraryHaskellDepends = [ base directory directory-tree hint mtl snap-core template-haskell time unix @@ -235157,10 +235559,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "snap-loader-static"; - version = "1.0.0.0"; - sha256 = "04i9fn84101w8ybns8m2830zlw2vvg81pzrs0vmj6s691y3ivxas"; - revision = "3"; - editedCabalFile = "07f2j0fsw6hhg6qjzfis72ka9dd7iijx09lwypp2mk0qsx6y63bi"; + version = "1.0.0.1"; + sha256 = "0598xvy2jk6xc4xhhjqy2v8f5s7k8x13v4wadw8r37h81jpbic00"; libraryHaskellDepends = [ base template-haskell ]; description = "Snap static loader"; license = stdenv.lib.licenses.bsd3; @@ -235227,6 +235627,8 @@ self: { pname = "snap-server"; version = "1.1.1.2"; sha256 = "1qprlgn59n9layslshpkizzjbsbd87v5h35iylva58vfnwwlmz77"; + revision = "1"; + editedCabalFile = "0bzda5wah6x4cx8g4m6ml4jkcn852i4cxvcgb61jxmwf910arbax"; configureFlags = [ "-fopenssl" ]; isLibrary = true; isExecutable = true; @@ -237242,8 +237644,8 @@ self: { }: mkDerivation { pname = "source-constraints"; - version = "0.0.1"; - sha256 = "0i9p63lbcmc78pp0bvym2zdfvrncrzchkw1xbak6idj3ikb1ljpx"; + version = "0.0.2"; + sha256 = "0dni6f4b8la60zq3n8ffklwnk9h6qm9lsddjqh812dw3f2jmllzz"; libraryHaskellDepends = [ attoparsec base bytestring filepath ghc syb text ]; @@ -239661,6 +240063,23 @@ self: { broken = true; }) {}; + "stack-clean-old" = callPackage + ({ mkDerivation, base, directory, extra, filepath, simple-cmd + , simple-cmd-args + }: + mkDerivation { + pname = "stack-clean-old"; + version = "0.1"; + sha256 = "12q3x0lj8mjhfr6zrizl7995qca28qccjfqwhriciv35l4sny9md"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory extra filepath simple-cmd simple-cmd-args + ]; + description = "Clean away old stack build artefacts"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "stack-fix" = callPackage ({ mkDerivation, base, options, text, turtle }: mkDerivation { @@ -241538,6 +241957,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "stm-actor" = callPackage + ({ mkDerivation, base, hspec, mtl, stm, stm-queue, transformers }: + mkDerivation { + pname = "stm-actor"; + version = "0.2.2.0"; + sha256 = "1xarn8gc3m38zrcwhvihb5z2m7qfjy4wf8sfczzwf8wsm72cdvl0"; + libraryHaskellDepends = [ base mtl stm stm-queue transformers ]; + testHaskellDepends = [ base hspec mtl stm stm-queue ]; + description = "A simplistic actor model based on STM"; + license = stdenv.lib.licenses.mit; + }) {}; + "stm-channelize" = callPackage ({ mkDerivation, base, stm }: mkDerivation { @@ -241749,6 +242180,22 @@ self: { broken = true; }) {}; + "stm-queue" = callPackage + ({ mkDerivation, async, base, criterion, deepseq, hspec, stm, time + }: + mkDerivation { + pname = "stm-queue"; + version = "0.1.2.0"; + sha256 = "06l5gavmf4x6vp54p1h27nnm5nnw6f8p82v5np93b25inc67vz4h"; + libraryHaskellDepends = [ base stm ]; + testHaskellDepends = [ async base hspec stm ]; + benchmarkHaskellDepends = [ + async base criterion deepseq hspec stm time + ]; + description = "An implementation of a real-time concurrent queue"; + license = stdenv.lib.licenses.mit; + }) {}; + "stm-queue-extras" = callPackage ({ mkDerivation, base, stm, stm-chans }: mkDerivation { @@ -243619,22 +244066,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "string-interpolate_0_3_0_0" = callPackage - ({ mkDerivation, base, bytestring, criterion, deepseq, formatting - , haskell-src-exts, haskell-src-meta, hspec, hspec-core - , interpolate, neat-interpolation, QuickCheck, quickcheck-instances - , quickcheck-text, quickcheck-unicode, split, template-haskell - , text, text-conversions, unordered-containers, utf8-string + "string-interpolate_0_3_0_1" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, criterion + , deepseq, formatting, haskell-src-exts, haskell-src-meta, hspec + , hspec-core, interpolate, neat-interpolation, QuickCheck + , quickcheck-instances, quickcheck-text, quickcheck-unicode, split + , template-haskell, text, text-conversions, unordered-containers + , utf8-string }: mkDerivation { pname = "string-interpolate"; - version = "0.3.0.0"; - sha256 = "0h7lqr5g11pr9ikzg7j26fgj9m8659j1vpcwggvndv6k71sh281a"; - revision = "1"; - editedCabalFile = "0id31zpxvmgs63acy3lx8myms5i8w70cfr1dx5yryzy5l66vaq0w"; + version = "0.3.0.1"; + sha256 = "119h30jnn7c30zs922q1dlnfl30svniflfvhrapalcgkgaw4sybg"; libraryHaskellDepends = [ - base bytestring haskell-src-exts haskell-src-meta split - template-haskell text text-conversions utf8-string + base base16-bytestring bytestring haskell-src-exts haskell-src-meta + split template-haskell text text-conversions utf8-string ]; testHaskellDepends = [ base bytestring hspec hspec-core QuickCheck quickcheck-instances @@ -244964,8 +245410,6 @@ self: { ]; description = "Tool for scaffolding fully configured batteries-included production-level Haskell projects"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "summoner-tui" = callPackage @@ -244985,8 +245429,6 @@ self: { executableHaskellDepends = [ base relude ]; description = "Tool for scaffolding fully configured batteries-included production-level Haskell projects using TUI"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "sump" = callPackage @@ -248243,6 +248685,28 @@ self: { broken = true; }) {}; + "tagstew" = callPackage + ({ mkDerivation, base, bytestring, compact, tagsoup, text + , unicode-show, unordered-containers, utf8-string + }: + mkDerivation { + pname = "tagstew"; + version = "0"; + sha256 = "0l49w51s0r7n2kc8254sasaj0b8fg3hf1ykyy6wsiyyn394592j6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring compact tagsoup text unordered-containers + ]; + executableHaskellDepends = [ + base bytestring tagsoup unicode-show utf8-string + ]; + description = "Black magic tagsoup"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "tagstream-conduit" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, bytestring , case-insensitive, conduit, conduit-extra, data-default, hspec @@ -251016,15 +251480,14 @@ self: { }) {}; "termbox" = callPackage - ({ mkDerivation, array, base, c2hs }: + ({ mkDerivation, base }: mkDerivation { pname = "termbox"; - version = "0.2.0.1"; - sha256 = "0rqlhinc1vmxnmwxrcv5rb78j3jmp6iwfcabzf95nhclvjhdadr8"; + version = "0.3.0"; + sha256 = "1vi2ssylwvc6xqnhpnvc9q9c70glbf6s63rmyblc53g4qra2wkah"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ array base ]; - libraryToolDepends = [ c2hs ]; + libraryHaskellDepends = [ base ]; description = "termbox bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -251035,10 +251498,8 @@ self: { ({ mkDerivation, base, reactive-banana, termbox }: mkDerivation { pname = "termbox-banana"; - version = "0.2.0"; - sha256 = "1n4775ahmm4h1vn1michsqp5l2j62py5wddnvcipb8225dcq8xsi"; - revision = "1"; - editedCabalFile = "123hndfs6x2ljwfh7izpikyv5v2d9hq122ddkk5nncnpbnb4bba5"; + version = "0.3.0"; + sha256 = "07nn1jff33zb80vhzkw48fik5d5w7j7q982ihpsbb6gbqp5azx5s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base reactive-banana termbox ]; @@ -252074,6 +252535,29 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "texmath_0_12_0_3" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , mtl, pandoc-types, parsec, process, syb, temporary, text + , utf8-string, xml + }: + mkDerivation { + pname = "texmath"; + version = "0.12.0.3"; + sha256 = "06293ng7s9mn05vf5wlw2691gjzh6nmg717rxmbzr96zjv3731ri"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers mtl pandoc-types parsec syb text xml + ]; + testHaskellDepends = [ + base bytestring directory filepath process temporary text + utf8-string xml + ]; + description = "Conversion between formats used to represent mathematics"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "texrunner" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory, filepath , HUnit, io-streams, lens, mtl, process, semigroups, temporary @@ -252232,6 +252716,8 @@ self: { pname = "text-conversions"; version = "0.3.0"; sha256 = "089c56vdj9xysqfr1hnvbnrghlg83q6w10xk02gflpsidcpvwmhp"; + revision = "1"; + editedCabalFile = "1rw2fi2y77599zmkacf2y06jmxkasydmkkknkmg5xg29hw64a82i"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring errors text ]; @@ -253688,6 +254174,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-test-utils_1_1_0" = callPackage + ({ mkDerivation, base, bytestring, tasty, tasty-golden, tasty-hunit + , template-haskell, th-orphans, transformers + }: + mkDerivation { + pname = "th-test-utils"; + version = "1.1.0"; + sha256 = "12a8yp9wfl40afa3ps8jg3axcaah018pangjm0fzzga2awr1wzwk"; + libraryHaskellDepends = [ + base template-haskell th-orphans transformers + ]; + testHaskellDepends = [ + base bytestring tasty tasty-golden tasty-hunit template-haskell + th-orphans transformers + ]; + description = "Utility functions for testing Template Haskell code"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-to-exp" = callPackage ({ mkDerivation, base, hspec, template-haskell }: mkDerivation { @@ -254275,6 +254781,8 @@ self: { pname = "threepenny-gui"; version = "0.9.0.0"; sha256 = "0mvx661xk3nzvvxcda4vdk2ka7mff8jbpib1x59n230w80bc5sja"; + revision = "1"; + editedCabalFile = "0g07sdc3r1cg16m5nbhwaa95zr7kbzag60f8han5pnp67c79n67i"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -256830,6 +257338,38 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "tomland_1_3_1_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , hashable, hedgehog, hspec, hspec-golden, hspec-hedgehog + , hspec-megaparsec, markdown-unlit, megaparsec, mtl + , parser-combinators, text, time, transformers + , unordered-containers, validation-selective + }: + mkDerivation { + pname = "tomland"; + version = "1.3.1.0"; + sha256 = "17909a8aapbrsa0yb642ij80k64dg2dam1v3rsvc3rm07ik61x42"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers deepseq hashable megaparsec mtl + parser-combinators text time transformers unordered-containers + validation-selective + ]; + executableHaskellDepends = [ + base bytestring containers hashable text time unordered-containers + ]; + executableToolDepends = [ markdown-unlit ]; + testHaskellDepends = [ + base bytestring containers directory hashable hedgehog hspec + hspec-golden hspec-hedgehog hspec-megaparsec megaparsec text time + unordered-containers + ]; + description = "Bidirectional TOML serialization"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tomlcheck" = callPackage ({ mkDerivation, base, htoml-megaparsec, megaparsec , optparse-applicative, text @@ -259690,6 +260230,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ttc_0_2_3_0" = callPackage + ({ mkDerivation, base, bytestring, tasty, tasty-hunit + , template-haskell, text + }: + mkDerivation { + pname = "ttc"; + version = "0.2.3.0"; + sha256 = "0yp92aa62xzzgnlwaw45p8cp9m3w2mmpdr3r2h3zw3dcqvq6hx1l"; + libraryHaskellDepends = [ base bytestring template-haskell text ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit template-haskell text + ]; + description = "Textual Type Classes"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ttl-hashtables" = callPackage ({ mkDerivation, base, clock, containers, data-default, failable , hashable, hashtables, hspec, mtl, transformers @@ -262129,8 +262686,8 @@ self: { }: mkDerivation { pname = "typesafe-precure"; - version = "0.7.8.1"; - sha256 = "060fg6s7yjasimhx7nz4cxymlsxdv9pshs4sv83vwj31nw33kr7b"; + version = "0.7.9.1"; + sha256 = "0vw0mbkii7j5rr5fp370j8grq355cg0ddw55f24gbjw1z0wc71hx"; libraryHaskellDepends = [ aeson aeson-pretty autoexporter base bytestring dlist monad-skeleton template-haskell text th-data-compat @@ -263737,24 +264294,26 @@ self: { }) {}; "uniqueness-periods-vector-examples" = callPackage - ({ mkDerivation, base, mmsyn6ukr, phonetic-languages-ukrainian - , print-info, uniqueness-periods-vector - , uniqueness-periods-vector-common + ({ mkDerivation, base, mmsyn6ukr, parallel + , phonetic-languages-ukrainian, print-info + , uniqueness-periods-vector, uniqueness-periods-vector-common , uniqueness-periods-vector-filters , uniqueness-periods-vector-general - , uniqueness-periods-vector-properties, vector + , uniqueness-periods-vector-properties + , uniqueness-periods-vector-stats, vector }: mkDerivation { pname = "uniqueness-periods-vector-examples"; - version = "0.4.0.0"; - sha256 = "11f7kgsrz0d7hna02qpf519775w4kli7zxg8yp0d0zzi1yp1cgrq"; + version = "0.6.1.0"; + sha256 = "1l1vb0awbgdv2vfkzzl4qmd29xkmncim8zjsf4936vr1q6va1v0m"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base mmsyn6ukr phonetic-languages-ukrainian print-info + base mmsyn6ukr parallel phonetic-languages-ukrainian print-info uniqueness-periods-vector uniqueness-periods-vector-common uniqueness-periods-vector-filters uniqueness-periods-vector-general - uniqueness-periods-vector-properties vector + uniqueness-periods-vector-properties + uniqueness-periods-vector-stats vector ]; description = "Examples of usage for the uniqueness-periods-vector series of packages"; license = stdenv.lib.licenses.mit; @@ -263764,8 +264323,8 @@ self: { ({ mkDerivation, base, mmsyn2, vector }: mkDerivation { pname = "uniqueness-periods-vector-filters"; - version = "0.1.1.0"; - sha256 = "1slwc94m62qp28g3bqbaa4x0zp0zz7x74kv41mcalzd79nlxf7cv"; + version = "0.2.0.0"; + sha256 = "0xzc5nymcgvr0n90266fwzy1c6kwv28wmxhwpq8yl1jjsj99dsbm"; libraryHaskellDepends = [ base mmsyn2 vector ]; description = "A library allows to change the structure of the 'RealFrac' function output"; license = stdenv.lib.licenses.mit; @@ -263797,6 +264356,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "uniqueness-periods-vector-stats" = callPackage + ({ mkDerivation, base, ghc-prim }: + mkDerivation { + pname = "uniqueness-periods-vector-stats"; + version = "0.1.2.0"; + sha256 = "1k98rdjq4i38lrnradfpdzk25b312h65m4mzbyjjzn7hzfra86gn"; + libraryHaskellDepends = [ base ghc-prim ]; + description = "A very basic descriptive statistics"; + license = stdenv.lib.licenses.mit; + }) {}; + "unit" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { @@ -266385,6 +266955,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "uusi" = callPackage + ({ mkDerivation, base, Cabal, colourista, directory, microlens + , optparse-applicative, process, text + }: + mkDerivation { + pname = "uusi"; + version = "0.0.0.0"; + sha256 = "0wii4azq5aj8d1c8n5plsfqqvf9x5s4qw82mhvjhnzja3d6cck4f"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base Cabal colourista directory microlens optparse-applicative + process text + ]; + description = "A program removing all version constraints of dependencies in .cabal file"; + license = stdenv.lib.licenses.mit; + }) {}; + "uvector" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { @@ -269586,6 +270174,8 @@ self: { pname = "wai-app-static"; version = "3.1.7.2"; sha256 = "138gd5482psq0wbm8s1az672lksi7vbavq6ayiyjkliivf6xpry8"; + revision = "1"; + editedCabalFile = "1q7zwjasysgbp9rdp75535igd7s6mhi2bnl4pzsn6vbyfw3qnsxd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -269805,6 +270395,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wai-extra_3_1_0" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring + , bytestring, call-stack, case-insensitive, containers, cookie + , data-default-class, deepseq, directory, fast-logger, hspec + , http-types, http2, HUnit, iproute, network, old-locale, resourcet + , streaming-commons, text, time, transformers, unix, unix-compat + , vault, void, wai, wai-logger, word8, zlib + }: + mkDerivation { + pname = "wai-extra"; + version = "3.1.0"; + sha256 = "1x316vfqkkhmvvvb2g8ag7ycpjsdarmkj4872g5bm44c2419gvvk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base base64-bytestring bytestring call-stack + case-insensitive containers cookie data-default-class deepseq + directory fast-logger http-types http2 HUnit iproute network + old-locale resourcet streaming-commons text time transformers unix + unix-compat vault void wai wai-logger word8 zlib + ]; + testHaskellDepends = [ + base bytestring case-insensitive cookie fast-logger hspec + http-types http2 HUnit resourcet text time transformers wai zlib + ]; + description = "Provides some basic WAI handlers and middleware"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-frontend-monadcgi" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, cgi , containers, http-types, transformers, wai @@ -271101,20 +271721,21 @@ self: { "wai-session-postgresql" = callPackage ({ mkDerivation, base, bytestring, cereal, cookie, data-default - , entropy, postgresql-simple, resource-pool, text, time + , entropy, hspec, postgresql-simple, resource-pool, text, time , transformers, wai, wai-session }: mkDerivation { pname = "wai-session-postgresql"; - version = "0.2.1.2"; - sha256 = "10xc34a1l6g2lr8b4grvv17281689gdb8q1vh3kkip5lk7fp1m9r"; + version = "0.2.1.3"; + sha256 = "1l3ws8bkflrk5gnvw0dd98fw83kfhf78mn9z6l2v6yv3gvdfzj6l"; libraryHaskellDepends = [ base bytestring cereal cookie data-default entropy postgresql-simple resource-pool text time transformers wai wai-session ]; testHaskellDepends = [ - base bytestring data-default postgresql-simple text wai-session + base bytestring data-default hspec postgresql-simple text + wai-session ]; description = "PostgreSQL backed Wai session store"; license = stdenv.lib.licenses.bsd3; @@ -272337,6 +272958,25 @@ self: { broken = true; }) {}; + "webauthn" = callPackage + ({ mkDerivation, aeson, asn1-encoding, asn1-types, base + , base16-bytestring, base64-bytestring, bytestring, cborg, cereal + , containers, cryptonite, hashable, memory, serialise, text, x509 + , x509-validation + }: + mkDerivation { + pname = "webauthn"; + version = "0"; + sha256 = "1nmrxpc0q7bs4z7gnkxbm02qpp8c2rn48hxi52y1k4iqglp9mmp0"; + libraryHaskellDepends = [ + aeson asn1-encoding asn1-types base base16-bytestring + base64-bytestring bytestring cborg cereal containers cryptonite + hashable memory serialise text x509 x509-validation + ]; + description = "Web Authentication API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "webby" = callPackage ({ mkDerivation, aeson, base-noprelude, binary, bytestring , formatting, http-api-data, http-types, relude, resourcet, tasty @@ -273970,6 +274610,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "witness_0_5" = callPackage + ({ mkDerivation, base, constraints, countable, semigroupoids + , transformers + }: + mkDerivation { + pname = "witness"; + version = "0.5"; + sha256 = "0888969dypgykmhp33nar4a6yhrbd5i6agnbq415ni5cfdx1c2cr"; + libraryHaskellDepends = [ + base constraints countable semigroupoids transformers + ]; + description = "values that witness types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "witty" = callPackage ({ mkDerivation, base, bytestring, network, unix }: mkDerivation { @@ -279826,8 +280482,8 @@ self: { }: mkDerivation { pname = "yesod-auth-lti13"; - version = "0.1.2.1"; - sha256 = "0p4z1vsbf55jc5ljwsdgbvji61554q3ngfn74klr2ddp87dn0fzr"; + version = "0.1.2.2"; + sha256 = "0r1hbnij2dyka1jgxrql9ymfcdc1y60x593a3dmnnw86qksbkb8r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -280167,6 +280823,44 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-core_1_6_18_4" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-html + , blaze-markup, bytestring, case-insensitive, cereal, clientsession + , conduit, conduit-extra, containers, cookie, deepseq, fast-logger + , gauge, hspec, hspec-expectations, http-types, HUnit, memory + , monad-logger, mtl, network, parsec, path-pieces, primitive + , random, resourcet, shakespeare, streaming-commons + , template-haskell, text, time, transformers, unix-compat, unliftio + , unordered-containers, vector, wai, wai-extra, wai-logger, warp + , word8 + }: + mkDerivation { + pname = "yesod-core"; + version = "1.6.18.4"; + sha256 = "1i69k0782prgf3wzi714fx0g3jsd654kncn62c7sijsbs0zc6h5h"; + libraryHaskellDepends = [ + aeson auto-update base blaze-html blaze-markup bytestring + case-insensitive cereal clientsession conduit conduit-extra + containers cookie deepseq fast-logger http-types memory + monad-logger mtl parsec path-pieces primitive random resourcet + shakespeare template-haskell text time transformers unix-compat + unliftio unordered-containers vector wai wai-extra wai-logger warp + word8 + ]; + testHaskellDepends = [ + async base bytestring clientsession conduit conduit-extra + containers cookie hspec hspec-expectations http-types HUnit network + path-pieces random resourcet shakespeare streaming-commons + template-haskell text transformers unliftio wai wai-extra warp + ]; + benchmarkHaskellDepends = [ + base blaze-html bytestring gauge shakespeare text + ]; + description = "Creation of type-safe, RESTful web applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-crud" = callPackage ({ mkDerivation, base, classy-prelude, containers, MissingH , monad-control, persistent, random, safe, stm, uuid, yesod-core @@ -282625,7 +283319,7 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; description = "Bindings for the Z3 Theorem Prover"; license = stdenv.lib.licenses.bsd3; - }) {gomp = null; inherit (pkgs) z3;}; + }) {inherit (pkgs) gomp; inherit (pkgs) z3;}; "z3-encoding" = callPackage ({ mkDerivation, base, containers, hspec, mtl, z3 }: From 631899e7c13a10a988366c789050e5ad3a400dbf Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Tue, 22 Sep 2020 17:38:54 +0200 Subject: [PATCH 153/293] haskellPackages: Fix eval errors --- pkgs/development/haskell-modules/configuration-common.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8d9feffc5ed..a23306b8fa9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1211,7 +1211,7 @@ self: super: { # we need an override because ghcide is tracking haskell-lsp closely. ghcide = dontCheck (super.ghcide.overrideScope (self: super: { hie-bios = dontCheck super.hie-bios_0_7_1; - lsp-test = dontCheck self.lsp-test_0_11_0_5; + lsp-test = dontCheck self.lsp-test_0_11_0_6; })); # hasn‘t bumped upper bounds @@ -1461,7 +1461,7 @@ self: super: { jira-wiki-markup = doDistribute self.jira-wiki-markup_1_3_2; pandoc = doDistribute self.pandoc_2_10_1; pandoc-citeproc = doDistribute self.pandoc-citeproc_0_17_0_2; - pandoc-types = doDistribute self.pandoc-types_1_21; + pandoc-types = doDistribute self.pandoc-types_1_22; rfc5051 = doDistribute self.rfc5051_0_2; # Upstream forgot to change the Cabal version bounds in the test suite. @@ -1481,7 +1481,7 @@ self: super: { ghcide = dontCheck hls-ghcide; # we are faster than stack here hie-bios = dontCheck super.hie-bios_0_7_1; - lsp-test = dontCheck super.lsp-test_0_11_0_5; + lsp-test = dontCheck super.lsp-test_0_11_0_6; # fourmolu can‘t compile with an older aeson aeson = dontCheck super.aeson_1_5_2_0; # brittany has an aeson upper bound of 1.5 From 6bcfecbfa2aa131a4645b0e18d716f2c2ccac1cb Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Tue, 22 Sep 2020 20:35:39 +0900 Subject: [PATCH 154/293] tests.haskell-shellFor: get compiling again --- pkgs/test/haskell-shellFor/default.nix | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/test/haskell-shellFor/default.nix b/pkgs/test/haskell-shellFor/default.nix index 1b3de999d22..05d09d6f39c 100644 --- a/pkgs/test/haskell-shellFor/default.nix +++ b/pkgs/test/haskell-shellFor/default.nix @@ -1,7 +1,7 @@ -{ stdenv, haskellPackages, cabal-install }: +{ lib, stdenv, haskellPackages, cabal-install }: -haskellPackages.shellFor { - packages = p: [ p.database-id-class p.constraints-extras ]; +(haskellPackages.shellFor { + packages = p: [ p.database-id-class p.constraints ]; nativeBuildInputs = [ cabal-install ]; phases = [ "unpackPhase" "buildPhase" "installPhase" ]; unpackPhase = '' @@ -9,16 +9,25 @@ haskellPackages.shellFor { mkdir -p "$sourceRoot" cd "$sourceRoot" tar -xf ${haskellPackages.database-id-class.src} - tar -xf ${haskellPackages.constraints-extras.src} - cp ${builtins.toFile "cabal.project" "packages: database-id-class* constraints-extras*"} cabal.project + tar -xf ${haskellPackages.constraints.src} + cp ${builtins.toFile "cabal.project" "packages: database-id-class* constraints*"} cabal.project ''; buildPhase = '' export HOME=$(mktemp -d) mkdir -p $HOME/.cabal touch $HOME/.cabal/config - cabal v2-build --offline --verbose database-id-class constraints-extras --ghc-options="-O0 -j$NIX_BUILD_CORES" + cabal v2-build --offline --verbose database-id-class constraints --ghc-options="-O0 -j$NIX_BUILD_CORES" ''; installPhase = '' touch $out ''; -} +}).overrideAttrs (oldAttrs: { + meta = + let + oldMeta = oldAttrs.meta or {}; + oldMaintainers = oldMeta.maintainers or []; + additionalMaintainers = with lib.maintainers; [ cdepillabout ]; + allMaintainers = oldMaintainers ++ additionalMaintainers; + in + oldMeta // { maintainers = allMaintainers; }; +}) From 13f22aec257e3650efb7eabadf9c5ddf16e14e18 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Wed, 23 Sep 2020 00:43:31 +0200 Subject: [PATCH 155/293] haskellPackages.haskell-language-server: Add aliases with ghc version Needed by haskell-language-server-wrapper to discover the correct binary. Especially useful when installing hls from multiple ghc version. --- pkgs/development/haskell-modules/configuration-nix.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index a1938de0ab3..9be62568373 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -782,4 +782,14 @@ self: super: builtins.intersectAttrs super { testToolDepends = [ pkgs.git pkgs.mercurial ]; }); + haskell-language-server = overrideCabal super.haskell-language-server (drv: { + postInstall = let + inherit (pkgs.lib) concatStringsSep take splitString; + ghc_version = self.ghc.version; + ghc_major_version = concatStringsSep "." (take 2 (splitString "." ghc_version)); + in '' + ln -s $out/bin/haskell-language-server $out/bin/haskell-language-server-${ghc_version} + ln -s $out/bin/haskell-language-server $out/bin/haskell-language-server-${ghc_major_version} + ''; + }); } From c430824a0695d95416c7477f05657a8ba0fcbf8d Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Wed, 23 Sep 2020 12:23:42 +0200 Subject: [PATCH 156/293] haskellPackages.pandoc: Fix build --- .../haskell-modules/configuration-common.nix | 2 +- .../configuration-hackage2nix.yaml | 1 + .../haskell-modules/hackage-packages.nix | 24 +++++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a23306b8fa9..0d170f0e1e4 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1461,7 +1461,7 @@ self: super: { jira-wiki-markup = doDistribute self.jira-wiki-markup_1_3_2; pandoc = doDistribute self.pandoc_2_10_1; pandoc-citeproc = doDistribute self.pandoc-citeproc_0_17_0_2; - pandoc-types = doDistribute self.pandoc-types_1_22; + pandoc-types = doDistribute self.pandoc-types_1_21; rfc5051 = doDistribute self.rfc5051_0_2; # Upstream forgot to change the Cabal version bounds in the test suite. diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 40776fb73eb..d474d45d7aa 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2589,6 +2589,7 @@ extra-packages: - network == 2.6.3.1 # newer versions don't compile with GHC 7.4.x and below - network == 3.0.* # required by network-bsd, HTTP, and many others (2019-04-30) - ormolu == 0.0.5.0 # required by haskell-language-server + - pandoc-types == 1.21 # required by for pandoc_2_10_1 - pantry == 0.2.0.0 # required by stack-2.1.3.1 - parallel == 3.2.0.3 # newer versions don't work with GHC 6.12.3 - patience ^>= 0.1 # required by chell-0.4.x diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 88da4767fbb..82eaebd4d03 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -190768,6 +190768,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pandoc-types_1_21" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, transformers + }: + mkDerivation { + pname = "pandoc-types"; + version = "1.21"; + sha256 = "1wbb0hhjiw0b66kj1ck3qipwgdac5v7qvjaqszsz5fll3cqp4sna"; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq ghc-prim QuickCheck syb + text transformers + ]; + testHaskellDepends = [ + aeson base bytestring containers HUnit QuickCheck string-qq syb + test-framework test-framework-hunit test-framework-quickcheck2 text + ]; + benchmarkHaskellDepends = [ base criterion text ]; + description = "Types for representing a structured document"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pandoc-types_1_22" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb From ae183ba4f7f2b187c37adc82081170eecbbbff2e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 25 Sep 2020 21:10:19 +0200 Subject: [PATCH 157/293] all-cabal-hashes: update to Hackage at 2020-09-25T08:31:15Z --- pkgs/data/misc/hackage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index b1b8d6ce902..7089ca52a3c 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/edb0920a8dbbd592d67a781d0b905728515ab623.tar.gz"; - sha256 = "08yvpwzw7c3xw3w970ysykj44vglqfiq057kx0axk81s68v83rcy"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/513c2f50baa5338bbe40a93cb328e1fe973df09c.tar.gz"; + sha256 = "1j5lch66x82ysqfq97jq5sm0f58cdm0vjvy4wpkcm1akgnkkycq3"; } From c8353580783e4488c19c985177136dbabd10214c Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Fri, 25 Sep 2020 18:21:22 +0200 Subject: [PATCH 158/293] shotcut: 20.07.11 -> 20.09.13, mlt: 6.20.0 -> 6.22.1 and add updateScript --- pkgs/applications/video/shotcut/default.nix | 17 ++++++++++++----- pkgs/development/libraries/mlt/default.nix | 12 +++++++++--- pkgs/development/libraries/mlt/qt-5.nix | 12 +++++++++--- 3 files changed, 30 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index f907179bd04..f1d77fb7d14 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -1,20 +1,21 @@ { stdenv, fetchFromGitHub, fetchpatch, mkDerivation, SDL2, frei0r, gettext, mlt , jack1, pkgconfig, qtbase, qtmultimedia, qtwebkit, qtx11extras, qtwebsockets -, qtquickcontrols, qtgraphicaleffects, libmlt, qmake, qttools +, qtquickcontrols, qtgraphicaleffects, libmlt, qmake, qttools, genericUpdater +, common-updater-scripts }: -assert stdenv.lib.versionAtLeast libmlt.version "6.20.0"; -assert stdenv.lib.versionAtLeast mlt.version "6.20.0"; +assert stdenv.lib.versionAtLeast libmlt.version "6.22.1"; +assert stdenv.lib.versionAtLeast mlt.version "6.22.1"; mkDerivation rec { pname = "shotcut"; - version = "20.07.11"; + version = "20.09.13"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "0ajg0bpdckhvmmsliy1xky9p4mdypnaw3z3cvfsdrm0zcihbgazv"; + sha256 = "1q7ba6j3b2yzn3y5z9s5ldh15wrvhi6vymhwm910nqa5379dcc21"; }; enableParallelBuilding = true; @@ -47,6 +48,12 @@ mkDerivation rec { cp -r src/qml $out/share/shotcut/ ''; + passthru.updateScript = genericUpdater { + inherit pname version; + versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; + rev-prefix = "v"; + }; + meta = with stdenv.lib; { description = "A free, open source, cross-platform video editor"; longDescription = '' diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 5b54e0894e1..8c73343f208 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchFromGitHub, makeWrapper , SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate , libvorbis, libxml2, movit, pkgconfig, sox -, gtk2 +, gtk2, genericUpdater, common-updater-scripts }: stdenv.mkDerivation rec { pname = "mlt"; - version = "6.20.0"; + version = "6.22.1"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - sha256 = "14kayzas2wisyw0z27qkcm4qnxbdb7bqa0hg7gaj5kbm3nvsnafk"; + sha256 = "0jxv848ykw0csbnayrd710ylw46m0picfv7rpzsxz1vh4jzs395k"; }; buildInputs = [ @@ -38,6 +38,12 @@ stdenv.mkDerivation rec { sed -i $out/lib/mlt/libmltopengl.so -e "s|$s|$t|g" ''; + passthru.updateScript = genericUpdater { + inherit pname version; + versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; + rev-prefix = "v"; + }; + meta = with stdenv.lib; { description = "Open source multimedia framework, designed for television broadcasting"; homepage = "https://www.mltframework.org"; diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index 6b41affb126..3dcbda68135 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -1,19 +1,19 @@ { stdenv, fetchFromGitHub, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate , libvorbis, libxml2, makeWrapper, movit, pkgconfig, sox, qtbase, qtsvg -, fftw, vid-stab, opencv3, ladspa-sdk +, fftw, vid-stab, opencv3, ladspa-sdk, genericUpdater, common-updater-scripts }: let inherit (stdenv.lib) getDev; in stdenv.mkDerivation rec { pname = "mlt"; - version = "6.20.0"; + version = "6.22.1"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - sha256 = "14kayzas2wisyw0z27qkcm4qnxbdb7bqa0hg7gaj5kbm3nvsnafk"; + sha256 = "0jxv848ykw0csbnayrd710ylw46m0picfv7rpzsxz1vh4jzs395k"; }; buildInputs = [ @@ -57,6 +57,12 @@ stdenv.mkDerivation rec { inherit ffmpeg; }; + passthru.updateScript = genericUpdater { + inherit pname version; + versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; + rev-prefix = "v"; + }; + meta = with stdenv.lib; { description = "Open source multimedia framework, designed for television broadcasting"; homepage = "https://www.mltframework.org/"; From 99dfe7ecf896d4b24ea794a9e4f3cb44eb262ca0 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Fri, 25 Sep 2020 22:36:28 +0300 Subject: [PATCH 159/293] =?UTF-8?q?sile:=200.10.10=20=E2=86=92=200.10.11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/typesetting/sile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index d61e97857c5..1084ee37ea7 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -38,11 +38,11 @@ in stdenv.mkDerivation rec { pname = "sile"; - version = "0.10.10"; + version = "0.10.11"; src = fetchurl { url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "0m7yyvw8ypz89rfx8nm70mf87l357w5qac73pmfgl84f24cbxh7g"; + sha256 = "0c4azy2iqcj5qg09caqzzjzvig5h0sjilkprphdxvg2bi7dr9g5c"; }; configureFlags = [ From 87199830756410ae2cf20766c1af843c818ece75 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 25 Sep 2020 19:36:59 +0000 Subject: [PATCH 160/293] libqalculate: 3.12.1 -> 3.13.0 --- pkgs/development/libraries/libqalculate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 5c520e1c9dd..11816beee04 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libqalculate"; - version = "3.12.1"; + version = "3.13.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "0g3ipl6ynhclmwny54zgdh721v0fs9dzj6j7r8dz91s86jva3chb"; + sha256 = "0nd0hrnp0a9p7hy6l6s45kfd267r7qg91aqn8g2dyam5hngskayk"; }; outputs = [ "out" "dev" "doc" ]; From 53c4c7ab3a68fb085f9bec88eb64a7bf778ef66f Mon Sep 17 00:00:00 2001 From: freezeboy Date: Fri, 25 Sep 2020 21:38:21 +0200 Subject: [PATCH 161/293] moodle: 3.9.1 -> 3.9.2 --- pkgs/servers/web-apps/moodle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/moodle/default.nix b/pkgs/servers/web-apps/moodle/default.nix index 447a27ad082..d7ee17ccdcc 100644 --- a/pkgs/servers/web-apps/moodle/default.nix +++ b/pkgs/servers/web-apps/moodle/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, writeText, plugins ? [ ] }: let - version = "3.9.1"; + version = "3.9.2"; stableVersion = builtins.substring 0 2 (builtins.replaceStrings ["."] [""] version); in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz"; - sha256 = "sha256-6QJDEInUQQSNj3kThQ65o2cT6JaRy0FrEKy+EcDMVvs="; + sha256 = "ygy9xlYs49Ga3u2Q/vqxhnDnqXsrh6YYTAtcsXF8kNo="; }; phpConfig = writeText "config.php" '' From 387df70eea2b4a097cd73c7d8d123ff48493050b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 25 Sep 2020 20:00:00 +0000 Subject: [PATCH 162/293] fluent-bit: 1.5.6 -> 1.5.7 https://fluentbit.io/announcements/v1.5.7/ --- pkgs/tools/misc/fluent-bit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index 455befa835d..cb8549c9c99 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.5.6"; + version = "1.5.7"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "1s4yjcqpvvvmzv2gzx9hnma9dkrqspp9ds0w3d7mbqw0z5gc70x9"; + sha256 = "1kpa2wgpm747w7bnk33m7bip5shlbkavs7rwnlj6yr600dcp8zp5"; }; nativeBuildInputs = [ cmake flex bison ]; From 8d52cf501f0796294b30ddf17f5b0ea8ccb8918b Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 25 Sep 2020 22:06:38 +0200 Subject: [PATCH 163/293] nixos/datadog: Don't recommend dd_url for sites, add proper option Turns out, `dd_url` should only be used in proxy scenarios, not to point datadog to their EU endpoint - `site` should be used for that. The `dd_url` setting doesn't affect APM, Logs or Live Process intake which have their own "*_dd_url" settings. --- .../services/monitoring/datadog-agent.nix | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/monitoring/datadog-agent.nix b/nixos/modules/services/monitoring/datadog-agent.nix index 673bc7b02b2..d97565f15d6 100644 --- a/nixos/modules/services/monitoring/datadog-agent.nix +++ b/nixos/modules/services/monitoring/datadog-agent.nix @@ -6,7 +6,6 @@ let cfg = config.services.datadog-agent; ddConf = { - dd_url = cfg.ddUrl; skip_ssl_validation = false; confd_path = "/etc/datadog-agent/conf.d"; additional_checksd = "/etc/datadog-agent/checks.d"; @@ -14,6 +13,8 @@ let } // optionalAttrs (cfg.logLevel != null) { log_level = cfg.logLevel; } // optionalAttrs (cfg.hostname != null) { inherit (cfg) hostname; } + // optionalAttrs (cfg.ddUrl != null) { dd_url = cfg.ddUrl; } + // optionalAttrs (cfg.site != null) { site = cfg.site; } // optionalAttrs (cfg.tags != null ) { tags = concatStringsSep ", " cfg.tags; } // optionalAttrs (cfg.enableLiveProcessCollection) { process_config = { enabled = "true"; }; } // optionalAttrs (cfg.enableTraceAgent) { apm_config = { enabled = true; }; } @@ -79,14 +80,23 @@ in { ddUrl = mkOption { description = '' - Custom dd_url to configure the agent with. - Useful when you want to point datadog to another endpoint, either - because you need a proxy to send out data, or because you use their EU - endpoint. + Custom dd_url to configure the agent with. Useful if traffic to datadog + needs to go through a proxy. + Don't use this to point to another datadog site (EU) - use site instead. ''; - default = "https://app.datadoghq.com"; - example = "https://app.datadoghq.eu"; - type = types.str; + default = null; + example = "http://haproxy.example.com:3834"; + type = types.nullOr types.str; + }; + + site = mkOption { + description = '' + The datadog site to point the agent towards. + Set to datadoghq.eu to point it to their EU site. + ''; + default = null; + example = "datadoghq.eu"; + type = types.nullOr types.str; }; tags = mkOption { From afec4b31bd93f2311cc295057ee1c35233a4d7f8 Mon Sep 17 00:00:00 2001 From: Dan Callahan Date: Fri, 25 Sep 2020 21:49:29 +0100 Subject: [PATCH 164/293] digikam: fix broken icons Ensures that the Breeze icon theme is available to digikam. Without this, digikam breaks in strange ways. Fixes #65322 Fixes #78225 --- pkgs/applications/graphics/digikam/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 2c0dbd5f3f0..5e9305a71b2 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -45,6 +45,7 @@ , hugin , gnumake +, breeze-icons , oxygen }: @@ -94,6 +95,7 @@ mkDerivation rec { kwidgetsaddons kxmlgui + breeze-icons marble oxygen threadweaver From 00aef98014e45d5c0e8eaba88dc8e0470b84be73 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 25 Sep 2020 21:20:33 +0000 Subject: [PATCH 165/293] luigi: 3.0.1 -> 3.0.2 --- pkgs/applications/networking/cluster/luigi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix index 98b71cfe112..e0a6cd48d6e 100644 --- a/pkgs/applications/networking/cluster/luigi/default.nix +++ b/pkgs/applications/networking/cluster/luigi/default.nix @@ -9,11 +9,11 @@ let }; in with python.pkgs; buildPythonApplication rec { pname = "luigi"; - version = "3.0.1"; + version = "3.0.2"; src = fetchPypi { inherit pname version; - sha256 = "02c480f5pjgqsvqnkaw7f6n4nhdspmhq5w7lw8sgg2v3jghg8n7i"; + sha256 = "b4b1ccf086586d041d7e91e68515d495c550f30e4d179d63863fea9ccdbb78eb"; }; propagatedBuildInputs = [ dateutil tornado_5 python-daemon boto3 ]; From fb719d957f9addd3adf01ec44c0adaf68eb20282 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 25 Sep 2020 15:19:27 -0700 Subject: [PATCH 166/293] haskell.ghc8102Binary: fix extra inputs --- pkgs/development/compilers/ghc/8.10.2-binary.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/ghc/8.10.2-binary.nix b/pkgs/development/compilers/ghc/8.10.2-binary.nix index 8dbe6bdae1a..87d341a10f1 100644 --- a/pkgs/development/compilers/ghc/8.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/8.10.2-binary.nix @@ -2,6 +2,7 @@ , fetchurl, perl, gcc , ncurses6, gmp, glibc, libiconv , llvmPackages +, ... }: # Prebuilt only does native From 38276b91fae3044b0d29c36138def5840d327755 Mon Sep 17 00:00:00 2001 From: ento Date: Fri, 25 Sep 2020 09:58:07 -0800 Subject: [PATCH 167/293] aws-vault: 6.0.0 -> 6.2.0 --- pkgs/tools/admin/aws-vault/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix index 1efbff221a6..d55b90f3b84 100644 --- a/pkgs/tools/admin/aws-vault/default.nix +++ b/pkgs/tools/admin/aws-vault/default.nix @@ -1,16 +1,16 @@ { buildGoModule, lib, fetchFromGitHub }: buildGoModule rec { pname = "aws-vault"; - version = "6.0.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "99designs"; repo = pname; rev = "v${version}"; - sha256 = "0ssm58ksk5jb28w1ipa57spzf6wixjy1m7flw61ls8k86cy7qb7c"; + sha256 = "0892fhjmxnms09bfbjnngnnnli2d4nkwq44fw98yb3d5lbpa1j1j"; }; - vendorSha256 = "0lxm7nkzf9j9id7m46gqn26prb1jfl34gy1fycr0578absdvsrjd"; + vendorSha256 = "18lmxx784377x1v0gr6fkdx5flhcajsqlzyjx508z0kih6ammc0z"; doCheck = false; From 5d7544ee728657f47f5c4f542bdbfb28ee89e9ac Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 25 Sep 2020 18:00:00 -0500 Subject: [PATCH 168/293] archiver: 3.3.0 -> 3.3.1 https://github.com/mholt/archiver/releases/tag/v3.3.1 --- pkgs/applications/misc/archiver/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/archiver/default.nix b/pkgs/applications/misc/archiver/default.nix index 114021eb78f..cfd8d1993a9 100644 --- a/pkgs/applications/misc/archiver/default.nix +++ b/pkgs/applications/misc/archiver/default.nix @@ -5,16 +5,18 @@ buildGoModule rec { pname = "archiver"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "mholt"; repo = pname; rev = "v${version}"; - sha256 = "1yr2jhidqvbwh1y08lpqaidwpr5yx3bhvznm5fc9pk64s7z5kq3h"; + sha256 = "1izr9znw3mbqpg85qkl1pad5hash531h3dpwbji5w2af2i6x4ga3"; }; - vendorSha256 = "1ikrgl03r9zkn86kxkqi2kf540g3qzzz24i5wvh6g3d5q49nygl9"; + vendorSha256 = "1rqhra3rfarq8f750zszkrm0jcsxa4sjbfpmcdlj5z000df699zq"; + + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev} -X main.date=unknown" ]; doCheck = false; From bbeed7ecf8a0d154f7588002c9734220032b5e56 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 26 Sep 2020 07:08:39 +1000 Subject: [PATCH 169/293] podman: 2.1.0 -> 2.1.1 https://github.com/containers/podman/releases/tag/v2.1.1 --- pkgs/applications/virtualization/podman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index e1e7d2c277d..b05149fd150 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "podman"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "033pdkrmdsk33n1mglpcpl3g9i62raw47wpab752qhbmpy1c49lr"; + sha256 = "0cy842wlyasxlxnwxkwhwgj148s30kfxnhgxa6ar26fly432aa68"; }; vendorSha256 = null; From 2768436826543af2b1540e4fe6b5afa15850e155 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 25 Sep 2020 14:50:26 -0700 Subject: [PATCH 170/293] hasura-graphql-engine: reduce closure size 4.3G to around 80MB --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b1d6353b04..9fc8ca55e84 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16527,7 +16527,7 @@ in hashi-ui = callPackage ../servers/hashi-ui {}; - hasura-graphql-engine = haskellPackages.graphql-engine; + hasura-graphql-engine = haskell.lib.justStaticExecutables haskellPackages.graphql-engine; hasura-cli = callPackage ../servers/hasura/cli.nix { }; From bff1304ec286592736aafc9db3e4c449d57be76d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 26 Sep 2020 05:24:41 +0000 Subject: [PATCH 171/293] nebula: 1.2.0 -> 1.3.0 --- pkgs/tools/networking/nebula/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/nebula/default.nix b/pkgs/tools/networking/nebula/default.nix index 178979b2caf..b3cd0d83024 100644 --- a/pkgs/tools/networking/nebula/default.nix +++ b/pkgs/tools/networking/nebula/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nebula"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "slackhq"; repo = pname; rev = "v${version}"; - sha256 = "0xrki9w83b4b3l5adq1rxz374f124wf388sdyvy7ngc3b04k7qlb"; + sha256 = "08pjzlqck9524phsmqjwg6237vj1mmwsynkxivnahv1vhwyy9awz"; }; - vendorSha256 = "094mn1r69c40w7k3lsggjh0dpws9l0j7mgiyjy1lpblkvkyk2azm"; + vendorSha256 = "1g6wk5sydxbzpx62k4bdq4qnyk98mn1pljgi5hbffj01ipd82kq8"; doCheck = false; From 3f8533e8360d438774a63e1dfd97af5a875428a4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 26 Sep 2020 05:32:59 +0000 Subject: [PATCH 172/293] nfpm: 1.7.0 -> 1.8.0 --- pkgs/tools/package-management/nfpm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index 18a1da8ce5f..2ecc64a09b1 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nfpm"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "0jmxafvxzqg65zg5cnjd2nsz1mmw06mc7qz3lbs5h2gkxiah8264"; + sha256 = "0hg15k9bz5iw7mv4m31rg4f5anfiirr3vjvy16z532vwfh05ixw3"; }; - vendorSha256 = "0yvzwbm0xb1h45x96h658avbjz9w79aaa6z042xpvjqc4wsr8155"; + vendorSha256 = "032l0xrf4ny4ildinxlfjy8sslhcl2krmgnm07dnx999jxlswxym"; doCheck = false; From 082fd1a6765e9ea0bb24001276bb44298559e092 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 26 Sep 2020 06:26:16 +0000 Subject: [PATCH 173/293] obsidian: 0.8.12 -> 0.8.15 --- pkgs/applications/misc/obsidian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 44bd043d348..055fc70cae7 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -30,12 +30,12 @@ let in stdenv.mkDerivation rec { pname = "obsidian"; - version = "0.8.12"; + version = "0.8.15"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz"; - sha256 = "1rvdxdxrfhw0ldslbnmx26znlvznb1iqpk95c0rh12hlzh4nlgxm"; + sha256 = "0cbgkdbfr7w4xixzwx80q9fzsv97lahfdsd8b26m2zvyby075qzj"; }; nativeBuildInputs = [ makeWrapper graphicsmagick ]; From 90ea25e1790ed373f70fdde370c88f6faf324149 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 26 Sep 2020 06:45:18 +0000 Subject: [PATCH 174/293] oneDNN: 1.6.1 -> 1.6.3 --- pkgs/development/libraries/oneDNN/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix index 1fb0f03d305..ad311daf1db 100644 --- a/pkgs/development/libraries/oneDNN/default.nix +++ b/pkgs/development/libraries/oneDNN/default.nix @@ -5,13 +5,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation rec { pname = "oneDNN"; - version = "1.6.1"; + version = "1.6.3"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${version}"; - sha256 = "1rdq2rb4f9xbk2a07fpqgvd9mx1r5gwpm0jr8rra815bzddam8zh"; + sha256 = "1cskqpa14jjgw409wbxw03kpm9a1g6lmmc2fs2916if6xd70xdj3"; }; outputs = [ "out" "dev" "doc" ]; From acfc94405dc5b67d3bdc5447c01297cfa028a84f Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 26 Sep 2020 08:52:11 +0200 Subject: [PATCH 175/293] moodle: change maintainer --- pkgs/servers/web-apps/moodle/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/web-apps/moodle/default.nix b/pkgs/servers/web-apps/moodle/default.nix index d7ee17ccdcc..b9f11b5c179 100644 --- a/pkgs/servers/web-apps/moodle/default.nix +++ b/pkgs/servers/web-apps/moodle/default.nix @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { "Free and open-source learning management system (LMS) written in PHP"; license = licenses.gpl3Plus; homepage = "https://moodle.org/"; - maintainers = with maintainers; [ aanderse ]; + maintainers = with maintainers; [ freezeboy ]; platforms = platforms.all; }; } From 9c4bd3127f5f73a866d3a4f047dbea3efa9daac0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 26 Sep 2020 06:53:25 +0000 Subject: [PATCH 176/293] openbazaar-client: 2.4.7 -> 2.4.8 --- pkgs/applications/networking/openbazaar/client.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/openbazaar/client.nix b/pkgs/applications/networking/openbazaar/client.nix index f011f9aef4e..c890329771f 100644 --- a/pkgs/applications/networking/openbazaar/client.nix +++ b/pkgs/applications/networking/openbazaar/client.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "openbazaar-client"; - version = "2.4.7"; + version = "2.4.8"; src = fetchurl { url = "https://github.com/OpenBazaar/openbazaar-desktop/releases/download/v${version}/openbazaar2client_${version}_amd64.deb"; - sha256 = "04wwljaiqm8rsdrzngqrzrjzfrjsrfsaa60c904zhbhmsqc7y4f1"; + sha256 = "0c8ar0rd4yydy4rd4hqafljrhi40v3cwhc9v7fjbrfhcx1ikmf64"; }; dontBuild = true; From 10dd055a8e948b8b3b9ce7182c7706ac48146d2b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 26 Sep 2020 07:16:15 +0000 Subject: [PATCH 177/293] operator-sdk: 1.0.0 -> 1.0.1 --- pkgs/development/tools/operator-sdk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/operator-sdk/default.nix b/pkgs/development/tools/operator-sdk/default.nix index cec885499bf..79baecd74f5 100644 --- a/pkgs/development/tools/operator-sdk/default.nix +++ b/pkgs/development/tools/operator-sdk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "operator-sdk"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; rev = "v${version}"; - sha256 = "1s59rgr0ssics1487mvx0h37zs7dfjimsvkbs2d8wqc3r8asw0g4"; + sha256 = "1p2ra7mqn7crip6sjgq2j49782ncvs4qahjwg6jk5rdvvi4hbyc7"; }; - vendorSha256 = "0xvjsiaa3qvlix1fm07z080vh79wg0xyx2s6jqnqn7fb3nh65kn7"; + vendorSha256 = "0zy540cbfm1kfc5sp802a9a5l2gkpgqprn8mlh9zg4d4shni61wa"; doCheck = false; From 9cb5285c0aee6adad68343f0babbe6fa53ce5aa7 Mon Sep 17 00:00:00 2001 From: Dan Callahan Date: Sat, 26 Sep 2020 08:36:14 +0100 Subject: [PATCH 178/293] libqtav: 1.12.0 -> git-2020-09-10 This un-breaks libqtav by upgrading it to the current upstream HEAD. Previously, Qtav was broken by the Qt 5.12 -> 5.14 migration (#84232). See commit 819bb63d5c1ff038f7cd39bb0fa7a4f9564ce000 This also un-pins ffmpeg_3; libqtav works fine with current ffmpeg. Digikam is the only derivation in nixpkgs that has referenced libqtav, thus upgrading to a pre-release revision poses minimal risk. --- pkgs/development/libraries/libqtav/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix index 43489e8e850..fc577d7e508 100644 --- a/pkgs/development/libraries/libqtav/default.nix +++ b/pkgs/development/libraries/libqtav/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchFromGitHub, extra-cmake-modules , qtbase, qtmultimedia, qtquick1, qttools , libGL, libX11 -, libass, openal, ffmpeg_3, libuchardet +, libass, openal, ffmpeg, libuchardet , alsaLib, libpulseaudio, libva }: @@ -9,19 +9,19 @@ with lib; mkDerivation rec { pname = "libqtav"; - version = "1.12.0"; + version = "git-2020-09-10"; nativeBuildInputs = [ extra-cmake-modules qttools ]; buildInputs = [ qtbase qtmultimedia qtquick1 libGL libX11 - libass openal ffmpeg_3 libuchardet + libass openal ffmpeg libuchardet alsaLib libpulseaudio libva ]; src = fetchFromGitHub { - sha256 = "03ii9l38l3fsr27g42fx4151ipzkip2kr4akdr8x28sx5r9rr5m2"; - rev = "v${version}"; + sha256 = "0qwrk40dihkbwmm7krz6qaqyn9v3qdjnd2k9b4s3a67x4403pib3"; + rev = "2a470d2a8d2fe22fae969bee5d594909a07b350a"; repo = "QtAV"; owner = "wang-bin"; fetchSubmodules = true; @@ -46,6 +46,5 @@ mkDerivation rec { homepage = "http://www.qtav.org/"; maintainers = [ maintainers.jraygauthier ]; platforms = platforms.linux; - broken = !(lib.versionOlder qtbase.version "5.13"); }; } From c4c101e41410689ffbbb04dbd36c0e6ea7e18c16 Mon Sep 17 00:00:00 2001 From: Dan Callahan Date: Sat, 26 Sep 2020 08:38:59 +0100 Subject: [PATCH 179/293] digikam: unbreak media playback This patch re-adds libqtav to digikam's list of dependencies, restoring support for video playback in the application. This effectively reverts commit 5194e7c0cbb4601df1a57531bf5955c35bbf4314 --- pkgs/applications/graphics/digikam/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 2c0dbd5f3f0..cdd428a29c7 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -32,6 +32,7 @@ , libkipi , libksane , liblqr1 +, libqtav , libusb1 , marble , libGL @@ -72,6 +73,7 @@ mkDerivation rec { libkipi libksane liblqr1 + libqtav libusb1 libGL libGLU From 9127ee59cd8614f6aef2ede95784fb2a6f3ff7fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 26 Sep 2020 10:19:01 +0200 Subject: [PATCH 180/293] thunderbird: 78.3.0 -> 78.3.1 It's supposed to fix just a frequent crash. https://www.thunderbird.net/en-US/thunderbird/78.3.1/releasenotes/ --- .../networking/mailreaders/thunderbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index fa68ef83a08..4abedec5231 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -70,13 +70,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "78.3.0"; + version = "78.3.1"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "2jxwx7yli1f032bdz1d8gd724am8kjxla7d767p0dl1zcw761xnimhl41m4ik7cc9dhj8s6wfhjgrga70794c2dfd7c36dlhgjqp9mx"; + "16b05e51776ba16503bc5fba02a6d0b5050a206e264a4707544354ad76af61902fd2dcf5d97b82b432dc69362ccd18543a0acccd80e06648e6c6f470886da450"; }; nativeBuildInputs = [ From 31ae9dd6abb93681b7b3683c7a92fac5ead8f552 Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Mon, 16 Dec 2019 18:19:28 +0100 Subject: [PATCH 181/293] nncp: init at 5.3.3 --- pkgs/tools/misc/nncp/default.nix | 61 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 63 insertions(+) create mode 100644 pkgs/tools/misc/nncp/default.nix diff --git a/pkgs/tools/misc/nncp/default.nix b/pkgs/tools/misc/nncp/default.nix new file mode 100644 index 00000000000..3322ed0c8a4 --- /dev/null +++ b/pkgs/tools/misc/nncp/default.nix @@ -0,0 +1,61 @@ +{ stdenv +, go +, fetchurl +, curl +, perl +, genericUpdater +, writeShellScript +}: + +stdenv.mkDerivation rec { + pname = "nncp"; + version = "5.3.3"; + + src = fetchurl { + url = "http://www.nncpgo.org/download/${pname}-${version}.tar.xz"; + sha256 = "1l35ndzrvpfim29jn1p0bwmc8w892z44nsrdnay28k229r9dhz3h"; + }; + + nativeBuildInputs = [ go ]; + + preConfigure = '' + export GOCACHE=$PWD/.cache + ''; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + "CFGPATH=/etc/nncp.hjson" + "SENDMAIL=/run/wrappers/bin/sendmail" + ]; + + passthru.updateScript = genericUpdater { + inherit pname version; + versionLister = writeShellScript "nncp-versionLister" '' + echo "# Versions for $1:" >> "$2" + ${curl}/bin/curl -s http://www.nncpgo.org/Tarballs.html | ${perl}/bin/perl -lne 'print $1 if /Release.*>([0-9.]+) Date: Sat, 26 Sep 2020 08:49:06 +0000 Subject: [PATCH 182/293] pkger: 0.17.0 -> 0.17.1 --- pkgs/development/libraries/pkger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pkger/default.nix b/pkgs/development/libraries/pkger/default.nix index 564efa31b60..8c8fd4f8fd6 100644 --- a/pkgs/development/libraries/pkger/default.nix +++ b/pkgs/development/libraries/pkger/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "pkger"; - version = "0.17.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "markbates"; repo = "pkger"; rev = "v${version}"; - sha256 = "195ba1avkpm9ssgakngv8j72k7yq2xna3xmm5m8l6c5g7lf91kkp"; + sha256 = "12zcvsd6bv581wwhahp1wy903495s51lw86b99cfihwmxc5qw6ww"; }; vendorSha256 = "1b9gpym6kb4hpdbrixphfh1qylmqr265jrmcd4vxb87ahvrsrvgp"; From b7b89a6272dd077bcc30e040c867a557229d34f3 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 26 Sep 2020 12:35:25 +1000 Subject: [PATCH 183/293] skopeo: fix wrapper --- pkgs/development/tools/skopeo/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 69744509748..db5f392b2ce 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -42,9 +42,7 @@ buildGoModule rec { install -Dm755 bin/skopeo -t $out/bin installManPage docs/*.[1-9] installShellCompletion --bash completions/bash/skopeo - ''; - - postInstall = stdenv.lib.optionals stdenv.isLinux '' + '' + stdenv.lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/skopeo \ --prefix PATH : ${stdenv.lib.makeBinPath [ fuse-overlayfs ]} ''; From 650cb981406f84925f35c6895c15aab3af3c2472 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 26 Sep 2020 11:38:49 +0200 Subject: [PATCH 184/293] opencascade-occt: 7.3.0p3 -> 7.4.0p1 --- pkgs/development/libraries/opencascade-occt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/opencascade-occt/default.nix b/pkgs/development/libraries/opencascade-occt/default.nix index 83b1cfc2add..f0016555c04 100644 --- a/pkgs/development/libraries/opencascade-occt/default.nix +++ b/pkgs/development/libraries/opencascade-occt/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "opencascade-occt"; - version = "7.3.0p3"; + version = "7.4.0p1"; commit = "V${builtins.replaceStrings ["."] ["_"] version}"; src = fetchurl { name = "occt-${commit}.tar.gz"; url = "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=${commit};sf=tgz"; - sha256 = "0k9c3ypcnjcilq1dhsf6xxbd52gyq4h5rchvp30k3c8ph4ris5pz"; + sha256 = "0b9hs3akx1f3hhg4zdip6qdv04ssqqcf9kk12amkidgvsl73z2hs"; }; nativeBuildInputs = [ cmake ninja ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { license = licenses.lgpl21; # essentially... # The special exception defined in the file OCCT_LGPL_EXCEPTION.txt # are basically about making the license a little less share-alike. - maintainers = with maintainers; [ amiloradovsky ]; + maintainers = with maintainers; [ amiloradovsky gebner ]; platforms = platforms.all; }; From 34b3008b8ca0ef054d2385cc67dfc0239a9cfbab Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 26 Sep 2020 09:47:06 +0000 Subject: [PATCH 185/293] pt2-clone: 1.22 -> 1.23 --- pkgs/applications/audio/pt2-clone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index b76be35da29..eaabcf4bef7 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.22"; + version = "1.23"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "1w6lbq4366bawy975glvjizk57zhvl562xhxwzn7p5hpm2bvw09b"; + sha256 = "1vixpp0vqpawqviwl44wn8zf602zyyrgqnjzrlwjrmdzydx9c93y"; }; nativeBuildInputs = [ cmake ]; From 0ab3e526c9bc66934a53c3da73211c9d85a7ce29 Mon Sep 17 00:00:00 2001 From: taku0 Date: Sat, 26 Sep 2020 19:09:13 +0900 Subject: [PATCH 186/293] thunderbird-bin: 78.3.0 -> 78.3.1 --- .../thunderbird-bin/release_sources.nix | 530 +++++++++--------- 1 file changed, 265 insertions(+), 265 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 2c7d1af6712..4540943c7b5 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "78.3.0"; + version = "78.3.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/af/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/af/thunderbird-78.3.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "e8a584fc47b5a41338ca4f4938ce4ffb99b00ddc8e83b3b5baa19f778c784e2f"; + sha256 = "dc14e5319ecee546f10f7decca4489718bfc94bc30f8b08e9571ef2ea6a3d6bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/ar/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/ar/thunderbird-78.3.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "7c6ca8a36571e2361f2d4a1d3c95e4061abaacaab9cc342ff095e0f7bbaad325"; + sha256 = "c2b3315de4d006ca44e3c5a68ed8e77024b89de2323970d4615490b86e0fdfd9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/ast/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/ast/thunderbird-78.3.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "e7b47cb0ad29611611d201441ddc45e04823bad143cda1a5a94b9832382f9130"; + sha256 = "0ffaca9fdce6bd88a0a850e149f1e3fc4e2cb167c637af7f9d674616038cf0a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/be/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/be/thunderbird-78.3.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "26f72664c546efb17bdccd244efdf7e86690550fe165155039530ffb0d4c2aaa"; + sha256 = "e52c73a0e1a93d6cb51004dd041f88213658673adfc67860f9550ee39adf9250"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/bg/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/bg/thunderbird-78.3.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "0e38d87d7eccc6af7f5894128b4b51418bc841802709693095ec5d7d1bb5b8a4"; + sha256 = "62ceac4d1085e1fcbc2446069c6b667be8391a4be5ade4b5f78107ddd3fcc170"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/br/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/br/thunderbird-78.3.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "39fa92e9220c92016281340ba2f05cb04a62fa0ca6ed15f7e12e02ad143c1e0d"; + sha256 = "0de6e27f09912f549e92136d46e02fa3738a3177897dd34e2858ee56b803224c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/ca/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/ca/thunderbird-78.3.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "80125296e56ebeaebf15e6b32724814e82e265dc7fe2394820d1880911ba82f0"; + sha256 = "ace99257cea52ecf6f99d9a819cf343a23b74e56c1f0bf2a3e66600dbcded779"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/cak/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/cak/thunderbird-78.3.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "fef1db95465636c18c1c8340ac66ff88caad4ea35b51111c1cb8650d9deb795a"; + sha256 = "f39736d27349ba66d142d61070e2c37c4c0a463a1cf89ea72fb1cabb264d38eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/cs/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/cs/thunderbird-78.3.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "4ebc2e7d28fde8a9f6eb878406bfd981f56254008f3276cf8d17dd24e5c45a0a"; + sha256 = "a068533fc0ac55972956aa9a9520f403df9519bc291c5102618476f249c911a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/cy/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/cy/thunderbird-78.3.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "4c4cd7ef87c9e83485678bcd1075912f36ac4a38a55b0fb9eac87e387f64de7a"; + sha256 = "bfd66cda463454684865f055339072513fc4b8774b34e96f3c799c6f555122fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/da/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/da/thunderbird-78.3.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "8209046080482641ce6866562c8bf89733bc008437f9cc88722f0a9653c46f0e"; + sha256 = "885bdd4063aa9d8d8dbd352af7291208766fb864b9989b68bb2fa038d314bd8b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/de/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/de/thunderbird-78.3.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "83d5532906fb8910ed177008633e073256f9a3fa8da37f0c6896c6d9a0547699"; + sha256 = "f1d9d91e6a4ef5e3945d958457e96cedde86a0f3b62ac5aee21eeff54c40c999"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/dsb/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/dsb/thunderbird-78.3.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "0e33d1505de3f434f6455f4c77b917fc7396652aeb1d961816bd0aa1e74a5bed"; + sha256 = "73628a6c666f69529b04ea8c60dc2fdffce17e9cf13ed6e3af24c8443f093b74"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/el/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/el/thunderbird-78.3.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "4a1f21553fa491acb123ad6a9e7c1c65977c92d6f6ee578dbef48b953ea56408"; + sha256 = "ec532079ebac4e8ba6e58e97d0c7eb1d7f5e0e20c1563985cabd03101dc2c995"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/en-CA/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/en-CA/thunderbird-78.3.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "d01635ba46605d1a2589f2bc7627b43675374928240698305e5cf7cfc8392b2b"; + sha256 = "1a1366cf35f9ab6b39300405538590e55d6a0833e406a61c9e3924a72adc2bcc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/en-GB/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/en-GB/thunderbird-78.3.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "d681790c0bb5aa4e8a81d002ec6d9003877c64e026a86f613fd649f2ad42af9e"; + sha256 = "1f62e839e1fff1c0a833ad2ee73fc72542bc3723e0e368ac1d9f153378da8859"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/en-US/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/en-US/thunderbird-78.3.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "6ccada557f18f5adb4a540423b005a91a1f33ef5a92b17fd38eaa40b2e7197e0"; + sha256 = "c46a8dde6a03c9588d0101354f2a09123d940bce507ea0a693807ea825b5edd1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/es-AR/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/es-AR/thunderbird-78.3.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "51fbb813a209631769b1835773ee656a61a62c64f11357edd36ef2edc4b3758d"; + sha256 = "3885122a529f8cc9cc7a579696f6e74f0d42a37309f44a33a18dbc99d01a433a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/es-ES/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/es-ES/thunderbird-78.3.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "fa15cbe049dabaec8567234329d1c24bef726d6e8c09ebc33f19cfad157f5953"; + sha256 = "d61e5d9e82f52de243cecfc8ccf0ec4476e3309167a33f9c4b7f513c31808527"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/et/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/et/thunderbird-78.3.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "69bd8968d9d9cc9203263091c26955df9bab6682867f6c2da2ce95614a231054"; + sha256 = "1ddc1fb310c75104c2642c145f9250fbffa834d5a9fb100c12c2e3ea31955321"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/eu/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/eu/thunderbird-78.3.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "ecd39147ecd5271a4d6b48cfff46cc1434992359b68b63e9bb0a32fd20b1959f"; + sha256 = "fdb2fd4d1650edc40f193c028a8bd6ac832742a383a2537f7cf7244f8d736717"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/fa/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/fa/thunderbird-78.3.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "46dbd0ec795e63ba32a7a3d10a40fda43276c8c11a202d1688202cdf152f5862"; + sha256 = "7ea9ed9eef1167792c2468372bd5c35a9a36401ec40d63a14a8b3d86cb6f6687"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/fi/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/fi/thunderbird-78.3.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "88d502d3c96129f1ae092bbe40bdfd880fdc84c4bed593d027f904dbdb5cfec7"; + sha256 = "efd073de097cb5f82a26a239fbb360b653041a48bf4c98e983b2fa9675e8c64e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/fr/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/fr/thunderbird-78.3.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "41074accb08f723accd88296f417ca9139eb338090ededf976e75f29b2433944"; + sha256 = "c07c981bc7fa69a10b3c78602e5cff029860b90243ccc3270f7df56505163b81"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/fy-NL/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/fy-NL/thunderbird-78.3.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "549182c4123fb95ef526c21badf7f5229afa14b9b48159ab7769cd615a4cd5d5"; + sha256 = "433912fe6bf0b36788f55f34d28cc56dc9a9c6f19684132e4ce51def7b968097"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/ga-IE/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/ga-IE/thunderbird-78.3.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "44e1144d9ece9328c74c7e8cabfb3660b004aee542d996e5ec1ad4404617371e"; + sha256 = "36a890c2aef942121a0e0717118328668d51961d506eab833141cb80c826768a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/gd/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/gd/thunderbird-78.3.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "a66ddc5474f2fd3857d83633972f6ad33cc23a4e371adb3de1ac063287f97e30"; + sha256 = "146853c4725c744d636acfcae4fdb3e65e2f37bd15d5abcbe105bf7ef8854b2f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/gl/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/gl/thunderbird-78.3.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "efe1bc2ab7a513f7ac4f41a5d963fdd2ecdc9fb7afa2a6f792efad46423cbf59"; + sha256 = "32f7c157a764c58a4b2d7aa45388919553300e6c0212ac1b48f30121a04332ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/he/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/he/thunderbird-78.3.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "df24d7d466c2ba2bd750ad5c55f9ce8c5ea5ce845a2f7040492a847dad4153e0"; + sha256 = "49e44de01ad2f13f1c2f82d137a1eab13d5800a1f72d7eb99514ea3d8bbac1d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/hr/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/hr/thunderbird-78.3.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "32fa27101058422448b0d1d154611e71fd96df76ea19ac224ee57cb908409ca7"; + sha256 = "de3df9903e42dbaa6d2f98da953ff141ac81728537c94505414c7df0721580ab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/hsb/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/hsb/thunderbird-78.3.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "ac2f378b764687e6eee65ffa3c6492cde6252811bccf91a41e9cc11110477593"; + sha256 = "3a851331fb698a7f6b5e54b26bba180f9952d55c29a0f8387e2637c0d8a83c79"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/hu/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/hu/thunderbird-78.3.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "f53e70dc6080c60928419a4035052afec7a1a9c68d43ca34fb42ee9efc0078bf"; + sha256 = "bbfeee0ce02dfc34012c994d914c69fe6a7d5b4ff0e36bc9e9ec453edc756725"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/hy-AM/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/hy-AM/thunderbird-78.3.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "77a12d688294fc852a5edaafed5936475b25ed546cbbc4bc9cd36f3ec6ce7506"; + sha256 = "b43ca227a53d8587da34219b02c1bd58f8ed23d63e425cd4911c5e1caa3a5254"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/id/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/id/thunderbird-78.3.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "d2792ba2dc2735c97a3180af031a7da43cd16cbe5c256552c6d840b7afa2a136"; + sha256 = "87ed1fb328b592418c515ac16dc8c45349c2dba4c69f8552f3e1f2aa9753bfca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/is/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/is/thunderbird-78.3.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "92cdf6bfeb024e225efff05f555baf3013031496f565dd7ef658fdf9a3e7e230"; + sha256 = "acfdf1a9dba0372966c82aa3629b5488111b8592b26aec3aa5162c6527ec29a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/it/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/it/thunderbird-78.3.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "47e9be8bd47567b78965438a3eaffc7350fd3ab6ba1a126973e0f53d92adb57f"; + sha256 = "04480c988c1518b7d2dc06c836f42b4bbbe243df7014a332d195a774fbafbd93"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/ja/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/ja/thunderbird-78.3.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "cbee18ab111ccf3b227ef91c38abed053f1e04bb29d263becb1864cdb4660c9c"; + sha256 = "a8041d9fc9c2e25367682b0c8d3343cf1a748d32616d4befc2ee3ab0cec24ee6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/ka/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/ka/thunderbird-78.3.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "6956a89db0e0148deb82e1d550ecfc270ebf7a3856776c9c8b3bff889b0ef624"; + sha256 = "d6df8809fd92b9a70a4cd95a035abbb14e0c0e8869034d3c90e50b2e531fa4d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/kab/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/kab/thunderbird-78.3.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "37e011a3103adafe9a89883ba02d5aa91962b4449be9918f79a8dd75bed4c404"; + sha256 = "6170fb0321369588af4417ce8ac25bb74ec14c932a8ecc22119f3c7d15bc9336"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/kk/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/kk/thunderbird-78.3.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "4ac58a7e5acf773d0184aab3b32bf9e93e917d8fc0edbcae3fa1811d10b27cd4"; + sha256 = "a3a9d5e5c1651f0d46fb6c3d74e87cbde964f2aac9484dbe0b12afabb66adfdf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/ko/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/ko/thunderbird-78.3.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "a44e7fbc5914d6fb990a7cc248f395d5517df8f2878fee4d7c9488eee5b8e64d"; + sha256 = "729a243dd4b5ab5dfd615228875ebba18a8b99d34ade0711cb7c1d2f4534b11d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/lt/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/lt/thunderbird-78.3.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "2f6c29fb552d3b577d77c14771bda5a99738d98659565fcca31694f85729319b"; + sha256 = "df653c6a2af688591a1e549fddf29f176046723601e5ef85633f69105f5ce23e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/ms/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/ms/thunderbird-78.3.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "8d95f02c8cdcc093de64cc602f3a4e43be467c0ad2d72065e0672c0f9395c3a8"; + sha256 = "278252b8d98cc29ce713eb00f59c87b54a324a0d3e833434a9912b3e1a0cd796"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/nb-NO/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/nb-NO/thunderbird-78.3.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "e2b7fc129209f62a8c6147ce14bc84f54c362e149ca9dd4b6595b8bbb7f5f311"; + sha256 = "665760b1c1035a831624c690053c5400d0ae93e28bc04a50bcc8014bc0111f5b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/nl/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/nl/thunderbird-78.3.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "3b2afba6b6841e09dc4db7af70e8fdaf7ccb820ec46e802911fc4b10dcd400b1"; + sha256 = "466cc2363465d0e3b6e80a9b3a27faaf010f693ed6b8b26f99610c1b4943db10"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/nn-NO/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/nn-NO/thunderbird-78.3.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "458fe7cf30621a83d950698a49ac937a14044af2f2ee5704926c0164cd5cc4bf"; + sha256 = "32f6aedcc9c9dad560e84c6de83452808e87b903c5cf69834f3a315ff560503c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/pa-IN/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/pa-IN/thunderbird-78.3.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "dba25eb862e80db5708334bea62e795511f0b769c0fafb0f48804f06ce835067"; + sha256 = "12073cbc4476a11c717a35f8281d9e8590f7eb35b20faf46aadeb41ffd875bfa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/pl/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/pl/thunderbird-78.3.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "b33eafd9ad827bb8b99c127dfcdd18c4c7063b672d06a2c04034f79c0453b062"; + sha256 = "3b8131571d497c6479615c48f908f324a76b297f9f0430eb18228283ab4de198"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/pt-BR/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/pt-BR/thunderbird-78.3.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "3f0ad3c5f476c3c4fc284bf52cfca1bc8c9fefb3b0fb57a62bf0ead44e97f6a4"; + sha256 = "618abb8f3e7c48f33002e4c99f05769b66036331a040ff395c65fd1dc9d60dbf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/pt-PT/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/pt-PT/thunderbird-78.3.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "e00156246b5b370f21fa5c6c6f76a4f3f24450216deca01afb132a88a7685f31"; + sha256 = "a43ea5f9181d9a7abc977ae3b0f5a20215c45d8d3e9baeae581ef15be0909489"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/rm/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/rm/thunderbird-78.3.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "7645eec7772e33e14a11516493a54079923c459b25f327fef1d6056df12e041a"; + sha256 = "69ea896f45830fe8eeb08e2244579a7454fc18fbdbafe781331bbad97ca4ccec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/ro/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/ro/thunderbird-78.3.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "e63bd8695f12187af15089fdb367ac960ec5381d558a65508402680f20972271"; + sha256 = "751137453712a435060346649a3f16a2422379ab0dab9141add053e85f0de8d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/ru/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/ru/thunderbird-78.3.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "44944b2ae9838c49710a0b46411adf5ce39b25e1806c3e35de9fa631d79ea896"; + sha256 = "26f2d8b5704ee445835bb7a0f5bcec222359ea83d7d53fe9c9870e664fe3a70f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/si/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/si/thunderbird-78.3.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "7efd1c975f9b5dd84b2d18063df27a49ff483bbd9d6936c145c0fcf01ac8c14d"; + sha256 = "1f450ffc77cf5309e8b01646c90324b14cc465b5b7d04566f3ff6cc56506d202"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/sk/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/sk/thunderbird-78.3.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "1712840259b63c154a559bd579ffe149ee6320aa18cb1498275c5b5931028546"; + sha256 = "f95af873292f04fe6c224e24a68ed715a8e4015a81be7b45352363f16233ee58"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/sl/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/sl/thunderbird-78.3.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "2b386674b7d0921d86bf1d4fe6e069464a47163dc9f64ac4ee781593a3956daa"; + sha256 = "ae49c848187a5eae1d8e8bb3f3b85e9c51794a5caed2832a38c9ac38910c85b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/sq/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/sq/thunderbird-78.3.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "fe4b55008a142aa45994d6c02778635e02cf65489a9c64e41c6f1ff44b2fe9b5"; + sha256 = "aa10a2fa4c73cef05c2b0657daa27c80697cda70e792be56b09ab1f9a66f544d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/sr/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/sr/thunderbird-78.3.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "486f90acae8688e5a4a7d60d84e7057bb6bb8af7d6d3715eb0940de0a951f9f0"; + sha256 = "92daea64a552175341b8223d9264a1bd5bbc5f3938f3420c8b81c7d0e9685b9c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/sv-SE/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/sv-SE/thunderbird-78.3.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "ee22d473baca639747ec4ecb05fa42937f6997c59e592b814bdbd4505c4b1be1"; + sha256 = "d001f1c61dea17d34dc309f6a1f120c57d6fdfe9fd0b3d336b1a1493f47dc196"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/th/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/th/thunderbird-78.3.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "31177d48dda461f8a0112cb62d157c9b49bca873f131a56af4940dab2fd1e514"; + sha256 = "0f640917646cb88c90aa7f85a79942f0e9dcce70e5d6d65da7e2d4cabfb73fb6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/tr/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/tr/thunderbird-78.3.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "44bcd37c83bcb7105da60988b5b83cdfcf6b95db077226d4010e55c0944416af"; + sha256 = "2150dc844df54651020d8ab4d43ba86d0624cbc06fceb12ab41eec5bafe7339e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/uk/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/uk/thunderbird-78.3.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "09e204a10698ae3626f459415ce5373cb69c8acdfeb89a6a585ba14a2db084ae"; + sha256 = "1d9bdddcd7e53d47e77c4fedef5f50559c45e61778e29fc98c04cc4538dcadd7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/uz/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/uz/thunderbird-78.3.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "5cdd367adf77562e6515d81280511f777d71d24c1e5056e39a7e0aee68560ada"; + sha256 = "281f2cb9c35c5710c387fd17a6a55b85c29a01b3f1e32a2b377392566d821b55"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/vi/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/vi/thunderbird-78.3.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "6e898a570d1fab1154e9cc64938245e57fbda54c9a31a89206fb383171372ee5"; + sha256 = "1678dae6f876b7799f61701db64ab1aa4d6aa3c316535a04734ec7f9481d6042"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/zh-CN/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/zh-CN/thunderbird-78.3.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "4da17de56b806ab6e76c01c58af87dcdfaf7215175c33af191a232875b4b2ed2"; + sha256 = "42c8fcced2d06b91f402c6a9c12b48dc1b024f1a5b2d01aa96a80df088700656"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-x86_64/zh-TW/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-x86_64/zh-TW/thunderbird-78.3.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "fba53ae0f767231c9e6bb567af6abe638366514edeeabbeefe087a1a3f37b31a"; + sha256 = "bbea2d5abe313825efd93e7fe8e63f5c73eeff72ab247b1990210256efee8aad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/af/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/af/thunderbird-78.3.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "6571f52bd52c84c24f023805cf6c8101102e6369b79e0b89602b0f80f8dff389"; + sha256 = "a54cfb6c0965d464ddfaa96dd214444ee51cea6c894e5efac236925d43de0be3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/ar/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/ar/thunderbird-78.3.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "ce2dac8ddda048faebb59a697af3041e0cdaf1acba3eb9eadf5d68fe68a87c4c"; + sha256 = "4d79eb10a38b01539b0c6d31db50f69004fbe5816c09e876cc338984aab0496b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/ast/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/ast/thunderbird-78.3.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "a75d47202663cf2be5266a5628dba37f377d360edd9f16c83681bf927a4a5271"; + sha256 = "5aa985186c01afe978961b64d702d98a59851257b1a3cd3d9873b7f67dcf1f61"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/be/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/be/thunderbird-78.3.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "2e001d467e265ed45e1edd2ca7be727c9519ab573be17bab30f9fe8e9e22f922"; + sha256 = "08d6da278f79b3e7c0132b8aec649b804d3a64b0d5c02223b66f83061e421c6e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/bg/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/bg/thunderbird-78.3.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "831bc4d837ce1ca174c3811edb4b90b393568f4e0bda5f3766374c64d0be1d21"; + sha256 = "c8749049c243474693272795cc3706e096873f743d22be171bb373746afe8a6e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/br/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/br/thunderbird-78.3.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "bb15f981f5ae2b827951183623b9b05f9ed2e990f1085a13d604610b571438a2"; + sha256 = "ecc9f08ef1b384d4844ea039ede864ad0f37c1cf83a75b8ee73a34b7f229e4f1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/ca/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/ca/thunderbird-78.3.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "9537779babc1ce1935ec83a968f4c86bdd8b07f780ab21858d2a38a2282873fa"; + sha256 = "92c9e0bbd375c525ad5c28dca4f8bc68726477ed49d908bf479d32729fb44c0a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/cak/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/cak/thunderbird-78.3.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "3972d530a1074a3a2e62bb82c759df5711ac6c17d99fc82a15a70a22d81c2076"; + sha256 = "33127a2b75dbdab2c33c8fb8a65e6bf053da6422449cb463c7cbf08fe7839d1e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/cs/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/cs/thunderbird-78.3.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "6723db160fbef3bba26ed9278a11b62940ae969a7969064ee96880271372c9fd"; + sha256 = "67d137a336085ffbc414d870d57152a275b082c80d240a6b9079f6573e172df0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/cy/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/cy/thunderbird-78.3.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "9942e8a0c9767eae94f007976895b4f4815cb1fcf37f422e6217fbb8569f98de"; + sha256 = "18115d42cf211dc6a90881d836c9431624d54adc30a9521d6b1a1718d95a864b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/da/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/da/thunderbird-78.3.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "7b99acc1d87ed91de39ac00f067fe1c1d7911105205f071a16b13ef43485fe6e"; + sha256 = "faea4b3a26149a036d8b44aa0709c4d04e5e917d321d13d1b00cd80b629e5627"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/de/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/de/thunderbird-78.3.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "f2f0bce89a03d00caa2087f837e3ad4ced3dc2429b1aa735be0a59d1be00dc29"; + sha256 = "1bb244032bfefc15c6e7e2a1e564fa51cfc80c18b6501f079ae65aa5bddc269d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/dsb/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/dsb/thunderbird-78.3.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "cecde5b9cf4f998090a27aa2b6e2b4277eb4d49b655c8f2ad7168b2e6029031a"; + sha256 = "687089560ea3561b21ba7f8cef77970f467b953671e5cfe956e0c0aa3dfa72cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/el/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/el/thunderbird-78.3.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "d3782c3f62efad5a34eb4d8cbad7c79b8197237bbffd5c240a5201118a0e14c8"; + sha256 = "5c8021489c7fdfea19446832b6676640134f805537474814f5a7e8d840a2e01c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/en-CA/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/en-CA/thunderbird-78.3.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "1a68fc861be0a410f9942d68fbeeeed6c4b4d22270016812d8555eaf42ac3400"; + sha256 = "a2c9c7f94191e9883f29dd43d7bee51158287cb45e3330ee5649f6553428d6f1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/en-GB/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/en-GB/thunderbird-78.3.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "c63897c877eba45ac3fe69807504bc1952d15229cb29d7cdbb2b22f467c3aeb0"; + sha256 = "6afea217b721756cc1ebfd7b99e86a2af239855ef1fe04d6e7fe9e00e00f787c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/en-US/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/en-US/thunderbird-78.3.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "108633517e71d5c1388f96c745e42e486018fbaa4cc231dc1a691be95da0cea8"; + sha256 = "24ae6fe44729cad965c36c8294b00831f426a815bda43bd39fb6e4ed8248a611"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/es-AR/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/es-AR/thunderbird-78.3.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "019b78da554ffb83d5e7ebf513f57e70c6dd845e1fa2127df6cb35b8fa84199e"; + sha256 = "3fd89cac92b8ae97766b56a84d0e8a16f51966cd77a8963ab92b5706cb8fafce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/es-ES/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/es-ES/thunderbird-78.3.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "1a56f90103ce912ea206ac9670027ea42e3e7c675cd9051e318613cedc0d5377"; + sha256 = "5227c2e2624bbc0ff3ec35be01ed42579c280ccbc5b2ab195aca3a6a760bb944"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/et/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/et/thunderbird-78.3.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "3aa3d6dcc23270da0289c68df54938877a7e1c65528916886ccf1362378b19d0"; + sha256 = "1991aa5a22f7a4f6435ed9a116cbbc1b87eccf957f1401b6f20af3ae67b1b3fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/eu/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/eu/thunderbird-78.3.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "37f54a858ebc14a6044c5fa4a2f5114523764873f694a1013fe56ebebc500aef"; + sha256 = "b9a6cdbd518ab307c646f38757bf8f2706ad51d4dd5f5193e719e112f343f021"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/fa/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/fa/thunderbird-78.3.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "ab759709162643bdbbfa878df92232c3af15aee8692b6f105cb6e6ec6bcf657c"; + sha256 = "49805c2c97109cc22075d08503926a57910f367010a2ff8ed9c91556ad4d419b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/fi/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/fi/thunderbird-78.3.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "f5342f80e9350dc7afdb0a56c63641a85efd1f588ad753ced3320e0f7a1fe13c"; + sha256 = "ce6e16cc46ee16ca9aad6154be7442dd8bdaee09e89a75c13639f1c1979dbb57"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/fr/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/fr/thunderbird-78.3.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "fdb3b58430eb8200660dd893e1d1620d0b07dbad461ac428a23e46704b1d2fcc"; + sha256 = "d2e4abb6fead6aeda1e8172c04ce7b809bfa8038ffaec89431791422e70b8932"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/fy-NL/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/fy-NL/thunderbird-78.3.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "ad84bbc708c96694389669d5845482604dbd6de579c4ecba975285c70fb25076"; + sha256 = "6286b7bdee544c51137c2bdc423eb72523b20ddde3eb4bee7b4ab575aebf30fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/ga-IE/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/ga-IE/thunderbird-78.3.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "040808951204a96b2990242c4adac630a036654de76f040ced8052db9ff7656c"; + sha256 = "b145a9b44cbafce2ebc22f4454ee6d4017c531918dd690598eb421822f4b0548"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/gd/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/gd/thunderbird-78.3.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "8f5ff190ad535f2fea08458f643fc13f11368049a8a0558e46743880fcc568b0"; + sha256 = "c0835ac49602ad6de4d37e016d40f51268bf3e43ff04a2bc1a83c5f7f7b12556"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/gl/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/gl/thunderbird-78.3.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "3783bcb06cbaa7fb719f6fbe1a1a8cfa281fc5b589977e9a8478c3ba8d04c629"; + sha256 = "22c5cfdfb8c64d18d10e2c839166ffbdb21b54d4bcebb51bb7bcaec21a3efdbb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/he/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/he/thunderbird-78.3.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "32bd0c54176361e06007e8985630462575778e44a613b114b0c3a36a8a9f075f"; + sha256 = "85f2170d4f4e20f91631a717bf78f28ac7ca45d47bb4fbfef3e56aeba291fbfc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/hr/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/hr/thunderbird-78.3.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "983a8a2c55a34dc72cc2539fcfa17f92d83357d54d5113add5c8e54bf5f2a925"; + sha256 = "2aa8960e96ebbb32be8f019f30d9eca73f69aefef0989b760223569ed8e1bca6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/hsb/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/hsb/thunderbird-78.3.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "ca1ec4a17990de8f4ce9a6c1596fd2f11bb711960c6abec9a75f23901c770d02"; + sha256 = "0c1f3803399da44d1c518057f191c3a544a3a3af3e2893be44e386edd43a5ae2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/hu/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/hu/thunderbird-78.3.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "e6fd79d68470234ebb2bb4b59c3def913e94157ed79081de210bd4502b910778"; + sha256 = "2f357cb86c535ec8bbe657d6987b657ed1d0257d2c94620359cab42570d35983"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/hy-AM/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/hy-AM/thunderbird-78.3.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "58218c4522ed635509e398d7918c449cc78b1354cf4290ab8d8b2cc03ee2acd9"; + sha256 = "ab3582a00d26e83a6b01cc2daa17ab9cf9708de1e1dcf9260f827f4e3fdde100"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/id/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/id/thunderbird-78.3.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "d8c70dbb59e214878907ec174417c2333fc739c615ef6edfb9db4fbd28c0dfb2"; + sha256 = "8d5a97914ee601a47a89dd7bbe971f95a1b5bfb4a7047feb164875daa316417d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/is/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/is/thunderbird-78.3.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "b626a42e7f2d434d4dcac79462d39a1a94e5e2757431bac52f7c13f25a628e77"; + sha256 = "089b7c67b70763d3e0080aba6a7d8201cd656e2c85bfe60739ad57b569b9c54a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/it/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/it/thunderbird-78.3.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "eb948fad64a889caf8d5ce92a92805c217de3a5db8b6d098bb7505e4e1b6cc7b"; + sha256 = "45aa6b0c5d3c00812efd815e197dc35a538002c63639d3b9857ca49f8e3e3692"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/ja/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/ja/thunderbird-78.3.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "d2c053cead7dd6dd3c77d6b1f7d32c9561bc3a4f172853ae5a3f329755eb467b"; + sha256 = "ea52820e216c79d015dc8715e5341ec2fdd4c7e99f772086652721488681d69b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/ka/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/ka/thunderbird-78.3.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "b93ce14fab022013e8350a46674fd3a1d1f069927c5f18e9382eb049f6c5336d"; + sha256 = "6fc3af0c7a5b78350714d9f8f640f71c7094cc77590038cb6e817bbc40ccd74b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/kab/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/kab/thunderbird-78.3.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "fd410f8733cbced19e7e67bb6ad00fb4623dbbff45e0dded0955e9d19d144d35"; + sha256 = "2b387a1fec481a3a98c0a62b3bcc06cf83c1b8504b46b89d1bec12572252db6e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/kk/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/kk/thunderbird-78.3.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "68434c73c46a483eafe733e269e8a7444e4dc187cc75dde5d60e51135479ccae"; + sha256 = "55f5d12ac7b5c0aee1d1d616a871f9c7ed3f5bd882acb9fd9538a3d29a0e58ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/ko/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/ko/thunderbird-78.3.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "2f2654b33923e1c0fe56e190098aed6ba72e62f17c4721d770c9cbbc42525d5f"; + sha256 = "8090cf9a8ce14dfe2dfd65b985501ab9580ca28f923377dca8a57b0529b0eb23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/lt/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/lt/thunderbird-78.3.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "b0e4dad1b445254e8e7e216a158331be85d14f80126d3be3299842e5776f1bb7"; + sha256 = "17584b8859a7356022a39b14fe2ee81f5b1d37df3ef0fc9e2caeae297bff61ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/ms/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/ms/thunderbird-78.3.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "be462abb580a1fff08dd481836bbbb0b975870e31d94b68f1116b8138d00290a"; + sha256 = "0a0119c8f5f458003aec3d4b933d9f4f1c9d7dca30a25886ec11079906a327a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/nb-NO/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/nb-NO/thunderbird-78.3.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "aaa8f4838cb41d1760fc9aab268bea62e87fdaf1fcb574c93c9d0c80ecc00222"; + sha256 = "d22e4ff9b10f278fa382a6e045790231fcdca2b0adfb5678d50963afce2c1cad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/nl/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/nl/thunderbird-78.3.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "6075322c01ddf976848d6f38fabaf3c5ab76a8f8ce81335cc5b1d4eb7f831b6f"; + sha256 = "882d4eec92d78f61b3fac34277bef4d9f331bfafc7c80fcd4518862a4e96ea7e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/nn-NO/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/nn-NO/thunderbird-78.3.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "d8ac0a301b41959150ec6bc53f3d28ddbde7d4936acf136de0ff0191fbfed3be"; + sha256 = "b97c95e6e483185ae010d21ce9c977ef71209363ceba56a91ebbf26e62febda6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/pa-IN/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/pa-IN/thunderbird-78.3.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "a0b254ab8f0cb5114fa5600ad0e03603f2df9d22c80c2264f78857b57d42a5b2"; + sha256 = "804f3ea53314ff6ea73d16a7b46f37e603161bdcd60272d7fbe1ce16a3588d62"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/pl/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/pl/thunderbird-78.3.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "630733fd1defa6fcb8b7fab780e47d33fa24262f17b81e2a15edeff70ba79f1f"; + sha256 = "faedc7b47d029583c3e1d2549b3f85ed37d933e545aeb5782b6c7db59cda71e1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/pt-BR/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/pt-BR/thunderbird-78.3.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "17b709dc483f81a1b53ad3c4d12603c715c30f8577718a9e22555623abbc45d7"; + sha256 = "4b1dfb1ff39d6200502746ffbdd1c97267c496276d6d019f27f8788be67c8dbc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/pt-PT/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/pt-PT/thunderbird-78.3.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "3e028eafe3c2c790694a2e5d6102742f61dc0833adcf0c7c21c0dd9ff33ed8e0"; + sha256 = "ca48dea62d3934197317e737a68ed685d60fcd21274022fbf74956e7b5767b26"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/rm/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/rm/thunderbird-78.3.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "887f6910a03d0f479a510710ffc390d0faad8287c67c88e958214d187453637e"; + sha256 = "2c71fcd755e02377499ee364c5777c9dd02e856de1923417fd1caa22a5fbae72"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/ro/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/ro/thunderbird-78.3.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "a7fe5af31f241884f0b8a3781997396b18118e98b55ee298d335be263bdf533d"; + sha256 = "0c28dd6d2345432beba854984384c7ef48eb33e93860ce601f977ba95286837e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/ru/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/ru/thunderbird-78.3.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "68d7ca9978f743ea4e1fab5191fb3aeedcd9b448dc14ae3a9328cb61d3307ee8"; + sha256 = "98b29b6d65f93a265a1b77a717b49445f8a51209a1bd83a160ecb51ff4217a91"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/si/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/si/thunderbird-78.3.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "88f84c3ef7f43a529d664693bd6c37b07b88121af64d7b2d8438e6fa6a8364fd"; + sha256 = "c8b63b0fe37222493b1f35fbdd9aeedd4af9bb10585ed9ec2f2dc1e2c52eba40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/sk/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/sk/thunderbird-78.3.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "af9513a838b0ccef884a7cfe852acdae6bb152997ac0cce220eea1a185f04ef4"; + sha256 = "c9d7715b8330e35ebefc386d8258c6ab00a12f14400fe01ad61037cd396b2cfa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/sl/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/sl/thunderbird-78.3.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "612d5ea2231e237942e56c12e8f833f39a2e0ac337965b32c49eadcb9f66dae8"; + sha256 = "2403387bbaab64e925c2729076ea039206d8b4e6964e7aa825877074eb6ccf57"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/sq/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/sq/thunderbird-78.3.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "5d62a217f4c91aa5cc81853ad608f963c68e6c7732fffc631aaf20b7599f353e"; + sha256 = "a8e83d18620b057c6981a170fafcef44f0e7800168c305abeb3ed6c5a936220c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/sr/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/sr/thunderbird-78.3.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "31901b595a8a5ccd6d114398a796f29e37c362f1c56688dc26df3b40c85e5710"; + sha256 = "6cfd9ddd429240f48c8f478d785b881047e262ebe6d3460f7780f57248b22da6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/sv-SE/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/sv-SE/thunderbird-78.3.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "d8f22eac71cea9958750c7ea36002dc84b2ba6095982c068bd111b4bd68420c6"; + sha256 = "e8db182f239050020f91b1aab23514245c04d3aab977df6215165c401c010ce0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/th/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/th/thunderbird-78.3.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "1379d5f81865bc0650da1d593e460838a08d03672ef10fe702ca02593c8a1d77"; + sha256 = "20d5cc43be200cc6359c56a3988f76583fb6887834bed0512125296f2c25b0f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/tr/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/tr/thunderbird-78.3.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "fd58b2af0a6e2f590a44431a1eb2f8eb37e22fa3ae386cf40c7f390305694d08"; + sha256 = "8e74feb16b9c23689fec026e88a1749bc2c78fba0cf048db0228168f93fa7d2c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/uk/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/uk/thunderbird-78.3.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "7a22516d75265f612c4fdd37e1adceb515137451654feba80d5061051d68fb84"; + sha256 = "6bd6d8c2b346adf03f0a12a84cdcd68b7e3d7e4c1caa7ebf23f5ecd90b0c0513"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/uz/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/uz/thunderbird-78.3.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "bd0027e0a6db2b4334088ea86206854cc2df5e4804e3342d2f030b8de122665e"; + sha256 = "b227ca8402b6ba1db029a4964ca4e3a28403ce5ade7bcb6cb9157665759426aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/vi/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/vi/thunderbird-78.3.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "2bb0f40007513364699b7a5b2b14559d4e6b7126bcbaab6a9c4517894004e61c"; + sha256 = "09962111baf14ad41f6277b3f625a38458ba07fbdbf17673807f29dd347e8eac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/zh-CN/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/zh-CN/thunderbird-78.3.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "e8fcbc19671ee573343d69eacff419655c96dff50048c8fccdeed14f713f6482"; + sha256 = "b86d0b18a3d87dc3fd018672f3bb8fa8eb5105fc56d1c4161ce324c6babc8286"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.0/linux-i686/zh-TW/thunderbird-78.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.1/linux-i686/zh-TW/thunderbird-78.3.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "73593d47d96de6d38cb14ea3be88ccd703c9161dfdb17620653f2ba85ed180a5"; + sha256 = "4e09553f18e9955b7072326b2e7f40bbb2e19f13f137742a0d9b29664f570d8a"; } ]; } From 7e2a0491e1af7f6990331d7a5bed42e5a88109e1 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 26 Sep 2020 12:12:53 +0200 Subject: [PATCH 187/293] neatvnc: 0.3.0 -> 0.3.1 --- pkgs/development/libraries/neatvnc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/neatvnc/default.nix b/pkgs/development/libraries/neatvnc/default.nix index 2eba3ca8bc1..dfc1a157158 100644 --- a/pkgs/development/libraries/neatvnc/default.nix +++ b/pkgs/development/libraries/neatvnc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "neatvnc"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "0zx9f9h1hqcyh3sf6k0scny2039p1lwdqbwqi8ppwwhjl2fzniv8"; + sha256 = "1209dzlmqf5p1cqzf6kss5inwgj644ynrh9qgpjf1kskqwfxn1c4"; }; postPatch = '' From 2e6844040e38148a2414e9226a594a2320262596 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 26 Sep 2020 12:13:32 +0200 Subject: [PATCH 188/293] signal-desktop: 1.36.2 -> 1.36.3 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 87ca24db8b9..85f71fd0ebc 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 = "1.36.2"; # Please backport all updates to the stable channel. + version = "1.36.3"; # 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 = "08273a395cjsiqkgalxj3flh268wi3c6dbz52kxrl6z9gkrnrp3r"; + sha256 = "1b75b5li0im2mwskkf1xsa6sjprl56isvcz2iy1gc48bambc72pc"; }; nativeBuildInputs = [ From e1b7af630fb864311f8e21d517179780b3bb0ccb Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 25 Sep 2020 05:38:03 -0500 Subject: [PATCH 189/293] cantata: use libvlc --- pkgs/applications/audio/cantata/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 95b7dd18425..df19ac94228 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -16,7 +16,7 @@ , withDevices ? true, udisks2 , withDynamic ? true , withHttpServer ? true -, withLibVlc ? false, vlc +, withLibVlc ? false, libvlc , withStreams ? true }: @@ -71,7 +71,7 @@ in mkDerivation { ++ lib.optional withMtp libmtp ++ lib.optional withMusicbrainz libmusicbrainz5 ++ lib.optional withUdisks udisks2 - ++ lib.optional withLibVlc vlc; + ++ lib.optional withLibVlc libvlc; nativeBuildInputs = [ cmake pkgconfig qttools ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d1bd25da33..2fc82e4c12b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2634,9 +2634,7 @@ in davix = callPackage ../tools/networking/davix { }; - cantata = libsForQt5.callPackage ../applications/audio/cantata { - inherit vlc; - }; + cantata = libsForQt5.callPackage ../applications/audio/cantata { }; can-utils = callPackage ../os-specific/linux/can-utils { }; From ebe4cc8870c460c1fc7f34c7a74d1fb308278c0a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 25 Sep 2020 10:49:40 -0500 Subject: [PATCH 190/293] megaglest: use libvlc --- pkgs/games/megaglest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index d5129818cb2..c34ca5dee95 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, pkgconfig, git, curl, SDL2, xercesc, openal, lua, vlc +{ stdenv, cmake, pkgconfig, git, curl, SDL2, xercesc, openal, lua, libvlc , libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng , fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, libGLU, glib , fetchFromGitHub @@ -29,7 +29,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake git curl SDL2 xercesc openal lua libpng libjpeg vlc wxGTK + buildInputs = [ cmake git curl SDL2 xercesc openal lua libpng libjpeg libvlc wxGTK glib cppunit fontconfig freetype ftgl glew libogg libvorbis makeWrapper libGLU ]; configurePhase = '' From 270d8a04099018055c669fa87b8e1292e924ed68 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 25 Sep 2020 10:50:44 -0500 Subject: [PATCH 191/293] obs-studio: use libvlc --- pkgs/applications/video/obs-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 8a2cd172822..5fe10b39a79 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -20,7 +20,7 @@ , xorg , makeWrapper , pkgconfig -, vlc +, libvlc , mbedtls , scriptingSupport ? true @@ -65,7 +65,7 @@ in mkDerivation rec { qtsvg speex x264 - vlc + libvlc makeWrapper mbedtls ] @@ -84,7 +84,7 @@ in mkDerivation rec { postInstall = '' wrapProgram $out/bin/obs \ - --prefix "LD_LIBRARY_PATH" : "${xorg.libX11.out}/lib:${vlc}/lib" + --prefix "LD_LIBRARY_PATH" : "${xorg.libX11.out}/lib:${libvlc}/lib" ''; postFixup = stdenv.lib.optionalString stdenv.isLinux '' From b5a5ed37359d067f3277811e021707888976854c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 25 Sep 2020 10:51:04 -0500 Subject: [PATCH 192/293] hdhomerun-config-gui: remove unused argument: vlc --- pkgs/applications/video/hdhomerun-config-gui/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/hdhomerun-config-gui/default.nix b/pkgs/applications/video/hdhomerun-config-gui/default.nix index a147de52da8..91feb178ca0 100644 --- a/pkgs/applications/video/hdhomerun-config-gui/default.nix +++ b/pkgs/applications/video/hdhomerun-config-gui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libhdhomerun, vlc, gcc, gnumake, pkg-config, gtk2 }: +{ stdenv, fetchurl, libhdhomerun, gcc, gnumake, pkg-config, gtk2 }: stdenv.mkDerivation rec { pname = "hdhomerun-config-gui"; From b3ab15a05793515f3b50205204c74082b98254df Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 25 Sep 2020 10:53:28 -0500 Subject: [PATCH 193/293] strawberry: use libvlc --- pkgs/applications/audio/strawberry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index f278b68b922..d6428e40312 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -30,7 +30,7 @@ , withGstreamer ? true , gst_all_1 ? null , withVlc ? true -, vlc ? null +, libvlc ? null }: mkDerivation rec { @@ -75,7 +75,7 @@ mkDerivation rec { gst-plugins-good gst-plugins-ugly ]) - ++ lib.optional withVlc vlc; + ++ lib.optional withVlc libvlc; nativeBuildInputs = [ cmake ninja pkgconfig qttools ]; From c70831a9fb5f686e36c40664da03b5e10f7e7167 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 25 Sep 2020 10:53:34 -0500 Subject: [PATCH 194/293] tribler: use libvlc --- pkgs/applications/networking/p2p/tribler/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index ed1129b238a..5cab23ecd71 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgs, python3Packages, makeWrapper -, enablePlayer ? true, vlc ? null, qt5, lib }: +, enablePlayer ? true, libvlc ? null, qt5, lib }: stdenv.mkDerivation rec { pname = "tribler"; @@ -50,9 +50,9 @@ stdenv.mkDerivation rec { postPatch = '' ${stdenv.lib.optionalString enablePlayer '' - substituteInPlace "./TriblerGUI/vlc.py" --replace "ctypes.CDLL(p)" "ctypes.CDLL('${vlc}/lib/libvlc.so')" + substituteInPlace "./TriblerGUI/vlc.py" --replace "ctypes.CDLL(p)" "ctypes.CDLL('${libvlc}/lib/libvlc.so')" substituteInPlace "./TriblerGUI/widgets/videoplayerpage.py" --replace "if vlc and vlc.plugin_path" "if vlc" - substituteInPlace "./TriblerGUI/widgets/videoplayerpage.py" --replace "os.environ['VLC_PLUGIN_PATH'] = vlc.plugin_path" "os.environ['VLC_PLUGIN_PATH'] = '${vlc}/lib/vlc/plugins'" + substituteInPlace "./TriblerGUI/widgets/videoplayerpage.py" --replace "os.environ['VLC_PLUGIN_PATH'] = vlc.plugin_path" "os.environ['VLC_PLUGIN_PATH'] = '${libvlc}/lib/vlc/plugins'" ''} ''; @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { --run 'cd $_TRIBLERPATH' \ --add-flags "-O $out/run_tribler.py" \ ${stdenv.lib.optionalString enablePlayer '' - --prefix LD_LIBRARY_PATH : ${vlc}/lib + --prefix LD_LIBRARY_PATH : ${libvlc}/lib ''} mkdir -p $out/share/applications $out/share/icons $out/share/man/man1 From ff33525cc9b92f833bee0cddebdd77ee4d589c40 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 26 Sep 2020 10:55:06 +0000 Subject: [PATCH 195/293] radare2-cutter: 1.11.1 -> 1.12.0 --- pkgs/development/tools/analysis/radare2/cutter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2/cutter.nix b/pkgs/development/tools/analysis/radare2/cutter.nix index 5fde4e1f433..1cef52a3444 100644 --- a/pkgs/development/tools/analysis/radare2/cutter.nix +++ b/pkgs/development/tools/analysis/radare2/cutter.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "radare2-cutter"; - version = "1.11.1"; + version = "1.12.0"; src = fetchFromGitHub { owner = "radareorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "0kscl0yf5qxacqnz3pp47r94yiwnc4rwirnr2x580z10fwhsivki"; + sha256 = "0ljj3j3apbbw628n2nyrxpbnclixx20bqjxm0xwggqzz9vywsar0"; }; postUnpack = "export sourceRoot=$sourceRoot/src"; From 99f235b3457e6a74b8e9c679474cb54b3adbabbe Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sat, 26 Sep 2020 07:11:39 -0400 Subject: [PATCH 196/293] generate-expr-from-tarballs.pl: quote URLs per RFC 0045 (#98751) https://github.com/NixOS/rfcs/pull/45 --- pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 21e61bc54d0..8bed3fc6d09 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -307,7 +307,7 @@ foreach my $pkg (sort (keys %pkgURLs)) { name = "$pkgNames{$pkg}"; builder = ./builder.sh; src = fetchurl { - url = $pkgURLs{$pkg}; + url = "$pkgURLs{$pkg}"; sha256 = "$pkgHashes{$pkg}"; }; hardeningDisable = [ "bindnow" "relro" ]; From 06697c7e29b98e8d65565182fb9b112d0e2ed044 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 26 Sep 2020 06:32:35 -0500 Subject: [PATCH 197/293] vlc: fix meta.broken --- pkgs/applications/video/vlc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 365eb8cd991..965a5ff3253 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -99,6 +99,6 @@ stdenv.mkDerivation rec { homepage = "http://www.videolan.org/vlc/"; license = licenses.lgpl21Plus; platforms = platforms.linux; - broken = versionAtLeast qtbase.version "5.15"; + broken = if qtbase != null then versionAtLeast qtbase.version "5.15" else false; }; } From 22301b66cd7aef888f46cdaa4dfe5042a06fcb38 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 26 Sep 2020 12:08:13 +0200 Subject: [PATCH 198/293] freecad: 0.18.4 -> unstable-2020-09-25 --- .../applications/graphics/freecad/default.nix | 21 ++++++------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 657caeca8b3..f9322add5c0 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,5 +1,5 @@ { stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d, -xercesc, ode, eigen, qtbase, qttools, qtwebkit, wrapQtAppsHook, +xercesc, ode, eigen, qtbase, qttools, qtwebengine, qtxmlpatterns, wrapQtAppsHook, opencascade-occt, gts, hdf5, vtk, medfile, zlib, python3Packages, swig, gfortran, libXmu, soqt, libf2c, libGLU, makeWrapper, pkgconfig, mpi ? null }: @@ -8,14 +8,14 @@ assert mpi != null; let pythonPackages = python3Packages; in mkDerivation rec { - pname = "freecad"; - version = "0.18.4"; + pname = "freecad-unstable"; + version = "2020-09-25"; src = fetchFromGitHub { owner = "FreeCAD"; repo = "FreeCAD"; - rev = version; - sha256 = "1phs9a0px5fnzpyx930cz39p5dis0f0yajxzii3c3sazgkzrd55s"; + rev = "7616153b3c31ace006169cdc2fdafab484498858"; + sha256 = "1vffvzv3gkndfj2k8ik0afyk9rgngnr4aai5py66qd63qd7kmxch"; }; nativeBuildInputs = [ @@ -29,20 +29,11 @@ in mkDerivation rec { buildInputs = [ cmake coin3d xercesc ode eigen opencascade-occt gts zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile - libGLU libXmu qtbase qttools qtwebkit + libGLU libXmu qtbase qttools qtwebengine qtxmlpatterns ] ++ (with pythonPackages; [ matplotlib pycollada shiboken2 pyside2 pyside2-tools pivy python boost ]); - # Fix missing app icon on Wayland. Has been upstreamed and should be safe to - # remove in versions >= 0.19 - patches = [ - (fetchpatch { - url = "https://github.com/FreeCAD/FreeCAD/commit/c4d2a358ca125d51d059dfd72dcbfba326196dfc.patch"; - sha256 = "0yqc9zrxgi2c2xcidm8wh7a9yznkphqvjqm9742qm5fl20p8gl4h"; - }) - ]; - cmakeFlags = [ "-DBUILD_QT5=ON" "-DSHIBOKEN_INCLUDE_DIR=${pythonPackages.shiboken2}/include" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 010309f9d0d..48a307f17b3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20803,8 +20803,6 @@ in freecad = libsForQt514.callPackage ../applications/graphics/freecad { mpi = openmpi; - # pyside2 5.12 is broken under python 3.8 - python3Packages = python37Packages; }; freemind = callPackage ../applications/misc/freemind { From 11dd6f4584da61c336c83b046aab54b5f8b59398 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 26 Sep 2020 12:52:23 +0200 Subject: [PATCH 199/293] coin3d: unstable-2019-06-12 -> 4.0.0 --- pkgs/development/libraries/coin3d/default.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/coin3d/default.nix b/pkgs/development/libraries/coin3d/default.nix index 634ac27058b..7fd67637253 100644 --- a/pkgs/development/libraries/coin3d/default.nix +++ b/pkgs/development/libraries/coin3d/default.nix @@ -1,14 +1,14 @@ -{ fetchFromBitbucket, stdenv, boost, cmake, libGL, libGLU }: +{ fetchFromGitHub, stdenv, boost, cmake, libGL, libGLU }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "coin"; - version = "unstable-2019-06-12"; + version = "4.0.0"; - src = fetchFromBitbucket { - owner = "Coin3D"; + src = fetchFromGitHub { + owner = "coin3d"; repo = "coin"; - rev = "8d860d7ba112b22c4e9b289268fd8b3625ab81d3"; - sha256 = "1cpncljqvw28k5wvpgchv593nayhby5gwpvbnyllc9hb9ms816xn"; + rev = "Coin-${version}"; + sha256 = "1ayg0hl8wanhadahm5xbghghxw1qjwqbrs3dl3ngnff027hsyf8p"; }; postPatch = '' @@ -18,11 +18,11 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ boost libGL libGLU ]; - meta = { - homepage = "https://bitbucket.org/Coin3D/coin/wiki/Home"; - license = stdenv.lib.licenses.gpl2Plus; + meta = with stdenv.lib; { + homepage = "https://github.com/coin3d/coin"; + license = licenses.bsd3; description = "High-level, retained-mode toolkit for effective 3D graphics development"; - maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ gebner viric ]; + platforms = platforms.linux; }; } From 0b536960acc8389dd54e63389afbe1982688fc52 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 26 Sep 2020 13:09:06 +0200 Subject: [PATCH 200/293] libsForQt5.soqt: 1.6.0a -> 1.6.0 --- pkgs/development/libraries/soqt/default.nix | 25 +++++++++------------ 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix index 7a4e6c45cf2..de11407e12b 100644 --- a/pkgs/development/libraries/soqt/default.nix +++ b/pkgs/development/libraries/soqt/default.nix @@ -1,26 +1,23 @@ -{ fetchhg, stdenv, coin3d, qtbase, cmake, pkgconfig }: +{ fetchurl, stdenv, coin3d, qtbase, cmake, pkgconfig }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "soqt"; - version = "1.6.0a"; + version = "1.6.0"; - src = fetchhg { - url = "https://bitbucket.org/Coin3D/soqt"; - rev = "5f2afb4890e0059eb27e1671f980d10ebfb9e762"; - sha256 = "0j9lsci4cx95v16l0jaky0vzh4lbdliwz7wc17442ihjaqiqmv8m"; - fetchSubrepos = true; + src = fetchurl { + url = "https://github.com/coin3d/soqt/releases/download/SoQt-${version}/soqt-${version}-src.tar.gz"; + sha256 = "07qfljy286vb7y1p93205zn9sp1lpn0rcrqm5010gj87kzsmllwz"; }; buildInputs = [ coin3d qtbase ]; nativeBuildInputs = [ cmake pkgconfig ]; - meta = { - homepage = "https://bitbucket.org/Coin3D/coin/wiki/Home"; - license = stdenv.lib.licenses.gpl2Plus; + meta = with stdenv.lib; { + homepage = "https://github.com/coin3d/soqt"; + license = licenses.bsd3; description = "Glue between Coin high-level 3D visualization library and Qt"; - - maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ gebner viric ]; + platforms = platforms.linux; }; } From 96dfa21d37d1e29bfee1057571c7546c8b0684df Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 26 Sep 2020 12:53:25 +0200 Subject: [PATCH 201/293] python3Packages.pivy: 0.6.5a2 -> 0.6.5 --- pkgs/development/python-modules/pivy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix index 8f1b7de92b9..3d3f93f21a2 100644 --- a/pkgs/development/python-modules/pivy/default.nix +++ b/pkgs/development/python-modules/pivy/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pivy"; - version = "0.6.5a2"; + version = "0.6.5"; src = fetchFromGitHub { - owner = "FreeCAD"; + owner = "coin3d"; repo = "pivy"; rev = version; - sha256 = "1w03jaha36bjyfaz8hchnv8yrkm5715w15crhd3qrlagz8fs38hm"; + sha256 = "0vids7sxk8w5vr73xdnf8xdci71a7syl6cd35aiisppbqyyfmykx"; }; nativeBuildInputs = with pkgs; [ From d0e502eb700669d8232a8517af4b58818dc14207 Mon Sep 17 00:00:00 2001 From: malte-v <34393802+malte-v@users.noreply.github.com> Date: Sat, 26 Sep 2020 13:57:32 +0200 Subject: [PATCH 202/293] libobjc2: unmark aarch64 as bad platform --- pkgs/desktops/gnustep/libobjc2/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/desktops/gnustep/libobjc2/default.nix b/pkgs/desktops/gnustep/libobjc2/default.nix index 0124e91a9b7..8cf47d1fb7b 100644 --- a/pkgs/desktops/gnustep/libobjc2/default.nix +++ b/pkgs/desktops/gnustep/libobjc2/default.nix @@ -21,6 +21,5 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ ashalkhakov matthewbauer ]; platforms = platforms.unix; - badPlatforms = [ "aarch64-linux" ]; }; } From d37d97660106298c0fc20b5d7c1266df11cf4da5 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 26 Sep 2020 13:56:42 +0200 Subject: [PATCH 203/293] gotify-cli: 2.1.1 -> 2.2.0 https://github.com/gotify/cli/releases/tag/v2.2.0 --- pkgs/tools/misc/gotify-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/gotify-cli/default.nix b/pkgs/tools/misc/gotify-cli/default.nix index 8d81713e7b1..cd60f0e98fa 100644 --- a/pkgs/tools/misc/gotify-cli/default.nix +++ b/pkgs/tools/misc/gotify-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gotify-cli"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "gotify"; repo = "cli"; rev = "v${version}"; - sha256 = "131gs6xzfggnrzq5jgyky23zvcmhx3q3hd17xvqxd02s2i9x1mg4"; + sha256 = "0hgh1i8rdmf12qmk66cgksv8hz5qzkfbfb6cfmrkhbq765xkm4ir"; }; - vendorSha256 = "1lhhsf944gm1p6qxn05g2s3hdnra5dggj7pdrdq6qr6r2xg7f5qh"; + vendorSha256 = "1l47s0h0v4cgqcsm5008cknvfa4vnv6f7n43d8ga0xq5ikqqzmja"; doCheck = false; From 740f01413b5874a34803795124f51b57b9d7975d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 26 Sep 2020 13:57:16 +0200 Subject: [PATCH 204/293] packer: 1.6.2 -> 1.6.3 https://github.com/hashicorp/packer/releases/tag/v1.6.3 --- pkgs/development/tools/packer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 909e821a6d1..1fc2fcfe5bf 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "packer"; - version = "1.6.2"; + version = "1.6.3"; goPackagePath = "github.com/hashicorp/packer"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "0kr9whv3s0f8866yjmwg311j3kcj29bp5xwpnv43ama4m1mq3bm7"; + sha256 = "0f4an5ghb6l83za077019bgndvpf2xdb3xn4ryqw1xf84hvk5vwx"; }; meta = with stdenv.lib; { From 78c10375d8933da2ca8a61849da4555c751fc927 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 26 Sep 2020 14:26:16 +0200 Subject: [PATCH 205/293] opencascade-occt730: init at 7.3.0p3 --- .../libraries/opencascade-occt/7.3.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/opencascade-occt/7.3.nix diff --git a/pkgs/development/libraries/opencascade-occt/7.3.nix b/pkgs/development/libraries/opencascade-occt/7.3.nix new file mode 100644 index 00000000000..83b1cfc2add --- /dev/null +++ b/pkgs/development/libraries/opencascade-occt/7.3.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, fetchpatch, cmake, ninja, tcl, tk, + libGL, libGLU, libXext, libXmu, libXi }: + +stdenv.mkDerivation rec { + pname = "opencascade-occt"; + version = "7.3.0p3"; + commit = "V${builtins.replaceStrings ["."] ["_"] version}"; + + src = fetchurl { + name = "occt-${commit}.tar.gz"; + url = "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=${commit};sf=tgz"; + sha256 = "0k9c3ypcnjcilq1dhsf6xxbd52gyq4h5rchvp30k3c8ph4ris5pz"; + }; + + nativeBuildInputs = [ cmake ninja ]; + buildInputs = [ tcl tk libGL libGLU libXext libXmu libXi ]; + + meta = with stdenv.lib; { + description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation"; + homepage = "https://www.opencascade.org/"; + license = licenses.lgpl21; # essentially... + # The special exception defined in the file OCCT_LGPL_EXCEPTION.txt + # are basically about making the license a little less share-alike. + maintainers = with maintainers; [ amiloradovsky ]; + platforms = platforms.all; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 48a307f17b3..f2ca97695b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14671,6 +14671,7 @@ in inherit (darwin.apple_sdk.frameworks) OpenCL Cocoa; }; opencascade-occt = callPackage ../development/libraries/opencascade-occt { }; + opencascade-occt730 = callPackage ../development/libraries/opencascade-occt/7.3.nix { }; opencl-headers = callPackage ../development/libraries/opencl-headers { }; From 58121fe1b085e201593f38e3b5eda0407dbd8e98 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 26 Sep 2020 14:26:53 +0200 Subject: [PATCH 206/293] freecadStable: init at 0.18.4 --- pkgs/applications/graphics/freecad/stable.nix | 85 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++ 2 files changed, 90 insertions(+) create mode 100644 pkgs/applications/graphics/freecad/stable.nix diff --git a/pkgs/applications/graphics/freecad/stable.nix b/pkgs/applications/graphics/freecad/stable.nix new file mode 100644 index 00000000000..657caeca8b3 --- /dev/null +++ b/pkgs/applications/graphics/freecad/stable.nix @@ -0,0 +1,85 @@ +{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d, +xercesc, ode, eigen, qtbase, qttools, qtwebkit, wrapQtAppsHook, +opencascade-occt, gts, hdf5, vtk, medfile, zlib, python3Packages, swig, +gfortran, libXmu, soqt, libf2c, libGLU, makeWrapper, pkgconfig, mpi ? null }: + +assert mpi != null; + +let + pythonPackages = python3Packages; +in mkDerivation rec { + pname = "freecad"; + version = "0.18.4"; + + src = fetchFromGitHub { + owner = "FreeCAD"; + repo = "FreeCAD"; + rev = version; + sha256 = "1phs9a0px5fnzpyx930cz39p5dis0f0yajxzii3c3sazgkzrd55s"; + }; + + nativeBuildInputs = [ + cmake + ninja + pkgconfig + pythonPackages.pyside2-tools + wrapQtAppsHook + ]; + + buildInputs = [ + cmake coin3d xercesc ode eigen opencascade-occt gts + zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile + libGLU libXmu qtbase qttools qtwebkit + ] ++ (with pythonPackages; [ + matplotlib pycollada shiboken2 pyside2 pyside2-tools pivy python boost + ]); + + # Fix missing app icon on Wayland. Has been upstreamed and should be safe to + # remove in versions >= 0.19 + patches = [ + (fetchpatch { + url = "https://github.com/FreeCAD/FreeCAD/commit/c4d2a358ca125d51d059dfd72dcbfba326196dfc.patch"; + sha256 = "0yqc9zrxgi2c2xcidm8wh7a9yznkphqvjqm9742qm5fl20p8gl4h"; + }) + ]; + + cmakeFlags = [ + "-DBUILD_QT5=ON" + "-DSHIBOKEN_INCLUDE_DIR=${pythonPackages.shiboken2}/include" + "-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken" + ("-DPYSIDE_INCLUDE_DIR=${pythonPackages.pyside2}/include" + + ";${pythonPackages.pyside2}/include/PySide2/QtCore" + + ";${pythonPackages.pyside2}/include/PySide2/QtWidgets" + + ";${pythonPackages.pyside2}/include/PySide2/QtGui" + ) + "-DPYSIDE_LIBRARY=PySide2::pyside2" + ]; + + # This should work on both x86_64, and i686 linux + preBuild = '' + export NIX_LDFLAGS="-L${gfortran.cc}/lib64 -L${gfortran.cc}/lib $NIX_LDFLAGS"; + ''; + + # Their main() removes PYTHONPATH=, and we rely on it. + preConfigure = '' + sed '/putenv("PYTHONPATH/d' -i src/Main/MainGui.cpp + + qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH") + ''; + + qtWrapperArgs = [ + "--set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1" + ]; + + postFixup = '' + mv $out/share/doc $out + ''; + + meta = with stdenv.lib; { + description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler"; + homepage = "https://www.freecadweb.org/"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ viric gebner ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2ca97695b4..9725480b5d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20805,6 +20805,11 @@ in freecad = libsForQt514.callPackage ../applications/graphics/freecad { mpi = openmpi; }; + freecadStable = libsForQt514.callPackage ../applications/graphics/freecad/stable.nix { + mpi = openmpi; + opencascade-occt = opencascade-occt730; + python3Packages = python37Packages; + }; freemind = callPackage ../applications/misc/freemind { jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 From 40d389028c6ddbd8f2af45f483c4a9f312959fb7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 24 Sep 2020 07:26:42 +0200 Subject: [PATCH 207/293] =?UTF-8?q?ocamlPackages.fpath:=200.7.2=20?= =?UTF-8?q?=E2=86=92=200.7.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/fpath/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/fpath/default.nix b/pkgs/development/ocaml-modules/fpath/default.nix index 02b125642cc..4694e3ac637 100644 --- a/pkgs/development/ocaml-modules/fpath/default.nix +++ b/pkgs/development/ocaml-modules/fpath/default.nix @@ -1,10 +1,14 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, astring }: +if !stdenv.lib.versionAtLeast ocaml.version "4.03" +then throw "fpath is not available for OCaml ${ocaml.version}" +else + stdenv.mkDerivation { - name = "ocaml${ocaml.version}-fpath-0.7.2"; + name = "ocaml${ocaml.version}-fpath-0.7.3"; src = fetchurl { - url = "https://erratique.ch/software/fpath/releases/fpath-0.7.2.tbz"; - sha256 = "1hr05d8bpqmqcfdavn4rjk9rxr7v2zl84866f5knjifrm60sxqic"; + url = "https://erratique.ch/software/fpath/releases/fpath-0.7.3.tbz"; + sha256 = "03z7mj0sqdz465rc4drj1gr88l9q3nfs374yssvdjdyhjbqqzc0j"; }; buildInputs = [ ocaml findlib ocamlbuild topkg ]; From b9377e0950ac24f5c50cc431e76985d2250c9a3a Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Sat, 26 Sep 2020 18:04:31 +0200 Subject: [PATCH 208/293] ghc8102Binary: add numactl to libPath on aarch64 Fixes: utils/ghc-cabal/dist-install/build/tmp/ghc-cabal: error while loading shared libraries: libnuma.so.1: cannot open shared object file: No such file or directory --- pkgs/development/compilers/ghc/8.10.2-binary.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.10.2-binary.nix b/pkgs/development/compilers/ghc/8.10.2-binary.nix index 87d341a10f1..26017c28fd0 100644 --- a/pkgs/development/compilers/ghc/8.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/8.10.2-binary.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl, perl, gcc -, ncurses6, gmp, glibc, libiconv +, ncurses6, gmp, glibc, libiconv, numactl , llvmPackages , ... }: @@ -13,7 +13,8 @@ let libPath = stdenv.lib.makeLibraryPath ([ ncurses6 gmp - ] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv); + ] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv + ++ stdenv.lib.optional (stdenv.hostPlatform.isAarch64) numactl); libEnvVar = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "DY" + "LD_LIBRARY_PATH"; From 680bdea2f0a573a598f9b5714623043fa3724e3e Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 26 Sep 2020 10:01:21 -0700 Subject: [PATCH 209/293] samba: 4.12.5 -> 4.12.6, fix build on darwin Upstream commit https://gitlab.com/samba-team/devel/samba/-/commit/6e263432 fixes compilation on BSD/macOS. --- pkgs/servers/samba/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 7ed1a72de0e..bfc8566f363 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -42,11 +42,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "samba"; - version = "4.12.5"; + version = "4.12.6"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; - sha256 = "05dqj5l3spa8ggw0agxa5rf8fwgiizbmbfjms46y5jla6z31rd2l"; + sha256 = "1v3cmw40csmi3jd8mhlx4bm7bk4m0426zkyin7kq11skwnsrna02"; }; outputs = [ "out" "dev" "man" ]; From 73825262f989a6884c8249abfcf6415a99232c9e Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Sat, 26 Sep 2020 14:28:47 +0200 Subject: [PATCH 210/293] Revert "haskell.ghc8102Binary: fix extra inputs" This reverts commit fb719d957f9addd3adf01ec44c0adaf68eb20282. --- pkgs/development/compilers/ghc/8.10.2-binary.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/compilers/ghc/8.10.2-binary.nix b/pkgs/development/compilers/ghc/8.10.2-binary.nix index 26017c28fd0..baa1d879b53 100644 --- a/pkgs/development/compilers/ghc/8.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/8.10.2-binary.nix @@ -2,7 +2,6 @@ , fetchurl, perl, gcc , ncurses6, gmp, glibc, libiconv, numactl , llvmPackages -, ... }: # Prebuilt only does native From bcd728c9bfade2df98888207f50e0515a3da99a1 Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Sat, 26 Sep 2020 14:29:11 +0200 Subject: [PATCH 211/293] ghc8102Binary: add to integerSimpleExcludes --- pkgs/top-level/haskell-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7a4ed975518..b21a3040c04 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -5,6 +5,7 @@ let integerSimpleExcludes = [ "ghc822Binary" "ghc865Binary" + "ghc8102Binary" "ghcjs" "ghcjs86" "integer-simple" From 99175cfbf6c75f85ac7b4c7d17a28d0b7e1e2fad Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 26 Sep 2020 12:16:38 +0100 Subject: [PATCH 212/293] pythonPackages.accupy: remove perfplot from checkInputs they were only used for performance tests that aren't useful to us - disabling these tests allows us to decouple from an unnecessary build dependency. convert to pytestCheckHook. --- .../python-modules/accupy/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/accupy/default.nix b/pkgs/development/python-modules/accupy/default.nix index f8d56159cc5..f36e12b365a 100644 --- a/pkgs/development/python-modules/accupy/default.nix +++ b/pkgs/development/python-modules/accupy/default.nix @@ -7,9 +7,8 @@ , pybind11 , pyfma , eigen -, pytest +, pytestCheckHook , matplotlib -, perfplot , isPy27 }: @@ -35,9 +34,8 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest + pytestCheckHook matplotlib - perfplot ]; postConfigure = '' @@ -49,9 +47,15 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - checkPhase = '' - pytest test + # performance tests aren't useful to us and disabling them allows us to + # decouple ourselves from an unnecessary build dep + preCheck = '' + for f in test/test*.py ; do + substituteInPlace $f --replace 'import perfplot' "" + done ''; + disabledTests = [ "test_speed_comparison1" "test_speed_comparison2" ]; + pythonImportsCheck = [ "accupy" ]; meta = with lib; { description = "Accurate sums and dot products for Python"; From 96f034655fcaa35f7f21f907c356c6569c186c96 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 26 Sep 2020 15:35:46 +0100 Subject: [PATCH 213/293] pythonPackages.snowflake-connector-python: 2.2.10 -> 2.3.2, fix build the relaxed version constraints don't seem to be specific avoidance of buggy versions, just upstream cautiously prohibiting untested versions if there *are* specific reasons, they're hidden away in upstream's jira --- .../snowflake-connector-python/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index ae280eb96cc..bdedfc0ed4b 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "2.2.10"; + version = "2.3.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0beba8eb9c1dec2782d52491d058256e1f5d9e010114a80ff3b8e3905be655fd"; + sha256 = "0as7m736wgx684wssnvhvixjkqidnhxn9i98rcdgagr67s3akfdy"; }; propagatedBuildInputs = [ @@ -57,12 +57,15 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "'cffi>=1.9,<1.14'," "'cffi~=1.9'," + --replace "'cryptography>=2.5.0,<3.0.0'," "'cryptography'," \ + --replace "'idna<2.10'," "'idna'," \ + --replace "'requests<2.24.0'," "'requests'," ''; # tests are not working # XXX: fix the tests doCheck = false; + pythonImportsCheck = [ "snowflake" "snowflake.connector" ]; meta = with lib; { description = "Snowflake Connector for Python"; From 70ae442fcfcb5eaf21ed1c2c82c17f11eedfa13e Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 26 Sep 2020 15:36:13 +0100 Subject: [PATCH 214/293] pythonPackages.snowflake-sqlalchemy: add pythonImportsCheck better than nothing --- .../development/python-modules/snowflake-sqlalchemy/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix index 4a44c320705..0eb0b6bebec 100644 --- a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix @@ -19,6 +19,8 @@ buildPythonPackage rec { snowflake-connector-python ]; + pythonImportsCheck = [ "snowflake.sqlalchemy" ]; + meta = with lib; { description = "Snowflake SQLAlchemy Dialect"; homepage = "https://www.snowflake.net/"; From 22cd2a23bf8437fc9025239b2beba8d8519c401f Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Sat, 26 Sep 2020 18:30:57 +0200 Subject: [PATCH 215/293] python3Packages.curio: fix tests on darwin Refactors to pytestCheckHook. --- .../python-modules/curio/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/curio/default.nix b/pkgs/development/python-modules/curio/default.nix index 5852f518ab5..0ffd66d6d01 100644 --- a/pkgs/development/python-modules/curio/default.nix +++ b/pkgs/development/python-modules/curio/default.nix @@ -2,8 +2,9 @@ , buildPythonPackage , fetchPypi , isPy3k -, pytest +, pytestCheckHook , sphinx +, stdenv }: buildPythonPackage rec { @@ -17,15 +18,18 @@ buildPythonPackage rec { disabled = !isPy3k; - checkInputs = [ pytest sphinx ]; + checkInputs = [ pytestCheckHook sphinx ]; __darwinAllowLocalNetworking = true; - # test_aside_basic times out, - # test_aside_cancel fails because modifies PYTHONPATH and cant find pytest - checkPhase = '' - pytest --deselect tests/test_task.py::test_aside_basic --deselect tests/test_task.py::test_aside_cancel -k "not test_ssl_outgoing" - ''; + disabledTests = [ + "test_aside_basic" # times out + "test_aside_cancel" # fails because modifies PYTHONPATH and cant find pytest + "test_ssl_outgoing" # touches network + ] ++ lib.optionals (stdenv.isDarwin) [ + "test_unix_echo" # socket bind error on hydra when built with other packages + "test_unix_ssl_server" # socket bind error on hydra when built with other packages + ]; meta = with lib; { homepage = "https://github.com/dabeaz/curio"; From bdeef5701db3a4976b35e80bbc6156c6f945a7f7 Mon Sep 17 00:00:00 2001 From: meutraa Date: Sat, 26 Sep 2020 14:14:55 +0100 Subject: [PATCH 216/293] androidStudioPackages.{dev,canary}: 4.2.0.11 -> 4.2.0.12 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index f35e695d1b6..648b45631e1 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -19,9 +19,9 @@ let sha256Hash = "sha256-qbxmR9g8DSKzcP09bJuc+am79BSXWG39UQxFEb1bZ88="; }; latestVersion = { # canary & dev - version = "4.2.0.11"; # "Android Studio 4.2 Canary 11" - build = "202.6825553"; - sha256Hash = "sha256-la3J0mgUxJA50l1PLr9FPMKI5QYkoBRriVyu3aVq7io="; + version = "4.2.0.12"; # "Android Studio 4.2 Canary 12" + build = "202.6847140"; + sha256Hash = "sha256-lt2069uAJdVlKg3fC2NmFFPoMmG5cAUnH9V4WRAawxk="; }; in { # Attributes are named by their corresponding release channels From 36c7fb33dcd08af1ec3cbf0155af2f9f620ed813 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 26 Sep 2020 20:18:54 +0000 Subject: [PATCH 217/293] signal-cli: 0.6.8 -> 0.6.10 --- .../networking/instant-messengers/signal-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index 5c46a5a0fd2..c1b9cdc122c 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.6.8"; + version = "0.6.10"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz"; - sha256 = "0gcyj8r7156zn5zzfnabf0mw3kcaq7v29vsjb6mdvj8cjjm05dvd"; + sha256 = "0zglcx5ylqjc3hjkzi84mjhp9dchnnkv12qq75q5pqkx1w45rmim"; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; From f63c9bced24f176329255f8e09e517c1990d6bd0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 26 Sep 2020 21:20:00 +0000 Subject: [PATCH 218/293] smenu: 0.9.15 -> 0.9.16 --- pkgs/tools/misc/smenu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/smenu/default.nix b/pkgs/tools/misc/smenu/default.nix index 4d24a1542fa..362c4f6c914 100644 --- a/pkgs/tools/misc/smenu/default.nix +++ b/pkgs/tools/misc/smenu/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - version = "0.9.15"; + version = "0.9.16"; pname = "smenu"; src = fetchFromGitHub { owner = "p-gen"; repo = "smenu"; rev = "v${version}"; - sha256 = "0s9qhg6dln33x8r2g8igvgkyrv8g1z26wf8gcnqp3kbp6fw12izi"; + sha256 = "1vlsrc071fznqnz67jbhrc4pcfwzc737lwd9jxpnidn0i08py5p2"; }; buildInputs = [ ncurses ]; From 2bdce0e50c6b8c64afb8de6b2fc9fccf5440dfb2 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Sat, 26 Sep 2020 14:05:50 -0700 Subject: [PATCH 219/293] maintainers: add austinbutler --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cbff5670550..6a25071bc06 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -806,6 +806,12 @@ githubId = 574938; name = "Jonathan Glines"; }; + austinbutler = { + email = "austinabutler@gmail.com"; + github = "austinbutler"; + githubId = 354741; + name = "Austin Butler"; + }; avaq = { email = "nixpkgs@account.avaq.it"; github = "avaq"; From 3b1ee7b0110932bd2fbc76e04a5fe9787ac8e058 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Sat, 26 Sep 2020 14:06:05 -0700 Subject: [PATCH 220/293] pythonPackages.requests-hawk: init at 1.0.1 --- .../python-modules/requests-hawk/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/python-modules/requests-hawk/default.nix diff --git a/pkgs/development/python-modules/requests-hawk/default.nix b/pkgs/development/python-modules/requests-hawk/default.nix new file mode 100644 index 00000000000..9641ee9d12c --- /dev/null +++ b/pkgs/development/python-modules/requests-hawk/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi, python, mohawk, requests }: + +buildPythonPackage rec { + pname = "requests-hawk"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1qcga289yr6qlkmc6fjk0ia6l5cg0galklpdzpslf1y8ky9zb7rl"; + }; + + propagatedBuildInputs = [ mohawk requests ]; + + meta = with lib; { + description = "Hawk authentication strategy for the requests python library."; + homepage = "https://github.com/sam-washington/requests-hawk"; + license = licenses.asl20; + maintainers = with maintainers; [ austinbutler ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index af2ec27f733..b5f996c1166 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6077,6 +6077,8 @@ in { requests-cache = callPackage ../development/python-modules/requests-cache { }; + requests-hawk = callPackage ../development/python-modules/requests-hawk { }; + requests = callPackage ../development/python-modules/requests { }; requests_download = callPackage ../development/python-modules/requests_download { }; From 004676ce9c8275598182884c9e5a823a34eaa173 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 27 Sep 2020 00:29:06 +0200 Subject: [PATCH 221/293] neomutt: apply two patches for regressions in the sidebar The following patches were pushed to `master` after the release and fix two regressions in the sidebar of NeoMutt: * 9675367 (sidebar: prevent the divider colour bleeding out): a small fix for ANSI colors to not break the layout. * 6078653 (Fix ): fixes invalid conditions in if-statements. Considering their release cycle I figured that it is reasonable to apply those on top of `20200925` for now. --- .../networking/mailreaders/neomutt/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 699d08536fb..96ca3db79f6 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -2,6 +2,7 @@ , ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl , lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, elinks, mailcap, runtimeShell, sqlite, zlib , glibcLocales +, fetchpatch }: stdenv.mkDerivation rec { @@ -21,6 +22,18 @@ stdenv.mkDerivation rec { mailcap sqlite ]; + patches = [ + # To be removed on next release. Fixes two bugs in the sidebar behavior. + (fetchpatch { + url = "https://github.com/neomutt/neomutt/commit/96753674e70edb695c1dc7af73e3317956c1b259.patch"; + sha256 = "0yjmgdfhn8ra7bc3d40c3c29imgpgbhzphjxp6575llh9kw5h53s"; + }) + (fetchpatch { + url = "https://github.com/neomutt/neomutt/commit/6078653c9233644ca76c24bdb64e49bd443dd714.patch"; + sha256 = "1s1p86bqpc9xq9z5qfh0mxxh6syps8shq0dm7bbkg1bz7qya5phy"; + }) + ]; + nativeBuildInputs = [ docbook_xsl docbook_xml_dtd_42 gettext libxml2 libxslt.bin makeWrapper tcl which zlib elinks ]; From c0b1d136c5c43f842f0644361f70e52d64889cc4 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Sat, 26 Sep 2020 16:03:29 -0700 Subject: [PATCH 222/293] python3Packages.alerta: add missing dependency --- pkgs/development/python-modules/alerta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/alerta/default.nix b/pkgs/development/python-modules/alerta/default.nix index a024592b4ed..579f0178729 100644 --- a/pkgs/development/python-modules/alerta/default.nix +++ b/pkgs/development/python-modules/alerta/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, six, click, requests, pytz, tabulate, pythonOlder +, six, click, requests, requests-hawk, pytz, tabulate, pythonOlder }: buildPythonPackage rec { @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "49e0862c756d644e9349f5040dd59d135cd871ffeaea5fc288eb3a2e818cf61a"; }; - propagatedBuildInputs = [ six click requests pytz tabulate ]; + propagatedBuildInputs = [ six click requests requests-hawk pytz tabulate ]; doCheck = false; From 3df1ed128941bc416a59d31d2ca3a9d54c516e4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 26 Sep 2020 20:07:52 -0300 Subject: [PATCH 223/293] enlightenment.efl: 1.24.3 -> 1.25.0 - Update version - Explicitly enable Lua launcher binary support and language bindings, as they are now disabled by default - Remove a patch that has been integrated upstream - luaL_reg is no longer required (according to Fedora package: https://src.fedoraproject.org/rpms/efl/blob/master/f/efl.spec) --- pkgs/desktops/enlightenment/efl/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/enlightenment/efl/default.nix b/pkgs/desktops/enlightenment/efl/default.nix index 9ce0306b549..6c981e9c93b 100644 --- a/pkgs/desktops/enlightenment/efl/default.nix +++ b/pkgs/desktops/enlightenment/efl/default.nix @@ -54,11 +54,11 @@ stdenv.mkDerivation rec { pname = "efl"; - version = "1.24.3"; + version = "1.25.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "de95c6e673c170c1e21382918b122417c091c643e7dcaced89aa785529625c2a"; + sha256 = "0vlmf0rp2qxdl06pdmrd1xdfa10sdz30vnxzc98inpdg1n8iz52k"; }; nativeBuildInputs = [ @@ -142,16 +142,17 @@ stdenv.mkDerivation rec { "--buildtype=release" "-D build-tests=false" # disable build tests, which are not working "-D drm=true" - "-D ecore-imf-loaders-disabler=ibus,scim" # ibus is disalbed by default, scim is not availabe in nixpkgs + "-D ecore-imf-loaders-disabler=ibus,scim" # ibus is disabled by default, scim is not availabe in nixpkgs "-D embedded-lz4=false" "-D fb=true" "-D network-backend=connman" "-D sdl=true" + "-D elua=true" + "-D bindings=lua,cxx" ]; patches = [ ./efl-elua.patch - ./0002-efreet-more-stat-info-changes.patch ]; postPatch = '' @@ -174,11 +175,10 @@ stdenv.mkDerivation rec { source "$setupHook" ''; - NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 - postInstall = '' # fix use of $out variable substituteInPlace "$out/share/elua/core/util.lua" --replace '$out' "$out" + rm "$out/share/elua/core/util.lua.orig" # add all module include dirs to the Cflags field in efl.pc modules=$(for i in "$out/include/"*/; do printf ' -I''${includedir}/'`basename $i`; done) From 9c132e34b3ad4b4e386766c972018d358963a4b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 26 Sep 2020 20:14:25 -0300 Subject: [PATCH 224/293] pythonPackages.pythonefl: 1.24.0 -> 1.25.0 --- pkgs/development/python-modules/python-efl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix index 419b4906487..4e3cffa9d22 100644 --- a/pkgs/development/python-modules/python-efl/default.nix +++ b/pkgs/development/python-modules/python-efl/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "python-efl"; - version = "1.24.0"; + version = "1.25.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/bindings/python/${pname}-${version}.tar.xz"; - sha256 = "1vk1cdd959gia4a9qzyq56a9zw3lqf9ck66k8c9g3c631mp5cfpy"; + sha256 = "0bk161xwlz4dlv56r68xwkm8snzfifaxd1j7w2wcyyk4fgvnvq4r"; }; nativeBuildInputs = [ pkgconfig ]; From 704c258ea7beb47e7b2d2f520313f234dae427dc Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 26 Sep 2020 22:26:56 +0100 Subject: [PATCH 225/293] pythonPackages.git-annex-adapter: 0.2.1 -> 0.2.2, fix build --- .../python-modules/git-annex-adapter/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix index ba3ff3bfd6c..318bafb98ef 100644 --- a/pkgs/development/python-modules/git-annex-adapter/default.nix +++ b/pkgs/development/python-modules/git-annex-adapter/default.nix @@ -1,10 +1,10 @@ { stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, substituteAll -, python, utillinux, pygit2, gitMinimal, git-annex +, python, utillinux, pygit2, gitMinimal, git-annex, cacert }: buildPythonPackage rec { pname = "git-annex-adapter"; - version = "0.2.1"; + version = "0.2.2"; disabled = !isPy3k; @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "alpernebbi"; repo = pname; rev = "v${version}"; - sha256 = "146q1jhcfc7f96ajkhjffskkljk2xzivs5ih5clb8qx0sh7mj097"; + sha256 = "0666vqspgnvmfs6j3kifwyxr6zmxjs0wlwis7br4zcq0gk32zgdx"; }; patches = [ @@ -28,11 +28,12 @@ buildPythonPackage rec { utillinux # `rev` is needed in tests/test_process.py ]; - propagatedBuildInputs = [ pygit2 ]; + propagatedBuildInputs = [ pygit2 cacert ]; checkPhase = '' ${python.interpreter} -m unittest ''; + pythonImportsCheck = [ "git_annex_adapter" ]; meta = with stdenv.lib; { homepage = "https://github.com/alpernebbi/git-annex-adapter"; From 93536b4392c9975db9349f05bbd6831bd2137801 Mon Sep 17 00:00:00 2001 From: Hugo Lageneste Date: Sat, 26 Sep 2020 16:23:30 +0200 Subject: [PATCH 226/293] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 124 +++++++++++++++------------- 1 file changed, 68 insertions(+), 56 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index f1b2b6d6386..24f2750fe68 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -65,11 +65,11 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2020-09-09"; + version = "2020-09-26"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "08295ce17405cb5f6c80d2f726262493bfd21210"; + rev = "94927195eeb5f8576d81ae5c35c0b63b07d6c412"; sha256 = "1jyxxn6j7jkcr1yky6p1y798rza04q3pivsddig8qk85kg6dkgy5"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; @@ -461,12 +461,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2020-09-24"; + version = "2020-09-26"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "12a5c97ef43d7f6865b5e51d6238a3a0bf1e8847"; - sha256 = "0l6dbjadwn4kmpyqjj6r4imn2i6zjqriskpp5m87krhj513516aw"; + rev = "2b83490cb1228abe4bf2c2557f1407321f6af734"; + sha256 = "10pgj0kh4vd0wvsb68l3k2af5rhmh249a2cf4mhbl8jb1g76bnrl"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -522,12 +522,12 @@ let completion-nvim = buildVimPluginFrom2Nix { pname = "completion-nvim"; - version = "2020-09-24"; + version = "2020-09-25"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "completion-nvim"; - rev = "5c153f8ae094867a414cb2a7c0f59454299f17b3"; - sha256 = "0jm39f4qrm5sgrq1q70wx9674zw1gh7kb0vhi57r42m3jivvxvjy"; + rev = "c0594169312cb16a9957fd98deac64edd43cb1c1"; + sha256 = "0zyjf57c1q36jzcvmf32w86k0mfhxlkbia8nl4mpm7fjq22vyjp3"; }; meta.homepage = "https://github.com/nvim-lua/completion-nvim/"; }; @@ -1884,12 +1884,12 @@ let lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2020-09-16"; + version = "2020-09-25"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "b9024dcb4204437452b84dfd83bd39748bfc7cd3"; - sha256 = "1m896054kz44k8kfmp4pmashin85n41gddnhsv1657dgd2dyzply"; + rev = "90fba59dc0426bc5987588883de903c0795c542a"; + sha256 = "14b43jdksyjd5ln8zgf0pwpdndlcs5nnivy68ky92mh6k38xhzgl"; }; meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; @@ -1920,12 +1920,12 @@ let lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2020-09-05"; + version = "2020-09-25"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "f5f870e0ac67542fd83cb6ff99632940fe8795f9"; - sha256 = "1al9yvwn3rfw22351p221nx68hhqynh9cq1flyalkvr46cda48cz"; + rev = "2afc3ab4dda191c75764d3239d1cf56356759dd4"; + sha256 = "0yvinwvzhqb87nqg38azd19c9w0yrkl06mx3agji2mvn23p66ab5"; }; meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; @@ -2364,12 +2364,12 @@ let neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2020-09-22"; + version = "2020-09-25"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "807a94f746bac2ab328dc22e6ca88bd411283cc8"; - sha256 = "0wrz8kghnb52i2sxnnkx74kpj1ibp956707x5zlx0gqipvbqdvs8"; + rev = "018f66204223336f74c0c5d2952a270e7bffc330"; + sha256 = "18066iby2baw09srvpy9s7qwiybd8fwvg0a9k5h1rpjf47lss42s"; }; meta.homepage = "https://github.com/kassio/neoterm/"; }; @@ -2436,12 +2436,12 @@ let nerdtree-git-plugin = buildVimPluginFrom2Nix { pname = "nerdtree-git-plugin"; - version = "2020-09-20"; + version = "2020-09-25"; src = fetchFromGitHub { owner = "Xuyuanp"; repo = "nerdtree-git-plugin"; - rev = "97eeaee46308a39cadfd2273280fcc4906988dd0"; - sha256 = "1s4mldcyq88mqnw3h4cq41w4217n6wmh1p4cwhqfz0caihb06jfb"; + rev = "85c4bed898d2d755a2a2ffbfc2433084ce107cdd"; + sha256 = "1m8s5x30k875812fbznvbq3pch5jpy29jr5rpzr0pr2ni5wkv6a4"; }; meta.homepage = "https://github.com/Xuyuanp/nerdtree-git-plugin/"; }; @@ -3458,12 +3458,12 @@ let traces-vim = buildVimPluginFrom2Nix { pname = "traces-vim"; - version = "2020-08-19"; + version = "2020-09-24"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "b38bdda4378b17888f5132787c49d79722c25752"; - sha256 = "0q29h348pgqxqw1pqq1nsj0nxccnb2x6jd92bpsqnjf452wsh2f2"; + rev = "8ea8d8b98e61cddaff159b4328310f4096c7bb2b"; + sha256 = "1fs7j7v72nv5374pqpx68xjc8kl3fyyhwz4hc029kljqlvgg0lrj"; }; meta.homepage = "https://github.com/markonm/traces.vim/"; }; @@ -3854,12 +3854,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-09-16"; + version = "2020-09-26"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "3740312de0be5200286260816e2563e77c0be0c5"; - sha256 = "0ia4h37gnxqagjz3yb2r6awp016iyc6dr0n84k2205g5pqck5b2x"; + rev = "9614105d09ff0d6e1043ab33028615f107fe94a5"; + sha256 = "11kkzl473l4nrz3k13264sn23pmpr1pdcnmxkzndpx1k0r3f87qy"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -4070,12 +4070,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2020-09-21"; + version = "2020-09-26"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "f5f9f60558c7bc1bfe6a577f1fd9f91ff9ab55bf"; - sha256 = "0l55j2vb4l76jlamwxvd1l38irzfvyqlqwi2s13iy8xx4i54vsfx"; + rev = "96351ea98afa8ff825925d7758208219dddd6c9c"; + sha256 = "1aav8d47y9n0hkb6is47mz2a4pbgwlg2id0lw0zzbvsxjvidrgpr"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -4322,12 +4322,12 @@ let vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2020-09-08"; + version = "2020-09-26"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "7d1c3aeb3b26c7fb7bcd7cb2bee67beb3e538db3"; - sha256 = "0yrc17pq713b86z71ad0zy8lm1cd2psyzbw8yb62d1prjc17hp77"; + rev = "929dbd023f0de84d1abb502b7d77eddad33419a6"; + sha256 = "15qj771nss9jxfrqnfgvk0d5zrna3g064lqbwrfxmc816k1j56w0"; }; meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; @@ -4478,12 +4478,12 @@ let vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2020-04-25"; + version = "2020-09-26"; src = fetchFromGitHub { owner = "elixir-editors"; repo = "vim-elixir"; - rev = "53c530f79cfcd12498e31fcf8ecc466eba34c75c"; - sha256 = "13yr7iwi4w0m4zgkq1ia74qcca9wh9k0bz2y1yvm81db0bllsf6s"; + rev = "f52785dcc02ac873d276358939967c30c45cc7ed"; + sha256 = "0vnl78v77f0sszjk24bjbh4hq1zzjj3ijqmb5jkyn6i22nmdxncm"; }; meta.homepage = "https://github.com/elixir-editors/vim-elixir/"; }; @@ -5211,12 +5211,12 @@ let vim-jsx-pretty = buildVimPluginFrom2Nix { pname = "vim-jsx-pretty"; - version = "2020-09-09"; + version = "2020-09-26"; src = fetchFromGitHub { owner = "MaxMEllon"; repo = "vim-jsx-pretty"; - rev = "58b9a4dd48ee28488a6772fc6bb04abb0d083092"; - sha256 = "0gw5l1i7crsflrl3si1ymlpjh9yj5l5d23jj9irwyfkc8c6zqvbn"; + rev = "7682eb98da8a3a2e484261514b512d6a419f7aa8"; + sha256 = "05f1wjrpgbpcx0y9yn2ak9fy5zml1rbhsb3viy603pcqchwcgjxl"; }; meta.homepage = "https://github.com/MaxMEllon/vim-jsx-pretty/"; }; @@ -5379,12 +5379,12 @@ let vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2020-09-24"; + version = "2020-09-26"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "9755ec0c99e3cc4f3b4e0171c0fba02c132d6800"; - sha256 = "17ahwyjyb6w9504301hjc7nlsgnn7y5mjp0a1akj4dh8wb4hhzg6"; + rev = "ec3090d161ea8b18f6159965f109ba192afb8188"; + sha256 = "042zz3m71r5nmw8rpqj44a1vi1xhkxxalpxpdi3zqmjyad0fbvbm"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -5931,12 +5931,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2020-09-24"; + version = "2020-09-25"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "e2bbed8acc1f1cf498a0085cf771cf9bf40fb709"; - sha256 = "1cg0lfpjrzp7wajmdggwy56vjymrvhlmvmg3j7z67avvck8n2fn9"; + rev = "33b86476b63f7fc2286336eb488a149a85cb08cb"; + sha256 = "044imdn5dslrjd8hb62bsp1i2pxm1ps43kx56rlzgnlb633mfvpd"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -6399,12 +6399,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2020-09-24"; + version = "2020-09-26"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "06fbadd9b3c8e4be1e1343addb51cd0582c047f7"; - sha256 = "14v5p1khr56pdy0x0pn540cjbvwxr6782pvsdwwbfdq9p2hmhnq1"; + rev = "730443a98e9bfa8709ed51a355f17a9ce86a9fb4"; + sha256 = "0cc6iby5ffzpr0lpkfn75bxbzcvm3196cr3d0gdjvgk322c91ajp"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -7142,6 +7142,18 @@ let meta.homepage = "https://github.com/Shougo/vimproc.vim/"; }; + vimsence = buildVimPluginFrom2Nix { + pname = "vimsence"; + version = "2020-06-30"; + src = fetchFromGitHub { + owner = "hugolgst"; + repo = "vimsence"; + rev = "d6bb167499b8e43e889b305c8670b2445f505ced"; + sha256 = "0f6jzkfjcvaln61jbva2laws8aqhs5vk4314z900d3hb7rfclrfy"; + }; + meta.homepage = "https://github.com/hugolgst/vimsence/"; + }; + vimshell-vim = buildVimPluginFrom2Nix { pname = "vimshell-vim"; version = "2019-07-16"; @@ -7156,12 +7168,12 @@ let vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2020-09-19"; + version = "2020-09-25"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "6a5c0cf63e9414bfbf627999f9859259a01d9d2c"; - sha256 = "1bwdnhsa5lrid21pz5byhvc5d3vfsrzq7laqxpcq0h67cch154m3"; + rev = "42b79d8cbd7e26d4573bc3c0f3cf5aa33bdc602d"; + sha256 = "1gsxm1gl47v2ik4v7z32vcmlb0b5ybvla5ay0r8v7s9skbsmaq63"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -7169,12 +7181,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-09-24"; + version = "2020-09-26"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "a19c398b1e7876694ff5f6c65d95b23d5b8aadde"; - sha256 = "1mrlafqh1y6yc1m3gybwsi8400gyvnvbwzbmpxdizlx87iiz3bpq"; + rev = "2417bc53c34dc66b008b7057c9acb34e575517bc"; + sha256 = "10kh3qq76m3k4kcqpm0jhvp1ydj0ffh12h8d5v5r9bcdh4iv82k5"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -7337,12 +7349,12 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2020-07-30"; + version = "2020-09-26"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "4d76c5391b7975bd6dd09c0562c0fd4d78e14fa0"; - sha256 = "1ql5gwdnsf9y56ijphspfi3sbjgfj1594728xyw6l432mddgqx99"; + rev = "a3866f0f8b5b156cc33abe9b94e74718a399f73d"; + sha256 = "1v3xks9s9ql6byc1x84w45jdf9phq7jvwbpr5pv8qy7wyc1iksgc"; fetchSubmodules = true; }; meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; From 6e062ca93835b15572f62f4f9630202a360f7133 Mon Sep 17 00:00:00 2001 From: Hugo Lageneste Date: Sat, 26 Sep 2020 18:19:29 +0200 Subject: [PATCH 227/293] vimPlugins.vimsence: init at 2020-06-30 --- pkgs/misc/vim-plugins/overrides.nix | 8 ++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 9 insertions(+) diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 18515293655..3874a85c191 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -228,6 +228,14 @@ self: super: { configurePhase = "cd plugins/nvim"; }); + vimsence = super.vimsence.overrideAttrs(old: { + meta = with stdenv.lib; { + description = "Discord rich presence for Vim"; + homepage = "https://github.com/hugolgst/vimsence"; + maintainers = with stdenv.lib.maintainers; [ hugolgst ]; + }; + }); + vim-gist = super.vim-gist.overrideAttrs(old: { dependencies = with super; [ webapi-vim ]; }); diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index f328d0505fa..5ed015253b4 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -150,6 +150,7 @@ hrsh7th/vim-vsnip hrsh7th/vim-vsnip-integ hsanson/vim-android hsitz/VimOrganizer +hugolgst/vimsence iamcco/coc-spell-checker iamcco/coc-vimlsp ianks/vim-tsx From 40efae06a7f90fb418b2b8d88518507213c72435 Mon Sep 17 00:00:00 2001 From: Hugo Lageneste Date: Sat, 26 Sep 2020 18:18:22 +0200 Subject: [PATCH 228/293] maintainers: add hugolgst --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6a25071bc06..6f48c87a004 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3497,6 +3497,12 @@ githubId = 39689; name = "Hugo Tavares Reis"; }; + hugolgst = { + email = "hugo.lageneste@pm.me"; + github = "hugolgst"; + githubId = 15371828; + name = "Hugo Lageneste"; + }; hyphon81 = { email = "zero812n@gmail.com"; github = "hyphon81"; From af2dc4d401f87f96e752d14c0733681e30d30f43 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Sat, 26 Sep 2020 18:33:49 -0700 Subject: [PATCH 229/293] python3Packages.mss: init at 6.0.0 --- .../python-modules/mss/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/mss/default.nix diff --git a/pkgs/development/python-modules/mss/default.nix b/pkgs/development/python-modules/mss/default.nix new file mode 100644 index 00000000000..1604a006567 --- /dev/null +++ b/pkgs/development/python-modules/mss/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + pname = "mss"; + version = "6.0.0"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0dicp55adbqxb7hqlck95hngb1klv5s26lszw3xim30k18bwqaxl"; + }; + + propagatedBuildInputs = [ ]; + + # By default it attempts to build Windows-only functionality + prePatch = '' + rm mss/windows.py + ''; + + # Skipping tests due to most relying on DISPLAY being set + pythonImportsCheck = [ "mss" ]; + + meta = with lib; { + description = "Cross-platform multiple screenshots module in pure Python"; + homepage = "https://github.com/BoboTiG/mss/"; + license = licenses.mit; + maintainers = with maintainers; [ austinbutler ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b5f996c1166..df3b769bf2f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3815,6 +3815,8 @@ in { msgpack-numpy = callPackage ../development/python-modules/msgpack-numpy { }; + mss = callPackage ../development/python-modules/mss { }; + msrestazure = callPackage ../development/python-modules/msrestazure { }; msrest = callPackage ../development/python-modules/msrest { }; From 84d74ae9c9cbed73274b8e4e00be14688ffc93fe Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Sat, 26 Sep 2020 18:51:03 -0700 Subject: [PATCH 230/293] pythonPackages.entrypoint2: init at 0.2.1 --- .../python-modules/entrypoint2/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/entrypoint2/default.nix diff --git a/pkgs/development/python-modules/entrypoint2/default.nix b/pkgs/development/python-modules/entrypoint2/default.nix new file mode 100644 index 00000000000..301de3e278f --- /dev/null +++ b/pkgs/development/python-modules/entrypoint2/default.nix @@ -0,0 +1,36 @@ +{ lib, buildPythonPackage, fetchPypi, EasyProcess, pathpy, pytest }: + +buildPythonPackage rec { + pname = "entrypoint2"; + version = "0.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "15dya04884armqjdyqz1jgachkqgh9dc3p25lvyz9afvg73k2qav"; + }; + + propagatedBuildInputs = [ ]; + + pythonImportsCheck = [ "entrypoint2" ]; + + # argparse is part of the standardlib + prePatch = '' + substituteInPlace setup.py --replace "argparse" "" + ''; + + checkInputs = [ EasyProcess pathpy pytest ]; + + # 0.2.1 has incompatible pycache files included + # https://github.com/ponty/entrypoint2/issues/8 + checkPhase = '' + rm -rf tests/__pycache__ + pytest tests + ''; + + meta = with lib; { + description = "Easy to use command-line interface for python modules"; + homepage = "https://github.com/ponty/entrypoint2/"; + license = licenses.bsd2; + maintainers = with maintainers; [ austinbutler ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index df3b769bf2f..8bf36ea1ad2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1869,6 +1869,8 @@ in { entrance-with-router-features = callPackage ../development/python-modules/entrance { routerFeatures = true; }; + entrypoint2 = callPackage ../development/python-modules/entrypoint2 { }; + entrypoints = callPackage ../development/python-modules/entrypoints { }; enum34 = callPackage ../development/python-modules/enum34 { }; From 99d163ef2f9115445d280f0a3248c2457bf7de6b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 27 Sep 2020 02:46:10 +0000 Subject: [PATCH 231/293] vips: 8.10.0 -> 8.10.1 --- pkgs/tools/graphics/vips/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 334cb00f3c1..eb5afebaa67 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "vips"; - version = "8.10.0"; + version = "8.10.1"; outputs = [ "bin" "out" "man" "dev" ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "libvips"; repo = "libvips"; rev = "v${version}"; - sha256 = "1v5kfmv1vmzyvz1198jm1kl763s2i3mgnsn69vh6dslasbh769di"; + sha256 = "0zfhp86vbxs5qdnjy8hvdcjslfkafvd3s3rjr2dppwm0iz4gdbfx"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' From a38806dafe219dc26d78a7798f11be3ca41f48ce Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 27 Sep 2020 02:54:11 +0000 Subject: [PATCH 232/293] vivid: 0.5.0 -> 0.6.0 --- pkgs/tools/misc/vivid/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/vivid/default.nix b/pkgs/tools/misc/vivid/default.nix index c8831a6fca5..70746287986 100644 --- a/pkgs/tools/misc/vivid/default.nix +++ b/pkgs/tools/misc/vivid/default.nix @@ -2,24 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "vivid"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "00xxk1ipr3hndd717q52j7s2wfxis1p4glaa9lvp72gwwzmv5k9w"; + sha256 = "0m928hy2q8byfpm55nziiz86gcnhdnw3zpj78d8wx0pp318zjbla"; }; - postPatch = '' - substituteInPlace src/main.rs --replace /usr/share $out/share - ''; + cargoSha256 = "10xddr5cccc5cmhn4kwi27h3krmgapd7bqcp4rhjlbhdhsw7qxkx"; - cargoSha256 = "1l34i7qalid9mlcbpqhbb2bxgn2ylb2lwki4c0hf4kkq646ql0n1"; - - postInstall = '' - mkdir -p $out/share/${pname} - cp -rv config/* themes $out/share/${pname} + # Remove after https://github.com/NixOS/nixpkgs/pull/97000 lands into master + preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + unset SDKROOT ''; meta = with stdenv.lib; { From ec34833248cda4575b56ee199088265d955dddf2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 27 Sep 2020 03:44:14 +0000 Subject: [PATCH 233/293] yacreader: 9.6.2 -> 9.7.1 --- pkgs/applications/graphics/yacreader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/yacreader/default.nix b/pkgs/applications/graphics/yacreader/default.nix index 9162e0bdef1..2d253d4462a 100644 --- a/pkgs/applications/graphics/yacreader/default.nix +++ b/pkgs/applications/graphics/yacreader/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "yacreader"; - version = "9.6.2"; + version = "9.7.1"; src = fetchFromGitHub { owner = "YACReader"; repo = pname; rev = version; - sha256 = "1s7kb72skhr364kq8wr2i012jjmaz2vzcz526h0b2bch8921wrnf"; + sha256 = "17kzh69sxpyk4n7c2gkbsvr9y4j14azdy1qxzghsbwp7ij4iw9kv"; }; nativeBuildInputs = [ qmake pkgconfig ]; From e170ef225492cc505aad9044565b69150e25af93 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 27 Sep 2020 04:06:25 +0000 Subject: [PATCH 234/293] yq-go: 3.3.2 -> 3.4.0 --- pkgs/development/tools/yq-go/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index ea553259961..3d9d6cf0a0c 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "3.3.2"; + version = "3.4.0"; src = fetchFromGitHub { owner = "mikefarah"; rev = version; repo = "yq"; - sha256 = "1rdpjxnq6cs6gwpp4bijp38b657yzjqcdzf98lhhpbpskjz8k8pp"; + sha256 = "1rvs27c5mz55zqq9c7yif0dms53bd30d8ylh45f3y3zgh82jihp8"; }; - vendorSha256 = "1bjy3qr26zndr3dhh9gd33rhm5gy779525qgzjw4a4mla0p2q6kl"; + vendorSha256 = "0l5bhbp8dfq04hb4xcpx96ksfwx4xvk0pj5ma00rk3z913ikygcd"; doCheck = false; From 8176112c8877ea9eefb38d9bce5202a5ca7340c0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 27 Sep 2020 04:20:00 +0000 Subject: [PATCH 235/293] vault: 1.5.3 -> 1.5.4 --- pkgs/tools/security/vault/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index eb999b5cedc..9e5f48c46f1 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "vault"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "149if5s4rdpxgzakh8s79j1fcfcqk1w7gvgchc044xlicl1r49ic"; + sha256 = "0bin0r0qmyz8xal910csbclzc6ng2xv69jszyi69gd6n6f43vqw8"; }; goPackagePath = "github.com/hashicorp/vault"; From 90911d783469ebbe3a15e001b3da7f2dd59e3b04 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 27 Sep 2020 04:20:00 +0000 Subject: [PATCH 236/293] postgresqlPackages.tds_fdw: 2.0.1 -> 2.0.2 https://github.com/tds-fdw/tds_fdw/releases/tag/v2.0.2 --- pkgs/servers/sql/postgresql/ext/tds_fdw.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix index 70b8dd30927..478b27b74f1 100644 --- a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "tds_fdw"; - version = "2.0.1"; + version = "2.0.2"; buildInputs = [ postgresql freetds ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "tds-fdw"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "1zpcrx30bvaf72782hgz2s19i5ndwvi7z87fanl1lnymznrk9lzg"; + sha256 = "024syj21gmdfkpr51l8ca70n5jimr35zwdy719b8h4zjn64ci1fk"; }; installPhase = '' From ae90a6ea1394a614e1590697e7a99bdbccfe064b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 27 Sep 2020 04:20:00 +0000 Subject: [PATCH 237/293] vault-bin: 1.5.3 -> 1.5.4 --- pkgs/tools/security/vault/vault-bin.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index b8a70eb82f9..457d45111a0 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -1,30 +1,30 @@ { stdenv, fetchurl, unzip }: let - version = "1.5.3"; + version = "1.5.4"; sources = let base = "https://releases.hashicorp.com/vault/${version}"; in { x86_64-linux = fetchurl { url = "${base}/vault_${version}_linux_amd64.zip"; - sha256 = "1chhi7piq04j8rgk15rcszqqp37xd9cjj67plr5pgvdps3s1zihy"; + sha256 = "1cyk9v70w0px2sxg8dichqgk38br9hc4kdl37jk57ci5gdl6w5ah"; }; i686-linux = fetchurl { url = "${base}/vault_${version}_linux_386.zip"; - sha256 = "0jbnvypapang025wfyj6i70jdz3g29ggg7rzmg8xh6gfyhwk3vmb"; + sha256 = "1n6hmhd4g2c6zzbimslxpghma5dyqwb96w60srbf9gn2vrimg4l4"; }; x86_64-darwin = fetchurl { url = "${base}/vault_${version}_darwin_amd64.zip"; - sha256 = "1m54258lfdr79p2j8janbkhp0a8bs8xbrcr51lqx2s620n7sfbya"; + sha256 = "05d5m8kdwl6mcx3swkasm5zcmddlyl6m9lwj26vbg9pllx9zxvqm"; }; i686-darwin = fetchurl { url = "${base}/vault_${version}_darwin_386.zip"; - sha256 = "038qkkhlwj86fz9vpcycvv5nb41y8mqypqvhfp0ia11birp8xlsr"; + sha256 = "109hisdwd58za541qhw61bscfrh3szzfn8vdmr4c7nh5praiqznb"; }; aarch64-linux = fetchurl { url = "${base}/vault_${version}_linux_arm64.zip"; - sha256 = "1vivkwcy9j9zs7w65k7y8chix8jnii5pz8zck6rlpwgz5vs0h04k"; + sha256 = "0q8icl5ncvixrdmsd2ilzvpa6c1pswa6zgh3vccsj7sg8mxprjmr"; }; }; From b6e21a7609e3992c196d8388dcb7e02d2af8c9ed Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 27 Sep 2020 06:16:58 +0000 Subject: [PATCH 238/293] nixos/hardened: update blacklisted filesystems https://github.com/openSUSE/suse-module-tools/blob/241a1582698c6a7f96f877a5ec64f478fdf90c82/suse-module-tools.spec#L24 --- nixos/modules/profiles/hardened.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix index 7bff79e8273..42ed62b0630 100644 --- a/nixos/modules/profiles/hardened.nix +++ b/nixos/modules/profiles/hardened.nix @@ -67,6 +67,8 @@ with lib; "jfs" "minix" "nilfs2" + "ntfs" + "omfs" "qnx4" "qnx6" "sysv" From 4504c2393a7eeec31e4ac050b7b8a13569637f6c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 27 Sep 2020 06:45:40 +0000 Subject: [PATCH 239/293] atlassian-confluence: 7.7.2 -> 7.7.3 --- pkgs/servers/atlassian/confluence.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index ab5c2da5edd..c67efef8e33 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -8,11 +8,11 @@ assert withMysql -> (mysql_jdbc != null); stdenvNoCC.mkDerivation rec { pname = "atlassian-confluence"; - version = "7.7.2"; + version = "7.7.3"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz"; - sha256 = "12ay2y7ixaxzj12pw66k65743ic3iccicn49cnjmas51c5ww09h1"; + sha256 = "02dyakvrsgvl2ccppdm7yla0s7c16qrakpdyydi2pidg907r8047"; }; buildPhase = '' From f7e5bb023186829e838260a8306cdb2980719c0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Wed, 16 Sep 2020 13:16:31 +0200 Subject: [PATCH 240/293] traefik: fix dashboard by using source releases The traefik dashboard depends on static files built with npm. The source releases included the prebundled static files , so switching to them fixes the issue. --- pkgs/servers/traefik/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index b18530f8c09..35ef1ef3958 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -1,16 +1,20 @@ -{ stdenv, buildGoModule, fetchFromGitHub, go-bindata, nixosTests }: +{ stdenv, fetchurl, buildGoModule, go-bindata, nixosTests }: buildGoModule rec { pname = "traefik"; version = "2.2.11"; - src = fetchFromGitHub { - owner = "containous"; - repo = "traefik"; - rev = "v${version}"; - sha256 = "0l93qb0kjbm5gjba0bxfyb5a0n1p54n5crhcsyzgrki4x586lan0"; + src = fetchurl { + url = "https://github.com/containous/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; + sha256 = "00kprbr437ml33bxm4nhxm9vwh6ywrpxvlij7p3r306bfpwa4j3r"; }; + unpackPhase = '' + mkdir source + cd source + tar xf $src + ''; + vendorSha256 = "06x2mcyp6c1jdf5wz51prhcn071d0580322lcv3x2bxk2grx08i2"; doCheck = false; From 40b1a628b6c99e3fbc229d139a8da46d359a97d6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 27 Sep 2020 02:33:03 +0000 Subject: [PATCH 241/293] vifm: 0.10.1 -> 0.11 --- pkgs/applications/misc/vifm/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix index d939beb443e..b014543e8ce 100644 --- a/pkgs/applications/misc/vifm/default.nix +++ b/pkgs/applications/misc/vifm/default.nix @@ -4,25 +4,25 @@ , utillinux, file, which, groff # adds support for handling removable media (vifm-media). Linux only! -, mediaSupport ? false, python3 ? null, udisks2 ? null, lib ? null +, mediaSupport ? false, python3 ? null, udisks2 ? null, lib ? null }: let isFullPackage = mediaSupport; in stdenv.mkDerivation rec { pname = if isFullPackage then "vifm-full" else "vifm"; - version = "0.10.1"; + version = "0.11"; src = fetchurl { url = "https://github.com/vifm/vifm/releases/download/v${version}/vifm-${version}.tar.bz2"; - sha256 = "0fyhxh7ndjn8fyjhj14ymkr3pjcs3k1xbs43g7xvvq85vdb6y04r"; + sha256 = "0rqyd424y0g5b5basw2ybb60r9gar4f40d1xgzr3c2dsy4jpwvyh"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ ncurses libX11 utillinux file which groff ]; postFixup = let - path = lib.makeBinPath - [ udisks2 + path = lib.makeBinPath + [ udisks2 (python3.withPackages (p: [p.dbus-python])) ]; @@ -42,4 +42,3 @@ in stdenv.mkDerivation rec { updateWalker = true; }; } - From 477c40126e3c5fa5ea964640223036f303b4614d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 26 Sep 2020 05:14:35 +0000 Subject: [PATCH 242/293] nco: 4.9.3 -> 4.9.5 --- pkgs/development/libraries/nco/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix index 11fc8b0db70..0d98142a075 100644 --- a/pkgs/development/libraries/nco/default.nix +++ b/pkgs/development/libraries/nco/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex, coreutils }: stdenv.mkDerivation rec { - version = "4.9.3"; + version = "4.9.5"; pname = "nco"; nativeBuildInputs = [ flex which ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/nco/nco/archive/${version}.tar.gz"; - sha256 = "0jpv2hw2as5wh06ac4hkhy7964w81pm7kp6nbwhmiyfzjzhwqhjy"; + sha256 = "0xp377rsamn2hwhzaf0ih70wd5274flpz74grys1b7rpbvbyf1bw"; }; prePatch = '' @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { substituteInPlace src/nco/nco_fl_utl.c \ --replace "/bin/mv" "${coreutils}/bin/mv" ''; - + meta = { description = "NetCDF Operator toolkit"; longDescription = "The NCO (netCDF Operator) toolkit manipulates and analyzes data stored in netCDF-accessible formats, including DAP, HDF4, and HDF5"; From 8cadf94a4d3c521be5bda588ffcdb0b925395389 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 30 Aug 2020 15:32:39 +0200 Subject: [PATCH 243/293] xorg.fontbitstreamtype1: generate .otf fonts --- pkgs/servers/x11/xorg/overrides.nix | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 092764a3d9d..a822ad989ac 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -1,7 +1,7 @@ { abiCompat ? null, stdenv, makeWrapper, fetchurl, fetchpatch, fetchFromGitLab, buildPackages, automake, autoconf, gettext, libiconv, libtool, intltool, - freetype, tradcpp, fontconfig, meson, ninja, ed, + freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge, libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, mesa, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook, mcpp, epoxy, openssl, pkgconfig, llvm_6, python3, @@ -848,4 +848,25 @@ self: super: --set XAPPLRESDIR ${placeholder "out"}/share/X11/app-defaults ''; }); + + # convert Type1 vector fonts to OpenType fonts + fontbitstreamtype1 = super.fontbitstreamtype1.overrideAttrs (attrs: { + nativeBuildInputs = attrs.nativeBuildInputs ++ [ fontforge ]; + + postBuild = '' + # convert Postscript (Type 1) font to otf + for i in $(find -type f -name '*.pfa' -o -name '*.pfb'); do + name=$(basename $i | cut -d. -f1) + fontforge -lang=ff -c "Open(\"$i\"); Generate(\"$name.otf\")" + done + ''; + + postInstall = '' + # install the otf fonts + fontDir="$out/lib/X11/fonts/misc/" + install -D -m 644 -t "$fontDir" *.otf + mkfontscale "$fontDir" + ''; + }); + } From c45160366b824a2d7a70c14b9ef1f797718fdd45 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 30 Aug 2020 15:33:26 +0200 Subject: [PATCH 244/293] xorg: mark fonts with proprietary licences as unfree --- pkgs/servers/x11/xorg/overrides.nix | 42 ++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index a822ad989ac..80112755e6d 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -50,10 +50,6 @@ self: super: hardeningDisable = [ "format" ]; }); - fontbhttf = super.fontbhttf.overrideAttrs (attrs: { - meta = attrs.meta // { license = lib.licenses.unfreeRedistributable; }; - }); - fontmiscmisc = super.fontmiscmisc.overrideAttrs (attrs: { postInstall = '' @@ -870,3 +866,41 @@ self: super: }); } + +# mark some packages as unfree +// ( + let + # unfree but redistributable + redist = [ + "fontadobeutopiatype1" + "fontadobeutopia100dpi" + "fontadobeutopia75dpi" + "fontbhtype1" + "fontibmtype1" + "fontbhttf" + "fontbh100dpi" + "fontbh75dpi" + ]; + + # unfree, possibly not redistributable + unfree = [ + # no license, just a copyright notice + "fontbhlucidatypewriter100dpi" + "fontbhlucidatypewriter75dpi" + "fontdaewoomisc" + + # unclear license, "permission to use"? + "fontjismisc" + ]; + + setLicense = license: name: + super.${name}.overrideAttrs (attrs: { + meta = attrs.meta // { inherit license; }; + }); + mapNamesToAttrs = f: names: with lib; + listToAttrs (zipListsWith nameValuePair names (map f names)); + + in + mapNamesToAttrs (setLicense lib.licenses.unfreeRedistributable) redist // + mapNamesToAttrs (setLicense lib.licenses.unfree) unfree +) From 759a2815ec5b6fddb10c637fceec0f1eba88449a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 27 Sep 2020 11:31:58 +0200 Subject: [PATCH 245/293] pkgsStatic.fmt: don't build shared libs The change in `static.nix` was added in https://github.com/NixOS/nixpkgs/pull/76875 but apparently `enabledShared` got removed in the master/staging-next merge. --- pkgs/development/libraries/fmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index be31997e5f9..eb9ecea7a18 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, enableShared ? true }: stdenv.mkDerivation rec { pname = "fmt"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" + "-DBUILD_SHARED_LIBS=${if enableShared then "ON" else "OFF"}" "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests ]; From 61cf0ddf29290c8b57395943b698bd85aa6f32e9 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 26 Sep 2020 19:10:51 +0200 Subject: [PATCH 246/293] =?UTF-8?q?ocamlPackages.topkg:=201.0.0=20?= =?UTF-8?q?=E2=86=92=201.0.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/topkg/default.nix | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/topkg/default.nix b/pkgs/development/ocaml-modules/topkg/default.nix index d2327b93a4f..1bd926b1ddb 100644 --- a/pkgs/development/ocaml-modules/topkg/default.nix +++ b/pkgs/development/ocaml-modules/topkg/default.nix @@ -7,11 +7,17 @@ build system is required, the attribute `run` can be used. */ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, result, opaline }: -if !stdenv.lib.versionAtLeast ocaml.version "4.01" -then throw "topkg is not available for OCaml ${ocaml.version}" -else - let + param = + if stdenv.lib.versionAtLeast ocaml.version "4.03" then { + version = "1.0.3"; + sha256 = "0b77gsz9bqby8v77kfi4lans47x9p2lmzanzwins5r29maphb8y6"; + } else { + version = "1.0.0"; + sha256 = "1df61vw6v5bg2mys045682ggv058yqkqb67w7r2gz85crs04d5fw"; + propagatedBuildInputs = [ result ]; + }; + /* This command allows to run the “topkg” build system. * It is usually called with `build` or `test` as argument. * Packages that use `topkg` may call this command as part of @@ -22,15 +28,15 @@ in stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-topkg-${version}"; - version = "1.0.0"; + inherit (param) version; src = fetchurl { url = "https://erratique.ch/software/topkg/releases/topkg-${version}.tbz"; - sha256 = "1df61vw6v5bg2mys045682ggv058yqkqb67w7r2gz85crs04d5fw"; + inherit (param) sha256; }; nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - propagatedBuildInputs = [ result ]; + propagatedBuildInputs = param.propagatedBuildInputs or []; buildPhase = "${run} build"; createFindlibDestdir = true; From 74f3e9cce1770c19e35f3e4e2559a49dce22f8c6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 27 Sep 2020 11:48:00 +0200 Subject: [PATCH 247/293] python39: 3.9.0rc1 -> 3.9.0rc2 --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 94422518b25..53fed542c05 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -108,9 +108,9 @@ in { major = "3"; minor = "9"; patch = "0"; - suffix = "rc1"; + suffix = "rc2"; }; - sha256 = "0w6wvyy9fbvfvrmhvmlb5gq18haagywk9hjkp1knjdarfczag9zv"; + sha256 = "gLV8EfYNwfRqQIsVQ/BO1S5kde1eWXtMI/P9ZfC3Kbo="; inherit (darwin) configd; inherit passthruFun; }; From a502146d7adca79e716474bc979f0b0730ffd9f5 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 23 Sep 2020 09:49:37 +0300 Subject: [PATCH 248/293] gpxsee: 7.31 -> 7.32 --- pkgs/applications/misc/gpxsee/default.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 9ee3b96a5bb..cc357917c85 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -1,28 +1,24 @@ -{ stdenv, mkDerivation, fetchFromGitHub, qmake, qttools, qttranslations }: +{ stdenv, mkDerivation, fetchFromGitHub, qmake, qttools, qttranslations, substituteAll }: mkDerivation rec { pname = "gpxsee"; - version = "7.31"; + version = "7.32"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "0y60h66p8ydkinxk9x4sp4cm6gq66nc9jcavy135vmycsiq9gphn"; + sha256 = "0mcd6zv71laykg1208vkqmaxv1v12mqq47156gb78a5ww8paa0ka"; }; - patches = [ + patches = (substituteAll { # See https://github.com/NixOS/nixpkgs/issues/86054 - ./fix-qttranslations-path.diff - ]; + src = ./fix-qttranslations-path.diff; + inherit qttranslations; + }); nativeBuildInputs = [ qmake qttools ]; - postPatch = '' - substituteInPlace src/GUI/app.cpp \ - --subst-var-by qttranslations ${qttranslations} - ''; - preConfigure = '' lrelease gpxsee.pro ''; From 109c7f95ca581a3069d24ef0f102501d521c2272 Mon Sep 17 00:00:00 2001 From: Niclas Thall Date: Sun, 27 Sep 2020 11:16:55 +0200 Subject: [PATCH 249/293] pythonPackages.lmtpd: upgrade to Python 3 Python 2 support was dropped on https://github.com/moggers87/lmtpd/commit/3546d4660f8229b3d6375aebf9e56ea88a93cbb0 ZHF: #97479 https://hydra.nixos.org/build/127641301 --- pkgs/development/python-modules/lmtpd/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/lmtpd/default.nix b/pkgs/development/python-modules/lmtpd/default.nix index e9dd42219eb..336b799eee2 100644 --- a/pkgs/development/python-modules/lmtpd/default.nix +++ b/pkgs/development/python-modules/lmtpd/default.nix @@ -1,9 +1,11 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ buildPythonPackage, fetchPypi, isPy3k, stdenv }: buildPythonPackage rec { pname = "lmtpd"; version = "6.2.0"; + disabled = !isPy3k; + src = fetchPypi { inherit pname version; sha256 = "2c6825d2ffa1de099440411a742f58e1b3e8deeb3345adcfd4c2c38d4baf62b3"; From a29f812f365aede81a5e8dcdc714abab21637499 Mon Sep 17 00:00:00 2001 From: Niclas Thall Date: Sun, 27 Sep 2020 11:34:56 +0200 Subject: [PATCH 250/293] pythonPackages.pygraphviz: upgrade to Python 3 Python 2 support was dropped on https://github.com/pygraphviz/pygraphviz/commit/c341911c15b8f88eb3852bf6be213ff5b50f7cb3 ZHF: #97479 https://hydra.nixos.org/build/127631797 --- pkgs/development/python-modules/pygraphviz/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix index 3a451f4af1e..a8d80f6e617 100644 --- a/pkgs/development/python-modules/pygraphviz/default.nix +++ b/pkgs/development/python-modules/pygraphviz/default.nix @@ -1,10 +1,12 @@ -{ stdenv, buildPythonPackage, fetchPypi, substituteAll, graphviz +{ stdenv, buildPythonPackage, isPy3k, fetchPypi, substituteAll, graphviz , pkgconfig, doctest-ignore-unicode, mock, nose }: buildPythonPackage rec { pname = "pygraphviz"; version = "1.6"; + disabled = !isPy3k; + src = fetchPypi { inherit pname version; sha256 = "411ae84a5bc313e3e1523a1cace59159f512336318a510573b47f824edef8860"; From 15e1e144dffb36ed442b33ab083516a0726e6bb3 Mon Sep 17 00:00:00 2001 From: Niclas Thall Date: Sun, 27 Sep 2020 12:10:12 +0200 Subject: [PATCH 251/293] pythonPackages.pure-eval: upgrade to Python 3 ZHF: NixOS#97479 https://hydra.nixos.org/build/127622386 --- pkgs/development/python-modules/pure-eval/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pure-eval/default.nix b/pkgs/development/python-modules/pure-eval/default.nix index d7e92f09784..2807611f493 100644 --- a/pkgs/development/python-modules/pure-eval/default.nix +++ b/pkgs/development/python-modules/pure-eval/default.nix @@ -1,9 +1,11 @@ -{ lib, buildPythonPackage, fetchFromGitHub, setuptools_scm, toml, pytest }: +{ buildPythonPackage, isPy3k, lib, fetchFromGitHub, setuptools_scm, toml, pytest }: buildPythonPackage rec { pname = "pure_eval"; version = "0.1.0"; + disabled = !isPy3k; + src = fetchFromGitHub { owner = "alexmojaki"; repo = pname; From 486174da1115f44ef48459db352e7e2216114a61 Mon Sep 17 00:00:00 2001 From: Niclas Thall Date: Sun, 27 Sep 2020 13:50:39 +0200 Subject: [PATCH 252/293] python3Packages.pybase64: Upgrade to python 3 Python 2 ist supported. ZHF: #97479 https://hydra.nixos.org/build/127647482 --- pkgs/development/python-modules/pybase64/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix index 6a141484bb4..d52a1f67d21 100644 --- a/pkgs/development/python-modules/pybase64/default.nix +++ b/pkgs/development/python-modules/pybase64/default.nix @@ -1,9 +1,11 @@ -{ buildPythonPackage, stdenv, fetchPypi, six, pytest }: +{ buildPythonPackage, isPy3k, stdenv, fetchPypi, six, pytest }: buildPythonPackage rec { pname = "pybase64"; version = "1.0.1"; + disabled = !isPy3k; + src = fetchPypi { inherit pname version; sha256 = "6ced40531bffc81bafc790d5c0d2f752e281b3b00fd6ff4e79385c625e5dbab1"; From d9cb2736b4c5692e05a1e30613aecea42db4f6c5 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 27 Sep 2020 15:02:47 +0100 Subject: [PATCH 253/293] pythonPackages.chameleon: fix tests by switching to github source tests are no longer included in the pypi tarball --- .../python-modules/chameleon/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/chameleon/default.nix b/pkgs/development/python-modules/chameleon/default.nix index d522764c799..0af3d18824a 100644 --- a/pkgs/development/python-modules/chameleon/default.nix +++ b/pkgs/development/python-modules/chameleon/default.nix @@ -1,17 +1,22 @@ { stdenv , buildPythonPackage -, fetchPypi +, fetchFromGitHub }: buildPythonPackage rec { pname = "Chameleon"; version = "3.8.1"; - src = fetchPypi { - inherit pname version; - sha256 = "adf9609a2fa4ad20deb390605495f9a5d617b737bfbd86e51a49bbac2acaf316"; + # tests not included in pypi tarball + src = fetchFromGitHub { + owner = "malthe"; + repo = "chameleon"; + rev = version; + sha256 = "0nf8x4w2vh1a31wdb86nnvlic9xmr23j3in1f6fq4z6mv2jkwa87"; }; + pythonImportsCheck = [ "chameleon" ]; + meta = with stdenv.lib; { homepage = "https://chameleon.readthedocs.io/"; description = "Fast HTML/XML Template Compiler"; From 3821543de7ec3f9a19bdbd7ec0bfd98b9b3253f3 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 27 Sep 2020 12:42:03 -0400 Subject: [PATCH 254/293] pythonPackages.fastparquet: disable broken test --- pkgs/development/python-modules/fastparquet/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index 0a52d89df5a..47c7d506309 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -16,6 +16,9 @@ buildPythonPackage rec { # FIXME: package zstandard # removing the test dependency for now substituteInPlace setup.py --replace "'zstandard'," "" + + # workaround for https://github.com/dask/fastparquet/issues/517 + rm fastparquet/test/test_partition_filters_specialstrings.py ''; nativeBuildInputs = [ pytestrunner ]; From d7365fad89899e94bf102b73452b93a3c20a3f3f Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 24 Sep 2020 22:47:07 +0100 Subject: [PATCH 255/293] pythonPackages.datatable: 0.10.1 -> 0.11.0, fix build once we've made some alterations to the source (which doesn't seem to have been shipped in a ready-to-build state), we can use the funny custom build system to build a wheel which can then be installed by the pipInstallHook. running the tests is again annoying because an ini file setting pytest's python_files parameter is missing, meaning we have to inject our own. --- .../python-modules/datatable/default.nix | 58 ++++++++++++------- .../datatable/hardcode-library-paths.patch | 43 -------------- pkgs/top-level/python-packages.nix | 5 +- 3 files changed, 41 insertions(+), 65 deletions(-) delete mode 100644 pkgs/development/python-modules/datatable/hardcode-library-paths.patch diff --git a/pkgs/development/python-modules/datatable/default.nix b/pkgs/development/python-modules/datatable/default.nix index 345903932bd..c5271e473e3 100644 --- a/pkgs/development/python-modules/datatable/default.nix +++ b/pkgs/development/python-modules/datatable/default.nix @@ -1,45 +1,63 @@ { stdenv, lib, buildPythonPackage, fetchPypi, substituteAll, pythonOlder +, pipInstallHook, writeText , blessed , docutils , libcxx -, libcxxabi , llvm -, openmp -, pytest +, pytestCheckHook , typesentry }: buildPythonPackage rec { pname = "datatable"; - version = "0.10.1"; + version = "0.11.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "3ce5257c0c4afa96e2b14ca47a0aaf73add195b11de48f4adda50b5ede927436"; + sha256 = "19c602711e00f72e9ae296d8fa742d46da037c2d3a2d254bdf68f817a8da76bb"; }; + # authors seem to have created their own build system + format = "other"; - patches = lib.optionals stdenv.isDarwin [ - # Replace the library auto-detection with hardcoded paths. - (substituteAll { - src = ./hardcode-library-paths.patch; + # tarball doesn't appear to have been shipped totally ready-to-build + postPatch = '' + substituteInPlace ci/ext.py \ + --replace \ + 'shell_cmd(["git"' \ + '"0000000000000000000000000000000000000000" or shell_cmd(["git"' + echo '${version}' > VERSION.txt + ''; + DT_RELEASE = "1"; - libomp_dylib = "${lib.getLib openmp}/lib/libomp.dylib"; - libcxx_dylib = "${lib.getLib libcxx}/lib/libc++.1.dylib"; - libcxxabi_dylib = "${lib.getLib libcxxabi}/lib/libc++abi.dylib"; - }) - ]; + buildPhase = '' + python ci/ext.py wheel + ''; propagatedBuildInputs = [ typesentry blessed ]; - buildInputs = [ llvm ] ++ lib.optionals stdenv.isDarwin [ openmp ]; - checkInputs = [ docutils pytest ]; + buildInputs = [ llvm pipInstallHook ]; + checkInputs = [ docutils pytestCheckHook ]; LLVM = llvm; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-isystem ${libcxx}/include/c++/v1"; - checkPhase = '' - mv datatable datatable.hidden - pytest - ''; + pytestFlagsArray = let + # ini file (not included in tarball) required to change python_files setting, + pytestIni = writeText "pytest.ini" '' + [pytest] + python_files = test_*.py test-*.py + ''; + in [ + "-c ${pytestIni}" + ]; + disabledTests = [ + # skip tests which are irrelevant to our installation or use way too much memory + "test_xfunction_paths" + "test_fread_from_cmd2" + "test_cast_huge_to_str" + "test_create_large_string_column" + ]; + pythonImportsCheck = [ "datatable" ]; meta = with lib; { description = "data.table for Python"; diff --git a/pkgs/development/python-modules/datatable/hardcode-library-paths.patch b/pkgs/development/python-modules/datatable/hardcode-library-paths.patch deleted file mode 100644 index 76c2f0e1dd7..00000000000 --- a/pkgs/development/python-modules/datatable/hardcode-library-paths.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/ci/setup_utils.py b/ci/setup_utils.py -index 66b385a..6255af0 100644 ---- a/ci/setup_utils.py -+++ b/ci/setup_utils.py -@@ -600,37 +600,7 @@ def find_linked_dynamic_libraries(): - them as a list of absolute paths. - """ - with TaskContext("Find the required dynamic libraries") as log: -- llvm = get_llvm() -- libs = required_link_libraries() -- resolved = [] -- for libname in libs: -- if llvm: -- fullpath = os.path.join(llvm, "lib", libname) -- if os.path.isfile(fullpath): -- resolved.append(fullpath) -- log.info("Library `%s` found at %s" % (libname, fullpath)) -- continue -- else: -- log.info("%s does not exist" % fullpath) -- # Rely on the shell `locate` command to find the dynamic libraries. -- proc = subprocess.Popen(["locate", libname], stdout=subprocess.PIPE, -- stderr=subprocess.PIPE) -- stdout, stderr = proc.communicate() -- if proc.returncode == 0: -- results = stdout.decode().strip().split("\n") -- results = [r for r in results if r] -- if results: -- results.sort(key=len) -- fullpath = results[0] -- assert os.path.isfile(fullpath), "Invalid path: %r" % (fullpath,) -- resolved.append(fullpath) -- log.info("Library `%s` found at %s" % (libname, fullpath)) -- continue -- else: -- log.fatal("Cannot locate dynamic library `%s`" % libname) -- else: -- log.fatal("`locate` command returned the following error:\n%s" -- % stderr.decode()) -+ resolved = ["@libomp_dylib@", "@libcxx_dylib@", "@libcxxabi_dylib@"] - return resolved - - diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8bf36ea1ad2..66695effc8b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1459,8 +1459,9 @@ in { datashape = callPackage ../development/python-modules/datashape { }; - datatable = - callPackage ../development/python-modules/datatable { inherit (pkgs.llvmPackages) openmp libcxx libcxxabi; }; + datatable = callPackage ../development/python-modules/datatable { + inherit (pkgs.llvmPackages) libcxx; + }; dateparser = callPackage ../development/python-modules/dateparser { }; From 6b48deee548522c14d565adfbd8b19f5bfc54fc0 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 20 Sep 2020 19:06:37 +0200 Subject: [PATCH 256/293] nixos/nextcloud: drop nextcloud17, deprecate nextcloud18 Both packages will get EOLed within the lifetime of 20.09. `nextcloud17` can be removed entirely (the attribute-path is kept however to provide meaningful errors), however `nextcloud18` must be kept as `insecure` to make sure that users from `nextcloud17` can properly upgrade to `nextcloud19` on NixOS 20.09. --- nixos/doc/manual/release-notes/rl-2009.xml | 25 +++++++++++++++++++ nixos/modules/services/web-apps/nextcloud.nix | 4 +-- pkgs/servers/nextcloud/default.nix | 16 +++++++++--- 3 files changed, 39 insertions(+), 6 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 511276bcaab..3a595fcd509 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -834,6 +834,31 @@ CREATE ROLE postgres LOGIN SUPERUSER; functionally redundent. + + + The package nextcloud17 has been removed and nextcloud18 was marked as insecure + since both of them will + will be EOL (end of life) within the lifetime of 20.09. + + + It's necessary to upgrade to nextcloud19: + + + + From nextcloud17, you have to upgrade to nextcloud18 first as + Nextcloud doesn't allow going multiple major revisions forward in a single upgrade. This is possible + by setting to nextcloud18. + + + + + From nextcloud18, it's possible to directly upgrade to nextcloud19 + by setting to nextcloud19. + + + + + diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 7da119758fc..0345aca4eef 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -85,7 +85,7 @@ in { package = mkOption { type = types.package; description = "Which package to use for the Nextcloud instance."; - relatedPackages = [ "nextcloud17" "nextcloud18" "nextcloud19" ]; + relatedPackages = [ "nextcloud18" "nextcloud19" ]; }; maxUploadSize = mkOption { @@ -354,7 +354,7 @@ in { recommended to upgrade to nextcloud19 after that. '') ++ (optional (versionOlder cfg.package.version "19") '' - A legacy Nextcloud install (from before NixOS 20.09/unstable) may be installed. + A legacy Nextcloud install (from before NixOS 20.09) may be installed. If/After nextcloud18 is installed successfully, you can safely upgrade to nextcloud19. If not, please upgrade to nextcloud18 first since Nextcloud doesn't diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 061f1a1a394..183da107f12 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -27,14 +27,22 @@ let }; }; in { - nextcloud17 = generic { - version = "17.0.6"; - sha256 = "0qq7lkgzsn1zakfym5bjqzpcisxmgfcdd927ddqlhddy3zvgxrxx"; - }; + nextcloud17 = throw '' + Nextcloud v17 has been removed from `nixpkgs` as the support for it will be dropped + by upstream within the lifetime of NixOS 20.09[1]. Please upgrade to Nextcloud v18 by + declaring + + services.nextcloud.package = pkgs.nextcloud18; + + in your NixOS config. + + [1] https://docs.nextcloud.com/server/18/admin_manual/release_schedule.html + ''; nextcloud18 = generic { version = "18.0.9"; sha256 = "0rigg5pv2vnxgmjznlvxfc41s00raxa8jhib5vsznhj55qn99jm1"; + insecure = true; }; nextcloud19 = generic { From 61616535b9462902d2a6f19a0899f3509b7acbf8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 27 Sep 2020 17:05:35 +0200 Subject: [PATCH 257/293] mlt: add libexif, gtk2, fftw, libebur128, opencv4, and SDL2 dependencies This enables more optional features. I'm not sure what the difference is between mlt and mlt-qt5. I suppose both derivations should be kept in sync? --- pkgs/development/libraries/mlt/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 8c73343f208..1f2915c5071 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper -, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate -, libvorbis, libxml2, movit, pkgconfig, sox -, gtk2, genericUpdater, common-updater-scripts +, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate, libexif +, libvorbis, libxml2, movit, pkgconfig, sox, fftw, opencv4, SDL2 +, gtk2, genericUpdater, common-updater-scripts, libebur128 }: stdenv.mkDerivation rec { @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { buildInputs = [ SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2 - makeWrapper movit pkgconfig sox - gtk2 + makeWrapper movit pkgconfig sox libexif gtk2 fftw libebur128 + opencv4 SDL2 ]; # Mostly taken from: From 19becd922ca86fc2535a1ad2cb064f41c4a740ec Mon Sep 17 00:00:00 2001 From: Matthias Totschnig Date: Sun, 27 Sep 2020 20:13:26 +0200 Subject: [PATCH 258/293] zola: 0.12.0 -> 0.12.1 --- pkgs/applications/misc/zola/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix index 5c4df9880d9..a6869179e39 100644 --- a/pkgs/applications/misc/zola/default.nix +++ b/pkgs/applications/misc/zola/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "zola"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "getzola"; repo = pname; rev = "v${version}"; - sha256 = "119ikgall6bv1r6h1pqcmc6nxkxld2lch04gk860zzk54jragbrp"; + sha256 = "00fkcrr40v93z23h3q2wqlfx0120g59j6j9szk8nx9x85i40j3if"; }; - cargoSha256 = "1jx5bgfmbv0wljps1yv6yir2pjlb0vwzzba4i2sv32awv9y0q3v6"; + cargoSha256 = "1wdypyy787dzdq5q64a9mjfygg0kli49yjzw7xh66sjd7263w9fs"; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ openssl oniguruma ] From ce9b73c281d8e7c379e8f0529c039abcc0284d0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 26 Sep 2020 20:33:55 +0200 Subject: [PATCH 259/293] python37Packages.tensorflow: 1.15.2 -> 1.15.4 Changes: https://github.com/tensorflow/tensorflow/releases/tag/v1.15.4 --- .../python-modules/tensorflow/1/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow/1/default.nix b/pkgs/development/python-modules/tensorflow/1/default.nix index 1aad8677ca2..5df3ad32afb 100644 --- a/pkgs/development/python-modules/tensorflow/1/default.nix +++ b/pkgs/development/python-modules/tensorflow/1/default.nix @@ -72,7 +72,7 @@ let tfFeature = x: if x then "1" else "0"; - version = "1.15.2"; + version = "1.15.4"; variant = if cudaSupport then "-gpu" else ""; pname = "tensorflow${variant}"; @@ -103,7 +103,7 @@ let owner = "tensorflow"; repo = "tensorflow"; rev = "v${version}"; - sha256 = "1q0848drjvnaaa38dgns8knmpmkj5plzsc98j20m5ybv68s55w78"; + sha256 = "0lg8ahyr2k7dmp0yfypk8ivl9a0xcg3j0f0dakmn5ljk8nsji0bj"; }; patches = [ @@ -255,6 +255,9 @@ let # include security vulnerabilities. So we make it optional. # https://github.com/tensorflow/tensorflow/issues/20280#issuecomment-400230560 sed -i '/tensorboard >=/d' tensorflow/tools/pip_package/setup.py + + substituteInPlace tensorflow/tools/pip_package/setup.py \ + --replace "numpy >= 1.16.0, < 1.19.0" "numpy >= 1.16.0" ''; preConfigure = let @@ -307,9 +310,9 @@ let # cudaSupport causes fetch of ncclArchive, resulting in different hashes sha256 = if cudaSupport then - "09j57w6kc0vkfcdwr0qggy3qgrgq82kfa2jrwvvcnij4bl3wj40j" + "1bi6aydidgi943hiqj0d279jbz2g173hvafdqla1ifw2qdsm73pb" else - "14g8z49qz7d8n1c2mcsfhr7yqpcy7mhmpm6hgmqvpgb8vm7yvwrc"; + "0l5510fr8n22c4hx9llr0vqqhx9wlgkyxl55fxbixhssd0ai05r4"; }; buildAttrs = { From 5bcc4b27f9b40119125e3dfd39c1a709459bca18 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Sat, 26 Sep 2020 23:50:52 -0700 Subject: [PATCH 260/293] pythonPackages.pyscreenshot: add missing dependencies --- pkgs/development/python-modules/pyscreenshot/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/pyscreenshot/default.nix b/pkgs/development/python-modules/pyscreenshot/default.nix index 23aa092641f..7967caf6178 100644 --- a/pkgs/development/python-modules/pyscreenshot/default.nix +++ b/pkgs/development/python-modules/pyscreenshot/default.nix @@ -1,7 +1,11 @@ { lib , buildPythonPackage , fetchPypi +, isPy3k , EasyProcess +, entrypoint2 +, jeepney +, mss }: buildPythonPackage rec { @@ -15,6 +19,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ EasyProcess + entrypoint2 + ] ++ lib.optionals (isPy3k) [ + jeepney + mss ]; # recursive dependency on pyvirtualdisplay From d10d6dfa4af8c8c729595002a96d0dc9d0688f50 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sun, 27 Sep 2020 11:29:04 -0700 Subject: [PATCH 261/293] projectm: fix build on darwin --- pkgs/applications/audio/projectm/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/projectm/default.nix b/pkgs/applications/audio/projectm/default.nix index 83952c271be..d55b79ece59 100644 --- a/pkgs/applications/audio/projectm/default.nix +++ b/pkgs/applications/audio/projectm/default.nix @@ -1,4 +1,5 @@ -{ mkDerivation +{ stdenv +, mkDerivation , lib , fetchFromGitHub , autoreconfHook @@ -39,12 +40,13 @@ mkDerivation rec { "--enable-sdl" ]; - fixupPhase = '' + fixupPhase = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # NOTE: 2019-10-05: Upstream inserts the src path buring build into ELF rpath, so must delete it out # upstream report: https://github.com/projectM-visualizer/projectm/issues/245 for entry in $out/bin/* ; do patchelf --set-rpath "$(patchelf --print-rpath $entry | tr ':' '\n' | grep -v 'src/libprojectM' | tr '\n' ':')" "$entry" done + '' + '' wrapQtApp $out/bin/projectM-pulseaudio rm $out/bin/projectM-unittest ''; From 6b9481607bfcc78dcc0a7919b849409c745a6c9e Mon Sep 17 00:00:00 2001 From: Matt Huszagh Date: Sun, 20 Oct 2019 17:55:28 -0700 Subject: [PATCH 262/293] openems: init at unstable-2020-02-15 --- .../science/electronics/openems/default.nix | 76 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 78 insertions(+) create mode 100644 pkgs/applications/science/electronics/openems/default.nix diff --git a/pkgs/applications/science/electronics/openems/default.nix b/pkgs/applications/science/electronics/openems/default.nix new file mode 100644 index 00000000000..f7c8dd7467a --- /dev/null +++ b/pkgs/applications/science/electronics/openems/default.nix @@ -0,0 +1,76 @@ +{ stdenv +, lib +, fetchFromGitHub +, csxcad +, fparser +, tinyxml +, hdf5 +, vtk +, boost +, zlib +, cmake +, octave +, gl2ps +, withQcsxcad ? true +, withMPI ? false +, withHyp2mat ? true +, qcsxcad ? null +, openmpi ? null +, hyp2mat ? null +}: + +assert withQcsxcad -> qcsxcad != null; +assert withMPI -> openmpi != null; +assert withHyp2mat -> hyp2mat != null; + +stdenv.mkDerivation { + pname = "openems"; + version = "unstable-2020-02-15"; + + src = fetchFromGitHub { + owner = "thliebig"; + repo = "openEMS"; + rev = "ba793ac84e2f78f254d6d690bb5a4c626326bbfd"; + sha256 = "1dca6b6ccy771irxzsj075zvpa3dlzv4mjb8xyg9d889dqlgyl45"; + }; + + nativeBuildInputs = [ + cmake + ]; + + cmakeFlags = lib.optionals withMPI [ "-DWITH_MPI=ON" ]; + + buildInputs = [ + fparser + tinyxml + hdf5 + vtk + boost + zlib + csxcad + (octave.override { inherit hdf5; }) ] + ++ lib.optionals withQcsxcad [ qcsxcad ] + ++ lib.optionals withMPI [ openmpi ] + ++ lib.optionals withHyp2mat [ hyp2mat ]; + + postFixup = '' + substituteInPlace $out/share/openEMS/matlab/setup.m \ + --replace /usr/lib ${hdf5}/lib \ + --replace /usr/include ${hdf5}/include + + ${octave}/bin/mkoctfile -L${hdf5}/lib -I${hdf5}/include \ + -lhdf5 $out/share/openEMS/matlab/h5readatt_octave.cc \ + -o $out/share/openEMS/matlab/h5readatt_octave.oct + ''; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Open Source Electromagnetic Field Solver"; + homepage = "http://openems.de/index.php/Main_Page.html"; + license = licenses.gpl3; + maintainers = with maintainers; [ matthuszagh ]; + platforms = platforms.linux; + badPlatforms = platforms.aarch64; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d4f035ae02..000ba87fdba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26531,6 +26531,8 @@ in ngspice = callPackage ../applications/science/electronics/ngspice { }; + openems = callPackage ../applications/science/electronics/openems { }; + pcb = callPackage ../applications/science/electronics/pcb { }; qcsxcad = libsForQt514.callPackage ../applications/science/electronics/qcsxcad { }; From 84a2282b7baf708e6cb245e89f129b9bc236f645 Mon Sep 17 00:00:00 2001 From: Patrick Winter Date: Sun, 27 Sep 2020 15:02:34 +0200 Subject: [PATCH 263/293] typer: init at 0.3.2 --- .../python-modules/typer/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/typer/default.nix diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix new file mode 100644 index 00000000000..61adcf9254f --- /dev/null +++ b/pkgs/development/python-modules/typer/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchPypi +, click +, pytestCheckHook +, shellingham +, pytestcov +, pytest_xdist +, pytest-sugar +, coverage +, mypy +, black +, isort +}: + +buildPythonPackage rec { + pname = "typer"; + version = "0.3.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "00v3h63dq8yxahp9vg3yb9r27l2niwv8gv0dbds9dzrc298dfmal"; + }; + + propagatedBuildInputs = [ click ]; + + checkInputs = [ + pytestCheckHook + pytestcov + pytest_xdist + pytest-sugar + shellingham + coverage + mypy + black + isort + ]; + pytestFlagsArray = [ + "--ignore=tests/test_completion/test_completion.py" + "--ignore=tests/test_completion/test_completion_install.py" + ]; + + meta = with lib; { + homepage = "https://typer.tiangolo.com/"; + description = "Typer, build great CLIs. Easy to code. Based on Python type hints."; + license = licenses.mit; + maintainers = [ maintainers.winpat ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 66695effc8b..26db1264667 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7205,6 +7205,8 @@ in { typeguard = callPackage ../development/python-modules/typeguard { }; + typer = callPackage ../development/python-modules/typer { }; + typesentry = callPackage ../development/python-modules/typesentry { }; typesystem = callPackage ../development/python-modules/typesystem { }; From 53a8a510743d3eaa3c76096a562ac8813d77e7af Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Sun, 27 Sep 2020 12:21:50 +0200 Subject: [PATCH 264/293] vscode-extensions.metals: 1.9.0 -> 1.9.4 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index a914d70f173..90ab030263c 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -170,8 +170,8 @@ in mktplcRef = { name = "metals"; publisher = "scalameta"; - version = "1.9.0"; - sha256 = "0p2wbnw98zmjbfiz4mi1mh131s78r01kjnja339lwdigqxg88gi6"; + version = "1.9.4"; + sha256 = "029s1al1f3qk4pa3539rs045g9jwkhbmdg7wj7biqc6shcria4ca"; }; meta = { license = stdenv.lib.licenses.asl20; From 4dbd770f30633762a4f2a55cf61f00c837213357 Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Sun, 27 Sep 2020 12:01:11 +0200 Subject: [PATCH 265/293] python3Packages.fsspec: fix tests on darwin, 0.7.4 -> 0.8.3 --- pkgs/development/python-modules/fsspec/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index a20b00087b7..3f866c29121 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -4,18 +4,20 @@ , pythonOlder , pytestCheckHook , numpy +, stdenv +, isPy38 }: buildPythonPackage rec { pname = "fsspec"; - version = "0.7.4"; + version = "0.8.3"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "intake"; repo = "filesystem_spec"; rev = version; - sha256 = "0ylslmkzc803050yh8dl6cagabb9vrygz6w2zsmglzn4v9sz6jgd"; + sha256 = "0mfy0wxjfwwnp5q2afhhfbampf0fk71wsv512pi9yvrkzzfi1hga"; }; checkInputs = [ @@ -27,6 +29,8 @@ buildPythonPackage rec { # Test assumes user name is part of $HOME # AssertionError: assert 'nixbld' in '/homeless-shelter/foo/bar' "test_strip_protocol_expanduser" + ] ++ lib.optionals (stdenv.isDarwin && isPy38) [ + "test_modified" # fails on hydra, works locally ]; meta = with lib; { From e1d834aa09f315894244422c7759268f32f3e3b4 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sun, 27 Sep 2020 12:59:28 -0700 Subject: [PATCH 266/293] sshping: fix build on darwin Fix hardcoded C++ compiler --- pkgs/tools/networking/sshping/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/sshping/default.nix b/pkgs/tools/networking/sshping/default.nix index 20f0eaa7e47..aa3e57d53f8 100644 --- a/pkgs/tools/networking/sshping/default.nix +++ b/pkgs/tools/networking/sshping/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ libssh ]; buildPhase = '' - g++ -Wall -I ext/ -o bin/sshping src/sshping.cxx -lssh + $CXX -Wall -I ext/ -o bin/sshping src/sshping.cxx -lssh ''; installPhase = '' From 31dff5cab8a6b30f90d65b8dc56dbb148ba628cf Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Sun, 27 Sep 2020 21:59:54 +0200 Subject: [PATCH 267/293] nixos/doc/manual: add link to nixos-generators (#98925) From the 'Building your Own NixOS CD' section --- nixos/doc/manual/development/building-nixos.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/doc/manual/development/building-nixos.xml b/nixos/doc/manual/development/building-nixos.xml index 56a596baed0..d58b6354d1d 100644 --- a/nixos/doc/manual/development/building-nixos.xml +++ b/nixos/doc/manual/development/building-nixos.xml @@ -24,4 +24,10 @@ # mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso + + If you want to customize your NixOS CD in more detail, or generate other kinds + of images, you might want to check out nixos-generators. This can also be a good starting point when you want to use Nix to build a + 'minimal' image that doesn't include a NixOS installation. + From f09ae7e371257daad29ecdf1c5e041f09e4acd2f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 27 Sep 2020 22:08:08 +0200 Subject: [PATCH 268/293] roundcube: 1.4.8 -> 1.4.9 https://github.com/roundcube/roundcubemail/releases/tag/1.4.9 --- pkgs/servers/roundcube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index d46972eae21..98ce4f25a2e 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.4.8"; + version = "1.4.9"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "0jkas28k7px95sm3zix86ggraxc9vyy66271sgpr2wrmbg2r056r"; + sha256 = "1cpcr3abjq1f2af0ca571y976yni48z3rh3x146c6ninl5ip9b4z"; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; From b8d1e39a2891ab87662180c638bde1cb1d61b96b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 27 Sep 2020 22:08:57 +0200 Subject: [PATCH 269/293] stellarium: 0.20.2 -> 0.20.3 https://github.com/Stellarium/stellarium/releases/tag/v0.20.3 --- pkgs/applications/science/astronomy/stellarium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 78a7f742174..3cccaec2c49 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "stellarium"; - version = "0.20.2"; + version = "0.20.3"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${version}"; - sha256 = "0bpxv781chx5acjh9ni5l9dlnvn6jgkqylq09885g6j4gi3q56br"; + sha256 = "08abrshrzhdfcg3b2vzfmnq8fhzrasadg1ajs81kcw96yjc59vak"; }; nativeBuildInputs = [ cmake perl wrapQtAppsHook ]; From c68f14d36933a06f87ed79d51f868f353bd56348 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Sun, 27 Sep 2020 23:01:06 +0200 Subject: [PATCH 270/293] atlassian-confluence: 7.7.3 -> 7.7.4 --- pkgs/servers/atlassian/confluence.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index c67efef8e33..2475c6c5aa6 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -8,11 +8,11 @@ assert withMysql -> (mysql_jdbc != null); stdenvNoCC.mkDerivation rec { pname = "atlassian-confluence"; - version = "7.7.3"; + version = "7.7.4"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz"; - sha256 = "02dyakvrsgvl2ccppdm7yla0s7c16qrakpdyydi2pidg907r8047"; + sha256 = "1j9lr181ama7rfv76ikkvr0jkmc26ln1daqvspnsyamqwd03vh48"; }; buildPhase = '' From 94d2aeb559c4427718f6010ba082b7be7ee82f6d Mon Sep 17 00:00:00 2001 From: "Maurice B. Lewis" Date: Sun, 27 Sep 2020 22:20:41 +0000 Subject: [PATCH 271/293] terraform-providers: add version to patchGoModVendor providers (#97590) Add version to binaries produced via patchGoModVendor to allow run-time provider version validation by terraform. This was initially introduced in 4e63119c540 (terraform: add the version component to terraform provider paths (#34497), 2018-02-06) but broken in 3e5149a79ad (terraform-providers: fix the google and google-beta providers, 2020-03-24) for terraform-providers.google and terraform-providers.google-beta, and in 20f55a9fc07 (terraform-providers.ibm: move to update-all script, 2020-04-26) for terraform-providers.ibm. --- .../networking/cluster/terraform-providers/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 686b9ef9500..8b28f8bab54 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -17,7 +17,7 @@ let }; # Terraform allow checking the provider versions, but this breaks # if the versions are not provided via file paths. - postBuild = "mv go/bin/${repo}{,_v${version}}"; + postBuild = "mv $NIX_BUILD_TOP/go/bin/${repo}{,_v${version}}"; }; # Google is now using the vendored go modules, which works a bit differently @@ -39,6 +39,8 @@ let # just build and install into $GOPATH/bin buildPhase = '' go install -mod=vendor -v -p 16 . + + runHook postBuild ''; # don't run the tests, they are broken in this setup From 1d85b1465150cfea778bca38925271675cdebf1b Mon Sep 17 00:00:00 2001 From: Justin Lovinger Date: Sun, 27 Sep 2020 18:35:42 -0400 Subject: [PATCH 272/293] maintainers: add JustinLovinger --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 608f28dbadb..8b8b8a2d9c7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4262,6 +4262,12 @@ githubId = 39434424; name = "Felix Springer"; }; + justinlovinger = { + email = "git@justinlovinger.com"; + github = "JustinLovinger"; + githubID = 7183441; + name = "Justin Lovinger"; + }; justinwoo = { email = "moomoowoo@gmail.com"; github = "justinwoo"; From d93e6842d42f7c50885458d2e73cd18ef48c9967 Mon Sep 17 00:00:00 2001 From: Justin Lovinger Date: Sun, 27 Sep 2020 18:36:34 -0400 Subject: [PATCH 273/293] wtype: init at 2020-09-14 --- pkgs/tools/wayland/wtype/default.nix | 34 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/tools/wayland/wtype/default.nix diff --git a/pkgs/tools/wayland/wtype/default.nix b/pkgs/tools/wayland/wtype/default.nix new file mode 100644 index 00000000000..a1c4744318e --- /dev/null +++ b/pkgs/tools/wayland/wtype/default.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchFromGitHub + +, meson +, ninja +, pkg-config + +, libxkbcommon +, wayland +}: + +stdenv.mkDerivation { + pname = "wtype"; + version = "2020-09-14"; + + src = fetchFromGitHub { + owner = "atx"; + repo = "wtype"; + rev = "74071228dea4047157ae82960a2541ecc431e4a1"; + sha256 = "1ncspxpnbwv1vkfmxs58q7aykjb6skaa1pg5sw5h798pss5j80rd"; + }; + + nativeBuildInputs = [ meson ninja pkg-config wayland ]; + buildInputs = [ libxkbcommon wayland ]; + + meta = with lib; { + description = "xdotool type for wayland"; + homepage = "https://github.com/atx/wtype"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ justinlovinger ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d4f035ae02..42515cbfeec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3406,6 +3406,8 @@ in wob = callPackage ../tools/misc/wob { }; + wtype = callPackage ../tools/wayland/wtype { }; + wrangler = callPackage ../development/tools/wrangler { }; xkcdpass = with pythonPackages; toPythonApplication xkcdpass; From 2870231e08557463c6c2f09c6bebab24a3ff0542 Mon Sep 17 00:00:00 2001 From: Justin Lovinger Date: Sun, 27 Sep 2020 18:37:44 -0400 Subject: [PATCH 274/293] rofimoji: init at 4.3.0 --- pkgs/applications/misc/rofimoji/default.nix | 45 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 49 insertions(+) create mode 100644 pkgs/applications/misc/rofimoji/default.nix diff --git a/pkgs/applications/misc/rofimoji/default.nix b/pkgs/applications/misc/rofimoji/default.nix new file mode 100644 index 00000000000..b76b1d6d21e --- /dev/null +++ b/pkgs/applications/misc/rofimoji/default.nix @@ -0,0 +1,45 @@ +{ buildPythonApplication +, fetchFromGitHub +, lib + +, waylandSupport ? true +, x11Support ? true + +, ConfigArgParse +, pyxdg +, rofi +, wl-clipboard +, wtype +, xdotool +, xsel +}: + +buildPythonApplication rec { + pname = "rofimoji"; + version = "4.3.0"; + + src = fetchFromGitHub { + owner = "fdw"; + repo = "rofimoji"; + rev = version; + sha256 = "08ayndpifr04njpijc5n5ii5nvibfpab39p6ngyyj0pb43792a8j"; + }; + + # `rofi` and the `waylandSupport` and `x11Support` dependencies + # contain binaries needed at runtime. + propagatedBuildInputs = with lib; [ ConfigArgParse pyxdg rofi ] + ++ optionals waylandSupport [ wl-clipboard wtype ] + ++ optionals x11Support [ xdotool xsel ]; + + # The 'extractors' sub-module is used for development + # and has additional dependencies. + postPatch = "rm -rf extractors"; + + meta = with lib; { + description = "A simple emoji and character picker for rofi"; + homepage = "https://github.com/fdw/rofimoji"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ justinlovinger ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 42515cbfeec..96ae0dcae01 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23077,6 +23077,10 @@ in rofi-systemd = callPackage ../tools/system/rofi-systemd { }; + rofimoji = callPackage ../applications/misc/rofimoji { + inherit (python3Packages) buildPythonApplication ConfigArgParse pyxdg; + }; + rootlesskit = callPackage ../tools/virtualization/rootlesskit {}; rpcs3 = libsForQt514.callPackage ../misc/emulators/rpcs3 { }; From 69ed40f341e98b5591ef35787b6ab24c35f8ad32 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 27 Sep 2020 19:13:37 -0300 Subject: [PATCH 275/293] eweb: "pname-version" rewriting A cosmetic modification. --- .../tools/literate-programming/eweb/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/literate-programming/eweb/default.nix b/pkgs/development/tools/literate-programming/eweb/default.nix index 39e309c4ce4..82805af5804 100644 --- a/pkgs/development/tools/literate-programming/eweb/default.nix +++ b/pkgs/development/tools/literate-programming/eweb/default.nix @@ -1,25 +1,24 @@ { stdenv, fetchurl, python3, asciidoc }: stdenv.mkDerivation rec { - - name = "eweb-${meta.version}"; + pname = "eweb"; + version = "9.10"; src = fetchurl { - url = "mirror://sourceforge/project/eweb/${name}.tar.bz2"; + url = "mirror://sourceforge/project/eweb/${pname}-${version}.tar.bz2"; sha256 = "1xy7vm2sj5q6s620fm25klmnwnz9xkrxmx4q2f8h6c85ydisayd5"; }; buildInputs = [ python3 asciidoc ]; installPhase = '' - install -d $out/bin $out/share/doc/${name} + install -d $out/bin $out/share/doc/${pname}-${version} cp etangle.py $out/bin - cp etangle.w etangle.html $out/share/doc/${name} + cp etangle.w etangle.html $out/share/doc/${pname}-${version} ''; meta = with stdenv.lib; { - version = "9.10" ; - homepage = "http://eweb.sf.net"; + homepage = "http://eweb.sourceforge.net/"; description = "An Asciidoc-based literate programming tool, written in Python"; platforms = platforms.linux; license = licenses.gpl3Plus; From 6c44133fac321e3fd324d36ce091be492e556030 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Tue, 22 Sep 2020 11:16:18 +0200 Subject: [PATCH 276/293] perldevel: 5.33.1 -> 5.33.2 dependencies: perl-cross: 15ca5359f99698ef0a199bc307b7956c08907abc -> f59d2b6a179760230d925550db78b93c410433e4 --- pkgs/development/interpreters/perl/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 991c385cedc..a817861f6f3 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -175,11 +175,11 @@ let priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl` }; } // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { - crossVersion = "15ca5359f99698ef0a199bc307b7956c08907abc"; # Aug 27, 2020 + crossVersion = "f59d2b6a179760230d925550db78b93c410433e4"; # Sept 22, 2020 perl-cross-src = fetchurl { url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz"; - sha256 = "0pcwv2ac02i2l0fjc8drdw70q6gwbypj2c5a53x2449m919v37h9"; + sha256 = "1r07waq4ik4gf32c046f27pglwcy5rv9b6whj6497xbxfmaa5562"; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; @@ -215,7 +215,7 @@ in { perldevel = common { perl = pkgs.perldevel; buildPerl = buildPackages.perldevel; - version = "5.33.1"; - sha256 = "1rlnqqqzyhal79ys5dv7fwm3mg81s43dwks28b74x2gcmsngjnw9"; + version = "5.33.2"; + sha256 = "0zrb3d744argzy5idmafk92iprq9qbhzqbg4xj5w2i80sgg41212"; }; } From 33ea2bb6b588249cd28fab2b74eb2b9261a96490 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Mon, 28 Sep 2020 02:18:34 +0200 Subject: [PATCH 277/293] maintainers: fix incorrect attribute githubId for justinlovinger --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8b8b8a2d9c7..2c6a06ff010 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4265,7 +4265,7 @@ justinlovinger = { email = "git@justinlovinger.com"; github = "JustinLovinger"; - githubID = 7183441; + githubId = 7183441; name = "Justin Lovinger"; }; justinwoo = { From 2f4f052f7cd5c71145f3ab58ae6ed18552716d7e Mon Sep 17 00:00:00 2001 From: ccellado Date: Sat, 26 Sep 2020 17:33:43 +0300 Subject: [PATCH 278/293] pyvips: init at 2.1.12 pyvips: init at 2.1.12 pyvips: init at 2.1.12 Update pkgs/development/python-modules/pyvips/default.nix Co-authored-by: Jon Update pkgs/development/python-modules/pyvips/default.nix Co-authored-by: Jon Update pkgs/development/python-modules/pyvips/default.nix Co-authored-by: Jon Update pkgs/development/python-modules/pyvips/default.nix Co-authored-by: Jon Update pkgs/development/python-modules/pyvips/default.nix Co-authored-by: Jon Update pkgs/top-level/python-packages.nix Co-authored-by: Jon Update pkgs/development/python-modules/pyvips/default.nix Co-authored-by: Jon pyvips: init at 2.1.12 Update pkgs/development/python-modules/pyvips/default.nix Co-authored-by: Jon --- .../python-modules/pyvips/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 +++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/pyvips/default.nix diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix new file mode 100644 index 00000000000..0f5f9a4b43a --- /dev/null +++ b/pkgs/development/python-modules/pyvips/default.nix @@ -0,0 +1,31 @@ +{ buildPythonPackage, fetchPypi, pytestrunner, pytestCheckHook, glib, vips, cffi +, pkg-config, pkgconfig, lib }: + +buildPythonPackage rec { + pname = "pyvips"; + version = "2.1.12"; + + src = fetchPypi { + inherit pname version; + sha256 = "0pg0dxhxgi2m7bb5bi5wpx9hgnbi8ws1bz6w2dldbhi52pizghl4"; + }; + + nativeBuildInputs = [ pytestrunner pkgconfig pkg-config ]; + + buildInputs = [ glib vips ]; + + propagatedBuildInputs = [ cffi ]; + + # tests are not included in pypi tarball + doCheck = false; + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "pyvips" ]; + + meta = with lib; { + description = "A python wrapper for libvips"; + homepage = "https://github.com/libvips/pyvips"; + license = licenses.mit; + maintainers = with maintainers; [ ccellado ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 26db1264667..95e51dba242 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5897,6 +5897,10 @@ in { pyviz-comms = callPackage ../development/python-modules/pyviz-comms { }; + pyvips = callPackage ../development/python-modules/pyvips { + inherit (pkgs) pkg-config vips glib; + }; + pyvmomi = callPackage ../development/python-modules/pyvmomi { }; pyvoro = callPackage ../development/python-modules/pyvoro { }; From 4702c49f23cbe5d77d35fef622f34f48ab987204 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 28 Sep 2020 07:23:45 +0200 Subject: [PATCH 279/293] wpsoffice: keep using ffmpeg_3 Partial revert of aa919664306e000db2085f80cc230f7d44214fc3 Related to #98945 --- pkgs/applications/office/wpsoffice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index e34c548f601..cc8412e1ac5 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -12,7 +12,7 @@ , cups , dbus , expat -, ffmpeg +, ffmpeg_3 , fontconfig , freetype , gdk-pixbuf @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { cairo dbus.lib expat - ffmpeg + ffmpeg_3 fontconfig freetype gdk-pixbuf From 11ce7675cf6e96584954f8e89859bc80dddab897 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Mon, 28 Sep 2020 01:04:25 +0200 Subject: [PATCH 280/293] yggdrasil: 0.3.14 -> 0.3.15 --- pkgs/tools/networking/yggdrasil/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/yggdrasil/default.nix b/pkgs/tools/networking/yggdrasil/default.nix index 90cd64b83ad..d5ecae75eb1 100644 --- a/pkgs/tools/networking/yggdrasil/default.nix +++ b/pkgs/tools/networking/yggdrasil/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yggdrasil"; - version = "0.3.14"; + version = "0.3.15"; src = fetchFromGitHub { owner = "yggdrasil-network"; repo = "yggdrasil-go"; rev = "v${version}"; - sha256 = "147kl2kvv1rn3yk0mlvd998a2yayjl07csxxkjvs6264j6csb860"; + sha256 = "1nf00ygp55l01c0gdkw15f08p3hmn6s2r99lgf2xpq8jn75qra4i"; }; - vendorSha256 = "09xv2p9rydnsb185x61fxhyjqx41wz285c1gdd47ad3s08ay1qc7"; + vendorSha256 = "1zk6h1isxyml9asyb7g4scbhnfwghqwnv40a5f5j7z0s0s4nybdp"; doCheck = false; From 170d1a605d7e170a114bdce5e47d7eff278c9701 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 Sep 2020 09:17:09 +0000 Subject: [PATCH 281/293] discord-canary: 0.0.112 -> 0.0.114 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 649e3b673df..8672f64be38 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -27,10 +27,10 @@ in { pname = "discord-canary"; binaryName = "DiscordCanary"; desktopName = "Discord Canary"; - version = "0.0.112"; + version = "0.0.114"; src = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "1ibw3lsk1060g6b79v78292q45ayqj3izrs3ilvg4gfwmfxmm1a0"; + sha256 = "0j3w4jf4jisrpz03462sqjsrvjw50kqqq3psyympw0jb1wjccc41"; }; }; }.${branch} From 211ba8bfa3a27adb802c47fede7a0d0c6106017b Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Mon, 28 Sep 2020 14:03:10 +0200 Subject: [PATCH 282/293] molly-brown: 2020-07-06 -> 2020-08-19 --- pkgs/servers/gemini/molly-brown/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/gemini/molly-brown/default.nix b/pkgs/servers/gemini/molly-brown/default.nix index 216a4015ef9..354412a4b73 100644 --- a/pkgs/servers/gemini/molly-brown/default.nix +++ b/pkgs/servers/gemini/molly-brown/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { pname = "molly-brown"; - version = "unstable-2020-07-06"; - rev = "2e510328ef1737c67641c588095e4628e3dfa8d3"; + version = "unstable-2020-08-19"; + rev = "48f9a206c03c0470e1c132b9667c6daa3583dada"; goPackagePath = "tildegit.org/solderpunk/molly-brown"; src = fetchgit { inherit rev; url = "https://tildegit.org/solderpunk/molly-brown.git"; - sha256 = "0c2pmkcs5a04h2vwzbhj6rg47mb9wcmkh22i56kx7clh51wbbvc4"; + sha256 = "1w79a25mbgav95p78fkdm9j62chwwpkqv0m2wmh5my03yq398gya"; }; goDeps = ./deps.nix; From 9fa50bea7800c4adea330c881c6438875722db8d Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Mon, 28 Sep 2020 13:28:55 +0200 Subject: [PATCH 283/293] nixos/molly-brown: refactor module to use a TOML generator --- .../services/web-servers/molly-brown.nix | 21 +++---------------- 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/nixos/modules/services/web-servers/molly-brown.nix b/nixos/modules/services/web-servers/molly-brown.nix index e9052a184b2..e0587f3b471 100644 --- a/nixos/modules/services/web-servers/molly-brown.nix +++ b/nixos/modules/services/web-servers/molly-brown.nix @@ -4,23 +4,8 @@ with lib; let cfg = config.services.molly-brown; - - settingsType = with types; - attrsOf (oneOf [ - int - str - (listOf str) - (attrsOf (oneOf [ int str (listOf str) (attrsOf str) ])) - ]) // { - description = "primitive expression convertable to TOML"; - }; - - configFile = pkgs.runCommand "molly-brown.toml" { - buildInputs = [ pkgs.remarshal ]; - preferLocalBuild = true; - passAsFile = [ "settings" ]; - settings = builtins.toJSON cfg.settings; - } "remarshal -if json -of toml < $settingsPath > $out"; + settingsFormat = pkgs.formats.toml { }; + configFile = settingsFormat.generate "molly-brown.toml" cfg.settings; in { options.services.molly-brown = { @@ -76,7 +61,7 @@ in { }; settings = mkOption { - type = settingsType; + inherit (settingsFormat) type; default = { }; description = '' molly-brown configuration. Refer to From 202f4bd5d8241296daa257eea6cd74bd2015e8a4 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 28 Sep 2020 14:40:40 +0200 Subject: [PATCH 284/293] =?UTF-8?q?ocamlPackages.mirage-stack:=202.1.0=20?= =?UTF-8?q?=E2=86=92=202.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/mirage-stack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-stack/default.nix b/pkgs/development/ocaml-modules/mirage-stack/default.nix index 528ea68d985..57e0f99ab1b 100644 --- a/pkgs/development/ocaml-modules/mirage-stack/default.nix +++ b/pkgs/development/ocaml-modules/mirage-stack/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "mirage-stack"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { url = "https://github.com/mirage/mirage-stack/releases/download/v${version}/mirage-stack-v${version}.tbz"; - sha256 = "1y110i4kjr03b0ji3q5h0bi3n3q8mdkfflb3fyq5rvpi5l45vvdb"; + sha256 = "1qhi0ghcj4j3hw7yqn085ac6n18b6b66z5ih3k8p79m4cvn7cdq0"; }; propagatedBuildInputs = [ mirage-protocols ]; From 6bb6779b8eac702cae18756cfb91468a31dbacd9 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 28 Sep 2020 14:53:09 +0200 Subject: [PATCH 285/293] =?UTF-8?q?ocamlPackages.asn1-combinators:=200.2.2?= =?UTF-8?q?=20=E2=86=92=200.2.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/asn1-combinators/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix index 16b4413291a..556c749011f 100644 --- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix +++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix @@ -6,11 +6,11 @@ buildDunePackage rec { minimumOCamlVersion = "4.05"; pname = "asn1-combinators"; - version = "0.2.2"; + version = "0.2.3"; src = fetchurl { url = "https://github.com/mirleft/ocaml-asn1-combinators/releases/download/v${version}/asn1-combinators-v${version}.tbz"; - sha256 = "0c9n3nki3drjwn7yv2pg7nzyzsi409laq70830wh147hvvwxbsy9"; + sha256 = "1z73hc17f5m2i4bfxw0g94fsri67f8vha812mm8klz4ggs8y7d6r"; }; propagatedBuildInputs = [ cstruct zarith bigarray-compat stdlib-shims ptime ]; From 1e510a65a3596bc052167fe05a662cbcbc488989 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Mon, 28 Sep 2020 17:07:45 +0200 Subject: [PATCH 286/293] programs.neovim: init (#98506) * programs.neovim: init Allows to build a proper runtime folder with after/ ftplugin/ parser/ subfolders etc. (neo)vim expects a few different folders, for instance to load treesitter parsers. This PR reuses the builder from the etc module, notwithstanding the different modes/uid/gid. This allows to get rid of some autocmd in customRC (via proper use of the folder hierarchy) which is a win in my opinion. --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/neovim.nix | 165 ++++++++++++++++++++++++++++++ 2 files changed, 166 insertions(+) create mode 100644 nixos/modules/programs/neovim.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 13b53168b31..0aacd3e2eda 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -140,6 +140,7 @@ ./programs/mininet.nix ./programs/mtr.nix ./programs/nano.nix + ./programs/neovim.nix ./programs/nm-applet.nix ./programs/npm.nix ./programs/oblogout.nix diff --git a/nixos/modules/programs/neovim.nix b/nixos/modules/programs/neovim.nix new file mode 100644 index 00000000000..eaf049010ee --- /dev/null +++ b/nixos/modules/programs/neovim.nix @@ -0,0 +1,165 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.neovim; + + runtime' = filter (f: f.enable) (attrValues cfg.runtime); + + # taken from the etc module + runtime = pkgs.stdenvNoCC.mkDerivation { + name = "runtime"; + + builder = ../system/etc/make-etc.sh; + + preferLocalBuild = true; + allowSubstitutes = false; + + sources = map (x: x.source) runtime'; + targets = map (x: x.target) runtime'; + }; + +in { + options.programs.neovim = { + enable = mkEnableOption "Neovim"; + + defaultEditor = mkOption { + type = types.bool; + default = false; + description = '' + When enabled, installs neovim and configures neovim to be the default editor + using the EDITOR environment variable. + ''; + }; + + viAlias = mkOption { + type = types.bool; + default = false; + description = '' + Symlink vi to nvim binary. + ''; + }; + + vimAlias = mkOption { + type = types.bool; + default = false; + description = '' + Symlink vim to nvim binary. + ''; + }; + + withRuby = mkOption { + type = types.bool; + default = true; + description = "Enable ruby provider."; + }; + + configure = mkOption { + type = types.attrs; + default = {}; + example = literalExample '' + configure = { + customRC = $'''' + " here your custom configuration goes! + $''''; + packages.myVimPackage = with pkgs.vimPlugins; { + # loaded on launch + start = [ fugitive ]; + # manually loadable by calling `:packadd $plugin-name` + opt = [ ]; + }; + }; + ''; + description = '' + Generate your init file from your list of plugins and custom commands. + Neovim will then be wrapped to load nvim -u /nix/store/-vimrc + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.neovim-unwrapped; + defaultText = literalExample "pkgs.neovim-unwrapped"; + description = "The package to use for the neovim binary."; + }; + + finalPackage = mkOption { + type = types.package; + visible = false; + readOnly = true; + description = "Resulting customized neovim package."; + }; + + runtime = mkOption { + default = {}; + example = literalExample '' + runtime."ftplugin/c.vim".text = "setlocal omnifunc=v:lua.vim.lsp.omnifunc"; + ''; + description = '' + Set of files that have to be linked in runtime. + ''; + + type = with types; attrsOf (submodule ( + { name, config, ... }: + { options = { + + enable = mkOption { + type = types.bool; + default = true; + description = '' + Whether this /etc file should be generated. This + option allows specific /etc files to be disabled. + ''; + }; + + target = mkOption { + type = types.str; + description = '' + Name of symlink. Defaults to the attribute + name. + ''; + }; + + text = mkOption { + default = null; + type = types.nullOr types.lines; + description = "Text of the file."; + }; + + source = mkOption { + type = types.path; + description = "Path of the source file."; + }; + + }; + + config = { + target = mkDefault name; + source = mkIf (config.text != null) ( + let name' = "neovim-runtime" + baseNameOf name; + in mkDefault (pkgs.writeText name' config.text)); + }; + + })); + + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ + cfg.finalPackage + ]; + environment.variables = { EDITOR = mkOverride 900 "nvim"; }; + + programs.neovim.finalPackage = pkgs.wrapNeovim cfg.package { + inherit (cfg) viAlias vimAlias; + configure = cfg.configure // { + + customRC = (cfg.configure.customRC or "") + '' + set runtimepath^=${runtime}/etc + ''; + }; + }; + }; +} From 55dc3b76f0ca1dd62d158b92a637fe484df5227d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 28 Sep 2020 13:10:46 -0400 Subject: [PATCH 287/293] system76-firmware: 1.0.17 -> 1.0.18 --- .../linux/firmware/system76-firmware/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/system76-firmware/default.nix b/pkgs/os-specific/linux/firmware/system76-firmware/default.nix index 40598abac92..6da1df98b25 100644 --- a/pkgs/os-specific/linux/firmware/system76-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/system76-firmware/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "system76-firmware"; # Check Makefile when updating, make sure postInstall matches make install - version = "1.0.17"; + version = "1.0.18"; src = fetchFromGitHub { owner = "pop-os"; repo = pname; rev = version; - sha256 = "0cnrskfk3sam90lfpgsraqs4bx9yz8rxhwfs8rxdri04lakxgghg"; + sha256 = "08y65ak3y08xcl1nprwraqv9l65yqnfllbgmxyd2bppjpprwq474"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--workspace" ]; - cargoSha256 = "06jrmxy68glcmbn9px29wc0s8pqdn26iy4jn3c246dapv1zvbb4s"; + cargoSha256 = "00933zkhqd1l29ir2dgp5r1k7g24mlb2k8fmggwzplrwzw1al5h4"; # Purposefully don't install systemd unit file, that's for NixOS postInstall = '' From a10e457b636ae8ce2ebb2877f9c316b45ad736a6 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 28 Sep 2020 16:23:55 +0200 Subject: [PATCH 288/293] =?UTF-8?q?pythonPackages.psautohint:=202.1.0=20?= =?UTF-8?q?=E2=86=92=202.1.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/python-modules/psautohint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/psautohint/default.nix b/pkgs/development/python-modules/psautohint/default.nix index 0f89069c7d8..b439c05f0b8 100644 --- a/pkgs/development/python-modules/psautohint/default.nix +++ b/pkgs/development/python-modules/psautohint/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "psautohint"; - version = "2.1.0"; + version = "2.1.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "adobe-type-tools"; repo = pname; - sha256 = "1k1rx1adqxdxj5v3788lwnvygylp73sps1p0q44hws2vmsag2s8r"; + sha256 = "00n9bycjmvx1fb4332bdj53f01q86ajndrvid9idpiyzybmd5vp4"; rev = "v${version}"; fetchSubmodules = true; # data dir for tests }; From e378c36f1ce1a5ba3ea3da7cc34cc4e37c2e04e8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 Sep 2020 11:57:11 +0000 Subject: [PATCH 289/293] python27Packages.hg-evolve: 10.0.1 -> 10.0.2 --- pkgs/development/python-modules/hg-evolve/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix index c40d9672f65..14cace859e9 100644 --- a/pkgs/development/python-modules/hg-evolve/default.nix +++ b/pkgs/development/python-modules/hg-evolve/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "hg-evolve"; - version = "10.0.1"; + version = "10.0.2"; src = fetchPypi { inherit pname version; - sha256 = "9468b3e2721744b077413c3d4a6b321b61370d4c87b90afa40dc2b48ad877d4b"; + sha256 = "75892623258339613528df45dcd1004786bf73e8d95407886d79bc4567fbde4d"; }; doCheck = false; From 76dbece8e8240a911fcc5722f813a8453f90406f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 Sep 2020 19:59:19 +0000 Subject: [PATCH 290/293] python37Packages.biopython: 1.77 -> 1.78 --- pkgs/development/python-modules/biopython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix index f96b8447e8a..43b48aa03a4 100644 --- a/pkgs/development/python-modules/biopython/default.nix +++ b/pkgs/development/python-modules/biopython/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "biopython"; - version = "1.77"; + version = "1.78"; src = fetchPypi { inherit pname version; - sha256 = "fb1936e9ca9e7af8de1050e84375f23328e04b801063edf0ad73733494d8ec42"; + sha256 = "1ee0a0b6c2376680fea6642d5080baa419fd73df104a62d58a8baf7a8bbe4564"; }; disabled = !isPy3k; From cd7db06935196264f72d7b4041f22d46dce16ecb Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Mon, 28 Sep 2020 22:42:18 +0200 Subject: [PATCH 291/293] programs.neovim: fix documentation (#99023) brackets broke doc generation on master --- nixos/modules/programs/neovim.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/programs/neovim.nix b/nixos/modules/programs/neovim.nix index eaf049010ee..0a1a2ac2b75 100644 --- a/nixos/modules/programs/neovim.nix +++ b/nixos/modules/programs/neovim.nix @@ -73,7 +73,7 @@ in { ''; description = '' Generate your init file from your list of plugins and custom commands. - Neovim will then be wrapped to load nvim -u /nix/store/-vimrc + Neovim will then be wrapped to load nvim -u /nix/store/hash-vimrc ''; }; From 9630d5c07fbdb264fec79f428b0c65366a356a72 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Mon, 28 Sep 2020 19:43:54 +0200 Subject: [PATCH 292/293] nixos/security/wrapper: ensure the tmpfs is not world writeable The /run/wrapper directory is a tmpfs. Unfortunately, it's mounted with its root directory has the standard (for tmpfs) mode: 1777 (world writeable, sticky -- the standard mode of shared temporary directories). This means that every user can create new files and subdirectories there, but can't move/delete/rename files that belong to other users. --- nixos/modules/security/wrappers/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix index 38fba96b25e..f560f5c7628 100644 --- a/nixos/modules/security/wrappers/default.nix +++ b/nixos/modules/security/wrappers/default.nix @@ -169,7 +169,7 @@ in boot.specialFileSystems.${parentWrapperDir} = { fsType = "tmpfs"; - options = [ "nodev" ]; + options = [ "nodev" "mode=755" ]; }; # Make sure our wrapperDir exports to the PATH env variable when @@ -195,6 +195,8 @@ in # 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 @@ -205,6 +207,9 @@ 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 + fi ln --symbolic --force --no-dereference $wrapperDir ${wrapperDir}-tmp mv --no-target-directory ${wrapperDir}-tmp ${wrapperDir} rm --force --recursive $old From 046c6a7038998507134981c8a294bb70861484bf Mon Sep 17 00:00:00 2001 From: Redvers Davies Date: Mon, 28 Sep 2020 17:40:58 -0400 Subject: [PATCH 293/293] ponyc: update 0.38.1 (#98598) Co-authored-by: Dmitry Kalinkin --- pkgs/development/compilers/ponyc/default.nix | 102 +++++++++++------- .../ponyc/make-safe-for-sandbox.patch | 93 ++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +- 3 files changed, 160 insertions(+), 38 deletions(-) create mode 100644 pkgs/development/compilers/ponyc/make-safe-for-sandbox.patch diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index e48e454a0a4..566fd7be311 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -1,64 +1,92 @@ -{ stdenv, fetchFromGitHub, llvm, makeWrapper, pcre2, coreutils, which, libressl, libxml2, +{ stdenv, fetchFromGitHub, fetchurl, makeWrapper, pcre2, coreutils, which, libressl, libxml2, cmake, z3, substituteAll, cc ? stdenv.cc, lto ? !stdenv.isDarwin }: -stdenv.mkDerivation ( rec { +stdenv.mkDerivation (rec { pname = "ponyc"; - version = "0.33.2"; + version = "0.38.1"; src = fetchFromGitHub { owner = "ponylang"; repo = pname; rev = version; - sha256 = "0jcdr1r3g8sm3q9fcc87d6x98fg581n6hb90hz7r08mzn4bwvysw"; + sha256 = "1hk810k9h3bl641pgw91y4x2qw67rvbapx6p2pk9qz5p7nfcn7qh"; + +# Due to a bug in LLVM 9.x, ponyc has to include its own vendored patched +# LLVM. (The submodule is a specific tag in the LLVM source tree). +# +# The pony developers are currently working to get off 9.x as quickly +# as possible so hopefully in a few revisions this package build will +# become a lot simpler. +# +# https://reviews.llvm.org/rG9f4f237e29e7150dfcf04ae78fa287d2dc8d48e2 + + fetchSubmodules = true; }; - buildInputs = [ llvm makeWrapper which libxml2 ]; + ponygbenchmark = fetchurl { + url = https://github.com/google/benchmark/archive/v1.5.0.tar.gz; + sha256 = "06i2cr4rj126m1zfz0x1rbxv1mw1l7a11mzal5kqk56cdrdicsiw"; + name = "v1.5.0.tar.gz"; + }; + + buildInputs = [ makeWrapper which libxml2 cmake z3 ]; propagatedBuildInputs = [ cc ]; - # Disable problematic networking tests - patches = [ ./disable-tests.patch ]; + # Sandbox disallows network access, so disabling problematic networking tests + patches = [ + ./disable-tests.patch + (substituteAll { + src = ./make-safe-for-sandbox.patch; + googletest = fetchurl { + url = https://github.com/google/googletest/archive/release-1.8.1.tar.gz; + sha256 = "17147961i01fl099ygxjx4asvjanwdd446nwbq9v8156h98zxwcv"; + name = "release-1.8.1.tar.gz"; + }; + }) + ]; + + postUnpack = '' + mkdir -p source/build/build_libs/gbenchmark-prefix/src + tar -C source/build/build_libs/gbenchmark-prefix/src -zxvf "$ponygbenchmark" + mv source/build/build_libs/gbenchmark-prefix/src/benchmark-1.5.0 \ + source/build/build_libs/gbenchmark-prefix/src/benchmark + ''; + + dontConfigure = true; + + postPatch = '' + # Patching Vendor LLVM + patchShebangs --host build/build_libs/gbenchmark-prefix/src/benchmark/tools/*.py + patch -d lib/llvm/src/ -p1 < lib/llvm/patches/2020-09-01-is-trivially-copyable.diff + patch -d lib/llvm/src/ -p1 < lib/llvm/patches/2020-01-07-01-c-exports.diff + patch -d lib/llvm/src/ -p1 < lib/llvm/patches/2019-12-23-01-jit-eh-frames.diff - preBuild = '' - # Fix tests - substituteInPlace packages/process/_test.pony \ - --replace '"/bin/' '"${coreutils}/bin/' substituteInPlace packages/process/_test.pony \ + --replace '"/bin/' '"${coreutils}/bin/' \ --replace '=/bin' "${coreutils}/bin" - - # Disabling the stdlib tests - substituteInPlace Makefile-ponyc \ - --replace 'test-ci: all check-version test-core test-stdlib-debug test-stdlib' 'test-ci: all check-version test-core' - - # Remove impure system refs substituteInPlace src/libponyc/pkg/package.c \ --replace "/usr/local/lib" "" \ --replace "/opt/local/lib" "" - - for file in `grep -irl '/usr/local/opt/libressl/lib' ./*`; do - substituteInPlace $file --replace '/usr/local/opt/libressl/lib' "${stdenv.lib.getLib libressl}/lib" - done - - export LLVM_CONFIG=${llvm}/bin/llvm-config - '' + stdenv.lib.optionalString ((!stdenv.isDarwin) && (!cc.isClang) && lto) '' - export LTO_PLUGIN=`find ${cc.cc}/ -name liblto_plugin.so` - '' + stdenv.lib.optionalString ((!stdenv.isDarwin) && (cc.isClang) && lto) '' - export LTO_PLUGIN=`find ${cc.cc}/ -name LLVMgold.so` ''; - makeFlags = [ "config=release" ] ++ stdenv.lib.optionals stdenv.isDarwin [ "bits=64" ] - ++ stdenv.lib.optionals (stdenv.isDarwin && (!lto)) [ "lto=no" ]; + + preBuild = '' + make libs build_flags=-j$NIX_BUILD_CORES + make configure build_flags=-j$NIX_BUILD_CORES + ''; + + makeFlags = [ + "PONYC_VERSION=${version}" + "prefix=${placeholder "out"}" + ] + ++ stdenv.lib.optionals stdenv.isDarwin [ "bits=64" ] + ++ stdenv.lib.optionals (stdenv.isDarwin && (!lto)) [ "lto=no" ]; enableParallelBuilding = true; doCheck = true; - checkTarget = "test-ci"; - - NIX_CFLAGS_COMPILE = [ "-Wno-error=redundant-move" ]; - - preCheck = '' - export PONYPATH="$out/lib:${stdenv.lib.makeLibraryPath [ pcre2 libressl ]}" - ''; + NIX_CFLAGS_COMPILE = [ "-Wno-error=redundant-move" "-Wno-error=implicit-fallthrough" ]; installPhase = '' make config=release prefix=$out '' @@ -79,7 +107,7 @@ stdenv.mkDerivation ( rec { description = "Pony is an Object-oriented, actor-model, capabilities-secure, high performance programming language"; homepage = "https://www.ponylang.org"; license = licenses.bsd2; - maintainers = with maintainers; [ doublec kamilchm patternspandemic ]; + maintainers = with maintainers; [ doublec kamilchm patternspandemic redvers ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; }) diff --git a/pkgs/development/compilers/ponyc/make-safe-for-sandbox.patch b/pkgs/development/compilers/ponyc/make-safe-for-sandbox.patch new file mode 100644 index 00000000000..b07763a475d --- /dev/null +++ b/pkgs/development/compilers/ponyc/make-safe-for-sandbox.patch @@ -0,0 +1,93 @@ +--- a/lib/CMakeLists.txt 2020-09-27 02:39:12.862940179 +0000 ++++ b/lib/CMakeLists.txt 2020-09-27 02:39:16.451957865 +0000 +@@ -10,12 +10,12 @@ + endif() + + ExternalProject_Add(gbenchmark +- URL https://github.com/google/benchmark/archive/v1.5.0.tar.gz ++ SOURCE_DIR gbenchmark-prefix/src/benchmark + CMAKE_ARGS -DCMAKE_BUILD_TYPE=${PONYC_LIBS_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DBENCHMARK_ENABLE_GTEST_TESTS=OFF -DCMAKE_CXX_FLAGS=-fpic --no-warn-unused-cli + ) + + ExternalProject_Add(googletest +- URL https://github.com/google/googletest/archive/release-1.8.1.tar.gz ++ URL @googletest@ + CMAKE_ARGS -DCMAKE_BUILD_TYPE=${PONYC_LIBS_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_CXX_FLAGS=-fpic -Dgtest_force_shared_crt=ON --no-warn-unused-cli + ) + +@@ -28,75 +28,6 @@ + COMPONENT library + ) + +-find_package(Git) +- +-set(LLVM_DESIRED_HASH "c1a0a213378a458fbea1a5c77b315c7dce08fd05") +-set(PATCHES_DESIRED_HASH "9063f83d727bf042a1232420e168c1ea192bf6a2960d35e57123245b630eb923") +- +-if(GIT_FOUND) +- if(EXISTS "${PROJECT_SOURCE_DIR}/../.git") +- # Update submodules as needed +- option(GIT_SUBMODULE "Check submodules during build" ON) +- if(GIT_SUBMODULE) +- message(STATUS "Updating submodules...") +- execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- RESULT_VARIABLE git_submod_result) +- #message("git_submod_result ${git_submod_result}") +- if(NOT git_submod_result EQUAL "0") +- message(FATAL_ERROR "git submodule update --init --recursive failed with ${git_submod_result}, please checkout submodules") +- endif() +- +- # we check to make sure the submodule hash matches +- # the reason the submodule hash is in this file is to be able to use this file as a key for caching the libs in CI +- execute_process(COMMAND ${GIT_EXECUTABLE} submodule status +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- OUTPUT_VARIABLE git_submod_output) +- #message("git_submod_output ${git_submod_output}") +- string(FIND "${git_submod_output}" "${LLVM_DESIRED_HASH}" LLVM_SUBMOD_POS) +- if(LLVM_SUBMOD_POS EQUAL "-1") +- message(FATAL_ERROR "Expecting the lib/llvm/src submodule to be at hash '${LLVM_DESIRED_HASH}'; found '${git_submod_output}'; update the LLVM_DESIRED_HASH variable in lib/CMakeLists.txt if you've updated the submodule.") +- endif() +- endif() +- endif() +- +- # Apply patches +- message("Applying patches...") +- file(GLOB PONY_LLVM_PATCHES "${PROJECT_SOURCE_DIR}/llvm/patches/*.diff") +- +- # check to see if the patch hashes match +- set(PATCHES_ACTUAL_HASH "") +- foreach (PATCH ${PONY_LLVM_PATCHES}) +- file(SHA256 ${PATCH} patch_file_hash) +- string(CONCAT PATCHES_ACTUAL_HASH patch_file_hash) +- endforeach() +- string(SHA256 PATCHES_ACTUAL_HASH ${PATCHES_ACTUAL_HASH}) +- if(NOT PATCHES_ACTUAL_HASH EQUAL "${PATCHES_DESIRED_HASH}") +- message(FATAL_ERROR "Patch hash actual ${PATCHES_ACTUAL_HASH} does not match desired ${PATCHES_DESIRED_HASH}") +- endif() +- +- foreach (PATCH ${PONY_LLVM_PATCHES}) +- message(" Checking ${PATCH}") +- execute_process(COMMAND ${GIT_EXECUTABLE} apply --check -p 1 --ignore-whitespace --whitespace=nowarn ${PATCH} +- WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/llvm/src" +- ERROR_VARIABLE _err_out +- RESULT_VARIABLE git_apply_check_result) +- if(git_apply_check_result EQUAL "0") +- message(" Applying ${PATCH}") +- execute_process(COMMAND ${GIT_EXECUTABLE} apply -p 1 --ignore-whitespace --whitespace=nowarn ${PATCH} +- WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/llvm/src" +- RESULT_VARIABLE git_apply_result) +- if(NOT git_apply_result EQUAL "0") +- message(FATAL_ERROR "Unable to apply ${PATCH}") +- endif() +- else() +- message(" Already applied ${PATCH}") +- endif() +- endforeach() +-else() +- message(FATAL_ERROR "Git not found!") +-endif() +- + if (NOT DEFINED LLVM_TARGETS_TO_BUILD) + set(LLVM_TARGETS_TO_BUILD X86) + endif() diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20090f0f299..099b8b30537 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9605,7 +9605,8 @@ in picat = callPackage ../development/compilers/picat { }; ponyc = callPackage ../development/compilers/ponyc { - llvm = llvm_7; + # Upstream pony has dropped support for versions compiled with gcc. + stdenv = clangStdenv; }; pony-stable = callPackage ../development/compilers/ponyc/pony-stable.nix { };