diff options
242 files changed, 3779 insertions, 2709 deletions
diff --git a/lib/default.nix b/lib/default.nix index 4971e68ebd3a..a909cefd60f1 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -56,6 +56,9 @@ let # back-compat aliases platforms = systems.doubles; + # linux kernel configuration + kernel = callLibs ./kernel.nix; + inherit (builtins) add addErrorContext attrNames concatLists deepSeq elem elemAt filter genericClosure genList getAttr hasAttr head isAttrs isBool isInt isList isString length diff --git a/lib/kernel.nix b/lib/kernel.nix index 36ea30838289..2ce19f8cb68c 100644 --- a/lib/kernel.nix +++ b/lib/kernel.nix @@ -1,12 +1,7 @@ -{ lib, version }: +{ lib }: with lib; { - # Common patterns/legacy - whenAtLeast = ver: mkIf (versionAtLeast version ver); - whenOlder = ver: mkIf (versionOlder version ver); - # range is (inclusive, exclusive) - whenBetween = verLow: verHigh: mkIf (versionAtLeast version verLow && versionOlder version verHigh); # Keeping these around in case we decide to change this horrible implementation :) @@ -18,4 +13,14 @@ with lib; module = { tristate = "m"; }; freeform = x: { freeform = x; }; + /* + Common patterns/legacy used in common-config/hardened-config.nix + */ + whenHelpers = version: { + whenAtLeast = ver: mkIf (versionAtLeast version ver); + whenOlder = ver: mkIf (versionOlder version ver); + # range is (inclusive, exclusive) + whenBetween = verLow: verHigh: mkIf (versionAtLeast version verLow && versionOlder version verHigh); + }; + } diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 574619b2b31f..aa70b26d2040 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1,5 +1,5 @@ /* List of NixOS maintainers. - + ```nix handle = { # Required name = "Your name"; @@ -13,32 +13,33 @@ fingerprint = "AAAA BBBB CCCC DDDD EEEE FFFF 0000 1111 2222 3333"; }]; }; + ``` - where + where - - `handle` is the handle you are going to use in nixpkgs expressions, - - `name` is your, preferably real, name, - - `email` is your maintainer email address, and - - `github` is your GitHub handle (as it appears in the URL of your profile page, `https://github.com/<userhandle>`), - - `githubId` is your GitHub user ID, which can be found at `https://api.github.com/users/<userhandle>`, - - `keys` is a list of your PGP/GPG key IDs and fingerprints. + - `handle` is the handle you are going to use in nixpkgs expressions, + - `name` is your, preferably real, name, + - `email` is your maintainer email address, and + - `github` is your GitHub handle (as it appears in the URL of your profile page, `https://github.com/<userhandle>`), + - `githubId` is your GitHub user ID, which can be found at `https://api.github.com/users/<userhandle>`, + - `keys` is a list of your PGP/GPG key IDs and fingerprints. - `handle == github` is strongly preferred whenever `github` is an acceptable attribute name and is short and convenient. + `handle == github` is strongly preferred whenever `github` is an acceptable attribute name and is short and convenient. - Add PGP/GPG keys only if you actually use them to sign commits and/or mail. + Add PGP/GPG keys only if you actually use them to sign commits and/or mail. - To get the required PGP/GPG values for a key run - ```shell - gpg --keyid-format 0xlong --fingerprint <email> | head -n 2 - ``` + To get the required PGP/GPG values for a key run + ```shell + gpg --keyid-format 0xlong --fingerprint <email> | head -n 2 + ``` - !!! Note that PGP/GPG values stored here are for informational purposes only, don't use this file as a source of truth. + !!! Note that PGP/GPG values stored here are for informational purposes only, don't use this file as a source of truth. - More fields may be added in the future. + More fields may be added in the future. - Please keep the list alphabetically sorted. - See `./scripts/check-maintainer-github-handles.sh` for an example on how to work with this data. - */ + Please keep the list alphabetically sorted. + See `./scripts/check-maintainer-github-handles.sh` for an example on how to work with this data. +*/ { "0x4A6F" = { email = "0x4A6F@shackspace.de"; @@ -1572,10 +1573,12 @@ githubId = 2217136; name = "Ștefan D. Mihăilă"; keys = [ - { longkeyid = "rsa4096/6E68A39BF16A3ECB"; + { + longkeyid = "rsa4096/6E68A39BF16A3ECB"; fingerprint = "CBC9 C7CC 51F0 4A61 3901 C723 6E68 A39B F16A 3ECB"; } - { longkeyid = "rsa4096/6220AD7846220A52"; + { + longkeyid = "rsa4096/6220AD7846220A52"; fingerprint = "7EAB 1447 5BBA 7DDE 7092 7276 6220 AD78 4622 0A52"; } ]; @@ -1792,7 +1795,7 @@ name = "Didier J. Devroye"; }; devhell = { - email = "\"^\"@regexmail.net"; + email = ''"^"@regexmail.net''; github = "devhell"; githubId = 896182; name = "devhell"; @@ -1958,7 +1961,7 @@ drewrisinger = { email = "drisinger+nixpkgs@gmail.com"; github = "drewrisinger"; - gitHubId = 10198051; + githubId = 10198051; name = "Drew Risinger"; }; dsferruzza = { @@ -2131,7 +2134,7 @@ }; ehmry = { email = "ehmry@posteo.net"; - github= "ehmry"; + github = "ehmry"; githubId = 537775; name = "Emery Hemingway"; }; @@ -2219,10 +2222,10 @@ name = "Jack Kelly"; }; enorris = { - name = "Eric Norris"; - email = "erictnorris@gmail.com"; - github = "ericnorris"; - githubId = 1906605; + name = "Eric Norris"; + email = "erictnorris@gmail.com"; + github = "ericnorris"; + githubId = 1906605; }; Enteee = { email = "nix@duckpond.ch"; @@ -2891,7 +2894,7 @@ github = "hansjoergschurr"; githubId = 9850776; name = "Hans-Jörg Schurr"; - }; + }; HaoZeke = { email = "r95g10@gmail.com"; github = "haozeke"; @@ -3099,7 +3102,7 @@ illiusdope = { email = "mat@marini.ca"; github = "illiusdope"; - gitHubId = 61913481; + githubId = 61913481; name = "Mat Marini"; }; ilya-fedin = { @@ -4224,10 +4227,10 @@ }]; }; luis = { - email = "luis.nixos@gmail.com"; - github = "Luis-Hebendanz"; - githubId = 22085373; - name = "Luis Hebendanz"; + email = "luis.nixos@gmail.com"; + github = "Luis-Hebendanz"; + githubId = 22085373; + name = "Luis Hebendanz"; }; lionello = { email = "lio@lunesu.com"; @@ -4470,12 +4473,12 @@ githubId = 50230945; name = "Marcus Boyd"; }; - marenz = { - email = "marenz@arkom.men"; - github = "marenz2569"; - githubId = 12773269; - name = "Markus Schmidl"; - }; + marenz = { + email = "marenz@arkom.men"; + github = "marenz2569"; + githubId = 12773269; + name = "Markus Schmidl"; + }; markus1189 = { email = "markus1189@gmail.com"; github = "markus1189"; @@ -4544,6 +4547,12 @@ githubId = 1711539; name = "matklad"; }; + matt-snider = { + email = "matt.snider@protonmail.com"; + github = "matt-snider"; + githubId = 11810057; + name = "Matt Snider"; + }; matthewbauer = { email = "mjbauer95@gmail.com"; github = "matthewbauer"; @@ -4719,7 +4728,7 @@ githubId = 668926; name = "Maximilian Güntner"; }; - mhaselsteiner = { + mhaselsteiner = { email = "magdalena.haselsteiner@gmx.at"; github = "mhaselsteiner"; githubId = 20536514; @@ -4884,11 +4893,11 @@ mmilata = { email = "martin@martinmilata.cz"; github = "mmilata"; - gitHubId = 85857; + githubId = 85857; name = "Martin Milata"; }; mmlb = { - email = "me.mmlb@mmlb.me"; + email = "manny@peekaboo.mmlb.icu"; github = "mmlb"; name = "Manuel Mendez"; }; @@ -5783,11 +5792,10 @@ github = "pradyuman"; githubId = 9904569; name = "Pradyuman Vig"; - keys = [ - { longkeyid = "rsa4096/4F74D5361C4CA31E"; - fingerprint = "240B 57DE 4271 2480 7CE3 EAC8 4F74 D536 1C4C A31E"; - } - ]; + keys = [{ + longkeyid = "rsa4096/4F74D5361C4CA31E"; + fingerprint = "240B 57DE 4271 2480 7CE3 EAC8 4F74 D536 1C4C A31E"; + }]; }; prikhi = { email = "pavan.rikhi@gmail.com"; @@ -5801,10 +5809,12 @@ githubId = 7537109; name = "Michael Weiss"; keys = [ - { longkeyid = "ed25519/0x130826A6C2A389FD"; # Git only + { + longkeyid = "ed25519/0x130826A6C2A389FD"; # Git only fingerprint = "86A7 4A55 07D0 58D1 322E 37FD 1308 26A6 C2A3 89FD"; } - { longkeyid = "rsa3072/0xBCA9943DD1DF4C04"; # Email, etc. + { + longkeyid = "rsa3072/0xBCA9943DD1DF4C04"; # Email, etc. fingerprint = "AF85 991C C950 49A2 4205 1933 BCA9 943D D1DF 4C04"; } ]; @@ -6170,12 +6180,10 @@ github = "rnhmjoj"; githubId = 2817565; name = "Michele Guerini Rocco"; - keys = - [ - { longkeyid = "ed25519/0xBFBAF4C975F76450"; - fingerprint = "92B2 904F D293 C94D C4C9 3E6B BFBA F4C9 75F7 6450"; - } - ]; + keys = [{ + longkeyid = "ed25519/0xBFBAF4C975F76450"; + fingerprint = "92B2 904F D293 C94D C4C9 3E6B BFBA F4C9 75F7 6450"; + }]; }; rob = { email = "rob.vermaas@gmail.com"; @@ -6380,10 +6388,10 @@ }]; }; samrose = { - email = "samuel.rose@gmail.com"; - github = "samrose"; - githubId = 115821; - name = "Sam Rose"; + email = "samuel.rose@gmail.com"; + github = "samrose"; + githubId = 115821; + name = "Sam Rose"; }; samueldr = { email = "samuel@dionne-riel.com"; @@ -6695,6 +6703,12 @@ githubId = 848812; name = "Stephan Jau"; }; + sjfloat = { + email = "steve+nixpkgs@jonescape.com"; + github = "sjfloat"; + githubId = 216167; + name = "Steve Jones"; + }; sjmackenzie = { email = "setori88@gmail.com"; github = "sjmackenzie"; @@ -7253,6 +7267,12 @@ githubId = 844343; name = "Thiago K. Okada"; }; + thmzlt = { + email = "git@thomazleite.com"; + github = "thmzlt"; + githubId = 7709; + name = "Thomaz Leite"; + }; ThomasMader = { email = "thomas.mader@gmail.com"; github = "ThomasMader"; @@ -7328,10 +7348,10 @@ github = "tkerber"; githubId = 5722198; name = "Thomas Kerber"; - keys = [ { + keys = [{ longkeyid = "rsa4096/0x8489B911F9ED617B"; fingerprint = "556A 403F B0A2 D423 F656 3424 8489 B911 F9ED 617B"; - } ]; + }]; }; tmplt = { email = "tmplt@dragons.rocks"; @@ -7611,7 +7631,8 @@ }; vcunat = { name = "Vladimír Čunát"; - email = "v@cunat.cz"; # vcunat@gmail.com predominated in commits before 2019/03 + # vcunat@gmail.com predominated in commits before 2019/03 + email = "v@cunat.cz"; github = "vcunat"; githubId = 1785925; keys = [{ diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index 77490ca3762a..9892d6f160f7 100644 --- a/nixos/lib/eval-config.nix +++ b/nixos/lib/eval-config.nix @@ -41,6 +41,12 @@ let # default to the argument. That way this new default could propagate all # they way through, but has the last priority behind everything else. nixpkgs.system = lib.mkDefault system; + + # Stash the value of the `system` argument. When using `nesting.children` + # we want to have the same default value behavior (immediately above) + # without any interference from the user's configuration. + nixpkgs.initialSystem = system; + _module.args.pkgs = lib.mkIf (pkgs_ != null) (lib.mkForce pkgs_); }; }; diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index 6663864f1e56..3891adc10435 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -175,13 +175,13 @@ in rec { nodeNames = builtins.attrNames nodes; invalidNodeNames = lib.filter - (node: builtins.match "^[A-z_][A-z0-9_]+$" node == null) nodeNames; + (node: builtins.match "^[A-z_]([A-z0-9_]+)?$" node == null) nodeNames; in if lib.length invalidNodeNames > 0 then throw '' Cannot create machines out of (${lib.concatStringsSep ", " invalidNodeNames})! - All machines are referenced as perl variables in the testing framework which will break the + All machines are referenced as python variables in the testing framework which will break the script when special characters are used. Please stick to alphanumeric chars and underscores as separation. diff --git a/nixos/lib/utils.nix b/nixos/lib/utils.nix index a522834e4294..21f4c7c6988f 100644 --- a/nixos/lib/utils.nix +++ b/nixos/lib/utils.nix @@ -14,7 +14,7 @@ rec { # becomes dev-xyzzy. FIXME: slow. escapeSystemdPath = s: replaceChars ["/" "-" " "] ["-" "\\x2d" "\\x20"] - (if hasPrefix "/" s then substring 1 (stringLength s) s else s); + (removePrefix "/" s); # Returns a system path for a given shell package toShellPath = shell: diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index 81427bb8ee64..dd36696b94d2 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -35,12 +35,22 @@ in ''; }; + networking.hostFiles = lib.mkOption { + type = types.listOf types.path; + defaultText = lib.literalExample "Hosts from `networking.hosts` and `networking.extraHosts`"; + example = lib.literalExample ''[ "''${pkgs.my-blocklist-package}/share/my-blocklist/hosts" ]''; + description = '' + Files that should be concatenated together to form <filename>/etc/hosts</filename>. + ''; + }; + networking.extraHosts = lib.mkOption { type = types.lines; default = ""; example = "192.168.0.1 lanlocalhost"; description = '' Additional verbatim entries to be appended to <filename>/etc/hosts</filename>. + For adding hosts from derivation results, use <option>networking.hostFiles</option> instead. ''; }; @@ -159,6 +169,15 @@ in "::1" = [ "localhost" ]; }; + networking.hostFiles = let + stringHosts = + let + oneToString = set: ip: ip + " " + concatStringsSep " " set.${ip} + "\n"; + allToString = set: concatMapStrings (oneToString set) (attrNames set); + in pkgs.writeText "string-hosts" (allToString (filterAttrs (_: v: v != []) cfg.hosts)); + extraHosts = pkgs.writeText "extra-hosts" cfg.extraHosts; + in mkBefore [ stringHosts extraHosts ]; + environment.etc = { # /etc/services: TCP/UDP port assignments. services.source = pkgs.iana-etc + "/etc/services"; @@ -167,12 +186,8 @@ in protocols.source = pkgs.iana-etc + "/etc/protocols"; # /etc/hosts: Hostname-to-IP mappings. - hosts.text = let - oneToString = set: ip: ip + " " + concatStringsSep " " set.${ip}; - allToString = set: concatMapStringsSep "\n" (oneToString set) (attrNames set); - in '' - ${allToString (filterAttrs (_: v: v != []) cfg.hosts)} - ${cfg.extraHosts} + hosts.source = pkgs.runCommandNoCC "hosts" {} '' + cat ${escapeShellArgs cfg.hostFiles} > $out ''; # /etc/host.conf: resolver configuration file diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index afb74581e239..011d493c1538 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -216,6 +216,14 @@ in Ignored when <code>nixpkgs.pkgs</code> is set. ''; }; + + initialSystem = mkOption { + type = types.str; + internal = true; + description = '' + Preserved value of <literal>system</literal> passed to <literal>eval-config.nix</literal>. + ''; + }; }; config = { diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 917840fb9195..dba2593bbef5 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -406,6 +406,7 @@ ./services/mail/sympa.nix ./services/mail/nullmailer.nix ./services/misc/airsonic.nix + ./services/misc/ankisyncd.nix ./services/misc/apache-kafka.nix ./services/misc/autofs.nix ./services/misc/autorandr.nix diff --git a/nixos/modules/programs/firejail.nix b/nixos/modules/programs/firejail.nix index 0abdde5ddebd..484f9eb44406 100644 --- a/nixos/modules/programs/firejail.nix +++ b/nixos/modules/programs/firejail.nix @@ -5,20 +5,20 @@ with lib; let cfg = config.programs.firejail; - wrappedBins = pkgs.stdenv.mkDerivation { - name = "firejail-wrapped-binaries"; - nativeBuildInputs = with pkgs; [ makeWrapper ]; - buildCommand = '' + wrappedBins = pkgs.runCommand "firejail-wrapped-binaries" + { preferLocalBuild = true; + allowSubstitutes = false; + } + '' mkdir -p $out/bin ${lib.concatStringsSep "\n" (lib.mapAttrsToList (command: binary: '' - cat <<_EOF >$out/bin/${command} - #!${pkgs.stdenv.shell} -e - /run/wrappers/bin/firejail ${binary} "\$@" - _EOF - chmod 0755 $out/bin/${command} + cat <<_EOF >$out/bin/${command} + #! ${pkgs.runtimeShell} -e + exec /run/wrappers/bin/firejail ${binary} "\$@" + _EOF + chmod 0755 $out/bin/${command} '') cfg.wrappedBinaries)} ''; - }; in { options.programs.firejail = { @@ -47,7 +47,7 @@ in { config = mkIf cfg.enable { security.wrappers.firejail.source = "${lib.getBin pkgs.firejail}/bin/firejail"; - environment.systemPackages = [ wrappedBins ]; + environment.systemPackages = [ pkgs.firejail ] ++ [ wrappedBins ]; }; meta.maintainers = with maintainers; [ peterhoeg ]; diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index b5ed2c594f77..230a2ae3f825 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -14,18 +14,34 @@ let base_dir = ${baseDir} protocols = ${concatStringsSep " " cfg.protocols} sendmail_path = /run/wrappers/bin/sendmail + # defining mail_plugins must be done before the first protocol {} filter because of https://doc.dovecot.org/configuration_manual/config_file/config_file_syntax/#variable-expansion + mail_plugins = $mail_plugins ${concatStringsSep " " cfg.mailPlugins.globally.enable} '' - (if cfg.sslServerCert == null then '' - ssl = no - disable_plaintext_auth = no - '' else '' - ssl_cert = <${cfg.sslServerCert} - ssl_key = <${cfg.sslServerKey} - ${optionalString (cfg.sslCACert != null) ("ssl_ca = <" + cfg.sslCACert)} - ssl_dh = <${config.security.dhparams.params.dovecot2.path} - disable_plaintext_auth = yes - '') + ( + concatStringsSep "\n" ( + mapAttrsToList ( + protocol: plugins: '' + protocol ${protocol} { + mail_plugins = $mail_plugins ${concatStringsSep " " plugins.enable} + } + '' + ) cfg.mailPlugins.perProtocol + ) + ) + + ( + if cfg.sslServerCert == null then '' + ssl = no + disable_plaintext_auth = no + '' else '' + ssl_cert = <${cfg.sslServerCert} + ssl_key = <${cfg.sslServerKey} + ${optionalString (cfg.sslCACert != null) ("ssl_ca = <" + cfg.sslCACert)} + ssl_dh = <${config.security.dhparams.params.dovecot2.path} + disable_plaintext_auth = yes + '' + ) '' default_internal_user = ${cfg.user} @@ -45,55 +61,58 @@ let } '' - (optionalString cfg.enablePAM '' - userdb { - driver = passwd - } - - passdb { - driver = pam - args = ${optionalString cfg.showPAMFailure "failure_show_msg=yes"} dovecot2 - } - '') + ( + optionalString cfg.enablePAM '' + userdb { + driver = passwd + } - (optionalString (cfg.sieveScripts != {}) '' - plugin { - ${concatStringsSep "\n" (mapAttrsToList (to: from: "sieve_${to} = ${stateDir}/sieve/${to}") cfg.sieveScripts)} - } - '') + passdb { + driver = pam + args = ${optionalString cfg.showPAMFailure "failure_show_msg=yes"} dovecot2 + } + '' + ) - (optionalString (cfg.mailboxes != []) '' - protocol imap { - namespace inbox { - inbox=yes - ${concatStringsSep "\n" (map mailboxConfig cfg.mailboxes)} + ( + optionalString (cfg.sieveScripts != {}) '' + plugin { + ${concatStringsSep "\n" (mapAttrsToList (to: from: "sieve_${to} = ${stateDir}/sieve/${to}") cfg.sieveScripts)} } - } - '') - - (optionalString cfg.enableQuota '' - mail_plugins = $mail_plugins quota - service quota-status { - executable = ${dovecotPkg}/libexec/dovecot/quota-status -p postfix - inet_listener { - port = ${cfg.quotaPort} + '' + ) + + ( + optionalString (cfg.mailboxes != []) '' + protocol imap { + namespace inbox { + inbox=yes + ${concatStringsSep "\n" (map mailboxConfig cfg.mailboxes)} + } + } + '' + ) + + ( + optionalString cfg.enableQuota '' + service quota-status { + executable = ${dovecotPkg}/libexec/dovecot/quota-status -p postfix + inet_listener { + port = ${cfg.quotaPort} + } + client_limit = 1 } - client_limit = 1 - } - - protocol imap { - mail_plugins = $mail_plugins imap_quota - } - plugin { - quota_rule = *:storage=${cfg.quotaGlobalPerUser} - quota = maildir:User quota # per virtual mail user quota # BUG/FIXME broken, we couldn't get this working - quota_status_success = DUNNO - quota_status_nouser = DUNNO - quota_status_overquota = "552 5.2.2 Mailbox is full" - quota_grace = 10%% - } - '') + plugin { + quota_rule = *:storage=${cfg.quotaGlobalPerUser} + quota = maildir:User quota # per virtual mail user quota # BUG/FIXME broken, we couldn't get this working + quota_status_success = DUNNO + quota_status_nouser = DUNNO + quota_status_overquota = "552 5.2.2 Mailbox is full" + quota_grace = 10%% + } + '' + ) cfg.extraConfig ]; @@ -107,7 +126,7 @@ let mailbox "${mailbox.name}" { auto = ${toString mailbox.auto} '' + optionalString (mailbox.specialUse != null) '' - special_use = \${toString mailbox.specialUse} + special_use = \${toString mailbox.specialUse} '' + "}"; mailboxes = { ... }: { @@ -160,7 +179,7 @@ in protocols = mkOption { type = types.listOf types.str; - default = [ ]; + default = []; description = "Additional listeners to start when Dovecot is enabled."; }; @@ -183,6 +202,43 @@ in description = "Additional entries to put verbatim into Dovecot's config file."; }; + mailPlugins = + let + plugins = hint: types.submodule { + options = { + enable = mkOption { + type = types.listOf types.str; + default = []; + description = "mail plugins to enable as a list of strings to append to the ${hint} <literal>$mail_plugins</literal> configuration variable"; + }; + }; + }; + in + mkOption { + type = with types; submodule { + options = { + globally = mkOption { + description = "Additional entries to add to the mail_plugins variable for all protocols"; + type = plugins "top-level"; + example = { enable = [ "virtual" ]; }; + default = { enable = []; }; + }; + perProtocol = mkOption { + description = "Additional entries to add to the mail_plugins variable, per protocol"; + type = attrsOf (plugins "corresponding per-protocol"); + default = {}; + example = { imap = [ "imap_acl" ]; }; + }; + }; + }; + description = "Additional entries to add to the mail_plugins variable, globally and per protocol"; + example = { + globally.enable = [ "acl" ]; + perProtocol.imap.enable = [ "imap_acl" ]; + }; + default = { globally.enable = []; perProtocol = {}; }; + }; + configFile = mkOption { type = types.nullOr types.path; default = null; @@ -305,27 +361,33 @@ in enable = true; params.dovecot2 = {}; }; - services.dovecot2.protocols = - optional cfg.enableImap "imap" - ++ optional cfg.enablePop3 "pop3" - ++ optional cfg.enableLmtp "lmtp"; + services.dovecot2.protocols = + optional cfg.enableImap "imap" + ++ optional cfg.enablePop3 "pop3" + ++ optional cfg.enableLmtp "lmtp"; + + services.dovecot2.mailPlugins = mkIf cfg.enableQuota { + globally.enable = [ "quota" ]; + perProtocol.imap.enable = [ "imap_quota" ]; + }; users.users = { dovenull = - { uid = config.ids.uids.dovenull2; + { + uid = config.ids.uids.dovenull2; description = "Dovecot user for untrusted logins"; group = "dovenull"; }; } // optionalAttrs (cfg.user == "dovecot2") { dovecot2 = - { uid = config.ids.uids.dovecot2; - description = "Dovecot user"; - group = cfg.group; - }; + { + uid = config.ids.uids.dovecot2; + description = "Dovecot user"; + group = cfg.group; + }; } // optionalAttrs (cfg.createMailUser && cfg.mailUser != null) { ${cfg.mailUser} = - { description = "Virtual Mail User"; } // - optionalAttrs (cfg.mailGroup != null) + { description = "Virtual Mail User"; } // optionalAttrs (cfg.mailGroup != null) { group = cfg.mailGroup; }; }; @@ -334,7 +396,7 @@ in } // optionalAttrs (cfg.group == "dovecot2") { dovecot2.gid = config.ids.gids.dovecot2; } // optionalAttrs (cfg.createMailUser && cfg.mailGroup != null) { - ${cfg.mailGroup} = { }; + ${cfg.mailGroup} = {}; }; environment.etc."dovecot/modules".source = modulesDir; @@ -363,15 +425,19 @@ in rm -rf ${stateDir}/sieve '' + optionalString (cfg.sieveScripts != {}) '' mkdir -p ${stateDir}/sieve - ${concatStringsSep "\n" (mapAttrsToList (to: from: '' - if [ -d '${from}' ]; then - mkdir '${stateDir}/sieve/${to}' - cp -p "${from}/"*.sieve '${stateDir}/sieve/${to}' - else - cp -p '${from}' '${stateDir}/sieve/${to}' - fi - ${pkgs.dovecot_pigeonhole}/bin/sievec '${stateDir}/sieve/${to}' - '') cfg.sieveScripts)} + ${concatStringsSep "\n" ( + mapAttrsToList ( + to: from: '' + if [ -d '${from}' ]; then + mkdir '${stateDir}/sieve/${to}' + cp -p "${from}/"*.sieve '${stateDir}/sieve/${to}' + else + cp -p '${from}' '${stateDir}/sieve/${to}' + fi + ${pkgs.dovecot_pigeonhole}/bin/sievec '${stateDir}/sieve/${to}' + '' + ) cfg.sieveScripts + )} chown -R '${cfg.mailUser}:${cfg.mailGroup}' '${stateDir}/sieve' ''; }; @@ -379,17 +445,21 @@ in environment.systemPackages = [ dovecotPkg ]; assertions = [ - { assertion = intersectLists cfg.protocols [ "pop3" "imap" ] != []; + { + assertion = intersectLists cfg.protocols [ "pop3" "imap" ] != []; message = "dovecot needs at least one of the IMAP or POP3 listeners enabled"; } - { assertion = (cfg.sslServerCert == null) == (cfg.sslServerKey == null) - && (cfg.sslCACert != null -> !(cfg.sslServerCert == null || cfg.sslServerKey == null)); + { + assertion = (cfg.sslServerCert == null) == (cfg.sslServerKey == null) + && (cfg.sslCACert != null -> !(cfg.sslServerCert == null || cfg.sslServerKey == null)); message = "dovecot needs both sslServerCert and sslServerKey defined for working crypto"; } - { assertion = cfg.showPAMFailure -> cfg.enablePAM; + { + assertion = cfg.showPAMFailure -> cfg.enablePAM; message = "dovecot is configured with showPAMFailure while enablePAM is disabled"; } - { assertion = cfg.sieveScripts != {} -> (cfg.mailUser != null && cfg.mailGroup != null); + { + assertion = cfg.sieveScripts != {} -> (cfg.mailUser != null && cfg.mailGroup != null); message = "dovecot requires mailUser and mailGroup to be set when sieveScripts is set"; } ]; diff --git a/nixos/modules/services/misc/ankisyncd.nix b/nixos/modules/services/misc/ankisyncd.nix new file mode 100644 index 000000000000..5fc19649d3d9 --- /dev/null +++ b/nixos/modules/services/misc/ankisyncd.nix @@ -0,0 +1,79 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.ankisyncd; + + name = "ankisyncd"; + + stateDir = "/var/lib/${name}"; + + authDbPath = "${stateDir}/auth.db"; + + sessionDbPath = "${stateDir}/session.db"; + + configFile = pkgs.writeText "ankisyncd.conf" (lib.generators.toINI {} { + sync_app = { + host = cfg.host; + port = cfg.port; + data_root = stateDir; + auth_db_path = authDbPath; + session_db_path = sessionDbPath; + + base_url = "/sync/"; + base_media_url = "/msync/"; + }; + }); +in + { + options.services.ankisyncd = { + enable = mkEnableOption "ankisyncd"; + + package = mkOption { + type = types.package; + default = pkgs.ankisyncd; + defaultText = literalExample "pkgs.ankisyncd"; + description = "The package to use for the ankisyncd command."; + }; + + host = mkOption { + type = types.str; + default = "localhost"; + description = "ankisyncd host"; + }; + + port = mkOption { + type = types.int; + default = 27701; + description = "ankisyncd port"; + }; + + openFirewall = mkOption { + default = false; + type = types.bool; + description = "Whether to open the firewall for the specified port."; + }; + }; + + config = mkIf cfg.enable { + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ]; + + environment.etc."ankisyncd/ankisyncd.conf".source = configFile; + + systemd.services.ankisyncd = { + description = "ankisyncd - Anki sync server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + path = [ cfg.package ]; + + serviceConfig = { + Type = "simple"; + DynamicUser = true; + StateDirectory = name; + ExecStart = "${cfg.package}/bin/ankisyncd"; + Restart = "always"; + }; + }; + }; + } diff --git a/nixos/modules/services/monitoring/cadvisor.nix b/nixos/modules/services/monitoring/cadvisor.nix index 695a8c42e85e..655a6934a266 100644 --- a/nixos/modules/services/monitoring/cadvisor.nix +++ b/nixos/modules/services/monitoring/cadvisor.nix @@ -135,7 +135,6 @@ in { serviceConfig.TimeoutStartSec=300; }; - virtualisation.docker.enable = mkDefault true; }) ]; } diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index b67f697ca0de..6b1a4be44d1d 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -9,12 +9,13 @@ let # a wrapper that verifies that the configuration is valid promtoolCheck = what: name: file: - pkgs.runCommand - "${name}-${replaceStrings [" "] [""] what}-checked" - { buildInputs = [ cfg.package ]; } '' - ln -s ${file} $out - promtool ${what} $out - ''; + if cfg.checkConfig then + pkgs.runCommand + "${name}-${replaceStrings [" "] [""] what}-checked" + { buildInputs = [ cfg.package ]; } '' + ln -s ${file} $out + promtool ${what} $out + '' else file; # Pretty-print JSON to a file writePrettyJSON = name: x: @@ -601,6 +602,20 @@ in { if Prometheus is served via a reverse proxy). ''; }; + + checkConfig = mkOption { + type = types.bool; + default = true; + description = '' + Check configuration with <literal>promtool + check</literal>. The call to <literal>promtool</literal> is + subject to sandboxing by Nix. When credentials are stored in + external files (<literal>password_file</literal>, + <literal>bearer_token_file</literal>, etc), they will not be + visible to <literal>promtool</literal> and it will report + errors, despite a correct configuration. + ''; + }; }; config = mkIf cfg.enable { diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix index 3fb85b16cbe2..5f8ac96b2292 100644 --- a/nixos/modules/services/networking/cjdns.nix +++ b/nixos/modules/services/networking/cjdns.nix @@ -29,17 +29,13 @@ let }; # Additional /etc/hosts entries for peers with an associated hostname - cjdnsExtraHosts = import (pkgs.runCommand "cjdns-hosts" {} - # Generate a builder that produces an output usable as a Nix string value - '' - exec >$out - echo \'\' - ${concatStringsSep "\n" (mapAttrsToList (k: v: - optionalString (v.hostname != "") - "echo $(${pkgs.cjdns}/bin/publictoip6 ${v.publicKey}) ${v.hostname}") - (cfg.ETHInterface.connectTo // cfg.UDPInterface.connectTo))} - echo \'\' - ''); + cjdnsExtraHosts = pkgs.runCommandNoCC "cjdns-hosts" {} '' + exec >$out + ${concatStringsSep "\n" (mapAttrsToList (k: v: + optionalString (v.hostname != "") + "echo $(${pkgs.cjdns}/bin/publictoip6 ${v.publicKey}) ${v.hostname}") + (cfg.ETHInterface.connectTo // cfg.UDPInterface.connectTo))} + ''; parseModules = x: x // { connectTo = mapAttrs (name: value: { inherit (value) password publicKey; }) x.connectTo; }; @@ -144,13 +140,15 @@ in connectTo = mkOption { type = types.attrsOf ( types.submodule ( connectToSubmodule ) ); default = { }; - example = { - "192.168.1.1:27313" = { - hostname = "homer.hype"; - password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM"; - publicKey = "371zpkgs8ss387tmr81q04mp0hg1skb51hw34vk1cq644mjqhup0.k"; - }; - }; + example = literalExample '' + { + "192.168.1.1:27313" = { + hostname = "homer.hype"; + password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM"; + publicKey = "371zpkgs8ss387tmr81q04mp0hg1skb51hw34vk1cq644mjqhup0.k"; + }; + } + ''; description = '' Credentials for making UDP tunnels. ''; @@ -189,13 +187,15 @@ in connectTo = mkOption { type = types.attrsOf ( types.submodule ( connectToSubmodule ) ); default = { }; - example = { - "01:02:03:04:05:06" = { - hostname = "homer.hype"; - password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM"; - publicKey = "371zpkgs8ss387tmr81q04mp0hg1skb51hw34vk1cq644mjqhup0.k"; - }; - }; + example = literalExample '' + { + "01:02:03:04:05:06" = { + hostname = "homer.hype"; + password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM"; + publicKey = "371zpkgs8ss387tmr81q04mp0hg1skb51hw34vk1cq644mjqhup0.k"; + }; + } + ''; description = '' Credentials for connecting look similar to UDP credientials except they begin with the mac address. @@ -278,7 +278,7 @@ in }; }; - networking.extraHosts = mkIf cfg.addExtraHosts cjdnsExtraHosts; + networking.hostFiles = mkIf cfg.addExtraHosts [ cjdnsExtraHosts ]; assertions = [ { assertion = ( cfg.ETHInterface.bind != "" || cfg.UDPInterface.bind != "" || cfg.confFile != null ); diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index 15aaf7410674..b0045ff795e3 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -546,7 +546,7 @@ in options nf_conntrack nf_conntrack_helper=1 ''; - assertions = [ { assertion = (cfg.checkReversePath != false) || kernelHasRPFilter; + assertions = [ { assertion = cfg.checkReversePath -> kernelHasRPFilter; message = "This kernel does not support rpfilter"; } ]; diff --git a/nixos/modules/services/networking/ntp/ntpd.nix b/nixos/modules/services/networking/ntp/ntpd.nix index b5403cb747d0..54ff054d84c7 100644 --- a/nixos/modules/services/networking/ntp/ntpd.nix +++ b/nixos/modules/services/networking/ntp/ntpd.nix @@ -23,6 +23,8 @@ let restrict -6 ::1 ${toString (map (server: "server " + server + " iburst\n") cfg.servers)} + + ${cfg.extraConfig} ''; ntpFlags = "-c ${configFile} -u ${ntpUser}:nogroup ${toString cfg.extraFlags}"; @@ -81,6 +83,17 @@ in ''; }; + extraConfig = mkOption { + type = types.lines; + default = ""; + example = '' + fudge 127.127.1.0 stratum 10 + ''; + description = '' + Additional text appended to <filename>ntp.conf</filename>. + ''; + }; + extraFlags = mkOption { type = types.listOf types.str; description = "Extra flags passed to the ntpd command."; diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index f67d29005616..14bd751ce324 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -15,6 +15,7 @@ let map (childConfig: (import ../../../lib/eval-config.nix { inherit baseModules; + system = config.nixpkgs.initialSystem; modules = (optionals inheritParent modules) ++ [ ./no-clone.nix ] diff --git a/nixos/modules/tasks/filesystems/btrfs.nix b/nixos/modules/tasks/filesystems/btrfs.nix index 48be18c71021..f64493e1a3c7 100644 --- a/nixos/modules/tasks/filesystems/btrfs.nix +++ b/nixos/modules/tasks/filesystems/btrfs.nix @@ -118,12 +118,17 @@ in fs' = utils.escapeSystemdPath fs; in nameValuePair "btrfs-scrub-${fs'}" { description = "btrfs scrub on ${fs}"; + # scrub prevents suspend2ram or proper shutdown + conflicts = [ "shutdown.target" "sleep.target" ]; + before = [ "shutdown.target" "sleep.target" ]; serviceConfig = { - Type = "oneshot"; + # simple and not oneshot, otherwise ExecStop is not used + Type = "simple"; Nice = 19; IOSchedulingClass = "idle"; ExecStart = "${pkgs.btrfs-progs}/bin/btrfs scrub start -B ${fs}"; + ExecStop = "${pkgs.btrfs-progs}/bin/btrfs scrub cancel ${fs}"; }; }; in listToAttrs (map scrubService cfgScrub.fileSystems); diff --git a/nixos/modules/virtualisation/kvmgt.nix b/nixos/modules/virtualisation/kvmgt.nix index 36ef6d17df69..0902d2dc2cb0 100644 --- a/nixos/modules/virtualisation/kvmgt.nix +++ b/nixos/modules/virtualisation/kvmgt.nix @@ -19,7 +19,8 @@ in { virtualisation.kvmgt = { enable = mkEnableOption '' KVMGT (iGVT-g) VGPU support. Allows Qemu/KVM guests to share host's Intel integrated graphics card. - Currently only one graphical device can be shared + Currently only one graphical device can be shared. To allow users to access the device without root add them + to the kvm group: <literal>users.extraUsers.<yourusername>.extraGroups = [ "kvm" ];</literal> ''; # multi GPU support is under the question device = mkOption { @@ -35,9 +36,7 @@ in { and find info about device via <command>cat /sys/bus/pci/devices/*/mdev_supported_types/i915-GVTg_V5_4/description</command> ''; example = { - i915-GVTg_V5_8 = { - uuid = "a297db4a-f4c2-11e6-90f6-d3b88d6c9525"; - }; + i915-GVTg_V5_8.uuid = "a297db4a-f4c2-11e6-90f6-d3b88d6c9525"; }; }; }; @@ -50,10 +49,7 @@ in { }; boot.kernelModules = [ "kvmgt" ]; - - boot.extraModprobeConfig = '' - options i915 enable_gvt=1 - ''; + boot.kernelParams = [ "i915.enable_gvt=1" ]; systemd.paths = mapAttrs' (name: value: nameValuePair "kvmgt-${name}" { @@ -65,6 +61,10 @@ in { } ) cfg.vgpus; + services.udev.extraRules = '' + SUBSYSTEM=="vfio", OWNER="root", GROUP="kvm" + ''; + systemd.services = mapAttrs' (name: value: nameValuePair "kvmgt-${name}" { description = "KVMGT VGPU ${name}"; diff --git a/nixos/tests/nesting.nix b/nixos/tests/nesting.nix index 6388b67a6e40..a75806b24ff6 100644 --- a/nixos/tests/nesting.nix +++ b/nixos/tests/nesting.nix @@ -29,10 +29,10 @@ import ./make-test-python.nix { ) clone.succeed("cowsay hey") clone.succeed("hello") - - children.wait_for_unit("default.target") - children.succeed("cowsay hey") - children.fail("hello") + + children.wait_for_unit("default.target") + children.succeed("cowsay hey") + children.fail("hello") with subtest("Nested children do not inherit from parent"): children.succeed( diff --git a/pkgs/applications/audio/ams/default.nix b/pkgs/applications/audio/ams/default.nix new file mode 100644 index 000000000000..e6c4fbe802e1 --- /dev/null +++ b/pkgs/applications/audio/ams/default.nix @@ -0,0 +1,48 @@ +{ stdenv +, fetchgit +, automake +, alsaLib +, ladspaH +, libjack2 +, fftw +, zita-alsa-pcmi +, qt5 +, pkg-config +, autoreconfHook +}: + +stdenv.mkDerivation rec { + name = "ams"; + version = "unstable-2019-04-27"; + + src = fetchgit { + url = "https://git.code.sf.net/p/alsamodular/ams.git"; + sha256 = "0qdyz5llpa94f3qx1xi1mz97vl5jyrj1mqff28p5g9i5rxbbk8z9"; + rev = "3250bbcfea331c4fcb9845305eebded80054973d"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + qt5.wrapQtAppsHook + ]; + + buildInputs = [ + alsaLib + ladspaH + libjack2 + fftw + zita-alsa-pcmi + ] ++ (with qt5; [ + qtbase + qttools + ]); + + meta = with stdenv.lib; { + description = "Realtime modular synthesizer for ALSA"; + homepage = "http://alsamodular.sourceforge.net"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ sjfloat ]; + }; +} diff --git a/pkgs/applications/audio/elisa/default.nix b/pkgs/applications/audio/elisa/default.nix index a159ca7f6855..1d56ce089d90 100644 --- a/pkgs/applications/audio/elisa/default.nix +++ b/pkgs/applications/audio/elisa/default.nix @@ -7,13 +7,13 @@ mkDerivation rec { pname = "elisa"; - version = "19.12.2"; + version = "19.12.3"; src = fetchFromGitHub { owner = "KDE"; repo = "elisa"; rev = "v${version}"; - sha256 = "0g6zj4ix97aa529w43v1z3n73b8l5di6gscs40hyx4sl1sb7fdh6"; + sha256 = "0s1sixkrx4czckzg0llkrbp8rp397ljsq1c309z23m277jsmnnb6"; }; buildInputs = [ vlc ]; diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix index 9613df6df0b7..94f08a5f7a82 100644 --- a/pkgs/applications/audio/spotify-tui/default.nix +++ b/pkgs/applications/audio/spotify-tui/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "spotify-tui"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "Rigellute"; repo = "spotify-tui"; rev = "v${version}"; - sha256 = "19mnnpsidwr5y6igs478gfp7rq76378f66nzfhj4mraqd2jc4nzj"; + sha256 = "0fmj25zjg12v0kyanic343lrdhxkh290v88qiz6ac47g8bdy3c83"; }; - cargoSha256 = "1zhv3sla92z7pjdnf0r4x85n7z9spi70vgy4kw72rdc5v9bmj7q8"; + cargoSha256 = "1n8aacy0hapjm10hmgqm07rb5c0ngmzr1s116pspsl7cdszza6xi"; nativeBuildInputs = [ pkgconfig ] ++ stdenv.lib.optionals stdenv.isLinux [ python3 ]; buildInputs = [ openssl ] diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix index a7d61598f3e2..48ad9bc971c2 100644 --- a/pkgs/applications/audio/sunvox/default.nix +++ b/pkgs/applications/audio/sunvox/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "SunVox"; - version = "1.9.5c"; + version = "1.9.5d"; src = fetchurl { url = "http://www.warmplace.ru/soft/sunvox/sunvox-${version}.zip"; - sha256 = "19ilif221nw8lvw0fgpjqzawibyvxk16aaylizwygf7c4j40wayi"; + sha256 = "15pyc3dk4dqlivgzki8sv7xpwg3bbn5xv9338g16a0dbn7s3kich"; }; buildInputs = [ unzip ]; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 1db952cf1a5a..466d52236d0d 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -250,12 +250,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2019.3.3"; /* updated by script */ + version = "2019.3.4"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "1dvnb6mb8xgrgqzqxm2zirwm77w4pci6ibwsdh6wqpnzpqksh4iw"; /* updated by script */ + sha256 = "0whd379ck79vhz14yh5g6vpl4cvgw4z9ag4mwgizmd8kbcfnvdxd"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -263,12 +263,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2019.3.2"; /* updated by script */ + version = "2019.3.3"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "1aypzs5q9zgggxbpaxfd8r5ds0ck31lb00csn62npndqxa3bj7z5"; /* updated by script */ + sha256 = "0zbyiw60gqcqi5bbazmsbs4qzmmxx1q034hs36k1dryf2y02jyih"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -276,12 +276,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2019.3.2"; /* updated by script */ + version = "2019.3.3"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "0namvc8dfm562dgvs4mrv1c6lyi4j8yxw402fkw55l0xqv3ff0a9"; /* updated by script */ + sha256 = "091ym7vyb0hxzz6a1jfb88x0lj499vjd04bq8swmw14m1akmk3lf"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -315,12 +315,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2019.3.2"; /* updated by script */ + version = "2019.3.3"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "02qnkcri49chbbpx2f338cfs5w2kg1l7zfn6fa7qrla82zpjsqlm"; /* updated by script */ + sha256 = "03ag1a40l1k8sqlywcs7kjn02c65xm3l9riyimg4hx23yi17w18h"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -354,12 +354,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2019.3.1"; /* updated by script */ + version = "2019.3.4"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; - sha256 = "0cs8fc3h6d2m84ppiqjy0f3xklpc5gf0i6c4bzv04y8ngh0cwgl2"; /* updated by script */ + sha256 = "17axv0v31dpmjcaij5qpqqm071mwhmf1ahy0y0h96limq8cw9872"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; @@ -367,12 +367,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2019.3.2"; /* updated by script */ + version = "2019.3.3"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "0mwzhvrhvsyb8r7sjcigv9jazim1zyipb3ym4xsd2gyl3ans2vm9"; /* updated by script */ + sha256 = "0lkzb3rifr7r23vijcz7rqcxjpykx7dkghiq5prk1zz83hzi4b2j"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; @@ -380,12 +380,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2019.3.2"; /* updated by script */ + version = "2019.3.3"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "0mbfkwjqg2d1mkka0vajx41nv4f07y1w7chk6ii7sylaj7ypzi13"; /* updated by script */ + sha256 = "1b7hwqpk96g4il5rbxb8cpqsizgc9k5kb8vkvkcc9xh7qqz02i85"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix index 2b4abb1f1625..338708e3f82e 100644 --- a/pkgs/applications/editors/quilter/default.nix +++ b/pkgs/applications/editors/quilter/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "quilter"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "1raba835kvqq4lfpk141vg81ll7sg3jyhwyr6758pdjmncncg0wr"; + sha256 = "1nk6scn98kb43h056ajycpj71jkx7b9p5g05khgl6bwj9hvjvcbw"; }; nativeBuildInputs = [ @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Focus on your writing - designed for elementary OS"; - homepage = https://github.com/lainsce/quilter; + homepage = "https://github.com/lainsce/quilter"; license = licenses.gpl2Plus; maintainers = pantheon.maintainers; platforms = platforms.linux; diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 372d9508174a..d6db89e5c5e2 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "texstudio"; - version = "2.12.20"; + version = "2.12.22"; src = fetchFromGitHub { owner = "${pname}-org"; repo = pname; rev = version; - sha256 = "0hywx2knqdrslzmm4if476ryf4ma0aw5j8kdp6lyrz2jx7az2gqa"; + sha256 = "037jvsfln8wav17qj9anxz2a7p51v7ky85wmhdj2hgwp40al651g"; }; nativeBuildInputs = [ qmake wrapQtAppsHook pkgconfig ]; @@ -27,6 +27,6 @@ mkDerivation rec { homepage = http://texstudio.sourceforge.net; license = licenses.gpl2Plus; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ cfouche ]; + maintainers = with maintainers; [ ajs124 cfouche ]; }; } diff --git a/pkgs/applications/editors/thonny/default.nix b/pkgs/applications/editors/thonny/default.nix index 16f1ba4346e9..706d3fd71763 100644 --- a/pkgs/applications/editors/thonny/default.nix +++ b/pkgs/applications/editors/thonny/default.nix @@ -4,13 +4,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "thonny"; - version = "3.2.6"; + version = "3.2.7"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "19krnxpp3i1n65zafazvdm9mvnjry5rml0y9imj4365q4bkj20g2"; + sha256 = "0gzvdgg5l4j0wgkh7lp4wjabrpxvvs5m7mnpszqixxijdffjd4cj"; }; propagatedBuildInputs = with python3.pkgs; [ @@ -45,7 +45,7 @@ buildPythonApplication rec { evaluation, detailed visualization of the call stack and a mode for explaining the concepts of references and heap. ''; - homepage = https://www.thonny.org/; + homepage = "https://www.thonny.org/"; license = licenses.mit; maintainers = with maintainers; [ leenaars ]; platforms = platforms.linux; diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index ace4bbe9cdc7..a573c518b5d6 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -62,7 +62,7 @@ in else [ gtk2 at-spi2-atk wrapGAppsHook ] ++ atomEnv.packages) ++ [ libsecret libXScrnSaver ]; - runtimeDependencies = [ systemd.lib fontconfig.lib ]; + runtimeDependencies = lib.optional (stdenv.isLinux) [ systemd.lib fontconfig.lib ]; nativeBuildInputs = lib.optional (!stdenv.isDarwin) autoPatchelfHook; diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 75f5b8302e6f..338a5249aebb 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -17,11 +17,11 @@ let python = python3Packages.python; in stdenv.mkDerivation rec { pname = "blender"; - version = "2.82"; + version = "2.82a"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - sha256 = "0rgw8nilvn6k6r7p28y2l1rwpami1cc8xz473jaahn7wa4ndyah0"; + sha256 = "18zbdgas6qf2kmvvlimxgnq7y9kj7hdxcgixrs6fj50x40q01q2d"; }; patches = lib.optional stdenv.isDarwin ./darwin.patch; @@ -122,7 +122,8 @@ stdenv.mkDerivation rec { # --python-expr is used to workaround https://developer.blender.org/T74304 postInstall = '' wrapProgram $blenderExecutable \ - --add-flags '--python-expr "import sys; sys.path.append(\"${python3Packages.numpy}/${python.sitePackages}\")"' + --prefix PYTHONPATH : ${python3Packages.numpy}/${python.sitePackages} \ + --add-flags '--python-use-system-env' ''; # Set RUNPATH so that libcuda and libnvrtc in /run/opengl-driver(-32)/lib can be @@ -136,7 +137,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "3D Creation/Animation/Publishing System"; - homepage = https://www.blender.org; + homepage = "https://www.blender.org"; # They comment two licenses: GPLv2 and Blender License, but they # say: "We've decided to cancel the BL offering for an indefinite period." license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 07612c96beef..e29a8ebfd19d 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -30,11 +30,11 @@ let in mkDerivation rec { pname = "calibre"; - version = "4.11.2"; + version = "4.12.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - sha256 = "0fxmpygc2ybx8skwhp9j6gnk9drlfiz2cl9g55h10zgxkfzqzqgv"; + sha256 = "144vl5p0adcywcqaarrriq5zd8q5i934yfjg9himiq1vdp9vy4fi"; }; patches = [ diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index a86c1e8bc055..d4d0643bfdc2 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "cheat"; - version = "3.0.3"; + version = "3.0.7"; src = fetchFromGitHub { owner = "chrisallenlane"; repo = "cheat"; rev = version; - sha256 = "19w1admdcgld9vlc4fsyc5d9bi6rmwhr2x2ji43za2vjlk34hnnx"; + sha256 = "0i5j85ciimk14kndb81qxny1ksr57sr9xdvjn7x1ibc7h6pikjn5"; }; subPackages = [ "cmd/cheat" ]; - modSha256 = "189cqnfl403f4lk7g9v68mwk93ciglqli639dk4x9091lvn5gq5q"; + modSha256 = "1v9hvxygwvqma2j5yz7r95g34xpwb0n29hm39i89vgmvl3hy67s0"; meta = with stdenv.lib; { description = "Create and view interactive cheatsheets on the command-line"; diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 531f8d851f1c..03483a1a2b8a 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -1,27 +1,60 @@ -{ stdenv, fetchurl, substituteAll, cmake, ninja, pkgconfig -, glibc, gtk3, gtkmm3, pcre, swig, antlr4_7, sudo -, mysql, libxml2, libmysqlconnectorcpp -, vsqlite, gdal, libiodbc, libpthreadstubs -, libXdmcp, libuuid, libzip, libsecret, libssh -, python2, jre -, boost, libsigcxx, libX11, openssl -, proj, cairo, libxkbcommon, epoxy, wrapGAppsHook -, at-spi2-core, dbus, bash, coreutils +{ stdenv +, fetchurl +, substituteAll +, cmake +, ninja +, pkgconfig +, glibc +, gtk3 +, gtkmm3 +, pcre +, swig +, antlr4_7 +, sudo +, mysql +, libxml2 +, libmysqlconnectorcpp +, vsqlite +, gdal +, libiodbc +, libpthreadstubs +, libXdmcp +, libuuid +, libzip +, libsecret +, libssh +, python2 +, jre +, boost +, libsigcxx +, libX11 +, openssl +, rapidjson +, proj +, cairo +, libxkbcommon +, epoxy +, wrapGAppsHook +, at-spi2-core +, dbus +, bash +, coreutils }: let inherit (python2.pkgs) paramiko pycairo pyodbc; in stdenv.mkDerivation rec { pname = "mysql-workbench"; - version = "8.0.15"; + version = "8.0.19"; src = fetchurl { url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz"; - sha256 = "0ca93azasya5xiw6j2map8drmxf445qqydpvrb512kjfqdiv67x6"; + sha256 = "unrszSK+tKcARSHxRSAAos+jDtYxdDcSnFENixaDJsw="; }; patches = [ ./fix-gdal-includes.patch + (substituteAll { src = ./hardcode-paths.patch; catchsegv = "${glibc.bin}/bin/catchsegv"; @@ -35,6 +68,13 @@ in stdenv.mkDerivation rec { rmdir = "${coreutils}/bin/rmdir"; sudo = "${sudo}/bin/sudo"; }) + + # Fix swig not being able to find headers + # https://github.com/NixOS/nixpkgs/pull/82362#issuecomment-597948461 + (substituteAll { + src = ./fix-swig-build.patch; + cairoDev = "${cairo.dev}"; + }) ]; # have it look for 4.7.2 instead of 4.7.1 @@ -44,31 +84,68 @@ in stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - cmake ninja pkgconfig jre swig wrapGAppsHook + cmake + ninja + pkgconfig + jre + swig + wrapGAppsHook ]; buildInputs = [ - gtk3 gtkmm3 libX11 antlr4_7.runtime.cpp python2 mysql libxml2 - libmysqlconnectorcpp vsqlite gdal boost libssh openssl - libiodbc pcre cairo libuuid libzip libsecret - libsigcxx proj + gtk3 + gtkmm3 + libX11 + antlr4_7.runtime.cpp + python2 + mysql + libxml2 + libmysqlconnectorcpp + vsqlite + gdal + boost + libssh + openssl + rapidjson + libiodbc + pcre + cairo + libuuid + libzip + libsecret + libsigcxx + proj + # python dependencies: - paramiko pycairo pyodbc # sqlanydb + paramiko + pycairo + pyodbc + # TODO: package sqlanydb and add it here + # transitive dependencies: - libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core dbus + libpthreadstubs + libXdmcp + libxkbcommon + epoxy + at-spi2-core + dbus ]; postPatch = '' patchShebangs tools/get_wb_version.sh ''; - # error: 'OGRErr OGRSpatialReference::importFromWkt(char**)' is deprecated + # error: 'OGRErr OGRSpatialReference::importFromWkt(char**)' is deprecated NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; cmakeFlags = [ "-DMySQL_CONFIG_PATH=${mysql}/bin/mysql_config" "-DIODBC_CONFIG_PATH=${libiodbc}/bin/iodbc-config" "-DWITH_ANTLR_JAR=${antlr4_7.jarLocation}" + # mysql-workbench 8.0.19 depends on libmysqlconnectorcpp 1.1.8. + # Newer versions of connector still provide the legacy library when enabled + # but the headers are in a different location. + "-DMySQLCppConn_INCLUDE_DIR=${libmysqlconnectorcpp}/include/jdbc" ]; # There is already an executable and a wrapper in bindir @@ -104,7 +181,7 @@ in stdenv.mkDerivation rec { and execute SQL queries. ''; - homepage = http://wb.mysql.com/; + homepage = "http://wb.mysql.com/"; license = licenses.gpl2; maintainers = [ maintainers.kkallio ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/mysql-workbench/fix-swig-build.patch b/pkgs/applications/misc/mysql-workbench/fix-swig-build.patch new file mode 100644 index 000000000000..ace1e5add43f --- /dev/null +++ b/pkgs/applications/misc/mysql-workbench/fix-swig-build.patch @@ -0,0 +1,12 @@ +--- a/library/forms/swig/CMakeLists.txt ++++ b/library/forms/swig/CMakeLists.txt +@@ -57,7 +57,7 @@ + + set(CMAKE_SWIG_FLAGS -w312) + set_source_files_properties(cairo.i PROPERTIES CPLUSPLUS ON) +-set_property(SOURCE cairo.i PROPERTY SWIG_FLAGS -DCAIRO_HAS_PNG_FUNCTIONS=1 -fcompact -DSWIG_PYTHON_LEGACY_BOOL -I/usr/include) ++set_property(SOURCE cairo.i PROPERTY SWIG_FLAGS -DCAIRO_HAS_PNG_FUNCTIONS=1 -fcompact -DSWIG_PYTHON_LEGACY_BOOL -I@cairoDev@/include) + if(CMAKE_VERSION VERSION_LESS 3.8) + swig_add_module(cairo python cairo.i) + else() + diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index e1045663a3bd..1fc0162f8d08 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -68,11 +68,6 @@ stdenv.mkDerivation rec { (if i3Support || i3GapsSupport then makeWrapper else null) ]; - postConfigure = '' - substituteInPlace generated-sources/settings.hpp \ - --replace "${stdenv.cc}" "${stdenv.cc.name}" - ''; - postInstall = if (i3Support || i3GapsSupport) then '' wrapProgram $out/bin/polybar \ --prefix PATH : "${if i3Support then i3 else i3-gaps}/bin" diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index b98b0eee2aa0..7ec72eae6fa9 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -16,10 +16,10 @@ let pname = "simplenote"; - version = "1.14.0"; + version = "1.15.0"; sha256 = { - x86_64-linux = "1l61xf1i80fd8ymmnrb3plqn70jsxd8wyg0n6f69bz3k8s5g8cxi"; + x86_64-linux = "08h3g2rw75k63ssd62c6jrb2dy9sz85y5jpfj5np64dvw70a1811"; }.${system} or throwSystem; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/wikicurses/default.nix b/pkgs/applications/misc/wikicurses/default.nix index d38383c30ecb..9b1e9f091e25 100644 --- a/pkgs/applications/misc/wikicurses/default.nix +++ b/pkgs/applications/misc/wikicurses/default.nix @@ -11,8 +11,18 @@ pythonPackages.buildPythonApplication rec { sha256 = "0f14s4qx3q5pr5vn460c34b5mbz2xs62d8ljs3kic8gmdn8x2knm"; }; + outputs = [ "out" "man" ]; + propagatedBuildInputs = with pythonPackages; [ urwid beautifulsoup4 lxml ]; + postInstall = '' + mkdir -p $man/share/man/man{1,5} + cp wikicurses.1 $man/share/man/man1/ + cp wikicurses.conf.5 $man/share/man/man5/ + ''; + + doCheck = false; + meta = { description = "A simple curses interface for MediaWiki sites such as Wikipedia"; homepage = https://github.com/ids1024/wikicurses/; diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix index 201a3eda3cc7..6616f7e4294e 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.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "getzola"; repo = pname; rev = "v${version}"; - sha256 = "112aqv21gy1fbly5v2x3ph32pr82d1mwh0q57yfaaqygz2madypb"; + sha256 = "07zg4ia983rgvgvmw4xbi347lr4rxlf1xv8rw72cflc74kyia67n"; }; - cargoSha256 = "0hqa60bx8pxhgad7x6r4zbwddrkcspnnp53bl94zbf3j47p10ggz"; + cargoSha256 = "13lnl01h8k8xv2ls1kjskfnyjmmk8iyk2mvbk01p2wmhp5m876md"; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ openssl ] diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index e600d134e9c0..434bd77b6d18 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -45,11 +45,11 @@ let flash = stdenv.mkDerivation rec { pname = "flashplayer-ppapi"; - version = "32.0.0.330"; + version = "32.0.0.344"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "08gpx0fq0r1sz5smfdgv4fkfwq1hdijv4dw432d6jdz8lq09y1nk"; + sha256 = "05ijlgsby9zxx0qs6f3vav1z0p6xr1cg6idl4akxvfmsl6hn6hkq"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 3d711f92d1c9..46a759cf27af 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -74,7 +74,7 @@ let in stdenv.mkDerivation rec { pname = "flashplayer"; - version = "32.0.0.330"; + version = "32.0.0.344"; src = fetchurl { url = @@ -85,14 +85,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "1k7h1p6g1vf96v31j1n8638jdxacap0729n0dnmh6l0h5q518k1b" + "1kkwijxlcs1rlqxr1vj51h95fwwrp5m0c9lngqpncgmmhh8v9dyr" else - "0gabgllx79s6rhv0zivfj6z79rcsdrzrdm94xdr19c11dsbqxd6b" + "0r47s19fw7gsph73rd5jb2zfsjwz7mjawm6c49rir9rsa0zxrsks" else if arch == "x86_64" then - "1pf3k1x8c2kbkc9pf9y5n4jilp3g41v8v0q5ng77sbnl92s35zsj" + "1ki3i7zw0q48xf01xjfm1mpizc5flk768p9hqxpg881r4h65dh6b" else - "1xibm6ffm09c553g100cgb6grnk21dfq8m81yy0jskph157vg962"; + "1v527i60sljwyvv4l1kg9ml05skjgm3naynlswd35hsz258jnxl4"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index b003a1b3f5c0..5274d30e68aa 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { pname = "flashplayer-standalone"; - version = "32.0.0.330"; + version = "32.0.0.344"; src = fetchurl { url = @@ -60,9 +60,9 @@ stdenv.mkDerivation { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "0wrkg2in4c0bnbifm06m4rdggzs8zbaxwrh6z3mpbf4p3bl6xg84" + "1ymsk07xmnanyv86r58ar1l4wgjarlq0fc111ajc76pp8dsxnfx8" else - "08qxa3zanlgmn8sn7crz242adx10jqymd4gzf1m0zlczw20ar09c"; + "0wiwpn4a0jxslw4ahalq74rksn82y0aqa3lrjr9qs7kdcak74vky"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index f5eea57b483d..686ffee91488 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -47,11 +47,11 @@ let in stdenv.mkDerivation rec { pname = "opera"; - version = "66.0.3515.72"; + version = "67.0.3575.31"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - sha256 = "1mw4sfjf9ijbgghkbkg45b6kzbd0qa0mxb88ajrjnxf4g26brhra"; + sha256 = "1ghygin7xf5lwd77s8f6bag339di4alwlkqwjzlq20wzwx4lns4w"; }; unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc ."; diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix index 67e91870f1a1..cb846060a3de 100644 --- a/pkgs/applications/networking/cluster/atlantis/default.nix +++ b/pkgs/applications/networking/cluster/atlantis/default.nix @@ -2,21 +2,21 @@ buildGoModule rec { pname = "atlantis"; - version = "0.10.1"; + version = "0.11.1"; src = fetchFromGitHub { owner = "runatlantis"; repo = "atlantis"; rev = "v${version}"; - sha256 = "08k2dgz6rph68647ah1rdp7hqa5h1ar4gdy7vdjy5kn7gz21gmri"; + sha256 = "1ylk6n13ln6yaq4nc4n7fm00wfiyqi2x33sca5avzsvd1b387kk6"; }; - modSha256 = "1i4s3xcq2qc3zy00wk2l77935ilm6n5k1msilmdnj0061ia4860y"; + modSha256 = "1bhplk3p780llpj9l0fwcyli74879968d6j582mvjwvf2winbqzq"; subPackages = [ "." ]; meta = with stdenv.lib; { - homepage = https://github.com/runatlantis/atlantis; + homepage = "https://github.com/runatlantis/atlantis"; description = "Terraform Pull Request Automation"; platforms = platforms.all; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 12e20e9c13b4..88ca9b3da947 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helm"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "16hbwmgq14g28r9s0ipnpiqlppyh57yrcqcspmj05vrf9jsg5vwj"; + sha256 = "0pg5cwgyfb4isy2fn233kj3bdn0i8qqp90yzix0khs5maalpnrk1"; }; modSha256 = "0618zzi4x37ahsrazsr82anghhfva8yaryzb3p5d737p3ixbiyv8"; diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 6decad2f9fbe..ee7c4ab9cbdd 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -1,6 +1,6 @@ { lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }: -let version = "0.85.0"; in +let version = "0.102.0"; in buildGoModule { pname = "helmfile"; @@ -10,12 +10,12 @@ buildGoModule { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "0k1019ddzhhl8kn70ibqf6srlfv92jkc26m78pic5c7ibqyq5fds"; + sha256 = "0v7mhsnhswiqd62wrmkcpzsg9nfi6wvkh9danngs5rqjiz1zffhy"; }; goPackagePath = "github.com/roboll/helmfile"; - modSha256 = "1npjm3rs32c1rwx8xb9s03jhd156da6p66hpaqccm7b6zxsm32nv"; + modSha256 = "0s7j7jbgr8gdc0s9dnl6zjwkpywqj05xyb7mkcank54kgrz0g5vq"; nativeBuildInputs = [ makeWrapper ]; @@ -31,7 +31,7 @@ buildGoModule { meta = { description = "Deploy Kubernetes Helm charts"; - homepage = https://github.com/roboll/helmfile; + homepage = "https://github.com/roboll/helmfile"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ pneumaticat yurrriq ]; platforms = lib.platforms.unix; diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix index 72bd82be6c16..b7decc0c1413 100644 --- a/pkgs/applications/networking/cluster/marathon/default.nix +++ b/pkgs/applications/networking/cluster/marathon/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { homepage = https://mesosphere.github.io/marathon; description = "Cluster-wide init and control system for services in cgroups or Docker containers"; license = licenses.asl20; - maintainers = with maintainers; [ kamilchm kevincox pradeepchhetri ]; + maintainers = with maintainers; [ kamilchm pradeepchhetri ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 1ad30335b94d..ec152fdc4648 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -256,7 +256,7 @@ in stdenv.mkDerivation rec { homepage = "http://mesos.apache.org"; license = licenses.asl20; description = "A cluster manager that provides efficient resource isolation and sharing across distributed applications, or frameworks"; - maintainers = with maintainers; [ cstrahan kevincox offline ]; + maintainers = with maintainers; [ cstrahan offline ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index 947abc39c21a..9d1df501369f 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -1,18 +1,23 @@ {stdenv, fetchurl, cmake, flex, bison, openssl, libpcap, zlib, file, curl , libmaxminddb, gperftools, python, swig, rocksdb }: - +let + preConfigure = (import ./script.nix); +in stdenv.mkDerivation rec { pname = "zeek"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { - url = "https://www.zeek.org/downloads/zeek-${version}.tar.gz"; - sha256 = "1lhik212wrbi092qizc08f3i0b9pj318sxwm0abc5jc3v3pz7x3r"; + url = "https://old.zeek.org/downloads/zeek-${version}.tar.gz"; + sha256 = "0xlw5v83qbgy23wdcddmvan2pid28mw745g4fc1z5r18kp67i8a2"; }; nativeBuildInputs = [ cmake flex bison file ]; buildInputs = [ openssl libpcap zlib curl libmaxminddb gperftools python swig rocksdb ]; + #see issue https://github.com/zeek/zeek/issues/804 to modify hardlinking duplicate files. + inherit preConfigure; + enableParallelBuilding = true; cmakeFlags = [ diff --git a/pkgs/applications/networking/ids/zeek/script.nix b/pkgs/applications/networking/ids/zeek/script.nix new file mode 100644 index 000000000000..10a2d11a1489 --- /dev/null +++ b/pkgs/applications/networking/ids/zeek/script.nix @@ -0,0 +1,62 @@ +'' + sed -i "1i##! test dpd" $PWD/scripts/base/frameworks/dpd/__load__.zeek + sed -i "1i##! test x509" $PWD/scripts/base/files/x509/__load__.zeek + sed -i "1i##! test files-extract" $PWD/scripts/base/files/extract/__load__.zeek + sed -i "1i##! test files-hash" $PWD/scripts/base/files/hash/__load__.zeek + sed -i "1i##! test files-pe" $PWD/scripts/base/files/pe/__load__.zeek + sed -i "1i##! test analyzer" $PWD/scripts/base/frameworks/analyzer/__load__.zeek + sed -i "1i##! test cluster" $PWD/scripts/base/frameworks/cluster/__load__.zeek + sed -i "1i##! test config" $PWD/scripts/base/frameworks/config/__load__.zeek + sed -i "1i##! test contro" $PWD/scripts/base/frameworks/control/__load__.zeek + sed -i "1i##! test files" $PWD/scripts/base/frameworks/files/__load__.zeek + sed -i "1i##! test files-magic" $PWD/scripts/base/frameworks/files/magic/__load__.zeek + sed -i "1i##! test input" $PWD/scripts/base/frameworks/input/__load__.zeek + sed -i "1i##! test intel" $PWD/scripts/base/frameworks/intel/__load__.zeek + sed -i "1i##! test logging" $PWD/scripts/base/frameworks/logging/__load__.zeek + sed -i "1i##! test logging-postprocessors" $PWD/scripts/base/frameworks/logging/postprocessors/__load__.zeek + sed -i "1i##! test netcontrol" $PWD/scripts/base/frameworks/netcontrol/__load__.zeek + sed -i "1i##! test netcontrol-plugins" $PWD/scripts/base/frameworks/netcontrol/plugins/__load__.zeek + sed -i "1i##! test notice" $PWD/scripts/base/frameworks/notice/__load__.zeek + sed -i "1i##! test openflow" $PWD/scripts/base/frameworks/openflow/__load__.zeek + sed -i "1i##! test openflow-plugins" $PWD/scripts/base/frameworks/openflow/plugins/__load__.zeek + sed -i "1i##! test packet-filter" $PWD/scripts/base/frameworks/packet-filter/__load__.zeek + sed -i "1i##! test reporter" $PWD/scripts/base/frameworks/reporter/__load__.zeek + sed -i "1i##! test signatures" $PWD/scripts/base/frameworks/signatures/__load__.zeek + sed -i "1i##! test software" $PWD/scripts/base/frameworks/software/__load__.zeek + sed -i "1i##! test sumstats" $PWD/scripts/base/frameworks/sumstats/__load__.zeek + sed -i "1i##! test sumstats-plugins" $PWD/scripts/base/frameworks/sumstats/plugins/__load__.zeek + sed -i "1i##! test conn" $PWD/scripts/base/protocols/conn/__load__.zeek + sed -i "1i##! test dce-rpc" $PWD/scripts/base/protocols/dce-rpc/__load__.zeek + sed -i "1i##! test dhcp" $PWD/scripts/base/protocols/dhcp/__load__.zeek + sed -i "1i##! test dnp3" $PWD/scripts/base/protocols/dnp3/__load__.zeek + sed -i "1i##! test dns" $PWD/scripts/base/protocols/dns/__load__.zeek + sed -i "1i##! test ftp" $PWD/scripts/base/protocols/ftp/__load__.zeek + sed -i "1i##! test http" $PWD/scripts/base/protocols/http/__load__.zeek + sed -i "1i##! test imap" $PWD/scripts/base/protocols/imap/__load__.zeek + sed -i "1i##! test irc" $PWD/scripts/base/protocols/irc/__load__.zeek + sed -i "1i##! test krb" $PWD/scripts/base/protocols/krb/__load__.zeek + sed -i "1i##! test modbus" $PWD/scripts/base/protocols/modbus/__load__.zeek + sed -i "1i##! test mqtt" $PWD/scripts/base/protocols/mqtt/__load__.zeek + sed -i "1i##! test mysql" $PWD/scripts/base/protocols/mysql/__load__.zeek + sed -i "1i##! test ntlm" $PWD/scripts/base/protocols/ntlm/__load__.zeek + sed -i "1i##! test ntp" $PWD/scripts/base/protocols/ntp/__load__.zeek + sed -i "1i##! test pop3" $PWD/scripts/base/protocols/pop3/__load__.zeek + sed -i "1i##! test radius" $PWD/scripts/base/protocols/radius/__load__.zeek + sed -i "1i##! test rdp" $PWD/scripts/base/protocols/rdp/__load__.zeek + sed -i "1i##! test rfb" $PWD/scripts/base/protocols/rfb/__load__.zeek + sed -i "1i##! test sip" $PWD/scripts/base/protocols/sip/__load__.zeek + sed -i "1i##! test smb" $PWD/scripts/base/protocols/smb/__load__.zeek + sed -i "1i##! test smtp" $PWD/scripts/base/protocols/smtp/__load__.zeek + sed -i "1i##! test snmp" $PWD/scripts/base/protocols/snmp/__load__.zeek + sed -i "1i##! test socks" $PWD/scripts/base/protocols/socks/__load__.zeek + sed -i "1i##! test ssh" $PWD/scripts/base/protocols/ssh/__load__.zeek + sed -i "1i##! test ssl" $PWD/scripts/base/protocols/ssl/__load__.zeek + sed -i "1i##! test syslog" $PWD/scripts/base/protocols/syslog/__load__.zeek + sed -i "1i##! test xmpp" $PWD/scripts/base/protocols/xmpp/__load__.zeek + sed -i "1i##! test unified2" $PWD/scripts/policy/files/unified2/__load__.zeek + sed -i "1i##! test intel-seen" $PWD/scripts/policy/frameworks/intel/seen/__load__.zeek + sed -i "1i##! test notice" $PWD/scripts/policy/frameworks/notice/__load__.zeek + sed -i "1i##! test barnyard2" $PWD/scripts/policy/integration/barnyard2/__load__.zeek + sed -i "1i##! test collective-intel" $PWD/scripts/policy/integration/collective-intel/__load__.zeek + sed -i "1i##! test detect-traceroute" $PWD/scripts/policy/misc/detect-traceroute/__load__.zeek +'' diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index 2fcf65dfc1c2..c7d8ce4b56d5 100644 --- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonApplication, fetchPypi, pythonOlder, +{ lib, stdenv, buildPythonApplication, fetchFromGitHub, pythonOlder, attrs, aiohttp, appdirs, click, keyring, Logbook, peewee, janus, prompt_toolkit, matrix-nio, dbus-python, pydbus, notify2, pygobject3, @@ -9,13 +9,16 @@ buildPythonApplication rec { pname = "pantalaimon"; - version = "0.4"; + version = "0.5.1"; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "1canj9w72wh1rcw6fivrvaahpxy13gb6gh1k8nss6bgixalvnq9m"; + # pypi tarball miss tests + src = fetchFromGitHub { + owner = "matrix-org"; + repo = pname; + rev = version; + sha256 = "18jihvqlfk8lx97hxcr36zdkp2sffg2l8mkg5lflylwcgwy1dx0y"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix index 76cc393f26a3..a214f222d566 100644 --- a/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/pkgs/applications/networking/ipfs-cluster/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ipfs-cluster"; - version = "0.11.0"; + version = "0.12.1"; rev = "v${version}"; - modSha256 = "03bqwg9nqh7w6j887gzxr2mcn14jc8f07z896b3swg5wzaz1i6hs"; + modSha256 = "0bn47lcb9plzvl2vqqj7p33ishz6bbqpsgf2i6p34g13bwwpq647"; src = fetchFromGitHub { owner = "ipfs"; repo = "ipfs-cluster"; inherit rev; - sha256 = "0q5lanm2zdwwhdwv05fssb34y4y4dha3dq7x1iaabbf70lpqv6yx"; + sha256 = "1jh6ynj50jd4w79widaqrgm3h3yz5h03vq0lbsx717a8d9073blh"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index db325cf13877..4f71fcf3b745 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -2,17 +2,21 @@ buildGoModule rec { pname = "ipfs"; - version = "0.4.22"; + version = "0.4.23"; rev = "v${version}"; src = fetchFromGitHub { owner = "ipfs"; repo = "go-ipfs"; inherit rev; - sha256 = "1drwkam2m1qdny51l7ja9vd33jffy8w0z0wbp28ajx4glp0kyra2"; + sha256 = "19m1bhqf1jghdv2ngdnjdk1kvjcxbkgm1ccdkmkabv4ii43h8jwm"; }; - modSha256 = "0jbzkifn88myk2vpd390clyl835978vpcfz912y8cnl26s6q677n"; + postPatch = '' + rm -rf test/dependencies + ''; + + modSha256 = "12m4ind1s8zaa6kssblc28z2cafy20w2jp80kzif39hg5ar9bijm"; meta = with stdenv.lib; { description = "A global, versioned, peer-to-peer filesystem"; diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index ffe75eaac7c8..5f5e66597acc 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -107,6 +107,6 @@ stdenv.mkDerivation rec { homepage = "https://www.claws-mail.org/"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ fpletz globin ]; + maintainers = with maintainers; [ fpletz globin orivej ]; }; } diff --git a/pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix b/pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix new file mode 100644 index 000000000000..1e1909e7109a --- /dev/null +++ b/pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix @@ -0,0 +1,121 @@ +{ config, fetchgit, stdenv, wrapGAppsHook, autoreconfHook, bison, flex +, curl, dbus, dbus-glib, enchant, gtk3, gnutls, gnupg, gpgme +, libarchive, libcanberra-gtk3, libetpan, libnotify, libsoup, libxml2, networkmanager +, openldap, perl, pkgconfig, poppler, python, shared-mime-info, webkitgtk +, glib-networking, gsettings-desktop-schemas, libSM, libytnef, libical +# Build options +# TODO: A flag to build the manual. +# TODO: Plugins that complain about their missing dependencies, even when +# provided: +# gdata requires libgdata +# geolocation requires libchamplain +, enableLdap ? false +, enableNetworkManager ? config.networking.networkmanager.enable or false +, enablePgp ? true +, enablePluginArchive ? false +, enablePluginFancy ? true +, enablePluginNotificationDialogs ? true +, enablePluginNotificationSounds ? true +, enablePluginPdf ? false +, enablePluginPython ? false +, enablePluginRavatar ? false +, enablePluginRssyl ? false +, enablePluginSmime ? false +, enablePluginSpamassassin ? false +, enablePluginSpamReport ? false +, enablePluginVcalendar ? false +, enableSpellcheck ? false +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + pname = "claws-mail-gtk3"; + version = "3.17.5"; + + src = fetchgit { + url = "git://git.claws-mail.org/claws.git"; + rev = "c1e1902323c2b5dfe82144328b7933dc857ef343"; # this commit is "for release 3.17.5" + sha256 = "0cqzlzcms6alvsdsbcc06bsdi1h349b16qngn2z1p8fz16x6s6cy"; + }; + + outputs = [ "out" "dev" ]; + + patches = [ ./mime.patch ]; + + preConfigure = '' + # autotools check tries to dlopen libpython as a requirement for the python plugin + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${python}/lib + # generate version without .git + [ -e version ] || echo "echo ${version}" > version + ''; + + postPatch = '' + substituteInPlace src/procmime.c \ + --subst-var-by MIMEROOTDIR ${shared-mime-info}/share + ''; + + nativeBuildInputs = [ autoreconfHook bison flex pkgconfig wrapGAppsHook python.pkgs.wrapPython ]; + propagatedBuildInputs = with python.pkgs; [ python ] ++ optionals enablePluginPython [ pygtk pygobject2 ]; + + buildInputs = + [ curl dbus dbus-glib gtk3 gnutls gsettings-desktop-schemas + libetpan perl glib-networking libSM libytnef + ] + ++ optional enableSpellcheck enchant + ++ optionals (enablePgp || enablePluginSmime) [ gnupg gpgme ] + ++ optional enablePluginArchive libarchive + ++ optional enablePluginNotificationSounds libcanberra-gtk3 + ++ optional enablePluginNotificationDialogs libnotify + ++ optional enablePluginFancy libsoup + ++ optional enablePluginRssyl libxml2 + ++ optional enableNetworkManager networkmanager + ++ optional enableLdap openldap + ++ optional enablePluginPdf poppler + ++ optional enablePluginFancy webkitgtk + ++ optional enablePluginVcalendar libical; + + configureFlags = + optional (!enableLdap) "--disable-ldap" + ++ optional (!enableNetworkManager) "--disable-networkmanager" + ++ optionals (!enablePgp) [ + "--disable-pgpcore-plugin" + "--disable-pgpinline-plugin" + "--disable-pgpmime-plugin" + ] + ++ optional (!enablePluginArchive) "--disable-archive-plugin" + ++ optional (!enablePluginFancy) "--disable-fancy-plugin" + ++ optional (!enablePluginPdf) "--disable-pdf_viewer-plugin" + ++ optional (!enablePluginPython) "--disable-python-plugin" + ++ optional (!enablePluginRavatar) "--disable-libravatar-plugin" + ++ optional (!enablePluginRssyl) "--disable-rssyl-plugin" + ++ optional (!enablePluginSmime) "--disable-smime-plugin" + ++ optional (!enablePluginSpamassassin) "--disable-spamassassin-plugin" + ++ optional (!enablePluginSpamReport) "--disable-spam_report-plugin" + ++ optional (!enablePluginVcalendar) "--disable-vcalendar-plugin" + ++ optional (!enableSpellcheck) "--disable-enchant"; + + enableParallelBuilding = true; + + pythonPath = with python.pkgs; [ pygobject2 pygtk ]; + + preFixup = '' + buildPythonPath "$out $pythonPath" + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share" --prefix PYTHONPATH : "$program_PYTHONPATH") + ''; + + postInstall = '' + mkdir -p $out/share/applications + cp claws-mail.desktop $out/share/applications + ''; + + NIX_CFLAGS_COMPILE = [ "-Wno-deprecated-declarations" ]; + + meta = { + description = "The user-friendly, lightweight, and fast email client"; + homepage = "https://www.claws-mail.org/"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ fpletz globin orivej ]; + }; +} diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 274d9d4718e2..dc473eaaadd7 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "20191207"; + version = "20200313"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "147yjpqnsbfy01fhsflxlixk0985r91a6bjmqq3cwmf7gka3sihm"; + sha256 = "1k4k07l6h5krc3fx928qvdq3ssw9fxn95aj7k885xlckd2i1lnb5"; }; buildInputs = [ @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { description = "A small but very powerful text-based mail client"; homepage = http://www.neomutt.org; license = licenses.gpl2Plus; - maintainers = with maintainers; [ cstrahan erikryb jfrankenau vrthra ]; + maintainers = with maintainers; [ cstrahan erikryb jfrankenau vrthra ma27 ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index f8d8c2627fec..e5ef55678006 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,615 +1,615 @@ { - version = "68.5.0"; + version = "68.6.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ar/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/ar/thunderbird-68.6.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "dc71109c963e9b8e162437e33feec002268b392cba9ebbfb37714aa79e834143641b92488c3c923256b1d0058c92e6502caf4f022b17145d8e0f67fa7d77b7c1"; + sha512 = "af46815cdcaa2f9d7819f9d38d9d924813e28784a94829717301fc603175a7e0c6d20b698f76125bc7a31be83753df65e155c36643c77e18eb48ac57257a4969"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ast/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/ast/thunderbird-68.6.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "2768582e13905d162eacb051209a3ff5c7f704ff95efa3339cf8ecdfce3f892e76e79e65d11c4638a8f4529177a7b2efb12d7c6ac308c1d02b93da361bb9cd23"; + sha512 = "484b7abf08bbbb5a6302d35f4d6f5b40ecbba900b40b11d1e40f46e613af4c51a17413844bc8d5792b55bc11f5585d1ec8956cef99c7c1c6b6255389a34e7256"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/be/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/be/thunderbird-68.6.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "dfb0806383acb8bbe817be30c4ad1ed34f21e68dea71e249226b07fdf4d1226c88690962f228b6d3f5d0205501be2dddf985b9f99b8eae37400362f1a0be1979"; + sha512 = "32e26ea9effd43c50ca27c59e9e65dc2beb882fbb0df2d7ae7eca41fd736b740872c756a3722df69095bc6015657ffa314bf03d0ca6f8119ca861ac7835e8dde"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/bg/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/bg/thunderbird-68.6.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "194b1f645ca3b1607283d176e28e07e204abec90a96a85e9f2aeef0c1af8011c7dea3f0dfdc37402719380b26899c83800ecb79da194730e9c3fcfce1685778b"; + sha512 = "cc19721c742e339e1c988759dc3cc6055e9c43b590075994774985158e366347a3bada182224a613e8f181491bcbee6a05712a63e0ee1d02de11e61442faea37"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/br/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/br/thunderbird-68.6.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "1b5513ea62c766d8dc7839fb9708dc63ab01e297a146a351d670aff3d6e7d6a842289da5da753fe649ff08a751b0fd0abee7a1fc71f7d0eebef375b72e929973"; + sha512 = "590cffad2e7027a5b833462d752c3b4507c9ebc04af621013a745534091255ca1cfe6863d191200015057e6d1fe289691229c4e6242e8aa9047ca09b15d68ce4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ca/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/ca/thunderbird-68.6.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "460c3b39881ab764fd7bedb10c27a2df5da6a907058010204d8849b87da42ce48f0038b05d0910b2c7df8339952dd781ea167687706494b92de2d0deebba8b81"; + sha512 = "56f6a25c737d18da4662410710306d93290f9db851cf338d564d9088004f6169390797fde3afd720b376d642394ba4052bddbb5aeff100d6b9e97ef7d2a1ea19"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/cak/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/cak/thunderbird-68.6.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "f35ea0852f598285d86445d80839db0dac799760607bd83db528196ebaf3a77abf9f185a2b2f1044a7d5c0fd07383e8c0e020dcc7251817d6d3299d6cae63137"; + sha512 = "45057e2f2b4cbcca5349f25c2396311ee8d5ed13fb329d471907dde9fad89810eeb72a5eac1adddcb86527c7a9bfc8dd190987d579f28ad5f6e1a9b2e0792ce8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/cs/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/cs/thunderbird-68.6.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "baac0a55a175fa4e9512c7ff2a82d986af049eadbde9e1136216ce1d5b384c4db3891ab8b5af420dc4a0635ba50a9d4908baed0f3a9f1ca0076596d20d5e15a0"; + sha512 = "9c7452d7ff20c1c15f1f12cb06493ab65549aa934b86aa37ebd0be95e55f4156f155f5d3e7bbdaae79d02514292458ae7de14852072067f52715b0ba45ae99f6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/cy/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/cy/thunderbird-68.6.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "ef0b065b9d322772ec002d994140b2c9510f80d993c9c00aaa65d3314b9b4b7352ffdda6b84a916326deebfc8a12696d60a62d69f5aa13bbbacfbf9a5ccbe443"; + sha512 = "6498688d0f18c1a307c19d3d738611993c35e56e67fae024d0676ec49dba6a752b883b539e2a83085c06f6065772ce393f4d0f9e0a898bf02a141e36ebbf523c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/da/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/da/thunderbird-68.6.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "1a9e3396d278cf9a02bb0bdc226036fd3cd6c86f47a4d9d00f4ca1031491a068b56c0b501799f75e385295ee50b013753376183b2bba73f0e95ae801507e0232"; + sha512 = "ad306983ae608ce8fa6a706a6459d8047e00f156870e8dc2e6b0c6c07661d6a836e8599a590b2f166b819a8d5b0e75106be7e4db0e7746566cac9397b9c29f7f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/de/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/de/thunderbird-68.6.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "7b292fe10c09831c1b21141168aa136da9a2d78750bb5094633d2f58f85f3b4df69b6b638e00f097a1490050cf92f4bcc53cd4bef9a5539bb96cd2812971318d"; + sha512 = "0449a38f90aff5e05a0b5382d108999c59049b8974592c3310fe2efaa8d0928e056fb3d81ad096975d6f9307adb79f9285853ef8339d3de88326b9d64bab086e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/dsb/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/dsb/thunderbird-68.6.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "3f26f768e5f400dc19d4069cb034878a3e0df059a5ec90cb70b06f138585ed976f58efb14ec54a3c0aac1e2fb8561c8e198f7a5822a40b37eff93a8e1c9ef3f2"; + sha512 = "ea99eb1eab6e06da1bc62dfa8b1c203eb5b8d61027ae35f29cb38ec1c2753ae4d2d96ce93b39eba665c3a5c247dc4adf0654154bb19d5ecfcb0631dab9a38085"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/el/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/el/thunderbird-68.6.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "c6847200d45a169ef8a3bae3e2b7d45592d31429a205222e03f9d5365104e92be54dc4b07227b23c07abd425ee5383b5917d34362d4f37667b6f5addc9197514"; + sha512 = "25241521666f05d2206188b8a7078d8db4585818511453f5359e19683305b5970d47636b37e4287d170c3a3d222dc8f3f6c81558e05be63679cce298f5321e17"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/en-GB/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/en-GB/thunderbird-68.6.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "bcc10a9daed5c4e68eb4a582cbfc8aa1c30b0d4cb92a714adbc695bba410e23d2f65e1194c0ed580976cda51d61fb95784b6296be95952aec1a2b51e711434d4"; + sha512 = "f247725c614dca6e6ede4622802a8ad3c342046eab0b4fe57dda6a1ba8be601adea20b9906e2a8d99c243712a0e067a2821c1e1b3a7ad57efd1766a60354840b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/en-US/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/en-US/thunderbird-68.6.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "9500d9a22bb42a04fd2d7d24ff8fb7a69b205d6f889ab3b301405a22a51da731452fd18ce33c492f0733d72bddf6aa37b4d8899db4418e8e0155f2bb93af6b06"; + sha512 = "0db0b36b095355d080d985df6547264a3df136d11ce828872dcc3b19c24a3156f521e1657c68059ba31de806f18a3d285275eaeecdb076344996bf8f6731bae6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/es-AR/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/es-AR/thunderbird-68.6.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "b193048a9c1a0d4c08c08cd12ae41c7a9cdfc8dba47c645d593675e08ac68f8158a578e645c8db32b862b0bb7174627534340a62aefa8ab9e38489b8b7687234"; + sha512 = "5efa24ab3951d53828eb8a04bd34029428fb832f19284111192993fb66e2b7ca1d91e400180f1b989562f391281ff9a1c05c927a8ffc599b993c7192197b334e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/es-ES/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/es-ES/thunderbird-68.6.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "c1c5cd0b49e388260cc781e4bc7bc46530791467d4241defc31dae35c0ced85d8cc9e63734b0b8898eb23216065f388930d36227bd1484279ce135b20a70f041"; + sha512 = "4d54f696793ca1264e7523ab7a3b64c64e57a8bf287257c21b5d06ea1eb51703cac251a2b9da7011942956bf110d1f09e661d28f5b7b861367d17cb299a740a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/et/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/et/thunderbird-68.6.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "9cb03aa0214d8e8a0c0786b95d5716a761bb9b2f1fb430b552f09ad3942a277e0117d7b2d95cabc01fb63dfc7956aeabbc522d38515371af7e3a52b8514a32d8"; + sha512 = "e6bd840cfa218b32b27315ee5c406db626a54597e6944426733e386a90b61cb0ad62c2b71f9d9bcaa8aa287e0778c3f89e3cb2ac589dc662da984d2b85748216"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/eu/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/eu/thunderbird-68.6.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "3c1da2c13f0b5ed58a1b11fcac24bb3ded8f1fd5dbb23fb8eaac529e5595bcca6adcfee0effa4c4e8a78e85d53b062113022e8e34ca936dc99cda5720a859b39"; + sha512 = "c39144c970c5f95d25e0a3a8065dd97fad9171159564a12fbc1596132aa8522191cf0db67e83a19f49e60e5df4251c00f7a8b779dbaa576ba48c93f5f7db199a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/fi/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/fi/thunderbird-68.6.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "1d04c56fd080a52dc2c399339369ab54a7650ddd9d4f473b6ae40445c2889e05eb25c635d7add28e779df3c851fc9826c416419be22691c3424bd8ad01ab23d1"; + sha512 = "038f4a2893f42db613135a9702430c312d9ffe42e17ca46512ce4a1cefff29f60727b615a1893d40e7169708627b4ecb4000eb05e146a0af48c8564e1c4fbedc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/fr/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/fr/thunderbird-68.6.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "a64c2a4c2f7da481995be93d03b6442a79c6a8ebeae3c2e1bd0efd8256f400bec3a416348ebee1753edd8a5911a80aa81843651e39a718607b3085494589210e"; + sha512 = "79e3a612752694162d11ddf3a4c4514341d56d1efe9bfcf997914b9084b3944a87a0276ec6d97ce2145150a3aea61526dc4e252f79a0832d37d144286b36f933"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/fy-NL/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/fy-NL/thunderbird-68.6.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "4e51df5766540356dc86414063c98f47aaca94a57d2449c05c677513ce4477533638eb34b234696431b8beb4d241b0eb97db08cf9e27da891e95965c16ef21a3"; + sha512 = "f54b56da0958198525c61d4c3b4b7f007cd28a3d621fa7a1fc2a85f020c5bf8e6fd66e4be9931543d19fd6b3d9cb0d69b36609c8dec71e0936d05cbbe91ae729"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ga-IE/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/ga-IE/thunderbird-68.6.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "ec4f2667daeff8305feb8ac64304f42fbcda6b4c93a8bdfb1f4b45f1fc40163049f6a887f7208b41c49a21a5d94f06adf2f4446e784b8e2822c9f997d783eff2"; + sha512 = "4e3c594578f7667e6f9ba8928a224e180830a9853b89ec60508554d11c9b7e2ca06fa7a9504fcfb3b0b8257bddd136ed8a15632beb7760a5d1ab5c43e30d565b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/gd/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/gd/thunderbird-68.6.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "09076ac19ec28a790b84c584856ffb60cbcb0db11fe52f1bd307515762fccf79e158a8805c6743eff287a4b25978f94c8ffcaf655b414fd267cd9db321ccbc41"; + sha512 = "98c466383f136f8c104475a8a1d8098f8f0a047b358ecbc93fe4ad6c1e96bffc3de81c61a9026ad8dbfa8e95130b4bf8c82d5d08875dc4c012357291d483ab87"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/gl/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/gl/thunderbird-68.6.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "ad697320ba8f4e5a04a4e201e04490398cc09152b1cb1a31e325c06a30d8ca6f7209c35c9d9263e6087db41b4502e69c9ad6c35183872312dcde215ab1ba3e90"; + sha512 = "649f1df44ab7289abc6038deb59fe38258fb31f8d20aa44fee6630d469560dbf212973fb9fd437fcef7456554223f7971a39a00de57b543e7e71d6f857ca0d34"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/he/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/he/thunderbird-68.6.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "7b367bd45c876e20a22e71b276d9ae9b7aec5fc58574647a5b8f99bdb52602eb41541f3397eea54a7395c5374a26277f1a312edb49c95eedfdc9ae06a6f5b9d3"; + sha512 = "70e97215a9b91ddb832f85194e3c8c385a7fbda9edd31d2273f472f6bf7ab12d8055e9bd535aeea5fc822588aa0efa2dbe4e66425a8eed16f2c8e321da9e6223"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/hr/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/hr/thunderbird-68.6.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "8f8fc6fab45e45ee426426a28fd00deb52110f68f2aa29037db120fa81afd802681aabb1f390ab62e2f067ac178eaf7f2b1d4f0c4ac70492ce45ef1cd2545a92"; + sha512 = "e44d1ea44dbcde82ac630bf6a34802adde9d4948f7036275a9ea424b70de44a2198d016db6d2ab860fa0bc6f74262db7b57d53cabb4ca03c6237fdd5cbfd584e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/hsb/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/hsb/thunderbird-68.6.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "870c925b327ff575b1cb6819864c5bb70b5531871e04a69ec3a456f83cd207bb2cd45defb4722f03586bb5e6569fe3d7e2c6e7937127269e9018a41039b6d83a"; + sha512 = "326f0a15c4ef03243c89cffe8cf5092fe0f1714f43afb835bc0b9b9711fb597effcc488eca3eacbd2f3777c6f355469a2164a6bc0c850984d554949002484026"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/hu/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/hu/thunderbird-68.6.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "3bacd70e1bf4c07d1c625e835296d52d353546950178a92ad4ff1d29168b78928f985b3db99c7b5587aeb5a51e54c9f4cb5f0cf354df3ea853e8147ff969c288"; + sha512 = "af5dc78b7e413c94aa3ef2a7e9a036d984c0519e762449178b3e404803ea375f0a1e92f0a24087d21cf2806d73100b5b161b67f587045e5f829f397d97143d14"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/hy-AM/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/hy-AM/thunderbird-68.6.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "46b9728709dd7866d6233e20c949dacccde3f62fce1558d2baadb87b94438833faf4d93e9449b0a5cddfbef8c3c9967258c606445c1fbf13aa74d776f61d844f"; + sha512 = "ab274b064c3fdf65f96f65ae0f582013603093be63ea38ebdd85b325f7be0e517301e22e954968dac83e8460a8f348e3b9ac4165cebf8ef540b4ba4095b23707"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/id/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/id/thunderbird-68.6.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "11889847cd84dec9132eaa768251fe41dfcb7cb4682cb5c34160142791f75512b74b79d1caa2ce8cf205e521a244b168f89760782dcf1b453793122414903428"; + sha512 = "1de1c0eeacb51814ca5de25b1b088072cb4c703068aef160534b339dcc0fa3a541400bc8a7c374595cd67c53708eefe2a264b3e8178a4ecca77b7da10b44524b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/is/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/is/thunderbird-68.6.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "e68fa0a96283013df42afa1fc7889d9dbfc906e508399d7dab6131b885ac73e5558c7acab1a5e8c13c6252e1612d43a1bc503b570c6f978c0460b121f2f37112"; + sha512 = "ac72b529293288e938d5a0b0a594c9fd47b0ed5a3173299b22afe7d11c34c347adf9e5b715ea3654561f4fc13ee0f81b8ba1b9504c96be71bd04b9c7d1eb719d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/it/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/it/thunderbird-68.6.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "a55f5664274caabc43d64ac1abaf04f159c2b76c8389ecc00dcd213430d8c80836fe149bf4449cccc53184f2ded1ebcb85f8347de099aee47c32c899c5184a6c"; + sha512 = "734c29ba833f05711bab8ae3548ce33a4633b48dedfddcc84ef6dbe4fd208eb6736f6f62f2ff74a8cb4864ceae1abde570b56669d199ae8162de5f02b79c44a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ja/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/ja/thunderbird-68.6.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "b3fb1bfaeb1509ee3392b11e18a2f80b6a84165e6f01c6caeb47f4b1e9dd8733d88ef724497f603352119412d9b5f88d7d37b21ccb1802e4f3930c6f499363e2"; + sha512 = "922026013615642cb55a4bebe647b99d84386a04ae2c6b3f5996a060ed62ceb921818439cafedbbf25486181cc4e2fb57058a0ac5d276a7960c70f6214ca81b0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ka/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/ka/thunderbird-68.6.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "1cf0b21bd0c1742a018675b8af830be7de163e567a2691b5c95cf91af9753b23d431ad5b67738d690220d1d8a57da7990cb01f89917f7c8ddad80b4ab056a83a"; + sha512 = "4804caeacf6aa2dbf14c88ae36f670ef06382ee98c71be6e341a620c8230222c413784b0b640dabf01266271debfb1eb59d4c2b80e596b092995d2327eec839d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/kab/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/kab/thunderbird-68.6.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "8decdb91a1241f4d9495202965986d78598f5e8be603ed9c28bbd2a8cb405ce96a1206f1ade35a11e2f161bffbd8a034fd13b15abd16f4ec5a05442a6194fd1e"; + sha512 = "f5cdfa7596ebd37cd0b4e7a31b5b2ad1d4e336c52681560a2183a3aae7dfd8be01312b5b342f1f0c1962cbfa13c8c2da188642dd16efcca30944bf30f71b7017"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/kk/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/kk/thunderbird-68.6.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "7a7e4d2c6dca6455c81456bb5a8eb3c8a085458ed9253c4a91b22a8cde9892fbba624be89c7ab1fea5875d902fa1198cf796bb309c3b6bd597bc05013d3f4687"; + sha512 = "ca87066bb2f8e945299c984189a5e01a620d3ca04b1f96a85fe99fb629c7a9721b289f702299aecfa5a67515d3f45827f8930ead8fa4a9187e0610a55d64e790"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ko/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/ko/thunderbird-68.6.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "cb037d1ab8dde1fcd61dfd446aa7587c7dcb24d239485e3b3c63db49097eb91bdc59fa9048b8871ce17da6b33bb0490e9f7a8f29f5f59a623f4eca522a04c287"; + sha512 = "89869ca565d972065b8e87d6d8febfcdfd7269b158f7afcd5747933759c6345deb979235139aa86cecb021c2abad30b5683b76de9c606a1dcbfc7dbccede98c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/lt/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/lt/thunderbird-68.6.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "898ad8b33435bafc361861a19887fa423eb2000acff87862543e4051722e1e1b4d6606eae057647bf7bee366296bfe5567ac1e7002fd62d28515a4d57c2466ad"; + sha512 = "93a417401249b24d25000c05970cec3c1a5f6f292a944ab2cc306fa076052228c354d746d180ee7c4fc75baf70b241cc743ad7e3a2ad31ceccc44bdb1485bd26"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ms/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/ms/thunderbird-68.6.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "c08d8ec6ff837eb03dc41fa5e8d9e7d8a142df489f47698f372808c0ddea88d1313abef999c00a0d4aaa6e0d5d4564845b001454d85ea8990cec072fea689e28"; + sha512 = "f0c8dcb9431889bafeab7964a48e377a00e04acff18cfb2955b41845c765ffd1d9ab77b6d4ae8a87dc0a7b7f2dffe3c5502fb4b6fda5ca042aeac1e445ba85bb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/nb-NO/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/nb-NO/thunderbird-68.6.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "9e34bea73e2514f2c76a08a79752977d12c42726408be0d5d39405c2edd56f826ad453fdb1e20c4f8840070715fc0eb1211135e8c9b1f3ecac6c0e99ec0be029"; + sha512 = "e3638c127d26636cfedd5c7024b58c04140b00da59c67afc3d93cdd7c359467b32113259af6fdedebb9d13d46005f50306a774731d90e65238f018fdf90adaa2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/nl/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/nl/thunderbird-68.6.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "3bd89bc0528d49a79ca93dcc6842f06102fd0799164d717ef7aeb15f283b44a7236148bd7a746ea7d713cf41b2bed7a5b7e66017b46b3398e4b6f035c7933a14"; + sha512 = "0289e32a70c952288248f3b3c5bddf7fbd77927d944f5b1b08c8e0268d20aac4bcfa21e246fc04ec10f47134b4f40498c0bde6af419145822165898d5f972119"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/nn-NO/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/nn-NO/thunderbird-68.6.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "0cc4b9ac7dab3e879f6a691546fb414c4b43de166c5deb018634fe8d6583bff378d60937be4c8c30a1ffe68f5d715bb67414fa7359e061c766426666bdbbabc9"; + sha512 = "ce1c64501cf2f3b599a7e0614d6845cdd3d3d37e876926ff0b5280c829f18b2746f0b4c43a46f1f0308d39f3a9fceda29a47374aa343ff4569d6af01c508ba08"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/pl/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/pl/thunderbird-68.6.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "48ceb0fe27e9dff3c09aaf05276aaa7c9c0d2d643236bf69af03974cd514bdd0d3bc816151887d3247907bb67853ed840e486e6f1bc721ac7283ea193152b723"; + sha512 = "86cddfefab791d313f271f91f209be19f3475a7e92801da6163078b62531da345156a048ca6036f3b32a663de06cd3eb719fc9c07b19effe104d86b010ea7180"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/pt-BR/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/pt-BR/thunderbird-68.6.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "77a272f0553e2981d156b5c928a159ef754ca2220e8e48a06a6bd53bc67b6965a202e06ee98d15bd8d2f5fabc9768ea744eed8d88009f194b8a3f0097eb2b194"; + sha512 = "613d75a4fb7affb990550d6a9a61af145a7bfa9dfe2b5385d6be06762a0624d78a3ef1ee7940d0d4b76fe9e5b728f55dd9b804d136ee3d16f71415d1597a733d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/pt-PT/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/pt-PT/thunderbird-68.6.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "bdbc148ab52ea519e2e5dc07655ffb687154a93420ac3d9b320349102436214ee26e558d94f4c8bcad1a94d611e7222f28c660e425385f3598c369332710066d"; + sha512 = "1d2c2582ee452557ebd600fa61bd89c6162d78ccaf4884567557ac4efae43c604288ac401fdd0ef1c9aafc32c913593fd6d69795e215b762556478245150ecb1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/rm/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/rm/thunderbird-68.6.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "de01b86deacf5af7b44112147cbb13057137a70c77e4f3f0fd7b6f2286da3cfff14d11bed3d2e2501db51dae336e3fdeea0fca60b5af92b13de78d9dee98d46e"; + sha512 = "c2c25f143b1421dd44180b55fe4263bc250c4f52b4748c133a38a9b7ecc7f491e492f2dd8e02ce7ff1a6cf61300eec939c0156740a2cb0ed2d37cca3a3570561"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ro/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/ro/thunderbird-68.6.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "03a9eae26c2b1d989d8f74b8bbe5237265f89c6632568be7282e1e9253fad3062502e1d64402f3fb57b1755a2b52be0fad65c0a099aa55affd623b594083f303"; + sha512 = "ef52beef9fa5de764fbc40c746fb6d95e5726174237432a5fe690d67c9e56a0138f6ed3fd0531a27fecc14c79e7d42ce84837e9cfd0df3db2a0134acb7460132"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ru/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/ru/thunderbird-68.6.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "a80a5cf3d34eb4e231c67182a17401783c75c5ccb0911fcc61a1cac8e007fca4e67004de02d9d10c5442dc2ad90837b6da562f37468dfbb84eef45981a6520aa"; + sha512 = "7fece3278eea40b2f4dc9a369cbed40ea04c9d499a1a5c23ec38e57a452c9b4b81e2e18b369cee8abbe15832d9ee87346821164e1556e8b812f30475f90cc980"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/si/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/si/thunderbird-68.6.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "8cfaa054258a2b83fd140702bc59c3723495ff090f2dda06830d70548c425d47522cf574bbc9328887ba7621e3bb55e17bedcd314e54d5787d6ab9d00fd836ef"; + sha512 = "564350c67c0b826a0e77c972774fb509b7a162d65cbe93873c1f0b62eb1a2c314ac09f3f9edc816ceb6b56d74fbaeaa576972ab7fb35f4dc5c9808a001b916f5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/sk/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/sk/thunderbird-68.6.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "c625263588f5b83e844c549aa182b996e7f99f3a2838c558d5a88ebfcb1cca966233c6f8f843c44651c001236d147d16b6ed3e26470c4d5c1b0b24c89472a46d"; + sha512 = "a013c634324efc8f2dc2e3ac4c4df222d7bc37e99820fa87a89d66a1099208623550a54a8660ccb9161f6cee7d2a2f1e96bda5299c57aa6c31e0c9830ba40029"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/sl/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/sl/thunderbird-68.6.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "9654edc706571afe5e1ccc54b1ca0a0b7d9dd800278d0ddeaebfd483334353d87e1b2ee99da0e6242fa81e4778d3d10573db48462d8f681dc9ae68814c4e7be8"; + sha512 = "855fca581e4b2caa41bd52c0f3a991e54ff8f038d0c757c0b3012c1c0cba0fe7b224b99a7ec9dc632a5e9d6c946cd2ebe871040129cbeb19ba260d47d3629935"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/sq/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/sq/thunderbird-68.6.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "d994da857c1e7c40c9df313f8135583885e728e93b80e0cdb0090bec49ddcf681b318a69dd553404f36c6ada6ecd4c70f4b7325ba092d700b60697941e855535"; + sha512 = "96076bfe74dcf439c39445d22196e0b1a09bcf3a844db8c6054bf709f861b4f1f8365bf3c7bdc4f23fa94861590819041d5dbd9bd04f1c828715ffeac108d8d3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/sr/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/sr/thunderbird-68.6.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "d45178698af58c9496340739b658c3974c4f8ff1386c862bc5032598f7079193321a0752d01e8da74890069ed549285925529fbf84f10738c870ba6d0d1c6f19"; + sha512 = "b88a2b84cb2d4d5e9a6682dbb9873b94b24dd89cb26480544d1982a5f3090d9d02345bf3b6ddbae7c5f41f32f81f0c40d32e496e03baec13efa661d258a55035"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/sv-SE/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/sv-SE/thunderbird-68.6.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "c79f1beb35445674b5c73914aa6379e415af42f90ae15afed18a748f5d7867be2ff6ade3e7ebee639954e65e5cc3d0abce158cf5cc0bf8740367f84067890751"; + sha512 = "f5ac338a7a44492ce470c767df410a0f5c0cd80a20015cdf86fcf3c0da3ef3c88885cba7263e73bcd16bc989fc6ac99b8593b634c38743ad5748ff24afe1a16c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/tr/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/tr/thunderbird-68.6.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "a8d294506c9b255a6af29aa6df09bc87242db91b7d9e415a4f173564dc65f22cb3cc093a2e5b7c9b519aaacfdff99d855c00963bf3370cc8c4c8f0f8bc6b0328"; + sha512 = "971e7505f57604b6073f8e1bfd7aada8c4a16cd52b003719dd6b3689734205361c9e9e5ab67a7fee21b6a6dcd52ff96bb2b801730a446ffc33798639e91a4a80"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/uk/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/uk/thunderbird-68.6.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "4c889e12d7855c5e57c01d894708577485d2ec0a50634160a682e517823780efe45968e1f2bfbc72f60fa5c690aad9d9bf9ff14686cff7f4696ca5704565f20d"; + sha512 = "d1a7a2822a30a9542d055f530c13b172025cd50c4291bd2b70cb0da48872a1b24c684199daef47f39c669a76eea5eeaa5d975e05d5cd4b0b2783523c5417dcb7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/uz/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/uz/thunderbird-68.6.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "6a8253b9c1d9f07d932bf097c12d106c8b5993eacc4560ea3e7c55d58b754cc7ea09c0e86ce8937d14b400d6a095cd26c6794633243c4b53d7ece8bf9c1118f3"; + sha512 = "53b0c0fed9a5c5efaef627a677c4a6b832e79391e265368928e9243091319cac7c1ce6756036385f8ce2fae9f12bdf14125b75230f17ec5cf9c56edc7d5c9908"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/vi/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/vi/thunderbird-68.6.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "ae4e2c35bc0a31422b5a2befa3b8bcd4835c535f6690a4ea11b21f0b3c33e38c2ff707ab70ac5aaec5153c4b38d44e67375aaf66b27af3b0316af35b9b5fa22b"; + sha512 = "f5bb40ecaa0ada3f48020a18f64e02aacd31c216db0c02f426a8c4dda3cb9b7740cca00c63ddb179424e37fe29badc846b4e8f2e87751f98e15430bbf8aab96a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/zh-CN/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/zh-CN/thunderbird-68.6.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "da4aa6e899ac51ffb94674248d11d7ce072c27b9bd1aa4a5bf79c48e16d5b437b838f2b7f709e56fceba338ad9172252ae82c283bb88bb41a73fec1f876fc24a"; + sha512 = "50f39f460f412412c5b97f3223f854d865fa526be05c5c5c60835ce8ac974dbfbe3b36abf5ac5f3698aed712560307e17ddf26606b09134360bde9e8c70fdeda"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/zh-TW/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/zh-TW/thunderbird-68.6.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "47244d490e02d5d784e81b3641126b38307128d4d95096fce05717c8535318a0cd1567f20bd19b13922cf6c89ba3042350a8870360a25003a87d6ba6e3e0bccc"; + sha512 = "eb463fe925431d9c5150eb0e3f6c6f907e96a547e02613b8a65803021761761011e3054dad8d18a93a1d0ae950846eefb9fd95c7744db86febbe60856562bed2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ar/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/ar/thunderbird-68.6.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "6c9adce3d5e14ba5748dd8f60bafd72c5d910926de91810da7fbddb7054da822b79a79679b72125c483889383f19aa8a928d949de8785972a7067b0d23921072"; + sha512 = "7e5a68cd2eb58dea99cf940ba8b212b7f6fcbd66e6ecfc9b476ea0aa33566f4ccb010d2056ca84000cedbb42072ce943fc955d4fd8a1cbb0b2faf30bb45f8867"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ast/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/ast/thunderbird-68.6.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "ff0090a6370069ff7668d650d16f3d9d24fa2325c46aecf9a3b8fc536e1138793e751fc524b63a5dec3e07c10aa77dcf09d066d9137aed1f35dcce1eb9c368e3"; + sha512 = "25a4fdae0021af4ce67560ef213b9dd18590d0850d0703f347b16206b4e48abd32b2f6f1bedb39812d0db04586169d095f104e82dbd4916a0f276b4f943d6fe5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/be/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/be/thunderbird-68.6.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "751527c55d73080fec112af6cd3f6161d848979b9b9f12f8cae4f4e28c2906f7aba5f6f2b02ad192f67f7b3b8713fbcaeba8960c53bc5bf1a9259e33f555fb94"; + sha512 = "60ada0a93b1b9eab7e2aadb78ef8433487868f1e1f2e04a6a91996263dca0f034949858e8e0b8da1b35e0a812af689e31a6b3e2620a4177db9e19da155e43868"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/bg/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/bg/thunderbird-68.6.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "8b10b496a27a6bbe22e443213f69b0e3fdcb9bfd7fecbd509fc771ef1a22a66586febca2b303cb1a526b739ab303283086f14b314cd545fdd5f13bedb6d23fcb"; + sha512 = "3cd159fdf5bd9d7b2ad021335b77326d234273e9f247be54d1c58b8dfc3cc2b855f1d5a31a096f8a93ec28c0255dc8b85d5c49e3b2928e170a78a68d7553a366"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/br/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/br/thunderbird-68.6.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "46ffb59df042c028366ae64c58c41a65c92d7aa4e50c24ebabe8141b2e78fdc6dbb5634574c7759ff0fd067cfe0ac7c9570bcd006d4c828a7dbdd00555178647"; + sha512 = "59b6cd33c5db88ed0c9ece2d88091f5769848b582200f79ef7178071afa5631781044a6a1cf30c27f3f3d81ac215c9b2095cc186766878486898935ef24b93a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ca/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/ca/thunderbird-68.6.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "98bcdfdec73eba43ac67c571ecdda4622040b300b560f227ced55a197384d3462b89e844dca1fd310da7c326099fc072eb42adcc14d9519b8bb6b44647abd70c"; + sha512 = "13e30705a506d0f34b95b1c22bc7770491f265268f9cbb6d7d4d7e4dc275ed81d46efa86d44f2acc8c475ab6b53589b6c4733067221d1ec604794bade2a9864e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/cak/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/cak/thunderbird-68.6.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "ca042a34871f95c82011e36ee700ebc60a3594229093ea2a38b28e6eeb6751c143227b9fc2dedac62608f42ffafe96aba4c600cd1e599794f2215adfa07e0270"; + sha512 = "6db7346815bc9fd9adb7896291015794477b05379635ee2c3b4b475b393b594c806efd309d5f46d996aa9e95b58fd13f65a70facc4d2c8ec74be8e3443507a3d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/cs/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/cs/thunderbird-68.6.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "ab121a73e77c9976e1cc4373340fce96abd419d387775e31da07bb9b4293e70fb6b753cf9904f3ab44f330b911664327e0d5d187dad8e2b46f702b112737bc79"; + sha512 = "aa407d20e7ec83e433d225dedb28d68eb8c9a1d295f2a37871048ea90930828c67674fe5059e8167fd9b0c573fc84d17fe3ce31ac7676a54b2786b38e10f58da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/cy/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/cy/thunderbird-68.6.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "8c82689dfd9602a05b3daed5c778a29b755ac09d191765961c1e113f65dc398400bea7e32b8cdbf83b4ec02f13f473dcca759591a508d7f8d5c642db334cce33"; + sha512 = "8e2e3136674041408daf6ec3dc194b5115aab6c254ca8da035b1f6900eb07d34ca57ab00f8776313f038a87acae3bfe454a6118f4b532e9f364ea411d685ca7e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/da/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/da/thunderbird-68.6.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "9d23be92c0574ae9dbbf27058fac97a92657bebff46ed9889c7987469e9a376c4800027aa371a039e294ad5be29d650b4d11e64c0130476638d87638e4db57ed"; + sha512 = "22062cc37c2563b98516b16f9adb210528ffdb8791df39170bac66351d86a3e491c54787c3c6dd866f6ce806029694e11868a3d5c3b9b9ad4faa1bb621a89a08"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/de/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/de/thunderbird-68.6.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "1f7d247455dd540e81fa15d201491415e691ea6b66df9cf36716316625decb541d2046ac8aef5efd5435d5be4e1c44bc3dc8db9eb2023b5cff1446d678a764fe"; + sha512 = "6228aca78b3577031aeae1f0c7ce7fe6eea41c232c46b8d6fc7ffdbbf4f0468a0e8c2ef77927bfe5c65380223d43cc67e6dcb0bcdeeb096f89794cbfee769a5b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/dsb/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/dsb/thunderbird-68.6.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "350b7378ba5b732e52af1234ce005c0ca0a5ffb286d4599c0f931dcf2c912740ea81bf6aa20c14960485be1360d1b9825ccb63c261836b389ac96088f3f77344"; + sha512 = "43a51d0b294a53878c630de5da04f417b2d929036b8a689e93c7f72c6b738cecd4105f216d7955d2937e9a4998bf9a96ace66771c75ee46f9ac2e96fe6674fb5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/el/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/el/thunderbird-68.6.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "510ff7b9d4549b9daefd69f25ad92d97ae516f5f2d0bddf459d11c260ba11d6c4cb2574bf81c08cb4d8c720c7c8164355fc1c3bf5055e99ec31ea85cfb677f0b"; + sha512 = "28b0aab8c2480d7deb48edd2c46468dda7489ba768a2293da43367d623464973527bf47ec6264443cf2febab667dcac39f1459117af97c3436100d8e9b3cb124"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/en-GB/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/en-GB/thunderbird-68.6.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "71cd61ffb1546dd8085c976d77c51d6231ad39afe9844d69ed697aa76e4c515780c264fdf2cc3644c9a22156054cbfad355b936f891465723ced665b14460604"; + sha512 = "af4c726daeb0951552c55331f7c4d3aef54078b7fcfb98ab32293f39c945e58cb43ed224c5f50ab56bd804629b8db2a9719186749501d76c9f6d26aa6fe7bcf8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/en-US/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/en-US/thunderbird-68.6.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "dd2dbad0087646a87faac120d616d4b7a07f30fbbd95f657cf5ce4c08714c013522a1e05a55fb0a4f23302b02b63935b06e15e4c05f83fee18a0f482bccfaf79"; + sha512 = "2a93646dfe69131d51d600511450f3cce267f11e51bcbba8a648baf1af1ebea57d43ae63c05cb138e74fac574cd76b55e07a86b98e7cb27e26575a777ad80934"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/es-AR/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/es-AR/thunderbird-68.6.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "dff461bfcf287a7fa38826a2b8f629913b1816d631b122042673677eed1636370ff50112ba0316047af0be4ffa869924c842ec17155ee422d52d40d2f7769184"; + sha512 = "1750821128688b0bfc2cf005be120740b5ffe953daaad0cb6a1fc8821347324dd90ef0541676ac9613fde8b7026a1085449e14c4bd23414153bd415f4d860460"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/es-ES/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/es-ES/thunderbird-68.6.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "381f9d0aa2695a0acca17bfde5e3845a59ce233736ea49d24e7cdeecd557b6d7ca4544b709f80f6454bd518132f9d7bd0b85cd76d053107f6dd4eeb4fa30b4c5"; + sha512 = "ecb1ec114a5728083773ae74cbcfb2488fbe902e2862dada06b9bbec3b1f6baf9d41bf78a12ffe803471a3b8d47feb7537ab9d80cdd02e720c55da22e2147b06"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/et/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/et/thunderbird-68.6.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "976f673e2ca991204df9134c8b3b1bbac00470b6bb5c20bb6ae5f886d611d250a509162f332e33523ef0cb103b70461dde8137449cf565d1be0f2ff0c08075a8"; + sha512 = "388b8a7249a82aa9078e9aa07dd56bf683f3f98c114c48e856f29ac5cb49f6baf6f7aaa55c1af490c8da03190cd30896fb45e24c40fce5b58d4b4babd1f547f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/eu/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/eu/thunderbird-68.6.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "8ecc9b36630e67dd2a7505103c2f2574fa1e27f6e7719d4b47e06359b8a41f2b7d97c88adc47acb6ce67205d15ec292570fb580166d963b1dd4a5bb0934c18eb"; + sha512 = "c68a5024cad0b85d73534277099e4a4dc0ced6b9ae62b3e3c1ee50634d0a495685a393fe464b670a912b075dda072718316fc0bcc6e09956b655975ced31c13c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/fi/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/fi/thunderbird-68.6.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "54ef27d97d3712dab4616fa8a5d14392f39962bcf5113718d6de2f0fb8c6f801100c4e9d48f3129675ebbe7dc213486181ba28b96db56d4a23cc4e56ae68e276"; + sha512 = "d005766665f6399e0e84a79a84f5220a0a29fd176c9a90e8b087c2be2dfee88f36c7cf08ce50c79798865c6bbf4818d4628ed384c53f555466b4a900fbbd776d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/fr/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/fr/thunderbird-68.6.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "becdddb3c175a2930bafb48a47227d8046c330ac22540662cc310bd734f89d09a693e1f355d49d00837ec9af43755c1eb7ea206e87cf550c25786086d1af5b1d"; + sha512 = "f7a46c960bd9c07b6f48ede2b1940f5177029eed8afd03e520db019013dee74b87818b92d8a106a95f5522c4f06e76ce6aed3031e0e0596c9f8e3a30d221ed94"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/fy-NL/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/fy-NL/thunderbird-68.6.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "dc6d3c3ce455b315fdfc1dda46b79f9ae506af0c17d46b2d2d54a7e0f1f5281619acc861b73bd6caa23e2eedef88f0e7e9c279931584e3f4a1ddb1ba87c9d3d2"; + sha512 = "25c3033f4bd890a6d8bca47114cf0bacb5aaa97c882e4aac306e790879516e26761615de2b73f2bf3229dfd36e86796a3c009daebd031b588595797a33ae55ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ga-IE/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/ga-IE/thunderbird-68.6.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "875529e87597870478e2552f06677cbff98226efdac4fc3de007662e7c0b1d575888f2bb3f23d5f5b14191793f54361d8950c041b2b82ddea5a0283b7c98b26e"; + sha512 = "6c8847f57225df57ec874879a9e62b0d16edee49419a69412a6710cd1a094570d0090cc2ddfa6a380d7c34623d5e6a7b740937cac43e9720640bd13d41ab5b75"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/gd/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/gd/thunderbird-68.6.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "47b7f5aea26aedaa3ba0ca52f53f86a339b51520d4f9150711cb37c72e6dbd2f1e0872d3eae8a9ddf821d3102025f82bdea7da5a9b077e817a80b31d345ed8b8"; + sha512 = "1f846022be0400ea2f7bb0bd2c56286021692c152565311fb9b4cf439a1b1c06656efacddfbd68ae6669f9435afc89fd4aba47cec768e0d5025b289a58bdd088"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/gl/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/gl/thunderbird-68.6.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "22e9ab419e7a80e498c459a89ac3cf39451dc95fda545ec9a0c74067d971b9f66457a6948918fb2cfd3e43a471b0f23e54bc880298813111f4cc77c5a99708fc"; + sha512 = "444ade430be00b1b60bbc937f693544402cdb626ece1a0706f274a3bc1b417a88a26eba3364c8d0faba34c6eeecdcbdf4b79225a286412425e2d4b8a183cb8b9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/he/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/he/thunderbird-68.6.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "7494ec5b2315748379a4b476add35cd6ce7f4afdd90a8503efd41188af189aa06b01345f21e5808720e2aeadc6729f7e65d4c5e16b5f301f04cf2646373a4712"; + sha512 = "5432eed239fa34699504fddfb80c167bfc078d1d3e9e0aea18081d6898da3f966a475059de6aee013f312579e7c6a62a9ae388cf0b103c2fdf0f3a3f410585ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/hr/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/hr/thunderbird-68.6.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "e586ff015da79b357f5b3218a65ad13e861d5e73c32f6cf990aa100ca76c2f3519feb6592826271a9ffed3f3d51f40db373c2931c2dae169454710c7b5e36c07"; + sha512 = "7c8a9a1e92db564b3eb2ab3b782d06798eb8a2c88502dba1965e5b6a1b004df4aa0423acd3244e56a507ae4b46bcd5012616973ed2d6196439f78e87c448d04e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/hsb/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/hsb/thunderbird-68.6.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "261970ba0021e09d4356284e52a8336db7448269a76714448ab5dc4f77dc91be8f2f8185915f4e1392912ca0464f4f699c754fdc2fe8080b1f68a3d210d085d6"; + sha512 = "d95e899f19f599270cb45a8a90cf6c616bba9af6e62a889d4cd6ffdf3019bc455c3910271f95e2b463ffb3da2bd806843a4f335951e800fab49ea764a07fec90"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/hu/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/hu/thunderbird-68.6.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "ce329a1900b7ce6093e06d522e141b228090f20f3917e9c154a4ee95611316bc1117224f2bfe5fd0add40a5b31ba39fc87fccba4d28edea83d0be05df7b87e70"; + sha512 = "b99171d4dbb965423fede825468ea740c4c86d666cb5efa457f71a79cbd226f01162b536aa53a6f19019e0ee14c9d3cb11957ca3ef453424eb3851393f1bc6e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/hy-AM/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/hy-AM/thunderbird-68.6.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "756d4675e03753d1b3398b665247301997200e5f53215f9eabd17acb7502f282a1a5be3ea098ef8db4941ce7fd1a57165344c3036b786d3857b08b6613ba4088"; + sha512 = "78df360fc50d4e80e73fffb3a39e109ea84a629edf6c7260eb1783ace5a93a460065da1e23d6cc201e918daa813db475cd2a4a38c0d4e9cb242b78f2e5a88952"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/id/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/id/thunderbird-68.6.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "61538042a75ab0d987fc9289fa1f6e7bc74ab67cda7c78ab34ed72894f6bf3cb3cd05e0a5519b44348d050319c137113508d6f8b4845d0fcc668560acea74eb9"; + sha512 = "81a0c9ef733ceadb814e69bee0d748d211147ddcc559b5fcca200cf24d67308bf440b601d60ea99cf1a71b9cb090c489d424bfe6af545cdaf039fe6f10b1ee5f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/is/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/is/thunderbird-68.6.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "c292cf7d04f84f6819950115f4d821f0212d87b6a8587468bb4c3c8978a98decf7dcf6e00d8db6bc557cd5e3e0621814caad65d5b86c645d82e670929d2da525"; + sha512 = "d25970c2c4ffac96252e4e5d8c33608f6147254fa8c9879a0e809b940aa4a0425477ce56456191ad24fe8c0bd94e68ccabbd70982a4665f4c9f09166c06510fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/it/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/it/thunderbird-68.6.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "950f886bd49b8b90e8c26dd52352e13020ae752c0581d15666a512265270c39a406b2421832e3eb25eede3ff5a6129287f9c7f6849a99ba907190f257615a79c"; + sha512 = "693bcd512a5ca343d389a3f3ca85c75a52df5fe101eef09ff6c68ed4a4a92c30b760969e2db54b8b87a50e9be28931dec0292dd5904e8526dc7aa8296036a03e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ja/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/ja/thunderbird-68.6.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "9902c298bf470ef71d1d00372caf3d99a16ca61ca4ae448c838c936e6ddee674a2ca6359989c852d6de41ab550a7fdca9db829951740324eeda8dbb84fb51705"; + sha512 = "d20d59d7abe85dcf660c89190c9761777bfad8b7276fdeaae74ef7a5eeb68f6aea6890aae53654849618459e74c58d5e46b07888c990b2ef6578ce6a96e5cfa1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ka/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/ka/thunderbird-68.6.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "123cead4f30751e8422821690a436796d1b915e38c1b03aac8c2bb339df7f2d69d6794f4261971f73595add6db6a9887d0e5d4f0699459baeeec46cc687f1efa"; + sha512 = "29aed1a98a6a4f2c30d98bd549461d32a229cd373145bc8f33426db3e518c4857b21446cd59cb03207eb60a432a69be6b0103df4467b33f49c3cb1097d96764c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/kab/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/kab/thunderbird-68.6.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "c9d3a9d368b8db85f7c6c83ff64bb5b3ab37faab2b2cdf29d23b444dc42ef394a951d3dc4c164eed3c5c278f12c9d42ef8a5f7abcc320ed6b6e181ec540873d9"; + sha512 = "347334edc3a87face8cc2efb2096cf8e07feacd0d7cf8b1e501778d67385730362d4718ea26d85a768988e05296eccdc4bdb08d50030128123903bed3cb1f7c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/kk/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/kk/thunderbird-68.6.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "2f3ba44e31fcacadf517de3d7e3c108335a75de4d54023de296d9329bba8cbb90d5989093e2d6afdfc8c7d2ce71db9e4bdfd72ff57d13bae281406cdb31a5670"; + sha512 = "b2be10cc25f6d93113463b2f8614d00b2b52e9b376f9e939825f8c2b0a4976584b11a96022538496a242cc3e3d7cbbbb832fa1c698ef91cd30e28dbeebb6b3e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ko/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/ko/thunderbird-68.6.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "8a8bf9ad7f9f2d7132d8f8635ef9e924c1f488ca9963157ab2b40230a63c48de9223cd3076489a7249894c2bb9a369dc7b80a09c05387fbb93906a562868a96e"; + sha512 = "2247b46fbcdac7067c03525374ac842a6f7699c6ba7bed4d16ae9f9e3717d5e8fd92cc9d1cc7c24dd2bd61a7f55ec68abd464fabe11e00f30778d9852c89698b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/lt/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/lt/thunderbird-68.6.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "79967b8b49ba9cc63fe379fa16395962e9fee3704c9513222934ff7bc6f89e3ea2dcae37f1f74c30bef962ddda450cac5fb9f9d0d6fdf65492aa8246f0334a02"; + sha512 = "7435ac8db0c185c492ed30cb1310e67f8c30d1b9a3593f9b7c31f524b13e22d2c2d77ba66f5be99321f28c90fe7810f1e77d2714166e20728d968ab4cd69ae8c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ms/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/ms/thunderbird-68.6.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "5f4c7d1a015aee2ab55a7387a621a793bd8c006740e2e97b2a0237c6947841cfe5cdc13a184614df58a082b0ab90fc581d84a31f98f0ef8c782a61326f027b1d"; + sha512 = "2931092def64e4f6985b4a8d93c82843b0e90f3ed644dc0c7605709068d6b4bf01d30d2b55c45ef29197d5fc542932294e56e924d9d5db9b3efd04095581957c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/nb-NO/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/nb-NO/thunderbird-68.6.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "60679df9cc0898513b343955d8e99362ea106599f98ddf238c694c7b35e4a260b3fa3b8a80a438d3a9891bfe4f1fee504d868e293f9c9eadf8d9042c280d7f08"; + sha512 = "ad2021b90d1a420661cb4d71fcfde6bbedb97c84a6f1a5d66e04c4fecfdf6836a1001bd6f4350b89d169b7fcf9c80230384063e1974bff53dfb11bad6fc1a49a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/nl/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/nl/thunderbird-68.6.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "ddc26e850a055a532107f7f6d329fc4385b0fbd68eea382574b8a3f2510d0b4c75587696b1994adc710ce286ddf41bc44f80cb42c8011171dcf813a4e3a992f1"; + sha512 = "46f2507b16558151f46cae7cc88189ec581694ee50212fd0f8d2a9dd006d6685a8c49ad7d24e2117ae4a2bc55a88621ab900af7dfdbc5a08511e6374361241fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/nn-NO/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/nn-NO/thunderbird-68.6.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "0ebef3051ad541cb042ca3512c145bf46b5807990b3643d42d3d21f4c9c01fdb69872967381ce9790c70e59948dd991d83286bf41404312e62074d814d70a1fa"; + sha512 = "b6afb0adeb9ac4ad5ae0f7ba396ff8d9643d1341016d389947007e8ff40710e3fcb25e612ffff787d1fe8ba5424c17a2fbef96e10e288ad1bbb79ae337cbf505"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/pl/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/pl/thunderbird-68.6.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "3fab9ea4cf7c2e9ae5bb30059a2cd96c9cab281c87600927dba3b7a932e434f56c7359cc05e8f5c568232d53ba68fcf7d0164b59021a9ac2e502415129abc38e"; + sha512 = "bd015ffab2e9fb6f416194d3d8cfa1181d220dffce30060e12a665918ec0ebbe7c78c4536dab8b5f67af790350a7675f733fda5e60e640a363c757ea26b6e88e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/pt-BR/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/pt-BR/thunderbird-68.6.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "7e5c5e2a1d5e8c940cdbb43fc394c75b97b5c1a3898e93647473b2dc751ac020225ba14ae812ddc1b0585fd4f6df747053d443d6538b21f96c7f8aab38521f37"; + sha512 = "fdce0362b597a82692f95236d8ff29ff442e7e9565cb44cf5ce1e526c80ee1571ed0d670a9cfa199c716507af21e02c2bc3f9ea26041fec2187ecaff8b70a6fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/pt-PT/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/pt-PT/thunderbird-68.6.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "a02fe6bad1dc6479df27ebe62a13ef2dc0a8f52bead42e65bee89e76bfa117c975fe1db612d0a577f7d8de84bb3ee82f27a3af247675721e4cb2e54467ff300a"; + sha512 = "9f0004b1f662945d35d8eec6800005116d40ca64575c66b471f2d09f8326ee359e9a429ee8684b28d4dafea9e5b708145831eadbbedcd44f0ce7a57390665a99"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/rm/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/rm/thunderbird-68.6.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "56967ecc02e1cfa91d9c942d31e5ce1c3f16319732344aee385acd0f0f40882e65f02e2134bd53483c5459039982eb261b8d0b97aed5388fdb2754f58d2eb80f"; + sha512 = "f72bbb0d18193c1cc0296f1717d2d1652a0317aafe05f16bbf7bb944bf554b6d4333c3a6e6327957f146f5cbabd174967e7c7147e1dc1a11420fc0906a59cc75"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ro/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/ro/thunderbird-68.6.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "20b6bc1e4fd8a595e42e468d94216aa0502aadb7de9cecd1a6da1fb14fc6008976551467ceb1e258fc87f98f4cfc485d91697817525a9a4ddb65626ccf6d989c"; + sha512 = "8ebdf16bc98c261eeaa0845a88bf03782c340871c0bbfce1e404dac459bd465a9c25eecba6a3b040ae8f6422537f474f6842f722be2c7698a1f70920d20f2ff0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ru/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/ru/thunderbird-68.6.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "325649a3cb72ac2c3d8ef01caaf00123a2ffd5772ced16271cef8c08408e8828c9d96ca8ea81ca594f669b936b68f941d35adc1f00268447c782efca186a4a36"; + sha512 = "92da68f204338f3dc5adfddf8a1332d4fb8e78901ed00eec00ff48b857861ffc98748755edb4b5580d46ffe25e183fdf1f29418104525b6edce201e273169cdc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/si/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/si/thunderbird-68.6.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "164e0588d563b49a5652a97f21eaf513cbbf9af7ff97f93446f7ab99800d0cbcb61714e72e53feccb407992386a02715413c26c70ca46c45dd15ca7357e185a2"; + sha512 = "72887d5bc23331e228f91477dd71631f66021055c5c989abdd3ae7f35d27d67c48c3a6983eada438ba47982b1b82655de60cc6a11a3f87cad2edc59e5b4c8706"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/sk/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/sk/thunderbird-68.6.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "fc2e7881caed0943f773a687653e2fc301ace20f59e7afb1074350cda33a1f18998789410c10d1f0aa9cb4ceae7268ab251efd7b5ca02a6949da6b613cd88780"; + sha512 = "844e533e41f87169d08176c9aa3f3ca355838837f9a8ee723991b65e1cd037cc7a7ccb03692394a63de91314117c6e158a48cef70b5ae803390fa99fbf7183d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/sl/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/sl/thunderbird-68.6.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "4dd57628b1d8c4518b889424f457c8f3b83bfbf6aca2cb9be403fe97020c25d4ef95e5d473c5d2be67a9caf184aa657c6c13a549cc3b7a2e5e29199c990cda8d"; + sha512 = "41b57fd7d7f2f7690dca2e22028f09c66fd93e4a7abed1a1b1d791b3953c4129d89737d918e47090631e543229e5e8bbd7f516e05d57781abba23a9379831d14"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/sq/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/sq/thunderbird-68.6.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "3cda84132453a2802738145fe38c9a36db162842bda1a1c2a125a1f8c4cfc6af2bbd4c629804e539f260af8964c34f5af77965d755ea0f327f7765cb43c525d2"; + sha512 = "671b70e2a1c6d54841e84864bdefa8989954771780c0a5e8732baccae18ae261b349435adcdda58197354f60d89d1b205b0dd3b98ea020279160dc4b104c5d25"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/sr/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/sr/thunderbird-68.6.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "6d1a2da487b616716c680619528f9b70fc5ca9c4c34e3e66841ace9254cddae6fa63396bcb8dec6d961a29f0dc14aefc660e96f90a82c7801a1acb7b21275fe1"; + sha512 = "5e9fc54b0abd21d2bc5ac4dd4895a5b2c961204f57175fa6051e0e23eee6b4af97ca00c9c595c8c64d29a3badbd7191baf364a9099db662aa2e6a3e7e0a570f0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/sv-SE/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/sv-SE/thunderbird-68.6.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "c2b3901a02f01123460816c566f62374ee954e18c411868059211d97d88b8d59c2452eb0fe1ecc940473b68f983dfb64f276a1f167178fba0d79a03235ac2758"; + sha512 = "42a4a55209a94df2a2bf1c2c144b0db17a99cf63d2750f0e1bec8cfcccf8fccd38ae5742d7f3c037923311e4388d582801857c648ae9ebadf332edc26ecb7607"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/tr/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/tr/thunderbird-68.6.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "bdcfc20888bd896abdb2dd52ae5d4497a5a9706c01ae0193548707d326b74eb5af448db5d0e9e647c976024560e091305bc6d074ca8181886e27a2e201446204"; + sha512 = "fb061df16bd3e44e1315797418c7568433ed24b0dc4dd91517c7562ab2ef999cc5e147a7aaa07d29446c5db09e5c76f3e96fe3d25453a4ef82d191d98903c785"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/uk/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/uk/thunderbird-68.6.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "e71a965b6d3c7f90b97361435027af0b0fe194233500f127b2b9c75fbc2cd2c4ecf4228b537081a8ef61131e97e09b348198d3f59db7587a2e40a75b0e90686e"; + sha512 = "4e70211298c788f874f47c1ce1eb291bf16df1c1316f51dde833bb983032ab50aa725fdd4453bd360f4fddb93215f01ecb75b2922c28b7b7abbef4a3a19c87cb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/uz/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/uz/thunderbird-68.6.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "305c74f94e10565923073d157dbc6c62d03e6c1f5291cad5a0fcddf5cd158e99f8fd88b84c4c0e4a352139339398c80f84abebf486503030fa5a0dd4ac1d02ea"; + sha512 = "7b6cedb38bc18da9902df19070cdb66c49d288591af3346e369c09b84dcc8803b6b06870165cb99e3faab33b95c9d115bdb648a1eb9be3ad28d17b84a69e35ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/vi/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/vi/thunderbird-68.6.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "5578e325a16c94acae412ba403abbd7920b2b78e8e469c16175d27e44bebcd257dcf9c5e4454276422ebbc7797049f927e0a131be54aa11ceac1878fa1ac6c13"; + sha512 = "eaaaf5002ccd31685b1f96fff6b63c9ab17d4ed3ec4c88cc368e60935b794e08a1fb56626d772f579fe0381b1381f3335de4739eaaf5b0dcfb31833c593b093c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/zh-CN/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/zh-CN/thunderbird-68.6.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "a8f2a25bac4b312d2c61bf3e6a7fae6a98fb6ed43682005881157809083dbb1939afd6200b67236b3087148622978f5616d554202f586ffd60b5dadb65dad433"; + sha512 = "89341195b5cd0d9833fee836acfea6091e9ebff3f675a02b74a2f6d6424df910d6ea4866f97832ba5bc798694d02b12d13c14c27bfff20df4ba967581c23ffcb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/zh-TW/thunderbird-68.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/zh-TW/thunderbird-68.6.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "9b463179ef67102ba10d440071b10a7e075c586c72cc352b2af05db9b048b46819a913547f5d0e0ca3a5c2e26110515d4a87db36f9765b59f64fd58f76662785"; + sha512 = "3a63cf99d67f0a0e79692caa2ded310284fd876b1d150cdbdc3a2bc3b1266250a90f05117c00521c1b589beaf825b8a091b7e40627d8c2127faf1b06f4c6b746"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 8d4fa98ef729..ef943518c773 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -72,13 +72,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "68.5.0"; + version = "68.6.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "15hi1193z6gp05dx6pqakxydyrxzls4xhfpvrk5qg458gxhdfj4qbgb33mcf944g7vf2hk5mk6nbgmdxlb9svw1n72ym2adyaca6n5v"; + "0z2r93inj4k0sg4ghq8nz209ayklvh9dxgbsimg6dgil5ibcmyapks30gva7r9jxi07mzmb6i2mj4wazgkyi6i124svzvllnm1cq0im"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index da7c5d4af741..4408994ba8f0 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -20,7 +20,6 @@ let version = source.version; patches = (source.patches or []) - ++ optional jackSupport ./mumble-jack-support.patch ++ [ ./fix-rnnoise-argument.patch ]; nativeBuildInputs = [ pkgconfig python qt5.qmake ] diff --git a/pkgs/applications/networking/mumble/mumble-jack-support.patch b/pkgs/applications/networking/mumble/mumble-jack-support.patch deleted file mode 100644 index 7c18a33193df..000000000000 --- a/pkgs/applications/networking/mumble/mumble-jack-support.patch +++ /dev/null @@ -1,457 +0,0 @@ -The patch was created by Filipe Coelho (falkTX) of the KXStudio -project. http://kxstudio.sourceforge.net - -diff -U 3 -H -d -r -N -- mumble-1.2.2.orig/src/mumble/JackAudio.cpp mumble-1.2.2/src/mumble/JackAudio.cpp ---- mumble-1.2.2.orig/src/mumble/JackAudio.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ mumble-1.2.2/src/mumble/JackAudio.cpp 2011-01-26 06:02:00.000000000 +0000 -@@ -0,0 +1,314 @@ -+/* Copyright (C) 2011, Benjamin Jemlich <pcgod@users.sourceforge.net> -+ Copyright (C) 2011, Filipe Coelho <falktx@gmail.com> -+ -+ All rights reserved. -+ -+ Redistribution and use in source and binary forms, with or without -+ modification, are permitted provided that the following conditions -+ are met: -+ -+ - Redistributions of source code must retain the above copyright notice, -+ this list of conditions and the following disclaimer. -+ - Redistributions in binary form must reproduce the above copyright notice, -+ this list of conditions and the following disclaimer in the documentation -+ and/or other materials provided with the distribution. -+ - Neither the name of the Mumble Developers nor the names of its -+ contributors may be used to endorse or promote products derived from this -+ software without specific prior written permission. -+ -+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR -+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+*/ -+ -+#include "JackAudio.h" -+#include "User.h" -+#include "Global.h" -+#include "MainWindow.h" -+#include "Timer.h" -+ -+#include <cstring> -+ -+static JackAudioSystem *jasys = NULL; -+ -+class JackAudioInputRegistrar : public AudioInputRegistrar { -+ public: -+ JackAudioInputRegistrar(); -+ virtual AudioInput *create(); -+ virtual const QList<audioDevice> getDeviceChoices(); -+ virtual void setDeviceChoice(const QVariant &, Settings &); -+ virtual bool canEcho(const QString &) const; -+}; -+ -+class JackAudioOutputRegistrar : public AudioOutputRegistrar { -+ public: -+ JackAudioOutputRegistrar(); -+ virtual AudioOutput *create(); -+ virtual const QList<audioDevice> getDeviceChoices(); -+ virtual void setDeviceChoice(const QVariant &, Settings &); -+}; -+ -+class JackAudioInit : public DeferInit { -+ public: -+ JackAudioInputRegistrar *airJackAudio; -+ JackAudioOutputRegistrar *aorJackAudio; -+ void initialize() { -+ jasys = new JackAudioSystem(); -+ jasys->init_jack(); -+ jasys->qmWait.lock(); -+ jasys->qwcWait.wait(&jasys->qmWait, 1000); -+ jasys->qmWait.unlock(); -+ if (jasys->bJackIsGood) { -+ airJackAudio = new JackAudioInputRegistrar(); -+ aorJackAudio = new JackAudioOutputRegistrar(); -+ } else { -+ airJackAudio = NULL; -+ aorJackAudio = NULL; -+ delete jasys; -+ jasys = NULL; -+ } -+ }; -+ void destroy() { -+ if (airJackAudio) -+ delete airJackAudio; -+ if (aorJackAudio) -+ delete aorJackAudio; -+ if (jasys) { -+ jasys->close_jack(); -+ delete jasys; -+ jasys = NULL; -+ } -+ }; -+}; -+ -+static JackAudioInit jackinit; //unused -+ -+JackAudioSystem::JackAudioSystem() { -+ bJackIsGood = false; -+ iSampleRate = 0; -+} -+ -+JackAudioSystem::~JackAudioSystem() { -+} -+ -+void JackAudioSystem::init_jack() -+{ -+ client = jack_client_open("mumble", JackNullOption, 0); -+ -+ if (client) { -+ in_port = jack_port_register(client, "input", JACK_DEFAULT_AUDIO_TYPE, JackPortIsInput, 0); -+ out_port = jack_port_register(client, "output", JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0); -+ jack_set_process_callback(client, process_callback, this); -+ jack_set_sample_rate_callback(client, srate_callback, this); -+ jack_on_shutdown(client, shutdown_callback, this); -+ -+ iSampleRate = jack_get_sample_rate(client); -+ -+ if (jack_activate(client) || in_port == NULL || out_port == NULL) { -+ client = NULL; -+ return; -+ } -+ -+ int port_flags; -+ unsigned i = -1; -+ const char** ports = jack_get_ports(client, 0, 0, JackPortIsPhysical); -+ -+ if (ports) { -+ while (ports[++i]) -+ { -+ jack_port_t* port = jack_port_by_name(client, ports[i]); -+ port_flags = jack_port_flags(port); -+ -+ if (port_flags & (JackPortIsPhysical|JackPortIsOutput) && strstr(jack_port_type(port), "audio")) { -+ jack_connect(client, ports[i], jack_port_name(in_port)); -+ } -+ if (port_flags & (JackPortIsPhysical|JackPortIsInput) && strstr(jack_port_type(port), "audio")) { -+ jack_connect(client, jack_port_name(out_port), ports[i]); -+ } -+ } -+ } -+ -+ jack_free(ports); -+ -+ // If we made it this far, then everything is okay -+ qhInput.insert(QString(), tr("Hardware Ports")); -+ qhOutput.insert(QString(), tr("Hardware Ports")); -+ bJackIsGood = true; -+ -+ } else { -+ bJackIsGood = false; -+ client = NULL; -+ } -+} -+ -+void JackAudioSystem::close_jack() -+{ -+ if (client) { -+ jack_deactivate(client); -+ jack_client_close(client); -+ client = NULL; -+ } -+} -+ -+int JackAudioSystem::process_callback(jack_nframes_t nframes, void *arg) -+{ -+ JackAudioSystem *jas = (JackAudioSystem*)arg; -+ -+ if (jas && jas->bJackIsGood) { -+ AudioInputPtr ai = g.ai; -+ AudioOutputPtr ao = g.ao; -+ JackAudioInput *jai = (JackAudioInput*)(ai.get()); -+ JackAudioOutput *jao = (JackAudioOutput*)(ao.get()); -+ -+ if (jai && jai->bRunning && jai->iMicChannels > 0 && !jai->isFinished()) { -+ void* input = jack_port_get_buffer(jas->in_port, nframes); -+ if ((float*)input != 0) -+ jai->addMic(input, nframes); -+ } -+ -+ if (jao && jao->bRunning && jao->iChannels > 0 && !jao->isFinished()) { -+ jack_default_audio_sample_t* output = (jack_default_audio_sample_t*)jack_port_get_buffer(jas->out_port, nframes); -+ memset(output, 0, sizeof(jack_default_audio_sample_t)*nframes); //TEST -+ jao->mix(output, nframes); -+ } -+ } -+ -+ return 0; -+} -+ -+int JackAudioSystem::srate_callback(jack_nframes_t frames, void *arg) -+{ -+ JackAudioSystem *jas = (JackAudioSystem*)arg; -+ jas->iSampleRate = frames; -+ return 0; -+} -+ -+void JackAudioSystem::shutdown_callback(void *arg) -+{ -+ JackAudioSystem *jas = (JackAudioSystem*)arg; -+ jas->bJackIsGood = false; -+} -+ -+JackAudioInputRegistrar::JackAudioInputRegistrar() : AudioInputRegistrar(QLatin1String("JACK"), 10) { -+} -+ -+AudioInput *JackAudioInputRegistrar::create() { -+ return new JackAudioInput(); -+} -+ -+const QList<audioDevice> JackAudioInputRegistrar::getDeviceChoices() { -+ QList<audioDevice> qlReturn; -+ -+ QStringList qlInputDevs = jasys->qhInput.keys(); -+ qSort(qlInputDevs); -+ -+ foreach(const QString &dev, qlInputDevs) { -+ qlReturn << audioDevice(jasys->qhInput.value(dev), dev); -+ } -+ -+ return qlReturn; -+} -+ -+void JackAudioInputRegistrar::setDeviceChoice(const QVariant &choice, Settings &s) { -+ Q_UNUSED(choice); -+ Q_UNUSED(s); -+} -+ -+bool JackAudioInputRegistrar::canEcho(const QString &osys) const { -+ Q_UNUSED(osys); -+ return false; -+} -+ -+JackAudioOutputRegistrar::JackAudioOutputRegistrar() : AudioOutputRegistrar(QLatin1String("JACK"), 10) { -+} -+ -+AudioOutput *JackAudioOutputRegistrar::create() { -+ return new JackAudioOutput(); -+} -+ -+const QList<audioDevice> JackAudioOutputRegistrar::getDeviceChoices() { -+ QList<audioDevice> qlReturn; -+ -+ QStringList qlOutputDevs = jasys->qhOutput.keys(); -+ qSort(qlOutputDevs); -+ -+ foreach(const QString &dev, qlOutputDevs) { -+ qlReturn << audioDevice(jasys->qhOutput.value(dev), dev); -+ } -+ -+ return qlReturn; -+} -+ -+void JackAudioOutputRegistrar::setDeviceChoice(const QVariant &choice, Settings &s) { -+ Q_UNUSED(choice); -+ Q_UNUSED(s); -+} -+ -+JackAudioInput::JackAudioInput() { -+ bRunning = true; -+ iMicChannels = 0; -+}; -+ -+JackAudioInput::~JackAudioInput() { -+ bRunning = false; -+ iMicChannels = 0; -+ qmMutex.lock(); -+ qwcWait.wakeAll(); -+ qmMutex.unlock(); -+ wait(); -+} -+ -+void JackAudioInput::run() { -+ if (jasys && jasys->bJackIsGood) { -+ iMicFreq = jasys->iSampleRate; -+ iMicChannels = 1; -+ eMicFormat = SampleFloat; -+ initializeMixer(); -+ } -+ -+ qmMutex.lock(); -+ while (bRunning) -+ qwcWait.wait(&qmMutex); -+ qmMutex.unlock(); -+} -+ -+JackAudioOutput::JackAudioOutput() { -+ bRunning = true; -+ iChannels = 0; -+} -+ -+JackAudioOutput::~JackAudioOutput() { -+ bRunning = false; -+ iChannels = 0; -+ qmMutex.lock(); -+ qwcWait.wakeAll(); -+ qmMutex.unlock(); -+ wait(); -+} -+ -+void JackAudioOutput::run() { -+ if (jasys && jasys->bJackIsGood) { -+ unsigned int chanmasks[32]; -+ -+ chanmasks[0] = SPEAKER_FRONT_LEFT; -+ chanmasks[1] = SPEAKER_FRONT_RIGHT; -+ -+ eSampleFormat = SampleFloat; -+ iMixerFreq = jasys->iSampleRate; -+ iChannels = 1; -+ initializeMixer(chanmasks); -+ } -+ -+ qmMutex.lock(); -+ while (bRunning) -+ qwcWait.wait(&qmMutex); -+ qmMutex.unlock(); -+} -diff -U 3 -H -d -r -N -- mumble-1.2.2.orig/src/mumble/JackAudio.h mumble-1.2.2/src/mumble/JackAudio.h ---- mumble-1.2.2.orig/src/mumble/JackAudio.h 1970-01-01 01:00:00.000000000 +0100 -+++ mumble-1.2.2/src/mumble/JackAudio.h 2011-01-26 06:03:58.000000000 +0000 -@@ -0,0 +1,97 @@ -+/* Copyright (C) 2011, Benjamin Jemlich <pcgod@users.sourceforge.net> -+ Copyright (C) 2011, Filipe Coelho <falktx@gmail.com> -+ -+ All rights reserved. -+ -+ Redistribution and use in source and binary forms, with or without -+ modification, are permitted provided that the following conditions -+ are met: -+ -+ - Redistributions of source code must retain the above copyright notice, -+ this list of conditions and the following disclaimer. -+ - Redistributions in binary form must reproduce the above copyright notice, -+ this list of conditions and the following disclaimer in the documentation -+ and/or other materials provided with the distribution. -+ - Neither the name of the Mumble Developers nor the names of its -+ contributors may be used to endorse or promote products derived from this -+ software without specific prior written permission. -+ -+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR -+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+*/ -+ -+#ifndef _JACKAUDIO_H -+#define _JACKAUDIO_H -+ -+#include "AudioInput.h" -+#include "AudioOutput.h" -+#include <jack/jack.h> -+ -+class JackAudioOutput; -+class JackAudioInput; -+ -+class JackAudioSystem : public QObject { -+ private: -+ Q_OBJECT -+ Q_DISABLE_COPY(JackAudioSystem) -+ protected: -+ jack_client_t* client; -+ jack_port_t* in_port; -+ jack_port_t* out_port; -+ -+ static int process_callback(jack_nframes_t nframes, void *arg); -+ static int srate_callback(jack_nframes_t frames, void *arg); -+ static void shutdown_callback(void *arg); -+ public: -+ QHash<QString, QString> qhInput; -+ QHash<QString, QString> qhOutput; -+ bool bJackIsGood; -+ int iSampleRate; -+ QMutex qmWait; -+ QWaitCondition qwcWait; -+ -+ void init_jack(); -+ void close_jack(); -+ -+ JackAudioSystem(); -+ ~JackAudioSystem(); -+}; -+ -+class JackAudioInput : public AudioInput { -+ friend class JackAudioSystem; -+ private: -+ Q_OBJECT -+ Q_DISABLE_COPY(JackAudioInput) -+ protected: -+ QMutex qmMutex; -+ QWaitCondition qwcWait; -+ public: -+ JackAudioInput(); -+ ~JackAudioInput(); -+ void run(); -+}; -+ -+class JackAudioOutput : public AudioOutput { -+ friend class JackAudioSystem; -+ private: -+ Q_OBJECT -+ Q_DISABLE_COPY(JackAudioOutput) -+ protected: -+ QMutex qmMutex; -+ QWaitCondition qwcWait; -+ public: -+ JackAudioOutput(); -+ ~JackAudioOutput(); -+ void run(); -+}; -+ -+#endif -diff -U 3 -H -d -r -N -- mumble-1.2.2.orig/src/mumble/mumble.pro mumble-1.2.2/src/mumble/mumble.pro ---- mumble-1.2.2.orig/src/mumble/mumble.pro 2010-02-09 16:34:51.000000000 +0000 -+++ mumble-1.2.2/src/mumble/mumble.pro 2011-01-26 01:45:55.000000000 +0000 -@@ -93,11 +93,17 @@ - unix { - HAVE_PULSEAUDIO=$$system(pkg-config --modversion --silence-errors libpulse) - HAVE_PORTAUDIO=$$system(pkg-config --modversion --silence-errors portaudio-2.0) -+ HAVE_JACKAUDIO=$$system(pkg-config --modversion --silence-errors jack) - - !isEmpty(HAVE_PORTAUDIO):!CONFIG(no-portaudio) { - CONFIG *= portaudio - } - -+ !isEmpty(HAVE_JACKAUDIO):!CONFIG(no-jackaudio) { -+ CONFIG -= portaudio -+ CONFIG *= jackaudio -+ } -+ - !isEmpty(HAVE_PULSEAUDIO):!CONFIG(no-pulseaudio) { - CONFIG -= portaudio - CONFIG *= pulseaudio -@@ -110,6 +116,13 @@ - QMAKE_CXXFLAGS_DEBUG *= -I../../speex/include -I../../speexbuild - } - -+ jackaudio { -+ DEFINES *= USE_JACKAUDIO -+ PKGCONFIG *= jack -+ HEADERS *= JackAudio.h -+ SOURCES *= JackAudio.cpp -+ } -+ - CONFIG *= link_pkgconfig - - PKGCONFIG *= openssl sndfile diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index 29961e9077f0..39ab0ee0efa9 100644 --- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "6.8.3"; + version = "6.8.4"; pname = "frostwire"; src = fetchurl { url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz"; - sha256 = "1fnrr96jmak2rf54cc0chbm7ls5rfav78vhw98sa7zy544l2sn88"; + sha256 = "1qs0r5621ihb9sj4sqpmxj9smwf8a8k3n1qx2i0sz65qhjfc90zz"; }; nativeBuildInputs = [ makeWrapper ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.frostwire.com/; + homepage = "https://www.frostwire.com/"; description = "BitTorrent Client and Cloud File Downloader"; license = licenses.gpl2; maintainers = with maintainers; [ gavin ]; diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index cada3f93f55a..c29bd3a486cc 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -1,6 +1,8 @@ -{stdenv, fetchFromGitHub, ocaml, lablgtk, fontschumachermisc, xset, makeWrapper, ncurses +{stdenv, fetchFromGitHub, ocamlPackages, fontschumachermisc, xset, makeWrapper, ncurses , enableX11 ? true}: +let inherit (ocamlPackages) ocaml lablgtk; in + stdenv.mkDerivation (rec { pname = "unison"; diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index 9317ccab4eab..3e2b7cf67f20 100644 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -5,14 +5,14 @@ , pango, gdk-pixbuf, atk }: buildPythonApplication rec { - version = "0.9.4"; + version = "0.9.4.4"; pname = "syncthing-gtk"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing-gtk"; rev = "v${version}"; - sha256 = "0d3rjd1xjd7zravks9a2ph7gv1cm8wxaxkkvl1fvcx15v7f3hff9"; + sha256 = "0nc0wd7qvyri7841c3dd9in5d7367hys0isyw8znv5fj4c0a6v1f"; }; nativeBuildInputs = [ @@ -34,10 +34,6 @@ buildPythonApplication rec { ]; patches = [ - (fetchpatch { - url = https://github.com/syncthing/syncthing-gtk/commit/b2535e5a9cdb31c4987ab7af37f62d58d38255b7.patch; - sha256 = "047v79wz2a9334gbzywlqwpacrk53s26ksvfqaddk06avv8742w7"; - }) (substituteAll { src = ./paths.patch; killall = "${killall}/bin/killall"; @@ -45,6 +41,9 @@ buildPythonApplication rec { }) ]; + # repo doesn't have any tests + doCheck = false; + setupPyBuildFlags = [ "build_py" "--nofinddaemon" "--nostdownloader" ]; postPatch = '' diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index a2b14443c1a9..0b36b3266efc 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -5,23 +5,29 @@ stdenv.mkDerivation rec { pname = "abiword"; - version = "3.0.2"; + version = "3.0.4"; src = fetchurl { url = "https://www.abisource.com/downloads/abiword/${version}/source/${pname}-${version}.tar.gz"; - sha256 = "08imry821g81apdwym3gcs4nss0l9j5blqk31j5rv602zmcd9gxg"; + sha256 = "1mx5l716n0z5788i19qmad30cck4v9ggr071cafw2nrf375rcc79"; }; enableParallelBuilding = true; patches = [ - # https://bugzilla.abisource.com/show_bug.cgi?id=13791 + # Switch to using enchant2; note by the next update enchant2 should be + # default and this patch can be removed. + # https://github.com/NixOS/nixpkgs/issues/38506 (fetchurl { - url = https://bugzilla.abisource.com/attachment.cgi?id=5860; - sha256 = "02p8kz02xm1197zcpzjs010mna9hxsbq5lwgxr8b7qhh9yxja7al"; + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/enchant-2.1.patch?h=packages/abiword"; + sha256 = "444dc2aadea3c80310a509b690097541573f6d2652c573d04da66a0f385fcfb2"; }) ]; + postPatch = '' + substituteInPlace configure --replace 'enchant >=' 'enchant-2 >=' + ''; + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = [ @@ -34,6 +40,6 @@ stdenv.mkDerivation rec { homepage = https://www.abisource.com/; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ pSub ylwghst ]; + maintainers = with maintainers; [ pSub ylwghst sna ]; }; } diff --git a/pkgs/applications/office/paperwork/backend.nix b/pkgs/applications/office/paperwork/backend.nix index 7f82780fbe92..c28a4bc916dc 100644 --- a/pkgs/applications/office/paperwork/backend.nix +++ b/pkgs/applications/office/paperwork/backend.nix @@ -3,14 +3,15 @@ , isPy3k, isPyPy , pyenchant, simplebayes, pillow, pycountry, whoosh, termcolor -, python-Levenshtein, pyinsane2, pygobject3, pyocr, natsort +, python-Levenshtein, pygobject3, pyocr, natsort, libinsane +, distro , pkgs }: buildPythonPackage rec { pname = "paperwork-backend"; - version = "1.2.4"; + version = "1.3.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -18,7 +19,7 @@ buildPythonPackage rec { group = "World"; owner = "OpenPaperwork"; rev = version; - sha256 = "0wjjiw99aswmppnhzq3jir0p5p78r3m8hjinhdirkgm6h7skq5p4"; + sha256 = "1219yz8z4r1yn6miq8zc2z1m1lnhf3dmkhwfw23n05bg842nvg65"; }; sourceRoot = "source/paperwork-backend"; @@ -34,14 +35,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyenchant simplebayes pillow pycountry whoosh termcolor - python-Levenshtein pyinsane2 pygobject3 pyocr natsort - pkgs.poppler_gi pkgs.gtk3 + python-Levenshtein libinsane pygobject3 pyocr natsort + pkgs.poppler_gi pkgs.gtk3 distro ]; meta = { description = "Backend part of Paperwork (Python API, no UI)"; homepage = https://openpaper.work/; license = lib.licenses.gpl3Plus; - maintainers = [ lib.maintainers.aszlig ]; + maintainers = with lib.maintainers; [ aszlig symphorien ]; }; } diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix index 3506ea8b5515..c3930115365c 100644 --- a/pkgs/applications/office/paperwork/default.nix +++ b/pkgs/applications/office/paperwork/default.nix @@ -1,7 +1,15 @@ -{ lib, python3Packages, gtk3, cairo -, aspellDicts, buildEnv -, gnome3, librsvg -, xvfb_run, dbus, libnotify +{ lib +, python3Packages +, gtk3 +, cairo +, aspellDicts +, buildEnv +, gnome3 +, librsvg +, xvfb_run +, dbus +, libnotify +, wrapGAppsHook }: python3Packages.buildPythonApplication rec { @@ -46,9 +54,23 @@ python3Packages.buildPythonApplication rec { paths = lib.collect lib.isDerivation aspellDicts; }}/lib/aspell"; + postInstall = '' + # paperwork-shell needs to be re-wrapped with access to paperwork + cp ${python3Packages.paperwork-backend}/bin/.paperwork-shell-wrapped $out/bin/paperwork-shell + # install desktop files and icons + XDG_DATA_HOME=$out/share $out/bin/paperwork-shell install + ''; + checkInputs = [ xvfb_run dbus.daemon ] ++ (with python3Packages; [ paperwork-backend ]); + + nativeBuildInputs = [ + wrapGAppsHook + ]; + buildInputs = [ - gnome3.adwaita-icon-theme libnotify librsvg + gnome3.adwaita-icon-theme + libnotify + librsvg ]; # A few parts of chkdeps need to have a display and a dbus session, so we not @@ -61,21 +83,20 @@ python3Packages.buildPythonApplication rec { ''; propagatedBuildInputs = with python3Packages; [ - paperwork-backend pypillowfight gtk3 cairo pyxdg dateutil setuptools pandas - ]; - - makeWrapperArgs = [ - "--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\"" - "--set GDK_PIXBUF_MODULE_FILE \"$GDK_PIXBUF_MODULE_FILE\"" - "--prefix XDG_DATA_DIRS : \"$out/share\"" - "--suffix XDG_DATA_DIRS : \"$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\"" + paperwork-backend + pypillowfight + gtk3 + cairo + pyxdg + dateutil + setuptools ]; meta = { description = "A personal document manager for scanned documents"; homepage = https://openpaper.work/; license = lib.licenses.gpl3Plus; - maintainers = [ lib.maintainers.aszlig ]; + maintainers = with lib.maintainers; [ aszlig symphorien ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index ee4940928841..3794a676d4c4 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -19,7 +19,7 @@ let maintainers = with maintainers; [ emmanuelrosa dtzWill kampka ]; }; - version = "0.39.4"; + version = "0.40.5"; in { @@ -30,14 +30,14 @@ in { src = fetchurl { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "18wrnm13k0gg6aljpf6k7c5zia81zzkqc0sa1pgz0yzczydsfaa9"; + sha256 = "02hmfgv8viy1hn2ix4b0gdzbcj7piddsmjdnb0b5hpwahqrikiyi"; }; # Fetch from source repo, no longer included in release. # (they did special-case icon.png but we want the scalable svg) # Use the version here to ensure we get any changes. trilium_svg = fetchurl { - url = "https://raw.githubusercontent.com/zadam/trilium/v${version}/src/public/images/trilium.svg"; + url = "https://raw.githubusercontent.com/zadam/trilium/v${version}/images/trilium.svg"; sha256 = "1rgj7pza20yndfp8n12k93jyprym02hqah36fkk2b3if3kcmwnfg"; }; @@ -78,7 +78,7 @@ in { src = fetchurl { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - sha256 = "06svdp25031p665pvlxdz10malvhxpczzrg90hpr1zymm6v8van3"; + sha256 = "00b7qx2h26qrdhw2a7y0irhbr442yynnzpm1pz55hi33zpckbrc7"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/rtl-sdr/default.nix b/pkgs/applications/radio/rtl-sdr/default.nix index 4e9badaa6c51..69c568c3a1bb 100644 --- a/pkgs/applications/radio/rtl-sdr/default.nix +++ b/pkgs/applications/radio/rtl-sdr/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0lmvsnb4xw4hmz6zs0z5ilsah5hjz29g1s0050n59fllskqr3b8k"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake libusb1 ]; + nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ libusb1 ]; # TODO: get these fixes upstream: # * Building with -DINSTALL_UDEV_RULES=ON tries to install udev rules to diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 7163c201dbfc..85f6ac42126d 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "verilator"; - version = "4.028"; + version = "4.030"; src = fetchurl { url = "https://www.veripool.org/ftp/${pname}-${version}.tgz"; - sha256 = "1rl92jnayhc1j47gjxdz2zf1by9vzlawbyw9mf1d7d2y22dqak1l"; + sha256 = "07ldkf7xkr31n1dmx82bmzam8bvc1vsp32k76vd7yzn7r853qyky"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index ae8b0ada8062..ac65a72c94b9 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.6.1"; + version = "3.7.0"; src = fetchFromGitHub { owner = "leanprover-community"; repo = "lean"; rev = "v${version}"; - sha256 = "0crcpzbz75mdyi1vi4mygw3mj4lx73vff58fkic1gfxlpwrwgi20"; + sha256 = "1khy41zv4bjbpy3949j7y7d4qal53w4679iqlhm2l8jxd7y46nvi"; }; nativeBuildInputs = [ cmake ]; @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Automatic and interactive theorem prover"; homepage = "https://leanprover.github.io/"; + changelog = "https://github.com/leanprover-community/lean/blob/v${version}/doc/changes.md"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice gebner ]; diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index f613f94b9ccd..3ee62fad44da 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -10,11 +10,11 @@ }: stdenv.mkDerivation rec { - name = "R-3.6.2"; + name = "R-3.6.3"; src = fetchurl { url = "https://cran.r-project.org/src/base/R-3/${name}.tar.gz"; - sha256 = "0m69pfi0nxyriyb2yz74xfzaxwfkinnf9kpvf1rz727vvmfa8rdx"; + sha256 = "13xaxwfbzj0bd6rn2n27z0n04lb93mcyq991w4vdbbg8v282jc49"; }; dontUseImakeConfigure = true; @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; meta = with stdenv.lib; { - homepage = http://www.r-project.org/; + homepage = "http://www.r-project.org/"; description = "Free software environment for statistical computing and graphics"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix index de84d35c2e89..bba26610a079 100644 --- a/pkgs/applications/science/math/geogebra/default.nix +++ b/pkgs/applications/science/math/geogebra/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "geogebra"; - version = "5-0-573-0"; + version = "5-0-574-0"; preferLocalBuild = true; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { "https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" "http://web.archive.org/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" ]; - sha256 = "0lj0k49sjsjqs716n74xbq6a4gids5903f5s6fhqyahrwyldhzrj"; + sha256 = "0jbci4spqkf33yb079lsnsc684y4mdf1p8lm9r0037av8jlsrgrc"; }; srcIcon = fetchurl { diff --git a/pkgs/applications/science/math/getdp/default.nix b/pkgs/applications/science/math/getdp/default.nix index 3ccd89cf2c13..0ac2ea7d1b39 100644 --- a/pkgs/applications/science/math/getdp/default.nix +++ b/pkgs/applications/science/math/getdp/default.nix @@ -1,24 +1,27 @@ -{ stdenv, fetchurl, cmake, gfortran, openblas, openmpi, python3 }: +{ stdenv, fetchurl, cmake, gfortran, openblas, openmpi, petsc, python3 }: stdenv.mkDerivation rec { - pname = "getdp"; - version = "3.0.4"; + name = "getdp-${version}"; + version = "3.3.0"; src = fetchurl { url = "http://getdp.info/src/getdp-${version}-source.tgz"; - sha256 = "0v3hg03lzw4hz28hm45hpv0gyydqz0wav7xvb5n0v0jrm47mrspv"; + sha256 = "1pfviy2bw8z5y6c15czvlvyjjg9pvpgrj9fr54xfi2gmvs7zkgpf"; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ gfortran openblas openmpi python3 ]; + nativeBuildInputs = [ cmake gfortran ]; + buildInputs = [ openblas openmpi petsc python3 ]; meta = with stdenv.lib; { description = "A General Environment for the Treatment of Discrete Problems"; longDescription = '' - GetDP is a free finite element solver using mixed elements to discretize de Rham-type complexes in one, two and three dimensions. - The main feature of GetDP is the closeness between the input data defining discrete problems (written by the user in ASCII data files) and the symbolic mathematical expressions of these problems. + GetDP is a free finite element solver using mixed elements to discretize + de Rham-type complexes in one, two and three dimensions. The main + feature of GetDP is the closeness between the input data defining + discrete problems (written by the user in ASCII data files) and the + symbolic mathematical expressions of these problems. ''; - homepage = http://getdp.info/; - license = stdenv.lib.licenses.gpl2Plus; + homepage = "http://getdp.info/"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ wucke13 ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 8886a0c8a695..8f2f740f2483 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchurl +, fetchpatch , gmp , readline , libX11 @@ -19,6 +20,15 @@ stdenv.mkDerivation rec { sha256 = "1jd65h2psrmba2dx7rkf5qidf9ka0cwbsg20pd18k45ggr30l467"; }; + patches = [ + # https://trac.sagemath.org/ticket/29313#comment:1 + (fetchpatch { + name = "backport-bug-fix.patch"; + url = "https://git.archlinux.org/svntogit/community.git/plain/repos/community-x86_64/c7a1d35f.patch?h=packages/pari&id=27893d227290dc3821d68aa25877d9765c204dad"; + sha256 = "0vm0fwyzj66cr32imip6srksd47s2s2sjl1rb26ph8gpfi3nalii"; + }) + ]; + buildInputs = [ gmp readline diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 1cbea74edae9..cd465a8c413a 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -130,6 +130,13 @@ stdenv.mkDerivation rec { url = "https://git.sagemath.org/sage.git/patch/?h=c6d0308db15efd611211d26cfcbefbd180fc0831"; sha256 = "0nwai2jr22h49km4hx3kwafs3mzsc5kwsv7mqwjf6ibwfx2bbgyq"; }) + + # https://trac.sagemath.org/ticket/29313 (patch from ArchLinux) + (fetchpatch { + name = "pari-2.11.3.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/sagemath-pari-2.11.3.patch?h=sagemath-git&id=02e1d58bd1cd70935d69a4990469d18be6bd2c43"; + sha256 = "0z07444zvijyw96d11q7j81pvg7ysd6ycf1bbbjr6za9y74hv7d2"; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index cbf7f4db8c41..c17ffb001182 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -27,6 +27,8 @@ mkDerivation rec { cd build ''; + NIX_CFLAGS_COMPILE = [ "-Wno-address-of-packed-member" ]; # Don't litter logs with these warnings + qmakeFlags = [ # Default install tries to copy Qt files into package "CONFIG+=QGC_DISABLE_BUILD_SETUP" diff --git a/pkgs/applications/version-management/git-and-tools/git-standup/default.nix b/pkgs/applications/version-management/git-and-tools/git-standup/default.nix index c7488e84d5d0..ceb734f0f67f 100644 --- a/pkgs/applications/version-management/git-and-tools/git-standup/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-standup/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "git-standup"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "kamranahmedse"; repo = pname; rev = version; - sha256 = "0wx9ypyxhpjbrasl6264jmj9fjrpg3gn93dg00cakabz3r7yxxq3"; + sha256 = "1xnn0jjha56v7l2vj45zzxncl6m5x2hq6nkffgc1bcikhp1pidn7"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix index 1279e5dd6c99..e4cd58bf0f02 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix @@ -2,13 +2,15 @@ libgit2.overrideAttrs (oldAttrs: { cmakeFlags = oldAttrs.cmakeFlags ++ [ + "-DBUILD_CLAR=OFF" + "-DBUILD_SHARED_LIBS=OFF" + "-DREGEX_BACKEND=builtin" "-DUSE_BUNDLED_ZLIB=ON" + "-DUSE_HTTPS=OFF" + "-DUSE_HTTP_PARSER=builtin" # overwritten from libgit2 "-DUSE_ICONV=OFF" - "-DBUILD_CLAR=OFF" "-DUSE_SSH=OFF" - "-DUSE_HTTPS=OFF" - "-DBUILD_SHARED_LIBS=OFF" - "-DUSE_EXT_HTTP_PARSER=OFF" + "-DZERO_NSEC=ON" ]; src = fetchFromGitHub { owner = "romkatv"; diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index 1b67b933cb1c..f868c6b3c8fa 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "hub"; - version = "2.14.1"; + version = "2.14.2"; goPackagePath = "github.com/github/hub"; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "github"; repo = pname; rev = "v${version}"; - sha256 = "0b179sp8z2blzh4a0c2pjbbiya68x2i4cnmcci58r8k0mwrx6mw1"; + sha256 = "1qjab3dpia1jdlszz3xxix76lqrm4zbmqzd9ymld7h06awzsg2vh"; }; nativeBuildInputs = [ groff utillinux ]; diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix index 04ba4c7c48fd..9fc89d520ae9 100644 --- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lefthook"; - version = "0.6.3"; + version = "0.7.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "Arkweid"; repo = "lefthook"; - sha256 = "01zvlw2yyxjg92d1qag1b42kc2kd68h4fmrv9y6ar7z0rw3p9a5d"; + sha256 = "14rcvbzzrx0m3xijl8qhw5l2h0q10hqzad2hqm3079g893f2qad0"; }; - modSha256 = "0mjhw778x40c2plmjlkiry4rwvr9xkz65b88a61j86liv2plbmq2"; + modSha256 = "0ih11gw2y9dhv3zw1fzjmdfjln5h6zg1bj7sl68cglf6743siqnq"; meta = with stdenv.lib; { description = "Fast and powerful Git hooks manager for any type of projects"; diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix index 3a354133e875..d356991815e7 100644 --- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix @@ -2,7 +2,7 @@ let name = "stgit-${version}"; - version = "0.21"; + version = "0.22"; in stdenv.mkDerivation { inherit name; @@ -11,7 +11,7 @@ stdenv.mkDerivation { owner = "ctmarinas"; repo = "stgit"; rev = "v${version}"; - sha256 = "16gwdad18rc9bivyzrjccp83iccmqr45fp2zawycmrfp2ancffc7"; + sha256 = "0xpvs5fa50rrvl2c8naha1nblk5ip2mgg63a9srqqxfx6z8qmrfz"; }; buildInputs = [ python2 git ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A patch manager implemented on top of Git"; - homepage = http://procode.org/stgit/; + homepage = "http://procode.org/stgit/"; license = licenses.gpl2; maintainers = with maintainers; [ the-kenny ]; platforms = platforms.unix; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 07ec3a291447..ddad51dfb636 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,11 +1,11 @@ { - "version": "12.8.5", - "repo_hash": "1y5606p793w1js39420jcd2bj42cripczgrdxgg2cq0r2kq8axk8", + "version": "12.8.6", + "repo_hash": "0plcigppmg6ckmq8myj3m9adshdvqj7czx8fms71bsa9zx060wib", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v12.8.5-ee", + "rev": "v12.8.6-ee", "passthru": { - "GITALY_SERVER_VERSION": "12.8.5", + "GITALY_SERVER_VERSION": "12.8.6", "GITLAB_PAGES_VERSION": "1.16.0", "GITLAB_SHELL_VERSION": "11.0.0", "GITLAB_WORKHORSE_VERSION": "8.21.0" diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 0dd60a6df208..9b3e4da20248 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -28,14 +28,14 @@ let }; }); in buildGoPackage rec { - version = "12.8.5"; + version = "12.8.6"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "19pwffncihhywfac7ybry38vyj3pmdz66g5nqrvwn4xxw7ypvd24"; + sha256 = "1rf9qmyjllkwkyi7la1dzyjh0z9sw21zdzihd7v9ngwqssfk5zfk"; }; # Fix a check which assumes that hook files are writeable by their diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index dc2d1e29719d..a2a3a6d05b7e 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -175,6 +175,8 @@ def update_gitaly(): f.write(repo.get_file(fn, f"v{gitaly_server_version}")) subprocess.check_output(['bundix'], cwd=gitaly_dir) + + os.environ['GOROOT'] = "" subprocess.check_output(['vgo2nix'], cwd=gitaly_dir) for fn in ['go.mod', 'go.sum']: @@ -197,6 +199,7 @@ def update_gitlab_shell(): with open(gitlab_shell_dir / fn, 'w') as f: f.write(repo.get_file(fn, f"v{gitlab_shell_version}")) + os.environ['GOROOT'] = "" subprocess.check_output(['vgo2nix'], cwd=gitlab_shell_dir) for fn in ['go.mod', 'go.sum']: @@ -217,6 +220,7 @@ def update_gitlab_workhorse(): with open(gitlab_workhorse_dir / fn, 'w') as f: f.write(repo.get_file(fn, f"v{gitlab_workhorse_version}")) + os.environ['GOROOT'] = "" subprocess.check_output(['vgo2nix'], cwd=gitlab_workhorse_dir) for fn in ['go.mod', 'go.sum']: diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index e4093ea87e72..7f7b3a227e84 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -206,9 +206,9 @@ rec { }; docker_19_03 = makeOverridable dockerGen { - version = "19.03.7"; - rev = "7141c199a2edb2a90b778175f836f9dd2a22c95a"; - sha256 = "1h1hrp6cw3ah2gaq2vfdd1d9vh7gyf7rs6bdxwpxk9ixc19fxsm4"; + version = "19.03.8"; + rev = "afacb8b7f0d8d4f9d2a8e8736e9c993e672b41f3"; + sha256 = "15iq16rlnkw78lvapcfpbnsnxhdjbvfvgzg3xzxhpdg1dmq40b6j"; runcRev = "dc9208a3303feef5b3839f4323d9beb36df0a9dd"; # v1.0.0-rc10 runcSha256 = "0pi3rvj585997m4z9ljkxz2z9yxf9p2jr0pmqbqrc7bc95f5hagk"; containerdRev = "7ad184331fa3e55e52b890ea95e65ba581ae3429"; # v1.2.13 diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 6c15b2ea2ced..5d3044bdbc71 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -21,8 +21,8 @@ let buildType = "release"; # Remember to change the extpackRev and version in extpack.nix and # guest-additions/default.nix as well. - main = "036x2mvkk22lbg72cz6pik9z538j1ag6mmwjjmfikgrq1i7v24jy"; - version = "6.0.14"; + main = "59f8f5774473f593e3eb5940e2a337e0674bcd9854164b2578fd43f896260c99"; + version = "6.1.4"; iasl' = iasl.overrideAttrs (old: rec { inherit (old) pname; @@ -89,6 +89,7 @@ in stdenv.mkDerivation { patches = optional enableHardening ./hardened.patch + ++ [ ./extra_symbols.patch ] # When hardening is enabled, we cannot use wrapQtApp to ensure that VirtualBoxVM sees # the correct environment variables needed for Qt to work, specifically QT_PLUGIN_PATH. # This is because VirtualBoxVM would detect that it is wrapped that and refuse to run, @@ -102,26 +103,6 @@ in stdenv.mkDerivation { }) ++ [ ./qtx11extras.patch - # Kernel 5.4 fix, should be fixed with next upstream release - # https://www.virtualbox.org/ticket/18945 - (fetchpatch { - name = "kernel-5.4-fix-1.patch"; - url = "https://www.virtualbox.org/changeset/81586/vbox?format=diff"; - sha256 = "0zbkc9v65pkdmjik53x29g39qyf7narkhpwpx5n1n1bfqnhf0k1r"; - stripLen = 1; - }) - (fetchpatch { - name = "kernel-5.4-fix-2.patch"; - url = "https://www.virtualbox.org/changeset/81587/vbox?format=diff"; - sha256 = "1j98cqxj8qlqwaqr4mvwwbkmchw8jmygjwgzz82gix7fj76j2y9c"; - stripLen = 1; - }) - (fetchpatch { - name = "kernel-5.4-fix-3.patch"; - url = "https://www.virtualbox.org/changeset/81649/vbox?format=diff"; - sha256 = "1d6p5k5dgzmjglqfkbcbvpn1x3wxila30q4gcbb7pxwfgclaw2hk"; - stripLen = 1; - }) ]; postPatch = '' diff --git a/pkgs/applications/virtualization/virtualbox/extra_symbols.patch b/pkgs/applications/virtualization/virtualbox/extra_symbols.patch new file mode 100644 index 000000000000..174bb8d9e70c --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/extra_symbols.patch @@ -0,0 +1,21 @@ +diff --git a/src/VBox/HostDrivers/linux/Makefile b/src/VBox/HostDrivers/linux/Makefile +index 6e44129b..e68ce128 100644 +--- a/src/VBox/HostDrivers/linux/Makefile ++++ b/src/VBox/HostDrivers/linux/Makefile +@@ -95,13 +95,13 @@ vboxpci: vboxdrv + install: + @$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxdrv install + @if [ -d vboxnetflt ]; then \ +- $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxnetflt install; \ ++ $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) KBUILD_EXTRA_SYMBOLS=$(abspath vboxnetflt/Module.symvers) -C vboxnetflt install; \ + fi + @if [ -d vboxnetadp ]; then \ +- $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxnetadp install; \ ++ $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) KBUILD_EXTRA_SYMBOLS=$(abspath vboxnetadp/Module.symvers) -C vboxnetadp install; \ + fi + @if [ -d vboxpci ]; then \ +- $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxpci install; \ ++ $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) KBUILD_EXTRA_SYMBOLS=$(abspath vboxpci/Module.symvers) -C vboxpci install; \ + fi + + else diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 690b72f3eeb0..fdb393a94ebe 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper -, zlib, xorg, dbus, virtualbox, dos2unix, fetchpatch, findutils, patchutils }: +, zlib, xorg, dbus, virtualbox}: let version = virtualbox.version; @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "1c9ysx0fhxxginmp607b4fk74dvlr32n6w52gawm06prf4xg90nb"; + sha256 = "e2846a7576cce1b92a7c0744f41eaac750248d6e31dfca5c45d5766648b394c7"; }; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; @@ -43,67 +43,9 @@ in stdenv.mkDerivation rec { prePatch = '' substituteInPlace src/vboxguest-${version}/vboxvideo/vbox_ttm.c \ --replace "<ttm/" "<drm/ttm/" - - echo ${lib.escapeShellArgs patches} | \ - ${findutils}/bin/xargs -n1 ${patchutils}/bin/lsdiff --strip=1 --addprefix=src/vboxguest-${version}/ | \ - ${findutils}/bin/xargs ${dos2unix}/bin/dos2unix ''; patchFlags = [ "-p1" "-d" "src/vboxguest-${version}" ]; - # Kernel 5.4 fix, should be fixed with next upstream release - # https://www.virtualbox.org/ticket/18945 - patches = lib.concatLists (lib.mapAttrsToList (changeset: args: - map (arg: - fetchpatch ({ - name = "kernel-5.4-fix-${changeset}.patch"; - url = "https://www.virtualbox.org/changeset/${changeset}/vbox?format=diff"; - } // arg)) args) { - "81586" = [{ - sha256 = "126z67x6vy65w6jlqbh4z4f1cffxnycwb69vns0154bawbsbxsiw"; - stripLen = 5; - extraPrefix = "vboxguest/"; - }]; - "81587" = [ - { - sha256 = "0simzswnl0wvnc2i9gixz99rfc7lxk1nrnskksrlrrl9hqnh0lva"; - stripLen = 5; - extraPrefix = "vboxsf/"; - includes = [ "*/the-linux-kernel.h" ]; - } - { - sha256 = "0a8r9h3x3lcjq2fykgqhdaykp00rnnkbxz8xnxg847zgvca15y02"; - stripLen = 5; - extraPrefix = "vboxguest/"; - includes = [ "*/the-linux-kernel.h" ]; - } - ]; - "81649" = [ - { - sha256 = "1p1skxlvqigydxr4sk7w51lpk7nxg0d9lppq39sdnfmgi1z0h0sc"; - stripLen = 2; - extraPrefix = "vboxguest/"; - includes = [ "*/cdefs.h" ]; - } - { - sha256 = "1j060ggdnndyjdhkfvs15306gl7g932sim9xjmx2mnx8gjdmg37f"; - stripLen = 2; - extraPrefix = "vboxsf/"; - includes = [ "*/cdefs.h" ]; - } - { - sha256 = "060h3a5k2yklbvlg0hyg4x87xrg37cvv3rjb67xizlwvlyy6ykkg"; - stripLen = 5; - extraPrefix = "vboxguest/"; - includes = [ "*/thread2-r0drv-linux.c" ]; - } - { - sha256 = "0cxlkf7cy751gl8dgzr7vkims1kmx5pgzsrxyk8w18zyp5nk9glw"; - stripLen = 7; - extraPrefix = "vboxvideo/"; - includes = [ "*/vbox_*.c" ]; - } - ]; - }); unpackPhase = '' ${if stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux" then '' @@ -162,7 +104,7 @@ in stdenv.mkDerivation rec { installPhase = '' # Install kernel modules. cd src/vboxguest-${version} - make install INSTALL_MOD_PATH=$out + make install INSTALL_MOD_PATH=$out KBUILD_EXTRA_SYMBOLS=$PWD/vboxsf/Module.symvers cd ../.. # Install binaries diff --git a/pkgs/applications/virtualization/virtualbox/hardened.patch b/pkgs/applications/virtualization/virtualbox/hardened.patch index 398100f3f398..180ea88461ef 100644 --- a/pkgs/applications/virtualization/virtualbox/hardened.patch +++ b/pkgs/applications/virtualization/virtualbox/hardened.patch @@ -75,32 +75,6 @@ index ce0f288..6193108 100644 return supR3HardenedSetError3(VERR_SUPLIB_WRITE_NON_SYS_GROUP, pErrInfo, "An unknown (and thus untrusted) group has write access to '", pszPath, "' and we therefore cannot trust the directory content or that of any subdirectory"); -diff --git a/src/VBox/Main/src-server/MachineImpl.cpp b/src/VBox/Main/src-server/MachineImpl.cpp -index 320c569..9bfe41f 100644 ---- a/src/VBox/Main/src-server/MachineImpl.cpp -+++ b/src/VBox/Main/src-server/MachineImpl.cpp -@@ -7543,7 +7543,7 @@ HRESULT Machine::i_launchVMProcess(IInternalSessionControl *aControl, - - /* get the path to the executable */ - char szPath[RTPATH_MAX]; -- RTPathAppPrivateArch(szPath, sizeof(szPath) - 1); -+ RTStrCopy(szPath, sizeof(szPath) - 1, "/run/wrappers/bin"); - size_t cchBufLeft = strlen(szPath); - szPath[cchBufLeft++] = RTPATH_DELIMITER; - szPath[cchBufLeft] = 0; -diff --git a/src/VBox/Main/src-server/NetworkServiceRunner.cpp b/src/VBox/Main/src-server/NetworkServiceRunner.cpp -index 1e38d99..5e43dda 100644 ---- a/src/VBox/Main/src-server/NetworkServiceRunner.cpp -+++ b/src/VBox/Main/src-server/NetworkServiceRunner.cpp -@@ -85,7 +85,7 @@ int NetworkServiceRunner::start(bool aKillProcOnStop) - - /* get the path to the executable */ - char exePathBuf[RTPATH_MAX]; -- const char *exePath = RTProcGetExecutablePath(exePathBuf, RTPATH_MAX); -+ const char *exePath = RTProcGetSuidPath(exePathBuf, RTPATH_MAX); - char *substrSl = strrchr(exePathBuf, '/'); - char *substrBs = strrchr(exePathBuf, '\\'); - char *suffix = substrSl ? substrSl : substrBs; diff --git a/src/VBox/Main/src-server/generic/NetIf-generic.cpp b/src/VBox/Main/src-server/generic/NetIf-generic.cpp index 98dc91a..43a819f 100644 --- a/src/VBox/Main/src-server/generic/NetIf-generic.cpp @@ -180,3 +154,29 @@ index 2aab645..9795f21 100644 RTR3DECL(const char *) RTProcShortName(void) { +diff --git a/src/VBox/Main/src-server/NetworkServiceRunner.cpp b/src/VBox/Main/src-server/NetworkServiceRunner.cpp +index 2e57690..3272c84 100644 +--- a/src/VBox/Main/src-server/NetworkServiceRunner.cpp ++++ b/src/VBox/Main/src-server/NetworkServiceRunner.cpp +@@ -188,7 +188,7 @@ int NetworkServiceRunner::start(bool aKillProcessOnStop) + * ASSUME it is relative to the directory that holds VBoxSVC. + */ + char szExePath[RTPATH_MAX]; +- AssertReturn(RTProcGetExecutablePath(szExePath, RTPATH_MAX), VERR_FILENAME_TOO_LONG); ++ AssertReturn(RTProcGetSuidPath(szExePath, RTPATH_MAX), VERR_FILENAME_TOO_LONG); + RTPathStripFilename(szExePath); + int vrc = RTPathAppend(szExePath, sizeof(szExePath), m->pszProcName); + AssertLogRelRCReturn(vrc, vrc); +diff --git a/src/VBox/Main/src-all/MachineLaunchVMCommonWorker.cpp b/src/VBox/Main/src-all/MachineLaunchVMCommonWorker.cpp +index 2991d3a7..d042a08b 100644 +--- a/src/VBox/Main/src-all/MachineLaunchVMCommonWorker.cpp ++++ b/src/VBox/Main/src-all/MachineLaunchVMCommonWorker.cpp +@@ -90,7 +90,7 @@ int MachineLaunchVMCommonWorker(const Utf8Str &aNameOrId, + + /* Get the path to the executable directory w/ trailing slash: */ + char szPath[RTPATH_MAX]; +- int vrc = RTPathAppPrivateArch(szPath, sizeof(szPath)); ++ int vrc = RTStrCopy(szPath, sizeof(szPath) - 1, "/run/wrappers/bin"); + AssertRCReturn(vrc, vrc); + size_t cbBufLeft = RTPathEnsureTrailingSeparator(szPath, sizeof(szPath)); + AssertReturn(cbBufLeft > 0, VERR_FILENAME_TOO_LONG); diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index 7895d8c124ab..062a8c4b8d87 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "2.12.c"; + version = "2.12.c.1"; pname = "i3lock-color"; src = fetchFromGitHub { owner = "PandorasFox"; repo = "i3lock-color"; rev = version; - sha256 = "08fhnchf187b73h52xgzb86g6byzxz085zs9galsvl687g5zxk34"; + sha256 = "1q09cfgkikqbrkk1kljg8dsgbs5nacixhdqaww18h94hmlnbbssc"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { - clock: time/date with configurable format - keyboard-layout ''; - homepage = https://github.com/PandorasFox/i3lock-color; + homepage = "https://github.com/PandorasFox/i3lock-color"; maintainers = with maintainers; [ malyn ]; license = licenses.bsd3; diff --git a/pkgs/data/fonts/jost/default.nix b/pkgs/data/fonts/jost/default.nix index ecada2eda7b7..3c1403da2639 100644 --- a/pkgs/data/fonts/jost/default.nix +++ b/pkgs/data/fonts/jost/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchzip}: let - version = "3.3"; + version = "3.5"; in fetchzip { name = "jost-${version}"; url = "https://github.com/indestructible-type/Jost/releases/download/${version}/Jost.zip"; @@ -11,7 +11,7 @@ in fetchzip { unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; - sha256="00nrhs3aif2hc4yhjhbn9ywmydl2w0g0hv5m5is8gv7wx8yi2j9z"; + sha256="0l78vhmbsyfmrva5wc76pskhxqryyg8q5xddpj9g5wqsddy525dq"; meta = with stdenv.lib; { homepage = https://github.com/indestructible-type/Jost; diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 96fd9ad33f16..9afe4a9e4001 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db"; - version = "20200203"; + version = "20200214"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "1zjq1dhlci00j17dij7s3l30hybzmaykpk5b6bd5xbllp745njn5"; + sha256 = "1fpdb8r8kzwp1k5dc9xyy9jr2jr3haq7n9b6spamm599zvzf8nb6"; }; nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Osinfo database of information about operating systems for virtualization provisioning tools"; - homepage = https://libosinfo.org/; + homepage = "https://libosinfo.org/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix index 0fb061519e6e..08f178b30e83 100644 --- a/pkgs/data/themes/plata/default.nix +++ b/pkgs/data/themes/plata/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "plata-theme"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitLab { owner = "tista500"; repo = "plata-theme"; rev = version; - sha256 = "1z8kiac3gb4hsyq92p5dd8fyjv7bad55q65kbnjiskpm4ircg4ja"; + sha256 = "183kas7b5vxm6l2m5c4yh8cnq05sfa82afcp9h6cfj2rh2iv6kqy"; }; preferLocalBuild = true; @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A GTK theme based on Material Design Refresh"; - homepage = https://gitlab.com/tista500/plata-theme; + homepage = "https://gitlab.com/tista500/plata-theme"; license = with licenses; [ gpl2 cc-by-sa-40 ]; platforms = platforms.linux; maintainers = [ maintainers.tadfisher ]; diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix index b53030217722..85739a6ec2ec 100644 --- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { pname = "elementary-music"; - version = "5.0.4"; + version = "5.0.5"; repoName = "music"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "02qjsf9xnfh043xbls9mll2r1wcdvclw60x8wysv12rhbm90gwvp"; + sha256 = "0cb0mwsp5w2bmjq8ap9mi0jvaqr9fgq00gfrkj0mzb5x5c26hrnw"; }; passthru = { @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Music player and library designed for elementary OS"; - homepage = https://github.com/elementary/music; + homepage = "https://github.com/elementary/music"; license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/development/compilers/binaryen/0001-Get-rid-of-git-dependency.patch b/pkgs/development/compilers/binaryen/0001-Get-rid-of-git-dependency.patch new file mode 100644 index 000000000000..79b053592a95 --- /dev/null +++ b/pkgs/development/compilers/binaryen/0001-Get-rid-of-git-dependency.patch @@ -0,0 +1,38 @@ +From 1c6af6c68ba3f49ae9e942844c739e934339d3b9 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch <maximilian@mbosch.me> +Date: Sat, 14 Mar 2020 00:37:31 +0100 +Subject: [PATCH] Get rid of git dependency + +--- + CMakeLists.txt | 15 +-------------- + 1 file changed, 1 insertion(+), 14 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4acf703e1..4e9bd60b5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -7,20 +7,7 @@ IF(NOT CMAKE_BUILD_TYPE) + SET(CMAKE_BUILD_TYPE "Release") + ENDIF() + +-FIND_PACKAGE(Git QUIET REQUIRED) +-EXECUTE_PROCESS(COMMAND +- "${GIT_EXECUTABLE}" --git-dir=${CMAKE_CURRENT_SOURCE_DIR}/.git describe --tags +- RESULT_VARIABLE +- GIT_HASH_RESULT +- OUTPUT_VARIABLE +- GIT_HASH +- OUTPUT_STRIP_TRAILING_WHITESPACE) +-IF(${GIT_HASH_RESULT}) +- MESSAGE(WARNING "Error running git describe to determine version") +- SET(BINARYEN_VERSION_INFO "(unable to determine version)") +-ELSE() +- SET(BINARYEN_VERSION_INFO "${GIT_HASH}") +-ENDIF() ++SET(BINARYEN_VERSION_INFO "@emscriptenv@") + CONFIGURE_FILE(config.h.in config.h) + + OPTION(BUILD_STATIC_LIB "Build as a static library" OFF) +-- +2.25.0 + diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index 664335c3dade..d37232437668 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -1,12 +1,12 @@ -{ stdenv, cmake, python, fetchFromGitHub, emscriptenRev ? null }: +{ stdenv, cmake, python3, fetchFromGitHub, emscriptenRev ? null, substituteAll }: let - defaultVersion = "89"; + defaultVersion = "91"; # Map from git revs to SHA256 hashes sha256s = { - version_89 = "0rh1dq33ilq54szfgi1ajaiaj7rbylai02rhp9zm9vpwp0rw8mij"; - "1.38.28" = "172s7y5f38736ic8ri3mnbdqcrkadd40a26cxcfwbscc53phl11v"; + version_91 = "1qsjqnzc5w9ny9v01bxkdvhh4kgbsia01x5vvac72m075v4mpgs4"; + "1.39.1" = "0ygm9m5322h4vfpf3j63q32qxk2l26yk62hh7dkb49j51zwl1y3y"; }; in @@ -29,7 +29,12 @@ stdenv.mkDerivation rec { inherit rev; }; - nativeBuildInputs = [ cmake python ]; + patches = stdenv.lib.optional (emscriptenRev != null) (substituteAll { + src = ./0001-Get-rid-of-git-dependency.patch; + emscriptenv = "1.39.1"; + }); + + nativeBuildInputs = [ cmake python3 ]; meta = with stdenv.lib; { homepage = https://github.com/WebAssembly/binaryen; diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 7ff8d7529ca3..f660a59a790a 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -245,6 +245,12 @@ stdenv.mkDerivation ({ inherit (stdenv) is64bit; + # In this particular combination it stopped creating lib output at all. + # TODO: perhaps find a better fix? (ideally understand what's going on) + postFixup = if crossStageStatic && targetPlatform.isMusl && targetPlatform.is32bit + then ''mkdir "$lib"'' + else null; + meta = { homepage = https://gcc.gnu.org/; license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 79173871095c..4517db4c3840 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "sbcl"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${pname}-${version}-source.tar.bz2"; - sha256 = "1s2nrq26czl7f8jpa9qjpmdqbzvldvf4c7c1z1c438v4f85xcl44"; + sha256 = "07pyzdjnhcpqwvr3rrk4i18maqdywbq1qj93fnpx1h4b7dp08r28"; }; buildInputs = [texinfo]; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3f28ebebd224..90819d64c339 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -81,12 +81,12 @@ self: super: { # The Hackage tarball is purposefully broken, because it's not intended to be, like, useful. # https://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/ - git-annex = (overrideSrc (appendPatch super.git-annex ./patches/git-annex-fix-build-with-ghc-8.8.x.patch) { + git-annex = (overrideSrc super.git-annex { src = pkgs.fetchgit { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "0pl0yip7zp4i78cj9jqkmm33wqaaaxjq3ggnfmv95y79yijd6yh4"; + sha256 = "0y2qcjahi705c6nnypqpa5w3bzyzk4kqvbwfnpiaxzk5vna589gg"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -376,6 +376,7 @@ self: super: { Rlang-QQ = dontCheck super.Rlang-QQ; safecopy = dontCheck super.safecopy; sai-shape-syb = dontCheck super.sai-shape-syb; + saltine = dontCheck super.saltine; # https://github.com/tel/saltine/pull/56 scp-streams = dontCheck super.scp-streams; sdl2 = dontCheck super.sdl2; # the test suite needs an x server sdl2-ttf = dontCheck super.sdl2-ttf; # as of version 0.2.1, the test suite requires user intervention @@ -1219,7 +1220,13 @@ self: super: { temporary-resourcet = doJailbreak super.temporary-resourcet; # Requires dhall >= 1.23.0 - ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_29_0; }; + ats-pkg = dontCheck (super.ats-pkg.override { dhall = self.dhall_1_29_0; }); + + # fake a home dir and capture generated man page + ats-format = overrideCabal super.ats-format (old : { + preConfigure = "export HOME=$PWD"; + postBuild = "mv .local/share $out"; + }); # Test suite doesn't work with current QuickCheck # https://github.com/pruvisto/heap/issues/11 @@ -1467,4 +1474,26 @@ self: super: { # haskell-ci-0.8 needs cabal-install-parsers ==0.1, but we have 0.2. haskell-ci = doJailbreak super.haskell-ci; + persistent-mysql = dontCheck super.persistent-mysql; + + # Fix EdisonAPI and EdisonCore for GHC 8.8: + # https://github.com/robdockins/edison/pull/16 + EdisonAPI = appendPatch super.EdisonAPI (pkgs.fetchpatch { + url = "https://github.com/robdockins/edison/pull/16/commits/8da6c0f7d8666766e2f0693425c347c0adb492dc.patch"; + postFetch = '' + ${pkgs.patchutils}/bin/filterdiff --include='a/edison-api/*' --strip=1 "$out" > "$tmpfile" + mv "$tmpfile" "$out" + ''; + sha256 = "0yi5pz039lcm4pl9xnl6krqxyqq5rgb5b6m09w0sfy06x0n4x213"; + }); + + EdisonCore = appendPatch super.EdisonCore (pkgs.fetchpatch { + url = "https://github.com/robdockins/edison/pull/16/commits/8da6c0f7d8666766e2f0693425c347c0adb492dc.patch"; + postFetch = '' + ${pkgs.patchutils}/bin/filterdiff --include='a/edison-core/*' --strip=1 "$out" > "$tmpfile" + mv "$tmpfile" "$out" + ''; + sha256 = "097wqn8hxsr50b9mhndg5pjim5jma2ym4ylpibakmmb5m98n17zp"; + }); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 5c66ad9a3909..3c6845705336 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -1,6 +1,6 @@ # pkgs/development/haskell-modules/configuration-hackage2nix.yaml -compiler: ghc-8.8.2 +compiler: ghc-8.8.3 core-packages: - array-0.5.4.0 @@ -10,23 +10,23 @@ core-packages: - Cabal-3.0.1.0 - containers-0.6.2.1 - deepseq-1.4.4.0 - - directory-1.3.4.0 + - directory-1.3.6.0 - filepath-1.4.2.1 - - ghc-8.8.2 - - ghc-boot-8.8.2 - - ghc-boot-th-8.8.2 + - ghc-8.8.3 + - ghc-boot-8.8.3 + - ghc-boot-th-8.8.3 - ghc-compact-0.1.0.0 - - ghc-heap-8.8.2 + - ghc-heap-8.8.3 - ghc-prim-0.5.3 - - ghci-8.8.2 + - ghci-8.8.3 - haskeline-0.7.5.0 - hpc-0.6.0.3 - integer-gmp-1.0.2.0 - - libiserv-8.8.2 + - libiserv-8.8.3 - mtl-2.2.2 - parsec-3.1.14.0 - pretty-1.1.3.6 - - process-1.6.7.0 + - process-1.6.8.0 - rts-1.0 - stm-2.5.0.0 - template-haskell-2.15.0.0 @@ -76,7 +76,7 @@ default-package-overrides: # gi-gdkx11-4.x requires gtk-4.x, which is still under development and # not yet available in Nixpkgs - gi-gdkx11 < 4 - # LTS Haskell 15.2 + # LTS Haskell 15.3 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -361,7 +361,7 @@ default-package-overrides: - bytes ==0.17 - byteset ==0.1.1.0 - byteslice ==0.2.2.0 - - bytesmith ==0.3.5.0 + - bytesmith ==0.3.6.0 - bytestring-builder ==0.10.8.2.0 - bytestring-conversion ==0.3.1 - bytestring-lexing ==0.5.0.2 @@ -407,7 +407,7 @@ default-package-overrides: - Chart-diagrams ==1.9.3 - chaselev-deque ==0.5.0.5 - ChasingBottoms ==1.3.1.7 - - checkers ==0.5.2 + - checkers ==0.5.4 - checksum ==0.0 - chimera ==0.3.0.0 - choice ==0.2.2 @@ -444,7 +444,7 @@ default-package-overrides: - co-log ==0.4.0.0 - co-log-core ==0.2.1.0 - co-log-polysemy ==0.0.1.1 - - Color ==0.1.3.1 + - Color ==0.1.4 - colorful-monoids ==0.2.1.2 - colorize-haskell ==1.0.1 - colour ==2.3.5 @@ -577,7 +577,7 @@ default-package-overrides: - data-tree-print ==0.1.0.2 - dataurl ==0.1.0.0 - DAV ==1.3.4 - - dbus ==1.2.11 + - dbus ==1.2.12 - debian-build ==0.10.2.0 - debug-trace-var ==0.2.0 - dec ==0.0.3 @@ -707,7 +707,7 @@ default-package-overrides: - extended-reals ==0.2.3.0 - extensible-effects ==5.0.0.1 - extensible-exceptions ==0.1.1.4 - - extra ==1.6.20 + - extra ==1.6.21 - extractable-singleton ==0.0.1 - extrapolate ==0.4.1 - fail ==4.9.0.0 @@ -785,12 +785,12 @@ default-package-overrides: - funcmp ==1.9 - function-builder ==0.3.0.1 - functor-classes-compat ==1 - - fused-effects ==1.0.0.1 + - fused-effects ==1.0.2.0 - fusion-plugin ==0.1.1 - fusion-plugin-types ==0.1.0 - fuzzcheck ==0.1.1 - fuzzy ==0.1.0.0 - - fuzzy-dates ==0.1.1.1 + - fuzzy-dates ==0.1.1.2 - fuzzyset ==0.2.0 - fuzzy-time ==0.1.0.0 - gauge ==0.2.5 @@ -868,9 +868,9 @@ default-package-overrides: - gi-pango ==1.0.22 - giphy-api ==0.7.0.0 - githash ==0.1.3.3 - - github-rest ==1.0.1 + - github-rest ==1.0.2 - github-types ==0.2.1 - - gitlab-haskell ==0.1.5 + - gitlab-haskell ==0.1.7 - gitrev ==1.3.1 - gi-xlib ==2.0.8 - gl ==0.9 @@ -1059,8 +1059,8 @@ default-package-overrides: - hunit-dejafu ==2.0.0.1 - hvect ==0.4.0.0 - hvega ==0.5.0.0 - - hw-balancedparens ==0.3.0.4 - - hw-bits ==0.7.1.0 + - hw-balancedparens ==0.3.0.5 + - hw-bits ==0.7.1.2 - hw-conduit ==0.2.0.6 - hw-conduit-merges ==0.2.0.0 - hw-diagnostics ==0.0.0.7 @@ -1287,7 +1287,7 @@ default-package-overrides: - markdown-unlit ==0.5.0 - markov-chain ==0.0.3.4 - massiv ==0.4.5.0 - - massiv-io ==0.2.0.0 + - massiv-io ==0.2.1.0 - massiv-test ==0.1.2 - mathexpr ==0.3.0.0 - math-functions ==0.3.3.0 @@ -1331,9 +1331,9 @@ default-package-overrides: - mime-types ==0.1.0.9 - mini-egison ==0.1.6 - minimal-configuration ==0.1.4 - - minimorph ==0.2.1.0 + - minimorph ==0.2.2.0 - minio-hs ==1.5.2 - - miniutter ==0.5.0.0 + - miniutter ==0.5.1.0 - mintty ==0.1.2 - miso ==1.4.0.0 - missing-foreign ==0.1.1 @@ -1356,7 +1356,7 @@ default-package-overrides: - monad-extras ==0.6.0 - monadic-arrays ==0.2.2 - monad-journal ==0.8.1 - - monad-logger ==0.3.31 + - monad-logger ==0.3.32 - monad-logger-json ==0.1.0.0 - monad-logger-prefix ==0.1.11 - monad-loops ==0.4.3 @@ -1551,7 +1551,7 @@ default-package-overrides: - persistent-sqlite ==2.10.6.2 - persistent-template ==2.8.2.3 - persistent-test ==2.0.3.1 - - persistent-typed-db ==0.1.0.0 + - persistent-typed-db ==0.1.0.1 - pg-harness-client ==0.6.0 - pgp-wordlist ==0.1.0.3 - pg-transact ==0.3.1.1 @@ -1739,7 +1739,7 @@ default-package-overrides: - rerebase ==1.4.1 - resolv ==0.1.1.3 - resource-pool ==0.2.3.2 - - resourcet ==1.2.2 + - resourcet ==1.2.3 - result ==0.2.6.0 - rethinkdb-client-driver ==0.0.25 - retry ==0.8.1.0 @@ -1747,7 +1747,7 @@ default-package-overrides: - rfc1751 ==0.1.2 - rfc5051 ==0.1.0.4 - rigel-viz ==0.2.0.0 - - rio ==0.1.14.0 + - rio ==0.1.14.1 - rio-orphans ==0.1.1.0 - rio-prettyprint ==0.1.0.0 - roc-id ==0.1.0.0 @@ -1792,7 +1792,7 @@ default-package-overrides: - sdl2-gfx ==0.2 - sdl2-image ==2.0.0 - sdl2-mixer ==1.1.0 - - sdl2-ttf ==2.1.0 + - sdl2-ttf ==2.1.1 - search-algorithms ==0.3.1 - secp256k1-haskell ==0.1.8 - securemem ==0.1.10 @@ -2178,7 +2178,7 @@ default-package-overrides: - unix-bytestring ==0.3.7.3 - unix-compat ==0.5.2 - unix-time ==0.4.7 - - unliftio ==0.2.12 + - unliftio ==0.2.12.1 - unliftio-core ==0.1.2.0 - unliftio-pool ==0.2.1.0 - unlit ==0.4.0.0 @@ -2239,7 +2239,7 @@ default-package-overrides: - wai-app-static ==3.1.7.1 - wai-conduit ==3.0.0.4 - wai-cors ==0.2.7 - - wai-enforce-https ==0.0.1 + - wai-enforce-https ==0.0.2 - wai-eventsource ==3.0.0 - wai-extra ==3.0.29.1 - wai-handler-launch ==3.0.3.1 @@ -2324,7 +2324,7 @@ default-package-overrides: - yesod-auth ==1.6.9 - yesod-auth-hashdb ==1.7.1.2 - yesod-bin ==1.6.0.4 - - yesod-core ==1.6.17.2 + - yesod-core ==1.6.17.3 - yesod-form ==1.6.7 - yesod-gitrev ==0.2.1 - yesod-newsfeed ==1.7.0.0 @@ -2344,7 +2344,7 @@ default-package-overrides: - zeromq4-haskell ==0.8.0 - zeromq4-patterns ==0.3.1.0 - zim-parser ==0.2.1.0 - - zip ==1.3.1 + - zip ==1.3.2 - zip-archive ==0.4.1 - zippers ==0.3 - zip-stream ==0.2.0.1 @@ -2847,6 +2847,7 @@ broken-packages: - arbor-monad-metric - arbor-monad-metric-datadog - arbtt + - archive-tar-bytestring - archiver - archlinux - archlinux-web @@ -2920,8 +2921,6 @@ broken-packages: - atomic-primops-vector - atomo - atp-haskell - - ats-format - - ats-pkg - ats-setup - ats-storable - attempt @@ -3179,6 +3178,8 @@ broken-packages: - bitcoin-rpc - bitcoin-script - bitcoin-tx + - bitcoind-regtest + - bitcoind-rpc - Bitly - bitly-cli - bitmaps @@ -3427,6 +3428,7 @@ broken-packages: - carte - cartel - Cartesian + - cas-store - casa-abbreviations-and-acronyms - casadi-bindings - casadi-bindings-control @@ -4383,8 +4385,6 @@ broken-packages: - edentv - edge - edges - - EdisonAPI - - EdisonCore - edit - edit-lenses - editable @@ -8156,7 +8156,6 @@ broken-packages: - persistent-map - persistent-migration - persistent-mongoDB - - persistent-mysql - persistent-mysql-haskell - persistent-protobuf - persistent-ratelimit @@ -8979,7 +8978,6 @@ broken-packages: - sajson - salak-toml - Salsa - - saltine - saltine-quickcheck - salvia - salvia-demo @@ -9377,7 +9375,6 @@ broken-packages: - smuggler - snake - snake-game - - snap - snap-accept - snap-auth-cli - snap-blaze-clay @@ -10962,5 +10959,3 @@ broken-packages: - ztar - zuramaru - Zwaluw - - zxcvbn-dvorak - - zxcvbn-hs diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d2d3c3436821..2caf04f479a1 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -3297,26 +3297,6 @@ self: { }: mkDerivation { pname = "Color"; - version = "0.1.3.1"; - sha256 = "0a4ljaqb1a8v622v99n37abas7xhzlmykbz5lm1q9xjs596qx357"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ base data-default-class deepseq vector ]; - testHaskellDepends = [ - base colour doctest hspec HUnit JuicyPixels massiv massiv-test - QuickCheck random template-haskell vector - ]; - benchmarkHaskellDepends = [ base colour criterion deepseq random ]; - description = "Color spaces and conversions between them"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Color_0_1_4" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, colour, criterion - , data-default-class, deepseq, doctest, hspec, HUnit, JuicyPixels - , massiv, massiv-test, QuickCheck, random, template-haskell, vector - }: - mkDerivation { - pname = "Color"; version = "0.1.4"; sha256 = "155h0zyl7gqpks4441ib4vjcdqpijmza0hx19lifg6kjvygpfj6d"; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -3328,7 +3308,6 @@ self: { benchmarkHaskellDepends = [ base colour criterion deepseq random ]; description = "Color spaces and conversions between them"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Combinatorrent" = callPackage @@ -5118,8 +5097,6 @@ self: { libraryHaskellDepends = [ base mtl ]; description = "A library of efficient, purely-functional data structures (API)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "EdisonCore" = callPackage @@ -5135,8 +5112,6 @@ self: { ]; description = "A library of efficient, purely-functional data structures (Core Implementations)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "EditTimeReport" = callPackage @@ -8891,8 +8866,8 @@ self: { ({ mkDerivation, base, bcm2835, bytestring }: mkDerivation { pname = "HPi"; - version = "0.6.0"; - sha256 = "1b0m6srghxbd3cjwffkajf1dnsw8nsgqyi4wiy7wsdsadqnv25z9"; + version = "0.7.0"; + sha256 = "094wdlnby4iqp5zvd3iimp3whn386w5h6x04izz5xxf43bzzbl2a"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ bcm2835 ]; description = "GPIO, I2C and SPI functions for the Raspberry Pi"; @@ -18442,6 +18417,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Spintax_0_3_4" = callPackage + ({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }: + mkDerivation { + pname = "Spintax"; + version = "0.3.4"; + sha256 = "008b83nnjgpzjr4c2dk1vambzb78dwx59c5cq4p0s8ghp6xl9sk3"; + libraryHaskellDepends = [ + attoparsec base extra mtl mwc-random text + ]; + description = "Random text generation based on spintax"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Spock" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, containers , cryptonite, focus, hashable, hspec, hspec-wai, http-types, hvect @@ -23553,8 +23542,8 @@ self: { }: mkDerivation { pname = "aeson-combinators"; - version = "0.0.1.1"; - sha256 = "0dcdmmpsjs7lkyznyvazxy977niysb58pwjidc2pkv26xdrkm2nk"; + version = "0.0.2.1"; + sha256 = "1a087940jpbnc2rc7cs4xj6kq1wv7b5ibhaimj7f6jglrn9xjgf0"; libraryHaskellDepends = [ aeson base bytestring containers fail scientific text time time-compat unordered-containers uuid-types vector void @@ -24120,8 +24109,8 @@ self: { pname = "aeson-schemas"; version = "1.0.3"; sha256 = "0fmhqibw6mw9shxh94riqq465njbgjsv539xb6sx7qpkhcck2csi"; - revision = "2"; - editedCabalFile = "0dydrwj8d7337c0qdxc7cxg8y2hb89ksli9692rvx7zfan41cpq7"; + revision = "3"; + editedCabalFile = "01vp89mjl7jl80mdl9hqmiz3vs7fjl5mf1p64d3g352xqak3mr7d"; libraryHaskellDepends = [ aeson base bytestring first-class-families megaparsec template-haskell text unordered-containers @@ -24283,8 +24272,8 @@ self: { }: mkDerivation { pname = "aeson-value-parser"; - version = "0.17"; - sha256 = "0xsvlwsql73g9lmd6izmgqfv8fvbbssmizkryaaphazym443hiw5"; + version = "0.18"; + sha256 = "1n288jb8ksjb6psgal4q6p7ad13sdak3llk54nc0gg5w2r20x634"; libraryHaskellDepends = [ aeson attoparsec base bytestring hashable mtl scientific text transformers unordered-containers vector @@ -31122,6 +31111,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "archive-tar-bytestring" = callPackage + ({ mkDerivation, base, bytestring, composition-prelude, cpphs + , tar-bytestring, text, unix + }: + mkDerivation { + pname = "archive-tar-bytestring"; + version = "0.1.0.0"; + sha256 = "0s1x4krnjdf1gq0f1krqdhxjkz4yanl5ayr0mdg6bcprlpzf3ib9"; + libraryHaskellDepends = [ + base bytestring composition-prelude tar-bytestring text unix + ]; + libraryToolDepends = [ cpphs ]; + description = "Common interface using the tar-bytestring package"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "archiver" = callPackage ({ mkDerivation, base, bytestring, containers, curl, HTTP, network , process, random @@ -31484,8 +31491,8 @@ self: { }: mkDerivation { pname = "arithmetic"; - version = "1.5"; - sha256 = "0angjp341sfij8lqns74k6pwazdc679bd19fxphqab91cj9p9s56"; + version = "1.6"; + sha256 = "1k448bgs99i5lg87jvbfy63p4h1n2g6ldb4a0vig5ym7q5yhjkdc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -33374,8 +33381,6 @@ self: { ]; description = "A source-code formatter for ATS"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ats-pkg" = callPackage @@ -33410,8 +33415,6 @@ self: { doHaddock = false; description = "A build tool for ATS"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ats-setup" = callPackage @@ -40700,6 +40703,49 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "bitcoind-regtest" = callPackage + ({ mkDerivation, base, bitcoind-rpc, cereal, containers + , haskoin-core, http-client, process, servant, servant-client + , tasty, tasty-hunit, temporary, text + }: + mkDerivation { + pname = "bitcoind-regtest"; + version = "0.1.0.0"; + sha256 = "078834ndl253d1s6f68a8cq1dc0hq3r3ic4a90wbr4msw9zn626q"; + libraryHaskellDepends = [ + base bitcoind-rpc cereal containers haskoin-core http-client + process servant servant-client temporary text + ]; + testHaskellDepends = [ + base bitcoind-rpc cereal haskoin-core http-client process servant + servant-client tasty tasty-hunit temporary text + ]; + description = "A library for working with bitcoin-core regtest networks"; + license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "bitcoind-rpc" = callPackage + ({ mkDerivation, aeson, base, bytestring, cereal, haskoin-core + , http-client, scientific, servant, servant-client + , servant-jsonrpc-client, text, time, transformers + }: + mkDerivation { + pname = "bitcoind-rpc"; + version = "0.1.0.0"; + sha256 = "1a3p49lzzsqd9m7ivisxksb6c7yc0dg5rps6ym85s4aasr1ln1j8"; + libraryHaskellDepends = [ + aeson base bytestring cereal haskoin-core http-client scientific + servant servant-client servant-jsonrpc-client text time + transformers + ]; + description = "A streamlined interface to bitcoin core using Haskoin types and Servant"; + license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "bitly-cli" = callPackage ({ mkDerivation, base, Bitly, directory, filepath, regexpr }: mkDerivation { @@ -44980,6 +45026,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bytelog" = callPackage + ({ mkDerivation, base, bytebuild, byteslice, natural-arithmetic + , posix-api, primitive + }: + mkDerivation { + pname = "bytelog"; + version = "0.1.0.0"; + sha256 = "03acvb13q3bs77qyxsf91b9l2wv6f23lrghqnh2dacsdrg75dpfa"; + libraryHaskellDepends = [ + base bytebuild byteslice natural-arithmetic posix-api primitive + ]; + description = "Fast logging"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "byteorder" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -45053,30 +45114,6 @@ self: { }: mkDerivation { pname = "bytesmith"; - version = "0.3.5.0"; - sha256 = "1axjb1p819cfpwrmilc8qakw7acipx47hdrilwj6ib0nn5agya8f"; - libraryHaskellDepends = [ - base byteslice bytestring contiguous primitive run-st text-short - wide-word - ]; - testHaskellDepends = [ - base byte-order byteslice primitive tasty tasty-hunit - tasty-quickcheck text-short wide-word - ]; - benchmarkHaskellDepends = [ - base byteslice bytestring gauge primitive - ]; - description = "Nonresumable byte parser"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bytesmith_0_3_6_0" = callPackage - ({ mkDerivation, base, byte-order, byteslice, bytestring - , contiguous, gauge, primitive, run-st, tasty, tasty-hunit - , tasty-quickcheck, text-short, wide-word - }: - mkDerivation { - pname = "bytesmith"; version = "0.3.6.0"; sha256 = "0idkkmmw5n8dv7hx236s1543n0k6gsj9s0yk6fggbaqydlsxn641"; libraryHaskellDepends = [ @@ -45092,7 +45129,6 @@ self: { ]; description = "Nonresumable byte parser"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytestring_0_10_10_0" = callPackage @@ -47280,8 +47316,8 @@ self: { }: mkDerivation { pname = "cachix"; - version = "0.3.6"; - sha256 = "14iz8ihzrcq075zk6cz8dmp2c9ygsfvi0ksa0969k8746hgwwxf9"; + version = "0.3.7"; + sha256 = "14rz8rncvnv8x9idfg69acck38bygnbnccdn7ghhz4ailiamf50b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -48407,6 +48443,68 @@ self: { broken = true; }) {}; + "cas-hashable" = callPackage + ({ mkDerivation, aeson, base, bytestring, clock, containers + , cryptonite, ghc-prim, hashable, integer-gmp, memory, path + , path-io, safe-exceptions, scientific, text, time, unix + , unordered-containers, vector + }: + mkDerivation { + pname = "cas-hashable"; + version = "1.0.1"; + sha256 = "13r3iiv882mq692yy24gy3kdfgg3lrk51909na5yx2hjlj47nyxd"; + libraryHaskellDepends = [ + aeson base bytestring clock containers cryptonite ghc-prim hashable + integer-gmp memory path path-io safe-exceptions scientific text + time unix unordered-containers vector + ]; + description = "A hashing class for content-addressed storage"; + license = stdenv.lib.licenses.mit; + }) {}; + + "cas-hashable-s3" = callPackage + ({ mkDerivation, aeson, aws, base, cas-hashable, constraints + , http-conduit, reflection, resourcet + }: + mkDerivation { + pname = "cas-hashable-s3"; + version = "1.0.0"; + sha256 = "07sap2kx6vqhyszdnmnvamaqkfpqn3711phj0ig961n7h8p433dz"; + libraryHaskellDepends = [ + aeson aws base cas-hashable constraints http-conduit reflection + resourcet + ]; + description = "ContentHashable instances for S3 objects"; + license = stdenv.lib.licenses.mit; + }) {}; + + "cas-store" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, cas-hashable + , containers, cryptonite, directory, filepath, hashable, hinotify + , hostname, lens, monad-control, path, path-io, random + , safe-exceptions, sqlite-simple, store, tar, tasty, tasty-hunit + , text, unix + }: + mkDerivation { + pname = "cas-store"; + version = "1.0.1"; + sha256 = "1ls0zsaf472ikpxddzr94cj7hbszlxm4jhdhl7syykypp867v2vi"; + libraryHaskellDepends = [ + aeson async base bytestring cas-hashable containers cryptonite + directory filepath hashable hinotify hostname lens monad-control + path path-io random safe-exceptions sqlite-simple store tar text + unix + ]; + testHaskellDepends = [ + async base cas-hashable containers path path-io safe-exceptions + tasty tasty-hunit unix + ]; + description = "A content-addressed storage"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "casa-abbreviations-and-acronyms" = callPackage ({ mkDerivation, base, bytestring, containers, fuzzy, lens , monoid-subclasses, optparse-applicative, these, wreq @@ -50194,8 +50292,8 @@ self: { }: mkDerivation { pname = "cgrep"; - version = "6.6.30"; - sha256 = "1ald0461mnd65g5czp3d8dzdvy8pmdxhzj35sghcnxi6qs18xp69"; + version = "6.6.32"; + sha256 = "0d1d81bkqd2wvcls5l1msli42cvcdrp0xy7i3s0yb10kfgd1y0qw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -50758,19 +50856,6 @@ self: { ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }: mkDerivation { pname = "checkers"; - version = "0.5.2"; - sha256 = "1mqfy6lrivc36kxbfr9zyp70pyq3k2xrmavkadznh999d54x11kq"; - libraryHaskellDepends = [ - array base QuickCheck random semigroupoids - ]; - description = "Check properties on standard classes and data structures"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "checkers_0_5_4" = callPackage - ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }: - mkDerivation { - pname = "checkers"; version = "0.5.4"; sha256 = "09g1430hjqxy01w0rgp0d03z2y8nw2zjyvfxs0kl9j0gyv57a10v"; libraryHaskellDepends = [ @@ -50778,7 +50863,6 @@ self: { ]; description = "Check properties on standard classes and data structures"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "checkmate" = callPackage @@ -57222,6 +57306,18 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "concurrent-resource-map" = callPackage + ({ mkDerivation, base, containers, random, stm }: + mkDerivation { + pname = "concurrent-resource-map"; + version = "0.1.0.0"; + sha256 = "05zgjb2plrk35fiyskk07jfiydi4mlk6awbfjvhnsa3qi11pxdly"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base random stm ]; + description = "Concurrent resource map"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "concurrent-rpc" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -58042,12 +58138,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "conferer_0_3_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , hspec, text + }: + mkDerivation { + pname = "conferer"; + version = "0.3.0.0"; + sha256 = "0irbi1b5fwxcm68a8dbh6qhl2sin998qv8pazw574a3s4z38slv5"; + libraryHaskellDepends = [ + base bytestring containers directory text + ]; + testHaskellDepends = [ + base bytestring containers deepseq directory hspec text + ]; + description = "Configuration management library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conferer-hedis" = callPackage ({ mkDerivation, base, conferer, hedis, hspec, text }: mkDerivation { pname = "conferer-hedis"; - version = "0.2.0.0"; - sha256 = "0h09lzjg8lhhql6zmr0c7mz8rlaskvkadmcl1xwj76cm1kg3hlwx"; + version = "0.3.0.0"; + sha256 = "1d5y15xlsmvj5vbfyp5hmx3zjrwyz58q08aq3w90ia4pi206sq1l"; libraryHaskellDepends = [ base conferer hedis text ]; testHaskellDepends = [ base conferer hedis hspec text ]; description = "conferer's FromConfig instances for hedis settings"; @@ -58066,14 +58181,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "conferer-hspec_0_3_0_0" = callPackage + ({ mkDerivation, base, conferer, hspec, hspec-core, text }: + mkDerivation { + pname = "conferer-hspec"; + version = "0.3.0.0"; + sha256 = "0vgg0fadcd3xkjrjrvvwl6ybxp6sccr82rjdxswrr0x38c5q42xz"; + libraryHaskellDepends = [ base conferer hspec-core text ]; + testHaskellDepends = [ base conferer hspec hspec-core text ]; + description = "conferer's FromConfig instances for hspec Config"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conferer-provider-dhall" = callPackage ({ mkDerivation, base, bytestring, conferer, conferer-provider-json , dhall, dhall-json, directory, hspec, text }: mkDerivation { pname = "conferer-provider-dhall"; - version = "0.2.0.0"; - sha256 = "0d0zwx4cqihvv09i45b6c7vhbxp9iiagqx417ikmhan9pki6ykq5"; + version = "0.3.0.0"; + sha256 = "0gdfc1np6p80sb2ddz2jzhqqzzw7jz0rkbhrvyd9k5bp7ivzhfk3"; libraryHaskellDepends = [ base bytestring conferer conferer-provider-json dhall dhall-json directory text @@ -58106,14 +58234,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "conferer-provider-json_0_3_0_0" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, bytestring, conferer + , directory, hspec, text, unordered-containers, vector + }: + mkDerivation { + pname = "conferer-provider-json"; + version = "0.3.0.0"; + sha256 = "0jrq1cpfhlyq9dvnf4kmx3wqjwz7x18g0hwbg4gkv12spjffpnc9"; + libraryHaskellDepends = [ + aeson base bytestring conferer directory text unordered-containers + vector + ]; + testHaskellDepends = [ + aeson aeson-qq base bytestring conferer directory hspec text + unordered-containers vector + ]; + description = "conferer's provider for reading json files"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conferer-provider-yaml" = callPackage ({ mkDerivation, base, conferer, conferer-provider-json, hspec , yaml }: mkDerivation { pname = "conferer-provider-yaml"; - version = "0.2.0.0"; - sha256 = "19h18374jkcbhj90f0sbz5fq9h35b4pi6wx0hf4h2n46k0gffq12"; + version = "0.3.0.0"; + sha256 = "0w1niybl4qa3yv5yzyvybs3v1h0a0ay051cvcpzimwx7kg6vqjv6"; libraryHaskellDepends = [ base conferer conferer-provider-json yaml ]; @@ -58130,8 +58279,8 @@ self: { }: mkDerivation { pname = "conferer-snap"; - version = "0.2.0.0"; - sha256 = "0kvg31i2ffs9ppky8kqszqpq5xaf01zy7k09ifsywmnm96cri9g4"; + version = "0.3.0.0"; + sha256 = "19kw9g0f7znc7as6nhjvnx5kypd71ygr5ialhk4pfjva3bp121ij"; libraryHaskellDepends = [ base conferer snap-core snap-server text ]; @@ -58157,6 +58306,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "conferer-warp_0_3_0_0" = callPackage + ({ mkDerivation, base, conferer, hspec, http-types, text, wai, warp + }: + mkDerivation { + pname = "conferer-warp"; + version = "0.3.0.0"; + sha256 = "19rld3xl4mfzl08wyciwh9amfcadnbn0rgjxvdy2s0vgk3nj7677"; + libraryHaskellDepends = [ base conferer http-types text wai warp ]; + testHaskellDepends = [ + base conferer hspec http-types text wai warp + ]; + description = "conferer's FromConfig instances for warp settings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "confetti" = callPackage ({ mkDerivation, base, cmdargs, directory, filepath, MissingH , tasty, tasty-hunit, tasty-smallcheck, text, time, unix, yaml @@ -58477,16 +58642,16 @@ self: { }) {}; "configurator-pg" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers, filepath - , HUnit, protolude, scientific, test-framework + ({ mkDerivation, base, bytestring, containers, filepath, HUnit + , megaparsec, protolude, scientific, test-framework , test-framework-hunit, text }: mkDerivation { pname = "configurator-pg"; - version = "0.1.0.3"; - sha256 = "0fc77ihnablff8v0kgr88pcc3rn41ca14bvfxr21jx807fn8g63p"; + version = "0.2.1"; + sha256 = "0hlzh1608gcz86sh0wg1qgfz2v805hdjwga9sib1hb5cpmfc9c4j"; libraryHaskellDepends = [ - attoparsec base containers protolude scientific text + base containers megaparsec protolude scientific text ]; testHaskellDepends = [ base bytestring filepath HUnit protolude test-framework @@ -59053,8 +59218,8 @@ self: { }: mkDerivation { pname = "construct"; - version = "0.2"; - sha256 = "18ww9yij81js122gkp03kajkakqvkn370lcz03kfcmmc5inw0vzj"; + version = "0.2.0.1"; + sha256 = "1j2xc1j9f71shins5nnj0xg41k4vx2r1jgimnnlcdln2g24v71l2"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ @@ -66981,8 +67146,8 @@ self: { }: mkDerivation { pname = "dbus"; - version = "1.2.11"; - sha256 = "150agli4ialryxcv6nd3y90pi5ikls8bn9my3fp2j5fwir27abns"; + version = "1.2.12"; + sha256 = "19gc1cmz8g5fmqks5rj5fwg9ihd5ras180jdv2wfgilrlrjxvx84"; libraryHaskellDepends = [ base bytestring cereal conduit containers deepseq exceptions filepath lens network parsec random split template-haskell text @@ -69619,6 +69784,8 @@ self: { pname = "dhall-json"; version = "1.6.2"; sha256 = "044hq25h872rjlcp24fzf0nslxg4a6hmq8ylcljzk003lmq0c2xz"; + revision = "1"; + editedCabalFile = "0zljipb4nq0xmdfhqq7vr9c3966mpkd812g4z6xz7ngzrqn41s40"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73303,20 +73470,22 @@ self: { }) {}; "dobutokO2" = callPackage - ({ mkDerivation, base, directory, mmsyn3, mmsyn7s, mmsyn7ukr - , process, vector + ({ mkDerivation, base, directory, mmsyn2, mmsyn3, mmsyn6ukr + , mmsyn7s, mmsyn7ukr, process, vector }: mkDerivation { pname = "dobutokO2"; - version = "0.3.1.1"; - sha256 = "1fkyk57ckif0yk2fc1gjvla44bj2y9r5k1zms03ld001vpmkwbir"; + version = "0.8.2.0"; + sha256 = "1czji489jj0f18shcx4likz8l46zwvq9vabrn1wv1lyh19nnk1k8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base directory mmsyn3 mmsyn7s mmsyn7ukr process vector + base directory mmsyn2 mmsyn3 mmsyn6ukr mmsyn7s mmsyn7ukr process + vector ]; executableHaskellDepends = [ - base directory mmsyn3 mmsyn7s mmsyn7ukr process vector + base directory mmsyn2 mmsyn3 mmsyn6ukr mmsyn7s mmsyn7ukr process + vector ]; description = "A program and a library to create experimental music from a mono audio and a Ukrainian text"; license = stdenv.lib.licenses.mit; @@ -76998,6 +77167,8 @@ self: { pname = "egison-pattern-src-th-mode"; version = "0.2.1.0"; sha256 = "0libfs39irdnqfvynmpji21p6nyk2s3zsxhlmsz763aya51ymxpy"; + revision = "1"; + editedCabalFile = "13k65z8jai64087ns3b99wznv0ain3z3bailk8fdpnsjf4s2a4qg"; libraryHaskellDepends = [ base egison-pattern-src haskell-src-exts haskell-src-meta mtl pretty template-haskell text @@ -82537,28 +82708,30 @@ self: { "extra" = callPackage ({ mkDerivation, base, clock, directory, filepath, process - , QuickCheck, semigroups, time, unix + , QuickCheck, quickcheck-instances, semigroups, time, unix }: mkDerivation { pname = "extra"; - version = "1.6.20"; - sha256 = "0bx0km3sc3irgpvz1ky334pr1fr88y2mkkniadzpn2pcrb9lxshr"; + version = "1.6.21"; + sha256 = "1gjx98w4w61g043k6rzc8i34cbxpcigi8lb6i7pp1vwp8w8jm5vl"; libraryHaskellDepends = [ base clock directory filepath process semigroups time unix ]; - testHaskellDepends = [ base directory filepath QuickCheck unix ]; + testHaskellDepends = [ + base directory filepath QuickCheck quickcheck-instances unix + ]; description = "Extra functions I use"; license = stdenv.lib.licenses.bsd3; }) {}; - "extra_1_7" = callPackage + "extra_1_7_1" = callPackage ({ mkDerivation, base, clock, directory, filepath, process , QuickCheck, quickcheck-instances, semigroups, time, unix }: mkDerivation { pname = "extra"; - version = "1.7"; - sha256 = "1mfhgbvyvrj0z9vpbcgm5dlrys51gd8fh2qwwihxixbw12vmqd86"; + version = "1.7.1"; + sha256 = "0zshxv9dnd8vksncmb8dj4wvq2wdybzwxyhmy2zp6a81icm4azx4"; libraryHaskellDepends = [ base clock directory filepath process semigroups time unix ]; @@ -82739,6 +82912,21 @@ self: { broken = true; }) {}; + "factor" = callPackage + ({ mkDerivation, arithmetic, base, opentheory-primitive, random }: + mkDerivation { + pname = "factor"; + version = "1.0"; + sha256 = "02fy4lnajdj0dqkz3bfpj6qzk34kjmjz6c0vidwc7kqqivhxldvh"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + arithmetic base opentheory-primitive random + ]; + description = "Factoring integers"; + license = stdenv.lib.licenses.mit; + }) {}; + "factory" = callPackage ({ mkDerivation, array, base, Cabal, containers, data-default , deepseq, parallel, primes, QuickCheck, random, toolshed @@ -83594,8 +83782,8 @@ self: { }: mkDerivation { pname = "fay"; - version = "0.24.0.4"; - sha256 = "1jpqc48a7h9x64wv77g7bdnhvfjgbabp4n3qcbqsfz9v92j46j0a"; + version = "0.24.0.5"; + sha256 = "05wm3zp41xgx0s9p0wmy9rqk9ii6wcxsr3jrcqqrnlpbp90dwfxx"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -83804,6 +83992,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fb_2_1_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit + , conduit-extra, containers, cryptonite, data-default, hspec + , http-client, http-conduit, http-types, HUnit, memory + , monad-logger, QuickCheck, resourcet, text, time, transformers + , transformers-base, unliftio, unliftio-core, unordered-containers + }: + mkDerivation { + pname = "fb"; + version = "2.1.0"; + sha256 = "18h16dkyh35q0wyjvri7z2q2j8rx4bb6ma2bf6h2cdm7jh6zdakq"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring conduit conduit-extra cryptonite + data-default http-client http-conduit http-types memory + monad-logger resourcet text time transformers transformers-base + unliftio unliftio-core unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring conduit containers data-default hspec + http-conduit HUnit QuickCheck resourcet text time transformers + unliftio + ]; + description = "Bindings to Facebook's API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fb-persistent" = callPackage ({ mkDerivation, base, cereal, fb, persistent, text, time }: mkDerivation { @@ -85910,6 +86125,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "first-class-families_0_8_0_0" = callPackage + ({ mkDerivation, base, doctest, Glob }: + mkDerivation { + pname = "first-class-families"; + version = "0.8.0.0"; + sha256 = "190jl3vs7glkbm8ap90x9yzlj01yzxd818s3i0w4pz21b6d6sxav"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest Glob ]; + description = "First class type families"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "first-class-instances" = callPackage ({ mkDerivation, base, Cabal, containers, hspec, hspec-discover , template-haskell @@ -90895,37 +91123,37 @@ self: { }) {}; "funflow" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, clock, constraints - , containers, contravariant, cryptonite, data-default, directory - , exceptions, filepath, ghc-prim, Glob, hashable, hedis, hinotify - , hostname, integer-gmp, katip, lens, lifted-async, memory - , monad-control, mtl, network, optparse-applicative, path, path-io - , pretty, process, random, safe-exceptions, scientific - , sqlite-simple, stm, store, tar, tasty, tasty-hunit - , template-haskell, temporary, text, time, transformers, unix - , unordered-containers, vector, yaml + ({ mkDerivation, aeson, async, base, bytestring, cas-hashable + , cas-store, clock, constraints, containers, contravariant + , cryptonite, data-default, directory, exceptions, filepath + , ghc-prim, Glob, hashable, hedis, hostname, integer-gmp, katip + , lens, lifted-async, memory, monad-control, mtl, network + , optparse-applicative, path, path-io, pretty, process, profunctors + , random, safe-exceptions, scientific, sqlite-simple, stm, store + , tar, tasty, tasty-hunit, template-haskell, temporary, text, time + , transformers, unix, unordered-containers, vector, yaml }: mkDerivation { pname = "funflow"; - version = "1.5.0"; - sha256 = "0mvv78jjiq3bglqpynl90155mwm7k8m7qv127cxi31n0xmzpw4ky"; + version = "1.6.0"; + sha256 = "0cwy4wiy5vr6wix5fjiw6dmy4nxyv9bbnj5w2wkhs8rdb0c34zim"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson async base bytestring clock constraints containers - contravariant cryptonite data-default directory exceptions filepath - ghc-prim Glob hashable hedis hinotify hostname integer-gmp katip - lens lifted-async memory monad-control mtl path path-io pretty - process random safe-exceptions scientific sqlite-simple stm store - tar template-haskell text time transformers unix - unordered-containers vector yaml + aeson async base bytestring cas-hashable cas-store clock + constraints containers contravariant cryptonite data-default + directory exceptions filepath ghc-prim Glob hashable hedis hostname + integer-gmp katip lens lifted-async memory monad-control mtl path + path-io pretty process profunctors random safe-exceptions + scientific sqlite-simple stm store tar template-haskell text time + transformers unix unordered-containers vector yaml ]; executableHaskellDepends = [ - base bytestring clock hedis network optparse-applicative path - safe-exceptions text unix + base bytestring cas-store clock hedis network optparse-applicative + path safe-exceptions text unix ]; testHaskellDepends = [ - async base containers data-default directory filepath hedis path + async base cas-store data-default directory filepath hedis path path-io process random safe-exceptions tasty tasty-hunit temporary text unix ]; @@ -91066,26 +91294,6 @@ self: { }: mkDerivation { pname = "fused-effects"; - version = "1.0.0.1"; - sha256 = "1v11m8i4ffadfiy3bxwgjcrx5z5gzxv4ciniqzv01b0jxajfkg9g"; - libraryHaskellDepends = [ base transformers ]; - testHaskellDepends = [ - base containers hedgehog hedgehog-fn inspection-testing mtl tasty - tasty-hedgehog tasty-hunit transformers - ]; - testToolDepends = [ markdown-unlit ]; - benchmarkHaskellDepends = [ base gauge ]; - description = "A fast, flexible, fused effect system"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fused-effects_1_0_2_0" = callPackage - ({ mkDerivation, base, containers, gauge, hedgehog, hedgehog-fn - , inspection-testing, markdown-unlit, mtl, tasty, tasty-hedgehog - , tasty-hunit, transformers - }: - mkDerivation { - pname = "fused-effects"; version = "1.0.2.0"; sha256 = "0dy8m54fm3gndj0bda0savl80w7drj8h113bhbi2439wl3x02y6x"; libraryHaskellDepends = [ base transformers ]; @@ -91097,7 +91305,6 @@ self: { benchmarkHaskellDepends = [ base gauge ]; description = "A fast, flexible, fused effect system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fused-effects-exceptions" = callPackage @@ -91351,8 +91558,8 @@ self: { ({ mkDerivation, base, hourglass, hspec, lens, parsec }: mkDerivation { pname = "fuzzy-dates"; - version = "0.1.1.1"; - sha256 = "1hanmwzr1g11am4z3r9wrkzfycvk76a03cg9bqpifidv7y9hcd73"; + version = "0.1.1.2"; + sha256 = "12ga6d4kp6mk6cg781ibaxxmpq7kfh8i4yg8r4awiwp1ic8lrcd9"; libraryHaskellDepends = [ base hourglass hspec lens parsec ]; testHaskellDepends = [ base hourglass hspec lens parsec ]; description = "Libary for parsing dates in strings in varied formats"; @@ -94771,6 +94978,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-lib-parser-ex_8_8_5_5" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, extra + , filepath, ghc, ghc-boot, ghc-boot-th, tasty, tasty-hunit + , uniplate + }: + mkDerivation { + pname = "ghc-lib-parser-ex"; + version = "8.8.5.5"; + sha256 = "15rp1829zzppz3y014cac1ssmklssn5hsfvadqrzkzmnky2yr215"; + libraryHaskellDepends = [ + base bytestring containers extra ghc ghc-boot ghc-boot-th uniplate + ]; + testHaskellDepends = [ + base directory extra filepath ghc ghc-boot-th tasty tasty-hunit + ]; + description = "Algorithms on GHC parse trees"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-make" = callPackage ({ mkDerivation, base, process, shake, unordered-containers }: mkDerivation { @@ -95191,14 +95418,19 @@ self: { "ghc-tags-plugin" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers - , directory, ghc, gitrev + , directory, filepath, ghc, lattices, QuickCheck + , quickcheck-instances, tasty, tasty-golden, tasty-quickcheck, text }: mkDerivation { pname = "ghc-tags-plugin"; - version = "0.1.1.0"; - sha256 = "1bwv5sda0lihc0f0blxgs4j730kd31p9djk8wxyf8qiqdlsp2afa"; + version = "0.1.4.0"; + sha256 = "0ci82krwqiprh23p316n1k09z6ja962xscnx9ycqpsyywbgkcqk4"; libraryHaskellDepends = [ - attoparsec base bytestring containers directory ghc gitrev + attoparsec base bytestring containers directory filepath ghc text + ]; + testHaskellDepends = [ + attoparsec base bytestring lattices QuickCheck quickcheck-instances + tasty tasty-golden tasty-quickcheck text ]; doHaddock = false; description = "A compiler plugin which generates tags file from GHC syntax tree"; @@ -95283,6 +95515,30 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "ghc-typelits-extra_0_4" = callPackage + ({ mkDerivation, base, containers, ghc, ghc-prim + , ghc-tcplugins-extra, ghc-typelits-knownnat + , ghc-typelits-natnormalise, integer-gmp, tasty, tasty-hunit + , transformers + }: + mkDerivation { + pname = "ghc-typelits-extra"; + version = "0.4"; + sha256 = "0511vpwn8hz1hvn58g49l95iqcgqr8l8bqy5qwijy2bzad2nhcbg"; + libraryHaskellDepends = [ + base containers ghc ghc-prim ghc-tcplugins-extra + ghc-typelits-knownnat ghc-typelits-natnormalise integer-gmp + transformers + ]; + testHaskellDepends = [ + base ghc-typelits-knownnat ghc-typelits-natnormalise tasty + tasty-hunit + ]; + description = "Additional type-level operations on GHC.TypeLits.Nat"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-typelits-knownnat" = callPackage ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck @@ -95321,6 +95577,25 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "ghc-typelits-natnormalise_0_7_2" = callPackage + ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra + , integer-gmp, syb, tasty, tasty-hunit, template-haskell + , transformers + }: + mkDerivation { + pname = "ghc-typelits-natnormalise"; + version = "0.7.2"; + sha256 = "1hk2f2vqkpia7kv7pqwf942y1w9m7mvmikzabkrjp8f8gijcsk52"; + libraryHaskellDepends = [ + base containers ghc ghc-tcplugins-extra integer-gmp syb + transformers + ]; + testHaskellDepends = [ base tasty tasty-hunit template-haskell ]; + description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-typelits-presburger" = callPackage ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra, mtl , pretty, reflection, syb, transformers @@ -95581,6 +95856,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghcid_0_8_3" = callPackage + ({ mkDerivation, ansi-terminal, base, cmdargs, containers + , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit + , terminal-size, time, unix + }: + mkDerivation { + pname = "ghcid"; + version = "0.8.3"; + sha256 = "1b8a8mx6z2ridw79gijjv90b2jgk0qrncvg0sjbmvyyyajx1h5f7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base cmdargs directory extra filepath process time + ]; + executableHaskellDepends = [ + ansi-terminal base cmdargs containers directory extra filepath + fsnotify process terminal-size time unix + ]; + testHaskellDepends = [ + ansi-terminal base cmdargs containers directory extra filepath + fsnotify process tasty tasty-hunit terminal-size time unix + ]; + description = "GHCi based bare bones IDE"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghcide" = callPackage ({ mkDerivation, aeson, async, base, binary, bytestring, containers , data-default, deepseq, directory, extra, filepath, fuzzy, ghc @@ -97277,8 +97579,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "8.20200226"; - sha256 = "09v80ni1w9z1im79lzrnpz7xlivwna44zqpwq4axwyd17cffqi9m"; + version = "8.20200309"; + sha256 = "1yjb01jh5rccqg44nqh4iyxmbpkcpm6m82lnw7s0s2vizj8891p5"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -97912,29 +98214,6 @@ self: { }: mkDerivation { pname = "github-rest"; - version = "1.0.1"; - sha256 = "0dv959xmfpwbkjnjkisgxldkb89ln0wypz4cb65biijqfw0i4399"; - libraryHaskellDepends = [ - aeson base bytestring http-client http-client-tls http-types jwt - mtl scientific text time transformers unliftio unliftio-core - ]; - testHaskellDepends = [ - aeson aeson-qq base bytestring http-client http-client-tls - http-types jwt mtl scientific tasty tasty-golden tasty-hunit - tasty-quickcheck text time transformers unliftio unliftio-core - ]; - description = "Query the GitHub REST API programmatically"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "github-rest_1_0_2" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, bytestring, http-client - , http-client-tls, http-types, jwt, mtl, scientific, tasty - , tasty-golden, tasty-hunit, tasty-quickcheck, text, time - , transformers, unliftio, unliftio-core - }: - mkDerivation { - pname = "github-rest"; version = "1.0.2"; sha256 = "0q4dxr0080pkszq9vv3j2wx89yhy15jjbk5m7wd1mwirgwxv214m"; libraryHaskellDepends = [ @@ -97948,7 +98227,6 @@ self: { ]; description = "Query the GitHub REST API programmatically"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "github-tools" = callPackage @@ -98172,22 +98450,6 @@ self: { }: mkDerivation { pname = "gitlab-haskell"; - version = "0.1.5"; - sha256 = "01wll1aik3x9bj5z29h12srj7skyqk6v1g4rvrd86zd9zvxqr6cw"; - libraryHaskellDepends = [ - aeson base bytestring connection http-conduit http-types text time - transformers unliftio unliftio-core - ]; - description = "A Haskell library for the GitLab web API"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "gitlab-haskell_0_1_7" = callPackage - ({ mkDerivation, aeson, base, bytestring, connection, http-conduit - , http-types, text, time, transformers, unliftio, unliftio-core - }: - mkDerivation { - pname = "gitlab-haskell"; version = "0.1.7"; sha256 = "1l7z7sqnipkbf4355zzmjrj9ig8bb9jysyj5r7rgqk8pr1znj524"; libraryHaskellDepends = [ @@ -98196,7 +98458,6 @@ self: { ]; description = "A Haskell library for the GitLab web API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gitlib" = callPackage @@ -98848,6 +99109,8 @@ self: { pname = "glirc"; version = "2.35"; sha256 = "093cqbvqijjy6xd0fzas13ldrsf9kg59jak88qzl5kks7z9djl0f"; + revision = "1"; + editedCabalFile = "14kgfgqyfw5vcm77n5iljxw5n28iclc1hpvi44x4vhrnmfpmq62v"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -107743,10 +108006,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.13.1.0"; - sha256 = "14l85n69zsczyw2fs8kjnnmkl4gk85xj3f4alfa7604nnmic9mvn"; - revision = "1"; - editedCabalFile = "0vbs0y4niirmwcc2r59pbzl33s4qzpdlslvigyb6adf6r79di1r9"; + version = "4.13.2.0"; + sha256 = "0g52lip9i6zanjja0v86v5sypjvnfpfwzzddrpj04pml733nsnfj"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -117398,6 +117659,8 @@ self: { pname = "hedn"; version = "0.3.0.0"; sha256 = "1gx8bw2l1qpb4jgh5d1zzgfm2rnwavg5shmp4wq2mqrih11r3f3y"; + revision = "1"; + editedCabalFile = "1bpd4dd8afccj2bakqqbimmd3ja9i21q9k98vmzw37ishbd3xync"; libraryHaskellDepends = [ base containers deepseq deriving-compat megaparsec parser-combinators prettyprinter scientific template-haskell text @@ -119697,6 +119960,8 @@ self: { pname = "hie-bios"; version = "0.4.0"; sha256 = "1pa8wjj6sml39371f355z46304jzzwpcr62q0qzrpqq8w9017241"; + revision = "1"; + editedCabalFile = "12m0hy4lirnr02h0nh2a85cfm8jv7jgqh24fdn29jkc28gpspm72"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121484,8 +121749,8 @@ self: { }: mkDerivation { pname = "hledger-flow"; - version = "0.13.1.0"; - sha256 = "1ixfsndl2has2pmq5vrf59z96j0pqaa8y8wk61rzjdh9cn62i3jj"; + version = "0.13.2.0"; + sha256 = "1zajlqbayr6vm45y3901xwgg6acjn8fwx73mm9bnbsbxfzxn4g7d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121922,8 +122187,8 @@ self: { }: mkDerivation { pname = "hlrdb-core"; - version = "0.1.5.0"; - sha256 = "0aznzrwv021nppb5cxbpnr7hiajny4s40diz6kcmddsbml56xmk9"; + version = "0.1.6.0"; + sha256 = "13hb0657y5cqhbl2m27v28b6zl9mgcq17r983rds3l3bccn67ayv"; libraryHaskellDepends = [ base bytestring hashable hedis lens mtl profunctors random time unordered-containers @@ -122750,18 +123015,19 @@ self: { ({ mkDerivation, base, base16-bytestring, base64-bytestring, binary , bytestring, containers, cryptohash-md5, cryptohash-sha1 , cryptohash-sha256, directory, filepath, hashable, mtl, process - , regex-base, regex-tdfa-text, tasty, tasty-discover, tasty-hspec - , tasty-hunit, tasty-quickcheck, temporary, text, unix - , unordered-containers, vector + , regex-base, regex-tdfa, saltine, tasty, tasty-discover + , tasty-hspec, tasty-hunit, tasty-quickcheck, temporary, text, time + , unix, unordered-containers, vector }: mkDerivation { pname = "hnix-store-core"; - version = "0.1.0.0"; - sha256 = "1xrx3ly6qsh3j6naqxdv9v759fbmksd2yfdgnzppcnskrcfrm347"; + version = "0.2.0.0"; + sha256 = "1gy808dzaq2jjy1xdhf3vjxzprlzn9mmbxc554sa03v8f9hc0r7h"; libraryHaskellDepends = [ base base16-bytestring binary bytestring containers cryptohash-md5 cryptohash-sha1 cryptohash-sha256 directory filepath hashable mtl - regex-base regex-tdfa-text text unix unordered-containers vector + regex-base regex-tdfa saltine text time unix unordered-containers + vector ]; testHaskellDepends = [ base base64-bytestring binary bytestring containers directory @@ -123328,6 +123594,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "holmes" = callPackage + ({ mkDerivation, base, containers, hashable, hedgehog, hspec + , logict, markdown-unlit, mtl, primitive, relude, split, tasty + , tasty-discover, tasty-hedgehog, tasty-hspec, transformers + , unordered-containers + }: + mkDerivation { + pname = "holmes"; + version = "0.2.0.0"; + sha256 = "13x48fvjfvh65c9cz3b81hk7ka43i0zz7gih7v3jpjwq0s7hqic8"; + libraryHaskellDepends = [ + base containers hashable hedgehog logict mtl primitive transformers + unordered-containers + ]; + testHaskellDepends = [ + base containers hashable hedgehog hspec primitive relude split + tasty tasty-discover tasty-hedgehog tasty-hspec transformers + unordered-containers + ]; + testToolDepends = [ markdown-unlit tasty-discover ]; + description = "Tools and combinators for solving constraint problems"; + license = stdenv.lib.licenses.mit; + }) {}; + "holy-project" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal , directory, filepath, hastache, http-conduit, HUnit, lens @@ -129223,8 +129513,8 @@ self: { }: mkDerivation { pname = "hspec-snap"; - version = "1.0.1.0"; - sha256 = "0r7isf3vi8mc6h50s6n8cbmvbdmklk3v8d7wwb1ikzjl4izhimkn"; + version = "1.0.2.0"; + sha256 = "1rqqyrnny5wk4xql1ddavq72qcvdhblm7ga8728i42v14n6z80i4"; libraryHaskellDepends = [ aeson base bytestring containers digestive-functors HandsomeSoup hspec hspec-core HUnit hxt lens mtl snap snap-core text @@ -130257,15 +130547,15 @@ self: { }) {}; "hsyslog-udp" = callPackage - ({ mkDerivation, base, bytestring, hspec, hsyslog, network, text - , time, unix + ({ mkDerivation, base, bytestring, hspec, hsyslog, network + , network-bsd, text, time, unix }: mkDerivation { pname = "hsyslog-udp"; - version = "0.2.4"; - sha256 = "1xahxchr1il9naf8kdwdbh1sy5vv4afqkcxfy4993nsk5j7zs586"; + version = "0.2.5"; + sha256 = "02n2l9fl926di21w01qhqn3f39hnm6nqc7kn0af1f89qncpbxl5d"; libraryHaskellDepends = [ - base bytestring hsyslog network text time unix + base bytestring hsyslog network network-bsd text time unix ]; testHaskellDepends = [ base hspec time ]; description = "Log to syslog over a network via UDP"; @@ -131010,6 +131300,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "http-client_0_6_4_1" = callPackage + ({ mkDerivation, array, async, base, blaze-builder, bytestring + , case-insensitive, containers, cookie, deepseq, directory + , exceptions, filepath, ghc-prim, hspec, http-types, memory + , mime-types, monad-control, network, network-uri, random, stm + , streaming-commons, text, time, transformers, zlib + }: + mkDerivation { + pname = "http-client"; + version = "0.6.4.1"; + sha256 = "1y12xfh6xvsfvyapbssmgrpjz025rmyccprbnmzhs0y1cmlz6hjp"; + libraryHaskellDepends = [ + array base blaze-builder bytestring case-insensitive containers + cookie deepseq exceptions filepath ghc-prim http-types memory + mime-types network network-uri random stm streaming-commons text + time transformers + ]; + testHaskellDepends = [ + async base blaze-builder bytestring case-insensitive containers + deepseq directory hspec http-types monad-control network + network-uri streaming-commons text time transformers zlib + ]; + doCheck = false; + description = "An HTTP client engine"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-client-auth" = callPackage ({ mkDerivation, base, base64-string, blaze-builder, bytestring , case-insensitive, conduit, crypto-conduit, http-client @@ -131387,6 +131705,26 @@ self: { broken = true; }) {}; + "http-directory_0_1_8" = callPackage + ({ mkDerivation, base, bytestring, hspec, html-conduit, http-client + , http-client-tls, http-date, http-types, network-uri, text, time + , xml-conduit + }: + mkDerivation { + pname = "http-directory"; + version = "0.1.8"; + sha256 = "0sav7z5vdda6zq1xyhvrqwh3kdn1bnpmwlhiaxr3sb1npz3hjgcn"; + libraryHaskellDepends = [ + base bytestring html-conduit http-client http-client-tls http-date + http-types network-uri text time xml-conduit + ]; + testHaskellDepends = [ base hspec text ]; + description = "http directory listing library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "http-dispatch" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , case-insensitive, hspec, http-client, http-client-tls, http-types @@ -133012,8 +133350,8 @@ self: { }: mkDerivation { pname = "hw-balancedparens"; - version = "0.3.0.4"; - sha256 = "1f25czr55c8fsb1l2ljfr93x2fp888g78ngf45xampnr6m3468j3"; + version = "0.3.0.5"; + sha256 = "0mc1qxng09891rpdw8g6cbx61b7pvvd7v4jm3ngzi5byamm0sbxp"; libraryHaskellDepends = [ base deepseq hedgehog hspec hw-bits hw-excess hw-fingertree hw-prim hw-rankselect-base vector @@ -133033,36 +133371,36 @@ self: { "hw-bits" = callPackage ({ mkDerivation, base, bitvec, bytestring, criterion, deepseq - , hedgehog, hspec, hspec-discover, hw-hspec-hedgehog, hw-int - , hw-prim, hw-string-parse, vector + , doctest, doctest-discover, hedgehog, hspec, hspec-discover + , hw-hspec-hedgehog, hw-int, hw-prim, hw-string-parse, vector }: mkDerivation { pname = "hw-bits"; - version = "0.7.1.0"; - sha256 = "0r4jinz2h5zkjap6f6qrjgfq6xhaz3j34fjwawv8qvgc4qgq7bil"; + version = "0.7.1.2"; + sha256 = "1jgj5j09ddiv6yf605m1azaknbfawqhfqc2m3xpr800v43myr3m8"; libraryHaskellDepends = [ base bitvec bytestring deepseq hw-int hw-prim hw-string-parse vector ]; testHaskellDepends = [ - base bitvec bytestring hedgehog hspec hw-hspec-hedgehog hw-prim - vector + base bitvec bytestring doctest doctest-discover hedgehog hspec + hw-hspec-hedgehog hw-prim vector ]; - testToolDepends = [ hspec-discover ]; + testToolDepends = [ doctest-discover hspec-discover ]; benchmarkHaskellDepends = [ base criterion vector ]; description = "Bit manipulation"; license = stdenv.lib.licenses.bsd3; }) {}; - "hw-bits_0_7_1_2" = callPackage + "hw-bits_0_7_1_5" = callPackage ({ mkDerivation, base, bitvec, bytestring, criterion, deepseq , doctest, doctest-discover, hedgehog, hspec, hspec-discover , hw-hspec-hedgehog, hw-int, hw-prim, hw-string-parse, vector }: mkDerivation { pname = "hw-bits"; - version = "0.7.1.2"; - sha256 = "1jgj5j09ddiv6yf605m1azaknbfawqhfqc2m3xpr800v43myr3m8"; + version = "0.7.1.5"; + sha256 = "0gvbsnirlgsj58363zqg960j0ydx2bhgw4lwql71jf9kg7hd4kqb"; libraryHaskellDepends = [ base bitvec bytestring deepseq hw-int hw-prim hw-string-parse vector @@ -133903,8 +134241,8 @@ self: { }: mkDerivation { pname = "hw-uri"; - version = "0.2.0.1"; - sha256 = "1i42l5jg06xlfbplibxx8104w1x61yixbv7w3l1fs0q06zzxaiqp"; + version = "0.2.1.0"; + sha256 = "1bwdzvms0n86k7gbkhk0jj3m1pcc9vbjk13kgpchqxpxm971srbs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135492,8 +135830,8 @@ self: { }: mkDerivation { pname = "icepeak"; - version = "0.7.1.0"; - sha256 = "1mw6ydcmp7q3qqqv0s86h3vahvsh9nzfi8d0yfwf8ywp6lzwhxfv"; + version = "0.7.2.0"; + sha256 = "0vs2lfwqxss2f4ajzj4pqzr5mxk69hs0jl4kz7y2qn7161x4vcd2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137349,6 +137687,29 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "incremental-parser_0_4_0_1" = callPackage + ({ mkDerivation, base, bytestring, checkers, criterion, deepseq + , monoid-subclasses, parsers, QuickCheck, rank2classes, tasty + , tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "incremental-parser"; + version = "0.4.0.1"; + sha256 = "1cghkzdsh8vjv1ggk5qjr5ny88wna5kbifbfsy1ld5n5k66536lf"; + libraryHaskellDepends = [ + base monoid-subclasses parsers rank2classes transformers + ]; + testHaskellDepends = [ + base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq monoid-subclasses text + ]; + description = "Generic parser library capable of providing partial results from partial input"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "incremental-sat-solver" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -139199,6 +139560,8 @@ self: { pname = "intro"; version = "0.6.0.1"; sha256 = "1kka6dnlyqppjx9ykk3zixfyslr8cf4ja6sa2hgq6h69mmsicp67"; + revision = "1"; + editedCabalFile = "1jxd4agavzccgszniqzakgpb6b49qx5c20asr068rpvaf03msncx"; libraryHaskellDepends = [ base bytestring containers deepseq dlist extra hashable mtl safe text transformers unordered-containers writer-cps-mtl @@ -151327,8 +151690,8 @@ self: { }: mkDerivation { pname = "libarchive"; - version = "2.2.3.0"; - sha256 = "0vnby3clfx3rqs6gw8l55nhdns47my0ihc9l4k5zmy1bvdhywy6y"; + version = "2.2.4.0"; + sha256 = "05d16ckk6iaj75zarqq6hjjmmb2xdd62hcyidfya3jfkw74zh1rp"; setupHaskellDepends = [ base Cabal chs-cabal ]; libraryHaskellDepends = [ base bytestring composition-prelude deepseq dlist filepath mtl @@ -153203,8 +153566,8 @@ self: { }: mkDerivation { pname = "lingo"; - version = "0.3.1.0"; - sha256 = "0bx3hf0lpi05w2ky0pkak39lhbpqyy8nahyk5j6z8ivi7fpm3p4s"; + version = "0.3.2.0"; + sha256 = "0qym6svpvxsxbhbppk0lkpp2zbqa13f0njkxnpyz5id581c3v8hx"; setupHaskellDepends = [ base bytestring Cabal containers directory filepath text yaml ]; @@ -157291,8 +157654,8 @@ self: { }: mkDerivation { pname = "lz4-bytes"; - version = "0.1.0.0"; - sha256 = "02lc1ka16vfwljsh1ybp4cn39rpgiwp38qj1ayr77ha3nhjzr9z0"; + version = "0.1.0.2"; + sha256 = "1h0rfc273jszv3c83izkr7v8x7zqikbayf20yhahj2fl129ar362"; libraryHaskellDepends = [ base byteslice primitive run-st ]; testHaskellDepends = [ base byteslice primitive tasty tasty-quickcheck @@ -157329,17 +157692,19 @@ self: { }) {}; "lz4-hs" = callPackage - ({ mkDerivation, base, bytestring, c2hs, filepath, tasty + ({ mkDerivation, base, bytestring, c2hs, criterion, filepath, tasty , tasty-hunit, temporary }: mkDerivation { pname = "lz4-hs"; - version = "0.1.1.0"; - sha256 = "12wcjfqbzh4myyxbnwlf3kddis8h0cgar62gjw7srrfa2025vmc7"; + version = "0.1.3.0"; + sha256 = "0yx1njh0zwk2qk99ip1f2wlcy3ql35piqbvd6dppr2hwnm5bh1mk"; libraryHaskellDepends = [ base bytestring ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base bytestring tasty tasty-hunit ]; - benchmarkHaskellDepends = [ base bytestring filepath temporary ]; + benchmarkHaskellDepends = [ + base bytestring criterion filepath temporary + ]; description = "lz4 bindings for Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -157520,6 +157885,26 @@ self: { broken = true; }) {}; + "macaroon-shop" = callPackage + ({ mkDerivation, base, bytes, bytestring, cereal, containers + , cryptonite, hedgehog, memory, saltine, transformers + }: + mkDerivation { + pname = "macaroon-shop"; + version = "0.1.0.0"; + sha256 = "087b83l3bdx1mk79bxqcwckbjdz7idi0m73dcrjiv5b4q5rjr8rs"; + libraryHaskellDepends = [ + base bytes bytestring cereal containers cryptonite memory saltine + transformers + ]; + testHaskellDepends = [ + base bytes bytestring cereal containers cryptonite hedgehog memory + saltine transformers + ]; + description = "A toolkit for working with macaroons"; + license = stdenv.lib.licenses.isc; + }) {}; + "macbeth-lib" = callPackage ({ mkDerivation, attoparsec, base, bytestring, conduit , conduit-extra, containers, directory, either-unwrap, filepath @@ -159647,31 +160032,6 @@ self: { }: mkDerivation { pname = "massiv-io"; - version = "0.2.0.0"; - sha256 = "1gypn2srqsnzmx1jd28632w34n7z4x5wadi4m7srxdhwk14vqg2m"; - revision = "1"; - editedCabalFile = "0kg2k84r5sxbg5pjjva639l0h1c4nhahmy1iakwmczkxjnzh6f8a"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base bytestring Color data-default-class deepseq exceptions - filepath JuicyPixels massiv netpbm unliftio vector - ]; - testHaskellDepends = [ - base bytestring doctest hspec JuicyPixels massiv massiv-test - QuickCheck random template-haskell - ]; - description = "Import/export of Image files into massiv Arrays"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "massiv-io_0_2_1_0" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, Color - , data-default-class, deepseq, doctest, exceptions, filepath, hspec - , JuicyPixels, massiv, massiv-test, netpbm, QuickCheck, random - , template-haskell, unliftio, vector - }: - mkDerivation { - pname = "massiv-io"; version = "0.2.1.0"; sha256 = "0p7z4nk0fv9lql17s9d18hi5mrnvr4zry6rghqnhjmhlp97g4yi6"; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -159685,7 +160045,6 @@ self: { ]; description = "Import/export of Image files into massiv Arrays"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "massiv-scheduler" = callPackage @@ -160263,8 +160622,8 @@ self: { }: mkDerivation { pname = "matterhorn"; - version = "50200.6.0"; - sha256 = "0b8qsd2w324sxmp3cgnz7fzlbhk5nz6slw8qxxm5dpy0bs5v7xnb"; + version = "50200.7.0"; + sha256 = "08ynlxqdb2mr7si0q7747pd1x9v9s7jmq2q75bqhzl44rpjhh4dv"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -160300,8 +160659,8 @@ self: { }: mkDerivation { pname = "mattermost-api"; - version = "50200.3.0"; - sha256 = "1d5nxaf382lzsr05rcby9w8y726bsda29w46b96p89whfbq8s9h3"; + version = "50200.4.0"; + sha256 = "0nl3xsw90rg08hmipr0d80h7ss68mlyaawagkiv2gj4qjlb2lqcn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -160324,8 +160683,8 @@ self: { }: mkDerivation { pname = "mattermost-api-qc"; - version = "50200.3.0"; - sha256 = "14111sq1k7iw8yy050805x0m80i9mixgxaqkl15gm0pvm4ap5ycd"; + version = "50200.4.0"; + sha256 = "1lxr3xfvc4qg1n1wxqz1bv4ac12xiwnk79i53w2gx2xks6rdpibj"; libraryHaskellDepends = [ base containers mattermost-api QuickCheck text time ]; @@ -163178,8 +163537,8 @@ self: { }: mkDerivation { pname = "minilight"; - version = "0.4.2"; - sha256 = "0bs4ix1yazq660jn9yz3yyfxx6scj2dgy37n13461l7ax1y9xp7s"; + version = "0.4.3"; + sha256 = "1qsmrb6bfwrv302pmm26nkkfky10h0mdkflvj3lfjmnz0bv7aw4g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -163219,22 +163578,6 @@ self: { }: mkDerivation { pname = "minimorph"; - version = "0.2.1.0"; - sha256 = "1phpsd0j8c987sw99p4hyywr4ydcxf5aq4h6xqdl3acwi0dv4zhj"; - libraryHaskellDepends = [ base text ]; - testHaskellDepends = [ - base HUnit test-framework test-framework-hunit text - ]; - description = "English spelling functions with an emphasis on simplicity"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "minimorph_0_2_2_0" = callPackage - ({ mkDerivation, base, HUnit, test-framework, test-framework-hunit - , text - }: - mkDerivation { - pname = "minimorph"; version = "0.2.2.0"; sha256 = "1fmnlv2qr8vnxk82b208fp7ckp920zrj9z9xv7lv6d5lgnsasf2c"; libraryHaskellDepends = [ base text ]; @@ -163243,7 +163586,6 @@ self: { ]; description = "English spelling functions with an emphasis on simplicity"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "minimung" = callPackage @@ -163435,23 +163777,6 @@ self: { }: mkDerivation { pname = "miniutter"; - version = "0.5.0.0"; - sha256 = "0hgsk54s07497rsgsck8lhpfbrxavx1chq90hsw14w3ggr1xnc7f"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ base binary containers minimorph text ]; - testHaskellDepends = [ - base containers HUnit test-framework test-framework-hunit text - ]; - description = "Simple English clause creation from arbitrary words"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "miniutter_0_5_1_0" = callPackage - ({ mkDerivation, base, binary, containers, HUnit, minimorph - , test-framework, test-framework-hunit, text - }: - mkDerivation { - pname = "miniutter"; version = "0.5.1.0"; sha256 = "0871hhpj5fl5si6rwg9l1lpdarlva3y888rgrrb4gaqsssnh0kk1"; enableSeparateDataOutput = true; @@ -163461,7 +163786,6 @@ self: { ]; description = "Simple English clause creation from arbitrary words"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "minlen" = callPackage @@ -164192,8 +164516,8 @@ self: { }: mkDerivation { pname = "mmsyn7h"; - version = "0.7.2.0"; - sha256 = "10mmc9gaq4wg9ixs1fwi7ga41lpiih5xx2w278fv6nli0p7flx3j"; + version = "0.7.5.0"; + sha256 = "17haan991lzs5qs4gzywhk4vpn9dvgasdm9ff8hzs5h6a0604sfn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -164226,8 +164550,8 @@ self: { ({ mkDerivation, base, mmsyn2, mmsyn5, mmsyn6ukr, vector }: mkDerivation { pname = "mmsyn7s"; - version = "0.6.5.1"; - sha256 = "0n5d3a3sscvasssi38nlbflqibjca2s95b6xyfmdwqn1n95bs6cy"; + version = "0.6.6.0"; + sha256 = "0hmsf7l3p2b2zj5ydjzxzkgqsj53yjwn71vgw8qzhbxjihk5x6l2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mmsyn2 mmsyn5 mmsyn6ukr vector ]; @@ -165289,27 +165613,6 @@ self: { }: mkDerivation { pname = "monad-logger"; - version = "0.3.31"; - sha256 = "0awr06bh5d51kci2w2xsj34qvh98sb6dm48a4k05k8awv8hrrpmd"; - libraryHaskellDepends = [ - base bytestring conduit conduit-extra exceptions fast-logger - lifted-base monad-control monad-loops mtl resourcet stm stm-chans - template-haskell text transformers transformers-base - transformers-compat unliftio-core - ]; - description = "A class of monads which can log messages"; - license = stdenv.lib.licenses.mit; - }) {}; - - "monad-logger_0_3_32" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-extra - , exceptions, fast-logger, lifted-base, monad-control, monad-loops - , mtl, resourcet, stm, stm-chans, template-haskell, text - , transformers, transformers-base, transformers-compat - , unliftio-core - }: - mkDerivation { - pname = "monad-logger"; version = "0.3.32"; sha256 = "14f1igbrkvwxxyhk58apc7swpzadaimfyaf75hwmsf5xc7xvjxyr"; libraryHaskellDepends = [ @@ -165320,7 +165623,6 @@ self: { ]; description = "A class of monads which can log messages"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-logger-json" = callPackage @@ -173055,18 +173357,18 @@ self: { ({ mkDerivation, async, base, binary, binary-conduit, bytestring , conduit, conduit-extra, data-default-class , data-default-instances-base, data-msgpack, data-msgpack-types - , exceptions, hspec, MissingH, monad-control, mtl, network, tagged - , text + , exceptions, hspec, monad-control, mtl, network, tagged, text + , unliftio-core }: mkDerivation { pname = "network-msgpack-rpc"; - version = "0.0.5"; - sha256 = "0lrlq5amcgg84ja2wjxkqm9llsbpsj6n0zrk7vvfjcra144b39rq"; + version = "0.0.6"; + sha256 = "1rris7vsls5cxagx3gx8aa3np7fld4dqyhcqczc7dwxcnkzj3c78"; libraryHaskellDepends = [ base binary binary-conduit bytestring conduit conduit-extra data-default-class data-default-instances-base data-msgpack - data-msgpack-types exceptions MissingH monad-control mtl network - tagged text + data-msgpack-types exceptions monad-control mtl network tagged text + unliftio-core ]; testHaskellDepends = [ async base bytestring hspec mtl network ]; description = "A MessagePack-RPC Implementation"; @@ -176766,18 +177068,16 @@ self: { }) {}; "objective" = callPackage - ({ mkDerivation, base, containers, exceptions, free, hashable + ({ mkDerivation, base, bifunctors, containers, exceptions, hashable , monad-skeleton, mtl, profunctors, template-haskell, transformers , transformers-compat, unordered-containers, void, witherable }: mkDerivation { pname = "objective"; - version = "1.1.2"; - sha256 = "0i36r3ygwpzb57ga0jjkp9rzikpsp15l777dclp7yi1zvqz2ikrg"; - revision = "1"; - editedCabalFile = "039j3xac9ish0yk4w04bmip6g9p6ndfd9ngh46ya125ms4nhmyj4"; + version = "1.2"; + sha256 = "0qbms1n31zafakhn6y0hdy1a3bv7l3z4gzfqc1iczbwnxamiiq0q"; libraryHaskellDepends = [ - base containers exceptions free hashable monad-skeleton mtl + base bifunctors containers exceptions hashable monad-skeleton mtl profunctors template-haskell transformers transformers-compat unordered-containers void witherable ]; @@ -177295,6 +177595,20 @@ self: { broken = true; }) {}; + "om-fail" = callPackage + ({ mkDerivation, base, monad-logger, safe-exceptions, transformers + }: + mkDerivation { + pname = "om-fail"; + version = "0.1.0.2"; + sha256 = "0wv102jpyi69xij2rwzrz5pdlc7pxad0wqsf0zfj15sfl1cnwya6"; + libraryHaskellDepends = [ + base monad-logger safe-exceptions transformers + ]; + description = "Monad transformer providing MonadFail"; + license = stdenv.lib.licenses.mit; + }) {}; + "omaketex" = callPackage ({ mkDerivation, base, optparse-applicative, shakespeare-text , shelly, text @@ -178386,15 +178700,15 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; - "opentelemetry_0_1_0" = callPackage + "opentelemetry_0_2_0" = callPackage ({ mkDerivation, async, base, bytestring, clock, directory , exceptions, hashable, random, stm, tasty, tasty-discover , tasty-hunit, tasty-quickcheck, text, unordered-containers }: mkDerivation { pname = "opentelemetry"; - version = "0.1.0"; - sha256 = "032dx71zdgsi1qpj948s55j3da0vdqms292166yvdg9h8vl5ji53"; + version = "0.2.0"; + sha256 = "1nxkghxwjkgvdk6xhpssa7aifryn6rr0agbhyc0ybf2c76r1pr8b"; libraryHaskellDepends = [ base bytestring clock directory exceptions hashable random stm text unordered-containers @@ -178408,6 +178722,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "opentelemetry-http-client" = callPackage + ({ mkDerivation, base, http-client, http-types, opentelemetry, text + }: + mkDerivation { + pname = "opentelemetry-http-client"; + version = "0.2.0"; + sha256 = "1z2fdlfc1hqzd9aypvrvyrc5547fvmfigh1wnsnbb9gswbckf6iy"; + libraryHaskellDepends = [ + base http-client http-types opentelemetry text + ]; + license = stdenv.lib.licenses.asl20; + }) {}; + "opentelemetry-lightstep" = callPackage ({ mkDerivation, aeson, async, base, bytestring, exceptions , http-client, http-client-tls, http-types, network, opentelemetry @@ -178415,8 +178742,8 @@ self: { }: mkDerivation { pname = "opentelemetry-lightstep"; - version = "0.1.0"; - sha256 = "01l463xfwn40j3jd54hvmbx0csgjg853j39r38clzwknxsfq60cb"; + version = "0.2.0"; + sha256 = "03fv2lgwkqngp26rdrk2fzvnccdgjc7xsv3sl3adb3xwzppkn0xh"; libraryHaskellDepends = [ aeson async base bytestring exceptions http-client http-client-tls http-types network opentelemetry scientific stm text @@ -178428,6 +178755,16 @@ self: { broken = true; }) {}; + "opentelemetry-wai" = callPackage + ({ mkDerivation, base, http-types, opentelemetry, text, wai }: + mkDerivation { + pname = "opentelemetry-wai"; + version = "0.2.0"; + sha256 = "1n27g8xjij05g7xxx8z50k39nmclhm707xs2pfqy830zdq1ldfl4"; + libraryHaskellDepends = [ base http-types opentelemetry text wai ]; + license = stdenv.lib.licenses.asl20; + }) {}; + "opentheory" = callPackage ({ mkDerivation, base, opentheory-primitive, QuickCheck }: mkDerivation { @@ -179462,8 +179799,8 @@ self: { ({ mkDerivation, base, hashable, lucid, org-mode, text }: mkDerivation { pname = "org-mode-lucid"; - version = "1.0.1"; - sha256 = "102hn0r18nm6l9m976bl6qfqwrdj3vmn0f2j32vrxkkybwfjwdkh"; + version = "1.1.0"; + sha256 = "066mdm9a7dkz6yy9g2yhqalvxrxhak1mw0awag3ivswv6djf528q"; libraryHaskellDepends = [ base hashable lucid org-mode text ]; license = stdenv.lib.licenses.bsd3; }) {}; @@ -181208,8 +181545,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.2.2"; - sha256 = "16aisw2cafa25hm3si7g0xzai9j602gggd8yz8ixrrhly9jhw0cd"; + version = "0.2.3"; + sha256 = "1sk8hhw3ad0jb2ik787pqjgaprd78k7qc0m0chcji3z5bprxp1cw"; description = "A box of patterns and paradigms"; license = stdenv.lib.licenses.mit; }) {}; @@ -181427,8 +181764,8 @@ self: { }: mkDerivation { pname = "pantry"; - version = "0.3.0.0"; - sha256 = "0j4ryr3wz2wlfsn9qf0cjbk91iwas89rci3x55cnf8s8ppx159am"; + version = "0.4.0.0"; + sha256 = "11n0xrk5258inzzikbapsv7752396qsrgaaf5kimpzgb67cs9k5j"; libraryHaskellDepends = [ aeson ansi-terminal base bytestring Cabal casa-client casa-types conduit conduit-extra containers cryptonite cryptonite-conduit @@ -182900,8 +183237,8 @@ self: { }: mkDerivation { pname = "partial-order"; - version = "0.1.2.1"; - sha256 = "15y3593fl5gabcf0qzyfql30v80sninv1f79dz4v2ll89dzwfzg3"; + version = "0.2.0.0"; + sha256 = "1j65vhgas602fzmrjzxg7fvkmqclzxdni8yn0699l7ni6miv8pxj"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers HUnit test-framework test-framework-hunit @@ -185286,8 +185623,6 @@ self: { ]; description = "Backend for the persistent library using MySQL database server"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "persistent-mysql-haskell" = callPackage @@ -185686,32 +186021,6 @@ self: { }: mkDerivation { pname = "persistent-typed-db"; - version = "0.1.0.0"; - sha256 = "0wlz2d6v4ks376amp26fxw5wj381kqaghp25mry073krc7yqz6yv"; - libraryHaskellDepends = [ - aeson base bytestring conduit http-api-data monad-logger - path-pieces persistent persistent-template resource-pool resourcet - template-haskell text transformers - ]; - testHaskellDepends = [ - aeson base bytestring conduit esqueleto hspec http-api-data - monad-logger path-pieces persistent persistent-template - resource-pool resourcet template-haskell text transformers - ]; - description = "Type safe access to multiple database schemata"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "persistent-typed-db_0_1_0_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit, esqueleto, hspec - , http-api-data, monad-logger, path-pieces, persistent - , persistent-template, resource-pool, resourcet, template-haskell - , text, transformers - }: - mkDerivation { - pname = "persistent-typed-db"; version = "0.1.0.1"; sha256 = "07yjzxg5yfxv1zbp5pkrvj8nrsxyhy4n11zgmd0q9g186q6283qn"; libraryHaskellDepends = [ @@ -188468,6 +188777,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "plaid" = callPackage + ({ mkDerivation, aeson, base, bytestring, casing, conduit + , conduit-extra, containers, either, errors, hspec, hspec-wai + , hspec-wai-json, http-client, http-client-tls, http-conduit + , http-types, microlens, microlens-th, mtl, network, pretty-simple + , QuickCheck, raw-strings-qq, safe-exceptions, text, time + , transformers, wai + }: + mkDerivation { + pname = "plaid"; + version = "0.1.0.0"; + sha256 = "125427rhy5xlaw3qinrazyyj39z4g0rbnhm2k4jrgp1jgba91lc3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring casing containers http-client-tls + http-conduit microlens microlens-th mtl network pretty-simple + raw-strings-qq safe-exceptions text time + ]; + executableHaskellDepends = [ + aeson base bytestring conduit conduit-extra either http-client + http-client-tls microlens microlens-th mtl network pretty-simple + safe-exceptions text time transformers + ]; + testHaskellDepends = [ + aeson base bytestring containers errors hspec hspec-wai + hspec-wai-json http-types microlens microlens-th pretty-simple + QuickCheck text time wai + ]; + description = "Plaid.com api integration library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "plailude" = callPackage ({ mkDerivation, base, bytestring, mtl, time, unix }: mkDerivation { @@ -189083,8 +189425,8 @@ self: { }: mkDerivation { pname = "plugins-multistage"; - version = "0.6.2"; - sha256 = "1cjy71s9whjkc8lrb29v5hbkak1jf36ng3xhqszdag887f2mk22b"; + version = "0.6.3"; + sha256 = "08m73a30alspw1dk33qvp5i0yqq7xlzkj2dsvs77myk9f1sp1ywx"; libraryHaskellDepends = [ base directory ghc ghci process template-haskell th-desugar ]; @@ -189843,6 +190185,8 @@ self: { pname = "polysemy"; version = "1.3.0.0"; sha256 = "0p5g1n5b0dfkadqpqf2ka25dblimwqhxwx5ax0mxwixb0jwd0pvb"; + revision = "1"; + editedCabalFile = "02fkrfdn7pwslc9yffgx3fis8ag36m3dhigw67ns1s16gsf5a7dz"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ async base containers first-class-families mtl QuickCheck stm syb @@ -189967,8 +190311,8 @@ self: { ({ mkDerivation, base, containers, deepseq, polyparse, tagsoup }: mkDerivation { pname = "polysoup"; - version = "0.6.3"; - sha256 = "0j2gk5x3njgv7x86p80f0zrsvzxcsn7x9l78swmgwcfkfy4j5xls"; + version = "0.6.4"; + sha256 = "0kgagizdn47xdnvmkwn5h3c78mdsh95siq2cyp9bga22pqhj4sid"; libraryHaskellDepends = [ base containers deepseq polyparse tagsoup ]; @@ -190648,8 +190992,8 @@ self: { }: mkDerivation { pname = "posix-api"; - version = "0.3.3.0"; - sha256 = "0a4npmhgnpq7ya21zijsxhyndr9swlknh6v7rn6y9qbva4q3gjx7"; + version = "0.3.4.0"; + sha256 = "163bblw200jr2vghc7i9g9xls6vhihayxvb4am4lr3j047ifqbmb"; libraryHaskellDepends = [ base byteslice primitive primitive-addr primitive-offset primitive-unlifted @@ -194275,8 +194619,8 @@ self: { ({ mkDerivation, base, comonad, lawz, profunctors }: mkDerivation { pname = "profunctor-arrows"; - version = "0.0.0.3"; - sha256 = "09hn8llfbwgj56mvwyiyk4n3myy0s4lixrzgi3sm4q1ypg4w0dz2"; + version = "0.0.1"; + sha256 = "136d594l4magjibq44fs64bqafvcdy8jm2gijs6x1whpab0vl44k"; libraryHaskellDepends = [ base comonad lawz profunctors ]; description = "Profunctor arrows"; license = stdenv.lib.licenses.bsd3; @@ -194324,31 +194668,27 @@ self: { }) {}; "profunctor-optics" = callPackage - ({ mkDerivation, adjunctions, base, connections, containers - , distributive, doctest, hedgehog, ilist, keys, magmas, mtl - , newtype-generics, profunctor-arrows, profunctors, rings - , semigroupoids, tagged, transformers, unliftio-core + ({ mkDerivation, adjunctions, base, coapplicative, distributive + , doctest, lawz, mtl, newtype-generics, profunctors, rings + , semigroupoids, tagged, transformers }: mkDerivation { pname = "profunctor-optics"; - version = "0.0.1"; - sha256 = "12f8v0bv6ra8smpjbcj8qlzm1fq4hzn1f2807f2jkcjz5s9a6wf5"; + version = "0.0.2"; + sha256 = "0x9cq3z1ixxgc85xf0387f5rsdwrm53qwzmcfm0b0z8gj38qaa5r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - adjunctions base connections distributive keys magmas mtl - newtype-generics profunctor-arrows profunctors rings semigroupoids - tagged transformers unliftio-core - ]; - executableHaskellDepends = [ - adjunctions base connections containers doctest ilist mtl + adjunctions base coapplicative distributive lawz mtl + newtype-generics profunctors rings semigroupoids tagged + transformers ]; - testHaskellDepends = [ base connections hedgehog ]; - description = "An optics library compatible with the typeclasses in 'profunctors'"; + executableHaskellDepends = [ base doctest mtl ]; + description = "A compact optics library compatible with the typeclasses in profunctors"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {}; + }) {coapplicative = null;}; "profunctors" = callPackage ({ mkDerivation, base, base-orphans, bifunctors, comonad @@ -196583,6 +196923,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "purescript-bridge_0_14_0_0" = callPackage + ({ mkDerivation, base, containers, directory, filepath + , generic-deriving, hspec, hspec-expectations-pretty-diff, lens + , mtl, text, transformers + }: + mkDerivation { + pname = "purescript-bridge"; + version = "0.14.0.0"; + sha256 = "1gplvmkx2c8ksk25wdinhwwbmqa5czbd4nwdgn4sa9ci10f2i4a3"; + libraryHaskellDepends = [ + base containers directory filepath generic-deriving lens mtl text + transformers + ]; + testHaskellDepends = [ + base containers hspec hspec-expectations-pretty-diff text + ]; + description = "Generate PureScript data types from Haskell data types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "purescript-bundle-fast" = callPackage ({ mkDerivation, base, containers, directory, filepath , optparse-applicative, text, vector @@ -200112,6 +200473,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rank2classes_1_4" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, distributive, doctest + , markdown-unlit, tasty, tasty-hunit, template-haskell + , transformers + }: + mkDerivation { + pname = "rank2classes"; + version = "1.4"; + sha256 = "0h8ysf32nw28aqhnnq2cckagwfrri4k44p3pzhhlp6lvhckvqnq1"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base distributive template-haskell transformers + ]; + testHaskellDepends = [ + base distributive doctest tasty tasty-hunit + ]; + testToolDepends = [ markdown-unlit ]; + description = "standard type constructor class hierarchy, only with methods of rank 2 types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rapid" = callPackage ({ mkDerivation, async, base, containers, foreign-store, stm }: mkDerivation { @@ -200557,8 +200940,8 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "9.0.7"; - sha256 = "0kgg1qfhgjajzrw22yvcxmiim14pxr2gim1aak3ivnmhn4yff4fg"; + version = "9.0.8"; + sha256 = "1a98zy1n6dlxxyfdganqfcx8hw04i4hjwdj8ggdd4g0jky62jaz2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -205611,8 +205994,8 @@ self: { }: mkDerivation { pname = "require"; - version = "0.4.3"; - sha256 = "0j6dsyqx637b5p8jmk5h4b0qham0m8m74c8b8y1dywm0c5daayca"; + version = "0.4.4"; + sha256 = "1y7n1dyccwfy5fplinw72fsq1vjzp5nrngvr5g08yfqykaidpc8r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -205637,6 +206020,30 @@ self: { broken = true; }) {}; + "rere" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, clock + , containers, criterion, derp, fin, parsec, QuickCheck + , quickcheck-instances, tasty, tasty-quickcheck, transformers, vec + }: + mkDerivation { + pname = "rere"; + version = "0.1"; + sha256 = "0hskndalxqmlwscvacqmp7gbp8m75a8hnvbifw0hw7hhszlf0yac"; + libraryHaskellDepends = [ + base containers fin parsec QuickCheck transformers vec + ]; + testHaskellDepends = [ + base containers QuickCheck quickcheck-instances tasty + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + aeson attoparsec base bytestring clock containers criterion derp + fin parsec vec + ]; + description = "Regular-expressions extended with fixpoints for context-free powers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rerebase" = callPackage ({ mkDerivation, rebase }: mkDerivation { @@ -205957,24 +206364,6 @@ self: { }: mkDerivation { pname = "resourcet"; - version = "1.2.2"; - sha256 = "1rfbfcv3r1h29y0yqr3x6a1s04lbc3vzm3jqnfg4f9rqp9d448qk"; - revision = "1"; - editedCabalFile = "18v6frks5zr64hpq8dprbk6dxpq4ykijp1xg00ghp7qz060f1r0i"; - libraryHaskellDepends = [ - base containers exceptions mtl primitive transformers unliftio-core - ]; - testHaskellDepends = [ base exceptions hspec transformers ]; - description = "Deterministic allocation and freeing of scarce resources"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "resourcet_1_2_3" = callPackage - ({ mkDerivation, base, containers, exceptions, hspec, mtl - , primitive, transformers, unliftio-core - }: - mkDerivation { - pname = "resourcet"; version = "1.2.3"; sha256 = "1ig7a22i5hn0ya7d4bg3xq0yy9mqgwawx4sv88db0fvdsnzg868s"; libraryHaskellDepends = [ @@ -205983,7 +206372,6 @@ self: { testHaskellDepends = [ base exceptions hspec transformers ]; description = "Deterministic allocation and freeing of scarce resources"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "respond" = callPackage @@ -207268,14 +207656,15 @@ self: { "rings" = callPackage ({ mkDerivation, adjunctions, base, containers, distributive, lawz - , magmas, semigroupoids + , magmas, profunctors, semigroupoids }: mkDerivation { pname = "rings"; - version = "0.1.2"; - sha256 = "0rci487ycp44h3qqpnwz9z429xwhsj4andsvcdpisbns56mw6rqd"; + version = "0.1.3"; + sha256 = "0w0jvmj7x62fs0k5vah47mbdasiqjs9kphvrfbdma4i59899w5y1"; libraryHaskellDepends = [ - adjunctions base containers distributive lawz magmas semigroupoids + adjunctions base containers distributive lawz magmas profunctors + semigroupoids ]; description = "Ring-like objects"; license = stdenv.lib.licenses.bsd3; @@ -207289,31 +207678,6 @@ self: { }: mkDerivation { pname = "rio"; - version = "0.1.14.0"; - sha256 = "1ss0lbdrmiblxza8lv51kpdw51s7m5qaihxlvf1jp4qg4amdayxw"; - libraryHaskellDepends = [ - base bytestring containers deepseq directory exceptions filepath - hashable microlens mtl primitive process text time typed-process - unix unliftio unliftio-core unordered-containers vector - ]; - testHaskellDepends = [ - base bytestring containers deepseq directory exceptions filepath - hashable hspec microlens mtl primitive process QuickCheck text time - typed-process unix unliftio unliftio-core unordered-containers - vector - ]; - description = "A standard library for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "rio_0_1_14_1" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, directory - , exceptions, filepath, hashable, hspec, microlens, mtl, primitive - , process, QuickCheck, text, time, typed-process, unix, unliftio - , unliftio-core, unordered-containers, vector - }: - mkDerivation { - pname = "rio"; version = "0.1.14.1"; sha256 = "0ysbjxaby846vp2w60747b7sm1zy30i62qg0bgsr7z52jamrx3qm"; libraryHaskellDepends = [ @@ -207329,7 +207693,6 @@ self: { ]; description = "A standard library for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rio-orphans" = callPackage @@ -208285,24 +208648,24 @@ self: { }: mkDerivation { pname = "rose-trees"; - version = "0.0.4.4"; - sha256 = "1kbjkfknl2pyp30n5c6m6xavqlm8zg06w78b3x7iwvi854yi64r3"; + version = "0.0.4.5"; + sha256 = "0ql6wdsq1dpx0bbgs6798c6h4wyw9xcbr64shr7pvl9fwivdl6j7"; libraryHaskellDepends = [ base containers deepseq hashable mtl QuickCheck quickcheck-instances semigroupoids semigroups sets unordered-containers witherable ]; testHaskellDepends = [ - base containers deepseq hashable QuickCheck quickcheck-instances - semigroupoids semigroups sets tasty tasty-quickcheck - unordered-containers witherable + base containers deepseq hashable mtl QuickCheck + quickcheck-instances semigroupoids semigroups sets tasty + tasty-quickcheck unordered-containers witherable ]; benchmarkHaskellDepends = [ base containers criterion deepseq hashable mtl QuickCheck quickcheck-instances semigroupoids semigroups sets unordered-containers witherable ]; - description = "A collection of rose tree structures"; + description = "Various trie implementations in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -210177,8 +210540,6 @@ self: { ]; description = "Cryptography that's easy to digest (NaCl/libsodium bindings)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) libsodium;}; "saltine-quickcheck" = callPackage @@ -212598,25 +212959,6 @@ self: { }: mkDerivation { pname = "sdl2-ttf"; - version = "2.1.0"; - sha256 = "1xw05jgv6x9xplahwf3jjdq6v3mha4s7bb27kn8x66764glnyrf7"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring sdl2 template-haskell text transformers - ]; - libraryPkgconfigDepends = [ SDL2 SDL2_ttf ]; - description = "Bindings to SDL2_ttf"; - license = stdenv.lib.licenses.bsd3; - platforms = [ "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;}; - - "sdl2-ttf_2_1_1" = callPackage - ({ mkDerivation, base, bytestring, SDL2, sdl2, SDL2_ttf - , template-haskell, text, transformers - }: - mkDerivation { - pname = "sdl2-ttf"; version = "2.1.1"; sha256 = "1iyqm1i5k8j4948gvr59rgalqwsdkishs52kp85ncvb6cpylw3qn"; isLibrary = true; @@ -212628,7 +212970,6 @@ self: { description = "Bindings to SDL2_ttf"; license = stdenv.lib.licenses.bsd3; platforms = [ "i686-linux" "x86_64-linux" ]; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;}; "sdnv" = callPackage @@ -216482,8 +216823,8 @@ self: { }: mkDerivation { pname = "servant-snap"; - version = "0.8.4.1"; - sha256 = "1649s1n313rd8h409bfz2jkq2ch7ffw06y120j95rjcp6r8xgfv2"; + version = "0.8.5"; + sha256 = "12ihxmi6c6zypzx6ijj0yhl0mppk40zkyhkv3g3kx3mgx50qs5yq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -217121,6 +217462,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "serverless-haskell_0_10_2" = callPackage + ({ mkDerivation, aeson, aeson-casing, amazonka-core + , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive + , hspec, hspec-discover, http-types, iproute, lens, network + , network-simple, raw-strings-qq, text, time, unix + , unordered-containers + }: + mkDerivation { + pname = "serverless-haskell"; + version = "0.10.2"; + sha256 = "1iy69394dqv38dlh71m8sarcfps9gaaq90zpc4f169vnhpr59wak"; + libraryHaskellDepends = [ + aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base + bytestring case-insensitive http-types iproute lens network + network-simple text time unix unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base + bytestring case-insensitive hspec hspec-discover http-types iproute + lens network network-simple raw-strings-qq text time unix + unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "Deploying Haskell code onto AWS Lambda using Serverless"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "serversession" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , containers, data-default, hashable, hspec, nonce, path-pieces @@ -217970,6 +218339,22 @@ self: { broken = true; }) {}; + "sha1" = callPackage + ({ mkDerivation, base, bytebuild, byteslice, natural-arithmetic + , primitive, small-bytearray-builder + }: + mkDerivation { + pname = "sha1"; + version = "0.1.0.2"; + sha256 = "14jy1g6pm4vnq7rhg4z1yazazk9vfav7nn8saxkddxaflaax4llf"; + libraryHaskellDepends = [ base bytebuild byteslice primitive ]; + testHaskellDepends = [ + base byteslice natural-arithmetic primitive small-bytearray-builder + ]; + description = "SHA-1 Hash"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "shade" = callPackage ({ mkDerivation, base, mtl, transformers }: mkDerivation { @@ -218126,6 +218511,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "shake-bindist" = callPackage + ({ mkDerivation, archive-sig, archive-tar, base, bytestring, bz2 + , lzlib, shake, zlib, zstd + }: + mkDerivation { + pname = "shake-bindist"; + version = "0.1.0.0"; + sha256 = "0f2w7bbnnigfjpfywljl6k2gcz1rq99lfz7cig0076rbjg7aifii"; + revision = "2"; + editedCabalFile = "0bk1r9qn41xhhjisvahs0fdsfiv79rb1yk545ry0vw83d0af6kl8"; + libraryHaskellDepends = [ + archive-sig archive-tar base bytestring bz2 lzlib shake zlib zstd + ]; + description = "Rules for binary distributions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "shake-c" = callPackage ({ mkDerivation, base, cdeps, composition-prelude, shake }: mkDerivation { @@ -221627,6 +222029,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "skylighting-lucid" = callPackage + ({ mkDerivation, base, containers, lucid, skylighting-core, text }: + mkDerivation { + pname = "skylighting-lucid"; + version = "1.0.0"; + sha256 = "09wh0dh8glnb051hdbcf4q4v3nflikgc585acqin8kq7zny7ps72"; + libraryHaskellDepends = [ + base containers lucid skylighting-core text + ]; + description = "Lucid support for Skylighting"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "skylighting-modding" = callPackage ({ mkDerivation, base, containers, skylighting-core, text }: mkDerivation { @@ -222798,10 +223213,8 @@ self: { }: mkDerivation { pname = "snap"; - version = "1.1.2.0"; - sha256 = "05da0dg0p6djcsinycih50hjnircibmicarwg2vr14a7zbrhynps"; - revision = "2"; - editedCabalFile = "13hx2wghxrranxxv5qp8a5maqd203q15k3qg4fafjzhyh3wf6a67"; + version = "1.1.3.0"; + sha256 = "09iwyam3k9a90xm99pm54h74f8llfz2jm0i8rrdqwayjy5xq2w3i"; libraryHaskellDepends = [ aeson attoparsec base bytestring cereal clientsession configurator containers directory directory-tree dlist fail filepath hashable @@ -222821,8 +223234,6 @@ self: { ]; description = "Top-level package for the Snap Web Framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "snap-accept" = callPackage @@ -224445,8 +224856,8 @@ self: { pname = "soap-openssl"; version = "0.1.0.2"; sha256 = "03w389yhybzvc06gpxigibqga9mr7m41rkg1ki3n686j9xzm8210"; - revision = "1"; - editedCabalFile = "1b3aivn9jfaax00id7x4cqvpmd6lgynslchlry0qsmq1lj466cdf"; + revision = "2"; + editedCabalFile = "0zhl8x57y35ymhpznrsn2yrgc3bigjn5mabwl4nvprpznb2x44vn"; libraryHaskellDepends = [ base configurator data-default HsOpenSSL http-client http-client-openssl soap text @@ -226716,8 +227127,8 @@ self: { }: mkDerivation { pname = "sqlite-simple"; - version = "0.4.17.0"; - sha256 = "1bd1883kn2bvzglqg3l2yjcd94liv36181ib8g40k34zdm67wvbz"; + version = "0.4.18.0"; + sha256 = "00icsf8pgrcqcn5562lmn12yz1f16a2v2q6bl90iknvjyrk1hgzp"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-textual bytestring containers direct-sqlite Only semigroups template-haskell text time @@ -227289,6 +227700,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stache_2_1_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, directory, file-embed, filepath, hspec, hspec-discover + , hspec-megaparsec, megaparsec, mtl, template-haskell, text + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "stache"; + version = "2.1.1"; + sha256 = "06pn7pm5vgk9f4bsh3m29cik514nv5w655ip04k7p5jv9xgmn4ld"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq directory filepath + megaparsec mtl template-haskell text unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers file-embed hspec hspec-megaparsec + megaparsec template-haskell text yaml + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + aeson base criterion deepseq megaparsec text + ]; + description = "Mustache templates for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stack" = callPackage ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, array , async, attoparsec, base, base64-bytestring, bytestring, Cabal @@ -229894,6 +230333,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stratosphere_0_50_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , hashable, hspec, hspec-discover, lens, template-haskell, text + , unordered-containers + }: + mkDerivation { + pname = "stratosphere"; + version = "0.50.0"; + sha256 = "0nxvrfi3jp0p874gkj25rdlfsb2rskp82bz58c0rply0s5rivlfl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring containers hashable lens + template-haskell text unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring containers hashable hspec + hspec-discover lens template-haskell text unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "EDSL for AWS CloudFormation"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stratum-tool" = callPackage ({ mkDerivation, aeson, async, base, bytestring, bytestring-builder , cmdargs, connection, containers, curl, curl-aeson, network, stm @@ -235467,8 +235931,8 @@ self: { }: mkDerivation { pname = "tagsoup-navigate"; - version = "0.1.0.4"; - sha256 = "1mds95a0xz3iklidmvczjpmm9vjhzdrdvcj3dg0n3ivwwli672m9"; + version = "0.1.0.7"; + sha256 = "02qq2qc5xrsw6nf4hc02g9xkgdkx3ka7pack02dkhnbxj3jv03vw"; libraryHaskellDepends = [ base deriving-compat lens mmorph mtl semigroupoids semigroups tagsoup tagsoup-selection transformers @@ -238940,6 +239404,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tex-join-bib" = callPackage + ({ mkDerivation, async, base, containers, foldl, optparse-generic + , system-filepath, text, turtle + }: + mkDerivation { + pname = "tex-join-bib"; + version = "0.1.0.0"; + sha256 = "1dlks58g9jfkcsdlcjyqw8rh27j1c66crb39s53ar7w6p08invk1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base containers foldl system-filepath text turtle + ]; + executableHaskellDepends = [ + base optparse-generic system-filepath text + ]; + description = "Compile separate tex files with the same bibliography"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "tex2txt" = callPackage ({ mkDerivation, base, containers, deepseq, parsec }: mkDerivation { @@ -245785,8 +246269,8 @@ self: { }: mkDerivation { pname = "tries"; - version = "0.0.6"; - sha256 = "0765my34c8fcd8ri9acrcymgpjfqqq7a98zr94z8czrnh5zsmzjv"; + version = "0.0.6.1"; + sha256 = "0sb4bj2dd88890hg8k3z0kpl1zk1d1r70sspviylzp6b26q3gyvm"; libraryHaskellDepends = [ base bytestring composition containers deepseq hashable keys QuickCheck quickcheck-instances rose-trees semigroups sets @@ -246787,6 +247271,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "turtle_1_5_17" = callPackage + ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock + , containers, criterion, directory, doctest, exceptions, fail + , foldl, hostname, managed, optional-args, optparse-applicative + , process, semigroups, stm, streaming-commons, system-fileio + , system-filepath, temporary, text, time, transformers, unix + , unix-compat + }: + mkDerivation { + pname = "turtle"; + version = "1.5.17"; + sha256 = "0chj4issjbkdkj1jbcpi8v104784qnzvkq81a4wcdijk09biphq7"; + libraryHaskellDepends = [ + ansi-wl-pprint async base bytestring clock containers directory + exceptions foldl hostname managed optional-args + optparse-applicative process semigroups stm streaming-commons + system-fileio system-filepath temporary text time transformers unix + unix-compat + ]; + testHaskellDepends = [ + base doctest fail system-filepath temporary + ]; + benchmarkHaskellDepends = [ base criterion text ]; + description = "Shell programming, Haskell-style"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "turtle-options" = callPackage ({ mkDerivation, base, HUnit, optional-args, parsec, text, turtle }: @@ -248665,8 +249177,8 @@ self: { }: mkDerivation { pname = "typesafe-precure"; - version = "0.7.6.2"; - sha256 = "0nhb8v17ycjjldcvhyjc1qk7r4hqhqdw6gw9fp0mbvn5cbpi0xrm"; + version = "0.7.7.1"; + sha256 = "0yjw4fm7n7qdb9rib7q5nirnw0cdvqy2g05lidxw5pkgdbi9np3m"; libraryHaskellDepends = [ aeson aeson-pretty autoexporter base bytestring dlist monad-skeleton template-haskell text th-data-compat @@ -250320,13 +250832,13 @@ self: { "unity-testresult-parser" = callPackage ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, containers - , mtl, optparse-applicative, split, text, unordered-containers - , xml-conduit + , mtl, optparse-applicative, semigroups, split, text + , unordered-containers, xml-conduit }: mkDerivation { pname = "unity-testresult-parser"; - version = "0.1.0.3"; - sha256 = "1521dv3d7ssqzy8vf4y55dzg0w192667kqia0f0w76magnwhk8ic"; + version = "0.1.0.10"; + sha256 = "0mb7q5lqkn11s11s8w6a4anmbsf3z4c66bg78j1dnwkqivx02k0b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -250334,8 +250846,8 @@ self: { xml-conduit ]; executableHaskellDepends = [ - ansi-terminal ansi-wl-pprint base mtl optparse-applicative split - text + ansi-terminal ansi-wl-pprint base mtl optparse-applicative + semigroups split text ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -250785,31 +251297,6 @@ self: { }: mkDerivation { pname = "unliftio"; - version = "0.2.12"; - sha256 = "02gy1zrxgzg4xmzm8lafsf1nyr3as1q20r8ld73xg3q7rkag9acg"; - libraryHaskellDepends = [ - async base bytestring deepseq directory filepath process stm time - transformers unix unliftio-core - ]; - testHaskellDepends = [ - async base bytestring containers deepseq directory filepath hspec - process QuickCheck stm time transformers unix unliftio-core - ]; - benchmarkHaskellDepends = [ - async base bytestring deepseq directory filepath gauge process stm - time transformers unix unliftio-core - ]; - description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; - license = stdenv.lib.licenses.mit; - }) {}; - - "unliftio_0_2_12_1" = callPackage - ({ mkDerivation, async, base, bytestring, containers, deepseq - , directory, filepath, gauge, hspec, process, QuickCheck, stm, time - , transformers, unix, unliftio-core - }: - mkDerivation { - pname = "unliftio"; version = "0.2.12.1"; sha256 = "18z8db7plbjdgl12p00zj5qd60v89wazgxqc356mwg295w2mydwc"; libraryHaskellDepends = [ @@ -250826,7 +251313,6 @@ self: { ]; description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unliftio-core" = callPackage @@ -255512,28 +255998,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "vty_5_27" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers - , deepseq, directory, filepath, hashable, HUnit, microlens - , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck - , quickcheck-assertions, random, smallcheck, stm, string-qq - , terminfo, test-framework, test-framework-hunit - , test-framework-smallcheck, text, transformers, unix, utf8-string - , vector + "vty_5_28_1" = callPackage + ({ mkDerivation, ansi-terminal, base, binary, blaze-builder + , bytestring, Cabal, containers, deepseq, directory, filepath + , hashable, HUnit, microlens, microlens-mtl, microlens-th, mtl + , parallel, parsec, QuickCheck, quickcheck-assertions, random + , smallcheck, stm, string-qq, terminfo, test-framework + , test-framework-hunit, test-framework-smallcheck, text + , transformers, unix, utf8-string, vector }: mkDerivation { pname = "vty"; - version = "5.27"; - sha256 = "1iif1lcf59bypxlamla085bzrp3bl23jq2rcfzrjy6a3grywdgdl"; + version = "5.28.1"; + sha256 = "0hshmpa3n6936527wimxf3vi5v6gddp09kxjjmcxjwq39h9a640y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base blaze-builder bytestring containers deepseq directory filepath - hashable microlens microlens-mtl microlens-th mtl parallel parsec - stm terminfo text transformers unix utf8-string vector + ansi-terminal base binary blaze-builder bytestring containers + deepseq directory filepath hashable microlens microlens-mtl + microlens-th mtl parallel parsec stm terminfo text transformers + unix utf8-string vector ]; executableHaskellDepends = [ - base containers microlens microlens-mtl mtl + base containers directory filepath microlens microlens-mtl mtl ]; testHaskellDepends = [ base blaze-builder bytestring Cabal containers deepseq HUnit @@ -255977,18 +256464,18 @@ self: { "wai-enforce-https" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, hspec - , http-types, network, text, wai, wai-extra, warp, warp-tls + , http-types, network, text, wai, wai-extra }: mkDerivation { pname = "wai-enforce-https"; - version = "0.0.1"; - sha256 = "0gm4n57abmbawpij3hsn6ia283b75sn40387dimpp573q5nnnwmv"; + version = "0.0.2"; + sha256 = "0p3j438knirr32j6dhqscws93h3ygk6lvw97r489h8i1dip9rqll"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring case-insensitive http-types network text wai ]; - executableHaskellDepends = [ base http-types wai warp warp-tls ]; testHaskellDepends = [ base bytestring case-insensitive hspec http-types wai wai-extra ]; @@ -255996,14 +256483,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "wai-enforce-https_0_0_2" = callPackage + "wai-enforce-https_0_0_2_1" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, hspec , http-types, network, text, wai, wai-extra }: mkDerivation { pname = "wai-enforce-https"; - version = "0.0.2"; - sha256 = "0p3j438knirr32j6dhqscws93h3ygk6lvw97r489h8i1dip9rqll"; + version = "0.0.2.1"; + sha256 = "1mbhk50j1a47ydg5kd6bj3nbzqfq1abm1d1vcxc3smw4fgf39g5x"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -262081,6 +262568,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "xeno_0_4_1" = callPackage + ({ mkDerivation, array, base, bytestring, bytestring-mmap, bzlib + , criterion, deepseq, filepath, ghc-prim, hexml, hexpat, hspec, mtl + , mutable-containers, time, vector, weigh, xml + }: + mkDerivation { + pname = "xeno"; + version = "0.4.1"; + sha256 = "0pnmbi6w4l1i8m5vjxgxpcx98b5rphm32ykzcvgdnvahv8mrqycy"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base bytestring deepseq mtl mutable-containers vector + ]; + executableHaskellDepends = [ + base bytestring bytestring-mmap deepseq hexml time weigh + ]; + testHaskellDepends = [ base bytestring hexml hspec ]; + benchmarkHaskellDepends = [ + base bytestring bzlib criterion deepseq filepath ghc-prim hexml + hexpat weigh xml + ]; + description = "A fast event-based XML parser in pure Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xenstore" = callPackage ({ mkDerivation, base, bytestring, cereal, mtl, network }: mkDerivation { @@ -264519,6 +265034,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "yaml_0_11_3_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring + , conduit, containers, directory, filepath, hspec, HUnit, libyaml + , mockery, mtl, raw-strings-qq, resourcet, scientific + , template-haskell, temporary, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "yaml"; + version = "0.11.3.0"; + sha256 = "01lafh83rp0v49f052vyv4gcbdgzcf42cmg0iqlykk6c586ksvh4"; + configureFlags = [ "-fsystem-libyaml" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring conduit containers directory + filepath libyaml mtl resourcet scientific template-haskell text + transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson attoparsec base base-compat bytestring conduit containers + directory filepath hspec HUnit libyaml mockery mtl raw-strings-qq + resourcet scientific template-haskell temporary text transformers + unordered-containers vector + ]; + description = "Support for parsing and rendering YAML documents"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yaml-combinators" = callPackage ({ mkDerivation, aeson, base, bytestring, doctest, generics-sop , scientific, tasty, tasty-hunit, text, transformers @@ -265974,43 +266519,6 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.6.17.2"; - sha256 = "0rcfksbxnwcpg5qh9vjkddv39q95mx4nxzgix51bbwa128hhzcwf"; - 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; - }) {}; - - "yesod-core_1_6_17_3" = 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.17.3"; sha256 = "0w2i18rjqz9mzldq0bdiaikn5mxws2f9ab0ngmab6rzywcqsvg22"; libraryHaskellDepends = [ @@ -266033,7 +266541,6 @@ self: { ]; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-crud" = callPackage @@ -266267,8 +266774,8 @@ self: { }: mkDerivation { pname = "yesod-fb"; - version = "0.5.2"; - sha256 = "0srvdipwrmqi3wh8z51432dgr3kpgi5iw9ikbahv6swvhs5k8w41"; + version = "0.6.0"; + sha256 = "0anhnbwc9j11lm2sh8wi15p160vb9g0ng8lqc6g8am61jsxxw40x"; libraryHaskellDepends = [ aeson base bytestring conduit fb http-client-tls http-conduit memory text wai yesod-core @@ -268631,6 +269138,8 @@ self: { pname = "zenhack-prelude"; version = "0.1.1.0"; sha256 = "07njs4zb976zxyiwg03ijvn1wvmx188ys49gckwybg1kl824x11f"; + revision = "1"; + editedCabalFile = "0sj45k2v33x3312yz1bdbck2bcv5q64mh7v7xy35ghp72ynw1z8z"; libraryHaskellDepends = [ base ]; description = "@zenhack's personal custom prelude"; license = stdenv.lib.licenses.mit; @@ -269120,8 +269629,8 @@ self: { }: mkDerivation { pname = "zip"; - version = "1.3.1"; - sha256 = "11dbbmwn81j6zmjnlxqz748jd9ywd18nhzr5pqkgk5kd3n27rd0j"; + version = "1.3.2"; + sha256 = "0nmqp34w82wzlkip9zk05dy4yjnwy8dc2k7n1kq0rrdsb9zsc360"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -269139,7 +269648,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "zip_1_3_2" = callPackage + "zip_1_4_0" = callPackage ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive , cereal, conduit, conduit-extra, containers, digest, directory , dlist, exceptions, filepath, hspec, monad-control, mtl @@ -269148,8 +269657,8 @@ self: { }: mkDerivation { pname = "zip"; - version = "1.3.2"; - sha256 = "0nmqp34w82wzlkip9zk05dy4yjnwy8dc2k7n1kq0rrdsb9zsc360"; + version = "1.4.0"; + sha256 = "07g17n6fr86c6c5yhs8ml53mk0g032060vja620bp32irfm00m2r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -269856,8 +270365,6 @@ self: { ]; description = "Password strength estimation based on zxcvbn"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "zxcvbn-hs" = callPackage @@ -269896,8 +270403,6 @@ self: { ]; description = "Password strength estimation based on zxcvbn"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; } diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 17fb1ab8ae85..1418cfef0574 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -124,7 +124,7 @@ let sha256Arg = if sha256 == null then "--sha256=" else ''--sha256="${sha256}"''; in buildPackages.stdenv.mkDerivation { name = "cabal2nix-${name}"; - nativeBuildInputs = [ buildPackages.cabal2nix ]; + nativeBuildInputs = [ buildPackages.cabal2nix-unwrapped ]; preferLocalBuild = true; allowSubstitutes = false; phases = ["installPhase"]; diff --git a/pkgs/development/haskell-modules/patches/git-annex-fix-build-with-ghc-8.8.x.patch b/pkgs/development/haskell-modules/patches/git-annex-fix-build-with-ghc-8.8.x.patch deleted file mode 100644 index e28a1f5949ee..000000000000 --- a/pkgs/development/haskell-modules/patches/git-annex-fix-build-with-ghc-8.8.x.patch +++ /dev/null @@ -1,125 +0,0 @@ -From f8d8959e43abd88c5e977079f0948e45cf4c0b0c Mon Sep 17 00:00:00 2001 -From: Peter Simons <simons@cryp.to> -Date: Fri, 28 Feb 2020 11:56:48 +0100 -Subject: [PATCH] Fix build with ghc-8.8.x. - -The 'fail' method has been moved to the 'MonadFail' class. I made the changes -so that the code still compiles with previous versions of 'base' that don't -have the new MonadFail class exported by Prelude yet. ---- - CmdLine/GitAnnex/Options.hs | 5 +++-- - Command/Expire.hs | 5 +++-- - Command/Init.hs | 7 ++++--- - Utility/HumanTime.hs | 5 +++-- - 4 files changed, 13 insertions(+), 9 deletions(-) - -diff --git a/CmdLine/GitAnnex/Options.hs b/CmdLine/GitAnnex/Options.hs -index 030c83dd5..a9a36d76f 100644 ---- a/CmdLine/GitAnnex/Options.hs -+++ b/CmdLine/GitAnnex/Options.hs -@@ -9,6 +9,7 @@ - - module CmdLine.GitAnnex.Options where - -+import Control.Monad.Fail as Fail ( MonadFail(..) ) - import Options.Applicative - import qualified Data.Map as M - -@@ -215,8 +216,8 @@ parseAllOption = flag' WantAllKeys - <> help "operate on all versions of all files" - ) - --parseKey :: Monad m => String -> m Key --parseKey = maybe (fail "invalid key") return . deserializeKey -+parseKey :: MonadFail m => String -> m Key -+parseKey = maybe (Fail.fail "invalid key") return . deserializeKey - - -- Options to match properties of annexed files. - annexedMatchingOptions :: [GlobalOption] -diff --git a/Command/Expire.hs b/Command/Expire.hs -index 83c38e569..37dc33883 100644 ---- a/Command/Expire.hs -+++ b/Command/Expire.hs -@@ -17,6 +17,7 @@ import Annex.VectorClock - import qualified Remote - import Utility.HumanTime - -+import Control.Monad.Fail as Fail ( MonadFail(..) ) - import Data.Time.Clock.POSIX - import qualified Data.Map as M - -@@ -105,9 +106,9 @@ parseExpire ps = do - Nothing -> giveup $ "bad expire time: " ++ s - Just d -> Just (now - durationToPOSIXTime d) - --parseActivity :: Monad m => String -> m Activity -+parseActivity :: MonadFail m => String -> m Activity - parseActivity s = case readish s of -- Nothing -> fail $ "Unknown activity. Choose from: " ++ -+ Nothing -> Fail.fail $ "Unknown activity. Choose from: " ++ - unwords (map show [minBound..maxBound :: Activity]) - Just v -> return v - -diff --git a/Command/Init.hs b/Command/Init.hs -index db6cb14fb..879a1110f 100644 ---- a/Command/Init.hs -+++ b/Command/Init.hs -@@ -13,6 +13,7 @@ import Annex.Version - import Types.RepoVersion - import qualified Annex.SpecialRemote - -+import Control.Monad.Fail as Fail ( MonadFail(..) ) - import qualified Data.Map as M - - cmd :: Command -@@ -33,14 +34,14 @@ optParser desc = InitOptions - <> help "Override default annex.version" - )) - --parseRepoVersion :: Monad m => String -> m RepoVersion -+parseRepoVersion :: MonadFail m => String -> m RepoVersion - parseRepoVersion s = case RepoVersion <$> readish s of -- Nothing -> fail $ "version parse error" -+ Nothing -> Fail.fail $ "version parse error" - Just v - | v `elem` supportedVersions -> return v - | otherwise -> case M.lookup v autoUpgradeableVersions of - Just v' -> return v' -- Nothing -> fail $ s ++ " is not a currently supported repository version" -+ Nothing -> Fail.fail $ s ++ " is not a currently supported repository version" - - seek :: InitOptions -> CommandSeek - seek = commandAction . start -diff --git a/Utility/HumanTime.hs b/Utility/HumanTime.hs -index 01fbeacfb..d2e70f332 100644 ---- a/Utility/HumanTime.hs -+++ b/Utility/HumanTime.hs -@@ -19,6 +19,7 @@ module Utility.HumanTime ( - import Utility.PartialPrelude - import Utility.QuickCheck - -+import Control.Monad.Fail as Fail ( MonadFail(..) ) - import qualified Data.Map as M - import Data.Time.Clock - import Data.Time.Clock.POSIX (POSIXTime) -@@ -44,7 +45,7 @@ daysToDuration :: Integer -> Duration - daysToDuration i = Duration $ i * dsecs - - {- Parses a human-input time duration, of the form "5h", "1m", "5h1m", etc -} --parseDuration :: Monad m => String -> m Duration -+parseDuration :: MonadFail m => String -> m Duration - parseDuration = maybe parsefail (return . Duration) . go 0 - where - go n [] = return n -@@ -55,7 +56,7 @@ parseDuration = maybe parsefail (return . Duration) . go 0 - u <- M.lookup c unitmap - go (n + num * u) rest - _ -> return $ n + num -- parsefail = fail "duration parse error; expected eg \"5m\" or \"1h5m\"" -+ parsefail = Fail.fail "duration parse error; expected eg \"5m\" or \"1h5m\"" - - fromDuration :: Duration -> String - fromDuration Duration { durationSeconds = d } --- -2.25.1 - diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/development/interpreters/metamath/default.nix index 423352955853..42b95f341ba9 100644 --- a/pkgs/development/interpreters/metamath/default.nix +++ b/pkgs/development/interpreters/metamath/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation { pname = "metamath"; - version = "0.180"; + version = "0.181"; buildInputs = [ autoreconfHook ]; src = fetchFromGitHub { owner = "metamath"; repo = "metamath-exe"; - rev = "469e1b253f29be838411e2cc9c93d7704297059c"; - sha256 = "0nazi7z8qrpn7nnmxk99ilwf8smkzh26jcvn17wyfnywxpdsb7wa"; + rev = "67cbfa8468deb6f8ad5bedafc6399bee59064764"; + sha256 = "1mk3g41qz26j38j68i9qmnl8khkd8jwrzj4vxkb855h4b819s000"; }; # the files necessary to build the DATA target are not in this distribution diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix index 37baf241db65..d3d9cf87207d 100644 --- a/pkgs/development/interpreters/wasmer/default.nix +++ b/pkgs/development/interpreters/wasmer/default.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "wasmer"; - version = "0.13.0"; + version = "0.16.2"; src = fetchFromGitHub { owner = "wasmerio"; repo = pname; rev = version; - sha256 = "1k9zd2vhrbvxlpkh21m39alk5lfhd3xa25k0awis27plfpv8fqcq"; + sha256 = "124zq772kz9a7n3qpxgmp4awqj41l8mhhwc0y3r77i1q02i1sy7z"; fetchSubmodules = true; }; - cargoSha256 = "101y3zcnbl0w0zv2k0bhqk5d0xj8m2h6ww9r366j9b1y54cqj4b7"; + cargoSha256 = "1qqysvcviimpm2zhzsbn8vhy91rxzaknh9hv75y38xd5ggnnh9m6"; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix index 94c454859ae0..a5cbb0794750 100644 --- a/pkgs/development/libraries/audio/libmysofa/default.nix +++ b/pkgs/development/libraries/audio/libmysofa/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libmysofa"; - version = "0.9.1"; + version = "1.0"; src = fetchFromGitHub { owner = "hoene"; repo = "libmysofa"; rev = "v${version}"; - sha256 = "10pz9n99cl2j72m7bdj8xka5akyk0sjbysr7rlfdq0qfkiq5922v"; + sha256 = "053inxfl2n6wdgvnn02kf63m92r48ch4wqix9mqf3rgcf1bfkyfa"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/boost/1.62.nix b/pkgs/development/libraries/boost/1.62.nix deleted file mode 100644 index a1b3c51d0e69..000000000000 --- a/pkgs/development/libraries/boost/1.62.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ stdenv, callPackage, fetchurl, ... } @ args: - -callPackage ./generic.nix (args // { - version = "1.62.0"; - - src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_62_0.tar.bz2"; - # long-form SHA256 from www.boost.org - sha256 = "36c96b0f6155c98404091d8ceb48319a28279ca0333fba1ad8611eb90afb2ca0"; - }; - -}) diff --git a/pkgs/development/libraries/boost/1.63.nix b/pkgs/development/libraries/boost/1.63.nix deleted file mode 100644 index a8b459f4b12f..000000000000 --- a/pkgs/development/libraries/boost/1.63.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ stdenv, callPackage, fetchurl, ... } @ args: - -callPackage ./generic.nix (args // { - version = "1.63.0"; - - src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_63_0.tar.bz2"; - # SHA256 from http://www.boost.org/users/history/version_1_63_0.html - sha256 = "beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0"; - }; - -}) diff --git a/pkgs/development/libraries/boost/1.64.nix b/pkgs/development/libraries/boost/1.64.nix deleted file mode 100644 index 32632f79d225..000000000000 --- a/pkgs/development/libraries/boost/1.64.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ stdenv, callPackage, fetchurl, ... } @ args: - -callPackage ./generic.nix (args // { - version = "1.64.0"; - - src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_64_0.tar.bz2"; - # SHA256 from http://www.boost.org/users/history/version_1_64_0.html - sha256 = "7bcc5caace97baa948931d712ea5f37038dbb1c5d89b43ad4def4ed7cb683332"; - }; - -}) diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix index 84b4b1bab77f..5f84440df45e 100644 --- a/pkgs/development/libraries/dqlite/default.nix +++ b/pkgs/development/libraries/dqlite/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "dqlite"; - version = "1.0.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "canonical"; repo = pname; rev = "v${version}"; - sha256 = "0670c1c84lcf5vl3h6mlff00fz2fnm766bzlk526sjjzysx3zjya"; + sha256 = "19snm6cicxagcw9ys2jmjf6fchzs6pwm7h4jmyr0pn6zks2yjf1i"; }; nativeBuildInputs = [ autoreconfHook file pkgconfig ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; homepage = https://github.com/CanonicalLtd/dqlite/; license = licenses.asl20; - maintainers = with maintainers; [ joko ]; + maintainers = with maintainers; [ joko wucke13 ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/howard-hinnant-date/default.nix b/pkgs/development/libraries/howard-hinnant-date/default.nix index 185af3dff319..df6e43293887 100644 --- a/pkgs/development/libraries/howard-hinnant-date/default.nix +++ b/pkgs/development/libraries/howard-hinnant-date/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "howard-hinnant-date-unstable"; - version = "2020-01-24"; + version = "2020-03-09"; src = fetchFromGitHub { owner = "HowardHinnant"; repo = "date"; - rev = "9a0ee2542848ab8625984fc8cdbfb9b5414c0082"; - sha256 = "0yxsn0hj22n61bjywysxqgfv7hj5xvsl6isma95fl8xrimpny083"; + rev = "4c1968b8f038483037cadfdbad3215ce21d934bb"; + sha256 = "0dywrf18v1znfnz0gdxgi2ydax466zq34gc1vvg2k7vq17a30wq3"; }; patches = [ diff --git a/pkgs/development/libraries/java/jflex/default.nix b/pkgs/development/libraries/java/jflex/default.nix index 744419dcd533..5eb7ef6c0765 100644 --- a/pkgs/development/libraries/java/jflex/default.nix +++ b/pkgs/development/libraries/java/jflex/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, jre} : stdenv.mkDerivation rec { - name = "jflex-1.7.0"; + name = "jflex-1.8.1"; src = fetchurl { url = "http://jflex.de/release/${name}.tar.gz"; - sha256 = "1k7bqw1mn569g9dxc0ia3yz1bzgzs5w52lh1xn3hgj7k5ymh54kk"; + sha256 = "0hspw4z1i7wc1dnnyh4xx6ka7891nsw4hc66bf45510gjks6779x"; }; sourceRoot = name; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://www.jflex.de/; + homepage = "https://www.jflex.de/"; description = "Lexical analyzer generator for Java, written in Java"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index 7ea7bccd6b87..9324279ed100 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "5.1.0"; - sha256 = "0s3jpcyhzia8d4k0xyc67is78kg416p9yc3c2f9w6fhhqqffd5jk"; + version = "5.2.1"; + sha256 = "1xl7z0vwbn5iycg7amka9jd6hxd8nmfk7nahi4p9w2bnw9f0wcrl"; } diff --git a/pkgs/development/libraries/libinsane/default.nix b/pkgs/development/libraries/libinsane/default.nix new file mode 100644 index 000000000000..d37ae9426564 --- /dev/null +++ b/pkgs/development/libraries/libinsane/default.nix @@ -0,0 +1,47 @@ +{ stdenv +, lib +, meson +, ninja +, fetchFromGitLab +, pkg-config +, glib +, docbook_xsl +, sane-backends +, gobject-introspection +, vala +, gtk-doc +, valgrind +, doxygen +, cunit +}: + +stdenv.mkDerivation rec { + pname = "libinsane"; + version = "1.0.3"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + repo = "libinsane"; + group = "World"; + owner = "OpenPaperwork"; + rev = version; + sha256 = "1x2pl4ahqjc6ql97v7fnyna0qrnw3bxmqg3lyi5biyajfhg9nvql"; + }; + + nativeBuildInputs = [ meson pkg-config ninja doxygen gtk-doc docbook_xsl gobject-introspection vala ]; + + buildInputs = [ sane-backends glib ]; + + checkInputs = [ cunit valgrind ]; + + doCheck = true; + + meta = { + description = "Crossplatform access to image scanners (paper eaters only)"; + homepage = "https://openpaper.work/en/projects/"; + license = lib.licenses.lgpl3Plus; + maintainers = [ lib.maintainers.symphorien ]; + }; +} diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index 166ff2ef5a02..898c659d0f73 100644 --- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -1,20 +1,39 @@ -{ stdenv, fetchurl, cmake, boost, mysql }: +{ stdenv +, fetchurl +, cmake +, boost +, openssl +, mysql80 +}: stdenv.mkDerivation rec { pname = "libmysqlconnectorcpp"; - version = "1.1.9"; + version = "8.0.19"; src = fetchurl { - url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}.tar.gz"; - sha256 = "1r6j17sy5816a2ld759iis2k6igc2w9p70y4nw9w3rd4d5x88c9y"; + url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}-src.tar.gz"; + sha256 = "fDvXTOZKkwDn1IG3aziK2VAXpSSAxpi3VVea7GLUoh4="; }; - buildInputs = [ cmake boost mysql ]; + nativeBuildInputs = [ + cmake + ]; - cmakeFlags = [ "-DMYSQL_LIB_DIR=${mysql}/lib" ]; + buildInputs = [ + boost + openssl + mysql80 + ]; + + cmakeFlags = [ + # libmysqlclient is shared library + "-DMYSQLCLIENT_STATIC_LINKING=false" + # still needed for mysql-workbench + "-DWITH_JDBC=true" + ]; meta = { - homepage = https://dev.mysql.com/downloads/connector/cpp/; + homepage = "https://dev.mysql.com/downloads/connector/cpp/"; description = "C++ library for connecting to mysql servers."; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix index 7fba3f3baa66..5f5ffef20260 100644 --- a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix +++ b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix @@ -9,13 +9,13 @@ assert enableGrpc -> c-ares != null; stdenv.mkDerivation rec { pname = "lightstep-tracer-cpp"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "lightstep"; repo = pname; rev = "v${version}"; - sha256 = "1x7n3b5i9a0481azy3ymfybjfvr5z0i8wm17d964hsv7ryvnapj0"; + sha256 = "0zwj5r0rmfk6cm5ikay4kh7na455vskylc5yrxkhisn4n850d1l4"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/msgpack/default.nix b/pkgs/development/libraries/msgpack/default.nix index bf51f8954025..f94bd35c3019 100644 --- a/pkgs/development/libraries/msgpack/default.nix +++ b/pkgs/development/libraries/msgpack/default.nix @@ -1,12 +1,12 @@ { callPackage, fetchFromGitHub, ... } @ args: callPackage ./generic.nix (args // rec { - version = "3.0.1"; + version = "3.2.0"; src = fetchFromGitHub { owner = "msgpack"; repo = "msgpack-c"; rev = "cpp-${version}"; - sha256 = "0nr6y9v4xbvzv717j9w9lhmags1y2s5mq103v044qlyd2jkbg2p4"; + sha256 = "07n0kdmdjn3amwfg7fqz3xac1yrrxh7d2l6p4pgc6as087pbm8pl"; }; }) diff --git a/pkgs/development/libraries/ndi/default.nix b/pkgs/development/libraries/ndi/default.nix index fcf9457c691c..7a4407a17f0d 100644 --- a/pkgs/development/libraries/ndi/default.nix +++ b/pkgs/development/libraries/ndi/default.nix @@ -2,21 +2,22 @@ stdenv.mkDerivation rec { pname = "ndi"; - version = "4"; + fullVersion = "4.1.6"; + version = builtins.head (builtins.splitVersion fullVersion); src = requireFile rec { name = "InstallNDISDK_v${version}_Linux.tar.gz"; - sha256 = "1hac5npyg8nifs9ipj34pkn0zjyx8774x3i3h8znhmijx2j2982p"; + sha256 = "0hki805j3hlci6w5ca2cajm5q0y9yihgvpsykkn8dzx8chw4pmsk"; message = '' - In order to use the NDI SDK, you need to comply with NewTek's license and - download the Linux version ${version} tarball from: + In order to use NDI SDK version ${fullVersion}, you need to comply with + NewTek's license and download the appropriate Linux tarball from: - ${meta.homepage} + ${meta.homepage} Once you have downloaded the file, please use the following command and re-run the installation: - nix-prefetch-url file://\$PWD/${name} + \$ nix-prefetch-url file://\$PWD/${name} ''; }; diff --git a/pkgs/development/libraries/openjpeg/2.x.nix b/pkgs/development/libraries/openjpeg/2.x.nix index 24f3752ef435..fe0e5aeb6914 100644 --- a/pkgs/development/libraries/openjpeg/2.x.nix +++ b/pkgs/development/libraries/openjpeg/2.x.nix @@ -23,5 +23,15 @@ callPackage ./generic.nix (args // rec { name = "CVE-2019-12973-2.patch"; sha256 = "1jkkfw13l7nx4hxdhc7z17f4vfgqcaf09zpl235kypbxx1ygc7vq"; }) + (fetchpatch { + url = "https://github.com/uclouvain/openjpeg/commit/024b8407392cb0b82b04b58ed256094ed5799e04.patch"; + name = "CVE-2020-6851.patch"; + sha256 = "1lfwlzqxb69cwzjp8v9lijz4c2qhf3b8m6sq1khipqlgrb3l58xw"; + }) + (fetchpatch { + url = "https://github.com/uclouvain/openjpeg/commit/05f9b91e60debda0e83977e5e63b2e66486f7074.patch"; + name = "CVE-2020-8112.patch"; + sha256 = "16kykc8wbq9kx9w9kkf3i7snak82m184qrl9bpxvkjl7h0n9aw49"; + }) ]; }) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index d9028ddfbb5b..3c952d601654 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -45,6 +45,7 @@ let # TODO(@Ericson2314): Improve with mass rebuild configurePlatforms = []; configureScript = { + armv5tel-linux = "./Configure linux-armv4 -march=armv5te"; armv6l-linux = "./Configure linux-armv4 -march=armv6"; armv7l-linux = "./Configure linux-armv4 -march=armv7-a"; x86_64-darwin = "./Configure darwin64-x86_64-cc"; diff --git a/pkgs/development/libraries/raft-canonical/default.nix b/pkgs/development/libraries/raft-canonical/default.nix index 515fbc602d90..201c332dfdd4 100644 --- a/pkgs/development/libraries/raft-canonical/default.nix +++ b/pkgs/development/libraries/raft-canonical/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "raft-canonical"; - version = "0.9.6"; + version = "0.9.17"; src = fetchFromGitHub { owner = "canonical"; repo = "raft"; rev = "v${version}"; - sha256 = "083il7b5kw3pc7m5p9xjpb9dlvfarc51sni92mkgm9ckc32x9vpp"; + sha256 = "0q444wd6wz85g4zjkdsrf8z7chkjq9rxzq8l6fh37mgf7c23hv09"; }; nativeBuildInputs = [ autoreconfHook file pkgconfig ]; @@ -18,12 +18,14 @@ stdenv.mkDerivation rec { substituteInPlace configure --replace /usr/bin/ " " ''; - doCheck = false; - # Due to - #io_uv_recv/success/first [ ERROR ] - #Error: test/lib/dir.c:97: No such file or directory + # test fails + # + #append/finalizeSegment [ ERROR ] + #Error: test/integration/test_uv_append.c:264: assertion failed: test_dir_has_file(f->dir, "0000000000000001-0000000000000004") is not true #Error: child killed by signal 6 (Aborted) + doCheck = false; + outputs = [ "dev" "out" ]; meta = with stdenv.lib; { @@ -39,6 +41,6 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/canonical/raft"; license = licenses.asl20; - maintainers = [ maintainers.wucke13 ]; + maintainers = with maintainers; [ wucke13 ]; }; } diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix index c2eda9dac48b..492ad63f27b6 100644 --- a/pkgs/development/libraries/science/math/petsc/default.nix +++ b/pkgs/development/libraries/science/math/petsc/default.nix @@ -1,17 +1,12 @@ -{ stdenv -, fetchurl -, blas -, gfortran -, liblapack -, python }: +{ stdenv , fetchurl , blas , gfortran , liblapack , python }: stdenv.mkDerivation rec { pname = "petsc"; - version = "3.8.4"; + version = "3.12.4"; src = fetchurl { url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz"; - sha256 = "1iy49gagxncx09d88kxnwkj876p35683mpfk33x37165si6xqy4z"; + sha256 = "1hw4f12v2xwrs37gjh83dbixhg0yxandqx7s7k5vlfx91l9l3aan"; }; nativeBuildInputs = [ blas gfortran.cc.lib liblapack python ]; @@ -26,7 +21,7 @@ stdenv.mkDerivation rec { configureFlagsArray=( $configureFlagsArray "--CC=$CC" - "--with-cxx=0" + "--with-cxx=g++" "--with-fc=0" "--with-mpi=0" "--with-blas-lib=[${blas}/lib/libblas.a,${gfortran.cc.lib}/lib/libgfortran.a]" @@ -34,17 +29,14 @@ stdenv.mkDerivation rec { ) ''; - postInstall = '' - rm $out/bin/petscmpiexec - rm $out/bin/popup - rm $out/bin/uncrustify.cfg - rm -rf $out/bin/win32fe - ''; - - meta = { - description = "Library of linear algebra algorithms for solving partial differential equations"; - homepage = https://www.mcs.anl.gov/petsc/index.html; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.bsd2; + meta = with stdenv.lib; { + description = '' + Library of linear algebra algorithms for solving partial differential + equations + ''; + homepage = "https://www.mcs.anl.gov/petsc/index.html"; + license = licenses.bsd2; + maintainers = with maintainers; [ wucke13 ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index 4acb2b38b81c..f79f79a62597 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libtiff +, fetchpatch , qtLib ? null , enablePython ? false, python ? null # Darwin support @@ -21,6 +22,13 @@ stdenv.mkDerivation rec { sha256 = "0nm7xwwj7rnsxjdv2ssviys8nhci4n9iiiqm2y14s520hl2dsp1d"; }; + patches = [ + (fetchpatch { + url = "https://gitlab.kitware.com/vtk/vtk/-/commit/706f1b397df09a27ab8981ab9464547028d0c322.diff"; + sha256 = "1q3pi5h40g05pzpbqp75xlgzvbfvyw8raza51svmi7d8dlslqybx"; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ libtiff ] @@ -60,7 +68,7 @@ stdenv.mkDerivation rec { description = "Open source libraries for 3D computer graphics, image processing and visualization"; homepage = http://www.vtk.org/; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix index 8363f774c241..0b57d0993190 100644 --- a/pkgs/development/libraries/wcslib/default.nix +++ b/pkgs/development/libraries/wcslib/default.nix @@ -1,14 +1,14 @@ { fetchurl, stdenv, flex }: stdenv.mkDerivation rec { - version = "7.1"; + version = "7.2"; pname = "wcslib"; buildInputs = [ flex ]; src = fetchurl { url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${pname}-${version}.tar.bz2"; - sha256 ="05ji2v4la8h6azprb8x2zh6wrswxsq8cqw9zml0layc4nfg79fzh"; + sha256 ="0fbf6ypq7ag9dmjn65ja5vbfxswb6511bja8rbna25wmhns9x5b3"; }; prePatch = '' @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "World Coordinate System Library for Astronomy"; - homepage = https://www.atnf.csiro.au/people/mcalabre/WCS/; + homepage = "https://www.atnf.csiro.au/people/mcalabre/WCS/"; longDescription = ''Library for world coordinate systems for spherical geometries and their conversion to image coordinate diff --git a/pkgs/development/ocaml-modules/earley/default.nix b/pkgs/development/ocaml-modules/earley/default.nix index ab3011361e12..f47231a242e0 100644 --- a/pkgs/development/ocaml-modules/earley/default.nix +++ b/pkgs/development/ocaml-modules/earley/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchurl, buildDunePackage }: +{ lib, fetchurl, ocaml, buildDunePackage }: + +if lib.versionAtLeast ocaml.version "4.08" +then throw "earley is not available for OCaml ${ocaml.version}" +else buildDunePackage rec { version = "2.0.0"; diff --git a/pkgs/development/ocaml-modules/earlybird/default.nix b/pkgs/development/ocaml-modules/earlybird/default.nix index 1a98c748e456..decbb4117670 100644 --- a/pkgs/development/ocaml-modules/earlybird/default.nix +++ b/pkgs/development/ocaml-modules/earlybird/default.nix @@ -1,7 +1,11 @@ -{ lib, fetchurl, buildDunePackage, angstrom, angstrom-lwt-unix, +{ lib, fetchurl, ocaml, buildDunePackage, angstrom, angstrom-lwt-unix, batteries, cmdliner, lwt_ppx, ocaml_lwt, ppx_deriving_yojson, ppx_tools_versioned, yojson }: +if lib.versionAtLeast ocaml.version "4.08" +then throw "earlybird is not available for OCaml ${ocaml.version}" +else + buildDunePackage rec { pname = "earlybird"; version = "0.1.5"; diff --git a/pkgs/development/ocaml-modules/ocf/default.nix b/pkgs/development/ocaml-modules/ocf/default.nix index 0452b1b7dfe4..e90d13de3b39 100644 --- a/pkgs/development/ocaml-modules/ocf/default.nix +++ b/pkgs/development/ocaml-modules/ocf/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ppx_tools, yojson }: if stdenv.lib.versionOlder ocaml.version "4.03" +|| stdenv.lib.versionAtLeast ocaml.version "4.08" then throw "ocf not supported for ocaml ${ocaml.version}" else stdenv.mkDerivation rec { diff --git a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix index 03cadad7ff4d..7fd939e58ec2 100644 --- a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix @@ -2,19 +2,19 @@ buildDunePackage rec { pname = "ppx_tools_versioned"; - version = "5.2.3"; + version = "5.3.0"; src = fetchFromGitHub { owner = "ocaml-ppx"; repo = pname; rev = version; - sha256 = "1hcmpnw26zf70a71r3d2c2c0mn8q084gdn1r36ynng6fv9hq6j0y"; + sha256 = "0c735w9mq49dmvkdw9ahfwh0icsk2sbhnfwmdhpibj86phfm17yj"; }; propagatedBuildInputs = [ ocaml-migrate-parsetree ]; meta = with lib; { - homepage = https://github.com/let-def/ppx_tools_versioned; + homepage = "https://github.com/let-def/ppx_tools_versioned"; description = "Tools for authors of syntactic tools (such as ppx rewriters)"; license = licenses.gpl2; maintainers = [ maintainers.volth ]; diff --git a/pkgs/development/ocaml-modules/sedlex/2.nix b/pkgs/development/ocaml-modules/sedlex/2.nix index 09390a27343f..26c35b983392 100644 --- a/pkgs/development/ocaml-modules/sedlex/2.nix +++ b/pkgs/development/ocaml-modules/sedlex/2.nix @@ -1,16 +1,15 @@ -{ stdenv +{ lib , fetchFromGitHub , fetchurl +, buildDunePackage , ocaml -, dune -, findlib , gen , ppx_tools_versioned , ocaml-migrate-parsetree , uchar }: -if stdenv.lib.versionOlder ocaml.version "4.02.3" +if lib.versionOlder ocaml.version "4.02.3" then throw "sedlex is not available for OCaml ${ocaml.version}" else @@ -28,8 +27,8 @@ let sha256 = "0gsb1jpj3mnqbjgbavi4l95gl6g4agq58j82km22fdfg63j3w3fk"; }; in -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-sedlex-${version}"; +buildDunePackage rec { + pname = "sedlex"; version = "2.1"; src = fetchFromGitHub { @@ -39,7 +38,7 @@ stdenv.mkDerivation rec { sha256 = "05f6qa8x3vhpdz1fcnpqk37fpnyyq13icqsk2gww5idjnh6kng26"; }; - buildInputs = [ ocaml findlib dune ppx_tools_versioned ocaml-migrate-parsetree ]; + buildInputs = [ ppx_tools_versioned ocaml-migrate-parsetree ]; propagatedBuildInputs = [ gen uchar ]; @@ -49,21 +48,14 @@ stdenv.mkDerivation rec { ln -s ${PropList} src/generator/data/PropList.txt ''; - buildFlags = [ "build" ]; - - installPhase = '' - make INSTALL_ARGS="--prefix=$out --libdir=$OCAMLFIND_DESTDIR" install - ''; - - createFindlibDestdir = true; + doCheck = true; dontStrip = true; meta = { homepage = https://github.com/ocaml-community/sedlex; description = "An OCaml lexer generator for Unicode"; - license = stdenv.lib.licenses.mit; - inherit (ocaml.meta) platforms; - maintainers = [ stdenv.lib.maintainers.marsam ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.marsam ]; }; } diff --git a/pkgs/development/ocaml-modules/wasm/default.nix b/pkgs/development/ocaml-modules/wasm/default.nix index e10a67a50a0d..fe3d4ea0e863 100644 --- a/pkgs/development/ocaml-modules/wasm/default.nix +++ b/pkgs/development/ocaml-modules/wasm/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }: if !stdenv.lib.versionAtLeast ocaml.version "4.02" + || stdenv.lib.versionAtLeast ocaml.version "4.08" then throw "wasm is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/development/python-modules/azure-mgmt-sql/default.nix b/pkgs/development/python-modules/azure-mgmt-sql/default.nix index 0929ca3ff5c2..a81f336df066 100644 --- a/pkgs/development/python-modules/azure-mgmt-sql/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-sql/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-sql"; - version = "0.16.0"; + version = "0.17.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "ddbdc29c1dca437275b0cb5a6fe2d86fa6886ccefb2270287357f07afe80a4ac"; + sha256 = "1kp1wzcydgyc2mzkxigfv6rqzwzf3d0cnbqc6w7h907qbb4lw2r0"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bravado-core/default.nix b/pkgs/development/python-modules/bravado-core/default.nix new file mode 100644 index 000000000000..55a12009a15c --- /dev/null +++ b/pkgs/development/python-modules/bravado-core/default.nix @@ -0,0 +1,52 @@ +{ lib, buildPythonPackage, fetchFromGitHub, python-dateutil, jsonref, jsonschema, + pyyaml, simplejson, six, pytz, msgpack, swagger-spec-validator, rfc3987, + strict-rfc3339, webcolors, mypy-extensions, jsonpointer, idna, pytest, mock, + pytest-benchmark, isPy27, enum34 }: + +buildPythonPackage rec { + pname = "bravado-core"; + version = "5.16.1"; + + src = fetchFromGitHub { + owner = "Yelp"; + repo = pname; + rev = "v${version}"; + sha256 = "0r9gk5vkjbc407fjydms3ik3hnzajq54znyz58d8rm6pvqcvjjpl"; + }; + + checkInputs = [ + mypy-extensions + pytest + mock + pytest-benchmark + ]; + + checkPhase = ''pytest --benchmark-skip''; + + propagatedBuildInputs = [ + python-dateutil + jsonref + jsonschema + pyyaml + simplejson + six + pytz + msgpack + swagger-spec-validator + + # the following 3 packages are included when jsonschema (3.2) is installed + # as jsonschema[format], which reflects what happens in setup.py + rfc3987 + strict-rfc3339 + webcolors + jsonpointer + idna + ] ++ lib.optionals isPy27 [ enum34 ]; + + meta = with lib; { + description = "Library for adding Swagger support to clients and servers"; + homepage = "https://github.com/Yelp/bravado-core"; + license = licenses.bsd3; + maintainers = with maintainers; [ vanschelven ]; + }; +} diff --git a/pkgs/development/python-modules/convertdate/default.nix b/pkgs/development/python-modules/convertdate/default.nix new file mode 100644 index 000000000000..5a8608c5037f --- /dev/null +++ b/pkgs/development/python-modules/convertdate/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, pymeeus, pytz }: + +buildPythonPackage rec { + pname = "convertdate"; + version = "2.2.0"; + + # Tests are not available in the PyPI tarball so use GitHub instead. + src = fetchFromGitHub { + owner = "fitnr"; + repo = pname; + rev = "v${version}"; + sha256 = "04j8k7a9qndmawy3m345py74y18hw7lb6gc0qp0mr8d68x99xjq0"; + }; + + propagatedBuildInputs = [ pymeeus pytz ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/fitnr/convertdate"; + description = "Utils for converting between date formats and calculating holidays"; + license = licenses.mit; + maintainers = with maintainers; [ jluttine ]; + }; +} diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index 75edf5dc424c..daec9218a1de 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchurl , uvicorn , starlette , pydantic @@ -10,11 +11,12 @@ , pyjwt , passlib , aiosqlite +, peewee }: buildPythonPackage rec { pname = "fastapi"; - version = "0.45.0"; + version = "0.49.0"; format = "flit"; disabled = !isPy3k; @@ -22,7 +24,7 @@ buildPythonPackage rec { owner = "tiangolo"; repo = "fastapi"; rev = version; - sha256 = "1qwh382ny6qa3zi64micdq4j7dc64zv4rfd8g91j0digd4rhs6i1"; + sha256 = "1dw5f2xvn0fqqsy29ypba8v3444cy7dvc7gkpmnhshky0rmfni3n"; }; propagatedBuildInputs = [ @@ -37,16 +39,9 @@ buildPythonPackage rec { pyjwt passlib aiosqlite + peewee ]; - # starlette pinning kept in place due to 0.12.9 being a hard - # dependency luckily fastapi is currently the only dependent on - # starlette. Please remove pinning when possible - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "pydantic >=0.32.2,<=0.32.2" "pydantic" - ''; - checkPhase = '' pytest --ignore=tests/test_default_response_class.py ''; diff --git a/pkgs/development/python-modules/hickle/default.nix b/pkgs/development/python-modules/hickle/default.nix index 8d45970294c7..bc8c741ec2bd 100644 --- a/pkgs/development/python-modules/hickle/default.nix +++ b/pkgs/development/python-modules/hickle/default.nix @@ -6,20 +6,23 @@ , astropy , scipy , pandas +, codecov , pytest , pytestcov , pytestrunner , coveralls +, twine +, check-manifest , lib }: buildPythonPackage rec { pname = "hickle"; - version = "3.4.5"; + version = "3.4.6"; src = fetchPypi { inherit pname version; - sha256 = "1d1qj3yl7635lgkqacz9r8fyhv71396l748ww4wy05ibpignjm2x"; + sha256 = "026r6yg3amsi8k8plzsbw5rnifym6sc17y011daqyvcpb7mfs94b"; }; postPatch = '' @@ -28,7 +31,9 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ h5py numpy dill ]; - checkInputs = [ pytest pytestcov pytestrunner coveralls scipy pandas astropy ]; + checkInputs = [ + pytest pytestcov pytestrunner coveralls scipy pandas astropy twine check-manifest codecov + ]; meta = { description = "Serialize Python data to HDF5"; diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index ebde21a48217..eeaf449971b8 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -1,18 +1,18 @@ -{ stdenv, buildPythonPackage, fetchPypi , six, dateutil }: +{ stdenv, buildPythonPackage, fetchPypi, six, dateutil, convertdate }: buildPythonPackage rec { pname = "holidays"; - version = "0.9.12"; + version = "0.10.1"; src = fetchPypi { inherit pname version; - sha256 = "3182c4a6fef8d01a829468362ace9c3bba7645873610535fef53454dbb4ea092"; + sha256 = "1dx39krafb6cdnd7h5vgwmw4y075s6k3d31a6vhwvqhmdig3294h"; }; - propagatedBuildInputs = [ six dateutil ]; + propagatedBuildInputs = [ six dateutil convertdate ]; meta = with stdenv.lib; { - homepage = https://github.com/dr-prodigy/python-holidays; + homepage = "https://github.com/dr-prodigy/python-holidays"; description = "Generate and work with holidays in Python"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; diff --git a/pkgs/development/python-modules/i3ipc/default.nix b/pkgs/development/python-modules/i3ipc/default.nix index 482a51a099ec..707a58ff85ef 100644 --- a/pkgs/development/python-modules/i3ipc/default.nix +++ b/pkgs/development/python-modules/i3ipc/default.nix @@ -1,24 +1,37 @@ { stdenv, buildPythonPackage, fetchFromGitHub , enum-compat -, xorgserver, pytest, i3, python +, xorgserver, pytest, pytest-xvfb, pytest-asyncio, i3, python, xlib, xdpyinfo +, makeFontsConf, coreutils }: buildPythonPackage rec { pname = "i3ipc"; - version = "1.6.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "acrisci"; repo = "i3ipc-python"; rev = "v${version}"; - sha256 = "0sb525wvwcnikjaqzha94xr97r1gjys30csmaj17swlxgyczxvq5"; + sha256 = "10zpbiw1gcndn439g1vxcdkxllwp02qcmaal4w7hi2rzgaw1xkdk"; }; + propagatedBuildInputs = [ enum-compat xlib ]; - propagatedBuildInputs = [ enum-compat ]; + fontsConf = makeFontsConf { + fontDirectories = [ ]; + }; + FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file + checkInputs = [ pytest xdpyinfo pytest-asyncio pytest-xvfb xorgserver i3 ]; + + postPatch = '' + substituteInPlace test/i3.config \ + --replace /bin/true ${coreutils}/bin/true + ''; - checkInputs = [ xorgserver pytest i3 ]; + checkPhase = '' + py.test --ignore=test/aio/test_shutdown_event.py \ + --ignore=test/test_shutdown_event.py + ''; - checkPhase = ''${python.interpreter} run-tests.py''; meta = with stdenv.lib; { description = "An improved Python library to control i3wm and sway"; diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 55ade7db9caa..3faa0a2edc39 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "1.2.6"; + version = "2.0.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "0mc3nrj7fc5q2ajr09m261j386jsp8qjljg8anghlh8czc9ln4s2"; + sha256 = "17p8rpihid0103fyjndk2yvg18n3ypn3hxay92ckcv10vsbiys5b"; }; propagatedBuildInputs = [ jupyterlab_server notebook ]; diff --git a/pkgs/development/python-modules/klaus/default.nix b/pkgs/development/python-modules/klaus/default.nix index d1218ab49b74..a2d171fbb9a5 100644 --- a/pkgs/development/python-modules/klaus/default.nix +++ b/pkgs/development/python-modules/klaus/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "klaus"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "jonashaag"; repo = pname; rev = version; - sha256 = "1432m3ki2g4ma10pfv310q1w4da46b0y2jklb8ajbz8a09ms6mfx"; + sha256 = "12b96jgiv9y7zmkqqj3dh0fbbm3ps8gbqk925qrhh56zqjl66kx2"; }; prePatch = '' diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index c7631f0c5b25..f8c1222fb3ff 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "nio"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; rev = version; - sha256 = "05cggfhsfa0irvzc7x3fndv6n0zszxxhmlv89r5rkrl5wvrhbb2h"; + sha256 = "151c59a913y6kx99g7g3mhpgbgavwic1mh21nfrr9x0rm98ilay9"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index 59dd94b30188..8e479dfaca25 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -15,7 +15,8 @@ buildPythonPackage rec { }; # arch doesn't report frequency is the same way - doCheck = stdenv.isx86_64; + # tests segfaults on darwin https://github.com/giampaolo/psutil/issues/1715 + doCheck = stdenv.isDarwin || stdenv.isx86_64; checkInputs = [ pytest ] ++ lib.optionals isPy27 [ mock ipaddress ]; # out must be referenced as test import paths are relative diff --git a/pkgs/development/python-modules/pyicloud/default.nix b/pkgs/development/python-modules/pyicloud/default.nix index 1c6fe286db5a..7bc52f74701c 100644 --- a/pkgs/development/python-modules/pyicloud/default.nix +++ b/pkgs/development/python-modules/pyicloud/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "pyicloud"; - version = "0.9.2"; + version = "0.9.4"; src = fetchPypi { inherit pname version; - sha256 = "1jjkzf7vwms6pymnmdr893830vrymxnq455xnqp21wqhjjiy2amd"; + sha256 = "0r171wnq2g5bw7gd59vh6flm0104ix1a6s2vhdrf8s74hipw57si"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyinsane2/default.nix b/pkgs/development/python-modules/pyinsane2/default.nix deleted file mode 100644 index 8f96ebe915a6..000000000000 --- a/pkgs/development/python-modules/pyinsane2/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, nose -, pillow -, pkgs -}: - -buildPythonPackage rec { - pname = "pyinsane2"; - version = "2.0.13"; - - src = fetchPypi { - inherit pname version; - sha256 = "0d519531d552e4512776225eb400a6a4a9bfc83a08918ec7fea19cb2fa7ec4ee"; - }; - - # This is needed by setup.py regardless of whether tests are enabled. - buildInputs = [ nose ]; - propagatedBuildInputs = [ pillow ]; - - postPatch = '' - # pyinsane2 forks itself, so we need to re-inject the PYTHONPATH. - sed -i -e '/os.putenv.*PYINSANE_DAEMON/ { - a \ os.putenv("PYTHONPATH", ":".join(sys.path)) - }' pyinsane2/sane/abstract_proc.py - - sed -i -e 's,"libsane.so.1","${pkgs.sane-backends}/lib/libsane.so",' \ - pyinsane2/sane/rawapi.py - ''; - - # Tests require a scanner to be physically connected, so let's just do a - # quick check whether initialization works. - checkPhase = '' - python -c 'import pyinsane2; pyinsane2.init()' - ''; - - meta = with stdenv.lib; { - homepage = "https://github.com/jflesch/pyinsane"; - description = "Access and use image scanners"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/development/python-modules/pymeeus/default.nix b/pkgs/development/python-modules/pymeeus/default.nix new file mode 100644 index 000000000000..4c8097325bcc --- /dev/null +++ b/pkgs/development/python-modules/pymeeus/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest }: + +buildPythonPackage rec { + pname = "PyMeeus"; + version = "0.3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "0qjnk9sc65i4by2x4zm6w941a4i31fmhgwbkpbqkk87rwq4h4hsn"; + }; + + checkInputs = [ pytest ]; + + checkPhase = '' + pytest . + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/architest/pymeeus"; + description = "Library of astronomical algorithms"; + license = licenses.lgpl3; + maintainers = with maintainers; [ jluttine ]; + }; +} diff --git a/pkgs/development/python-modules/pyocr/default.nix b/pkgs/development/python-modules/pyocr/default.nix index ca606767f4d5..8cfce9ba43f1 100644 --- a/pkgs/development/python-modules/pyocr/default.nix +++ b/pkgs/development/python-modules/pyocr/default.nix @@ -1,10 +1,10 @@ -{ lib, fetchFromGitLab, buildPythonPackage, pillow, six -, tesseract, cuneiform, isPy3k, substituteAll, pytest, tox -}: +{ lib, fetchFromGitLab, buildPythonPackage, pillow, setuptools_scm, +setuptools-scm-git-archive , tesseract, cuneiform, isPy3k, substituteAll, +pytest, tox }: buildPythonPackage rec { pname = "pyocr"; - version = "0.5.3"; + version = "0.7.2"; disabled = !isPy3k; # Don't fetch from PYPI because it doesn't contain tests. @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "OpenPaperwork"; repo = "pyocr"; rev = version; - sha256 = "1nihf0qmbpg3yj3yp11jp6hp5z5dqf39nz6j9lqbvgi1nqbs7x15"; + sha256 = "09ab86bmizpv94w3mdvdqkjyyvk1vafw3jqhkiw5xx7p180xn3il"; }; patches = [ (substituteAll { @@ -23,38 +23,8 @@ buildPythonPackage rec { }) ]; - postPatch = '' - echo 'version = "${version}"' > src/pyocr/_version.py - - # Disable specific tests that are probably failing because of this issue: - # https://github.com/jflesch/pyocr/issues/52 - for test in $disabledTests; do - file="''${test%%:*}" - fun="''${test#*:}" - echo "import pytest" >> "tests/tests_$file.py" - echo "$fun = pytest.mark.skip($fun)" >> "tests/tests_$file.py" - done - ''; - - disabledTests = [ - "cuneiform:TestTxt.test_basic" - "cuneiform:TestTxt.test_european" - "cuneiform:TestTxt.test_french" - "cuneiform:TestWordBox.test_basic" - "cuneiform:TestWordBox.test_european" - "cuneiform:TestWordBox.test_french" - "libtesseract:TestBasicDoc.test_basic" - "libtesseract:TestDigitLineBox.test_digits" - "libtesseract:TestLineBox.test_japanese" - "libtesseract:TestTxt.test_japanese" - "libtesseract:TestWordBox.test_japanese" - "libtesseract:TestTxt.test_multi" - "tesseract:TestTxt.test_multi" - "tesseract:TestDigitLineBox.test_digits" - "tesseract:TestTxt.test_japanese" - ]; - - propagatedBuildInputs = [ pillow six ]; + buildInputs = [ setuptools_scm setuptools-scm-git-archive ]; + propagatedBuildInputs = [ pillow ]; checkInputs = [ pytest tox ]; checkPhase = "pytest"; diff --git a/pkgs/development/python-modules/pyocr/paths.patch b/pkgs/development/python-modules/pyocr/paths.patch index 9350d4050dad..55cbf7d48da4 100644 --- a/pkgs/development/python-modules/pyocr/paths.patch +++ b/pkgs/development/python-modules/pyocr/paths.patch @@ -1,9 +1,9 @@ -Index: current/src/pyocr/cuneiform.py -=================================================================== ---- current.orig/src/pyocr/cuneiform.py -+++ current/src/pyocr/cuneiform.py -@@ -27,13 +27,9 @@ from . import error - from . import util +diff --git a/src/pyocr/cuneiform.py b/src/pyocr/cuneiform.py +index 2e5b717..35647e2 100644 +--- a/src/pyocr/cuneiform.py ++++ b/src/pyocr/cuneiform.py +@@ -25,13 +25,9 @@ from . import builders + from .error import CuneiformError -# CHANGE THIS IF CUNEIFORM IS NOT IN YOUR PATH, OR IS NAMED DIFFERENTLY @@ -18,25 +18,34 @@ Index: current/src/pyocr/cuneiform.py LANGUAGES_LINE_PREFIX = "Supported languages: " LANGUAGES_SPLIT_RE = re.compile("[^a-z]") -Index: current/src/pyocr/libtesseract/tesseract_raw.py -=================================================================== ---- current.orig/src/pyocr/libtesseract/tesseract_raw.py -+++ current/src/pyocr/libtesseract/tesseract_raw.py -@@ -1,52 +1,13 @@ - import ctypes +diff --git a/src/pyocr/libtesseract/tesseract_raw.py b/src/pyocr/libtesseract/tesseract_raw.py +index a068e73..9ebea5c 100644 +--- a/src/pyocr/libtesseract/tesseract_raw.py ++++ b/src/pyocr/libtesseract/tesseract_raw.py +@@ -2,7 +2,6 @@ import ctypes + import locale import logging import os -import sys from ..error import TesseractError - +@@ -10,48 +9,16 @@ from ..error import TesseractError logger = logging.getLogger(__name__) --TESSDATA_PREFIX = os.getenv('TESSDATA_PREFIX', None) + TESSDATA_PREFIX = os.getenv('TESSDATA_PREFIX', None) -libnames = [] ++if TESSDATA_PREFIX is None: ++ TESSDATA_PREFIX = '@tesseract@/share/tessdata' ++ os.environ['TESSDATA_PREFIX'] = TESSDATA_PREFIX ++ ++ + # 70 is the minimum credible dpi for tesseract and force it to compute an + # estimate of the image dpi + DPI_DEFAULT = 70 + - --if getattr(sys, 'frozen', False): +-if getattr(sys, 'frozen', False): # pragma: no cover - # Pyinstaller integration - libnames += [os.path.join(sys._MEIPASS, "libtesseract-4.dll")] - libnames += [os.path.join(sys._MEIPASS, "libtesseract-3.dll")] @@ -51,7 +60,7 @@ Index: current/src/pyocr/libtesseract/tesseract_raw.py - TESSDATA_PREFIX = tessdata - - --if sys.platform[:3] == "win": +-if sys.platform[:3] == "win": # pragma: no cover - libnames += [ - # Jflesch> Don't they have the equivalent of LD_LIBRARY_PATH on - # Windows ? @@ -76,15 +85,16 @@ Index: current/src/pyocr/libtesseract/tesseract_raw.py g_libtesseract = None -@@ -346,12 +307,11 @@ def init(lang=None): +@@ -364,12 +331,12 @@ def init(lang=None): try: if lang: lang = lang.encode("utf-8") - prefix = None -- if TESSDATA_PREFIX: +- if TESSDATA_PREFIX: # pragma: no cover - prefix = TESSDATA_PREFIX.encode("utf-8") -+ prefix = os.getenv('TESSDATA_PREFIX', '@tesseract@/share/tessdata') -+ os.environ['TESSDATA_PREFIX'] = prefix ++ ++ prefix = TESSDATA_PREFIX ++ g_libtesseract.TessBaseAPIInit3( ctypes.c_void_p(handle), - ctypes.c_char_p(prefix), @@ -92,11 +102,11 @@ Index: current/src/pyocr/libtesseract/tesseract_raw.py ctypes.c_char_p(lang) ) g_libtesseract.TessBaseAPISetVariable( -Index: current/src/pyocr/tesseract.py -=================================================================== ---- current.orig/src/pyocr/tesseract.py -+++ current/src/pyocr/tesseract.py -@@ -31,8 +31,7 @@ from .builders import DigitBuilder # ba +diff --git a/src/pyocr/tesseract.py b/src/pyocr/tesseract.py +index 7c30852..44e8446 100644 +--- a/src/pyocr/tesseract.py ++++ b/src/pyocr/tesseract.py +@@ -28,8 +28,7 @@ from .builders import DigitBuilder # backward compatibility from .error import TesseractError # backward compatibility from .util import digits_only @@ -106,3 +116,233 @@ Index: current/src/pyocr/tesseract.py TESSDATA_EXTENSION = ".traineddata" +diff --git a/tests/tests_cuneiform.py b/tests/tests_cuneiform.py +index 45b7f6a..95f55c6 100644 +--- a/tests/tests_cuneiform.py ++++ b/tests/tests_cuneiform.py +@@ -21,7 +21,7 @@ class TestCuneiform(BaseTest): + # XXX is it useful? + which.return_value = True + self.assertTrue(cuneiform.is_available()) +- which.assert_called_once_with("cuneiform") ++ which.assert_called_once_with("@cuneiform@/bin/cuneiform") + + @patch("subprocess.Popen") + def test_version(self, popen): +@@ -54,7 +54,7 @@ class TestCuneiform(BaseTest): + self.assertIn("eng", langs) + self.assertIn("fra", langs) + popen.assert_called_once_with( +- ["cuneiform", "-l"], ++ ["@cuneiform@/bin/cuneiform", "-l"], + stdout=subprocess.PIPE, stderr=subprocess.STDOUT + ) + +@@ -109,7 +109,7 @@ class TestCuneiformTxt(BaseTest): + output = cuneiform.image_to_string(self.image) + self.assertEqual(output, self._get_file_content("text").strip()) + popen.assert_called_once_with( +- ["cuneiform", "-f", "text", "-o", self.tmp_filename, "-"], ++ ["@cuneiform@/bin/cuneiform", "-f", "text", "-o", self.tmp_filename, "-"], + stdin=subprocess.PIPE, stdout=subprocess.PIPE, + stderr=subprocess.STDOUT + ) +@@ -125,7 +125,7 @@ class TestCuneiformTxt(BaseTest): + builder=self.builder) + self.assertEqual(output, self._get_file_content("text").strip()) + popen.assert_called_once_with( +- ["cuneiform", "-l", "fra", "-f", "text", "-o", self.tmp_filename, ++ ["@cuneiform@/bin/cuneiform", "-l", "fra", "-f", "text", "-o", self.tmp_filename, + "-"], + stdin=subprocess.PIPE, stdout=subprocess.PIPE, + stderr=subprocess.STDOUT +@@ -142,7 +142,7 @@ class TestCuneiformTxt(BaseTest): + builder=self.builder) + self.assertEqual(output, self._get_file_content("text").strip()) + popen.assert_called_once_with( +- ["cuneiform", "-f", "text", "-o", self.tmp_filename, "-"], ++ ["@cuneiform@/bin/cuneiform", "-f", "text", "-o", self.tmp_filename, "-"], + stdin=subprocess.PIPE, stdout=subprocess.PIPE, + stderr=subprocess.STDOUT + ) +@@ -173,7 +173,7 @@ class TestCuneiformTxt(BaseTest): + output = cuneiform.image_to_string(image, builder=self.builder) + self.assertEqual(output, self._get_file_content("text").strip()) + popen.assert_called_once_with( +- ["cuneiform", "-f", "text", "-o", self.tmp_filename, "-"], ++ ["@cuneiform@/bin/cuneiform", "-f", "text", "-o", self.tmp_filename, "-"], + stdin=subprocess.PIPE, stdout=subprocess.PIPE, + stderr=subprocess.STDOUT + ) +@@ -227,7 +227,7 @@ class TestCuneiformWordBox(BaseTest): + output = cuneiform.image_to_string(self.image, + builder=self.builder) + popen.assert_called_once_with( +- ["cuneiform", "-f", "hocr", "-o", self.tmp_filename, "-"], ++ ["@cuneiform@/bin/cuneiform", "-f", "hocr", "-o", self.tmp_filename, "-"], + stdin=subprocess.PIPE, stdout=subprocess.PIPE, + stderr=subprocess.STDOUT + ) +@@ -280,7 +280,7 @@ class TestCuneiformLineBox(BaseTest): + output = cuneiform.image_to_string(self.image, + builder=self.builder) + popen.assert_called_once_with( +- ["cuneiform", "-f", "hocr", "-o", self.tmp_filename, "-"], ++ ["@cuneiform@/bin/cuneiform", "-f", "hocr", "-o", self.tmp_filename, "-"], + stdin=subprocess.PIPE, stdout=subprocess.PIPE, + stderr=subprocess.STDOUT + ) +diff --git a/tests/tests_libtesseract.py b/tests/tests_libtesseract.py +index ad7fdc9..57e7a60 100644 +--- a/tests/tests_libtesseract.py ++++ b/tests/tests_libtesseract.py +@@ -165,7 +165,8 @@ class TestLibTesseractRaw(BaseTest): + args = libtess.TessBaseAPIInit3.call_args[0] + self.assertEqual(len(args), 3) + self.assertEqual(args[0].value, self.handle) +- self.assertEqual(args[1].value, None) ++ # we hardcode tesseract data, so we don't get None ++ #self.assertEqual(args[1].value, None) + self.assertEqual(args[2].value, lang.encode() if lang else None) + + self.assertEqual( +@@ -201,7 +202,8 @@ class TestLibTesseractRaw(BaseTest): + args = libtess.TessBaseAPIInit3.call_args[0] + self.assertEqual(len(args), 3) + self.assertEqual(args[0].value, self.handle) +- self.assertEqual(args[1].value, None) ++ # we hardcode tesseract data, so we don't get None ++ #self.assertEqual(args[1].value, None) + self.assertEqual(args[2].value, lang.encode() if lang else None) + + self.assertEqual( +diff --git a/tests/tests_tesseract.py b/tests/tests_tesseract.py +index 1a55567..a24d96f 100644 +--- a/tests/tests_tesseract.py ++++ b/tests/tests_tesseract.py +@@ -36,7 +36,7 @@ class TestTesseract(BaseTest): + def test_available(self, which): + which.return_value = True + self.assertTrue(tesseract.is_available()) +- which.assert_called_once_with("tesseract") ++ which.assert_called_once_with("@tesseract@/bin/tesseract") + + @patch("subprocess.Popen") + def test_version_error(self, popen): +@@ -156,7 +156,7 @@ class TestTesseract(BaseTest): + for lang in ("eng", "fra", "jpn", "osd"): + self.assertIn(lang, langs) + popen.assert_called_once_with( +- ["tesseract", "--list-langs"], ++ ["@tesseract@/bin/tesseract", "--list-langs"], + startupinfo=None, creationflags=0, + stdout=subprocess.PIPE, stderr=subprocess.STDOUT + ) +@@ -171,7 +171,7 @@ class TestTesseract(BaseTest): + self.assertEqual(te.exception.status, 1) + self.assertEqual("unable to get languages", te.exception.message) + popen.assert_called_once_with( +- ["tesseract", "--list-langs"], ++ ["@tesseract@/bin/tesseract", "--list-langs"], + startupinfo=None, creationflags=0, + stdout=subprocess.PIPE, stderr=subprocess.STDOUT + ) +@@ -248,7 +248,7 @@ class TestTesseract(BaseTest): + self.assertEqual(status, 0) + self.assertEqual(error, message) + popen.assert_called_once_with( +- ["tesseract", "input.bmp", "output"], ++ ["@tesseract@/bin/tesseract", "input.bmp", "output"], + cwd=tmpdir, + startupinfo=None, + creationflags=0, +@@ -271,7 +271,7 @@ class TestTesseract(BaseTest): + self.assertEqual(status, 0) + self.assertEqual(error, message) + popen.assert_called_with( +- ["tesseract", "input2.bmp", "output2", "-l", "fra", "--psm", "3"], ++ ["@tesseract@/bin/tesseract", "input2.bmp", "output2", "-l", "fra", "--psm", "3"], + cwd=tmpdir, + startupinfo=None, + creationflags=0, +@@ -302,7 +302,7 @@ class TestTesseract(BaseTest): + self.assertEqual(result["angle"], 90) + self.assertEqual(result["confidence"], 9.30) + popen.assert_called_once_with( +- ["tesseract", "input.bmp", "stdout", "--psm", "0"], ++ ["@tesseract@/bin/tesseract", "input.bmp", "stdout", "--psm", "0"], + stdin=subprocess.PIPE, + shell=False, + startupinfo=None, +@@ -338,7 +338,7 @@ class TestTesseract(BaseTest): + self.assertEqual(result["angle"], 90) + self.assertEqual(result["confidence"], 9.30) + popen.assert_called_once_with( +- ["tesseract", "input.bmp", "stdout", "--psm", "0"], ++ ["@tesseract@/bin/tesseract", "input.bmp", "stdout", "--psm", "0"], + stdin=subprocess.PIPE, + shell=False, + startupinfo=None, +@@ -371,7 +371,7 @@ class TestTesseract(BaseTest): + self.assertEqual(result["angle"], 90) + self.assertEqual(result["confidence"], 9.30) + popen.assert_called_once_with( +- ["tesseract", "input.bmp", "stdout", ++ ["@tesseract@/bin/tesseract", "input.bmp", "stdout", + "--psm", "0", "-l", "osd"], + stdin=subprocess.PIPE, + shell=False, +@@ -399,7 +399,7 @@ class TestTesseract(BaseTest): + with self.assertRaises(tesseract.TesseractError) as te: + tesseract.detect_orientation(self.image) + popen.assert_called_once_with( +- ["tesseract", "input.bmp", "stdout", "--psm", "0"], ++ ["@tesseract@/bin/tesseract", "input.bmp", "stdout", "--psm", "0"], + stdin=subprocess.PIPE, + shell=False, + startupinfo=None, +@@ -433,7 +433,7 @@ class TestTesseract(BaseTest): + with self.assertRaises(tesseract.TesseractError) as te: + tesseract.detect_orientation(self.image) + popen.assert_called_once_with( +- ["tesseract", "input.bmp", "stdout", "--psm", "0"], ++ ["@tesseract@/bin/tesseract", "input.bmp", "stdout", "--psm", "0"], + stdin=subprocess.PIPE, + shell=False, + startupinfo=None, +@@ -467,7 +467,7 @@ class TestTesseract(BaseTest): + self.assertEqual(result["angle"], 90) + self.assertEqual(result["confidence"], 9.30) + popen.assert_called_once_with( +- ["tesseract", "input.bmp", "stdout", "-psm", "0"], ++ ["@tesseract@/bin/tesseract", "input.bmp", "stdout", "-psm", "0"], + stdin=subprocess.PIPE, + shell=False, + startupinfo=None, +@@ -500,7 +500,7 @@ class TestTesseract(BaseTest): + self.assertEqual(result["angle"], 90) + self.assertEqual(result["confidence"], 9.30) + popen.assert_called_once_with( +- ["tesseract", "input.bmp", "stdout", "-psm", "0", "-l", "fra"], ++ ["@tesseract@/bin/tesseract", "input.bmp", "stdout", "-psm", "0", "-l", "fra"], + stdin=subprocess.PIPE, + shell=False, + startupinfo=None, +@@ -527,7 +527,7 @@ class TestTesseract(BaseTest): + with self.assertRaises(tesseract.TesseractError) as te: + tesseract.detect_orientation(self.image) + popen.assert_called_once_with( +- ["tesseract", "input.bmp", "stdout", "-psm", "0"], ++ ["@tesseract@/bin/tesseract", "input.bmp", "stdout", "-psm", "0"], + stdin=subprocess.PIPE, + shell=False, + startupinfo=None, +@@ -561,7 +561,7 @@ class TestTesseract(BaseTest): + with self.assertRaises(tesseract.TesseractError) as te: + tesseract.detect_orientation(self.image) + popen.assert_called_once_with( +- ["tesseract", "input.bmp", "stdout", "-psm", "0"], ++ ["@tesseract@/bin/tesseract", "input.bmp", "stdout", "-psm", "0"], + stdin=subprocess.PIPE, + shell=False, + startupinfo=None, diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index a2170db1bd48..a6d93465ffc2 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , buildPythonPackage -, fetchPypi +, fetchFromGitHub , aiofiles , graphene , itsdangerous @@ -20,12 +20,20 @@ buildPythonPackage rec { pname = "starlette"; - version = "0.13.0"; + + # This is not the latest version of Starlette, however, later + # versions of Starlette break FastAPI due to + # https://github.com/tiangolo/fastapi/issues/683. Please update when + # possible. FastAPI is currently Starlette's only dependent. + + version = "0.12.9"; disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "6bd414152d40d000ccbf6aa40ed89718b40868366a0f69fb83034f416303acef"; + src = fetchFromGitHub { + owner = "encode"; + repo = pname; + rev = version; + sha256 = "0w44s8ynzy8w8dgm755c8jina9i4dd87vqkcv7jc1kwkg384w9i5"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 0cddbd5a0a49..ed685bc0c485 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -69,7 +69,7 @@ let tfFeature = x: if x then "1" else "0"; - version = "1.15.1"; + version = "1.15.2"; variant = if cudaSupport then "-gpu" else ""; pname = "tensorflow${variant}"; @@ -100,7 +100,7 @@ let owner = "tensorflow"; repo = "tensorflow"; rev = "v${version}"; - sha256 = "1j8vysfblkyydrr67qr3i7kvaq5ygnjlx8hw9a9pc95ac462jq7i"; + sha256 = "1q0848drjvnaaa38dgns8knmpmkj5plzsc98j20m5ybv68s55w78"; }; patches = [ @@ -294,12 +294,10 @@ let TF_SYSTEM_LIBS = null; # cudaSupport causes fetch of ncclArchive, resulting in different hashes - # FIXME: can't (re)produce this output with current bazel. - # FIXME: build log: https://gist.github.com/andir/eff3e9c8eda5b56c8ea84903aed9cc35 sha256 = if cudaSupport then - "0bzkqjnw1crf0v91yb1frvy0l7kmjawbfwdhm89h73i8fqjab8jw" + "1qygfcvvn9vysap9nk6xccxi9mgmzyxiywz6k456f811l1v70p2c" else - "1d7czp43a3a4aksvdcskbdy7dgifily1amqbz9fa6d8mkhdj5if5"; + "0kfjanw0mfbh30vi1ms2xlg8yp429cbyfriik6yxd5cla2pncg2j"; }; buildAttrs = { diff --git a/pkgs/development/python-modules/tensorflow/lift-gast-restriction.patch b/pkgs/development/python-modules/tensorflow/lift-gast-restriction.patch index 24cc118d8f33..30861d923417 100644 --- a/pkgs/development/python-modules/tensorflow/lift-gast-restriction.patch +++ b/pkgs/development/python-modules/tensorflow/lift-gast-restriction.patch @@ -3,9 +3,9 @@ index 992f2eae22..d9386f9b13 100644 --- a/tensorflow/tools/pip_package/setup.py +++ b/tensorflow/tools/pip_package/setup.py @@ -54,7 +54,7 @@ REQUIRED_PACKAGES = [ - 'astor >= 0.6.0', - 'backports.weakref >= 1.0rc1;python_version<"3.4"', 'enum34 >= 1.1.6;python_version<"3.4"', + # functools comes with python3, need to install the backport for python2 + 'functools32 >= 3.2.3;python_version<"3"', - 'gast == 0.2.2', + 'gast >= 0.2.2', 'google_pasta >= 0.1.6', diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 8fe5f7a0cab1..fc5244f96449 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -110,17 +110,17 @@ in { #<generated> # DO NOT EDIT! Automatically generated by ./update.py radare2 = generic { - version_commit = "23881"; - gittap = "4.3.0"; - gittip = "bb78ef34573020a6e92a975d0dafcddff52e6892"; - rev = "4.3.0"; - version = "4.3.0"; - sha256 = "19mj419shphcgsf6ndii5i45dcac0nwiwnzp83wccnivpyfhcpnv"; + version_commit = "23963"; + gittap = "4.3.1"; + gittip = "e7f940d27b3b4eb2738afef78a6ea09ed770318c"; + rev = "4.3.1"; + version = "4.3.1"; + sha256 = "0fiy6aj8xf9anpkk2vpkx8x0m2f26rhjb92nmg61xj13dmhchh30"; cs_ver = "4.0.1"; cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6"; }; r2-for-cutter = generic { - version_commit = "23881"; + version_commit = "23963"; gittap = "4.2.1"; gittip = "08478fdd29d8ce2a6c61fbd7b207bffc10682938"; rev = "08478fdd29d8ce2a6c61fbd7b207bffc10682938"; diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index c98eba0abe63..1b22cb2dc036 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "0j1bx2180z6znfrg8k4sjwvm3cbvnklqjxdssbr2yd47h8kfwk3g"; + sha256 = "12a1jg4vcp6w72j8nsxf162i616g303cs783wlsa9iwm4w0cpb2h"; }; - modSha256 = "1qa7qfxpc43n9xyyfcd24d17g4fdcffkd57ny078ja219x13kay3"; + modSha256 = "1k26i01sdgx9yik5fnd8kv300d8llqpvj9qpvga7hsbk58s2g8mv"; subPackages = [ "." ]; diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 3f6a7229b30f..0fe4de98f1d2 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.204.4"; + version = "2.204.5"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "0m4g0hm7cfmma5lrs9jsdy2gzp383hhh4k968s41krdms2pf5jhf"; + sha256 = "17437wshci2fyvvaznzk738m2npqa61w16aw5jslw2ifnyjkziwl"; }; buildCommand = '' diff --git a/pkgs/development/tools/database/cdb/default.nix b/pkgs/development/tools/database/cdb/default.nix index 47f625736750..b9ebba554774 100644 --- a/pkgs/development/tools/database/cdb/default.nix +++ b/pkgs/development/tools/database/cdb/default.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation { ''; meta = { - homepage = "https://cr.yp.to/cdb"; + homepage = "https://cr.yp.to/cdb.html"; license = lib.licenses.publicDomain; maintainers = [ lib.maintainers.Profpatsch ]; platforms = lib.platforms.unix; diff --git a/pkgs/development/tools/git-ftp/default.nix b/pkgs/development/tools/git-ftp/default.nix index b0a59e632f16..c0001774252b 100644 --- a/pkgs/development/tools/git-ftp/default.nix +++ b/pkgs/development/tools/git-ftp/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, pandoc, man }: stdenv.mkDerivation rec { pname = "git-ftp"; - version = "1.5.2"; + version = "1.6.0"; src = fetchFromGitHub { owner = "git-ftp"; repo = "git-ftp"; rev = version; - sha256 = "09qr8ciyfipcq32kl78ksvcra22aq7r4my685aajlbvkxgs0a867"; + sha256 = "1hxkqf7jbrx24q18yxpnd3dxzh4xk6asymwkylp1x7zg6mcci87d"; }; dontBuild = true; diff --git a/pkgs/development/tools/haskell/vaultenv/default.nix b/pkgs/development/tools/haskell/vaultenv/default.nix index 419f4530dca1..1d901cb723cf 100644 --- a/pkgs/development/tools/haskell/vaultenv/default.nix +++ b/pkgs/development/tools/haskell/vaultenv/default.nix @@ -6,11 +6,11 @@ }: mkDerivation rec { pname = "vaultenv"; - version = "0.13.0"; + version = "0.13.1"; src = fetchzip { url = "https://github.com/channable/vaultenv/archive/v${version}.tar.gz"; - sha256 = "0kz5p57fq855mhbqrpb737sqrax9cdcyh2g57460hc8fyvs97lq0"; + sha256 = "0ycf5skxjns77sgbm8faq9ps9rs2hqznsbzrd51hdkpak56k42cp"; }; buildTools = [ hpack ]; diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index 480456ff21d8..477a476dfe78 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "hcloud"; - version = "1.14.0"; + version = "1.16.1"; goPackagePath = "github.com/hetznercloud/cli"; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "hetznercloud"; repo = "cli"; rev = "v${version}"; - sha256 = "167x64ni4xm0d9b02gy8zvc8knhsvb1c9jhysw7svi7iaw5f2ds5"; + sha256 = "1d6qa21sq79hr84nnn3j7w0776mnq58g8g1krpnh4d6bv3kc3lq7"; }; - modSha256 = "1g81szkrkxmv51l78v0d39i8dvrrdhf8wh38rwxvnay3iajgrnqk"; + modSha256 = "1zy41hi2qzrdmih3pkpng8im576lhkr64zm66w73p7jyvy0kf9sx"; buildFlagsArray = [ "-ldflags=" "-w -X github.com/hetznercloud/cli/cli.Version=${version}" ]; diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix index 1e2359f10033..1867f33bfa8b 100644 --- a/pkgs/development/tools/heroku/default.nix +++ b/pkgs/development/tools/heroku/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "heroku"; - version = "7.38.1"; + version = "7.39.0"; src = fetchurl { url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz"; - sha256 = "1sa4ph4d5y48yz2n06aivqgl07ljlgwgf5ik431vnrz5smxl6ngr"; + sha256 = "0jj5n1jw61scpli1a0115zyp8zsa3mmljzd72bm1n5c86ppdh8pa"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/hobbes/default.nix b/pkgs/development/tools/hobbes/default.nix new file mode 100644 index 000000000000..b56afc0a4351 --- /dev/null +++ b/pkgs/development/tools/hobbes/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, cmake, llvm_6, ncurses, readline, zlib }: + +stdenv.mkDerivation { + name = "hobbes"; + version = "unstable-2020-03-10"; + + src = fetchFromGitHub { + owner = "morgan-stanley"; + repo = "hobbes"; + rev = "ae956df9da3f3b24630bc1757dfaa2a8952db07a"; + sha256 = "1a0lb87vb0qcp5wy6swk4jcc88l7vhy6iflsk7zplw547mbjhjsy"; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + llvm_6 # LLVM 6 is latest currently supported. See https://git.io/JvK6w. + ncurses + readline + zlib + ]; + + doCheck = false; # Running tests in NixOS hangs. See https://git.io/JvK7R. + checkTarget = "test"; + + meta = with stdenv.lib; { + description = "A language and an embedded JIT compiler"; + longDescription = '' + Hobbes is a a language, embedded compiler, and runtime for efficient + dynamic expression evaluation, data storage and analysis. + ''; + homepage = "https://github.com/Morgan-Stanley/hobbes"; + license = licenses.asl20; + maintainers = [ maintainers.thmzlt ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index 415479edc84d..6ac2d4404eb9 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ let baseName = "metals"; - version = "0.7.6"; + version = "0.8.1"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -15,7 +15,7 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "03vx8n77mndpqbvq14cy3k9r4jwgjacrv56v5n87da8rqiclx37j"; + outputHash = "0m1vly213cazylg1rmfh5qk3bq65aafa0rf1anfdb3ggymylwza0"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/development/tools/minizinc/ide.nix b/pkgs/development/tools/minizinc/ide.nix index 3b1ac92a96e7..921ee3d158c8 100644 --- a/pkgs/development/tools/minizinc/ide.nix +++ b/pkgs/development/tools/minizinc/ide.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, qtbase, qtwebengine, qtwebkit, qmake, makeWrapper, minizinc }: let - version = "2.3.2"; + version = "2.4.2"; in stdenv.mkDerivation { pname = "minizinc-ide"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { owner = "MiniZinc"; repo = "MiniZincIDE"; rev = version; - sha256 = "0ym45fjfvxxrxp79sa5psrwg2p33l5h8qncx6agj9brml7d873c4"; + sha256 = "1xqs27f14r79vcxf9bx72bbnhxc913lpr5d8cv31dacbq5fyxkw7"; }; sourceRoot = "source/MiniZincIDE"; diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index 03bd2696cce5..de1cf939e6ae 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "v${version}"; - sha256 = "00clafq3izvfwxkb85hf6s40yfw2hpsfz3xg4da28pgh1wlqb9ps"; + sha256 = "0l7id483006mnii4rlcff4p0ricd8a2n24sf74a9b387x0akpbsn"; }; - modSha256 = "0ghp61m8fxg1iwq2ypmp99cqv3n16c06v2xzg9v34299vmd89gi2"; + modSha256 = "04s4p9j6j7gw1s4v271zwzvdny7dvjaazd2pihmyjfik95xmwx9r"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; diff --git a/pkgs/development/tools/misc/cli11/default.nix b/pkgs/development/tools/misc/cli11/default.nix index 6261ffc9b018..53356e53a78a 100644 --- a/pkgs/development/tools/misc/cli11/default.nix +++ b/pkgs/development/tools/misc/cli11/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "cli11"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "CLIUtils"; repo = "CLI11"; rev = "v${version}"; - sha256 = "0i1x4ax5hal7jdsxw40ljwfv68h0ac85iyi35i8p52p9s5qsc71q"; + sha256 = "1nqri8ahisi00nwh6cynhq5n9iq9iydkysnxj36r2y20yvbi4bxj"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/misc/inotify-tools/default.nix b/pkgs/development/tools/misc/inotify-tools/default.nix index b04de1832abb..ead13e340d5e 100644 --- a/pkgs/development/tools/misc/inotify-tools/default.nix +++ b/pkgs/development/tools/misc/inotify-tools/default.nix @@ -1,16 +1,23 @@ -{ stdenv, autoreconfHook, fetchFromGitHub }: +{ stdenv, autoreconfHook, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "inotify-tools"; - version = "3.20.1"; + version = "3.20.2.2"; src = fetchFromGitHub { repo = "inotify-tools"; owner = "rvoicilas"; rev = version; - sha256 = "14dci1i4mhsd5sa33k8h3ayphk19kizynh5ql9ryibdpmcanfiyq"; + sha256 = "1r12bglkb0bkqff6kgxjm81hk6z20nrxq3m7iv15d4nrqf9pm7s0"; }; + patches = [ + (fetchpatch { + url = "https://github.com/inotify-tools/inotify-tools/commit/7ddf45158af0c1e93b02181a45c5b65a0e5bed25.patch"; + sha256 = "08imqancx8l0bg9q7xaiql1xlalmbfnpjfjshp495sjais0r6gy7"; + }) + ]; + nativeBuildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix index 784895845e52..310ef0be1517 100644 --- a/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "omnisharp-roslyn"; - version = "1.32.19"; + version = "1.34.11"; src = fetchurl { url = "https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v${version}/omnisharp-mono.tar.gz"; - sha256 = "0flmijar7ih9wp2i585035zhgwpqymr2y778x841bpgv412kxgpz"; + sha256 = "0j55jrji7ya0pm91hfmyd9s6lkl35xbybr81a1gka90mlyp0gx63"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index bfc330276b0e..1430f0fc2a34 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.5.1"; + version = "1.5.4"; goPackagePath = "github.com/hashicorp/packer"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "0cj5nr2wjpw676wwx97pk4vfal4n13hm95bjl6600fj6m3491sh0"; + sha256 = "06320crk5dldh7w3yi4pkx7hn3s0l8q1h9fqyzf56iw8sx7983g5"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index c064ebc4e7e1..2ca4b8070aaa 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -3,7 +3,7 @@ rustPlatform.buildRustPackage rec { pname = "rust-bindgen"; - version = "0.53.1"; + version = "0.53.2"; RUSTFLAGS = "--cap-lints warn"; # probably OK to remove after update @@ -11,10 +11,10 @@ rustPlatform.buildRustPackage rec { owner = "rust-lang"; repo = pname; rev = "v${version}"; - sha256 = "0zxqryqks9in9q7az0lrw8fq9wnc5p4yf6b1fxnzy2j6qhlw2c5c"; + sha256 = "01dkaa2akqrhpxxf0g2zyfdb3nx16y14qsg0a9d5n92c4yyvmwjg"; }; - cargoSha256 = "1fdgm83l9d469garfbgny6jk1fvwnwh32sybz9g7s2qzrvzzrx1d"; + cargoSha256 = "0pm9kh3qrcv5jsbrr476982lg1j31fbvxpzs4gphxl0mv1qmp4zm"; libclang = llvmPackages.libclang.lib; #for substituteAll @@ -58,7 +58,7 @@ rustPlatform.buildRustPackage rec { As with most compiler related software, this will only work inside a nix-shell with the required libraries as buildInputs. ''; - homepage = https://github.com/rust-lang/rust-bindgen; + homepage = "https://github.com/rust-lang/rust-bindgen"; license = with licenses; [ bsd3 ]; platforms = platforms.unix; maintainers = [ maintainers.ralith ]; diff --git a/pkgs/development/web/nodejs/v13.nix b/pkgs/development/web/nodejs/v13.nix index affb86bece86..c5e3f7c4bdbf 100644 --- a/pkgs/development/web/nodejs/v13.nix +++ b/pkgs/development/web/nodejs/v13.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "13.10.1"; - sha256 = "14pvqwhilq210zn830zmh04a62rj3si0ijc4ihrhdf3dvghrx2c3"; + version = "13.11.0"; + sha256 = "07r9xwjmiip9zmgfq77f3av3p93adc5cphj07idph1l8ws1j2h75"; } diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index 4f88e36a2f6c..0664af117e1e 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -40,7 +40,7 @@ let # The latest Dwarf Fortress version. Maintainers: when a new version comes # out, ensure that (unfuck|dfhack|twbt) are all up to date before changing # this. - latestVersion = "0.47.02"; + latestVersion = "0.47.04"; # Converts a version to a package name. versionToName = version: "dwarf-fortress_${lib.replaceStrings ["."] ["_"] version}"; diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index b27dc9c058c7..2467053cc1a6 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -52,6 +52,12 @@ let xmlRev = "23500e4e9bd1885365d0a2ef1746c321c1dd509a"; prerelease = true; }; + "0.47.04" = { + dfHackRelease = "0.47.04-alpha0"; + sha256 = "07056k6717mqim9skwjprqplj8jmmli6g4p2c72c8000jwnn2hjy"; + xmlRev = "23500e4e9bd1885365d0a2ef1746c321c1dd50aa"; + prerelease = true; + }; }; release = if hasAttr dfVersion dfhack-releases diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index be0d57f45d9c..4485b3ae784a 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "dwarf-therapist"; - version = "41.1.3"; + version = "41.1.5"; src = fetchFromGitHub { owner = "Dwarf-Therapist"; repo = "Dwarf-Therapist"; rev = "v${version}"; - sha256 = "15f6npbfgsxsr6pm2vxpali8f6nyyk80bcyhy9s77n064q0qg2nj"; + sha256 = "0w1mwwf49vdmvmdfvlkn4m0hzvlj111rpl8hv4rw6v8nv6yfb2y4"; }; nativeBuildInputs = [ texlive cmake ninja ]; diff --git a/pkgs/games/dwarf-fortress/game.json b/pkgs/games/dwarf-fortress/game.json index daef15575d51..f5f1f389904f 100644 --- a/pkgs/games/dwarf-fortress/game.json +++ b/pkgs/games/dwarf-fortress/game.json @@ -107,5 +107,19 @@ "legacy_s": "1jxf52kaijf4crwxj30a4f6z7rzs6xa91y6vn5s8jr0cvbr5pz64", "legacy32": "0j7shqdv3gimacj03cil2y0fmr0j0fp57cwmdjwnxwx3m96k3xwm", "legacy32_s": "1wc7pcp9dwz0q1na3i5pbqknya595qdkmr7hsmgh2kk8rsp3g9g2" + }, + "0.47.04": { + "linux": "1ri82c5hja6n0wv538srf2nbcyb8ip49w4l201m90cmcycmqgr8x", + "linux32": "00yz8gl75sbx15d7vl22ij0a5qd325kpc9mgm1lh5g7i065vgzn8", + "osx": "0c1g655bn5n4pbzxw3v83gmy54va5y87m7ksi6iryfal0m9lshhv", + "osx32": "1knfgqbwa7v9va1w6i8yzz6xp3dj633dbs50izx6ldszm0ra42pg", + "win": "0j7ixr3rf9900zzfw3nd3vg97kdkspm530cmf9dkwhf6klmpks7s", + "win_s": "11amw5gjhi753mvf17wifcjiyikjx0qwa16787gfhj9jfp0yw764", + "win32": "1xw9f49n85c31kbzkm5zh81kccjx9msjyy3xwr0klak5w398a59l", + "win32_s": "0s26hrgfk2b5wg4dvg90wgw1mvrrvbyjhmsys9f5fl7zn1pjbxxr", + "legacy": "103bcnn8gxi2rkpjmjfgv5a5kxmh1zd7vagrsscv55sppd7fcl7n", + "legacy_s": "19ai7lvxx0y3iha9qrbl5krric547rzs6vm4ibk8x61vv97jrbd8", + "legacy32": "0lli6s1g7yj3p3h26ajgq3h619n88qn6s7amyz6z8w7hyzfi7wij", + "legacy32_s": "1wzxbzgln9pmsk2nchrl94d2yd09xdgynmjl4qwcaqzkrnf3sfqc" } } diff --git a/pkgs/games/dwarf-fortress/twbt/default.nix b/pkgs/games/dwarf-fortress/twbt/default.nix index 86ff8a6bc446..011284bcff5d 100644 --- a/pkgs/games/dwarf-fortress/twbt/default.nix +++ b/pkgs/games/dwarf-fortress/twbt/default.nix @@ -41,6 +41,11 @@ let sha256 = "07bqy9rkd64h033sxdpigp5zq4xrr0xd36wdr1b21g649mv8j6yw"; prerelease = false; }; + "0.47.04" = { + twbtRelease = "6.61"; + sha256 = "07bqy9rkd64h033sxdpigp5zq4xrr0xd36wdr1b21g649mv8j6yw"; + prerelease = false; + }; }; release = if hasAttr dfVersion twbt-releases diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index e9d172f212df..ccf44ee5ca13 100644 --- a/pkgs/games/dwarf-fortress/unfuck.nix +++ b/pkgs/games/dwarf-fortress/unfuck.nix @@ -40,6 +40,10 @@ let unfuckRelease = "0.47.01"; sha256 = "11xvb3qh4crdf59pwfwpi73rzm3ysd1r1xp2k1jp7527jmqapk4k"; }; + "0.47.04" = { + unfuckRelease = "0.47.04"; + sha256 = "1wa990xbsyiiz7abq153xmafvvk1dmgz33rp907d005kzl1z86i9"; + }; }; release = if hasAttr dfVersion unfuck-releases diff --git a/pkgs/games/empty-epsilon/default.nix b/pkgs/games/empty-epsilon/default.nix index 6560db48cb34..29a789b4084b 100644 --- a/pkgs/games/empty-epsilon/default.nix +++ b/pkgs/games/empty-epsilon/default.nix @@ -3,8 +3,8 @@ let major = "2020"; - minor = "01"; - patch = "15"; + minor = "02"; + patch = "18"; version = "${major}.${minor}.${patch}"; @@ -16,7 +16,7 @@ let owner = "daid"; repo = "SeriousProton"; rev = "EE-${version}"; - sha256 = "0isiy18dv22cpv7wdbvqss2afha719a7i76bvw4cs14vfsdx9s8w"; + sha256 = "1cq32jm3p40h5mipb64i9b1kcid27bpc8g6j4k0v69cfqkjpha5c"; }; nativeBuildInputs = [ cmake ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation { owner = "daid"; repo = "EmptyEpsilon"; rev = "EE-${version}"; - sha256 = "0jklfap9jd9ynhvwzr9q4icvx5yb4sqm457vcar4jads4pwsd0xk"; + sha256 = "1hl3mbg6pw2r7ri042vm86pb2xv77jvh6pag1z96bxvx791zcnwk"; }; nativeBuildInputs = [ cmake ]; @@ -60,7 +60,7 @@ stdenv.mkDerivation { description = "Open source bridge simulator based on Artemis"; homepage = https://daid.github.io/EmptyEpsilon/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ fpletz lheckemann ]; + maintainers = with maintainers; [ fpletz lheckemann ma27 ]; platforms = platforms.linux; }; } diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix index 2fb675359511..38763073ac8f 100644 --- a/pkgs/games/mnemosyne/default.nix +++ b/pkgs/games/mnemosyne/default.nix @@ -17,6 +17,8 @@ python.pkgs.buildPythonApplication rec { buildInputs = [ anki ]; propagatedBuildInputs = with python.pkgs; [ + googletrans + gtts pyqtwebengine pyqt5 matplotlib diff --git a/pkgs/games/redeclipse/default.nix b/pkgs/games/redeclipse/default.nix index 3002fc75e632..fc6f50ef97e4 100644 --- a/pkgs/games/redeclipse/default.nix +++ b/pkgs/games/redeclipse/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchFromGitHub, fetchurl, fetchpatch -, curl, ed, pkgconfig, zlib, libX11 +, curl, ed, pkgconfig, freetype, zlib, libX11 , SDL2, SDL2_image, SDL2_mixer }: stdenv.mkDerivation rec { pname = "redeclipse"; - version = "1.6.0"; + version = "2.0.0"; src = fetchurl { url = "https://github.com/redeclipse/base/releases/download/v${version}/redeclipse_${version}_nix.tar.bz2"; - sha256 = "0j98zk7nivdsap4y50dlqnql17hdila1ikvps6vicwaqb3l4gaa8"; + sha256 = "143i713ggbk607qr4n39pi0pn8d93x9x6fcbh8rc51jb9qhi8p5i"; }; buildInputs = [ - libX11 zlib + libX11 freetype zlib SDL2 SDL2_image SDL2_mixer ]; @@ -23,15 +23,6 @@ stdenv.mkDerivation rec { makeFlags = [ "-C" "src/" "prefix=$(out)" ]; - patches = [ - # "remove gamma name hack" - Can't find `____gammaf128_r_finite` otherwise - # Is likely to be included in next release - (fetchpatch { - url = "https://github.com/red-eclipse/base/commit/b16b4963c1ad81bb9ef784bc4913a4c8ab5f1bb4.diff"; - sha256 = "1bm07qrq60bbmbf5k9255qq115mcyfphfy2f7xl1yx40mb9ns65p"; - }) - ]; - enableParallelBuilding = true; installTargets = [ "system-install" ]; diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index e9f8d6984af9..9e76693ce8fd 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, ghostscript, texinfo, imagemagick, texi2html, guile +{ stdenv, lib, fetchurl, ghostscript, gyre-fonts, texinfo, imagemagick, texi2html, guile , python2, gettext, flex, perl, bison, pkgconfig, autoreconfHook, dblatex , fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff , makeWrapper, t1utils @@ -7,22 +7,17 @@ } }: -let - - version = "2.18.2"; - -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "lilypond"; - inherit version; + version = "2.20.0"; - src = fetchgit { - url = "https://git.savannah.gnu.org/r/lilypond.git"; - rev = "release/${version}-1"; - sha256 = "0fk045fmmb6fcv7jdvkbqr04qlwnxzwclr2gzx3gja714xy6a76x"; + src = fetchurl { + url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; + sha256 = "0qd6pd4siss016ffmcyw5qc6pr2wihnvrgd4kh1x725w7wr02nar"; }; + patches = [ ./findlib.patch ]; + postInstall = '' for f in "$out/bin/"*; do # Override default argv[0] setting so LilyPond can find @@ -35,7 +30,9 @@ stdenv.mkDerivation { configureFlags = [ "--disable-documentation" - "--with-ncsb-dir=${ghostscript}/share/ghostscript/fonts" + # FIXME: these URW fonts are not OTF, configure reports "URW++ OTF files... no". + "--with-urwotf-dir=${ghostscript}/share/ghostscript/fonts" + "--with-texgyre-dir=${gyre-fonts}/share/fonts/truetype/" ]; preConfigure = '' @@ -43,25 +40,23 @@ stdenv.mkDerivation { export HOME=$TMPDIR/home ''; - nativeBuildInputs = [ makeWrapper pkgconfig autoreconfHook ]; - - autoreconfPhase = "NOCONFIGURE=1 sh autogen.sh"; + nativeBuildInputs = [ autoreconfHook bison flex makeWrapper pkgconfig ]; buildInputs = [ ghostscript texinfo imagemagick texi2html guile dblatex tex zip netpbm - python2 gettext flex perl bison fontconfig freetype pango + python2 gettext perl fontconfig freetype pango fontforge help2man groff t1utils ]; + autoreconfPhase = "NOCONFIGURE=1 sh autogen.sh"; + enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Music typesetting system"; - homepage = http://lilypond.org/; + homepage = "http://lilypond.org/"; license = licenses.gpl3; maintainers = with maintainers; [ marcweber yurrriq ]; platforms = platforms.all; }; - - patches = [ ./findlib.patch ]; } diff --git a/pkgs/misc/lilypond/fonts.nix b/pkgs/misc/lilypond/fonts.nix index 00335eddce86..deeedf679954 100644 --- a/pkgs/misc/lilypond/fonts.nix +++ b/pkgs/misc/lilypond/fonts.nix @@ -7,7 +7,6 @@ let inherit version; pname = "openlilypond-font-${fontName}"; - src = fetchFromGitHub { inherit rev sha256; owner = "OpenLilyPondFonts"; @@ -31,8 +30,7 @@ let ''; meta = with stdenv.lib; { - inherit (src.meta) homepage; - inherit (lilypond.meta) platforms; + inherit (lilypond.meta) homepage platforms; description = "${fontName} font for LilyPond"; license = licenses.ofl; maintainers = with maintainers; [ yurrriq ]; diff --git a/pkgs/misc/lilypond/unstable.nix b/pkgs/misc/lilypond/unstable.nix index e2c0dccb2e17..68f48a2db64f 100644 --- a/pkgs/misc/lilypond/unstable.nix +++ b/pkgs/misc/lilypond/unstable.nix @@ -18,10 +18,4 @@ lilypond.overrideAttrs (oldAttrs: { meta = oldAttrs.meta // { broken = stdenv.isDarwin; }; - - configureFlags = [ - "--disable-documentation" - "--with-urwotf-dir=${ghostscript}/share/ghostscript/fonts" - "--with-texgyre-dir=${gyre-fonts}/share/fonts/truetype/" - ]; }) diff --git a/pkgs/misc/lilypond/with-fonts.nix b/pkgs/misc/lilypond/with-fonts.nix index 36dbcf170dd5..1036f474b14d 100644 --- a/pkgs/misc/lilypond/with-fonts.nix +++ b/pkgs/misc/lilypond/with-fonts.nix @@ -5,7 +5,7 @@ stdenv.lib.appendToName "with-fonts" (symlinkJoin { inherit (lilypond) meta name version ; - paths = [ lilypond ]; + paths = [ lilypond ] ++ openlilylib-fonts.all; buildInputs = [ makeWrapper lndir ]; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index e925068421d6..2c8b8de65b31 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -16,11 +16,12 @@ }: with stdenv.lib; - - with import ../../../../lib/kernel.nix { inherit (stdenv) lib; inherit version; }; +with stdenv.lib.kernel; +with (stdenv.lib.kernel.whenHelpers version); let + # configuration items have to be part of a subattrs flattenKConf = nested: mapAttrs (_: head) (zipAttrs (attrValues nested)); diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index 156a4cf44234..3010d87a178a 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -11,15 +11,15 @@ { stdenv, version }: with stdenv.lib; -with import ../../../../lib/kernel.nix { inherit (stdenv) lib; inherit version; }; +with stdenv.lib.kernel; +with (stdenv.lib.kernel.whenHelpers version); assert (versionAtLeast version "4.9"); optionalAttrs (stdenv.hostPlatform.platform.kernelArch == "x86_64") { DEFAULT_MMAP_MIN_ADDR = freeform "65536"; # Prevent allocation of first 64K of memory - # Reduce attack surface by disabling various emulations - IA32_EMULATION = no; + # Reduce attack surface by disabling X32 X86_X32 = no; # Note: this config depends on EXPERT y and so will not take effect, hence # it is left "optional" for now. diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 2dedc1592e88..5773b171f744 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.24"; + version = "5.4.25"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1cvy3mxwzll4f9j8i3hfmi0i0zq75aiafq1jskp9n4kq9iwar83z"; + sha256 = "09ay0adc3s3m7qk0nj5lkmrp5i0q76a9kax0xix8914d115rgvf0"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/mptcp-config.nix b/pkgs/os-specific/linux/kernel/mptcp-config.nix index e5e3ee283fff..9752e63d9f94 100644 --- a/pkgs/os-specific/linux/kernel/mptcp-config.nix +++ b/pkgs/os-specific/linux/kernel/mptcp-config.nix @@ -1,5 +1,5 @@ { stdenv }: -with import ../../../../lib/kernel.nix { inherit (stdenv) lib; version = null; }; +with stdenv.lib.kernel; { # DRM_AMDGPU = yes; diff --git a/pkgs/os-specific/linux/sdparm/default.nix b/pkgs/os-specific/linux/sdparm/default.nix index 5517f163b3e0..e0392e442bf5 100644 --- a/pkgs/os-specific/linux/sdparm/default.nix +++ b/pkgs/os-specific/linux/sdparm/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { pname = "sdparm"; - version = "1.10"; + version = "1.11"; src = fetchurl { url = "http://sg.danny.cz/sg/p/${pname}-${version}.tar.xz"; - sha256 = "1jjq3lzgfy4r76rc26q02lv4wm5cb4dx5nh913h489zjrr4f3jbx"; + sha256 = "1nqjc4w2w47zavcbf5xmm53x1zbwgljaw1lpajcdi537cgy32fa8"; }; meta = with stdenv.lib; { - homepage = http://sg.danny.cz/sg/sdparm.html; + homepage = "http://sg.danny.cz/sg/sdparm.html"; description = "A utility to access SCSI device parameters"; license = licenses.bsd3; platforms = with platforms; linux; diff --git a/pkgs/servers/ankisyncd/default.nix b/pkgs/servers/ankisyncd/default.nix new file mode 100644 index 000000000000..e10986701237 --- /dev/null +++ b/pkgs/servers/ankisyncd/default.nix @@ -0,0 +1,67 @@ +{ lib +, fetchFromGitHub +, python3 +, anki +}: + +python3.pkgs.buildPythonApplication rec { + pname = "ankisyncd"; + version = "2.1.0"; + src = fetchFromGitHub { + owner = "tsudoko"; + repo = "anki-sync-server"; + rev = version; + sha256 = "6a140afa94fdb1725fed716918875e3d2ad0092cb955136e381c9d826cc4927c"; + }; + format = "other"; + + installPhase = '' + runHook preInstall + + mkdir -p $out/${python3.sitePackages} + + cp -r ankisyncd utils ankisyncd.conf $out/${python3.sitePackages} + mkdir $out/share + cp ankisyncctl.py $out/share/ + + runHook postInstall + ''; + + fixupPhase = '' + PYTHONPATH="$PYTHONPATH:$out/${python3.sitePackages}:${anki}" + + makeWrapper "${python3.interpreter}" "$out/bin/ankisyncd" \ + --set PYTHONPATH $PYTHONPATH \ + --add-flags "-m ankisyncd" + + makeWrapper "${python3.interpreter}" "$out/bin/ankisyncctl" \ + --set PYTHONPATH $PYTHONPATH \ + --add-flags "$out/share/ankisyncctl.py" + ''; + + checkInputs = with python3.pkgs; [ + pytest + webtest + ]; + + buildInputs = [ ]; + + propagatedBuildInputs = [ anki ]; + + checkPhase = '' + # Exclude tests that require sqlite's sqldiff command, since + # it isn't yet packaged for NixOS, although 2 PRs exist: + # - https://github.com/NixOS/nixpkgs/pull/69112 + # - https://github.com/NixOS/nixpkgs/pull/75784 + # Once this is merged, these tests can be run as well. + pytest --ignore tests/test_web_media.py tests/ + ''; + + meta = with lib; { + description = "Self-hosted Anki sync server"; + maintainers = with maintainers; [ matt-snider ]; + homepage = "https://github.com/tsudoko/anki-sync-server"; + license = licenses.agpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index a4eed02af711..611db53d6458 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "atlassian-jira"; - version = "8.7.0"; + version = "8.7.1"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "0k3z4j5pp0xx8qq5clr3069449w5k43gzag60jv3dzq35586yvdi"; + sha256 = "0f46j94xjb5a5f74fsykjif64s9w2yd9ccy9098yrzaa8lbwdgpz"; }; buildPhase = '' diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 2b2bdabc6265..6b18dd30f308 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.106.1"; + version = "0.106.6"; components = { "abode" = ps: with ps; [ ]; # missing inputs: abodepy "acer_projector" = ps: with ps; [ pyserial]; @@ -124,6 +124,7 @@ "configurator" = ps: with ps; [ ]; "conversation" = ps: with ps; [ aiohttp-cors]; "coolmaster" = ps: with ps; [ ]; # missing inputs: pycoolmasternet + "coronavirus" = ps: with ps; [ ]; # missing inputs: coronavirus "counter" = ps: with ps; [ ]; "cover" = ps: with ps; [ ]; "cppm_tracker" = ps: with ps; [ ]; # missing inputs: clearpasspy diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 9f7b3fed4a56..2b571fe96bfc 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -67,7 +67,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.106.1"; + hassVersion = "0.106.6"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -84,7 +84,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "0i261hzjfhqnq7j8dwsnj2h2vmr4vnxkvk2ff910am1knzni3a2z"; + sha256 = "11kv5lmm8nxp7yv3w43mzmgzkafddy0z6wl2878p96iyil1w7qhb"; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index f297212442c3..1446518fbc5c 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20200220.4"; + version = "20200220.5"; src = fetchPypi { inherit pname version; - sha256 = "0cb8b6xizxz1q5r0qgwsqs53va9bxdqnp4vwf5lh8ppv9zy7hssc"; + sha256 = "0nc44r5ybq0prsz2yid622i0xr7q0qrc4ymbk69bqg6jrmjpbdl1"; }; # no Python tests implemented diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index 65c2bcfbfd45..a5c6e9d09614 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -53,7 +53,7 @@ def get_version(): return m.group(1) -def parse_components(version="master"): +def parse_components(version: str = "master"): components = {} with tempfile.TemporaryDirectory() as tmp: with urlopen( @@ -61,14 +61,13 @@ def parse_components(version="master"): ) as response: tarfile.open(fileobj=BytesIO(response.read())).extractall(tmp) # Use part of a script from the Home Assistant codebase - sys.path.append(os.path.join(tmp, f"home-assistant-{version}")) + core_path = os.path.join(tmp, f"core-{version}") + sys.path.append(core_path) from script.hassfest.model import Integration integrations = Integration.load_dir( pathlib.Path( - os.path.join( - tmp, f"home-assistant-{version}", "homeassistant/components" - ) + os.path.join(core_path, "homeassistant/components") ) ) for domain in sorted(integrations): diff --git a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix index 138864aec7d0..0e07454bbc5e 100644 --- a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix +++ b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, apacheHttpd, jdk }: stdenv.mkDerivation rec { - name = "tomcat-connectors-1.2.46"; + name = "tomcat-connectors-1.2.48"; src = fetchurl { url = "mirror://apache/tomcat/tomcat-connectors/jk/${name}-src.tar.gz"; - sha256 = "1sfbcsmshjkj4wc969ngjcxhjyp4mbkjprbs111d1b0x3l7547by"; + sha256 = "15wfj1mvad15j1fqw67qbpbpwrcz3rb0zdhrq6z2sax1l05kc6yb"; }; configureFlags = [ @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Provides web server plugins to connect web servers with Tomcat"; - homepage = https://tomcat.apache.org/download-connectors.cgi; + homepage = "https://tomcat.apache.org/download-connectors.cgi"; license = licenses.asl20; platforms = platforms.unix; }; diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index b5282d862af6..167829669440 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -80,10 +80,10 @@ in fastcgi-cache-purge = { src = fetchFromGitHub { - owner = "FRiCKLE"; + owner = "nginx-modules"; repo = "ngx_cache_purge"; - rev = "2.3"; - sha256 = "0ib2jrbjwrhvmihhnzkp4w87fxssbbmmmj6lfdwpm6ni8p9g60dw"; + rev = "2.5"; + sha256 = "1f4kxagzvz10vqbcjwi57wink6xw3s1h7wlrrlrlpkmhfbf9704y"; }; }; diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index 8b36e7de69fd..c56e994ed54e 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -17,14 +17,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "1.15.0"; + version = "1.16.0"; pname = "unit"; src = fetchFromGitHub { owner = "nginx"; repo = "unit"; rev = version; - sha256 = "1dj21fcssrvbspppbhg8684vfcbn0m1abiy1r60h5fzb470k21jb"; + sha256 = "19gclqhwccpi7y4386ap33ycwhylv4s4kwfc6ik8scmc4pw3sj9l"; }; patches = [ diff --git a/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix b/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix index ec1f82507ce1..39adc6b78ee3 100644 --- a/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix +++ b/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix @@ -1,12 +1,12 @@ { mkDerivation, fetchFromGitHub, base, bytestring, network, stdenv }: mkDerivation { pname = "client-ip-echo"; - version = "0.1.0.4"; + version = "0.1.0.5"; src = fetchFromGitHub { owner = "jerith666"; repo = "client-ip-echo"; - rev = "58d1bc627c21008236afb1af4c09ba8153c95dad"; - sha256 = "153fab87qq080a819bqbdan925045icqwxldwj3ps40w2ssn7a53"; + rev = "e81db98d04c13966b2ec114e01f82487962055a7"; + sha256 = "02rzzbm1mdqh5zx5igd0s7pwkcsk64lx40rclxw3485348brc6ya"; }; isLibrary = false; isExecutable = true; diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index aa4db2239f0e..715a52ec99c2 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "cadvisor"; - version = "0.35.0"; + version = "0.36.0"; src = fetchFromGitHub { owner = "google"; repo = "cadvisor"; rev = "v${version}"; - sha256 = "1652yf2a4ng9z0jq8q6jnzh6svj5nwar9j8q7sssgy36bi03ixqa"; + sha256 = "12hk2l82i7hawzbvj6imcfwn6v8pcfv0dbjfn259yi4b0jrlx6l8"; }; goPackagePath = "github.com/google/cadvisor"; diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 46e1460d795e..22f768b94e1f 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "2.0.49"; + version = "2.0.51"; pname = "munin"; src = fetchFromGitHub { owner = "munin-monitoring"; repo = "munin"; rev = version; - sha256 = "13m56wh5cq82pwvv4ngav1zyn2sajxxjigljrz8ycjriw0wvncsf"; + sha256 = "1r018lbk1dncg6v3ai7wvnk1qr4ddsjc5g605dq086z0l0xg7ras"; }; buildInputs = [ diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index 48afc610c615..0a707519c64e 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "pushgateway"; - version = "0.8.0"; + version = "1.2.0"; rev = "v${version}"; goPackagePath = "github.com/prometheus/pushgateway"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "pushgateway"; - sha256 = "1mzwkxnznv6wzy7dc8rksa8gr7z92plrzls8gb8rk432zfqcbv6a"; + sha256 = "0q57pvdfapi1xx8mw7ykvxs64alypyqbxwvrqjcrgv2jidbcd1mm"; }; buildUser = "nix@nixpkgs"; diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 22fc4ebf39e4..9b23e9ac501f 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nextcloud"; - version = "18.0.1"; + version = "18.0.2"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${pname}-${version}.tar.bz2"; - sha256 = "1h0rxpdssn1hc65k41zbvww9r4f79vbd9bixc9ri5n7hp0say3vp"; + sha256 = "10fbdq0366iai2kpw6v6p78mnn9gz8x0xzsbqrp109yx4c4nccyh"; }; installPhase = '' diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index 92cee87197d6..8df674111ad1 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.21.5"; + version = "0.21.17"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "1wzfdf6300vabflsdbkizjg322in1rgksp7dk8gii38czja9y893"; + sha256 = "0hyrsxaill7x9g4bp6mri9i3ll75y7j1xxc226gw2c817zc6ayms"; }; dontBuild = true; diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix index 298e771fa7a9..5a58a52210af 100644 --- a/pkgs/servers/sql/monetdb/default.nix +++ b/pkgs/servers/sql/monetdb/default.nix @@ -3,7 +3,7 @@ }: let - version = "11.35.9"; + version = "11.35.19"; in stdenv.mkDerivation { pname = "monetdb"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2"; - sha256 = "0bs7z41vwm9aidxl1f40yx8r0qz3qranmxd0xzd4a1hahjq3j5rx"; + sha256 = "1qfgsv1k23sn6jl7jbxmfh7w7hyzmh8r1cddl4kksqrw41q6h82q"; }; postPatch = '' @@ -23,7 +23,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "An open source database system"; - homepage = https://www.monetdb.org/; + homepage = "https://www.monetdb.org/"; license = licenses.mpl20; platforms = platforms.unix; maintainers = [ maintainers.StillerHarpo ]; diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 866dd8021d0a..f57a6e8fa508 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgroonga"; - version = "2.2.2"; + version = "2.2.5"; src = fetchurl { url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0pdz2lpi7g1n9b5rg6kwhh6fr0bwf06zr642brmh53n6mp41186m"; + sha256 = "0lwj99kdx9kfp4vfd7lfapj183mz235kj1vjfscfnkg5ypj656gz"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/ums/default.nix b/pkgs/servers/ums/default.nix index 3fb2817277aa..503ff16caeeb 100644 --- a/pkgs/servers/ums/default.nix +++ b/pkgs/servers/ums/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "ums"; - version = "6.2.2"; + version = "9.1.0"; src = fetchurl { - url = "mirror://sourceforge/project/unimediaserver/Official%20Releases/Linux/" + stdenv.lib.toUpper "${pname}-${version}" + "-Java8.tgz"; - sha256 = "1qa999la9hixy0pdj9phjvr6lwqycgdvm94nc1606vz0ivf95b15"; + url = "mirror://sourceforge/project/unimediaserver/Official%20Releases/Linux/" + stdenv.lib.toUpper "${pname}-${version}" + ".tgz"; + sha256 = "07wprjpwqids96v5q5fhwcxqlg8jp1vy585vl2nqbfi1vf5v294s"; name = "${pname}-${version}.tgz"; }; @@ -19,6 +19,10 @@ stdenv.mkDerivation rec { mkdir $out/bin mv $out/documentation /$out/doc + # ums >= 9.0.0 ships its own JRE in the package. if we remove it, the `UMS.sh` + # script will correctly fall back to the JRE specified by JAVA_HOME + rm -rf $out/linux/jre-x64 $out/linux/jre-x86 + makeWrapper "$out/UMS.sh" "$out/bin/ums" \ --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [ libzen libmediainfo] }" \ --set JAVA_HOME "${jre8}" diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix index 80b0f3860514..ad2e845f9bc8 100644 --- a/pkgs/shells/elvish/default.nix +++ b/pkgs/shells/elvish/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "elvish"; - version = "0.12"; + version = "0.13"; goPackagePath = "github.com/elves/elvish"; excludedPackages = [ "website" ]; @@ -15,9 +15,11 @@ buildGoPackage rec { owner = "elves"; repo = pname; rev = "v${version}"; - sha256 = "1vvbgkpnrnb5aaak4ks45wl0cyp0vbry8bpxl6v2dpmq9x0bscpp"; + sha256 = "0fprii430p9w8x4wq93iqkgkwi5kypwwlnzgvlcz0mkksayk8bzg"; }; + modSha256 = "13x4wbfj8049ygm3zbgzyr2bm4sq4x6xddrxx6shr8fydlcf1g8v"; + meta = with stdenv.lib; { description = "A friendly and expressive command shell"; longDescription = '' diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 811ef762f78a..9f3f0da75c9e 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "08zqvk8qkilynfivx1jnr2yqrav64p9cy9i30jjgcqrh2gsrb9dd"; + sha256 = "06w1118cxr5x3l7cq2wc092xvsfkgga8b6kz1gcmhwq0gf7fqirz"; }; - cargoSha256 = "1gpg0jpd5pmmny9gzzbkph1h2kqmjlapdsw04jzx852yg89lls5v"; + cargoSha256 = "1bpb4p4j7lwb70qjsssbr878mfalil4xh8r954aaa2rlcf97fmb7"; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index 2bc65164d582..2a1688480dbc 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -5,28 +5,21 @@ , glibcLocales , coreutils , git +, python3 }: python3Packages.buildPythonApplication rec { pname = "xonsh"; - version = "0.9.13"; + version = "0.9.14"; # fetch from github because the pypi package ships incomplete tests src = fetchFromGitHub { owner = "xonsh"; repo = "xonsh"; - rev = "refs/tags/${version}"; - sha256 = "0nk6rjdkbxli510iwqspvray48kdxvbdmq1k8nxn14kqfpqzlbcv"; + rev = version; + sha256 = "03g8ilg4dxin3v3rzccdxx9zf8rvyqpxakn1dlpqbgsnwdwa19p4"; }; - patches = [ - (fetchpatch { - name = "fix-ptk-tests.patch"; - url = "https://github.com/xonsh/xonsh/commit/ca7acecc968dcda7dd56c1f5d5b4df349c98d734.patch"; - sha256 = "00nhbf9wzm6r86r9zq8mnhds30w6gdhkgsx5kpl0jppiz4ll96iw"; - }) - ]; - LC_ALL = "en_US.UTF-8"; postPatch = '' sed -ie "s|/bin/ls|${coreutils}/bin/ls|" tests/test_execer.py @@ -34,6 +27,7 @@ python3Packages.buildPythonApplication rec { sed -ie 's|/usr/bin/env|${coreutils}/bin/env|' tests/test_integrations.py sed -ie 's|/usr/bin/env|${coreutils}/bin/env|' scripts/xon.sh + find scripts -name 'xonsh*' -exec sed -i -e "s|env -S|env|" {} \; find -name "*.xsh" | xargs sed -ie 's|/usr/bin/env|${coreutils}/bin/env|' patchShebangs . ''; @@ -41,7 +35,7 @@ python3Packages.buildPythonApplication rec { doCheck = !stdenv.isDarwin; checkPhase = '' - HOME=$TMPDIR pytest -k 'not test_repath_backslash and not test_os and not test_man_completion and not test_builtins and not test_main and not test_ptk_highlight' + HOME=$TMPDIR pytest -k 'not test_repath_backslash and not test_os and not test_man_completion and not test_builtins and not test_main and not test_ptk_highlight and not test_pyghooks' HOME=$TMPDIR pytest -k 'test_builtins or test_main' --reruns 5 HOME=$TMPDIR pytest -k 'test_ptk_highlight' ''; diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix index e1bfc68dc4de..c0ae5e03e6c3 100644 --- a/pkgs/shells/zsh/antibody/default.nix +++ b/pkgs/shells/zsh/antibody/default.nix @@ -2,22 +2,22 @@ buildGoModule rec { pname = "antibody"; - version = "4.2.0"; - - goPackagePath = "github.com/getantibody/antibody"; + version = "4.3.1"; src = fetchFromGitHub { owner = "getantibody"; repo = "antibody"; rev = "v${version}"; - sha256 = "1vds7mxqxa7xlhvjvmnh1nr1ra3dciav0qlv45s1dmwn5qrcilci"; + sha256 = "1cxg0173d3xnpyzbisj926vh3qql9rw3q4j1z900m34gw7cvsdpf"; }; - modSha256 = "1n9sgrm16iig600f4q1cmbwwk0822isjvbyazplylha843510b17"; + modSha256 = "08k4mzqcva7yq1zmfxhlqnd8kk70zry6cfghxl1bgmhnfjqh61qr"; + + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; meta = with lib; { description = "The fastest shell plugin manager"; - homepage = https://github.com/getantibody/antibody; + homepage = "https://github.com/getantibody/antibody"; license = licenses.mit; maintainers = with maintainers; [ filalex77 worldofpeace ]; }; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 4943a92faa74..5a61cd2e90a7 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2020-03-05"; + version = "2020-03-12"; pname = "oh-my-zsh"; - rev = "2eb3e9d57cf69f3c2fa557f9047e0a648d80b235"; + rev = "07e3236bc5c8dbf9d818a4f0145f09bdb4bec6f0"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "025xd53j307wh3bly456b7y6r71wm2dzqn6xway0rsc6r5b70z4x"; + sha256 = "1imjvig60r250ljbnajxq4zv4fgs3l3jrrda0dvlnax5v5psxb12"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/pkgs/tools/admin/awsweeper/default.nix b/pkgs/tools/admin/awsweeper/default.nix index 91ef7ee022e4..661747c2fd0d 100644 --- a/pkgs/tools/admin/awsweeper/default.nix +++ b/pkgs/tools/admin/awsweeper/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "awsweeper"; - version = "0.4.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "cloudetc"; repo = pname; rev = "v${version}"; - sha256 = "0if2sfxd28m832zyiy40grwa4may45zq20h35yxf8bq0wxvp0q3f"; + sha256 = "0sbd1jgzz3rxxwgbni885zvvcznfc51imaxwv7f064290iqlbrv4"; }; - modSha256 = "0nzc8ib2c3wlwk97qq45kgpnval69v8nbxhkfabcx0idipx3pbvk"; + modSha256 = "14yvf0svh7xqpc2y7xr94pc6r7d3iv2nsr8qs3f5q29hdc5hv3fs"; meta = with lib; { description = "A tool to clean out your AWS account"; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index fd8ee9e04a3a..c7c2881a567a 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -1,7 +1,7 @@ { stdenv, pkgconfig, lxc, buildGoPackage, fetchurl , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq , squashfsTools, iproute, iptables, ebtables, libcap, libco-canonical, dqlite -, raft-canonical, sqlite-replication +, raft-canonical, sqlite-replication, udev , writeShellScriptBin, apparmor-profiles, apparmor-parser , criu , bash @@ -9,13 +9,13 @@ buildGoPackage rec { pname = "lxd"; - version = "3.18"; + version = "3.22"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "1p8g2gbwgn3kln5rxddpc2fxk8bvf026wjiqip2b0vvpi7h3955h"; + sha256 = "1j60xajcycqnnkasbghcvx3dvb5iadvvq2l3hh9i0sw3dk1wx4hn"; }; preBuild = '' @@ -45,7 +45,7 @@ buildGoPackage rec { nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ lxc acl libcap libco-canonical.dev dqlite.dev - raft-canonical.dev sqlite-replication ]; + raft-canonical.dev sqlite-replication udev.dev ]; meta = with stdenv.lib; { description = "Daemon based on liblxc offering a REST API to manage containers"; diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index 7c2c66f9fbaa..db6f27a3010f 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "procs"; - version = "0.9.18"; + version = "0.9.20"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "0bqaj4a56h26sgiw2r453k6f252sy6lrb71ammr0ki3bqqqjhvdi"; + sha256 = "00qqn8nwv791bs88n302hy67dpas5hcacnkakn7law567klnzxfz"; }; - cargoSha256 = "1rrwmi1wwjjql3chw996wki7mx0biaw9wc4v2xzv3vrxspvlvb5g"; + cargoSha256 = "09ib1nlqhzq3mc5wc16mgqbyr652asrwdpbwaax54fm1gd334prl"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 1a7fb5c3a084..e351867ca1bf 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "blueman"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { url = "https://github.com/blueman-project/blueman/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "1hyvc5x97j8b4kvwzh58zzlc454d0h0hk440zbg8f5as9qrv5spi"; + sha256 = "0k49hgyglsrlszckjzrvlsdm9ysns3qgvczgcmwaz02vvwnb4zai"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix index 81686a456d07..398641faf15e 100644 --- a/pkgs/tools/bootloaders/refind/default.nix +++ b/pkgs/tools/bootloaders/refind/default.nix @@ -14,12 +14,12 @@ in stdenv.mkDerivation rec { pname = "refind"; - version = "0.11.5"; + version = "0.12.0"; srcName = "refind-src-${version}"; src = fetchurl { url = "mirror://sourceforge/project/refind/${version}/${srcName}.tar.gz"; - sha256 = "0pphl37y1zfrcai821aab9k097yp669hn1j07cas1nppinafg78v"; + sha256 = "1i5p3sir3mx4i2q5w78360xn2kbgsj8rmgrqvsvag1zzr5dm1f3v"; }; patches = [ diff --git a/pkgs/tools/filesystems/btrfs-dedupe/default.nix b/pkgs/tools/filesystems/btrfs-dedupe/default.nix deleted file mode 100644 index 40a58e4227f3..000000000000 --- a/pkgs/tools/filesystems/btrfs-dedupe/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, rustPlatform, lzo, zlib }: - -with rustPlatform; - -buildRustPackage rec { - pname = "btrfs-dedupe"; - version = "1.1.0"; - - - src = fetchurl { - url = "https://gitlab.wellbehavedsoftware.com/well-behaved-software/btrfs-dedupe/repository/archive.tar.bz2?ref=72c6a301d20f935827b994db210bf0a1e121273a"; - sha256 = "0qy1g4crhfgs2f5cmrsjv6qscg3r66gb8n6sxhimm9ksivhjyyjp"; - }; - - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1sz3fswb76rnk7x4kpl1rnj2yxbhpx6q8kv8xxiqdr7qyphpi98r"; - - buildInputs = [ lzo zlib ]; - - meta = with stdenv.lib; { - homepage = https://gitlab.wellbehavedsoftware.com/well-behaved-software/btrfs-dedupe; - description = "BTRFS deduplication utility"; - license = licenses.mit; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ ikervagyok ]; - }; -} diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index e3b1d7c661c7..abf6ed1361b9 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -93,7 +93,7 @@ let ]); sitePackages = ceph-python-env.python.sitePackages; - version = "14.2.6"; + version = "14.2.7"; in rec { ceph = stdenv.mkDerivation { pname = "ceph"; @@ -101,7 +101,7 @@ in rec { src = fetchurl { url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz"; - sha256 = "0qkyrb25r2a57n6k8ncb43x7hvhkmpi7abhfyi98mlz2lhmhzlm1"; + sha256 = "0qiqhm6hvz299q54k3i4crnb5dhpq6xnn2yqih9pxn9van0dq1ln"; }; patches = [ diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 16aaabee6189..b7e2fb00a140 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "0.13.2"; + version = "0.13.4"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "0lrrbzs7s2dgifamp81g41fhg6274pvri4hr3xxr1swpvsinxwfn"; + sha256 = "0xd7vsybv6w5llvb85g6bx6r33lr0ki077rwzdvwb9c8w64fvs2h"; }; - cargoSha256 = "1whnisc30f7qsd8xdr25s64sd1qlbcasd0b06f216sxsf6bmf8a1"; + cargoSha256 = "16qad0m2vygwrbz40ww0mb0ba5wn2wna1n78bc8nxh60x0qiigi9"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/docui/default.nix b/pkgs/tools/misc/docui/default.nix index 66c0cfc82b1b..0329c1bc4a69 100644 --- a/pkgs/tools/misc/docui/default.nix +++ b/pkgs/tools/misc/docui/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "docui"; - version = "2.0.0"; + version = "2.0.4"; src = fetchFromGitHub { owner = "skanehira"; repo = "docui"; rev = version; - sha256 = "0rizl4rxmb3brzvqxw5llbgvq3rncix3h60pgq50djdf0jjnn5hs"; + sha256 = "0jya0wdp8scjmsr44krdbbb8q4gplf44gsng1nyn12a6ldqzayxl"; }; - modSha256 = "0asqz9nnx80g2wi7dzxrfmppcraywrwdqi9vzr66vaihwpfpfnwz"; + modSha256 = "1wyx05kk4f41mgvwnvfc9xk7vd3x96cbn5xb5ph7p443f70ydnak"; meta = with stdenv.lib; { description = "TUI Client for Docker"; - homepage = https://github.com/skanehira/docui; + homepage = "https://github.com/skanehira/docui"; license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ aethelz ]; diff --git a/pkgs/tools/misc/fselect/default.nix b/pkgs/tools/misc/fselect/default.nix index 2a3813eb184f..e508eb02ad09 100644 --- a/pkgs/tools/misc/fselect/default.nix +++ b/pkgs/tools/misc/fselect/default.nix @@ -1,17 +1,23 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ stdenv, fetchFromGitHub, rustPlatform, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "fselect"; - version = "0.6.8"; + version = "0.6.9"; src = fetchFromGitHub { owner = "jhspetersson"; repo = "fselect"; rev = version; - sha256 = "1zccl60l557lhaaqb33myys4vp3jsnjqh3dxb22i46bff28s1w6c"; + sha256 = "0cgzvzdsy8vbiapgk1l5dp48c3kq0xmx53yfi486mx8nwvz3ksc0"; }; - cargoSha256 = "0023adx4xkm24p3nwj0j669xns4qf8insalcnlv3r2iv4138w10l"; + cargoSha256 = "0mjd9nmaggsszf0kx68yrvy3fqbn35v34c7q3584fv50ipqn6drb"; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installManPage docs/fselect.1 + ''; meta = with stdenv.lib; { description = "Find files with SQL-like queries"; diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 740b600cdb3e..d337731888fd 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fzf"; - version = "0.21.0"; + version = "0.21.0-1"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - sha256 = "0s52mq64r44dh7wwc4h96xhhbxf000dr96nim0g0dcmkmnm2p8gv"; + sha256 = "1d4bwcmjirwkkv0m01sx9rxp01iik57iy54zxhdkkz842pxlr2xv"; }; modSha256 = "16bb0a9z49jqhh9lmq8rvl7x9vh79mi4ygkb9sm04g41g5z6ag1s"; diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index 168afc7efedd..07c5f9b35174 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -15,18 +15,19 @@ , libssh2 , openssl , coreutils +, autoreconfHook }: stdenv.mkDerivation rec { pname = "mc"; - version = "4.8.23"; + version = "4.8.24"; src = fetchurl { - url = "http://www.midnight-commander.org/downloads/${pname}-${version}.tar.xz"; - sha256 = "077z7phzq3m1sxyz7li77lyzv4rjmmh3wp2vy86pnc4387kpqzyx"; + url = "https://www.midnight-commander.org/downloads/${pname}-${version}.tar.xz"; + sha256 = "0ikd2yql44p7nagmb08dmjqdwadclnvgr7ri9pmzc2s5f301r7w5"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ file @@ -58,12 +59,12 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "File Manager and User Shell for the GNU Project"; - downloadPage = "http://www.midnight-commander.org/downloads/"; - homepage = "http://www.midnight-commander.org"; + downloadPage = "https://www.midnight-commander.org/downloads/"; + homepage = "https://www.midnight-commander.org"; license = licenses.gpl2Plus; maintainers = with maintainers; [ sander ]; platforms = with platforms; linux ++ darwin; - repositories.git = git://github.com/MidnightCommander/mc.git; + repositories.git = "https://github.com/MidnightCommander/mc.git"; updateWalker = true; }; } diff --git a/pkgs/tools/misc/opentimestamps-client/default.nix b/pkgs/tools/misc/opentimestamps-client/default.nix index 94984c57e49c..8cc5cd7f6f2b 100644 --- a/pkgs/tools/misc/opentimestamps-client/default.nix +++ b/pkgs/tools/misc/opentimestamps-client/default.nix @@ -4,7 +4,7 @@ buildPythonApplication rec { pname = "opentimestamps-client"; - version = "0.6.0"; + version = "0.7.0"; disabled = (!isPy3k); # We can't use the pypi source because it doesn't include README.md which is @@ -13,18 +13,9 @@ buildPythonApplication rec { owner = "opentimestamps"; repo = "opentimestamps-client"; rev = "opentimestamps-client-v${version}"; - sha256 = "05m8nllqad3k69mvby5q08y22i0wrj84gqifdgcldimrrn1i00xp"; + sha256 = "1aiq9cwr40md54swzm7wkwj0h65psxmvj2japvw79s9x0pp8iwqs"; }; - patches = [ - (fetchpatch { - url = "https://github.com/opentimestamps/opentimestamps-client/commit/1b328269ceee66916e9a639e8d5d7d13cd70d5d8.patch"; - sha256 = "0bd3yalyvk5n4sflw9zilpay5k653ybdgkkfppyrk7c8z3i81hbl"; - }) - ]; - - checkInputs = [ git ]; - propagatedBuildInputs = [ opentimestamps appdirs GitPython pysocks ]; meta = { diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index f081f94a1475..39150cfed7e1 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, openssl, pcsclite, check }: +{ stdenv, fetchurl, pkgconfig, openssl, check, pcsclite, PCSC +, withApplePCSC ? stdenv.isDarwin +}: stdenv.mkDerivation rec { name = "yubico-piv-tool-2.0.0"; @@ -9,9 +11,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl pcsclite check ]; + buildInputs = [ openssl check ] + ++ (if withApplePCSC then [ PCSC ] else [ pcsclite ]); - configureFlags = [ "--with-backend=pcsc" ]; + configureFlags = [ "--with-backend=${if withApplePCSC then "macscard" else "pcsc"}" ]; meta = with stdenv.lib; { homepage = https://developers.yubico.com/yubico-piv-tool/; diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 6554dd465d4c..8296600cf3d3 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.20.0"; + version = "0.23.7"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "0yd3d90ssdzpbsdq068dvsi0r1z2rlv3wpbmpkhfgpxmwrvdanrq"; + sha256 = "1sfl2nyzspqllbklc9wf62wqxs0k3ac7vzqz8kl5h9ch654g542a"; }; - modSha256 = "0cqwkmhajp3py3b5aj3qz9480qy2ws0vy1gk21bxjm56wqxl2gf0"; + modSha256 = "0r5ybr4gpcdsldk12b0d4xiih6ckwnqkfwy89c97prv24v14zysv"; meta = with stdenv.lib; { description = "Simple DNS proxy with DoH, DoT, and DNSCrypt support"; diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index dcf377ca0c04..3e5300549db6 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "${project}-${version}"; project = "mailutils"; - version = "3.8"; + version = "3.9"; src = fetchurl { url = "mirror://gnu/${project}/${name}.tar.xz"; - sha256 = "1wkn9ch664477r4d8jk9153w5msljsbj99907k7zgzpmywbs6ba7"; + sha256 = "1g1xf2lal04nsnf1iym9n9n0wxjpqbcr9nysxpm98v4pniinqwsz"; }; postPatch = '' diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix index 8832560b3b10..a722a8016bc9 100644 --- a/pkgs/tools/networking/wireguard-go/default.nix +++ b/pkgs/tools/networking/wireguard-go/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "wireguard-go"; - version = "0.0.20191012"; + version = "0.0.20200121"; goPackagePath = "golang.zx2c4.com/wireguard"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz"; - sha256 = "0s3hvqpz13n630yvi0476hfzrp3xcj8x61zc2hl5z70f8kvbay4i"; + sha256 = "04ca1j8lcbyg1qg7ls23yy90s17k97i912ksxfpads0sdd3r2yc9"; }; patches = [ ./0001-Fix-darwin-build.patch ]; diff --git a/pkgs/tools/networking/yggdrasil/default.nix b/pkgs/tools/networking/yggdrasil/default.nix index ca10adae0e44..3bf3b97c2355 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.12"; + version = "0.3.13"; src = fetchFromGitHub { owner = "yggdrasil-network"; repo = "yggdrasil-go"; rev = "v${version}"; - sha256 = "03ywxamjcnhcr20vm9pn3rq3hqq49i6rfdvx44czzr30h8xp8dhw"; + sha256 = "1k3xxarrl33sxik1dqahfllrhd501xqq5q5mcn4y5wi9lwywsy50"; }; - modSha256 = "1vqk0jyqc1qcryi247r5pbvfjw3m48l028fb2mrq1xqqfkjqrr85"; + modSha256 = "057yl3i29kwpd129aa2rb67s5rmz898fi2a7lxv3nfjp7018s9qw"; # Change the default location of the management socket on Linux # systems so that the yggdrasil system service unit does not have to @@ -28,10 +28,11 @@ buildGoModule rec { ''; meta = with lib; { - description = "An experiment in scalable routing as an encrypted IPv6 overlay network"; + description = + "An experiment in scalable routing as an encrypted IPv6 overlay network"; homepage = "https://yggdrasil-network.github.io/"; license = licenses.lgpl3; platforms = platforms.all; - maintainers = with maintainers; [ gazally lassulus ]; + maintainers = with maintainers; [ ehmry gazally lassulus ]; }; } diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index 9b7d915a3490..c85bcf5b66c3 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "sunng87"; repo = "cargo-release"; rev = "v${version}"; - sha256 = "1w9w43i5br94vg5m4idabh67p4ffsx2lmc2g0ak2k961vl46wr0q"; + sha256 = "0w4p1v9ya6kai2sy4ic45s1m01ya3hlysxlc8ha698jfvzs8nnld"; }; - cargoSha256 = "1x54c6wk5cbnqcy1qpsff8lwqxs0d4qf0v71r7wl0kjp8mrmmhl4"; + cargoSha256 = "02x268xbxd2nin9y1dm35mkk90vyx16zzp18fi4fwc8kpsdbjpai"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index 60091742e0d0..0b5f5edf3992 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.1.10"; + version = "1.2.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "0qn9hybqnhyf1xb6n0m4qq2ac8h187i2pjkkik73qly1hmyq45j7"; + sha256 = "0zl8xf74k5is8rxbirrqb5cnfgrlppr1gchfqm31305mnpicr92s"; }; - modSha256 = "037ihnvssgkzbg94yfw4lwqnhj02m187dfn1fm7i6yv13kf0gkpx"; + modSha256 = "14izjwadl4ify0wrz0yinqvayar79h0pxxqj5n69a5dgbx09fp0l"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; diff --git a/pkgs/tools/package-management/xbps/default.nix b/pkgs/tools/package-management/xbps/default.nix index 21000bf6353d..0322faa4c88b 100644 --- a/pkgs/tools/package-management/xbps/default.nix +++ b/pkgs/tools/package-management/xbps/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xbps"; - version = "0.58"; + version = "0.59"; src = fetchFromGitHub { owner = "void-linux"; repo = "xbps"; rev = version; - sha256 = "03zjbqz6fcp9h45ms93hsf96yd79r6hmbk6vixl5m34bf1z2qdn5"; + sha256 = "0m00h1f004gsa998cr93b4zmsn4162983d360pzpd3hfi3qzan5d"; }; nativeBuildInputs = [ pkgconfig which ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/void-linux/xbps; + homepage = "https://github.com/void-linux/xbps"; description = "The X Binary Package System"; platforms = platforms.linux; # known to not work on Darwin, at least license = licenses.bsd2; diff --git a/pkgs/tools/security/afl/qemu-patches/syscall-glibc2_30.diff b/pkgs/tools/security/afl/qemu-patches/syscall-glibc2_30.diff new file mode 100644 index 000000000000..aa2950bf157c --- /dev/null +++ b/pkgs/tools/security/afl/qemu-patches/syscall-glibc2_30.diff @@ -0,0 +1,51 @@ +--- qemu-2.10.0-clean/linux-user/syscall.c 2020-03-12 18:47:47.898592169 +0100 ++++ qemu-2.10.0/linux-user/syscall.c 2020-03-13 09:13:42.461809699 +0100 +@@ -34,6 +34,7 @@ + #include <sys/resource.h> + #include <sys/swap.h> + #include <linux/capability.h> ++#include <linux/sockios.h> // https://lkml.org/lkml/2019/6/3/988 + #include <sched.h> + #include <sys/timex.h> + #ifdef __ia64__ +@@ -256,7 +257,9 @@ static type name (type1 arg1,type2 arg2, + #endif + + #ifdef __NR_gettid +-_syscall0(int, gettid) ++// taken from https://patchwork.kernel.org/patch/10862231/ ++#define __NR_sys_gettid __NR_gettid ++_syscall0(int, sys_gettid) + #else + /* This is a replacement for the host gettid() and must return a host + errno. */ +@@ -6219,7 +6222,7 @@ static void *clone_func(void *arg) + cpu = ENV_GET_CPU(env); + thread_cpu = cpu; + ts = (TaskState *)cpu->opaque; +- info->tid = gettid(); ++ info->tid = sys_gettid(); + task_settid(ts); + if (info->child_tidptr) + put_user_u32(info->tid, info->child_tidptr); +@@ -6363,9 +6366,9 @@ static int do_fork(CPUArchState *env, un + mapping. We can't repeat the spinlock hack used above because + the child process gets its own copy of the lock. */ + if (flags & CLONE_CHILD_SETTID) +- put_user_u32(gettid(), child_tidptr); ++ put_user_u32(sys_gettid(), child_tidptr); + if (flags & CLONE_PARENT_SETTID) +- put_user_u32(gettid(), parent_tidptr); ++ put_user_u32(sys_gettid(), parent_tidptr); + ts = (TaskState *)cpu->opaque; + if (flags & CLONE_SETTLS) + cpu_set_tls (env, newtls); +@@ -11402,7 +11405,7 @@ abi_long do_syscall(void *cpu_env, int n + break; + #endif + case TARGET_NR_gettid: +- ret = get_errno(gettid()); ++ ret = get_errno(sys_gettid()); + break; + #ifdef TARGET_NR_readahead + case TARGET_NR_readahead: diff --git a/pkgs/tools/security/afl/qemu.nix b/pkgs/tools/security/afl/qemu.nix index 479de4b41850..b841ccb93d3c 100644 --- a/pkgs/tools/security/afl/qemu.nix +++ b/pkgs/tools/security/afl/qemu.nix @@ -52,6 +52,8 @@ stdenv.mkDerivation { "../${afl.src.name}/qemu_mode/patches/memfd.diff" # nix-specific patches to make installation more well-behaved ./qemu-patches/no-etc-install.patch + # patch for fixing qemu build on glibc >= 2.30 + ./qemu-patches/syscall-glibc2_30.diff ]; configureFlags = diff --git a/pkgs/tools/security/b3sum/default.nix b/pkgs/tools/security/b3sum/default.nix index 5dc4f1b81e67..6f783d07ced8 100644 --- a/pkgs/tools/security/b3sum/default.nix +++ b/pkgs/tools/security/b3sum/default.nix @@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec { sourceRoot = "source/b3sum"; cargoSha256 = "1rqhz2r60603mylazn37mkm783qb7qhjcg8cqss0iy1g752f3f2i"; - verifyCargoDeps = false; cargoPatches = [ ./add-cargo-lock.patch ]; diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index fbef98df82d7..71f39eaf2ee9 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -16,11 +16,11 @@ let pname = "bitwarden"; version = { - x86_64-linux = "1.16.6"; + x86_64-linux = "1.17.0"; }.${system} or ""; sha256 = { - x86_64-linux = "074hqm4gjljc82nhn7h6wsd74567390018fi3v38g7jh7aph10jj"; + x86_64-linux = "01azgz1wka32z2jjdnbdyzm8fbrb34ifwirmjbvfw37yia28sd72"; }.${system} or ""; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/pcsctools/default.nix b/pkgs/tools/security/pcsctools/default.nix index fa53b91a02f1..c9c677e64c02 100644 --- a/pkgs/tools/security/pcsctools/default.nix +++ b/pkgs/tools/security/pcsctools/default.nix @@ -5,11 +5,11 @@ let deps = lib.makeBinPath [ wget coreutils ]; in stdenv.mkDerivation rec { - name = "pcsc-tools-1.5.5"; + name = "pcsc-tools-1.5.6"; src = fetchurl { url = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools/${name}.tar.bz2"; - sha256 = "01251m8hf7by8rw8fayhjxmcqvi6dp150680fpf89bqycha2vgqv"; + sha256 = "1a2zd06c6s4sqlpm5801gj41gh5g62jb8srd7vhlcm70hg3l3nsy"; }; buildInputs = [ udev dbus perlPackages.perl pcsclite ]; @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Tools used to test a PC/SC driver, card or reader"; - homepage = http://ludovic.rousseau.free.fr/softwares/pcsc-tools/; + homepage = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; platforms = platforms.linux; diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix index c2d3b33c7490..8efcf22312fb 100644 --- a/pkgs/tools/system/ddrescue/default.nix +++ b/pkgs/tools/system/ddrescue/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "ddrescue-1.24"; + name = "ddrescue-1.25"; src = fetchurl { url = "mirror://gnu/ddrescue/${name}.tar.lz"; - sha256 = "11qh0bbzf00mfb4yq35gnv5m260k4d7q9ixklry6bqvhvvp3ypab"; + sha256 = "0qqh38izl5ppap9a5izf3hijh94k65s3zbfkczd4b7x04syqwlyf"; }; nativeBuildInputs = [ lzip ]; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { second and successive copies. ''; - homepage = https://www.gnu.org/software/ddrescue/ddrescue.html; + homepage = "https://www.gnu.org/software/ddrescue/ddrescue.html"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/system/r10k/Gemfile.lock b/pkgs/tools/system/r10k/Gemfile.lock index f399068b56ec..3ff9b6462156 100644 --- a/pkgs/tools/system/r10k/Gemfile.lock +++ b/pkgs/tools/system/r10k/Gemfile.lock @@ -1,38 +1,40 @@ GEM remote: https://rubygems.org/ specs: - colored (1.2) - cri (2.15.5) - faraday (0.13.1) + colored2 (3.1.2) + cri (2.15.10) + faraday (0.17.3) multipart-post (>= 1.2, < 3) - faraday_middleware (0.12.2) + faraday_middleware (0.13.1) faraday (>= 0.7.4, < 1.0) fast_gettext (1.1.2) gettext (3.2.9) locale (>= 2.0.5) text (>= 1.3.0) - gettext-setup (0.30) + gettext-setup (0.34) fast_gettext (~> 1.1.0) - gettext (>= 3.0.2) + gettext (>= 3.0.2, < 3.3.0) locale - locale (2.1.2) + locale (2.1.3) log4r (1.1.10) - minitar (0.8) - multi_json (1.13.1) - multipart-post (2.0.0) - puppet_forge (2.2.9) - faraday (>= 0.9.0, < 0.14.0) - faraday_middleware (>= 0.9.0, < 0.13.0) + minitar (0.9) + multi_json (1.14.1) + multipart-post (2.1.1) + puppet_forge (2.3.3) + faraday (>= 0.9.0, < 0.18.0, != 0.13.1) + faraday_middleware (>= 0.9.0, < 0.14.0) gettext-setup (~> 0.11) minitar semantic_puppet (~> 1.0) - r10k (3.2.0) - colored (= 1.2) - cri (~> 2.15.1) + r10k (3.4.1) + colored2 (= 3.1.2) + cri (>= 2.15.10, < 3.0.0) + fast_gettext (~> 1.1.0) + gettext (>= 3.0.2, < 3.3.0) gettext-setup (~> 0.24) log4r (= 1.1.10) multi_json (~> 1.10) - puppet_forge (~> 2.2.8) + puppet_forge (~> 2.3.0) semantic_puppet (1.0.2) text (1.3.1) @@ -43,4 +45,4 @@ DEPENDENCIES r10k BUNDLED WITH - 1.17.2 + 1.17.3 diff --git a/pkgs/tools/system/r10k/gemset.nix b/pkgs/tools/system/r10k/gemset.nix index b918fe788b59..d0e955d4cea9 100644 --- a/pkgs/tools/system/r10k/gemset.nix +++ b/pkgs/tools/system/r10k/gemset.nix @@ -1,23 +1,23 @@ { - colored = { + colored2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b0x5jmsyi0z69bm6sij1k89z7h0laag3cb4mdn7zkl9qmxb90lx"; + sha256 = "0jlbqa9q4mvrm73aw9mxh23ygzbjiqwisl32d8szfb5fxvbjng5i"; type = "gem"; }; - version = "1.2"; + version = "3.1.2"; }; cri = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z1z1aj7a3gf16wv31kc0mr45snlxrjavcj762rx791ymalmxkbr"; + sha256 = "1h45kw2s4bjwgbfsrncs30av0j4zjync3wmcc6lpdnzbcxs7yms2"; type = "gem"; }; - version = "2.15.5"; + version = "2.15.10"; }; faraday = { dependencies = ["multipart-post"]; @@ -25,10 +25,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gyqsj7vlqynwvivf9485zwmcj04v1z7gq362z0b8zw2zf4ag0hw"; + sha256 = "13aghksmni2sl15y7wfpx6k5l3lfd8j9gdyqi6cbw6jgc7bqyyn2"; type = "gem"; }; - version = "0.13.1"; + version = "0.17.3"; }; faraday_middleware = { dependencies = ["faraday"]; @@ -36,10 +36,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p7icfl28nvl8qqdsngryz1snqic9l8x6bk0dxd7ygn230y0k41d"; + sha256 = "1a93rs58bakqck7bcihasz66a1riy22h2zpwrpmb13gp8mw3wkmr"; type = "gem"; }; - version = "0.12.2"; + version = "0.13.1"; }; fast_gettext = { groups = ["default"]; @@ -68,20 +68,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04c243gwwlnh4m8rn1zx0w8mzhixjf9fvpfb65xcmgs5a19146j4"; + sha256 = "1vfnayz20xd8q0sz27816kvgia9z2dpj9fy7z15da239wmmnz7ga"; type = "gem"; }; - version = "0.30"; + version = "0.34"; }; locale = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sls9bq4krx0fmnzmlbn64dw23c4d6pz46ynjzrn9k8zyassdd0x"; + sha256 = "0997465kxvpxm92fiwc2b16l49mngk7b68g5k35ify0m3q0yxpdn"; type = "gem"; }; - version = "2.1.2"; + version = "2.1.3"; }; log4r = { groups = ["default"]; @@ -98,30 +98,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dfw1q83h6jxrmivd3fsg0dsbkdhv63qns0jc1a6kf1vmhd6ihwd"; + sha256 = "126mq86x67d1p63acrfka4zx0cx2r0vc93884jggxnrmmnzbxh13"; type = "gem"; }; - version = "0.8"; + version = "0.9"; }; multi_json = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; + sha256 = "0xy54mjf7xg41l8qrg1bqri75agdqmxap9z466fjismc1rn2jwfr"; type = "gem"; }; - version = "1.13.1"; + version = "1.14.1"; }; multipart-post = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; + sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.1"; }; puppet_forge = { dependencies = ["faraday" "faraday_middleware" "gettext-setup" "minitar" "semantic_puppet"]; @@ -129,21 +129,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00qma88kwg2f4nh5yid9w4pqfdbwlh8bz2mmgiiwji38s0pdahba"; + sha256 = "1lyd10ai27lxylywjxpwyxikx5hblsdchid3chymrrv55x217cny"; type = "gem"; }; - version = "2.2.9"; + version = "2.3.3"; }; r10k = { - dependencies = ["colored" "cri" "gettext-setup" "log4r" "multi_json" "puppet_forge"]; + dependencies = ["colored2" "cri" "fast_gettext" "gettext" "gettext-setup" "log4r" "multi_json" "puppet_forge"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yjvklvdvx0wjgg6bhhaszdsk62cysjviwj0536z7ng25q3ci5kj"; + sha256 = "0nlckw4yr2ph14i9h0blsdb5zmrzqh3aknkm0dg3hrcx8ygncai6"; type = "gem"; }; - version = "3.2.0"; + version = "3.4.1"; }; semantic_puppet = { groups = ["default"]; diff --git a/pkgs/tools/system/sg3_utils/default.nix b/pkgs/tools/system/sg3_utils/default.nix index 67145bc3cc54..45e3287511a3 100644 --- a/pkgs/tools/system/sg3_utils/default.nix +++ b/pkgs/tools/system/sg3_utils/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "sg3_utils-1.44"; + name = "sg3_utils-1.45"; src = fetchurl { url = "http://sg.danny.cz/sg/p/${name}.tgz"; - sha256 = "0yxfbkd48mbzipwmggcvpq60zybsb6anrca878si26z7496nibld"; + sha256 = "0qasc3qm4i8swjfaywiwpgz76gdxqvm47qycxgmprbsjmxqwk1qb"; }; meta = with stdenv.lib; { - homepage = http://sg.danny.cz/sg/; + homepage = "http://sg.danny.cz/sg/"; description = "Utilities that send SCSI commands to devices"; platforms = platforms.linux; license = with licenses; [ bsd2 gpl2Plus ]; diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index 8066f07afa93..ed104f3a9ba1 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "syslog-ng"; - version = "3.25.1"; + version = "3.26.1"; src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "05v8vgs4fbzslqjca9zjk7hkiyb6yj4i2v0fi51xan6ypirrdjrl"; + sha256 = "1kb2rdhfw4vcdxpvr7rcpg5ysr14ib43bfqdm3755wjdhqil48ch"; }; nativeBuildInputs = [ pkgconfig which ]; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://www.syslog-ng.com; + homepage = "https://www.syslog-ng.com"; description = "Next-generation syslogd with advanced networking and filtering capabilities"; license = licenses.gpl2; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74ab773c2393..c30bc270ad47 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -126,6 +126,8 @@ in addOpenGLRunpath = callPackage ../build-support/add-opengl-runpath { }; + ankisyncd = callPackage ../servers/ankisyncd { }; + avro-tools = callPackage ../development/tools/avro-tools { }; # Zip file format only allows times after year 1980, which makes e.g. Python wheel building fail with: @@ -171,6 +173,8 @@ in deadcode = callPackage ../development/tools/deadcode { }; + hobbes = callPackage ../development/tools/hobbes { stdenv = gcc6Stdenv; }; # GCC 6 is latest currently supported. See https://git.io/JvK6M. + proto-contrib = callPackage ../development/tools/proto-contrib {}; protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {}; @@ -621,6 +625,8 @@ in amp = callPackage ../applications/editors/amp {}; + ams = callPackage ../applications/audio/ams {}; + amtterm = callPackage ../tools/system/amtterm {}; analog = callPackage ../tools/admin/analog {}; @@ -1295,8 +1301,6 @@ in btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { }; - btrfs-dedupe = callPackage ../tools/filesystems/btrfs-dedupe {}; - btrbk = callPackage ../tools/backup/btrbk { asciidoc = asciidoc-full; }; @@ -1340,19 +1344,17 @@ in cue2pops = callPackage ../tools/cd-dvd/cue2pops { }; - cabal2nix = haskell.lib.overrideCabal (haskell.lib.generateOptparseApplicativeCompletion "cabal2nix" haskell.packages.ghc881.cabal2nix) (drv: { - isLibrary = false; - enableSharedExecutables = false; - executableToolDepends = (drv.executableToolDepends or []) ++ [ makeWrapper ]; - postInstall = '' - exe=$out/libexec/${drv.pname}-${drv.version}/${drv.pname} - install -D $out/bin/${drv.pname} $exe - rm -rf $out/{bin,lib,share} - makeWrapper $exe $out/bin/${drv.pname} \ - --prefix PATH ":" "${nix}/bin" \ - --prefix PATH ":" "${nix-prefetch-scripts}/bin" - '' + (drv.postInstall or ""); - }); + cabal2nix-unwrapped = haskell.lib.justStaticExecutables (haskell.lib.generateOptparseApplicativeCompletion "cabal2nix" haskellPackages.cabal2nix); + + cabal2nix = symlinkJoin { + inherit (cabal2nix-unwrapped) name meta; + nativeBuildInputs = [ makeWrapper ]; + paths = [ cabal2nix-unwrapped ]; + postBuild = '' + wrapProgram $out/bin/cabal2nix \ + --prefix PATH ":" "${lib.makeBinPath [ nix nix-prefetch-scripts ]}" + ''; + }; stack2nix = with haskell.lib; overrideCabal (justStaticExecutables haskellPackages.stack2nix) (drv: { executableToolDepends = [ makeWrapper ]; @@ -3092,7 +3094,7 @@ in cholmod-extra = callPackage ../development/libraries/science/math/cholmod-extra { }; - emscriptenVersion = "1.38.28"; + emscriptenVersion = "1.39.1"; emscripten = callPackage ../development/compilers/emscripten { }; @@ -4551,6 +4553,7 @@ in liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix { ffmpeg = ffmpeg-full; + ocamlPackages = ocaml-ng.ocamlPackages_4_07; }; lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { }; @@ -4820,6 +4823,8 @@ in libgumath = callPackage ../development/libraries/libgumath { }; + libinsane = callPackage ../development/libraries/libinsane { }; + libipfix = callPackage ../development/libraries/libipfix { }; libircclient = callPackage ../development/libraries/libircclient { }; @@ -8306,7 +8311,7 @@ in # Please update doc/languages-frameworks/haskell.section.md, “Our # current default compiler is”, if you bump this: - haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc882; + haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc883; inherit (haskellPackages) ghc; @@ -8359,7 +8364,9 @@ in fsharp41 = callPackage ../development/compilers/fsharp41 { mono = mono6; }; - fstar = callPackage ../development/compilers/fstar { }; + fstar = callPackage ../development/compilers/fstar { + ocamlPackages = ocaml-ng.ocamlPackages_4_07; + }; dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {}); @@ -8932,7 +8939,7 @@ in sagittarius-scheme = callPackage ../development/compilers/sagittarius-scheme {}; sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {}; - sbcl_2_0_1 = callPackage ../development/compilers/sbcl {}; + sbcl_2_0_2 = callPackage ../development/compilers/sbcl {}; sbcl = callPackage ../development/compilers/sbcl/2.0.0.nix {}; scala_2_10 = callPackage ../development/compilers/scala/2.10.nix { }; @@ -10161,6 +10168,7 @@ in fffuu = haskell.lib.justStaticExecutables (haskellPackages.callPackage ../tools/misc/fffuu { }); flow = callPackage ../development/tools/analysis/flow { + ocamlPackages = ocaml-ng.ocamlPackages_4_07; inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -11054,9 +11062,6 @@ in boost159 = callPackage ../development/libraries/boost/1.59.nix { }; boost15x = boost159; boost160 = callPackage ../development/libraries/boost/1.60.nix { }; - boost162 = callPackage ../development/libraries/boost/1.62.nix { }; - boost163 = callPackage ../development/libraries/boost/1.63.nix { }; - boost164 = callPackage ../development/libraries/boost/1.64.nix { }; boost165 = callPackage ../development/libraries/boost/1.65.nix { }; boost166 = callPackage ../development/libraries/boost/1.66.nix { }; boost167 = callPackage ../development/libraries/boost/1.67.nix { }; @@ -12774,9 +12779,7 @@ in libmysofa = callPackage ../development/libraries/audio/libmysofa { }; - libmysqlconnectorcpp = callPackage ../development/libraries/libmysqlconnectorcpp { - mysql = mysql57; - }; + libmysqlconnectorcpp = callPackage ../development/libraries/libmysqlconnectorcpp { }; libnatpmp = callPackage ../development/libraries/libnatpmp { }; @@ -12898,9 +12901,7 @@ in libksba = callPackage ../development/libraries/libksba { }; - libksi = callPackage ../development/libraries/libksi { - openssl = openssl_1_0_2; - }; + libksi = callPackage ../development/libraries/libksi { }; liblinear = callPackage ../development/libraries/liblinear { }; @@ -14903,7 +14904,9 @@ in yubico-pam = callPackage ../development/libraries/yubico-pam { }; - yubico-piv-tool = callPackage ../tools/misc/yubico-piv-tool { }; + yubico-piv-tool = callPackage ../tools/misc/yubico-piv-tool { + inherit (darwin.apple_sdk.frameworks) PCSC; + }; yubikey-manager = callPackage ../tools/misc/yubikey-manager { }; @@ -16857,7 +16860,6 @@ in # Hardened linux hardenedLinuxPackagesFor = kernel: linuxPackagesFor (kernel.override { - features.ia32Emulation = false; structuredExtraConfig = import ../os-specific/linux/kernel/hardened-config.nix { inherit stdenv; inherit (kernel) version; @@ -18624,6 +18626,9 @@ in claws-mail = callPackage ../applications/networking/mailreaders/claws-mail { inherit (xorg) libSM; }; + claws-mail-gtk3 = callPackage ../applications/networking/mailreaders/claws-mail/gtk3.nix { + inherit (xorg) libSM; + }; clfswm = callPackage ../applications/window-managers/clfswm { }; @@ -21720,7 +21725,7 @@ in stalonetray = callPackage ../applications/window-managers/stalonetray {}; - inherit (ocamlPackages) stog; + inherit (ocaml-ng.ocamlPackages_4_07) stog; stp = callPackage ../applications/science/logic/stp { }; @@ -22043,7 +22048,10 @@ in unigine-valley = callPackage ../applications/graphics/unigine-valley { }; - inherit (ocaml-ng.ocamlPackages_4_05) unison; + unison = callPackage ../applications/networking/sync/unison { + enableX11 = config.unison.enableX11 or true; + ocamlPackages = ocaml-ng.ocamlPackages_4_05; + }; unpaper = callPackage ../tools/graphics/unpaper { }; @@ -24404,7 +24412,9 @@ in abc-verifier = callPackage ../applications/science/logic/abc {}; - abella = callPackage ../applications/science/logic/abella {}; + abella = callPackage ../applications/science/logic/abella { + ocamlPackages = ocaml-ng.ocamlPackages_4_07; + }; acgtk = callPackage ../applications/science/logic/acgtk {}; @@ -24412,7 +24422,9 @@ in aspino = callPackage ../applications/science/logic/aspino {}; - beluga = callPackage ../applications/science/logic/beluga { }; + beluga = callPackage ../applications/science/logic/beluga { + ocamlPackages = ocaml-ng.ocamlPackages_4_07; + }; boogie = dotnetPackages.Boogie; @@ -24760,7 +24772,9 @@ in golly = callPackage ../applications/science/misc/golly { wxGTK = wxGTK30; }; golly-beta = callPackage ../applications/science/misc/golly/beta.nix { wxGTK = wxGTK30; }; - megam = callPackage ../applications/science/misc/megam { }; + megam = callPackage ../applications/science/misc/megam { + inherit (ocaml-ng.ocamlPackages_4_07) ocaml; + }; netlogo = callPackage ../applications/science/misc/netlogo { }; @@ -25142,13 +25156,9 @@ in lilypond-unstable = callPackage ../misc/lilypond/unstable.nix { }; - lilypond-with-fonts = callPackage ../misc/lilypond/with-fonts.nix { - lilypond = lilypond-unstable; - }; + lilypond-with-fonts = callPackage ../misc/lilypond/with-fonts.nix { }; - openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { - lilypond = lilypond-unstable; - }; + openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { }; loop = callPackage ../tools/misc/loop { }; @@ -25649,7 +25659,10 @@ in buildGoModule = buildGo112Module; }; - inherit (callPackage ../applications/networking/cluster/terraform {}) + inherit (callPackage ../applications/networking/cluster/terraform { + # terraform 0.12 crashes with go1.14 on darwin https://github.com/hashicorp/terraform/issues/24287 + buildGoPackage = if stdenv.isDarwin then buildGo113Package else buildGoPackage; + }) terraform_0_11 terraform_0_11-full terraform_0_12 diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 002e3bebbb2c..e8a6bc21035b 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1198,10 +1198,6 @@ let google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { }; - unison = callPackage ../applications/networking/sync/unison { - enableX11 = config.unison.enableX11 or true; - }; - hol_light = callPackage ../applications/science/logic/hol_light { }; })).overrideScope' liftJaneStreet; @@ -1233,5 +1229,5 @@ in let inherit (pkgs) callPackage; in rec ocamlPackages_latest = ocamlPackages_4_10; - ocamlPackages = ocamlPackages_4_07; + ocamlPackages = ocamlPackages_4_08; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ee2eaffbb0bf..7f9f28b45392 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -511,6 +511,8 @@ in { django-sesame = callPackage ../development/python-modules/django-sesame { }; + bravado-core = callPackage ../development/python-modules/bravado-core { }; + breathe = callPackage ../development/python-modules/breathe { }; brotli = callPackage ../development/python-modules/brotli { }; @@ -571,6 +573,8 @@ in { codespell = callPackage ../development/python-modules/codespell { }; + convertdate = callPackage ../development/python-modules/convertdate { }; + crc32c = callPackage ../development/python-modules/crc32c { }; curio = callPackage ../development/python-modules/curio { }; @@ -1175,6 +1179,8 @@ in { pymavlink = callPackage ../development/python-modules/pymavlink { }; + pymeeus = callPackage ../development/python-modules/pymeeus { }; + pymsgbox = callPackage ../development/python-modules/pymsgbox { }; pynisher = callPackage ../development/python-modules/pynisher { }; @@ -5099,8 +5105,6 @@ in { pyinotify = callPackage ../development/python-modules/pyinotify { }; - pyinsane2 = callPackage ../development/python-modules/pyinsane2 { }; - pyjwt = callPackage ../development/python-modules/pyjwt { }; pykickstart = callPackage ../development/python-modules/pykickstart { }; |