diff --git a/doc/languages-frameworks/gnome.xml b/doc/languages-frameworks/gnome.xml index bb68d026ae2..7671714d8a9 100644 --- a/doc/languages-frameworks/gnome.xml +++ b/doc/languages-frameworks/gnome.xml @@ -233,7 +233,7 @@ mkDerivation { - You can rely on applications depending on the library set the necessary environment variables but that it often easy to miss. Instead we recommend to patch the paths in the source code whenever possible. Here are some examples: + You can rely on applications depending on the library setting the necessary environment variables but that is often easy to miss. Instead we recommend to patch the paths in the source code whenever possible. Here are some examples: diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index f23926eee3b..97dc9e2ff53 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -53,10 +53,12 @@ all crate sources of this package. Currently it is obtained by inserting a fake checksum into the expression and building the package once. The correct checksum can be then take from the failed build. -When the `Cargo.lock`, provided by upstream, is not in sync with the -`Cargo.toml`, it is possible to use `cargoPatches` to update it. All patches -added in `cargoPatches` will also be prepended to the patches in `patches` at -build-time. +Per the instructions in the [Cargo Book](https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html) +best practices guide, Rust applications should always commit the `Cargo.lock` +file in git to ensure a reproducible build. However, a few packages do not, and +Nix depends on this file, so if it missing you can use `cargoPatches` to apply +it in the `patchPhase`. Consider sending a PR upstream with a note to the +maintainer describing why it's important to include in the application. Unless `legacyCargoFetcher` is set to `true`, the fetcher will also verify that the `Cargo.lock` file is in sync with the `src` attribute, and will compress the diff --git a/lib/customisation.nix b/lib/customisation.nix index ac234e3b8c6..dc5dd769197 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -131,7 +131,12 @@ rec { origArgs = auto // args; pkgs = f origArgs; mkAttrOverridable = name: _: makeOverridable (newArgs: (f newArgs).${name}) origArgs; - in lib.mapAttrs mkAttrOverridable pkgs; + in + if lib.isDerivation pkgs then throw + ("function `callPackages` was called on a *single* derivation " + + ''"${pkgs.name or ""}";'' + + " did you mean to use `callPackage` instead?") + else lib.mapAttrs mkAttrOverridable pkgs; /* Add attributes to each output of a derivation without changing diff --git a/lib/default.nix b/lib/default.nix index f8cc5c4d816..a909cefd60f 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -24,6 +24,7 @@ let # packaging customisation = callLibs ./customisation.nix; maintainers = import ../maintainers/maintainer-list.nix; + teams = callLibs ../maintainers/team-list.nix; meta = callLibs ./meta.nix; sources = callLibs ./sources.nix; versions = callLibs ./versions.nix; @@ -55,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/generators.nix b/lib/generators.nix index a64e94bd5cb..240a19789b5 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -76,10 +76,14 @@ rec { * mkKeyValue is the same as in toINI. */ toKeyValue = { - mkKeyValue ? mkKeyValueDefault {} "=" - }: attrs: - let mkLine = k: v: mkKeyValue k v + "\n"; - in libStr.concatStrings (libAttr.mapAttrsToList mkLine attrs); + mkKeyValue ? mkKeyValueDefault {} "=", + listsAsDuplicateKeys ? false + }: + let mkLine = k: v: mkKeyValue k v + "\n"; + mkLines = if listsAsDuplicateKeys + then k: v: map (mkLine k) (if lib.isList v then v else [v]) + else k: v: [ (mkLine k v) ]; + in attrs: libStr.concatStrings (lib.concatLists (libAttr.mapAttrsToList mkLines attrs)); /* Generate an INI-style config file from an @@ -106,7 +110,9 @@ rec { # apply transformations (e.g. escapes) to section names mkSectionName ? (name: libStr.escape [ "[" "]" ] name), # format a setting line from key and value - mkKeyValue ? mkKeyValueDefault {} "=" + mkKeyValue ? mkKeyValueDefault {} "=", + # allow lists as values for duplicate keys + listsAsDuplicateKeys ? false }: attrsOfAttrs: let # map function to string for each key val @@ -115,7 +121,7 @@ rec { (libAttr.mapAttrsToList mapFn attrs); mkSection = sectName: sectValues: '' [${mkSectionName sectName}] - '' + toKeyValue { inherit mkKeyValue; } sectValues; + '' + toKeyValue { inherit mkKeyValue listsAsDuplicateKeys; } sectValues; in # map input to ini sections mapAttrsToStringsSep "\n" mkSection attrsOfAttrs; diff --git a/lib/kernel.nix b/lib/kernel.nix index 36ea3083828..2ce19f8cb68 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/lib/tests/misc.nix b/lib/tests/misc.nix index 01ff5ecf148..739c5d5fe15 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -348,6 +348,18 @@ runTests { ''; }; + testToINIDuplicateKeys = { + expr = generators.toINI { listsAsDuplicateKeys = true; } { foo.bar = true; baz.qux = [ 1 false ]; }; + expected = '' + [baz] + qux=1 + qux=false + + [foo] + bar=true + ''; + }; + testToINIDefaultEscapes = { expr = generators.toINI {} { "no [ and ] allowed unescaped" = { diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 598616c3ba9..aa70b26d204 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/`), - - `githubId` is your GitHub user ID, which can be found at `https://api.github.com/users/`, - - `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/`), + - `githubId` is your GitHub user ID, which can be found at `https://api.github.com/users/`, + - `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 | head -n 2 - ``` + To get the required PGP/GPG values for a key run + ```shell + gpg --keyid-format 0xlong --fingerprint | 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"; @@ -3096,6 +3099,12 @@ githubId = 4401220; name = "Michael Eden"; }; + illiusdope = { + email = "mat@marini.ca"; + github = "illiusdope"; + githubId = 61913481; + name = "Mat Marini"; + }; ilya-fedin = { email = "fedin-ilja2010@ya.ru"; github = "ilya-fedin"; @@ -3590,6 +3599,12 @@ github = "jorsn"; githubId = 4646725; }; + joshuafern = { + name = "Joshua Fern"; + email = "joshuafern@protonmail.com"; + github = "JoshuaFern"; + githubId = 4300747; + }; jpas = { name = "Jarrod Pas"; email = "jarrod@jarrodpas.com"; @@ -4212,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"; @@ -4458,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"; @@ -4532,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"; @@ -4707,7 +4728,7 @@ githubId = 668926; name = "Maximilian Güntner"; }; - mhaselsteiner = { + mhaselsteiner = { email = "magdalena.haselsteiner@gmx.at"; github = "mhaselsteiner"; githubId = 20536514; @@ -4872,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"; }; @@ -5492,6 +5513,12 @@ githubId = 11016164; name = "Fedor Pakhomov"; }; + paluh = { + email = "paluho@gmail.com"; + github = "paluh"; + githubId = 190249; + name = "Tomasz Rybarczyk"; + }; pamplemousse = { email = "xav.maso@gmail.com"; github = "Pamplemousse"; @@ -5765,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"; @@ -5783,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"; } ]; @@ -5881,6 +5909,12 @@ githubId = 4579165; name = "Danny Bautista"; }; + peelz = { + email = "peelz.dev+nixpkgs@gmail.com"; + github = "louistakepillz"; + githubId = 920910; + name = "peelz"; + }; q3k = { email = "q3k@q3k.org"; github = "q3k"; @@ -6146,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"; @@ -6356,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"; @@ -6671,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"; @@ -7229,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"; @@ -7304,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"; @@ -7587,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/maintainers/team-list.nix b/maintainers/team-list.nix new file mode 100644 index 00000000000..f98bbeee912 --- /dev/null +++ b/maintainers/team-list.nix @@ -0,0 +1,24 @@ +/* List of maintainer teams. + name = { + # Required + members = [ maintainer1 maintainer2 ]; + scope = "Maintain foo packages."; + }; + + where + + - `members` is the list of maintainers belonging to the group, + - `scope` describes the scope of the group. + + More fields may be added in the future. + + Please keep the list alphabetically sorted. + */ + +{ lib }: +with lib.maintainers; { + freedesktop = { + members = [ jtojnar worldofpeace ]; + scope = "Maintain Freedesktop.org packages for graphical desktop."; + }; +} diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 892208b01d7..e236b230332 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -23,6 +23,11 @@ Support is planned until the end of April 2021, handing over to 21.03. + + + PHP now defaults to PHP 7.4, updated from 7.3. + + diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index 77490ca3762..9892d6f160f 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 6663864f1e5..3891adc1043 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 a522834e429..21f4c7c6988 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 81427bb8ee6..dd36696b94d 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 /etc/hosts. + ''; + }; + networking.extraHosts = lib.mkOption { type = types.lines; default = ""; example = "192.168.0.1 lanlocalhost"; description = '' Additional verbatim entries to be appended to /etc/hosts. + For adding hosts from derivation results, use 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/ids.nix b/nixos/modules/misc/ids.nix index 979cdc5d4ad..85e5534e906 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -133,7 +133,7 @@ in tcpcryptd = 93; # tcpcryptd uses a hard-coded uid. We patch it in Nixpkgs to match this choice. firebird = 95; #keys = 96; # unused - #haproxy = 97; # DynamicUser as of 2019-11-08 + #haproxy = 97; # dynamically allocated as of 2020-03-11 mongodb = 98; openldap = 99; #users = 100; # unused @@ -448,7 +448,7 @@ in #tcpcryptd = 93; # unused firebird = 95; keys = 96; - #haproxy = 97; # DynamicUser as of 2019-11-08 + #haproxy = 97; # dynamically allocated as of 2020-03-11 #mongodb = 98; # unused openldap = 99; munin = 102; diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index afb74581e23..011d493c153 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -216,6 +216,14 @@ in Ignored when nixpkgs.pkgs is set. ''; }; + + initialSystem = mkOption { + type = types.str; + internal = true; + description = '' + Preserved value of system passed to eval-config.nix. + ''; + }; }; config = { diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e70a853624b..dba2593bbef 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -297,6 +297,7 @@ ./services/desktops/geoclue2.nix ./services/desktops/gsignond.nix ./services/desktops/gvfs.nix + ./services/desktops/malcontent.nix ./services/desktops/pipewire.nix ./services/desktops/gnome3/at-spi2-core.nix ./services/desktops/gnome3/chrome-gnome-shell.nix @@ -405,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 74c3e4425a7..484f9eb4440 100644 --- a/nixos/modules/programs/firejail.nix +++ b/nixos/modules/programs/firejail.nix @@ -5,28 +5,34 @@ 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 = { enable = mkEnableOption "firejail"; wrappedBinaries = mkOption { - type = types.attrs; + type = types.attrsOf types.path; default = {}; + example = literalExample '' + { + firefox = "''${lib.getBin pkgs.firefox}/bin/firefox"; + mpv = "''${lib.getBin pkgs.mpv}/bin/mpv"; + } + ''; description = '' Wrap the binaries in firejail and place them in the global path. @@ -41,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/rename.nix b/nixos/modules/rename.nix index 2cc6c46e358..410db8fd84e 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -21,12 +21,12 @@ with lib; (mkRemovedOptionModule [ "services" "firefox" "syncserver" "group" ] "") (mkRemovedOptionModule [ "services" "winstone" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "networking" "vpnc" ] "Use environment.etc.\"vpnc/service.conf\" instead.") - (mkRemovedOptionModule [ "environment.blcr.enable" ] "The BLCR module has been removed") - (mkRemovedOptionModule [ "services.beegfsEnable" ] "The BeeGFS module has been removed") - (mkRemovedOptionModule [ "services.beegfs" ] "The BeeGFS module has been removed") - (mkRemovedOptionModule [ "services.osquery" ] "The osquery module has been removed") - (mkRemovedOptionModule [ "services.fourStore" ] "The fourStore module has been removed") - (mkRemovedOptionModule [ "services.fourStoreEndpoint" ] "The fourStoreEndpoint module has been removed") + (mkRemovedOptionModule [ "environment" "blcr" "enable" ] "The BLCR module has been removed") + (mkRemovedOptionModule [ "services" "beegfsEnable" ] "The BeeGFS module has been removed") + (mkRemovedOptionModule [ "services" "beegfs" ] "The BeeGFS module has been removed") + (mkRemovedOptionModule [ "services" "osquery" ] "The osquery module has been removed") + (mkRemovedOptionModule [ "services" "fourStore" ] "The fourStore module has been removed") + (mkRemovedOptionModule [ "services" "fourStoreEndpoint" ] "The fourStoreEndpoint module has been removed") (mkRemovedOptionModule [ "programs" "way-cooler" ] ("way-cooler is abandoned by its author: " + "https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html")) (mkRemovedOptionModule [ "services" "xserver" "multitouch" ] '' diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 4c7f0ee657c..b787a767539 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -302,7 +302,7 @@ in lpath = "acme/${cert}"; apath = "/var/lib/${lpath}"; spath = "/var/lib/acme/.lego"; - rights = if data.allowKeysForGroup then "750" else "700"; + fileMode = if data.allowKeysForGroup then "640" else "600"; globalOpts = [ "-d" data.domain "--email" data.email "--path" "." "--key-type" data.keyType ] ++ optionals (cfg.acceptTerms) [ "--accept-tos" ] ++ optionals (data.dnsProvider != null && !data.dnsPropagationCheck) [ "--dns.disable-cp" ] @@ -331,7 +331,7 @@ in Group = data.group; PrivateTmp = true; StateDirectory = "acme/.lego ${lpath}"; - StateDirectoryMode = rights; + StateDirectoryMode = if data.allowKeysForGroup then "750" else "700"; WorkingDirectory = spath; # Only try loading the credentialsFile if the dns challenge is enabled EnvironmentFile = if data.dnsProvider != null then data.credentialsFile else null; @@ -354,10 +354,11 @@ in cp -p ${spath}/certificates/${keyName}.issuer.crt chain.pem ln -sf fullchain.pem cert.pem cat key.pem fullchain.pem > full.pem - chmod ${rights} *.pem - chown '${data.user}:${data.group}' *.pem fi + chmod ${fileMode} *.pem + chown '${data.user}:${data.group}' *.pem + ${data.postRun} ''; in @@ -399,7 +400,7 @@ in # Give key acme permissions chown '${data.user}:${data.group}' "${apath}/"{key,fullchain,full}.pem - chmod ${rights} "${apath}/"{key,fullchain,full}.pem + chmod ${fileMode} "${apath}/"{key,fullchain,full}.pem ''; serviceConfig = { Type = "oneshot"; diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 8d520b82fb5..248bf0ebc91 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -21,6 +21,11 @@ let installOptions = "${mysqldOptions} ${lib.optionalString isMysqlAtLeast57 "--insecure"}"; + settingsFile = pkgs.writeText "my.cnf" ( + generators.toINI { listsAsDuplicateKeys = true; } cfg.settings + + optionalString (cfg.extraOptions != null) "[mysqld]\n${cfg.extraOptions}" + ); + in { @@ -76,9 +81,64 @@ in description = "Location where MySQL stores its table files"; }; + configFile = mkOption { + type = types.path; + default = settingsFile; + defaultText = "settingsFile"; + description = '' + Override the configuration file used by MySQL. By default, + NixOS generates one automatically from . + ''; + example = literalExample '' + pkgs.writeText "my.cnf" ''' + [mysqld] + datadir = /var/lib/mysql + bind-address = 127.0.0.1 + port = 3336 + plugin-load-add = auth_socket.so + + !includedir /etc/mysql/conf.d/ + '''; + ''; + }; + + settings = mkOption { + type = with types; attrsOf (attrsOf (oneOf [ bool int str (listOf str) ])); + default = {}; + description = '' + MySQL configuration. Refer to + , + , + and + for details on supported values. + + + + MySQL configuration options such as --quick should be treated as + boolean options and provided values such as true, false, + 1, or 0. See the provided example below. + + + ''; + example = literalExample '' + { + mysqld = { + key_buffer_size = "6G"; + table_cache = 1600; + log-error = "/var/log/mysql_err.log"; + plugin-load-add = [ "server_audit" "ed25519=auth_ed25519" ]; + }; + mysqldump = { + quick = true; + max_allowed_packet = "16M"; + }; + } + ''; + }; + extraOptions = mkOption { - type = types.lines; - default = ""; + type = with types; nullOr lines; + default = null; example = '' key_buffer_size = 6G table_cache = 1600 @@ -252,10 +312,27 @@ in config = mkIf config.services.mysql.enable { + warnings = optional (cfg.extraOptions != null) "services.mysql.`extraOptions` is deprecated, please use services.mysql.`settings`."; + services.mysql.dataDir = mkDefault (if versionAtLeast config.system.stateVersion "17.09" then "/var/lib/mysql" else "/var/mysql"); + services.mysql.settings.mysqld = mkMerge [ + { + datadir = cfg.dataDir; + bind-address = mkIf (cfg.bind != null) cfg.bind; + port = cfg.port; + plugin-load-add = optional (cfg.ensureUsers != []) "auth_socket.so"; + } + (mkIf (cfg.replication.role == "master" || cfg.replication.role == "slave") { + log-bin = "mysql-bin-${toString cfg.replication.serverId}"; + log-bin-index = "mysql-bin-${toString cfg.replication.serverId}.index"; + relay-log = "mysql-relay-bin"; + server-id = cfg.replication.serverId; + }) + ]; + users.users.mysql = { description = "MySQL server user"; group = "mysql"; @@ -266,25 +343,7 @@ in environment.systemPackages = [mysql]; - environment.etc."my.cnf".text = - '' - [mysqld] - port = ${toString cfg.port} - datadir = ${cfg.dataDir} - ${optionalString (cfg.bind != null) "bind-address = ${cfg.bind}" } - ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") - '' - log-bin=mysql-bin-${toString cfg.replication.serverId} - log-bin-index=mysql-bin-${toString cfg.replication.serverId}.index - relay-log=mysql-relay-bin - server-id = ${toString cfg.replication.serverId} - ''} - ${optionalString (cfg.ensureUsers != []) - '' - plugin-load-add = auth_socket.so - ''} - ${cfg.extraOptions} - ''; + environment.etc."my.cnf".source = cfg.configFile; systemd.tmpfiles.rules = [ "d '${cfg.dataDir}' 0700 ${cfg.user} mysql -" @@ -297,7 +356,7 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - restartTriggers = [ config.environment.etc."my.cnf".source ]; + restartTriggers = [ cfg.configFile ]; unitConfig.RequiresMountsFor = "${cfg.dataDir}"; diff --git a/nixos/modules/services/desktops/malcontent.nix b/nixos/modules/services/desktops/malcontent.nix new file mode 100644 index 00000000000..416464cbe08 --- /dev/null +++ b/nixos/modules/services/desktops/malcontent.nix @@ -0,0 +1,32 @@ +# Malcontent daemon. + +{ config, lib, pkgs, ... }: + +with lib; + +{ + + ###### interface + + options = { + + services.malcontent = { + + enable = mkEnableOption "Malcontent"; + + }; + + }; + + + ###### implementation + + config = mkIf config.services.malcontent.enable { + + environment.systemPackages = [ pkgs.malcontent ]; + + services.dbus.packages = [ pkgs.malcontent ]; + + }; + +} diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index b5ed2c594f7..230a2ae3f82 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.sieveScripts != {}) '' - plugin { - ${concatStringsSep "\n" (mapAttrsToList (to: from: "sieve_${to} = ${stateDir}/sieve/${to}") cfg.sieveScripts)} - } - '') - - (optionalString (cfg.mailboxes != []) '' - protocol imap { - namespace inbox { - inbox=yes - ${concatStringsSep "\n" (map mailboxConfig cfg.mailboxes)} + ( + optionalString cfg.enablePAM '' + userdb { + driver = passwd } - } - '') - (optionalString cfg.enableQuota '' - mail_plugins = $mail_plugins quota - service quota-status { - executable = ${dovecotPkg}/libexec/dovecot/quota-status -p postfix - inet_listener { - port = ${cfg.quotaPort} + passdb { + driver = pam + args = ${optionalString cfg.showPAMFailure "failure_show_msg=yes"} dovecot2 } - client_limit = 1 - } + '' + ) - protocol imap { - mail_plugins = $mail_plugins imap_quota - } + ( + optionalString (cfg.sieveScripts != {}) '' + plugin { + ${concatStringsSep "\n" (mapAttrsToList (to: from: "sieve_${to} = ${stateDir}/sieve/${to}") cfg.sieveScripts)} + } + '' + ) - 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%% - } - '') + ( + 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 + } + + 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} $mail_plugins 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 00000000000..5fc19649d3d --- /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/misc/autorandr.nix b/nixos/modules/services/misc/autorandr.nix index 4708e16e2a6..cf7fb5f78d3 100644 --- a/nixos/modules/services/misc/autorandr.nix +++ b/nixos/modules/services/misc/autorandr.nix @@ -48,5 +48,5 @@ in { }; - meta.maintainers = with maintainers; [ gnidorah ma27 ]; + meta.maintainers = with maintainers; [ gnidorah ]; } diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixos/modules/services/misc/zoneminder.nix index d7f7324580c..d5b3537068d 100644 --- a/nixos/modules/services/misc/zoneminder.nix +++ b/nixos/modules/services/misc/zoneminder.nix @@ -77,6 +77,8 @@ in { `config.services.zoneminder.database.createLocally` to true. Otherwise, when set to `false` (the default), you will have to create the database and database user as well as populate the database yourself. + Additionally, you will need to run `zmupdate.pl` yourself when + upgrading to a newer version. ''; webserver = mkOption { @@ -330,6 +332,8 @@ in { ${config.services.mysql.package}/bin/mysql < ${pkg}/share/zoneminder/db/zm_create.sql touch "/var/lib/${dirName}/db-created" fi + + ${zoneminder}/bin/zmupdate.pl -nointeractive ''; serviceConfig = { User = user; diff --git a/nixos/modules/services/monitoring/cadvisor.nix b/nixos/modules/services/monitoring/cadvisor.nix index 695a8c42e85..655a6934a26 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 b67f697ca0d..6b1a4be44d1 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 promtool + check. The call to promtool is + subject to sandboxing by Nix. When credentials are stored in + external files (password_file, + bearer_token_file, etc), they will not be + visible to promtool and it will report + errors, despite a correct configuration. + ''; + }; }; config = mkIf cfg.enable { diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 36ebffa4463..f9ad1457fc8 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -29,6 +29,7 @@ let "fritzbox" "json" "mail" + "mikrotik" "minio" "nextcloud" "nginx" @@ -197,13 +198,25 @@ in config = mkMerge ([{ assertions = [ { - assertion = (cfg.snmp.configurationPath == null) != (cfg.snmp.configuration == null); + assertion = cfg.snmp.enable -> ( + (cfg.snmp.configurationPath == null) != (cfg.snmp.configuration == null) + ); message = '' Please ensure you have either `services.prometheus.exporters.snmp.configuration' or `services.prometheus.exporters.snmp.configurationPath' set! ''; } { - assertion = (cfg.mail.configFile == null) != (cfg.mail.configuration == {}); + assertion = cfg.mikrotik.enable -> ( + (cfg.mikrotik.configFile == null) != (cfg.mikrotik.configuration == null) + ); + message = '' + Please specify either `services.prometheus.exporters.mikrotik.configuration' + or `services.prometheus.exporters.mikrotik.configFile'. + ''; + } { + assertion = cfg.mail.enable -> ( + (cfg.mail.configFile == null) != (cfg.mail.configuration == null) + ); message = '' Please specify either 'services.prometheus.exporters.mail.configuration' or 'services.prometheus.exporters.mail.configFile'. diff --git a/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix b/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix index 8a90afa9984..fe8d905da3f 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix @@ -61,7 +61,7 @@ in { ExecStart = '' ${pkgs.prometheus-blackbox-exporter}/bin/blackbox_exporter \ --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ - --config.file ${adjustedConfigFile} \ + --config.file ${escapeShellArg adjustedConfigFile} \ ${concatStringsSep " \\\n " cfg.extraFlags} ''; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix b/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix index 1cc34641809..97210463027 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix @@ -66,7 +66,7 @@ in serviceConfig = { ExecStart = '' ${pkgs.prometheus-collectd-exporter}/bin/collectd_exporter \ - -log.format ${cfg.logFormat} \ + -log.format ${escapeShellArg cfg.logFormat} \ -log.level ${cfg.logLevel} \ -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ ${collectSettingsArgs} \ diff --git a/nixos/modules/services/monitoring/prometheus/exporters/dnsmasq.nix b/nixos/modules/services/monitoring/prometheus/exporters/dnsmasq.nix index e9fa26cb1f5..68afba21d64 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/dnsmasq.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/dnsmasq.nix @@ -30,7 +30,7 @@ in ${pkgs.prometheus-dnsmasq-exporter}/bin/dnsmasq_exporter \ --listen ${cfg.listenAddress}:${toString cfg.port} \ --dnsmasq ${cfg.dnsmasqListenAddress} \ - --leases_path ${cfg.leasesPath} \ + --leases_path ${escapeShellArg cfg.leasesPath} \ ${concatStringsSep " \\\n " cfg.extraFlags} ''; }; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix b/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix index a01074758ff..aba3533e439 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix @@ -64,7 +64,7 @@ in ${pkgs.prometheus-dovecot-exporter}/bin/dovecot_exporter \ --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ --web.telemetry-path ${cfg.telemetryPath} \ - --dovecot.socket-path ${cfg.socketPath} \ + --dovecot.socket-path ${escapeShellArg cfg.socketPath} \ --dovecot.scopes ${concatStringsSep "," cfg.scopes} \ ${concatStringsSep " \\\n " cfg.extraFlags} ''; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/json.nix b/nixos/modules/services/monitoring/prometheus/exporters/json.nix index 82a55bafc98..bd0026b55f7 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/json.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/json.nix @@ -27,7 +27,7 @@ in ExecStart = '' ${pkgs.prometheus-json-exporter}/bin/prometheus-json-exporter \ --port ${toString cfg.port} \ - ${cfg.url} ${cfg.configFile} \ + ${cfg.url} ${escapeShellArg cfg.configFile} \ ${concatStringsSep " \\\n " cfg.extraFlags} ''; }; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/mail.nix b/nixos/modules/services/monitoring/prometheus/exporters/mail.nix index 7d8c6fb6140..18c5c4dd162 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/mail.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/mail.nix @@ -90,7 +90,7 @@ let Timeout until mails are considered "didn't make it". ''; }; - disableFileDelition = mkOption { + disableFileDeletion = mkOption { type = types.bool; default = false; description = '' @@ -127,8 +127,8 @@ in ''; }; configuration = mkOption { - type = types.submodule exporterOptions; - default = {}; + type = types.nullOr (types.submodule exporterOptions); + default = null; description = '' Specify the mailexporter configuration file to use. ''; @@ -147,8 +147,9 @@ in ExecStart = '' ${pkgs.prometheus-mail-exporter}/bin/mailexporter \ --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + --web.telemetry-path ${cfg.telemetryPath} \ --config.file ${ - if cfg.configuration != {} then configurationFile else cfg.configFile + if cfg.configuration != null then configurationFile else (escapeShellArg cfg.configFile) } \ ${concatStringsSep " \\\n " cfg.extraFlags} ''; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/mikrotik.nix b/nixos/modules/services/monitoring/prometheus/exporters/mikrotik.nix new file mode 100644 index 00000000000..62c2cc56847 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/mikrotik.nix @@ -0,0 +1,66 @@ +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.mikrotik; +in +{ + port = 9436; + extraOpts = { + configFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Path to a mikrotik exporter configuration file. Mutually exclusive with + option. + ''; + example = literalExample "./mikrotik.yml"; + }; + + configuration = mkOption { + type = types.nullOr types.attrs; + default = null; + description = '' + Mikrotik exporter configuration as nix attribute set. Mutually exclusive with + option. + + See + for the description of the configuration file format. + ''; + example = literalExample '' + { + devices = [ + { + name = "my_router"; + address = "10.10.0.1"; + user = "prometheus"; + password = "changeme"; + } + ]; + features = { + bgp = true; + dhcp = true; + routes = true; + optics = true; + }; + } + ''; + }; + }; + serviceOpts = let + configFile = if cfg.configFile != null + then cfg.configFile + else "${pkgs.writeText "mikrotik-exporter.yml" (builtins.toJSON cfg.configuration)}"; + in { + serviceConfig = { + # -port is misleading name, it actually accepts address too + ExecStart = '' + ${pkgs.prometheus-mikrotik-exporter}/bin/mikrotik-exporter \ + -config-file=${escapeShellArg configFile} \ + -port=${cfg.listenAddress}:${toString cfg.port} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/minio.nix b/nixos/modules/services/monitoring/prometheus/exporters/minio.nix index ab3e3d7d5d5..d6dd62f871b 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/minio.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/minio.nix @@ -54,8 +54,8 @@ in ${pkgs.prometheus-minio-exporter}/bin/minio-exporter \ -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ -minio.server ${cfg.minioAddress} \ - -minio.access-key ${cfg.minioAccessKey} \ - -minio.access-secret ${cfg.minioAccessSecret} \ + -minio.access-key ${escapeShellArg cfg.minioAccessKey} \ + -minio.access-secret ${escapeShellArg cfg.minioAccessSecret} \ ${optionalString cfg.minioBucketStats "-minio.bucket-stats"} \ ${concatStringsSep " \\\n " cfg.extraFlags} ''; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix b/nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix index 5f9a52053f7..aee6bd5e66c 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix @@ -50,7 +50,7 @@ in -u ${cfg.username} \ -t ${cfg.timeout} \ -l ${cfg.url} \ - -p @${cfg.passwordFile} \ + -p ${escapeShellArg "@${cfg.passwordFile}"} \ ${concatStringsSep " \\\n " cfg.extraFlags} ''; }; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix b/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix index d50564717ea..3b6ef1631f8 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix @@ -67,15 +67,15 @@ in ${pkgs.prometheus-postfix-exporter}/bin/postfix_exporter \ --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ --web.telemetry-path ${cfg.telemetryPath} \ - --postfix.showq_path ${cfg.showqPath} \ + --postfix.showq_path ${escapeShellArg cfg.showqPath} \ ${concatStringsSep " \\\n " (cfg.extraFlags ++ optional cfg.systemd.enable "--systemd.enable" ++ optional cfg.systemd.enable (if cfg.systemd.slice != null then "--systemd.slice ${cfg.systemd.slice}" else "--systemd.unit ${cfg.systemd.unit}") ++ optional (cfg.systemd.enable && (cfg.systemd.journalPath != null)) - "--systemd.journal_path ${cfg.systemd.journalPath}" - ++ optional (!cfg.systemd.enable) "--postfix.logfile_path ${cfg.logfilePath}")} + "--systemd.journal_path ${escapeShellArg cfg.systemd.journalPath}" + ++ optional (!cfg.systemd.enable) "--postfix.logfile_path ${escapeShellArg cfg.logfilePath}")} ''; }; }; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix b/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix index fe7ae8a8ac9..045e48a3d0f 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix @@ -19,7 +19,7 @@ in configuration = mkOption { type = types.nullOr types.attrs; - default = {}; + default = null; description = '' Snmp exporter configuration as nix attribute set. Mutually exclusive with 'configurationPath' option. ''; @@ -36,15 +36,15 @@ in }; logFormat = mkOption { - type = types.str; - default = "logger:stderr"; + type = types.enum ["logfmt" "json"]; + default = "logfmt"; description = '' - Set the log target and format. + Output format of log messages. ''; }; logLevel = mkOption { - type = types.enum ["debug" "info" "warn" "error" "fatal"]; + type = types.enum ["debug" "info" "warn" "error"]; default = "info"; description = '' Only log messages with the given severity or above. @@ -54,13 +54,13 @@ in serviceOpts = let configFile = if cfg.configurationPath != null then cfg.configurationPath - else "${pkgs.writeText "snmp-eporter-conf.yml" (builtins.toJSON cfg.configuration)}"; + else "${pkgs.writeText "snmp-exporter-conf.yml" (builtins.toJSON cfg.configuration)}"; in { serviceConfig = { ExecStart = '' ${pkgs.prometheus-snmp-exporter.bin}/bin/snmp_exporter \ - --config.file=${configFile} \ - --log.format=${cfg.logFormat} \ + --config.file=${escapeShellArg configFile} \ + --log.format=${escapeShellArg cfg.logFormat} \ --log.level=${cfg.logLevel} \ --web.listen-address=${cfg.listenAddress}:${toString cfg.port} \ ${concatStringsSep " \\\n " cfg.extraFlags} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/unifi.nix b/nixos/modules/services/monitoring/prometheus/exporters/unifi.nix index 9aa0f1b85aa..8d0e8764001 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/unifi.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/unifi.nix @@ -55,8 +55,8 @@ in ${pkgs.prometheus-unifi-exporter}/bin/unifi_exporter \ -telemetry.addr ${cfg.listenAddress}:${toString cfg.port} \ -unifi.addr ${cfg.unifiAddress} \ - -unifi.username ${cfg.unifiUsername} \ - -unifi.password ${cfg.unifiPassword} \ + -unifi.username ${escapeShellArg cfg.unifiUsername} \ + -unifi.password ${escapeShellArg cfg.unifiPassword} \ -unifi.timeout ${cfg.unifiTimeout} \ ${optionalString cfg.unifiInsecure "-unifi.insecure" } \ ${concatStringsSep " \\\n " cfg.extraFlags} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix b/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix index 12153fa021e..5b5a6e18fcd 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix @@ -74,10 +74,10 @@ in ${pkgs.prometheus-varnish-exporter}/bin/prometheus_varnish_exporter \ --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ --web.telemetry-path ${cfg.telemetryPath} \ - --varnishstat-path ${cfg.varnishStatPath} \ + --varnishstat-path ${escapeShellArg cfg.varnishStatPath} \ ${concatStringsSep " \\\n " (cfg.extraFlags ++ optional (cfg.healthPath != null) "--web.health-path ${cfg.healthPath}" - ++ optional (cfg.instance != null) "-n ${cfg.instance}" + ++ optional (cfg.instance != null) "-n ${escapeShellArg cfg.instance}" ++ optional cfg.noExit "--no-exit" ++ optional cfg.withGoMetrics "--with-go-metrics" ++ optional cfg.verbose "--verbose" diff --git a/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix b/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix index 374f83a2939..04421fc2d25 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix @@ -59,7 +59,7 @@ in { ${optionalString cfg.verbose "-v"} \ ${optionalString cfg.singleSubnetPerField "-s"} \ ${optionalString cfg.withRemoteIp "-r"} \ - ${optionalString (cfg.wireguardConfig != null) "-n ${cfg.wireguardConfig}"} + ${optionalString (cfg.wireguardConfig != null) "-n ${escapeShellArg cfg.wireguardConfig}"} ''; }; }; diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix index 3fb85b16cbe..5f8ac96b229 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 15aaf741067..b0045ff795e 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/freeradius.nix b/nixos/modules/services/networking/freeradius.nix index e192b70c129..f3fdd576b65 100644 --- a/nixos/modules/services/networking/freeradius.nix +++ b/nixos/modules/services/networking/freeradius.nix @@ -10,14 +10,15 @@ let { description = "FreeRadius server"; wantedBy = ["multi-user.target"]; - after = ["network-online.target"]; - wants = ["network-online.target"]; + after = ["network.target"]; + wants = ["network.target"]; preStart = '' ${pkgs.freeradius}/bin/radiusd -C -d ${cfg.configDir} -l stdout ''; serviceConfig = { - ExecStart = "${pkgs.freeradius}/bin/radiusd -f -d ${cfg.configDir} -l stdout -xx"; + ExecStart = "${pkgs.freeradius}/bin/radiusd -f -d ${cfg.configDir} -l stdout" + + optionalString cfg.debug " -xx"; ExecReload = [ "${pkgs.freeradius}/bin/radiusd -C -d ${cfg.configDir} -l stdout" "${pkgs.coreutils}/bin/kill -HUP $MAINPID" @@ -41,6 +42,16 @@ let ''; }; + debug = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable debug logging for freeradius (-xx + option). This should not be left on, since it includes + sensitive data such as passwords in the logs. + ''; + }; + }; in @@ -66,6 +77,7 @@ in }; systemd.services.freeradius = freeradiusService cfg; + warnings = optional cfg.debug "Freeradius debug logging is enabled. This will log passwords in plaintext to the journal!"; }; diff --git a/nixos/modules/services/networking/haproxy.nix b/nixos/modules/services/networking/haproxy.nix index aff71e5e97d..4678829986c 100644 --- a/nixos/modules/services/networking/haproxy.nix +++ b/nixos/modules/services/networking/haproxy.nix @@ -26,6 +26,18 @@ with lib; ''; }; + user = mkOption { + type = types.str; + default = "haproxy"; + description = "User account under which haproxy runs."; + }; + + group = mkOption { + type = types.str; + default = "haproxy"; + description = "Group account under which haproxy runs."; + }; + config = mkOption { type = types.nullOr types.lines; default = null; @@ -49,7 +61,8 @@ with lib; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - DynamicUser = true; + User = cfg.user; + Group = cfg.group; Type = "notify"; # when running the config test, don't be quiet so we can see what goes wrong ExecStartPre = "${pkgs.haproxy}/sbin/haproxy -c -f ${haproxyCfg}"; @@ -60,5 +73,16 @@ with lib; AmbientCapabilities = "CAP_NET_BIND_SERVICE"; }; }; + + users.users = optionalAttrs (cfg.user == "haproxy") { + haproxy = { + group = cfg.group; + isSystemUser = true; + }; + }; + + users.groups = optionalAttrs (cfg.group == "haproxy") { + haproxy = {}; + }; }; } diff --git a/nixos/modules/services/networking/ntp/ntpd.nix b/nixos/modules/services/networking/ntp/ntpd.nix index b5403cb747d..54ff054d84c 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 ntp.conf. + ''; + }; + extraFlags = mkOption { type = types.listOf types.str; description = "Extra flags passed to the ntpd command."; diff --git a/nixos/modules/services/networking/shorewall.nix b/nixos/modules/services/networking/shorewall.nix index c59a5366915..16383be2530 100644 --- a/nixos/modules/services/networking/shorewall.nix +++ b/nixos/modules/services/networking/shorewall.nix @@ -26,13 +26,14 @@ in { description = "The shorewall package to use."; }; configs = lib.mkOption { - type = types.attrsOf types.str; + type = types.attrsOf types.lines; default = {}; description = '' This option defines the Shorewall configs. The attribute name defines the name of the config, and the attribute value defines the content of the config. ''; + apply = lib.mapAttrs (name: text: pkgs.writeText "${name}" text); }; }; }; @@ -62,7 +63,7 @@ in { ''; }; environment = { - etc = lib.mapAttrs' (name: conf: lib.nameValuePair "shorewall/${name}" {text=conf;}) cfg.configs; + etc = lib.mapAttrs' (name: conf: lib.nameValuePair "shorewall/${name}" {source=conf;}) cfg.configs; systemPackages = [ cfg.package ]; }; }; diff --git a/nixos/modules/services/networking/shorewall6.nix b/nixos/modules/services/networking/shorewall6.nix index 374e407cc7a..e081aedc6c3 100644 --- a/nixos/modules/services/networking/shorewall6.nix +++ b/nixos/modules/services/networking/shorewall6.nix @@ -26,13 +26,14 @@ in { description = "The shorewall package to use."; }; configs = lib.mkOption { - type = types.attrsOf types.str; + type = types.attrsOf types.lines; default = {}; description = '' This option defines the Shorewall configs. The attribute name defines the name of the config, and the attribute value defines the content of the config. ''; + apply = lib.mapAttrs (name: text: pkgs.writeText "${name}" text); }; }; }; @@ -62,7 +63,7 @@ in { ''; }; environment = { - etc = lib.mapAttrs' (name: conf: lib.nameValuePair "shorewall6/${name}" {text=conf;}) cfg.configs; + etc = lib.mapAttrs' (name: conf: lib.nameValuePair "shorewall6/${name}" {source=conf;}) cfg.configs; systemPackages = [ cfg.package ]; }; }; diff --git a/nixos/modules/services/networking/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix index 47990dbb377..b3e20184423 100644 --- a/nixos/modules/services/networking/vsftpd.nix +++ b/nixos/modules/services/networking/vsftpd.nix @@ -133,8 +133,8 @@ let ${optionalString cfg.enableVirtualUsers '' guest_enable=YES guest_username=vsftpd - pam_service_name=vsftpd ''} + pam_service_name=vsftpd ${cfg.extraConfig} ''; diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index ff8e54a1ce2..e8f83f6dd8b 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -428,7 +428,7 @@ in ++ (attrValues ( mapAttrs (name: value: { assertion = value.generatePrivateKeyFile -> (value.privateKey == null); - message = "networking.wireguard.interfaces.${name}.generatePrivateKey must not be set if networking.wireguard.interfaces.${name}.privateKey is set."; + message = "networking.wireguard.interfaces.${name}.generatePrivateKeyFile must not be set if networking.wireguard.interfaces.${name}.privateKey is set."; }) cfg.interfaces)) ++ map ({ interfaceName, peer, ... }: { assertion = (peer.presharedKey == null) || (peer.presharedKeyFile == null); diff --git a/nixos/modules/services/wayland/cage.nix b/nixos/modules/services/wayland/cage.nix index cac5c042ec1..c59ca9983a6 100644 --- a/nixos/modules/services/wayland/cage.nix +++ b/nixos/modules/services/wayland/cage.nix @@ -51,6 +51,7 @@ in { conflicts = [ "getty@tty1.service" ]; restartIfChanged = false; + unitConfig.ConditionPathExists = "/dev/tty1"; serviceConfig = { ExecStart = '' ${pkgs.cage}/bin/cage \ @@ -59,7 +60,6 @@ in { ''; User = cfg.user; - ConditionPathExists = "/dev/tty1"; IgnoreSIGPIPE = "no"; # Log this user with utmp, letting it show up with commands 'w' and diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index c8602e5975b..28b433104a1 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -87,10 +87,17 @@ let ${optionalString (cfg.sslDhparam != null) "ssl_dhparam ${cfg.sslDhparam};"} ${optionalString (cfg.recommendedTlsSettings) '' - ssl_session_cache shared:SSL:42m; - ssl_session_timeout 23m; - ssl_ecdh_curve secp384r1; - ssl_prefer_server_ciphers on; + # Keep in sync with https://ssl-config.mozilla.org/#server=nginx&config=intermediate + + ssl_session_timeout 1d; + ssl_session_cache shared:SSL:10m; + # Breaks forward secrecy: https://github.com/mozilla/server-side-tls/issues/135 + ssl_session_tickets off; + # We don't enable insecure ciphers by default, so this allows + # clients to pick the most performant, per https://github.com/mozilla/server-side-tls/issues/260 + ssl_prefer_server_ciphers off; + + # OCSP stapling ssl_stapling on; ssl_stapling_verify on; ''} @@ -487,8 +494,9 @@ in sslCiphers = mkOption { type = types.str; - default = "EECDH+aRSA+AESGCM:EDH+aRSA:EECDH+aRSA:+AES256:+AES128:+SHA1:!CAMELLIA:!SEED:!3DES:!DES:!RC4:!eNULL"; - description = "Ciphers to choose from when negotiating tls handshakes."; + # Keep in sync with https://ssl-config.mozilla.org/#server=nginx&config=intermediate + default = "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384"; + description = "Ciphers to choose from when negotiating TLS handshakes."; }; sslProtocols = mkOption { diff --git a/nixos/modules/services/web-servers/uwsgi.nix b/nixos/modules/services/web-servers/uwsgi.nix index 3481b5e6040..4b74c329e3d 100644 --- a/nixos/modules/services/web-servers/uwsgi.nix +++ b/nixos/modules/services/web-servers/uwsgi.nix @@ -32,7 +32,7 @@ let inherit plugins; } // removeAttrs c [ "type" "pythonPackages" ] // optionalAttrs (python != null) { - pythonpath = "${pythonEnv}/${python.sitePackages}"; + pyhome = "${pythonEnv}"; env = # Argh, uwsgi expects list of key-values there instead of a dictionary. let env' = c.env or []; diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix new file mode 100644 index 00000000000..a9ba8e6280d --- /dev/null +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix @@ -0,0 +1,92 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + dmcfg = config.services.xserver.displayManager; + ldmcfg = dmcfg.lightdm; + cfg = ldmcfg.greeters.tiny; + +in +{ + options = { + + services.xserver.displayManager.lightdm.greeters.tiny = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable lightdm-tiny-greeter as the lightdm greeter. + + Note that this greeter starts only the default X session. + You can configure the default X session using + . + ''; + }; + + label = { + user = mkOption { + type = types.str; + default = "Username"; + description = '' + The string to represent the user_text label. + ''; + }; + + pass = mkOption { + type = types.str; + default = "Password"; + description = '' + The string to represent the pass_text label. + ''; + }; + }; + + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Section to describe style and ui. + ''; + }; + + }; + + }; + + config = mkIf (ldmcfg.enable && cfg.enable) { + + services.xserver.displayManager.lightdm.greeters.gtk.enable = false; + + nixpkgs.config.lightdm-tiny-greeter.conf = + let + configHeader = '' + #include + static const char *user_text = "${cfg.label.user}"; + static const char *pass_text = "${cfg.label.pass}"; + static const char *session = "${dmcfg.defaultSession}"; + ''; + in + optionalString (cfg.extraConfig != "") + (configHeader + cfg.extraConfig); + + services.xserver.displayManager.lightdm.greeter = + mkDefault { + package = pkgs.lightdm-tiny-greeter.xgreeters; + name = "lightdm-tiny-greeter"; + }; + + assertions = [ + { + assertion = dmcfg.defaultSession != null; + message = '' + Please set: services.xserver.displayManager.defaultSession + ''; + } + ]; + + }; +} diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index f7face0adb7..cb7b5f95958 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -77,6 +77,7 @@ in ./lightdm-greeters/mini.nix ./lightdm-greeters/enso-os.nix ./lightdm-greeters/pantheon.nix + ./lightdm-greeters/tiny.nix ]; options = { diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index 641cf9faadc..b82d69b3bb8 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -183,7 +183,7 @@ while (my ($unit, $state) = each %{$activePrev}) { # active after the system has resumed, which probably # should not be the case. Just ignore it. if ($unit ne "suspend.target" && $unit ne "hibernate.target" && $unit ne "hybrid-sleep.target") { - unless (boolIsTrue($unitInfo->{'RefuseManualStart'} // "no")) { + unless (boolIsTrue($unitInfo->{'RefuseManualStart'} // "no") || boolIsTrue($unitInfo->{'X-OnlyManualStart'} // "no")) { $unitsToStart{$unit} = 1; recordUnit($startListFile, $unit); # Don't spam the user with target units that always get started. @@ -222,7 +222,7 @@ while (my ($unit, $state) = each %{$activePrev}) { $unitsToReload{$unit} = 1; recordUnit($reloadListFile, $unit); } - elsif (!boolIsTrue($unitInfo->{'X-RestartIfChanged'} // "yes") || boolIsTrue($unitInfo->{'RefuseManualStop'} // "no") ) { + elsif (!boolIsTrue($unitInfo->{'X-RestartIfChanged'} // "yes") || boolIsTrue($unitInfo->{'RefuseManualStop'} // "no") || boolIsTrue($unitInfo->{'X-OnlyManualStart'} // "no")) { $unitsToSkip{$unit} = 1; } else { if (!boolIsTrue($unitInfo->{'X-StopIfChanged'} // "yes")) { diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index f67d2900561..14bd751ce32 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/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix index 57ade288096..1f4d54a1ae2 100644 --- a/nixos/modules/system/etc/etc.nix +++ b/nixos/modules/system/etc/etc.nix @@ -94,7 +94,7 @@ in default = 0; type = types.int; description = '' - UID of created file. Only takes affect when the file is + UID of created file. Only takes effect when the file is copied (that is, the mode is not 'symlink'). ''; }; @@ -103,7 +103,7 @@ in default = 0; type = types.int; description = '' - GID of created file. Only takes affect when the file is + GID of created file. Only takes effect when the file is copied (that is, the mode is not 'symlink'). ''; }; @@ -113,7 +113,7 @@ in type = types.str; description = '' User name of created file. - Only takes affect when the file is copied (that is, the mode is not 'symlink'). + Only takes effect when the file is copied (that is, the mode is not 'symlink'). Changing this option takes precedence over uid. ''; }; @@ -123,7 +123,7 @@ in type = types.str; description = '' Group name of created file. - Only takes affect when the file is copied (that is, the mode is not 'symlink'). + Only takes effect when the file is copied (that is, the mode is not 'symlink'). Changing this option takes precedence over gid. ''; }; diff --git a/nixos/modules/tasks/auto-upgrade.nix b/nixos/modules/tasks/auto-upgrade.nix index 7fe06699191..bfc1e301efa 100644 --- a/nixos/modules/tasks/auto-upgrade.nix +++ b/nixos/modules/tasks/auto-upgrade.nix @@ -63,6 +63,19 @@ let cfg = config.system.autoUpgrade; in ''; }; + randomizedDelaySec = mkOption { + default = "0"; + type = types.str; + example = "45min"; + description = '' + Add a randomized delay before each automatic upgrade. + The delay will be chozen between zero and this value. + This value must be a time span in the format specified by + systemd.time + 7 + ''; + }; + }; }; @@ -109,6 +122,8 @@ let cfg = config.system.autoUpgrade; in startAt = cfg.dates; }; + systemd.timers.nixos-upgrade.timerConfig.RandomizedDelaySec = cfg.randomizedDelaySec; + }; } diff --git a/nixos/modules/tasks/filesystems/btrfs.nix b/nixos/modules/tasks/filesystems/btrfs.nix index 48be18c7102..f64493e1a3c 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 36ef6d17df6..0902d2dc2cb 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: users.extraUsers.<yourusername>.extraGroups = [ "kvm" ]; ''; # multi GPU support is under the question device = mkOption { @@ -35,9 +36,7 @@ in { and find info about device via cat /sys/bus/pci/devices/*/mdev_supported_types/i915-GVTg_V5_4/description ''; 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/docker-tools.nix b/nixos/tests/docker-tools.nix index 54dd97e5b13..51b472fcf9c 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -137,5 +137,22 @@ import ./make-test-python.nix ({ pkgs, ... }: { # Ensure the two output paths (ls and hello) are in the layer "docker run bulk-layer ls /bin/hello", ) + + with subtest("Ensure correct behavior when no store is needed"): + # This check tests two requirements simultaneously + # 1. buildLayeredImage can build images that don't need a store. + # 2. Layers of symlinks are eliminated by the customization layer. + # + docker.succeed( + "docker load --input='${pkgs.dockerTools.examples.no-store-paths}'" + ) + + # Busybox will not recognize argv[0] and print an error message with argv[0], + # but it confirms that the custom-true symlink is present. + docker.succeed("docker run --rm no-store-paths custom-true |& grep custom-true") + + # This check may be loosened to allow an *empty* store rather than *no* store. + docker.succeed("docker run --rm no-store-paths ls /") + docker.fail("docker run --rm no-store-paths ls /nix/store") ''; }) diff --git a/nixos/tests/kubernetes/dns.nix b/nixos/tests/kubernetes/dns.nix index 46bcb01a526..638942e1540 100644 --- a/nixos/tests/kubernetes/dns.nix +++ b/nixos/tests/kubernetes/dns.nix @@ -3,8 +3,6 @@ with import ./base.nix { inherit system; }; let domain = "my.zyx"; - certs = import ./certs.nix { externalDomain = domain; kubelets = [ "machine1" "machine2" ]; }; - redisPod = pkgs.writeText "redis-pod.json" (builtins.toJSON { kind = "Pod"; apiVersion = "v1"; diff --git a/nixos/tests/nesting.nix b/nixos/tests/nesting.nix index 6388b67a6e4..a75806b24ff 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/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 3d0d00bfbe6..4fc3668cfaf 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -224,7 +224,7 @@ let after = [ "postfix.service" ]; requires = [ "postfix.service" ]; preStart = '' - mkdir -p 0600 mail-exporter/new + mkdir -p -m 0700 mail-exporter/new ''; serviceConfig = { ProtectHome = true; @@ -245,6 +245,46 @@ let ''; }; + mikrotik = { + exporterConfig = { + enable = true; + extraFlags = [ "-timeout=1s" ]; + configuration = { + devices = [ + { + name = "router"; + address = "192.168.42.48"; + user = "prometheus"; + password = "shh"; + } + ]; + features = { + bgp = true; + dhcp = true; + dhcpl = true; + dhcpv6 = true; + health = true; + routes = true; + poe = true; + pools = true; + optics = true; + w60g = true; + wlansta = true; + wlanif = true; + monitor = true; + ipsec = true; + }; + }; + }; + exporterTest = '' + wait_for_unit("prometheus-mikrotik-exporter.service") + wait_for_open_port(9436) + succeed( + "curl -sSf http://localhost:9436/metrics | grep -q 'mikrotik_scrape_collector_success{device=\"router\"} 0'" + ) + ''; + }; + nextcloud = { exporterConfig = { enable = true; @@ -363,6 +403,7 @@ let }; metricProvider = { services.rspamd.enable = true; + virtualisation.memorySize = 1024; }; exporterTest = '' wait_for_unit("rspamd.service") diff --git a/nixos/tests/signal-desktop.nix b/nixos/tests/signal-desktop.nix index ae141fe116d..e4b830e9e23 100644 --- a/nixos/tests/signal-desktop.nix +++ b/nixos/tests/signal-desktop.nix @@ -17,6 +17,7 @@ import ./make-test-python.nix ({ pkgs, ...} : services.xserver.enable = true; test-support.displayManager.auto.user = "alice"; environment.systemPackages = [ pkgs.signal-desktop ]; + virtualisation.memorySize = 1024; }; enableOCR = true; diff --git a/pkgs/applications/audio/MMA/default.nix b/pkgs/applications/audio/MMA/default.nix index 42f8af99e6f..4304fe59bdf 100644 --- a/pkgs/applications/audio/MMA/default.nix +++ b/pkgs/applications/audio/MMA/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, python3, alsaUtils, timidity }: stdenv.mkDerivation rec { - version = "19.08"; + version = "20.02"; pname = "mma"; src = fetchurl { url = "https://www.mellowood.ca/mma/mma-bin-${version}.tar.gz"; - sha256 = "02g2q9f1hbrj1v4mbf7zx2571vqpfla5803hcjpkdkvn8g0dwci0"; + sha256 = "0i9c3f14j7wy2c86ky83f2vgmg5bihnnwsmpkq13fgqjsaf0qwnv"; }; buildInputs = [ makeWrapper python3 alsaUtils timidity ]; @@ -19,6 +19,7 @@ sed -i 's@/usr/bin/timidity@/${timidity}/bin/timidity@g' mma-splitrec sed -i 's@/usr/bin/timidity@/${timidity}/bin/timidity@g' util/mma-splitrec.py find . -type f | xargs sed -i 's@/usr/bin/env python@${python3.interpreter}@g' + find . -type f | xargs sed -i 's@/usr/bin/python@${python3.interpreter}@g' ''; installPhase = '' diff --git a/pkgs/applications/audio/ams/default.nix b/pkgs/applications/audio/ams/default.nix new file mode 100644 index 00000000000..e6c4fbe802e --- /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 a159ca7f685..1d56ce089d9 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 9613df6df0b..94f08a5f7a8 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/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index b763e6e6122..eb2055ec7c1 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -10,14 +10,14 @@ let # If an update breaks things, one of those might have valuable info: # https://aur.archlinux.org/packages/spotify/ # https://community.spotify.com/t5/Desktop-Linux - version = "1.1.10.546.ge08ef575-19"; + version = "1.1.26.501.gbe11e53b-15"; # To get the latest stable revision: # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' # To get general information: # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.' # More examples of api usage: # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py - rev = "36"; + rev = "41"; deps = [ @@ -56,6 +56,8 @@ let xorg.libXScrnSaver xorg.libXtst xorg.libxcb + xorg.libSM + xorg.libICE zlib ]; @@ -75,7 +77,7 @@ stdenv.mkDerivation { # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334 src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap"; - sha512 = "c49f1a86a9b737e64a475bbe62754a36f607669e908eb725a2395f0a0a6b95968e0c8ce27ab2c8b6c92fe8cbacb1ef58de11c79b92dc0f58c2c6d3a140706a1f"; + sha512 = "41bc8d20388bab39058d0709d99b1c8e324ea37af217620797356b8bc0b24aedbe801eaaa6e00a93e94e26765602e5dc27ad423ce2e777b4bec1b92daf04f81e"; }; buildInputs = [ squashfsTools makeWrapper ]; diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix index a7d61598f3e..48ad9bc971c 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/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix index a8236b4b60f..b9645fa4d8a 100644 --- a/pkgs/applications/audio/zam-plugins/default.nix +++ b/pkgs/applications/audio/zam-plugins/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "zam-plugins"; - version = "3.11"; + version = "3.12"; src = fetchgit { url = "https://github.com/zamaudio/zam-plugins.git"; deepClone = true; - rev = "af338057e42dd5d07cba1889bfc74eda517c6147"; - sha256 = "1qbskhcvy2k2xv0f32lw13smz5g72v0yy47zv6vnhnaiaqf3f2d5"; + rev = "87fdee6e87dbee75c1088e2327ea59c1ab1522e4"; + sha256 = "0kz0xygff3ca1v9nqi0dvrzy9whbzqxrls5b7hydi808d795893n"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/blockchains/btcdeb/default.nix b/pkgs/applications/blockchains/btcdeb/default.nix new file mode 100644 index 00000000000..9a8db94401c --- /dev/null +++ b/pkgs/applications/blockchains/btcdeb/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, fetchFromGitHub +, autoreconfHook +, pkgconfig +, openssl +}: + +with stdenv.lib; +stdenv.mkDerivation rec { + pname = "btcdeb"; + version = "0.2.19"; + + src = fetchFromGitHub { + owner = "kallewoof"; + repo = pname; + rev = "fb2dace4cd115dc9529a81515cee855b8ce94784"; + sha256 = "0l0niamcjxmgyvc6w0wiygfgwsjam3ypv8mvjglgsj50gyv1vnb3"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ openssl ]; + + meta = { + description = "Bitcoin Script Debugger"; + homepage = "https://github.com/kallewoof/btcdeb"; + license = licenses.mit; + maintainers = with maintainers; [ akru ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/blockchains/nano-wallet/default.nix b/pkgs/applications/blockchains/nano-wallet/default.nix index 2b7ae5d9c6e..7d9fdb06d18 100644 --- a/pkgs/applications/blockchains/nano-wallet/default.nix +++ b/pkgs/applications/blockchains/nano-wallet/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "nano-wallet"; - version = "19.0"; + version = "20.0"; src = fetchFromGitHub { owner = "nanocurrency"; repo = "raiblocks"; rev = "V${version}"; - sha256 = "1y5fc4cvfqh33imjkh91sqhy5bb9kh0icwyvdgm1cl564vnjax80"; + sha256 = "12nrjjd89yjzx20d85ccmp395pl0djpx0x0qb8dgka8xfy11k7xn"; fetchSubmodules = true; }; diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index cf83be9b50d..a919a305419 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -11,24 +11,27 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "paritytech"; + # N.B. In 2018, the thing that was "polkadot" was split off into its own + # repo, so if this package is ever updated it should be changed to + # paritytech/polkadot, as per comment here: + # https://github.com/paritytech/polkadot#note repo = "substrate"; rev = "19f4f4d4df3bb266086b4e488739f73d3d5e588c"; sha256 = "0v7g03rbml2afw0splmyjh9nqpjg0ldjw09hyc0jqd3qlhgxiiyj"; - }; + }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0gc3w0cwdyk8f7cgpp9sfawczk3n6wd7q0nhfvk87sry71b8vvwq"; + cargoSha256 = "1h5v7c7xi2r2wzh1pj6xidrg7dx23w3rjm88mggpq7574arijk4i"; buildInputs = [ pkgconfig openssl openssl.dev ]; meta = with stdenv.lib; { description = "Polkadot Node Implementation"; - homepage = https://polkadot.network; + homepage = "https://polkadot.network"; license = licenses.gpl3; maintainers = [ maintainers.akru ]; platforms = platforms.linux; + # Last attempt at building this was on v0.7.22 + # https://github.com/paritytech/polkadot/releases broken = true; }; } diff --git a/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix b/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix new file mode 100644 index 00000000000..323df736936 --- /dev/null +++ b/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix @@ -0,0 +1,46 @@ +{ stdenv, linkFarm, lightdm-tiny-greeter, fetchFromGitHub +, pkgconfig, lightdm, gtk3, glib, wrapGAppsHook, conf ? "" }: + +stdenv.mkDerivation rec { + pname = "lightdm-tiny-greeter"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "off-world"; + repo = "lightdm-tiny-greeter"; + rev = version; + sha256 = "08azpj7b5qgac9bgi1xvd6qy6x2nb7iapa0v40ggr3d1fabyhrg6"; + }; + + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + buildInputs = [ lightdm gtk3 glib ]; + + postUnpack = if conf != "" then '' + cp ${builtins.toFile "config.h" conf} source/config.h + '' else ""; + + buildPhase = '' + mkdir -p $out/bin $out/share/xgreeters + make ${pname} + mv ${pname} $out/bin/. + mv lightdm-tiny-greeter.desktop $out/share/xgreeters + ''; + + installPhase = '' + substituteInPlace "$out/share/xgreeters/lightdm-tiny-greeter.desktop" \ + --replace "Exec=lightdm-tiny-greeter" "Exec=$out/bin/lightdm-tiny-greeter" + ''; + + passthru.xgreeters = linkFarm "lightdm-tiny-greeter-xgreeters" [{ + path = "${lightdm-tiny-greeter}/share/xgreeters/lightdm-tiny-greeter.desktop"; + name = "lightdm-tiny-greeter.desktop"; + }]; + + meta = with stdenv.lib; { + description = "A tiny multi user lightdm greeter"; + homepage = https://github.com/off-world/lightdm-tiny-greeter; + license = licenses.bsd3; + maintainers = with maintainers; [ edwtjo ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/editors/amp/default.nix b/pkgs/applications/editors/amp/default.nix index e4248e32447..625a5d3c0ab 100644 --- a/pkgs/applications/editors/amp/default.nix +++ b/pkgs/applications/editors/amp/default.nix @@ -3,19 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "amp"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "jmacdonald"; repo = pname; rev = version; - sha256 = "0jhxyl27nwp7rp0lc3kic69g8x55d0azrwlwwhz3z74icqa8f03j"; + sha256 = "0l1vpcfq6jrq2dkrmsa4ghwdpp7c54f46gz3n7nk0i41b12hnigw"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0rk5c8knx8swqzmj7wd18hq2h5ndkzvcbq4lzggpavkk01a8hlb1"; + cargoSha256 = "09v991rl2w4c4jh7ga7q1lk6wyl2vr71j5cpniij8mcvszrz78qf"; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ openssl python3 xorg.libxcb libgit2 ] ++ stdenv.lib.optionals stdenv.isDarwin diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 5736ec1dccc..bc994493292 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -18,9 +18,9 @@ let sha256Hash = "0ibp54wcss4ihm454hbavv1bhar6cd4alp5b0z248ryjr5w9mixf"; }; latestVersion = { # canary & dev - version = "4.1.0.1"; # "Android Studio 4.1 Canary 1" - build = "193.6224510"; - sha256Hash = "0misff7xx8jcg4zr5ahc8qdwvlkx605il0shzd9i1cm9v1br3sqx"; + version = "4.1.0.2"; # "Android Studio 4.1 Canary 2" + build = "193.6264773"; + sha256Hash = "0m09q4jp653i9jlqsjplx3d64xkdm27c35781yz6h5rw0a1sq6kz"; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 56624498aea..61275d9da4c 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -343,10 +343,10 @@ elpaBuild { pname = "bnf-mode"; ename = "bnf-mode"; - version = "0.4.3"; + version = "0.4.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/bnf-mode-0.4.3.tar"; - sha256 = "1hdhk6kw50vsixprrri0jb5i1c2y94ihifipqgq6kil7y4blr614"; + url = "https://elpa.gnu.org/packages/bnf-mode-0.4.4.tar"; + sha256 = "0acr3x96zknxs90dc9mpnrwiaa81883h36lx5q1lxfn78vjfw14x"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -2007,6 +2007,36 @@ license = lib.licenses.free; }; }) {}; + modus-operandi-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "modus-operandi-theme"; + ename = "modus-operandi-theme"; + version = "0.6.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.6.0.el"; + sha256 = "10smvzaxp90lsg0g61s2nzmfxwnlrxq9dv4rn771vlhra249y08v"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/modus-operandi-theme.html"; + license = lib.licenses.free; + }; + }) {}; + modus-vivendi-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "modus-vivendi-theme"; + ename = "modus-vivendi-theme"; + version = "0.6.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.6.0.el"; + sha256 = "1b7wkz779f020gpil4spbdzmg2fx6l48wk1138564cv9kx3nkkz2"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/modus-vivendi-theme.html"; + license = lib.licenses.free; + }; + }) {}; multishell = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "multishell"; @@ -2765,10 +2795,10 @@ elpaBuild { pname = "relint"; ename = "relint"; - version = "1.14"; + version = "1.15"; src = fetchurl { - url = "https://elpa.gnu.org/packages/relint-1.14.tar"; - sha256 = "0hjzhxcygb2r2s3g2pk3z9x3appy1y8gkw8gpg9cpkl6lpwcsh2f"; + url = "https://elpa.gnu.org/packages/relint-1.15.tar"; + sha256 = "0sxmdsacj8my942k8j76m2y68nzab7190acv7cwgflc5n4f07yxa"; }; packageRequires = [ emacs xr ]; meta = { @@ -3041,10 +3071,10 @@ elpaBuild { pname = "ssh-deploy"; ename = "ssh-deploy"; - version = "3.1.10"; + version = "3.1.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.10.tar"; - sha256 = "0gckc6yhgi8pn3s8vdyzz8x1s2d4wmsw6yjwsaqcr5nra50glbpg"; + url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.11.tar"; + sha256 = "1xd09kfn7lqw6jzfkrn0p5agdpcz1z9zbazqigylpqfcywr5snhk"; }; packageRequires = [ emacs ]; meta = { @@ -3157,7 +3187,11 @@ license = lib.licenses.free; }; }) {}; - timerfunctions = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: + timerfunctions = callPackage ({ cl-lib ? null + , elpaBuild + , emacs + , fetchurl + , lib }: elpaBuild { pname = "timerfunctions"; ename = "timerfunctions"; @@ -3166,7 +3200,7 @@ url = "https://elpa.gnu.org/packages/timerfunctions-1.4.2.el"; sha256 = "122q8nv08pz1mkgilvi9qfrs7rsnc5picr7jyz2jpnvpd9qw6jw5"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/timerfunctions.html"; license = lib.licenses.free; @@ -3675,10 +3709,10 @@ elpaBuild { pname = "xr"; ename = "xr"; - version = "1.16"; + version = "1.18"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xr-1.16.tar"; - sha256 = "1s6pkbr7gkan0r9gfmix75m587d8cg6l11722v70zzgf2z9w2xg9"; + url = "https://elpa.gnu.org/packages/xr-1.18.tar"; + sha256 = "1nq9pj47sxgpkw97c2xrkhgcwh3zsfd2a22qiqbl4i9zf2l9yy91"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json index 338766b4ebe..d86bc8a585b 100644 --- a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json @@ -1064,8 +1064,8 @@ "auto-complete", "rtags" ], - "commit": "3d025d9c97359442f7190ec42a63ff7e5fd85a9a", - "sha256": "1c8llhbhvrv5kwmci7rlsjqv3gr4gxi45g6c21fqrblyhas95s3n" + "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5", + "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x" }, "stable": { "version": [ @@ -1473,26 +1473,26 @@ "repo": "abo-abo/ace-window", "unstable": { "version": [ - 20200201, - 1753 + 20200311, + 1025 ], "deps": [ "avy" ], - "commit": "a36c1472d0ee59c2c1e6fb3ad66304141b154ef5", - "sha256": "1mkf1zi8z435jfpdi239gbn8243lwwsf1mgr6qq60pxbxxw9g13d" + "commit": "7003c88cd9cad58dc35c7cd13ebc61c355fb5be7", + "sha256": "0f3r40d5yxp2pm2j0nn86s29nqj8py0jxjbj50v4ci3hsd92d8jl" }, "stable": { "version": [ 0, - 9, + 10, 0 ], "deps": [ "avy" ], - "commit": "eef897e590c4ce63c28fd29ebff3c97aec8a69ae", - "sha256": "07mcdzjmgrqdvjs94f2n5bkrf5vrq2fwzz256wbm3wzqxqkfy1q6" + "commit": "7003c88cd9cad58dc35c7cd13ebc61c355fb5be7", + "sha256": "0f3r40d5yxp2pm2j0nn86s29nqj8py0jxjbj50v4ci3hsd92d8jl" } }, { @@ -1873,17 +1873,17 @@ }, { "ename": "ahg", - "commit": "5b7972602399f9df9139cff177e38653bb0f43ed", - "sha256": "0kw138lfzwp54fmly3jzzml11y7fhcjp3w0irmwdzr68lc206lr4", - "fetcher": "bitbucket", - "repo": "agriggio/ahg", + "commit": "eb2493e54641d6ca54461f237d3b7d30067a639f", + "sha256": "1za0hsk6mz6h958mqh4wcv3jv02qdbwi28cwnk90fpkkn43grwdi", + "fetcher": "git", + "url": "https://bitbucket.org/agriggio/ahg", "unstable": { "version": [ - 20190903, - 1349 + 20200304, + 741 ], - "commit": "c85d951d7376425156911e5f3cd7535b4ecfbfc3", - "sha256": "0j5h1yjhg7lj3zxznfzy7mqj2c2r4cwdg8xik3wlk2cnm27fhgz6" + "commit": "0ece48646ef7a8c813005934cc13f984b9998707", + "sha256": "0ypck79bmv4pa8l555kgij69jbpkv4fz9w91qs30lacjmrj0nha5" } }, { @@ -2051,8 +2051,8 @@ "deps": [ "f" ], - "commit": "43bfd15f0b1b90e0e99345f7c6c6e994d048a05c", - "sha256": "02y51gbbb9j448zifxgw53hprq77wsk8v6waafgpdbn84wljxkig" + "commit": "644f331071f8b09a898fae490541908b5054d2e6", + "sha256": "0yf2mikpxnfl673rv0w7xp1cvlkgvlmzgaixva3ppz6f0wg3vgz6" }, "stable": { "version": [ @@ -2158,16 +2158,16 @@ "repo": "jwiegley/alert", "unstable": { "version": [ - 20191126, - 2032 + 20200303, + 2118 ], "deps": [ "cl-lib", "gntp", "log4e" ], - "commit": "a73ede85c9cdd7d1a7593d4674cde8eec66c098b", - "sha256": "02p049xrbccb6hf7pc51mwwqqiks25dvz42smb1s7q03a0svrq6d" + "commit": "7046393272686c7a1a9b3e7f7b1d825d2e5250a6", + "sha256": "1s93ijkax0s78qn79c364ainmq7jq4gc95akl9wra642ql6hz3iq" }, "stable": { "version": [ @@ -2272,14 +2272,14 @@ "repo": "jtbm37/all-the-icons-dired", "unstable": { "version": [ - 20200229, - 2225 + 20200301, + 1346 ], "deps": [ "all-the-icons" ], - "commit": "9d535651412a20105ba58c0fceb3a807891c3606", - "sha256": "1w6rj619rx13jrhd5nvgm5j7ipazngm0sk66ll9c62lja43lmkwh" + "commit": "733e0b520562d1f78f757f21287547272cedcaef", + "sha256": "1ml9xzdaqjnpwb8rnqr0967n3zk7fb56xy531gc52k3pxj68zbcc" } }, { @@ -2315,20 +2315,20 @@ "deps": [ "all-the-icons" ], - "commit": "04578528f609ee837854f329cbf64ddd40f7a2ae", - "sha256": "0m5y18z2w3c0paq07papj1dc3m7cxhrrjyfav4gbbi5cpmh5sxnp" + "commit": "ee0409588ebaee1aada351f1a75abcdc999ac9e2", + "sha256": "0afq5wjh74ks8hrsb9m41h1m9gyc0hvp2qmy4b1ls9kffgnk7ri2" }, "stable": { "version": [ 1, - 1, + 2, 0 ], "deps": [ "all-the-icons" ], - "commit": "07a55895ded043fa317c61c3a7013736345e7a38", - "sha256": "14c5rbl48hfdnj186p9g9csf5xrzid2jv90x3n4p8r5nigy5j74m" + "commit": "ee0409588ebaee1aada351f1a75abcdc999ac9e2", + "sha256": "0afq5wjh74ks8hrsb9m41h1m9gyc0hvp2qmy4b1ls9kffgnk7ri2" } }, { @@ -2371,28 +2371,28 @@ "repo": "seagle0128/all-the-icons-ivy-rich", "unstable": { "version": [ - 20200301, - 656 + 20200310, + 1551 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "b3dda7af490e606b85e1e0cd9806988ce301dac5", - "sha256": "0bj0m7gbjkgwyh87zhsx2vhbw6g6ncjc1r63ai726scz10h5y0a4" + "commit": "3e02da9a166df7ebea25aae476efd7b8d74d63e0", + "sha256": "0p91yvpqy7xjkz2mcpq6c8kjfxqfw9byxprqg2qqnzg421c5yv6x" }, "stable": { "version": [ 1, - 1, + 2, 0 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "7344a94182cca55d33f3c04e0d9c9e9e91db0637", - "sha256": "03pmfx528dhywas4j40h95r1v3dprn9n3ydhk13jsclmjy471cz9" + "commit": "3e02da9a166df7ebea25aae476efd7b8d74d63e0", + "sha256": "0p91yvpqy7xjkz2mcpq6c8kjfxqfw9byxprqg2qqnzg421c5yv6x" } }, { @@ -2815,8 +2815,8 @@ "dash", "request" ], - "commit": "084ffad14fa700ad1ba95d8cbfe4a8f6052e2408", - "sha256": "0zjd5yid333shvjm4zy3p7zdpa09xcl96gc4wvi2paxjad6iqhwz" + "commit": "546774a453ef4617b1bcb0d1626e415c67cc88df", + "sha256": "1if610hq5j8rbjh1caw5bwbgnsn231awwxqbpwvrh966kdxzl4qf" } }, { @@ -2912,11 +2912,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20200219, - 1558 + 20200306, + 1547 ], - "commit": "818f66f4a3d6a33ae90c4e5de12f8dce770e7875", - "sha256": "017yzg3jqf0x7zn7xhdgbr6m97zzcjv6icj5zl5q4zj0ksm9l82q" + "commit": "6cc6ac887220cd26b8e72f1ec95555517faf0e80", + "sha256": "0j2zcs9dya36k0k1sa1brdvnh537m15mmanbb3dlqqkfd7ig5ql0" }, "stable": { "version": [ @@ -3065,26 +3065,26 @@ "repo": "zellio/ansible-vault-mode", "unstable": { "version": [ - 20200130, - 2300 + 20200305, + 2240 ], "deps": [ "seq" ], - "commit": "5653e82a2706cc7e9f46d24c6319b00ba6eb7528", - "sha256": "02p970jh7vl2bx8arm04mk313rqgh2s48rm0mn8zbiam8s71m2bm" + "commit": "c4fe4b0af2ac7f9d32acee234716ab31fa824cef", + "sha256": "1xif6vv53rpc2k974pqckmzck55zhdhzyfl54kdp25w93xbs3js4" }, "stable": { "version": [ 0, 4, - 0 + 1 ], "deps": [ "seq" ], - "commit": "898b0989f6054c813802e0ff0fb0c0094e3a71b5", - "sha256": "0qjjzmnx4pczv6jkafmji2kn2a0rqsxcm8g5jp8lq2cc6dx86ad4" + "commit": "9a50ed6b73222e9973c08d79b6955e57ed3b7d97", + "sha256": "1xif6vv53rpc2k974pqckmzck55zhdhzyfl54kdp25w93xbs3js4" } }, { @@ -3885,6 +3885,36 @@ "sha256": "0wqc7bqx9rvk8r7fd3x84h8p01v97s6w2jf29nnjb59xakwp22i7" } }, + { + "ename": "auctex-cluttex", + "commit": "d08e481ad618a44f9bfa38c68ca30e67a6727538", + "sha256": "05cbiihq0k9d13l8xgd67yanxmj57hajcm2x2v3ils3lfkphqm5w", + "fetcher": "github", + "repo": "tsuu32/auctex-cluttex", + "unstable": { + "version": [ + 20200311, + 1453 + ], + "deps": [ + "auctex" + ], + "commit": "76a786a26e1ddf4a1ef2b0067639c32e7cee9d06", + "sha256": "1vvvfhr52q34bv5mhhvzdwkkvcff955xkdijlrfyr8n7p9csjpim" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "auctex" + ], + "commit": "e358f7148092d8ed64703641b5621e130cce458d", + "sha256": "1whzcp9wvpwn1c33n7mqxx8v6g4apg3cq5h2ffl74423ysymry71" + } + }, { "ename": "auctex-latexmk", "commit": "3f48af615c56f093dff417a5d3b705f9993c518f", @@ -4965,14 +4995,14 @@ "repo": "abo-abo/avy", "unstable": { "version": [ - 20191106, - 1234 + 20200311, + 1106 ], "deps": [ "cl-lib" ], - "commit": "cf95ba9582121a1c2249e3c5efdc51acd566d190", - "sha256": "0d7v04xzr385ybq0ai88d4h8ywl53q1ig197cbkrna2jl2s466bh" + "commit": "3bf83140fad4c28f2dc4c7107b9d8fef84d17cb9", + "sha256": "1zicf7xynvxdx0pvg0zshvllabmjprvprjgg54phcbqlilcrq0hk" }, "stable": { "version": [ @@ -6735,6 +6765,30 @@ "sha256": "1bpyhsjfdjfa1iw9kv7fsl30vz48qllqgjg1rsxdl3vcripcbc9z" } }, + { + "ename": "blitzmax-mode", + "commit": "a1a59a8ac5bb12507e58cde85b09e7f19ce72a82", + "sha256": "1isqkmc6g412l7gbg0bmyfsl975wjv7fv753z1mi0bzr7ihv5ckz", + "fetcher": "github", + "repo": "Sodaware/blitzmax-mode", + "unstable": { + "version": [ + 20200211, + 2205 + ], + "commit": "4814c35007035f0e26e0fadc50fffc4ab6d298ad", + "sha256": "160jd2rn1lgwgnm1ygdcsz1z0yxg9f1ps9wxqkv30xnkbnnxq10c" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "d772deff2464d48d018bbe43b1e4b3745a4ac886", + "sha256": "0gzm2qzwbaqfmfi1vhcx23w9v1mcs6kx5kijncn9hbvhi0640j76" + } + }, { "ename": "bln-mode", "commit": "ee12ef97df241b7405feee69c1e66b3c1a67204b", @@ -6860,26 +6914,26 @@ "repo": "sergeyklay/bnf-mode", "unstable": { "version": [ - 20200122, - 2155 + 20200301, + 2140 ], "deps": [ "cl-lib" ], - "commit": "11b19fa77ab0a6bb2208c776ccd17887a0325b8c", - "sha256": "10sb8ixfhxnan2cs6xhpy21lniv8yqp5xy0q9dla3z8897clrnw7" + "commit": "4a7aff6a3a691826ea4add9f519c854b9611d780", + "sha256": "1hnkvwl0as2s4aayqahclqclsriigqv51h8yafx0za1xfh4snfzv" }, "stable": { "version": [ 0, 4, - 3 + 4 ], "deps": [ "cl-lib" ], - "commit": "fecc2a8fc9cfff9d75da8809c24ef56ca4985dde", - "sha256": "04wj1s483khi2qvnbjcyfihip150qjmizc8qnjsqg60nwcxjh5j5" + "commit": "4a7aff6a3a691826ea4add9f519c854b9611d780", + "sha256": "1hnkvwl0as2s4aayqahclqclsriigqv51h8yafx0za1xfh4snfzv" } }, { @@ -7291,21 +7345,21 @@ "repo": "rmuslimov/browse-at-remote", "unstable": { "version": [ - 20200127, - 145 + 20200308, + 639 ], "deps": [ "cl-lib", "f", "s" ], - "commit": "aeee6bf38f78aaed5dd2efd6305f30a7594e3060", - "sha256": "1hp61vd5vxgyz61l8h59v9yvadpqzrc3ihsd731gl1k9siajg8q2" + "commit": "6aecae4b5d202e582425fc8aa2c9c2b6a4779f25", + "sha256": "0c93ilvxmfv28a05fs2lbdyc2q308anjw0xvbkg7dc0blg0fgb05" }, "stable": { "version": [ 0, - 10, + 14, 0 ], "deps": [ @@ -7313,8 +7367,8 @@ "f", "s" ], - "commit": "47bab994640f086939c30cc6416e770ad067e950", - "sha256": "0vhia7xmszcb3lxrb8wh93a3knjfzj48h8nhj4fh8zj1pjz6args" + "commit": "771a3079e27f397d2f5a9470b945980fa68ee048", + "sha256": "0bx4ns0jb0sqrjk1nsspvl3mhz3n12925azf7brlwb1vcgnji09v" } }, { @@ -7972,19 +8026,19 @@ "repo": "jorgenschaefer/emacs-buttercup", "unstable": { "version": [ - 20200229, - 620 + 20200308, + 2200 ], - "commit": "b2985171b8f745c8edab3d6fccf72d036519ca86", - "sha256": "129rxvd83i3jzivmqkx9a9lpq3g80716y9mc55hqf60l7wxg9787" + "commit": "b360e3501703d8829a7dfc2d141e8c7c32c9bcfe", + "sha256": "0b3xkykfw8888zdg5w45kzij0d547j67crpc62mizh0fnc5naqvr" }, "stable": { "version": [ 1, - 20 + 21 ], - "commit": "adba24e575a07f4db3e9058953b441f390e8f2a2", - "sha256": "0143j6f271l19j41a4pgakxvslip8375jg8pwcvn22gz25s4g45w" + "commit": "0dbd474460e4c314bf8bc6e4d3dec647081538c9", + "sha256": "1ra5r56k539q6l98msxdn4vfd7k6jm00g8cdhs6hpwvb1blj8di2" } }, { @@ -8025,11 +8079,11 @@ "repo": "rolandwalker/button-lock", "unstable": { "version": [ - 20150223, - 1354 + 20200309, + 1323 ], - "commit": "f9082feb329432fcf2ac49a95e64bed9fda24d58", - "sha256": "06qjvybf65ffrcnhhbqs333lg51fawaxnva3jvdg7zbrsv4m9acl" + "commit": "9afe0f4d05910b0cccc94cb6d4d880119f3b0528", + "sha256": "1d893isxvchrqxw6iaknbv8l31rgalfc4hmppf0l87gxp5y9hxa2" }, "stable": { "version": [ @@ -8887,8 +8941,8 @@ 20151205, 1343 ], - "commit": "f6abd9f4d4ec44edd04eeb75e23ec87988509d8b", - "sha256": "1vy653j7abbnvc03vy28y0vnvq8rzfd2zv0qbgp8zs70svfcnjxz" + "commit": "183c4fd3fe5fb7cb089bbfc7437815d426d08372", + "sha256": "1jgvs093w0llp0nxfdzfrlk7il0wj48qhnqsn61pvnma10m93zdl" } }, { @@ -8937,8 +8991,8 @@ 20200210, 1326 ], - "commit": "f6abd9f4d4ec44edd04eeb75e23ec87988509d8b", - "sha256": "1vy653j7abbnvc03vy28y0vnvq8rzfd2zv0qbgp8zs70svfcnjxz" + "commit": "183c4fd3fe5fb7cb089bbfc7437815d426d08372", + "sha256": "1jgvs093w0llp0nxfdzfrlk7il0wj48qhnqsn61pvnma10m93zdl" } }, { @@ -8949,11 +9003,11 @@ "repo": "cdominik/cdlatex", "unstable": { "version": [ - 20191203, - 646 + 20200305, + 809 ], - "commit": "b7af5a9884189412b4699a8fbffcb8fc17bdf617", - "sha256": "1ra5m51b9r0irp30bg8qm9wziaz5r4bi84b14s8ss5q3w950sdd5" + "commit": "a5cb624ef5f9e3d51fce6faa8dc153277f61043a", + "sha256": "0gicai05d21909mjjvfc6194ygrqg2pbff60pjh3w593c4l4jmcj" }, "stable": { "version": [ @@ -9072,27 +9126,27 @@ "repo": "ema2159/centaur-tabs", "unstable": { "version": [ - 20200214, - 1651 + 20200309, + 16 ], "deps": [ "cl-lib", "powerline" ], - "commit": "96b7c90bdcb6fe3d7c5146b579ab7b9794c2a17b", - "sha256": "01dik5v8b331vplvm3qclg04z2qdcfk0gfb12rz8p503s8y4xisi" + "commit": "af50f87d40697a4e5d6097e2042111fc4a930b40", + "sha256": "1c3szcv87gjlm2bndasrx9q46x699cxapmhfs2zs08yk6gc1yfji" }, "stable": { "version": [ 3, - 0 + 1 ], "deps": [ "cl-lib", "powerline" ], - "commit": "7d0d4e939d8089fc18b20a51a49de11b70947649", - "sha256": "19xm43f3p5klyiyycy3bp46j2mpqcf4jl5d34hvv0jynx4hxlk1f" + "commit": "af50f87d40697a4e5d6097e2042111fc4a930b40", + "sha256": "1c3szcv87gjlm2bndasrx9q46x699cxapmhfs2zs08yk6gc1yfji" } }, { @@ -9207,8 +9261,8 @@ 20171115, 2108 ], - "commit": "911033c7b88a5aa166cfabe36df3c9a2083caf8a", - "sha256": "1imbp99fxyq6zjkfnjmmhra68p0kgg3axhnx57k3xmlfqqw69hw9" + "commit": "b7135d2b898062aa9b1cc279062b8cbf48802d21", + "sha256": "1v4af4kblrq1bcfdzwqpq9inmyj83ppj5kwpnnvw6j92x0362nga" }, "stable": { "version": [ @@ -9325,11 +9379,11 @@ "repo": "emacsmirror/cg", "unstable": { "version": [ - 20190316, - 2206 + 20200305, + 1845 ], - "commit": "9349600829ca1758306e703a649874f8c63955fa", - "sha256": "1s3s37g99x19zxnq0xbiy95kjhm2hb09saxic2basapcp0sdfbwh" + "commit": "b0e4cca3d8a28054b3af2f592b528903c7e7c111", + "sha256": "06ff0blmixn38z013pxj0a5qqn6aw09kv50zzyx5prdyzb57fx6h" } }, { @@ -9846,8 +9900,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20200227, - 1414 + 20200308, + 1030 ], "deps": [ "clojure-mode", @@ -9858,8 +9912,8 @@ "sesman", "spinner" ], - "commit": "1a33e62cc56c1d3f4e4c80604140bdef40e3cf57", - "sha256": "0i4kbkl6vck2pnk2p6ars9ifj5b7haigfrmaid9qq8qq2nslczrq" + "commit": "c027c4948562f736fd77e441dc10cb5d6bb355a1", + "sha256": "0p808ks2x9dg98v80icxldynvvvfwwsf2y89la40fsc572s8zqjw" }, "stable": { "version": [ @@ -10110,8 +10164,8 @@ "repo": "andras-simonyi/citeproc-el", "unstable": { "version": [ - 20190914, - 613 + 20200305, + 2126 ], "deps": [ "dash", @@ -10121,8 +10175,8 @@ "s", "string-inflection" ], - "commit": "fd2188e5d76ca78723567ae3b369ae542402e633", - "sha256": "0a924bpb15259dlv8ry5bhlq61yczy31fnsbvx2lhzf9r0i06vvc" + "commit": "1884b5c88ad4eb35450a7acf053594369ccb1b22", + "sha256": "0dr4fx14kmahg533ij92ycn1a8kagbadfml9iyziisllxypmjrzf" }, "stable": { "version": [ @@ -10983,8 +11037,8 @@ 20190710, 1319 ], - "commit": "61596e1cc861f975ec822f72d34842674b388646", - "sha256": "04m4im5qaxybh9kir1kclljzql3qiadhi1g64byyilgbl81vx6nv" + "commit": "c7c6e103d1209f7e29cb2909cf342be75478f304", + "sha256": "0p4fi9yss2n9wdlhra035spj353q047mfyab1jgswyfjfghgmiks" }, "stable": { "version": [ @@ -10992,10 +11046,10 @@ 17, 0, -1, - 1 + 2 ], - "commit": "125f0451a9061c60036c5f92d104ee9fb3111a98", - "sha256": "15spvk8392ngnxxm5v919nnvakw8aw4h1g3i41mhr9fs901z9cis" + "commit": "d1cb554c99c73e1486fbf4e09125337a7c0e9ea3", + "sha256": "07qkp3wbmpx2p3jpzxhgf5y9j6yzaxnq4krbj2d5m1hbgxxqgxz5" } }, { @@ -11469,14 +11523,14 @@ "repo": "purcell/color-theme-sanityinc-solarized", "unstable": { "version": [ - 20190206, - 59 + 20200304, + 2156 ], "deps": [ "cl-lib" ], - "commit": "54daf1e5a0fbee6682cade1f59171daf185239e3", - "sha256": "0z9p9lbngrv8yx9asmz6x89183gw2v75l990hr8m0aydfbfn6gnz" + "commit": "c688337aaae9f47128a841479e4191858ac147f6", + "sha256": "0a16fn7h0yljlgg1scy82w5r6awd7gk6xf1qd83cx8kj2cg7k7vb" }, "stable": { "version": [ @@ -11988,14 +12042,14 @@ "repo": "krzysztof-magosa/company-ansible", "unstable": { "version": [ - 20200228, - 2134 + 20200306, + 1441 ], "deps": [ "company" ], - "commit": "0bbf6561d95fb6e1f34aa971e7db5203f22366b5", - "sha256": "0ygdhrqva1q6qll40bg9bpd4z023vibzzb0xkidjvwhaa40m33b7" + "commit": "79dd421b161efa49fbdffad57fa40edb41f484a3", + "sha256": "0b05n6m47vyhirxfqzapzl4gf179aks1296qsw1sw8v84kb5kl0x" }, "stable": { "version": [ @@ -13248,8 +13302,8 @@ "company", "rtags" ], - "commit": "3d025d9c97359442f7190ec42a63ff7e5fd85a9a", - "sha256": "1c8llhbhvrv5kwmci7rlsjqv3gr4gxi45g6c21fqrblyhas95s3n" + "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5", + "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x" }, "stable": { "version": [ @@ -13662,11 +13716,11 @@ "repo": "jjzmajic/compdef", "unstable": { "version": [ - 20200222, - 338 + 20200304, + 611 ], - "commit": "79639b90e537058ab4de1961cee63a26c4ca2a10", - "sha256": "0rgf145x7v0y47knnkhx6dc1vflibs45daprc7wi8qlnjmjmr4vw" + "commit": "30fb5846ed851efee641ce8c5d8879ad36cd7ac6", + "sha256": "0qn99jynafjyxc6fy9z888h7j7drs2mz34acwq8yh22v314x2639" } }, { @@ -14274,14 +14328,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20200224, - 2036 + 20200311, + 1152 ], "deps": [ "swiper" ], - "commit": "fcf5dcfd5796637d64164fd17956c5bc54e25612", - "sha256": "1hx00axmjfgc14ixj16pg7029zj7rsx2i80sw6f2bvp543l2aicq" + "commit": "5f1d9ce04599c52818244c2cb8cb066a601610b8", + "sha256": "1gsyf210jq4ij5r47k5sajpjq3z0rgihz84g6y3647k12a00biap" }, "stable": { "version": [ @@ -15817,8 +15871,8 @@ 20190111, 2150 ], - "commit": "f6bf6aa9c7d2414b54e7289639ae5f43b15ede05", - "sha256": "0sl9vz753np0qb6v5c3nf1kgyd7gyp4yslas5fwfs5j4f3981cdk" + "commit": "22213aa38cfb3460bbcd746910cea00eedea8a2c", + "sha256": "06x99iwby54d5za6py8g6bb1pblnqi8vs16ncr9brk23zswrg1ml" }, "stable": { "version": [ @@ -16394,14 +16448,14 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20200225, - 745 + 20200306, + 1344 ], "deps": [ "page-break-lines" ], - "commit": "b7857a361967a9f0f6370879b30854f1e2fd81ff", - "sha256": "1l6n707v77gc4lgrg5livl2isigv7j6dsrkfppkcyjz2xyvl0n3y" + "commit": "bf38867ae80902d58207974b4a2bba4249324599", + "sha256": "1ksa1rq6xmyxc4srj1n3l0rd66zcz9br8k2bp3pzriljqvk8l753" }, "stable": { "version": [ @@ -16669,15 +16723,15 @@ "repo": "skk-dev/ddskk", "unstable": { "version": [ - 20200301, - 237 + 20200310, + 2004 ], "deps": [ "ccc", "cdb" ], - "commit": "f6abd9f4d4ec44edd04eeb75e23ec87988509d8b", - "sha256": "1vy653j7abbnvc03vy28y0vnvq8rzfd2zv0qbgp8zs70svfcnjxz" + "commit": "183c4fd3fe5fb7cb089bbfc7437815d426d08372", + "sha256": "1jgvs093w0llp0nxfdzfrlk7il0wj48qhnqsn61pvnma10m93zdl" } }, { @@ -17742,20 +17796,20 @@ "repo": "gonewest818/dimmer.el", "unstable": { "version": [ - 20200301, - 43 + 20200308, + 2331 ], - "commit": "b9a35a236314e9afe173287a5aaf5ac7307f6067", - "sha256": "1a8aagg6087l9pi4pjk91k1liikbsp6mxbnpx3mzzcvylh2kis5f" + "commit": "2b8b639e55e0e79101f7197264f17429cdcf4669", + "sha256": "026qb0r289wkf4zpr3l4pwp7l2rxgfqd8vrj2z8zhyas0r0wwjzx" }, "stable": { "version": [ 0, 4, - 1 + 2 ], - "commit": "5c0d50439afb43362b06a249a40e1ee00ce837a8", - "sha256": "1ykzr7h96a55hnj0bwq9fds4fdwinzx48p3i3k2g6fy8qcn7ydlb" + "commit": "e45bf2d064a8ecdea2b4caf646ece2d0adc1d84e", + "sha256": "0dw0qh5hm1x76s5cqxvylvmjgy0jwy11xm258g6kmx6w1k6r1d2l" } }, { @@ -18278,11 +18332,11 @@ "repo": "Vifon/dired-rifle.el", "unstable": { "version": [ - 20181012, - 2131 + 20200308, + 2358 ], - "commit": "a4f7b1e798397688b9c00d3507fcd395ece17a40", - "sha256": "09jp54drbx1hb4fj6bzh8ava7nk56pp500xsa9712vscg1f38fpz" + "commit": "99e4110c80d65ca43e2b0ec078e3202995e392d7", + "sha256": "034qak8kdp7laz1ylqy9np5ajhwf741mdl0bj5kb7rrrsijxada6" } }, { @@ -18316,15 +18370,15 @@ "repo": "stsquad/dired-rsync", "unstable": { "version": [ - 20200225, - 1343 + 20200308, + 1150 ], "deps": [ "dash", "s" ], - "commit": "276a313bd61096ad680769c8d419c1cf3d5981e9", - "sha256": "1s4cllfwyspp65f05f3jw449ijn6m96pbn3vjpil4b116hsxm1qb" + "commit": "bfd5c155be1cb6b71c83e5f41116c81b6532b6d5", + "sha256": "096lqsq4bh5fgxhfscvmscd5v8d4ji88wks2chi92h9v85sha3b6" }, "stable": { "version": [ @@ -18377,11 +18431,11 @@ "repo": "crocket/dired-single", "unstable": { "version": [ - 20180824, - 312 + 20200303, + 1144 ], - "commit": "cfd463598175d89672a766a4f4a4a778836186e2", - "sha256": "0bpk4hqa9k702k0mcbg62wy29sx1n1dzrprkzp4x76ixgzfav3lj" + "commit": "90ade369ba478fdebf61957f837c0b10cef128b1", + "sha256": "08qm8s77kfx9yfhm10vivhq15jrndvd29azkv4y1wd9qsrh5ylk0" }, "stable": { "version": [ @@ -18635,11 +18689,11 @@ "repo": "purcell/disable-mouse", "unstable": { "version": [ - 20181225, - 2206 + 20200304, + 2159 ], - "commit": "689ea9f3d702529a5b5ac2493e28eefca65c7abb", - "sha256": "0na9kkx2rjakgxq416cr2wjdggzf4ycki7jj7ywpra966zldf84s" + "commit": "a8318f5f21716316053cc092ab9abb43cb681fe0", + "sha256": "0z9749hd3x1z2sf3lyzx2rrcfarixmfg0hnc5xsckkgyb7gbn6hq" }, "stable": { "version": [ @@ -19441,11 +19495,11 @@ "repo": "progfolio/doct", "unstable": { "version": [ - 20200225, - 2305 + 20200308, + 1939 ], - "commit": "671ff27f9ee97b4ca79edcad8626a0356732d0cc", - "sha256": "0ajvys20w8fp661x8y7j7f72kmw5ylwvcdxrhiplk6h6xhacjwdc" + "commit": "82387b252b2e9bcbc4aed0e9568cddcafbdbfac5", + "sha256": "0h24d2938qrk4aw778y9ll4j8m9p8w1q9cfyx5qw60sbdrcbrlmj" } }, { @@ -19560,16 +19614,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20200301, - 657 + 20200311, + 1726 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "0df558598451c36714c0793283fecc064adaf786", - "sha256": "1gi3qcqnv0qs8f1921s0bs6ppc3z44sbb035qdlzm1lii7s2v4ll" + "commit": "06a79f5c5035b12c3110a7ab43b48e50217a2ae7", + "sha256": "0pgng5nqc3cj7bb57l0abqc2sr1542lgv7271i602k56sg7ak431" }, "stable": { "version": [ @@ -19594,14 +19648,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20200225, - 1641 + 20200302, + 110 ], "deps": [ "cl-lib" ], - "commit": "756cf15a6bfb3146f2a28a861c1d9e4e86605cdf", - "sha256": "01w67r9vms19mrz8nc8mbyq0gkvgbixpcl14xbb51mrvnssaf3qb" + "commit": "e53b83c9106c76e54996ba2d1b70a8288a379572", + "sha256": "1wwy7abxxpr0048y03g3nv0sw1w8s0pdnnffpxp7djlp55nvay29" }, "stable": { "version": [ @@ -19809,8 +19863,8 @@ 20161021, 1211 ], - "commit": "4953f1c8a68472e157a0dcd0a7e35a4ec2577133", - "sha256": "1i7k7d2gnzd2izplhdmjbkcxvkwnc3y3y0hrcp2rq60bjpkcl1gv" + "commit": "a69e364532fffa451d1f12ade8fadb9cdbd8318c", + "sha256": "12pwfv0j54idvn061l3qxf0vrrl56085n517izh8x6jkgxjcx7k0" }, "stable": { "version": [ @@ -19830,11 +19884,11 @@ "repo": "dracula/emacs", "unstable": { "version": [ - 20200228, - 1008 + 20200304, + 1730 ], - "commit": "f7cf1b23ae8f70aaf723552159213d143b92889a", - "sha256": "1lz24sbwc3d98ibjvqb160qb2jkknm53v0imdykw86bjqgplxvv7" + "commit": "ed2f68d85b637636a4f7b782f19ee4f8e9f6fa44", + "sha256": "19qvkrknnhkr77hkyv9x1dg6m4difwz59sy2mqzw50wfb6vsy17n" }, "stable": { "version": [ @@ -20078,19 +20132,19 @@ "repo": "jscheid/dtrt-indent", "unstable": { "version": [ - 20191019, - 2141 + 20200306, + 1054 ], - "commit": "48221c928b72746d18c1e284c45748a0c2f1691f", - "sha256": "0jmlb54b0qrp2mr9cnbzki1vy7i0wv5y1h03ns8acwa2hmpjk30a" + "commit": "1569b712ea691a9b8df12af5ee8c8a4aa4853e45", + "sha256": "1149s9ym30nfdbb2ndk5ypl5wb984an6n37gycra15j3z15d60mh" }, "stable": { "version": [ - 0, - 9 + 1, + 0 ], - "commit": "48221c928b72746d18c1e284c45748a0c2f1691f", - "sha256": "0jmlb54b0qrp2mr9cnbzki1vy7i0wv5y1h03ns8acwa2hmpjk30a" + "commit": "1569b712ea691a9b8df12af5ee8c8a4aa4853e45", + "sha256": "1149s9ym30nfdbb2ndk5ypl5wb984an6n37gycra15j3z15d60mh" } }, { @@ -20160,8 +20214,8 @@ "repo": "jacktasia/dumb-jump", "unstable": { "version": [ - 20200222, - 2006 + 20200306, + 513 ], "deps": [ "dash", @@ -20169,8 +20223,8 @@ "popup", "s" ], - "commit": "a0ec2f139325bf3b39664e2a85be042a06f63af8", - "sha256": "12agvqxx50sg0klz3q6rcgfx5m2dw7idn65vwwamb019fpr4q94p" + "commit": "e8e9b0c2d1eda594fd40db9c64e93a70b426641b", + "sha256": "0m8771bzz972zf2lhv7f4z2x0rnnfc0iidb5jpz072wr3v52kark" }, "stable": { "version": [ @@ -20214,17 +20268,17 @@ 20191016, 1241 ], - "commit": "d90488a7e2c24ecc7136bbcb270bfb30d4f1ad4f", - "sha256": "0pqlwkz3j5kpghqgx29xns0s8a66mi48prarirgqq8knfd7vkvzs" + "commit": "cbb259a99ecb15bc714ee1023d1a643b7e6c996f", + "sha256": "0xi83prqla41bvjmj5y6qwsxxbb6jwznr9lw3z2ibk46djr9hdsx" }, "stable": { "version": [ 2, - 3, - 1 + 4, + 0 ], - "commit": "4e9ca5de1bf9eb8cd3d2277634d418ba747be864", - "sha256": "124x7yh8mjmqrf3z962sdcakd1ka3js5kg2vx767ygw4q6w8cjdh" + "commit": "ccd447e41a711f8a52bc854d71dba8677c900c34", + "sha256": "0i8b84mi38r431z4a1yh4xnn9z5mnk1g3di0qz6h4lsxq8pg2m0v" } }, { @@ -20259,20 +20313,20 @@ }, { "ename": "dyalog-mode", - "commit": "e608f40d00a3b2a80a6997da00e7d04f76d8ef0d", - "sha256": "0w61inyfvxiyihx5z9fk1ckawcd3cr6xiradbbwzmn25k99gkbgr", - "fetcher": "bitbucket", + "commit": "1a8f86df54f1243fea71e1e73ed0b9fb049032bd", + "sha256": "00mbkl275g8x3w341nsi90ffm5cfalnrfzx8ww1hnxc86q5ldivw", + "fetcher": "github", "repo": "harsman/dyalog-mode", "unstable": { "version": [ - 20191002, - 1352 + 20200301, + 1149 ], "deps": [ "cl-lib" ], - "commit": "4e214c1804eefde07b1dcd2ea07b8e41f33d7ee7", - "sha256": "1vq1fhn8x6i6wmccwiq482dbrdpn5cllkdn3v0ki0427a8gwkdal" + "commit": "5dceeefaed6fbedb680bb6cc9aba14fb5f890310", + "sha256": "137kgixsdkw2rqj1402gc31gd6hdbna7bx5j1xxhyiig2x2b3aqx" } }, { @@ -20883,25 +20937,26 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20200229, - 741 + 20200308, + 2130 ], "deps": [ "parsebib" ], - "commit": "96dff9eacad70d2fbd3cc432c9235413569080f9", - "sha256": "044p78y48cgv9wyxpf6kd137ppbh96dmd5xyaykafk9jf75h47kz" + "commit": "cd37aaa9a11e3b2232b8aa12cfe9a8ae9b830b10", + "sha256": "0spiz5r2y4pdpyc4d3f9w228giq0j9rm8f5h5akzn5rwiq9pfkwz" }, "stable": { "version": [ 2, - 22 + 22, + 1 ], "deps": [ "parsebib" ], - "commit": "f094f7741264ba5de14624b1b8da8a2ba678bfe7", - "sha256": "1hn11y09bpb10hxp0b7j72shivnnq1qyvw13lyjqlycr6rgvckb9" + "commit": "cd37aaa9a11e3b2232b8aa12cfe9a8ae9b830b10", + "sha256": "0spiz5r2y4pdpyc4d3f9w228giq0j9rm8f5h5akzn5rwiq9pfkwz" } }, { @@ -21562,14 +21617,14 @@ }, { "ename": "edts", - "commit": "782db7fba2713bfa17d9305ae15b0a9e1985445b", - "sha256": "0f0rbd0mqqwn743qmr1g5mmi1sbmlcglclww8jxvbvb61jq8vspr", + "commit": "92b0d3a2af833e0f11e6a935d54eba5e3879d690", + "sha256": "1363k9fh1z7r6hxccsqx2a1d688kldr4h6vp91hwph7ihk4868il", "fetcher": "github", - "repo": "tjarvstrand/edts", + "repo": "sebastiw/edts", "unstable": { "version": [ - 20200217, - 801 + 20200304, + 1709 ], "deps": [ "auto-complete", @@ -21580,8 +21635,8 @@ "popup", "s" ], - "commit": "299e4553551a88dc5f26921125bccbc3efc662ef", - "sha256": "0fsgnh7g1fignsvl5i0kbkqb6f4ffc9k0202xm8p3b41vxgzdky5" + "commit": "22eb59692a792c6769ae0b2b9f9a2583133764b8", + "sha256": "015irp4vd4s2j2iw4p0r98kb60xyjbrpvckj8iixsja3qj8b63rw" }, "stable": { "version": [ @@ -21729,8 +21784,8 @@ 20200107, 2333 ], - "commit": "de8ccd81a8312634a3c8c7f06b6993105538d29f", - "sha256": "08wpwpyskx59k31bqakw3mzir0blqcqk8m7dmr5mvp9gji41mb2d" + "commit": "39d416a6ef2c1f863a9482e7ada59d5da6fb7883", + "sha256": "0f66fnzkwl37qp8rj3hhnnayx27l06c18n7x3422pvbgxc78c7i8" }, "stable": { "version": [ @@ -21875,8 +21930,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20200301, - 802 + 20200307, + 2048 ], "deps": [ "anaphora", @@ -21886,8 +21941,8 @@ "request", "websocket" ], - "commit": "10d7f10179f05eec243de3e55addd533bc46ce31", - "sha256": "0w2vlsr6s79mdlis4vsad9svs4ywbrkbyg5wygpd89m10sclkqcy" + "commit": "b265205a5735f7727336f483001cd2bdb9fc7a4e", + "sha256": "1b2ydpp9kh3a64if2fz6dky4mz3ifd7am7gms5508aj0757mzy4m" }, "stable": { "version": [ @@ -21961,8 +22016,8 @@ "repo": "kostafey/ejc-sql", "unstable": { "version": [ - 20200212, - 1038 + 20200308, + 1421 ], "deps": [ "auto-complete", @@ -21971,8 +22026,8 @@ "direx", "spinner" ], - "commit": "af7a59dba2ee2e906cbe6d1686d639b65f8838b2", - "sha256": "1pvhb1i4xhic89hn9l27afinxrgs50s0lpln8daa6dci3z0i8xx8" + "commit": "046bffbaac2a78e440d39a1f1e2dd8055a39f3bd", + "sha256": "0ccww05ivqgsvvrhjlwlciv00213qar4sdzawzmxh85vxj3a045b" }, "stable": { "version": [ @@ -22539,8 +22594,8 @@ "inline-docs", "quick-peek" ], - "commit": "4dcd6644c7aee2565dd32c1f65e2d1fa4432ceb8", - "sha256": "0xnp937xpjvypz2cv0xsdc47g484qr7kbdjccdflgv2yn244dc37" + "commit": "3123b20f26d2f74033de6feb398fd36745c46e14", + "sha256": "16crwazyn28qyb9zax1jfz2favgw402z676yf67qchgzsf2jj43s" } }, { @@ -22750,28 +22805,28 @@ "repo": "fasheng/elfeed-protocol", "unstable": { "version": [ - 20200301, - 236 + 20200305, + 230 ], "deps": [ "cl-lib", "elfeed" ], - "commit": "8f5cdb32c7d9f53427086fd8309c6c72d0bd9e79", - "sha256": "0brc185y8gb34xci5cv3g5i9s0gzrglkkbyxck5zk36icbh6wm3k" + "commit": "16daf009952fc020a2589ccf325a2b822403f7b6", + "sha256": "1lsxbr8b8gn33w6xrs9ghgv2xxvls2arlvq0fkp3vpb5ki8jzsqs" }, "stable": { "version": [ 0, 7, - 3 + 5 ], "deps": [ "cl-lib", "elfeed" ], - "commit": "7048b8e3f55d6c8a9508d34b86f7a3434cda8e30", - "sha256": "0rg2nczzzbljmm3kkh5cnvj3ji0shrhwxw46lg3h93dp1nja9lzz" + "commit": "bffe74f0f7d7126691f6a9dd9eadf8714545dfe0", + "sha256": "16cmm59lwkgq0yj0pg9sn46afvqqjjx06xv5sc96vgwvn1n0lfi7" } }, { @@ -22924,11 +22979,11 @@ "repo": "xuchunyang/elisp-demos", "unstable": { "version": [ - 20200219, - 2102 + 20200306, + 1620 ], - "commit": "1d3b349f90dc6572a90d49ee247c43a4ba64252e", - "sha256": "0jvphz7ql4wbcj88w9igcgid4mjn7qysqgp8jmp7aqaf9zfpl2bd" + "commit": "bd9dfc8659096cf3102f50b9dc895c599d824732", + "sha256": "1gkywnajnv62s0r2mdkc70cbzdyxa1x9w8rlbnlkdx4js3brakiz" }, "stable": { "version": [ @@ -23069,25 +23124,25 @@ "repo": "purcell/elisp-slime-nav", "unstable": { "version": [ - 20200129, - 2057 + 20200304, + 2201 ], "deps": [ "cl-lib" ], - "commit": "fea3bedf6383fea8370a9484a5610759c25055f9", - "sha256": "1mxs519gqax1fnaf5lirg69jrv4hj5a39hf7lzai7hyhcf9slzc1" + "commit": "9ab52362600af9f97f1590f05a295538025170b3", + "sha256": "08k4zlawjkb0ldn4lgrhih8nzln398x7dwzpipqfyrmp0xziywma" }, "stable": { "version": [ 0, - 9 + 10 ], "deps": [ "cl-lib" ], - "commit": "0e96d9f1f0d334f09414b509d44d5c000b51f432", - "sha256": "11vyy0bvzbs1h1kggikrvhd658j7c730w0pdp6qkm60rigvfi1ih" + "commit": "9ab52362600af9f97f1590f05a295538025170b3", + "sha256": "08k4zlawjkb0ldn4lgrhih8nzln398x7dwzpipqfyrmp0xziywma" } }, { @@ -24554,15 +24609,15 @@ "repo": "iqbalansari/emacs-emojify", "unstable": { "version": [ - 20191017, - 420 + 20200309, + 553 ], "deps": [ "ht", "seq" ], - "commit": "4c84ef9502988b52b1e296630bcee7f7c62cfc02", - "sha256": "11v7br4j1yx1hqqlv2phkxn3jx2qa3vrb4cq61ymfdx82v8j78jj" + "commit": "e05217ee668db3ffb537528408ce8004fadb75c0", + "sha256": "1blhvzrvjabh81si1h9iznldfp6mkchd31ig68byqfjvi6d34nxq" }, "stable": { "version": [ @@ -24917,15 +24972,15 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20191228, - 2011 + 20200309, + 546 ], "deps": [ "closql", "dash" ], - "commit": "075f6afa81f7a83a35088b699ed44d6029192198", - "sha256": "0g1ggna56w3c1qdqi3g1aq4gz6hdpacwc4hd31bqa03gydr8ghlg" + "commit": "edf8c009066360af61caedf67a2482eaa19481b0", + "sha256": "1ml5337wbw2zsf1vwv5svwvhd93jgl9sq79l1byiz32bnb0q5nhh" }, "stable": { "version": [ @@ -25515,8 +25570,8 @@ 20200220, 2206 ], - "commit": "2839ecb8fc1ba424b863867b2086127fad839d28", - "sha256": "0r7cljx0f1c0mbzgvny7aka0zsyvmnryvzly9qfx0psgr06x8qfw" + "commit": "f9cbc2a6f6c03b529860857f94242ea80b30d3f3", + "sha256": "0xxq20k4al58yv4y1kj2d8hwpcwji0qwzqn06p5y1wzzyw22sz7h" }, "stable": { "version": [ @@ -26048,11 +26103,11 @@ "repo": "zwild/eshell-prompt-extras", "unstable": { "version": [ - 20191104, - 1230 + 20200310, + 809 ], - "commit": "356a540f9365b2f37f8a8cfb9c0e0e1994d12f4a", - "sha256": "0gb07mns23dgqqr6qfy7d6ndizy15sqgbgfaig6k5xbjnwi02v9g" + "commit": "6a30813893e04ab8c0793757cdb2ff9873ab0c56", + "sha256": "0vk30sq0p3afpaw9phmfpglvhs01f97rhm3ygzwiv8h4smy9zgsj" }, "stable": { "version": [ @@ -26316,14 +26371,14 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20200226, - 2140 + 20200311, + 102 ], "deps": [ "julia-mode" ], - "commit": "a2be8cb97c6fff13fc28170d6359f835b8b562a5", - "sha256": "1jj040lng03jmp8ddn5fi8cg2v6fwxxv9ikispx3n03va1mrzf7m" + "commit": "3b84933f58d23403ded5bb5b25b8b2f714824ce9", + "sha256": "074lpj12sg90qbv8409dp9008nwc9rmqrb1clnxapfacz12649nc" }, "stable": { "version": [ @@ -26772,30 +26827,30 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20200224, - 914 + 20200304, + 1421 ], "deps": [ "cl-lib", "goto-chg", "undo-tree" ], - "commit": "7c42ba4de086dc8f5b2d277c8d2806adc6b84279", - "sha256": "1pzznnibgk0x33m04064w2r0ksk26liynswa785nld4king70iq2" + "commit": "296932406a0b55474fe4b6cb8db8b7d5e05633aa", + "sha256": "1gvmvczdfgq07chj98gqg5j2zyfdrq3znl8l6a81mbrjbvsyvmd3" }, "stable": { "version": [ 1, - 12, - 17 + 14, + 0 ], "deps": [ "cl-lib", "goto-chg", "undo-tree" ], - "commit": "5b690258fcfc47ca1fed25f17e04356edc713925", - "sha256": "001ywnhjl0dmywc8vg8brsisx432kcfdgv6xksawbg1czw6j0y02" + "commit": "4dc63903d9688e2ce838a220b0e24d8f14a64c12", + "sha256": "17xrn3s6a4afmls8fw8nnxa1jq9dmj2qqrxa2vngh50hxpz8840p" } }, { @@ -27509,15 +27564,15 @@ "repo": "emacs-evil/evil-magit", "unstable": { "version": [ - 20200226, - 1347 + 20200302, + 1611 ], "deps": [ "evil", "magit" ], - "commit": "ba0e59248f8d7f59de811ed2e1f2c565dd7da1ca", - "sha256": "1jy1nzjr8mxn4153qdcvk3s0cdy7xrim7jq2c6dzdqxjdprhj8nz" + "commit": "0b79aa33a478770865716dc0e09f95d91ec042a2", + "sha256": "0qxapq9nl1yr3ryg1q9n2ajffm308fai115mbvwmjl9sd6x2p3ly" }, "stable": { "version": [ @@ -28187,8 +28242,8 @@ "evil", "string-inflection" ], - "commit": "008b74a9b2994abfb4ff5b679b8a5a26fd45e98a", - "sha256": "0lwwrd9n0ha2xn5a053s8a1l05zya4smf61yc5c1s4fqv0xai9fj" + "commit": "6913de02a210487c063cd63ecf27b17a24797870", + "sha256": "1wyd903yvp8lxbhavsr4grn79hkxcsz71mcvy3hrvnf7ifhw514a" }, "stable": { "version": [ @@ -28303,26 +28358,26 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20200129, - 815 + 20200304, + 911 ], "deps": [ "evil" ], - "commit": "7c42ba4de086dc8f5b2d277c8d2806adc6b84279", - "sha256": "1pzznnibgk0x33m04064w2r0ksk26liynswa785nld4king70iq2" + "commit": "296932406a0b55474fe4b6cb8db8b7d5e05633aa", + "sha256": "1gvmvczdfgq07chj98gqg5j2zyfdrq3znl8l6a81mbrjbvsyvmd3" }, "stable": { "version": [ 1, - 12, - 17 + 14, + 0 ], "deps": [ "evil" ], - "commit": "5b690258fcfc47ca1fed25f17e04356edc713925", - "sha256": "001ywnhjl0dmywc8vg8brsisx432kcfdgv6xksawbg1czw6j0y02" + "commit": "4dc63903d9688e2ce838a220b0e24d8f14a64c12", + "sha256": "17xrn3s6a4afmls8fw8nnxa1jq9dmj2qqrxa2vngh50hxpz8840p" } }, { @@ -28678,11 +28733,11 @@ "repo": "jjzmajic/ewal", "unstable": { "version": [ - 20200301, - 823 + 20200305, + 230 ], - "commit": "732a2f4abb480f9f5a3249af822d8eb1e90324e3", - "sha256": "09dgs0g5hcf5hris8i1w6w7wxarzmsagyc3l50rflvxy3djhlbkd" + "commit": "4ecc355dae9c7d648cd2874e01a15dfa02b9350d", + "sha256": "1v444nfrzz0lkybrgfics5kc8gncbvvs23qlq1pkz7ann6q84ip0" }, "stable": { "version": [ @@ -28694,6 +28749,38 @@ "sha256": "09dgs0g5hcf5hris8i1w6w7wxarzmsagyc3l50rflvxy3djhlbkd" } }, + { + "ename": "ewal-doom-themes", + "commit": "5f59228fa54a9733f549c1ba531cd90d4350fb62", + "sha256": "14blxk8dkr0hkhf1hd75xk0zzx6qxavynymhbwbvbf3m0mp64x6l", + "fetcher": "gitlab", + "repo": "jjzmajic/ewal", + "unstable": { + "version": [ + 20200301, + 839 + ], + "deps": [ + "doom-themes", + "ewal" + ], + "commit": "4ecc355dae9c7d648cd2874e01a15dfa02b9350d", + "sha256": "1v444nfrzz0lkybrgfics5kc8gncbvvs23qlq1pkz7ann6q84ip0" + }, + "stable": { + "version": [ + 0, + 2, + 1 + ], + "deps": [ + "doom-themes", + "ewal" + ], + "commit": "732a2f4abb480f9f5a3249af822d8eb1e90324e3", + "sha256": "09dgs0g5hcf5hris8i1w6w7wxarzmsagyc3l50rflvxy3djhlbkd" + } + }, { "ename": "ewal-evil-cursors", "commit": "ee7f9833a1dda00e12bcf45c7194ebc38e26168b", @@ -28708,8 +28795,8 @@ "deps": [ "ewal" ], - "commit": "732a2f4abb480f9f5a3249af822d8eb1e90324e3", - "sha256": "09dgs0g5hcf5hris8i1w6w7wxarzmsagyc3l50rflvxy3djhlbkd" + "commit": "4ecc355dae9c7d648cd2874e01a15dfa02b9350d", + "sha256": "1v444nfrzz0lkybrgfics5kc8gncbvvs23qlq1pkz7ann6q84ip0" }, "stable": { "version": [ @@ -28739,8 +28826,8 @@ "ewal", "spacemacs-theme" ], - "commit": "732a2f4abb480f9f5a3249af822d8eb1e90324e3", - "sha256": "09dgs0g5hcf5hris8i1w6w7wxarzmsagyc3l50rflvxy3djhlbkd" + "commit": "4ecc355dae9c7d648cd2874e01a15dfa02b9350d", + "sha256": "1v444nfrzz0lkybrgfics5kc8gncbvvs23qlq1pkz7ann6q84ip0" }, "stable": { "version": [ @@ -28817,8 +28904,8 @@ "deps": [ "evil" ], - "commit": "88266fa7fcfbef704032f671b94f756f2f98bd4f", - "sha256": "0nmm7pvs81429a4zpal6aidfd1n58yavv3skscrav5r0wnlbz773" + "commit": "d5daea30176d48e74c9d063ac9bfc240ebeb97d0", + "sha256": "18mb7ik15yygfyjr5y2awbn5lrr3b9z1f31gnfslvrlav2nl1m7d" }, "stable": { "version": [ @@ -28947,11 +29034,11 @@ "repo": "magnars/expand-region.el", "unstable": { "version": [ - 20200224, - 1501 + 20200304, + 1839 ], - "commit": "1603d01fbfbef0d73ac940f7847c7e0b9b978093", - "sha256": "0apwvqbv04pgl682ja96l6cchfflr83s2h4p7vzpjc05h8pc0znr" + "commit": "ea6b4cbb9985ddae532bd2faf9bb00570c9f2781", + "sha256": "1pc3nnyb6cy4x6xnm25kdhmjmfm2rar7cnxsfck2wg5nm11p0klm" }, "stable": { "version": [ @@ -29152,8 +29239,8 @@ "exwm", "exwm-firefox-core" ], - "commit": "9407977034baf5f8b1e43c07ed8728f8f42d70d8", - "sha256": "1fha5fxjylgylmbr6fn5cz9py9csh4na9h7vljvapkrazwkpvbsy" + "commit": "14643ee53a506ddcb5d2e06cb9f1be7310cd00b1", + "sha256": "12rhsy5f662maip1sma0vi364xb8swb7g59r4dmafjv3b52gxik8" } }, { @@ -29518,11 +29605,11 @@ "repo": "WJCFerguson/emacs-faff-theme", "unstable": { "version": [ - 20191028, - 1846 + 20200304, + 1414 ], - "commit": "a16c4b36ef50731a83a57c1c6341a49e9897d225", - "sha256": "10850175c6jll4grsdjl180hs3rd72yajq55x6fz3a8mm8v5fqk9" + "commit": "3a2f4b567de490ee7af32ecca46de741e7fd7d6a", + "sha256": "0h3i61md4w6zsjarqan0s3p3kxz5af6ic3fww4ly6s8q1nv57xsc" }, "stable": { "version": [ @@ -29947,8 +30034,8 @@ "f", "s" ], - "commit": "1f2199f653ebae152ab34ebd8ccd364ab96ae392", - "sha256": "1idpm3gbbvq4s0q5dk7gs3lycnfwi58nhg4vdss084kgckwfz62r" + "commit": "9a80e1d42a4b01879a7585485384af6431b34651", + "sha256": "129mfslbp15d9z83r38lcqxnfx3n5jldaja5qbdgrmlw14irgx0r" }, "stable": { "version": [ @@ -30785,14 +30872,14 @@ "repo": "wanderlust/flim", "unstable": { "version": [ - 20190526, - 1034 + 20200303, + 319 ], "deps": [ "apel" ], - "commit": "e4bd54fd7d335215b54f7ef27ed974c8cd68d472", - "sha256": "0sl3skyqqzanjrp34hd1rh8wvdgsj2cm7k7hx5kc5ipggp77720r" + "commit": "f303f2f6c124bc8635add96d3326a2209749437b", + "sha256": "08gxrpzxxfgbxznvpj00bjvh8l7afg2h2vaj6iasis9724f3mgl6" } }, { @@ -31965,25 +32052,25 @@ "url": "https://git.deparis.io/flycheck-grammalecte/", "unstable": { "version": [ - 20191003, - 1844 + 20200308, + 1452 ], "deps": [ "flycheck" ], - "commit": "11cc5a0480dbdd4a9fa2bc12184b3fb56efc5cf3", - "sha256": "1x7y0sjq1p7idzsy2bdqhdll8vj2ci45cd5jn8qgzv02kms65djp" + "commit": "ca4b87d22474d3337db72e19f88105f557f44867", + "sha256": "0wj81xfy3wlgdlnhhyhz5lfkl6sfb2ajwb6s8f2y4bcvqa8gz3qj" }, "stable": { "version": [ - 0, - 9 + 1, + 0 ], "deps": [ "flycheck" ], - "commit": "d1ca6d9d4d64aa343598018134506930434ac5e0", - "sha256": "0s7kbs764nhq4nlfbbilz5clvadcyz5bi0ksrbm9kczhagisxnjv" + "commit": "ca4b87d22474d3337db72e19f88105f557f44867", + "sha256": "0wj81xfy3wlgdlnhhyhz5lfkl6sfb2ajwb6s8f2y4bcvqa8gz3qj" } }, { @@ -32331,25 +32418,25 @@ "repo": "purcell/flycheck-ledger", "unstable": { "version": [ - 20191128, - 203 + 20200304, + 2204 ], "deps": [ "flycheck" ], - "commit": "2065beab564c23e6ab380547d19bdb5a9b3b25fc", - "sha256": "16wq9l8q15iw7mdicrx2c28qrhndmd0fmg8f3yiyk2frmb8ack9h" + "commit": "628e25ba66604946085571652a94a54f4d1ad96f", + "sha256": "1djrj3is0dzrl2703bw7bclf33dp4xqmy144q7xj5pvpb9v3kf50" }, "stable": { "version": [ 0, - 4 + 5 ], "deps": [ "flycheck" ], - "commit": "9401b6c83f60bfd29edfc62fee76f75e17a3a41e", - "sha256": "1pdssw5k88ym5fczllfjv26sp4brlyrywnlzq5baha5pq91h9cb6" + "commit": "628e25ba66604946085571652a94a54f4d1ad96f", + "sha256": "1djrj3is0dzrl2703bw7bclf33dp4xqmy144q7xj5pvpb9v3kf50" } }, { @@ -32609,15 +32696,15 @@ "repo": "purcell/flycheck-package", "unstable": { "version": [ - 20200222, - 512 + 20200304, + 2151 ], "deps": [ "flycheck", "package-lint" ], - "commit": "e867b83dc84f1f8870eea069a71fa2a24cbcd5c9", - "sha256": "1b7javiqbcfzh1xkrjld9f5xrmld69gvnjz72mqpqmzbilfvmdpq" + "commit": "caea75f77dc7668c7aa0ebcd48f677e3522b5d77", + "sha256": "1x63rwpyzcn99jzhyxh91l3hp2j55wspxdv5rhvnpbar5nlqlbz1" }, "stable": { "version": [ @@ -32684,8 +32771,8 @@ "flycheck", "phpstan" ], - "commit": "6744215d82ce9e82416d83e5b27fb9bac9e8d461", - "sha256": "0hbm881w84nm4g67085xzikz422vkb08y98hfk2n3kqmznvp8i51" + "commit": "a1c30ca634107551c20c846b5316ca5697adb06d", + "sha256": "0b7rnzk1zkrzh978bmh2dsy78f0sb4ia1w06khyqiby52m27q9k1" }, "stable": { "version": [ @@ -32944,27 +33031,27 @@ "repo": "purcell/flycheck-relint", "unstable": { "version": [ - 20200226, - 508 + 20200304, + 152 ], "deps": [ "flycheck", "relint" ], - "commit": "6dbd319a49d334653a3e4f9bff229f482bbb7ba4", - "sha256": "0rmnq0llmc96hmvhim451fknzafj80pjkd6qdb0x1bdr7iww1ilc" + "commit": "f498c130408411906bda81c1023a88b1498dcf18", + "sha256": "18sgnj6y9vsj9np58d8cr72jfady0kwdg6rdx667098lbznaw0da" }, "stable": { "version": [ 0, - 2 + 4 ], "deps": [ "flycheck", "relint" ], - "commit": "6dbd319a49d334653a3e4f9bff229f482bbb7ba4", - "sha256": "0rmnq0llmc96hmvhim451fknzafj80pjkd6qdb0x1bdr7iww1ilc" + "commit": "39ec5deabdd23afaf6e1e34e13edd14d910899d0", + "sha256": "0m46n91hmh6gml9ravd0d1i79jnl9vbr733na3w0kg87mixnjdy8" } }, { @@ -32982,8 +33069,8 @@ "flycheck", "rtags" ], - "commit": "3d025d9c97359442f7190ec42a63ff7e5fd85a9a", - "sha256": "1c8llhbhvrv5kwmci7rlsjqv3gr4gxi45g6c21fqrblyhas95s3n" + "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5", + "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x" }, "stable": { "version": [ @@ -34118,20 +34205,20 @@ "repo": "karlotness/flymake-quickdef", "unstable": { "version": [ - 20190727, - 2028 + 20200308, + 2342 ], - "commit": "5b3980a7c1763171e8cdb28ebfd5f4eaad32f9f9", - "sha256": "0rhg29jcpa4314ld9shhvf81m1ar8xp2853hxm94bxpnnza5d8x7" + "commit": "150c5839768a3d32f988f9dc08052978a68f2ad7", + "sha256": "19gfd539l97j8xbrq1fw83b54mxbcamlz9m896088d3p01zf8b0g" }, "stable": { "version": [ - 0, 1, - 1 + 0, + 0 ], - "commit": "53bf206f1a71b2fc12f49741832a94f6498ae6a6", - "sha256": "0wqfn068ylb30f8988knrcd9v3r3xck5yb1fj9jnrw2bs6qxxc57" + "commit": "150c5839768a3d32f988f9dc08052978a68f2ad7", + "sha256": "19gfd539l97j8xbrq1fw83b54mxbcamlz9m896088d3p01zf8b0g" } }, { @@ -34980,8 +35067,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20200228, - 1527 + 20200309, + 937 ], "deps": [ "closql", @@ -34993,8 +35080,8 @@ "markdown-mode", "transient" ], - "commit": "0ade907a469d7159d9f5b3290e2aebec4397c58a", - "sha256": "12pvnasc4nr3n4k91ch90zsvyc1rv1ghga8lx7xp78fc6b3y959r" + "commit": "2e2d26cf428012f0ece53a81cde02179e72648aa", + "sha256": "0mpim6699cda3ds8gv1f2y021gssjrw9rg7w9b8h1ifhrl54x0qn" }, "stable": { "version": [ @@ -35194,14 +35281,14 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20200218, - 1249 + 20200307, + 943 ], "deps": [ "seq" ], - "commit": "974c9df2c73cf52030dfe0c771d97d3d37bd08e4", - "sha256": "0103rnq9x07a11930jgcg04ayd7npri9wd2j2ghr510y7sm86p0d" + "commit": "c3f70903327659cd307f9a8225b5c4310cfc6e8e", + "sha256": "1zavkilkff9gbnl6i5ghc0z93b4k3kv604lyysqnc7mvvzf344vc" }, "stable": { "version": [ @@ -35595,8 +35682,8 @@ "repo": "FStarLang/fstar-mode.el", "unstable": { "version": [ - 20200131, - 1622 + 20200305, + 1654 ], "deps": [ "company", @@ -35606,8 +35693,8 @@ "quick-peek", "yasnippet" ], - "commit": "336b41ecd7ecb64fac869ec61e683e20a14d79d2", - "sha256": "1122m5l16sw3mi9xvsmkrxxsvx6895g0agd55w8wk5968323n01y" + "commit": "aaaf2568881d3e5e08f8cbd04a9add49912552ad", + "sha256": "1wqbfz8sbvfl7v31a1i6mc6c8p5fyp8yflj87lavpk1d0h5dl8ly" }, "stable": { "version": [ @@ -35637,8 +35724,8 @@ "deps": [ "cl-lib" ], - "commit": "573e4ed198584f17126549f708bd8426e93058be", - "sha256": "0baqikbbgxb2a0jyqz8s9ibivh9q14bq2g2kngd89pssd74fv04k" + "commit": "85d15e865ab3beca4ab601b5741ed31b55e247bd", + "sha256": "16z3sgfjm49f7ll11lfw8pwrqgss6631frr5xxnh18x1p5n96gjc" }, "stable": { "version": [ @@ -36244,6 +36331,38 @@ "sha256": "08cw1fa25kbhbq2sp1cpn90bz38i9hjfdj93xf6wvki55b52s0nn" } }, + { + "ename": "geolocation", + "commit": "fddc094aa08365c0e04f0d8f2f19a47908964f50", + "sha256": "03mxy8dfmy8db8rx9j7q1lvzy11grz0bd3054ckwgmlb6ng7d72q", + "fetcher": "github", + "repo": "gonewest818/geolocation.el", + "unstable": { + "version": [ + 20200308, + 2324 + ], + "deps": [ + "deferred", + "request-deferred" + ], + "commit": "83ab28e64bc067016b5344dffe93e380e9807e9c", + "sha256": "0ns7pgi4gbpfb192n9fdhv12zflq74jdmqc518rgh7hqlyp26mf4" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "deps": [ + "deferred", + "request-deferred" + ], + "commit": "83ab28e64bc067016b5344dffe93e380e9807e9c", + "sha256": "0ns7pgi4gbpfb192n9fdhv12zflq74jdmqc518rgh7hqlyp26mf4" + } + }, { "ename": "german-holidays", "commit": "bf5b3807ff989b13f95e8d6fad2f26a42ff0643c", @@ -36574,15 +36693,15 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20200228, - 4 + 20200309, + 936 ], "deps": [ "let-alist", "treepy" ], - "commit": "b0faadaf079542f81ac06a15a1bd225e2a7af1ec", - "sha256": "1fasnipic9mkhkm7km56f43s19cyzrrs1cd8nr81b9kxmp95ik3r" + "commit": "a8bf337534ec583906db77a3d56f7d1b84bda952", + "sha256": "0cpbz79k6q5ang47qw4j3i99qz093xc40k8lsc9j21g07fihxiv5" }, "stable": { "version": [ @@ -36933,8 +37052,8 @@ "transient", "with-editor" ], - "commit": "c8cd22e28d20b0d7ae74102df4e35d7c0c61ebe6", - "sha256": "134n9m2zrf60ljm867bv92qjgk61cmgns1a3cqpvj4wflpaahnbv" + "commit": "1916e83aa463fee86ac1c6bcfd80d780d0544901", + "sha256": "1bnykbb868dna4j91kp5jzi7ab4siiy1ni228x8i50cmfm4i91in" }, "stable": { "version": [ @@ -37669,8 +37788,8 @@ "ghub", "s" ], - "commit": "1de2d6d148e3604899270be36eb6b0385b837aac", - "sha256": "1g1j6c93aw9n9v7r20dzlnylkn4292vwi59l8hai49i1944hr00h" + "commit": "3fb7cc2a818c43f2b29ce17792efafd4f6b07765", + "sha256": "06bfwb7n700farbgc6lp6nqjx8sshc8r6lbhk3fqy92ahdpkz0wn" } }, { @@ -38218,11 +38337,11 @@ "repo": "emacsorphanage/gnuplot", "unstable": { "version": [ - 20191212, - 1801 + 20200310, + 536 ], - "commit": "a406143d52618638d908b6b0b1c1c90c045b83ee", - "sha256": "0vq7ha6z07x46pf7qig1f6p1rr8vyhj8vafrmq40h3gw5422vv8y" + "commit": "a080f79b6f7a6ca94d11cda0d341acfc6e76d0c5", + "sha256": "111n89p74iymxrla3mk387xffnqmkb11pixjfgiv61l9b35hx94g" }, "stable": { "version": [ @@ -38706,8 +38825,8 @@ "cl-lib", "go-mode" ], - "commit": "53c76cddf54638dea5e4cae99ce0181de28e1064", - "sha256": "0fpdschrcbx2fjx01x5z84gk7pmicssxv23q9p88k6d11nj80iqc" + "commit": "85a20dac6cee1e4bcfff554a665bcb7cd21dc0d9", + "sha256": "09xivjss1vlpqyp8cbv6652sgy3rxp00ml7f76prx22cwfpq67db" }, "stable": { "version": [ @@ -38799,11 +38918,11 @@ "repo": "dominikh/go-mode.el", "unstable": { "version": [ - 20200112, - 2140 + 20200309, + 303 ], - "commit": "53c76cddf54638dea5e4cae99ce0181de28e1064", - "sha256": "0fpdschrcbx2fjx01x5z84gk7pmicssxv23q9p88k6d11nj80iqc" + "commit": "85a20dac6cee1e4bcfff554a665bcb7cd21dc0d9", + "sha256": "09xivjss1vlpqyp8cbv6652sgy3rxp00ml7f76prx22cwfpq67db" }, "stable": { "version": [ @@ -38907,8 +39026,8 @@ "deps": [ "go-mode" ], - "commit": "53c76cddf54638dea5e4cae99ce0181de28e1064", - "sha256": "0fpdschrcbx2fjx01x5z84gk7pmicssxv23q9p88k6d11nj80iqc" + "commit": "85a20dac6cee1e4bcfff554a665bcb7cd21dc0d9", + "sha256": "09xivjss1vlpqyp8cbv6652sgy3rxp00ml7f76prx22cwfpq67db" }, "stable": { "version": [ @@ -39155,8 +39274,8 @@ 20180221, 2015 ], - "commit": "910be7a94367618fd0fd25eaabbee4fdc0ac7092", - "sha256": "08gskshgfwxhmm9i4vgd4q7kqd5i7yihqh33v6r07br6kqd0g995" + "commit": "738671d3881b9731cc63024d5d88cf28db875626", + "sha256": "0jkiz4py59jjnkyxbxifpf7bsar11lbgmj5jiq2kic5k03shkn9c" } }, { @@ -39483,35 +39602,6 @@ "sha256": "0kpalpssfrwcqrmp47i3j2x04m01fm7cspwsm6fks8pn71lagcwm" } }, - { - "ename": "goto-gem", - "commit": "a52b516b7b10bdada2f64499c8f43f85a236f254", - "sha256": "0i79z1isdbnqmz5rlqjjys68l27nl90m1gzks4f9d6dsgfryhgwx", - "fetcher": "gitlab", - "repo": "pidu/goto-gem", - "unstable": { - "version": [ - 20140729, - 1845 - ], - "deps": [ - "s" - ], - "commit": "e3206f11f48bb7e798514a4ca2c2f60649613e5e", - "sha256": "0j2hdxqfsifm0d8ilwcw7np6mvn4xm58xglzh42gigj2fxv87g99" - }, - "stable": { - "version": [ - 1, - 2 - ], - "deps": [ - "s" - ], - "commit": "6f5bd405c096ef879fed1298c09d0daa0bae5dac", - "sha256": "188q7jr1y872as3w32m8lf6vwl2by1ibgdk6zk7dhpcjwd0ik7x7" - } - }, { "ename": "goto-last-change", "commit": "d68945f5845e5e44fb6c11726a56acd4dc56e101", @@ -39592,8 +39682,8 @@ "magit-popup", "s" ], - "commit": "5d909f3e947adbce0482a0a00ede8654499cd28b", - "sha256": "122r7clj081gwxgw03d162garrjw604ynfpyzhawix0wh8hwmg9z" + "commit": "5cc9f67181417bb4e7fa466e14e5daff0be2075f", + "sha256": "1l53m0kr0f9ng2723nmkncanvbcix2ccslqm2xrmqbl638h8pvkj" }, "stable": { "version": [ @@ -39991,11 +40081,11 @@ "repo": "ppareit/graphviz-dot-mode", "unstable": { "version": [ - 20200203, - 1919 + 20200304, + 432 ], - "commit": "0a4197d1c2b440db37f3e77cba01fb2c00a1a88d", - "sha256": "0a2p4vnchb63275j0w9fhkq1x4dkyyvaxqpyhx41zlg2zfzvcpwh" + "commit": "3642a0a5f41a80c8ecef7c6143d514200b80e194", + "sha256": "16aq9zz4dnccngk9q1k2qa0mwd63cycwrzdkvzg4nn6ikq6w7wnp" }, "stable": { "version": [ @@ -40231,21 +40321,6 @@ "sha256": "14c09m9p6556rrf0qfad4zsv7qxa5flamzg6fa83cxh0qfg7wjbp" } }, - { - "ename": "grin", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "0rak710fp9c7wx39qn4dc9d0xfjr5w7hwklxh99v1x1ihkla9378", - "fetcher": "bitbucket", - "repo": "dariusp686/emacs-grin", - "unstable": { - "version": [ - 20110806, - 658 - ], - "commit": "f541aa22da52b8ff2f7af79bc5e4b58b9f5db8be", - "sha256": "0rqpgc50z86j4waijfm6kw4zjmzqfii6nnvyix4rkd4y3ryny1x2" - } - }, { "ename": "grip-mode", "commit": "de97f1c15b3ab53ca5e314b679c289705302bb64", @@ -40254,11 +40329,11 @@ "repo": "seagle0128/grip-mode", "unstable": { "version": [ - 20200217, - 1151 + 20200307, + 1433 ], - "commit": "061f78d0f1699288e7abc7eaa0dd13749524464a", - "sha256": "0dg4aq4x2wn7mwv04nydkz773ip3n3ps7j1kw4mcrvv65m62ks9y" + "commit": "b6fb07217afc618f2dc1fb3569c85ae3ca9d921f", + "sha256": "0v90n2rpc1v7apwwlryg0v3avr708iwd092i4jw19sdv6bs6mwc2" }, "stable": { "version": [ @@ -40421,14 +40496,14 @@ "repo": "greduan/emacs-theme-gruvbox", "unstable": { "version": [ - 20200216, - 2257 + 20200307, + 1522 ], "deps": [ "autothemer" ], - "commit": "d5218aec3283d21566cb2c5619a19268743fc07e", - "sha256": "1cp7imprwk5vvgsfskpvjzxypq06xf5pqjhicvnyg4386ckznfib" + "commit": "647796a42951a807ee1694a648442b3d83057e43", + "sha256": "0j0w6g0pr1p90wjyrwl21y0hlvjms8ba4yw90sd89lnzn7ncscm8" }, "stable": { "version": [ @@ -40539,14 +40614,14 @@ "repo": "tmalsburg/guess-language.el", "unstable": { "version": [ - 20190325, - 1436 + 20200309, + 707 ], "deps": [ "cl-lib" ], - "commit": "e64d88f287a547198e4c96e2fff543e103f2b456", - "sha256": "0dmbr7gylnc1dsjaldfw51nmli66lizs1w5a8p1zacpf7w5kf7x2" + "commit": "a0bacb4e3659db5808056e6235abc9f00570cecd", + "sha256": "13hqqfjwd69ycmn85rzjpr9qdjv6jvnx7dl555c934xwdlnw9c2d" } }, { @@ -40819,30 +40894,6 @@ "sha256": "1s06m8bam7wlhqw0gbc443lfrz51mj05pzvbmjzqadqn4240v4jw" } }, - { - "ename": "hack-time-mode", - "commit": "6481dc9f487c5677f2baf1bffdf8f2297185345e", - "sha256": "0vz72ykl679a69sb0r2h9ymcr3xms7bij1w6vxndlfw5v9hg3hk5", - "fetcher": "gitlab", - "repo": "marcowahl/hack-time-mode", - "unstable": { - "version": [ - 20190827, - 956 - ], - "commit": "74465859154314228482b4f41fcda726c82c71c9", - "sha256": "1q9k7r09y532fcvzjkgcqnk5hdms55hrshawgxhiz3qwxxc3svsi" - }, - "stable": { - "version": [ - 0, - 1, - 1 - ], - "commit": "df8e86ab04beb655bf5b3860f8bea41cf1fbc3eb", - "sha256": "1n4kirb65r4s8k2kiga857fk8zylk14ibq0k2vdx5b8axbz71ggh" - } - }, { "ename": "hacker-typer", "commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4", @@ -41615,8 +41666,8 @@ "helm-core", "popup" ], - "commit": "21e778bc8858b082ed45e3d0bb287ca9d13e101b", - "sha256": "14rcgdmb7vlxzkfprps2svzk8r9198fzzkkrls8cafw9zg4fimxg" + "commit": "fd429c68e7a73e9d398f7fe620ae16b7d6e3b0a7", + "sha256": "1l627nvmypx3j3qp5vkdh8vk56js2kb26na6w021np7j1wn3cjk9" }, "stable": { "version": [ @@ -42462,14 +42513,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20200207, - 1836 + 20200306, + 1417 ], "deps": [ "async" ], - "commit": "21e778bc8858b082ed45e3d0bb287ca9d13e101b", - "sha256": "14rcgdmb7vlxzkfprps2svzk8r9198fzzkkrls8cafw9zg4fimxg" + "commit": "fd429c68e7a73e9d398f7fe620ae16b7d6e3b0a7", + "sha256": "1l627nvmypx3j3qp5vkdh8vk56js2kb26na6w021np7j1wn3cjk9" }, "stable": { "version": [ @@ -43075,15 +43126,15 @@ "repo": "emacs-helm/helm-firefox", "unstable": { "version": [ - 20161202, - 1317 + 20200306, + 1408 ], "deps": [ "cl-lib", "helm" ], - "commit": "b290734807ee68e7a7aface2af781d86e1fd5950", - "sha256": "02m05fy5qf5xfd5dh402pibbzwzmcfgqymqigkbdfyjbfbljl3zx" + "commit": "7065e01188ed17b86a7b4f01b95ace575a15eef1", + "sha256": "0kk7d73hcrxcnsrq803zp5lh1hyk30nahb6wdlalqvkczksgpkml" }, "stable": { "version": [ @@ -44462,14 +44513,14 @@ "repo": "emacs-helm/helm-org", "unstable": { "version": [ - 20191229, - 635 + 20200311, + 633 ], "deps": [ "helm" ], - "commit": "8457e1e46227bf87726e05c42cec5a4b51c2ef7b", - "sha256": "0kcjhwwi492n9m2w894hvdavfvhj45zygy7bwvx103wvpay5h6h6" + "commit": "b7a18dfc17e8b933956d61d68c435eee03a96c24", + "sha256": "0sbk8c05v28xz7mdpzrlawn5iwf3hkkr1fj8lsi861l4fhjbmcap" }, "stable": { "version": [ @@ -45202,8 +45253,8 @@ "helm", "rtags" ], - "commit": "3d025d9c97359442f7190ec42a63ff7e5fd85a9a", - "sha256": "1c8llhbhvrv5kwmci7rlsjqv3gr4gxi45g6c21fqrblyhas95s3n" + "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5", + "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x" }, "stable": { "version": [ @@ -47319,6 +47370,30 @@ "sha256": "1zyd6350mbah7wjz7qrwyh9pr4jpk5i1v8p7cfmdlja92fpqj9rh" } }, + { + "ename": "hover", + "commit": "0dea54ebe452094c141e99f724a5fbfffe9381f0", + "sha256": "1vnxga7bbv96la2jjvh3r71j3fgaz59v81q7z5yixgn7vxrcvvc9", + "fetcher": "github", + "repo": "ericdallo/hover.el", + "unstable": { + "version": [ + 20200309, + 1550 + ], + "commit": "5d94d07b0213b45fc3b2d57362fd9bcb86a2fbe8", + "sha256": "1fkzlp92lqkwnld3hnfk3qywy7ssyfy03vjxxrisryhnyam9r87d" + }, + "stable": { + "version": [ + 1, + 0, + 3 + ], + "commit": "5d94d07b0213b45fc3b2d57362fd9bcb86a2fbe8", + "sha256": "1fkzlp92lqkwnld3hnfk3qywy7ssyfy03vjxxrisryhnyam9r87d" + } + }, { "ename": "howdoi", "commit": "d08f4d6c8bdf16f47d2474f92273fd214179cb18", @@ -47702,11 +47777,11 @@ "repo": "humanoid-colors/emacs-humanoid-themes", "unstable": { "version": [ - 20200209, - 1402 + 20200310, + 940 ], - "commit": "80eeceadc595899a7b87abccf33099c3d4a14d0a", - "sha256": "0ji1wxlfyjdrwkfphkn6yl3y57701a0ywqzxpjbb9k762i20qycr" + "commit": "57d7db70904faeeba9ccd0151e4ebf889403a40d", + "sha256": "0vxfq6gycgkfypyk91mwf2jg1mkldxpkd2v39j2nmlgbbw1ldaka" } }, { @@ -47732,11 +47807,11 @@ "repo": "nflath/hungry-delete", "unstable": { "version": [ - 20170412, - 102 + 20200309, + 209 ], - "commit": "0434458d3f6b2b585f332271feaa054bf4ec96d7", - "sha256": "04g8gdfqpzdhxf5rnl2k49f2klmzxwys79aib7xs30i0n8c8qb7d" + "commit": "4a341cfa3a19185c5ecb687970e299082e1144e3", + "sha256": "1gwksvvizz3kdpfzgwp45l1idjbrn8kz4jf0zx4fva20mh6mjz01" }, "stable": { "version": [ @@ -47867,15 +47942,15 @@ "repo": "abo-abo/hydra", "unstable": { "version": [ - 20200228, - 1830 + 20200306, + 913 ], "deps": [ "cl-lib", "lv" ], - "commit": "d2b921d067d7c7ea2f087b4d8edfdc37bcdf4af8", - "sha256": "1zsm7qhqj17wnx611rz6f917lvvj4ifz4vg4x144y8a5740pkihi" + "commit": "16fa8d109ec5799931a793b2e866ea9d593bee84", + "sha256": "1l6pi5ldmdcgv5qyg3kk1x8sxb639brzbfj0iddy5752hmg08g3h" }, "stable": { "version": [ @@ -48036,25 +48111,25 @@ "repo": "purcell/ibuffer-projectile", "unstable": { "version": [ - 20181202, - 352 + 20200304, + 2205 ], "deps": [ "projectile" ], - "commit": "76496214144687cee0b5139be2e61b1e400cac87", - "sha256": "0vv9xwb1qd5x8zhqmmsn1nrpd11cql9hxb7483nsdhcfwl4apqav" + "commit": "504b0edaa0d937ce60ccc8fdf09f2dae0a90fbaf", + "sha256": "18cqxnwzzbkcj9jcaw89b210432yzhrl1dwsv48p0jbhfnr17k41" }, "stable": { "version": [ 0, - 2 + 3 ], "deps": [ "projectile" ], - "commit": "8b225dc779088ce65b81d8d86dc5d394baa53e2e", - "sha256": "1zcnp61c9cp2kvns3v499hifk072rxm4rhw4pvdv2mm966vcxzvc" + "commit": "504b0edaa0d937ce60ccc8fdf09f2dae0a90fbaf", + "sha256": "18cqxnwzzbkcj9jcaw89b210432yzhrl1dwsv48p0jbhfnr17k41" } }, { @@ -48122,25 +48197,25 @@ "repo": "purcell/ibuffer-vc", "unstable": { "version": [ - 20181225, - 2227 + 20200304, + 2207 ], "deps": [ "cl-lib" ], - "commit": "64cb03887bcae6127e80f0d9342c33206e21d2d2", - "sha256": "1ayqa7l5ny7g01pb3917w2phnsdfw69scw3lk6bpa773pq00n2vi" + "commit": "1249c1e30cf11badfe032ac3b1058f24ba510ace", + "sha256": "1mgn7b786j4hwq1ks012hxxgvrfn5rz90adi2j190gmjz60rc5g5" }, "stable": { "version": [ 0, - 10 + 11 ], "deps": [ "cl-lib" ], - "commit": "b2bac7aa69335933ebb2e6f34259fa96d2c8d46a", - "sha256": "0bqdi5w120256g74k0j4jj81x804x1gcg4dxa74w3mb6fl5xlvs8" + "commit": "1249c1e30cf11badfe032ac3b1058f24ba510ace", + "sha256": "1mgn7b786j4hwq1ks012hxxgvrfn5rz90adi2j190gmjz60rc5g5" } }, { @@ -48380,16 +48455,16 @@ "repo": "DarwinAwardWinner/ido-completing-read-plus", "unstable": { "version": [ - 20200215, - 1841 + 20200310, + 25 ], "deps": [ "cl-lib", "memoize", "seq" ], - "commit": "46202cf953139332ea79b8904bc30166a9cc6148", - "sha256": "06h437hni3lh90qnxq2a489h6f312b11wfvrcj21jwbn2zxak1hb" + "commit": "98d3a6e56b1d3652da7b47f49f76d77f82ea80ba", + "sha256": "0rmqyxb0cr3avm6lzz26r2d9fmja2csrh3whmky8h2giz79mjf7d" }, "stable": { "version": [ @@ -49176,20 +49251,20 @@ "repo": "petergardfjall/emacs-immaterial-theme", "unstable": { "version": [ - 20200217, - 1302 + 20200308, + 1330 ], - "commit": "a0fd571723adcfc780fd31a3a4444e1d6edbb64d", - "sha256": "1xby0qsbv1maqs31lkaq6h8djm08cahsxkas8q0cvnlfvgxxim1d" + "commit": "19c46859e041a0c0e7f40a9157a6c4d0d660f441", + "sha256": "0nx1g7caypnkid7bzhm4gg44cmpikpz1qz1cp11y6rlq1lwrb1d9" }, "stable": { "version": [ 0, - 3, - 10 + 4, + 2 ], - "commit": "1a18584252a79553dbc3bbfd3b6612235661bad3", - "sha256": "1dvl52innx742pg4lls1dgx8avpg2k3kqll7x04alxkc9wk6ms73" + "commit": "19c46859e041a0c0e7f40a9157a6c4d0d660f441", + "sha256": "0nx1g7caypnkid7bzhm4gg44cmpikpz1qz1cp11y6rlq1lwrb1d9" } }, { @@ -49622,11 +49697,11 @@ "repo": "nonsequitur/inf-ruby", "unstable": { "version": [ - 20200228, - 2320 + 20200303, + 1736 ], - "commit": "fe1ea9925c6a6cfa7620fe13ea7769e264494749", - "sha256": "0zk4w3fwgashql8vx4ihn6zdfzn6206gklf74wn2b3k4awb9mj8b" + "commit": "e4ae089218bda49eb87beb2ca3593260e2fa3748", + "sha256": "1a3r1piljsrn2sbzkqjl6ffgygx6xjh6c7a7p85br84kq2ca4mfq" }, "stable": { "version": [ @@ -50740,11 +50815,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20200229, - 2136 + 20200311, + 1144 ], - "commit": "fcf5dcfd5796637d64164fd17956c5bc54e25612", - "sha256": "1hx00axmjfgc14ixj16pg7029zj7rsx2i80sw6f2bvp543l2aicq" + "commit": "5f1d9ce04599c52818244c2cb8cb066a601610b8", + "sha256": "1gsyf210jq4ij5r47k5sajpjq3z0rgihz84g6y3647k12a00biap" }, "stable": { "version": [ @@ -50806,8 +50881,8 @@ "repo": "wpcarro/ivy-clipmenu.el", "unstable": { "version": [ - 20200217, - 1656 + 20200302, + 1419 ], "deps": [ "dash", @@ -50815,8 +50890,8 @@ "ivy", "s" ], - "commit": "305ff456e700621e96b552f8e4857a7edc664518", - "sha256": "06pi64375bmmdal3pdhsv9j35jfizxciks9zwbvwc90k9wbgvxrf" + "commit": "ef25acf3f058fe1ede3a29fae2e9cdac8b08cd17", + "sha256": "1yzvaf95pncfi1r3xj8h6393dfvx291q3ahdwpp7qn3jh71kjx6k" } }, { @@ -51040,8 +51115,8 @@ "hydra", "ivy" ], - "commit": "fcf5dcfd5796637d64164fd17956c5bc54e25612", - "sha256": "1hx00axmjfgc14ixj16pg7029zj7rsx2i80sw6f2bvp543l2aicq" + "commit": "5f1d9ce04599c52818244c2cb8cb066a601610b8", + "sha256": "1gsyf210jq4ij5r47k5sajpjq3z0rgihz84g6y3647k12a00biap" }, "stable": { "version": [ @@ -51286,14 +51361,14 @@ "repo": "Yevgnen/ivy-rich", "unstable": { "version": [ - 20200214, - 504 + 20200308, + 331 ], "deps": [ "ivy" ], - "commit": "af43abad5c87b44a46ce74d57e54cad5112c22eb", - "sha256": "0qa6kj88dh4vrxiyxrd7jg231hkmw7mfk96jvxqyldvsagp5ybcc" + "commit": "0f22aff4c7d7d01bb11561578f5fcd7a2eaa7058", + "sha256": "0d8q58k5j0vzq8m2z7kc597ks93hq1x98svjkqzlvnak241yzkim" }, "stable": { "version": [ @@ -51323,8 +51398,8 @@ "ivy", "rtags" ], - "commit": "3d025d9c97359442f7190ec42a63ff7e5fd85a9a", - "sha256": "1c8llhbhvrv5kwmci7rlsjqv3gr4gxi45g6c21fqrblyhas95s3n" + "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5", + "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x" }, "stable": { "version": [ @@ -53046,19 +53121,19 @@ "repo": "JuliaEditorSupport/julia-emacs", "unstable": { "version": [ - 20191225, - 858 + 20200310, + 1429 ], - "commit": "5238f9adb7dd1c161fd6130435ebf0ac3755f33c", - "sha256": "1482wx9vhxvs1msdqmcv7hv31q57r2pkwij39rvscc3s046x61vr" + "commit": "b800403fada2b83bc98d6006cfd370e0cfd7876f", + "sha256": "1ay4wm303qh48h6g75di66w2f2smg5dnlqv40dgx4nhkyi68wrvg" }, "stable": { "version": [ 0, - 3 + 4 ], - "commit": "d21b83db56ae74d232dc2be2cd87810c5b8a6451", - "sha256": "0h4v227qdd7w0caigzbgjmjh6ddjlwgcd0g7s30ac45vdwr877lc" + "commit": "8bfc709716a257521cb386f20b8932e83db930a9", + "sha256": "1w131jb9mhvyjxa0p93iwfhzidgbcs6b8i6jg79yisqb9wchik99" } }, { @@ -53069,14 +53144,14 @@ "repo": "tpapp/julia-repl", "unstable": { "version": [ - 20191209, - 1051 + 20200310, + 1145 ], "deps": [ "s" ], - "commit": "b11a5729709c5ca541db2b6472b6579166723060", - "sha256": "0vb464y21jvqdkswz8hm8lm345fs811i6ns1zbwx7rz7bav4zlw5" + "commit": "5fa04de4e76e10d5ee37d4244f48ddae4503faa1", + "sha256": "1xnb3r5999ipkkvh7fl2kr0yy0j3vmnw7a6n23m9ps4fvy6hpl9n" }, "stable": { "version": [ @@ -53106,6 +53181,50 @@ "sha256": "182r7x7w3xnx7c54izz3rlz0khcwh7v21m89qpq99f9dvcs6273k" } }, + { + "ename": "julia-snail", + "commit": "4b80da8bdccaa0992deb07cef7ea4a582d9707ae", + "sha256": "0yljiqgamm5gjr1dbzjfqvnrijhgrpjd7gj8and1w33s1d2qh8gd", + "fetcher": "github", + "repo": "gcv/julia-snail", + "unstable": { + "version": [ + 20200310, + 2223 + ], + "deps": [ + "cl-lib", + "dash", + "julia-mode", + "parsec", + "s", + "spinner", + "vterm" + ], + "commit": "41cf7c0d14b053f93387090844d0409824f9cd45", + "sha256": "07brz5866qasp1yag3c81x1va4y3ffk56ka3iwgbg2j65wa4n3i5" + }, + "stable": { + "version": [ + 1, + 0, + 0, + -2, + 5 + ], + "deps": [ + "cl-lib", + "dash", + "julia-mode", + "parsec", + "s", + "spinner", + "vterm" + ], + "commit": "a614471cad3a133a00f77a7855407d506d94ce65", + "sha256": "01wdly6l0xkzqmqab529mhjc7mnijpv3f78cjnx0w0ak13srva93" + } + }, { "ename": "jumblr", "commit": "b47000c35a181c03263e85e8955eb4b4c9e69e4d", @@ -53238,8 +53357,8 @@ "repo": "dzop/emacs-jupyter", "unstable": { "version": [ - 20191019, - 1519 + 20200311, + 439 ], "deps": [ "cl-lib", @@ -53247,8 +53366,8 @@ "websocket", "zmq" ], - "commit": "9e3c1633586982e278f072dfaaabd115fa4d19f7", - "sha256": "08aig8b2xh9yr5dqj6jivv54vc93277xffmmd3q0k5ghf4087c8n" + "commit": "1546a72f570c7d3a6376d211d27002b2b11ddb40", + "sha256": "0jm4j45qr6np6qwnx9ffvcjvbsjz79d4s57vzvlajzfgl6c879vp" }, "stable": { "version": [ @@ -54559,14 +54678,11 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20200211, - 1819 + 20200310, + 2009 ], - "deps": [ - "transient" - ], - "commit": "fe9f51e678a8b74e1116bffd662abc3d504fc857", - "sha256": "1dhhpjjpxl0j18nq4h0pmkz9l55cdzd7kaxhvkr0r0mvhpa7d04m" + "commit": "4ba0a5f579525a9199421827221dc3786d2cc754", + "sha256": "17y5bslh3483q1vmc0y7lxgm7aaqxiyshkv41j9ga0c6jjrmalvl" }, "stable": { "version": [ @@ -54588,15 +54704,15 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20191231, - 1429 + 20200310, + 1832 ], "deps": [ "evil", "kubel" ], - "commit": "fe9f51e678a8b74e1116bffd662abc3d504fc857", - "sha256": "1dhhpjjpxl0j18nq4h0pmkz9l55cdzd7kaxhvkr0r0mvhpa7d04m" + "commit": "4ba0a5f579525a9199421827221dc3786d2cc754", + "sha256": "17y5bslh3483q1vmc0y7lxgm7aaqxiyshkv41j9ga0c6jjrmalvl" }, "stable": { "version": [ @@ -54796,11 +54912,11 @@ "repo": "ksjogo/labburn-theme", "unstable": { "version": [ - 20200206, - 1213 + 20200309, + 1556 ], - "commit": "ae3dafe552ab6f9d5b0760ace44555317e6c90c6", - "sha256": "1lx7ci0j5havhsymjr4mb4nnh71ajmviysmanjbbm6wsg470ig7r" + "commit": "d11537a2060df7e992217ede8f65d6c11de49458", + "sha256": "0aqdl3hq76r315h2h75lxgbyb7hw3hdg49n72frm1wx7hj372d0g" }, "stable": { "version": [ @@ -55410,14 +55526,14 @@ "repo": "DamienCassou/ledger-import", "unstable": { "version": [ - 20191126, - 2035 + 20200302, + 943 ], "deps": [ "ledger-mode" ], - "commit": "e32c4dd5952e3e5daa65eda5a22d508e97683409", - "sha256": "1p6n5vgpjmm1z6xq8f4yxf9w0r8wczlf0pa8qdfv7jmc50l58a2y" + "commit": "955e915fef9d46c968ef9101f7770870e2d2d80f", + "sha256": "018f7k4j8q1ka36winv2higjp8vmm90vss7vwyck9hg4w708m85p" }, "stable": { "version": [ @@ -55440,11 +55556,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20200229, - 1453 + 20200302, + 334 ], - "commit": "6286366e6074e048d2a997d971d4d1c350f6bc63", - "sha256": "1bkfmvq7a6bq3b94495cfzzlxdxdiwyjar5rn5z2hsw1dljc7380" + "commit": "8af289082331e40fdb6123b0145504f1c162cf09", + "sha256": "0i58vfcw30ryznji3pyi5lj5aclwi0h42fx7hzadrysjbvw3qscg" }, "stable": { "version": [ @@ -55931,8 +56047,8 @@ 20180219, 1024 ], - "commit": "8eacaf88ee7ef9445c767a032177a90711cb3ff7", - "sha256": "1334d09qsc5clcmkh1qi6mlph158ggf1p5kpsyl48vl1knj4ia9s" + "commit": "d083a9f0c74830bd77b794babb09fe0f0fdb3854", + "sha256": "1fgd2kfwh7gl4yxrmvv8yrv6wvvwy6y0nwibqqsy55698a1qb2fm" }, "stable": { "version": [ @@ -56200,8 +56316,8 @@ "repo": "abo-abo/lispy", "unstable": { "version": [ - 20200227, - 1354 + 20200305, + 1858 ], "deps": [ "ace-window", @@ -56210,8 +56326,8 @@ "iedit", "zoutline" ], - "commit": "c1286a2b41fa1f21c4f2ecdd5ba191805e04e268", - "sha256": "05vq28ziqamc0sysaa4zrljac4r0nq7j6a23m2vsf7nf8ymzff1c" + "commit": "c7e282ae06f654bf985466ae05dedc4efc87144d", + "sha256": "1gw03xwjwvgvp1m2nl3wmz3y6d2q6xqpawpdfw95kn4rpw1lsh4w" }, "stable": { "version": [ @@ -56624,8 +56740,8 @@ 20200221, 611 ], - "commit": "0048b6c4b4f948f08786f3fb06935aa3ce227368", - "sha256": "0mfqxjn0hhrm0w8wf7hf85g1i8b9ihnavkw870rmyfj8y8nnp8qb" + "commit": "70cfd34877272f132235d5ba779b883b3935dd37", + "sha256": "03ma0naf4yp7z60szngcazx2sbvqxam66jflkq1d16i52r1hg4bb" }, "stable": { "version": [ @@ -57196,15 +57312,15 @@ "repo": "emacs-lsp/lsp-haskell", "unstable": { "version": [ - 20191230, - 1847 + 20200309, + 2144 ], "deps": [ "haskell-mode", "lsp-mode" ], - "commit": "6d481f97e62b0fd2455e8f7a36429981277445b1", - "sha256": "0ljflzdjzsafgqqq9fdajrcm0rk4xaki2h5gbsbkgn8z65a2xh6h" + "commit": "582fa27c8894db888c92b5e53527b8deec82ea7f", + "sha256": "1jrvd8gnd7hc9xksryb35a2qzwwv7q6ncpcsb2l9ryfl5xd26i0a" } }, { @@ -57266,8 +57382,8 @@ "request", "treemacs" ], - "commit": "dbeeee9c74db25db217059011935b882f7ec1257", - "sha256": "1ra16rm61xwhp583ib1ran6bv0z353qs4aag75l809kyvq9szlyg" + "commit": "0cea6fd5e7b163766ddf47380d655771c1b070e5", + "sha256": "17d5xf2dzy1lnxm6cip0gmzrw37xv362fakn05nhkq5ygl7bhpz6" }, "stable": { "version": [ @@ -57346,8 +57462,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20200229, - 1850 + 20200311, + 612 ], "deps": [ "dash", @@ -57358,8 +57474,8 @@ "markdown-mode", "spinner" ], - "commit": "db3f7f022b6d8c509b5f5d84ff437840dc0fdaa1", - "sha256": "0p0fkby3i87zjjilv7pzbi1bkvr1gnrqpc4rrly2nn9pcrg5l16w" + "commit": "9f2333b1d5213f651af643ec5f2876bd987d7ab1", + "sha256": "01qnrnm2rscdc9gyld6lf3yfdyzb86rsdvjghm58nks7wbw7zb04" }, "stable": { "version": [ @@ -57568,8 +57684,8 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20200224, - 743 + 20200311, + 1837 ], "deps": [ "dash", @@ -57577,8 +57693,8 @@ "lsp-mode", "markdown-mode" ], - "commit": "bf3966e87c91c5d825c483ce0883f30dd2272b62", - "sha256": "0wapq3472cjdr1m47isv0lg61byanpb67k7cn9iyrlqp11y2xcjp" + "commit": "e91d52629c8c0934c9dfa924ea44aeaebe70097d", + "sha256": "0yq7768jnf5i68rla8sjyic5xihywyzfs8jxqbjlrrvz2m1mjr0r" }, "stable": { "version": [ @@ -57688,8 +57804,8 @@ 20200227, 1301 ], - "commit": "d2b921d067d7c7ea2f087b4d8edfdc37bcdf4af8", - "sha256": "1zsm7qhqj17wnx611rz6f917lvvj4ifz4vg4x144y8a5740pkihi" + "commit": "16fa8d109ec5799931a793b2e866ea9d593bee84", + "sha256": "1l6pi5ldmdcgv5qyg3kk1x8sxb639brzbfj0iddy5752hmg08g3h" }, "stable": { "version": [ @@ -58000,11 +58116,11 @@ "repo": "roadrunner1776/magik", "unstable": { "version": [ - 20200217, - 1213 + 20200304, + 1323 ], - "commit": "c42d7c084c1b928815cd665d1e42ea29b280853e", - "sha256": "0kgpynkqny8rj9ly6q72fgpv07sry92dda2v6wqhwd9nr84p1nkk" + "commit": "e54f934952cde3f96d6a131968295d993b3cf624", + "sha256": "1yivbgbcy5qvs55dn5lx08mbkmsd4mriymas9jgh7rn6hl14x8hj" }, "stable": { "version": [ @@ -58024,8 +58140,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20200228, - 1207 + 20200307, + 319 ], "deps": [ "async", @@ -58034,8 +58150,8 @@ "transient", "with-editor" ], - "commit": "c8cd22e28d20b0d7ae74102df4e35d7c0c61ebe6", - "sha256": "134n9m2zrf60ljm867bv92qjgk61cmgns1a3cqpvj4wflpaahnbv" + "commit": "1916e83aa463fee86ac1c6bcfd80d780d0544901", + "sha256": "1bnykbb868dna4j91kp5jzi7ab4siiy1ni228x8i50cmfm4i91in" }, "stable": { "version": [ @@ -58362,8 +58478,8 @@ "libgit", "magit" ], - "commit": "c8cd22e28d20b0d7ae74102df4e35d7c0c61ebe6", - "sha256": "134n9m2zrf60ljm867bv92qjgk61cmgns1a3cqpvj4wflpaahnbv" + "commit": "1916e83aa463fee86ac1c6bcfd80d780d0544901", + "sha256": "1bnykbb868dna4j91kp5jzi7ab4siiy1ni228x8i50cmfm4i91in" } }, { @@ -58443,14 +58559,14 @@ "repo": "magit/magit-popup", "unstable": { "version": [ - 20200102, - 1811 + 20200306, + 223 ], "deps": [ "dash" ], - "commit": "df9abf1a1bce3fadb5e0657eb8f4c7026efa3c69", - "sha256": "1ifhph1mj7wjar62d65fjx45qsjwsyslbj7liih3v0r4by5gyxmw" + "commit": "f316a085b9f66804692554df46c0f4f536a45b78", + "sha256": "1d650wny0201vh4hmkmx290rq0b2fnlwlb8ivys7mai9d380vlwi" }, "stable": { "version": [ @@ -58517,8 +58633,8 @@ "deps": [ "dash" ], - "commit": "c8cd22e28d20b0d7ae74102df4e35d7c0c61ebe6", - "sha256": "134n9m2zrf60ljm867bv92qjgk61cmgns1a3cqpvj4wflpaahnbv" + "commit": "1916e83aa463fee86ac1c6bcfd80d780d0544901", + "sha256": "1bnykbb868dna4j91kp5jzi7ab4siiy1ni228x8i50cmfm4i91in" }, "stable": { "version": [ @@ -58622,8 +58738,8 @@ "repo": "alphapapa/magit-todos", "unstable": { "version": [ - 20200204, - 823 + 20200310, + 28 ], "deps": [ "async", @@ -58634,14 +58750,14 @@ "pcre2el", "s" ], - "commit": "ad5663aa26fad147f1afbd878cbe21a064ba5745", - "sha256": "1naqyl9qy15nkjz41l8pzqy79bkm7cp5ih63ji8ycq416400pia1" + "commit": "a0e5d1f3c7dfcb4f18c1b0d57f1746a4872df5c6", + "sha256": "0v11ngxwndaylmzqm5rrvch7hsfcm15xhih13ckm6kn2skqdzh40" }, "stable": { "version": [ 1, 5, - 1 + 2 ], "deps": [ "async", @@ -58652,8 +58768,8 @@ "pcre2el", "s" ], - "commit": "ad5663aa26fad147f1afbd878cbe21a064ba5745", - "sha256": "1naqyl9qy15nkjz41l8pzqy79bkm7cp5ih63ji8ycq416400pia1" + "commit": "65db450bdb766f12e5aa31ae1cecbc0716e07218", + "sha256": "0a4ghad93nmk4i0aq25c3g5lwxi7z327v0z10zi8yyja5daipsdp" } }, { @@ -58764,16 +58880,16 @@ "repo": "ThibautVerron/magma-mode", "unstable": { "version": [ - 20181205, - 1708 + 20200305, + 2108 ], "deps": [ "cl-lib", "dash", "f" ], - "commit": "9b734abbdf15fddecb58dc9eed1cbc39b78be2e1", - "sha256": "0nmakba9gszi251z962jlggw9mbsk8jxyynangsd1yj4bdfs6sgg" + "commit": "7cdfa21495b20cd9e2697ea1475ca3ec69fab0b4", + "sha256": "1brwlbbyfb357vf0l0wf30yk9s66fhl3l2ncg840p6xpw9kk0dnc" } }, { @@ -58818,15 +58934,15 @@ "repo": "jerrypnz/major-mode-hydra.el", "unstable": { "version": [ - 20191014, - 337 + 20191030, + 2354 ], "deps": [ "dash", "pretty-hydra" ], - "commit": "fd362d2be7ed80889715ed8a30a61780a18ce6ea", - "sha256": "0vnmvpsm46izxlh0l0p89rhy6ifzzfpzk7j3kkf2608s6dy8hgcy" + "commit": "20362323f66883c1336ffe70be24f91509addf54", + "sha256": "16krmj2lnk7j5ygdjw4hl020qqxg11bnc8sz15yr4fpy1p7hq5cz" }, "stable": { "version": [ @@ -59655,6 +59771,21 @@ "sha256": "0r005yap50jf6b5jc7314ds17g1nn2irn1agidi74fbrwfbndxgm" } }, + { + "ename": "masm-mode", + "commit": "3f1961f11a811045095db15d650eae7469d8670c", + "sha256": "0zlc8gc0xdqgzs1ywix236wh5nfnsmab9s9x1hpfpzkg6sjzv8wr", + "fetcher": "github", + "repo": "YiGeeker/masm-mode", + "unstable": { + "version": [ + 20200308, + 1450 + ], + "commit": "626b9255c2bb967a53d1d50be0b98a1bcae3250c", + "sha256": "1k6wcksddy0k02hrqfaifr61c09pg6kpcqpmfm9zkb444pdqjn17" + } + }, { "ename": "mastodon", "commit": "809d963b69b154325faaf61e54ca87b94c1c9a90", @@ -60066,11 +60197,11 @@ "repo": "techquila/melancholy-theme", "unstable": { "version": [ - 20190620, - 1001 + 20200305, + 133 ], - "commit": "3140860d0b310b6ff51b0df11de992cd65135692", - "sha256": "1hp2ndbiqlb1p86m437r34rvrzsy8ag0bzvkiz4zf5rgvm8y48sk" + "commit": "ffed56cb756f8acba93ce7edc664c950d75927d9", + "sha256": "1wcvd68dm453rvhjm89vv2faljgyszwyc4g95q7ydvhk3h1gck2p" } }, { @@ -60225,8 +60356,8 @@ 20191025, 851 ], - "commit": "077385b3f9f3050678963d47c56e18aecc9f8b28", - "sha256": "1p926jsajhn10679gbsj0lgmfvz8q5mxx0w326qni7y9mmrxvsni" + "commit": "a3eb8ce9a52d48cb521eb2c01297fd224ccf25ee", + "sha256": "0i8nxaqb2icw0arbjin23p1ah6p9v4dbvrdr7sak3fm7hxv1v7yi" }, "stable": { "version": [ @@ -60403,17 +60534,17 @@ 20191018, 242 ], - "commit": "4fa095ff8416d1759ffd9cbd01d667cff386bbb5", - "sha256": "171fsvzk0msvz1052034g60prf40w6qdkglg560v73iika8x2k4s" + "commit": "0177fc4e7edd705db59b82c83a24db51dc405890", + "sha256": "1whl7kz4im2jmdz99336wfn152q0l3qwii4w7sn45rlsm2sijiw1" }, "stable": { "version": [ 1, 1, - 5 + 8 ], - "commit": "2e28cf362b7e4a8b6a5bbaf60983a72e19798c8b", - "sha256": "0lal6d4a4pbni1xl3g1gb3rnmyz2kym9r1mhb2n14awqqxxg7l3q" + "commit": "0177fc4e7edd705db59b82c83a24db51dc405890", + "sha256": "1whl7kz4im2jmdz99336wfn152q0l3qwii4w7sn45rlsm2sijiw1" } }, { @@ -60434,6 +60565,21 @@ "sha256": "1jy07b1am1g4hwiwywmi9iyidv3yp933j2y4f9nmfhpb4yjs193y" } }, + { + "ename": "metronome", + "commit": "2f77239fecb41487a6aa03e6fc219cba96dee18d", + "sha256": "1kkm7s6hiyk3h1bnf9pfnsikmfpp998041wg0bwqnpzhzzlq6fy4", + "fetcher": "gitlab", + "repo": "jagrg/metronome", + "unstable": { + "version": [ + 20200309, + 1918 + ], + "commit": "ab9478da0da3aadba26c65beba938c3928c823c3", + "sha256": "0qrjyn2qc5k5a6gz1m1izx315sy7dd0cdzgiyrwp8za39gkhgbl7" + } + }, { "ename": "mew", "commit": "362dfc4d0fdb3e5cb39564160de62c3440ce182e", @@ -60687,25 +60833,25 @@ "repo": "kiennq/emacs-mini-modeline", "unstable": { "version": [ - 20200131, - 312 + 20200309, + 413 ], "deps": [ "dash" ], - "commit": "8762d2ec5de2994f05a2a11f505d0963eb28e59e", - "sha256": "0dc9frairj081g326b64mddr3knpxhwvmn19w7m1ckmxbv7lg0in" + "commit": "4d97bf35cf0f9d58b14d13a78172c15463820382", + "sha256": "0cqzqrc8wpxav08fx9n1ljpzf97hj3wdhizywj4avnyxj3g63zwi" }, "stable": { "version": [ - 20200131, - 312 + 20200308, + 730 ], "deps": [ "dash" ], - "commit": "8762d2ec5de2994f05a2a11f505d0963eb28e59e", - "sha256": "0dc9frairj081g326b64mddr3knpxhwvmn19w7m1ckmxbv7lg0in" + "commit": "aece47d83b4fe24942eb9a3f748f60c3c0f69a56", + "sha256": "18inykf5wx767kkqjjc5bzdy8rqyqg0y7q2r6lxxmph06mbw1wva" } }, { @@ -60925,17 +61071,17 @@ }, { "ename": "minsk-theme", - "commit": "36546342769ce5b6487a9b9ca3ec48bc81b6c880", - "sha256": "0cxwrc8nw7kkpc3z2pa7qmkyamsbsnfs93ybflv3z1wzp6z9q1b8", + "commit": "2f78d25a094cfa5d5a6dad2f0c6d051138b8744b", + "sha256": "1sf93ycd6a1p4xf1bhgjbqd4y38v1b4qgf0mh6pag2xz93jr7lw5", "fetcher": "github", "repo": "jlpaca/minsk-theme", "unstable": { "version": [ - 20200102, - 1829 + 20200306, + 1220 ], - "commit": "2ad8e88530fb0b66b5798ff8d692144691c93891", - "sha256": "16fyqw79vfdklzibqc0j78d6ws77naxz7yj1iahp3wcwqlwln545" + "commit": "d1e04ca03aadb942dc4bee82f44848c3ce52b25c", + "sha256": "1yrjmyh8a0xqijyg16v20iqh13s7j4pf410f0214a4m9lp07pxpx" } }, { @@ -60985,11 +61131,11 @@ "repo": "jabranham/mixed-pitch", "unstable": { "version": [ - 20191023, - 1025 + 20200310, + 130 ], - "commit": "fbc566ace3ed7508dab6bec90ba185f21c829aab", - "sha256": "0175w364alym0qvvqlsgmy0j100pzdx5j1ck07hif3k5bs69q22i" + "commit": "60907165f118648d658572c578f9fd642bd42beb", + "sha256": "0icflm968n89p6kayy8rxm5sll4pxqlnk5pfqq648y3zg273lfk6" }, "stable": { "version": [ @@ -61384,20 +61530,20 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20200228, - 1019 + 20200311, + 1733 ], - "commit": "e1b2d0a6235c26ce9e8ca7085393eeff20408378", - "sha256": "0cjbvqnw2xhvrzihzywbb5x568vrmxwmrq2rzdm1bw2596ycrnd3" + "commit": "23c67bcb185951e3d9e4b90669e5c1ea4c80c7ba", + "sha256": "120v3m9ljcsznbmqdl4c5blv4ry3qckrqk2p917dk3z21zbll05q" }, "stable": { "version": [ 0, - 4, + 6, 0 ], - "commit": "ed89fbe217fc1a754d9de5f3e6b22b43fca284af", - "sha256": "0c4y3y9mjf6x2b9087fk6nkxvgvm9f5l1p2vdwqny80vp4krsb8r" + "commit": "a9d1ae86522f158eea2410571ec992775e04b284", + "sha256": "15z6qq0b0npp7hscmh04i3mi10bynzdy52fv2b160nji264zvcwa" } }, { @@ -61408,20 +61554,20 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20200228, - 1019 + 20200311, + 1733 ], - "commit": "e1b2d0a6235c26ce9e8ca7085393eeff20408378", - "sha256": "0cjbvqnw2xhvrzihzywbb5x568vrmxwmrq2rzdm1bw2596ycrnd3" + "commit": "23c67bcb185951e3d9e4b90669e5c1ea4c80c7ba", + "sha256": "120v3m9ljcsznbmqdl4c5blv4ry3qckrqk2p917dk3z21zbll05q" }, "stable": { "version": [ 0, - 4, + 6, 0 ], - "commit": "ed89fbe217fc1a754d9de5f3e6b22b43fca284af", - "sha256": "0c4y3y9mjf6x2b9087fk6nkxvgvm9f5l1p2vdwqny80vp4krsb8r" + "commit": "a9d1ae86522f158eea2410571ec992775e04b284", + "sha256": "15z6qq0b0npp7hscmh04i3mi10bynzdy52fv2b160nji264zvcwa" } }, { @@ -61918,11 +62064,11 @@ "repo": "wyuenho/move-dup", "unstable": { "version": [ - 20190408, - 1246 + 20200311, + 1424 ], - "commit": "19f1c075d939084279b190c38412b4cfda96840d", - "sha256": "0rb9x00dygf0v5xk6gljdn0lvkgzyl129b5i4jpxz0ylccckd0xn" + "commit": "7a384e0e0889e07a9a81d007d8ccc654c7c89bd2", + "sha256": "040xg9bbficz300zqrnvk68b76ljnif9sdiag03hp61xqpzxmacm" }, "stable": { "version": [ @@ -62459,14 +62605,14 @@ "repo": "agpchil/mu4e-maildirs-extension", "unstable": { "version": [ - 20180606, - 812 + 20200302, + 1228 ], "deps": [ "dash" ], - "commit": "3ef4c48516be66e73d24fe764aadbcfc126b7964", - "sha256": "04nf947sxkir3gni67jc5djhywkmay1l8cqkicayimrh3vd5cy05" + "commit": "bd81c3e1c1f690b124937960acd2a819e9a2483e", + "sha256": "0v6aih6gqzg631kpqrqgkj8nw6d7i5ih2qnmraf3i29m5y6gqync" }, "stable": { "version": [ @@ -64093,8 +64239,8 @@ 20181024, 1439 ], - "commit": "2ca4c711f77d9cb95e3698de70d07823f4baa256", - "sha256": "1g53dfs7dycihh98lsril6b57v5mfkqhicy74d3jpkyny7zpshaz" + "commit": "1f3cc7b7207309c441ce5bf120b57081bbea0c18", + "sha256": "1y19f8qqd5bvkrpr3b8d18ff8qdi4j0fgha4dkb7zgjhi0rb9nb7" }, "stable": { "version": [ @@ -64347,8 +64493,8 @@ "repo": "dickmao/nnhackernews", "unstable": { "version": [ - 20200225, - 1605 + 20200310, + 855 ], "deps": [ "anaphora", @@ -64356,8 +64502,8 @@ "dash-functional", "request" ], - "commit": "2fbe9052d93fa7b8fca107aa0dfaebbdf734c95c", - "sha256": "0c09hdr79i701gjalav6vj9k7qp8w5ln4s3ji2hk6z03fqpf7g91" + "commit": "ac896a7becd1dcfded728a36ce13cf7dcd823e04", + "sha256": "02gv1kc46aa7sbalh02sphaq50kgi055803cnxjbjvlqhlmwc2cw" } }, { @@ -64383,8 +64529,8 @@ "repo": "dickmao/nnreddit", "unstable": { "version": [ - 20200225, - 1558 + 20200301, + 1930 ], "deps": [ "anaphora", @@ -64393,8 +64539,8 @@ "request", "virtualenvwrapper" ], - "commit": "13c6bc1db743f047a952d023be6c2b982a0e95bf", - "sha256": "13qzgvpngja3cd9fkarx7scsvna97fz79snai3ap4qfy5d9gqyqh" + "commit": "a7e6a3b93949da0a1cf91318ce8bd8cf5cfb2216", + "sha256": "0mcj4bdzhin9ibp3m6rrhqh54a2n07ck25djka3apqyd16dvx2y2" } }, { @@ -64420,14 +64566,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20200123, - 1753 + 20200309, + 533 ], "deps": [ "cl-lib" ], - "commit": "14ed8ed2a2d8ae700ce1889d76bc4588d22549b1", - "sha256": "0gdnvvlrakyi1xpvlxr55k0rjnb6fprrc7pwjzpl79j87srrj9k0" + "commit": "05ef102cffd2f32061eacf2d379663122257f5b1", + "sha256": "0c75arxqb8p3bp1nasfcwy32al4ys3jv68q48dnc2addvjmld42g" }, "stable": { "version": [ @@ -66224,14 +66370,14 @@ "repo": "clemera/objed", "unstable": { "version": [ - 20200107, - 1319 + 20200311, + 1229 ], "deps": [ "cl-lib" ], - "commit": "8dc17701d1dc65b5d2113e7ca406136bf612bc9e", - "sha256": "1ly7lkv27n7dp8q25w5yk8a69vqzmxp72ln329j7ik13rjyhj1dc" + "commit": "31c5dedd265ac3cdb0636460325ea9f7e1a26f60", + "sha256": "0gb71fzycmrqg0gyl2ahf2w82gapazrb6ddbk6wvylsaaf5ml217" }, "stable": { "version": [ @@ -66442,26 +66588,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20200124, - 1310 + 20200308, + 1805 ], "deps": [ "org-re-reveal" ], - "commit": "64235b073c47baf7f1d7909706875c42a7f6da3d", - "sha256": "124f98q8bcd832wsdkmzm3rjmmhpqyf8z5ddx841j6p68ds8066r" + "commit": "9313251afc74536792f90423b3189180c632e1e4", + "sha256": "0dk151cy5fng75inknq4g24qvh9q0fzyak77qdkip3lsy670vlg1" }, "stable": { "version": [ 2, - 2, - 0 + 4, + 1 ], "deps": [ "org-re-reveal" ], - "commit": "64235b073c47baf7f1d7909706875c42a7f6da3d", - "sha256": "124f98q8bcd832wsdkmzm3rjmmhpqyf8z5ddx841j6p68ds8066r" + "commit": "9313251afc74536792f90423b3189180c632e1e4", + "sha256": "0dk151cy5fng75inknq4g24qvh9q0fzyak77qdkip3lsy670vlg1" } }, { @@ -66524,20 +66670,20 @@ "repo": "rnkn/olivetti", "unstable": { "version": [ - 20200212, - 1439 + 20200311, + 527 ], - "commit": "4b113151308c1214e8e70a7846558dad9c918859", - "sha256": "0cb06dy22897nx0wakar24frdhg5865icj25a2wb198br8r094ik" + "commit": "67e32a7754cda4c8d94227e80bfa708abb4e8e6d", + "sha256": "0928kn9yfwc2mhmja13y39iswlkk474xnszh9qza206j6r37h6p3" }, "stable": { "version": [ 1, 9, - 2 + 3 ], - "commit": "4b113151308c1214e8e70a7846558dad9c918859", - "sha256": "0cb06dy22897nx0wakar24frdhg5865icj25a2wb198br8r094ik" + "commit": "67e32a7754cda4c8d94227e80bfa708abb4e8e6d", + "sha256": "0928kn9yfwc2mhmja13y39iswlkk474xnszh9qza206j6r37h6p3" } }, { @@ -66587,30 +66733,30 @@ "repo": "AdrieanKhisbe/omni-log.el", "unstable": { "version": [ - 20170930, - 1235 + 20200304, + 2229 ], "deps": [ "dash", "ht", "s" ], - "commit": "11e959473c1bd9415d0cda785940c36ba6ad44ab", - "sha256": "081vq3wzl8w9yz1356np6h27d7yi5j8i3va9sc2flfwylmw1y9gr" + "commit": "0a240660ccdd0b6588b4e3c322743b5ab1161338", + "sha256": "0xbrwj7zsqx91p28l3dknlhr3y5cj6lah6h5x1s9l9kmfz850dcp" }, "stable": { "version": [ 0, - 3, - 6 + 4, + 0 ], "deps": [ "dash", "ht", "s" ], - "commit": "20021eb788cbeec0371145468430b259686f519d", - "sha256": "1sf2zbhjaz5b9xmz6632338cga7d326ibgw8b8c6c6b4vk16yhqc" + "commit": "0a240660ccdd0b6588b4e3c322743b5ab1161338", + "sha256": "0xbrwj7zsqx91p28l3dknlhr3y5cj6lah6h5x1s9l9kmfz850dcp" } }, { @@ -66621,8 +66767,8 @@ "repo": "AdrieanKhisbe/omni-quotes.el", "unstable": { "version": [ - 20170425, - 1832 + 20200304, + 2341 ], "deps": [ "dash", @@ -66631,14 +66777,14 @@ "omni-log", "s" ], - "commit": "454116c1dd6581baaeefd6b9310b1b6b7a5c36d0", - "sha256": "1h8lrpi5wizi5vncdz83cxlx7c71xw3sw89sfg462zfbz2sq8afl" + "commit": "cfc7b7f01628a5d57384820d1096de4541e67cdf", + "sha256": "1bv45gdyzycapi9q69h3339308qxwgjzj5rgr3f927vl4xm18kfb" }, "stable": { "version": [ 0, 5, - 0 + 1 ], "deps": [ "dash", @@ -66647,8 +66793,8 @@ "omni-log", "s" ], - "commit": "454116c1dd6581baaeefd6b9310b1b6b7a5c36d0", - "sha256": "1h8lrpi5wizi5vncdz83cxlx7c71xw3sw89sfg462zfbz2sq8afl" + "commit": "cfc7b7f01628a5d57384820d1096de4541e67cdf", + "sha256": "1bv45gdyzycapi9q69h3339308qxwgjzj5rgr3f927vl4xm18kfb" } }, { @@ -67753,14 +67899,14 @@ "repo": "abo-abo/org-download", "unstable": { "version": [ - 20200211, - 1541 + 20200311, + 1049 ], "deps": [ "async" ], - "commit": "3c4810279334d487c76fb5e23e6e6cd098ccd6ac", - "sha256": "1xc98xbkrj56gp3njmbqnkvkigbgqjqfyiacrnqf9fkznwvjhrrp" + "commit": "b96fd7ba02cbdae95cc37970ebcfae8afa8b25d2", + "sha256": "1fx621ll5kjw10n2xhba7h39m1cqvink61kyhb228p6h8cl63kss" }, "stable": { "version": [ @@ -68252,11 +68398,11 @@ "repo": "bastibe/org-journal", "unstable": { "version": [ - 20200227, - 1830 + 20200311, + 710 ], - "commit": "271b99f5ec4fa45fdf546713a9c3f55543e9cbb9", - "sha256": "1ayqxcfbs3mcygwjyx93lclpp1dhqaq35v7bl8739d59i0drsyhq" + "commit": "664c08e12cde19ce7dca645ba9accecda7266c32", + "sha256": "02gla6cs8w08jg8czl5855vxvs1jyxq839rh9f95d40x4jgc1rwy" }, "stable": { "version": [ @@ -68535,14 +68681,14 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20200221, - 25 + 20200303, + 1716 ], "deps": [ "htmlize" ], - "commit": "4278cf11735a2890e22acf6d34c632dd64a2e5a4", - "sha256": "1fyr5z441bncgnazwgbpfk5bd4k5p9nh525sfdxzw6w8s26i8pnw" + "commit": "2f521a89b106750ebafa94503cdeb043a02c5ab5", + "sha256": "1wr8qdkf75swf4jfqbv0r2hw7d5bw73nyyv7xa0msbc1hyw33b6l" } }, { @@ -68945,11 +69091,11 @@ "repo": "marcowahl/org-pretty-tags", "unstable": { "version": [ - 20200124, - 2002 + 20200303, + 2201 ], - "commit": "f52744ab69a9077450c84b80475147d7c435f4bb", - "sha256": "1nycdawb065c8cakmlfpcqpkyij0kv1c940mi49ps2k58nz4554x" + "commit": "40fd72f3e701e31813f383fb429d30bb88cee769", + "sha256": "0d80cbkdq1d8cqc5nv732gzw4k6m2dpjjix3ycfyf27m4wkbwhmc" }, "stable": { "version": [ @@ -69081,8 +69227,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20200228, - 203 + 20200309, + 2240 ], "deps": [ "dash", @@ -69097,8 +69243,8 @@ "transient", "ts" ], - "commit": "fc91bdd4836a026ae5b5df18ed133f85cf3ff138", - "sha256": "1li9x44zd63s4xvhhimvnq6nd995hyhdrzybcxhvyr1qbqgnga5i" + "commit": "1688774dddae45b7b77420d01c0eb56d76dd0c95", + "sha256": "12pwi4sd4lfrgbzrj91cq2d9kp5ql0c2nqda7x6x94x9z1h5xfh8" }, "stable": { "version": [ @@ -69204,8 +69350,8 @@ "htmlize", "org" ], - "commit": "14df7542f2a675f65501962e344e03d798cf0d39", - "sha256": "1mc01v257884pdsw37dghgddyyy6v6rd9cmnnpq45xvd5ibz1vaf" + "commit": "e4460a98b6bfa01720c287a171252f49c1949801", + "sha256": "0hhwc6yfy69qwiyxca8r12rdxvrj44vzdsnvdk0yc9szsfnmn4hz" }, "stable": { "version": [ @@ -69316,8 +69462,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20200225, - 246 + 20200309, + 1231 ], "deps": [ "dash", @@ -69331,8 +69477,8 @@ "pdf-tools", "s" ], - "commit": "caca18f8eeae213c2719e628949df70910f7d3c7", - "sha256": "0w31xjyyn2122c7n3s3rs64wgmhb82q49hqsy48m7ynkm9x9a0jq" + "commit": "e3eb9215a540ba62a0b0253d003c704b7740deeb", + "sha256": "152wzlavx5b4ap9wdl3dql5idvsjl5zq6zjwcilp9pni6dn34w12" }, "stable": { "version": [ @@ -69527,8 +69673,8 @@ "repo": "alphapapa/org-sidebar", "unstable": { "version": [ - 20191012, - 514 + 20200310, + 35 ], "deps": [ "dash", @@ -69538,13 +69684,13 @@ "org-super-agenda", "s" ], - "commit": "b5eff7195718e6a70a42d36e48800632080aab0c", - "sha256": "138hbcmkxmmdcagdv438946cr4qkwklqqwf2b1khi8gimnnivsxm" + "commit": "41b914c7bdc5a12c9289b134822bdfea0889ac9e", + "sha256": "1mggpxbzprmmbkiv3xklw1saafsi153n4spr4l0m59lgm4gpymgj" }, "stable": { "version": [ 0, - 2 + 3 ], "deps": [ "dash", @@ -69554,8 +69700,8 @@ "org-super-agenda", "s" ], - "commit": "9634320a6f9ab919119e08a14853c31387f38ce3", - "sha256": "106h06vjfbqfj761vbxwymd6612ds8c6fk053yzgbrqzm3hn2c03" + "commit": "41b914c7bdc5a12c9289b134822bdfea0889ac9e", + "sha256": "1mggpxbzprmmbkiv3xklw1saafsi153n4spr4l0m59lgm4gpymgj" } }, { @@ -69726,8 +69872,8 @@ "repo": "alphapapa/org-super-agenda", "unstable": { "version": [ - 20200129, - 16 + 20200310, + 1337 ], "deps": [ "dash", @@ -69736,8 +69882,8 @@ "s", "ts" ], - "commit": "ab9c335f9738853c52aae9b946f50e8b6c46a1e0", - "sha256": "1l1k7jbn1n1qp5q5h174sdwpqhh8l5zbg9flk1pwaxzq88103gy5" + "commit": "dd0d104c269fab9ebe5af7009bc1dd2a3a8f3c12", + "sha256": "0kx9sikk7c3j0zp3a31kj8zv2kjxqjhhl25n7c7nslf2fp5w2d8b" }, "stable": { "version": [ @@ -69755,6 +69901,36 @@ "sha256": "1ghwap34y4gvwssqv3sfqa8wn9jh6pawc7xnkhm1qxmvs53gxbg6" } }, + { + "ename": "org-superstar", + "commit": "1e49a3cc1006f271ce53f03717b0484a4fd89957", + "sha256": "0rbmrdc7ghcwk5y4jkgf7axwknck85l4xl03kwbkmnac0w98zzlj", + "fetcher": "github", + "repo": "integral-dw/org-superstar-mode", + "unstable": { + "version": [ + 20200311, + 1848 + ], + "deps": [ + "org" + ], + "commit": "715a9681d31968807df349280f96932f1a986f37", + "sha256": "0klq0khb59hmkwhay0dln5zhii8mbk3d7rn7rddixrrh5x5ghrlv" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "deps": [ + "org" + ], + "commit": "2f9f9d6b21cb54c2ce6af15ab0e3c73e2b962d78", + "sha256": "0q6180qwjpha10zsiw0ni6lanyjwlj8141a6qivfcs8nwczz7nvz" + } + }, { "ename": "org-sync", "commit": "923ddbaf1a158caac5e666a396a8dc66969d204a", @@ -70332,8 +70508,8 @@ "repo": "org2blog/org2blog", "unstable": { "version": [ - 20200301, - 501 + 20200303, + 418 ], "deps": [ "htmlize", @@ -70341,14 +70517,14 @@ "metaweblog", "xml-rpc" ], - "commit": "4fa095ff8416d1759ffd9cbd01d667cff386bbb5", - "sha256": "171fsvzk0msvz1052034g60prf40w6qdkglg560v73iika8x2k4s" + "commit": "0177fc4e7edd705db59b82c83a24db51dc405890", + "sha256": "1whl7kz4im2jmdz99336wfn152q0l3qwii4w7sn45rlsm2sijiw1" }, "stable": { "version": [ 1, 1, - 5 + 8 ], "deps": [ "htmlize", @@ -70356,8 +70532,8 @@ "metaweblog", "xml-rpc" ], - "commit": "2e28cf362b7e4a8b6a5bbaf60983a72e19798c8b", - "sha256": "0lal6d4a4pbni1xl3g1gb3rnmyz2kym9r1mhb2n14awqqxxg7l3q" + "commit": "0177fc4e7edd705db59b82c83a24db51dc405890", + "sha256": "1whl7kz4im2jmdz99336wfn152q0l3qwii4w7sn45rlsm2sijiw1" } }, { @@ -70501,11 +70677,11 @@ "repo": "kostafey/organic-green-theme", "unstable": { "version": [ - 20191125, - 1630 + 20200301, + 1916 ], - "commit": "15746df5f3af5ee308cd4f546ef229eef2d825ac", - "sha256": "100axl6ajddfw23lr98k8b05zrd4hajcq68mi90vddqbn06mk577" + "commit": "9374259e1b22d68f30a1f5376052ab09dbad606d", + "sha256": "13jpfn4sjsw0lssrq0n75085j2g41ppmwky5mq0nyv8j0c0mmqpk" } }, { @@ -70896,11 +71072,11 @@ "repo": "purcell/osx-location", "unstable": { "version": [ - 20150613, - 917 + 20200304, + 2209 ], - "commit": "8bb3a94cc9f04b922d2d730fe08596cc6ee12bf2", - "sha256": "09hjcpmh0fxhsx63vcaz05w94xcc8q35vgffggjqaybs7hyzlx69" + "commit": "18fcc306caa575c5afdeaf091aa1a9b003daa52a", + "sha256": "0n59mf0qx78d4qb071qgbvd50vzkn3xffwgxjwjv90193h99qdnj" }, "stable": { "version": [ @@ -71483,14 +71659,14 @@ "repo": "kaushalmodi/ox-hugo", "unstable": { "version": [ - 20200122, - 2049 + 20200305, + 1413 ], "deps": [ "org" ], - "commit": "16f1b0c9a9e01bdc3582284f570be5fd70004e03", - "sha256": "0z6cz93kcr7h3yag36m58mmncp6klyalqprj4ifpk9wj3802yyyi" + "commit": "1c1e3ec46785d93f4de2e71fc32604bd7c0fed40", + "sha256": "1cgwpj9x10z6y9ykbma39xakzisly5jhp5pkdiwrc5zq5psr2ddx" }, "stable": { "version": [ @@ -71794,14 +71970,14 @@ "repo": "yjwen/org-reveal", "unstable": { "version": [ - 20200216, - 1516 + 20200304, + 937 ], "deps": [ "org" ], - "commit": "aafedfd8052d1ac4b0ddf946b3258a3b5ae5bbbe", - "sha256": "1hiidlagr7y3l22xwk4nd7m6c83j2vlhyijb0hmw89casfsdixbj" + "commit": "0d947cbce655cadb035e3b5da0fa2af8c228d69b", + "sha256": "1sf8qdih1fbzhsyvkf8grmfsglvrgim0ww14ww01w9xnr02fkb0g" } }, { @@ -71867,14 +72043,14 @@ "repo": "balddotcat/ox-slimhtml", "unstable": { "version": [ - 20181219, - 850 + 20200302, + 728 ], "deps": [ "cl-lib" ], - "commit": "a5070cb2c67425aa33da8503c83361e8814a86ec", - "sha256": "13adpcgsd4153yd0097iady2dy6pa9w02rp97whkl4hjmhdik71i" + "commit": "6f774398d189430593c93e503bf0f3cd0e8bcc25", + "sha256": "12axvwqadv0qlvnzrvbi85p94c10r5w6f3gixck0cbz7p8qz678r" }, "stable": { "version": [ @@ -72226,15 +72402,15 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20200226, - 2001 + 20200309, + 1953 ], "deps": [ "cl-lib", "let-alist" ], - "commit": "78d0cdbe63d142801cbd046871353ae0455dad33", - "sha256": "0ghq8sg3jgidr1srdrl1cighsdvk314an3l2w56ak0ss99h6q28a" + "commit": "5cfa10041a467ca122f5bda31119a5904d574631", + "sha256": "0vnswz9dgzd0i2h6qs8i2nccrcd4pxnbqir4qnhz7nsbhdrvccj6" }, "stable": { "version": [ @@ -72263,8 +72439,8 @@ "deps": [ "package-lint" ], - "commit": "78d0cdbe63d142801cbd046871353ae0455dad33", - "sha256": "0ghq8sg3jgidr1srdrl1cighsdvk314an3l2w56ak0ss99h6q28a" + "commit": "5cfa10041a467ca122f5bda31119a5904d574631", + "sha256": "0vnswz9dgzd0i2h6qs8i2nccrcd4pxnbqir4qnhz7nsbhdrvccj6" }, "stable": { "version": [ @@ -72430,11 +72606,11 @@ "repo": "purcell/page-break-lines", "unstable": { "version": [ - 20200121, - 837 + 20200305, + 244 ], - "commit": "6fb993a42059b58d1a0219006f2d61ebd3b2c9e6", - "sha256": "09crppxqc0d2bdr1pb7k24mhbax5ibdcgd1mw7ybvifakgvfwbkf" + "commit": "314b397910b3d16bb7cbcc25098696348e678080", + "sha256": "106w2n01i9d6z2r43lwwrm7hlppi9bkf8g8nsqd91f0f06921plw" }, "stable": { "version": [ @@ -72537,16 +72713,16 @@ "repo": "abo-abo/pamparam", "unstable": { "version": [ - 20200228, - 1902 + 20200309, + 1703 ], "deps": [ "hydra", "lispy", "worf" ], - "commit": "21ceadbf95cc49202e2704ba9704a5784230efd8", - "sha256": "0n7ia4fpp3lgdmf7m0q1lqqnkbpw24bdk1apjvacwjlpy4gsqy2z" + "commit": "ed730f17074cb12a8fb9a0daa852d1abbfb34372", + "sha256": "0shzsgs5ds4lzw1fv13vdphbhxyqad5s7jwk5zqa5wg42sidxq3r" } }, { @@ -72619,15 +72795,15 @@ "repo": "joostkremers/pandoc-mode", "unstable": { "version": [ - 20200219, - 2243 + 20200303, + 2322 ], "deps": [ "dash", "hydra" ], - "commit": "7e417a670cff080650f2c1153dd9c50fc4ac8a48", - "sha256": "0jd2avxzidfac5nz9xk405jpb3rba9bq2cw6acdz7wj37lnxxnh7" + "commit": "befd7be704d6dbe3dba69da761fc62e0609c9366", + "sha256": "0c621viqjss1ynzgcb81afck9rl1lwadzq68vas4gb2zjb5dd06h" }, "stable": { "version": [ @@ -72745,14 +72921,14 @@ "repo": "ajgrf/parchment", "unstable": { "version": [ - 20200221, - 1702 + 20200308, + 1727 ], "deps": [ "autothemer" ], - "commit": "206dfc8e459971b0d5795ef5da4f1f737020eeab", - "sha256": "097vs3792054jczsk8jy6dhwqqlfvfgfshg3bhlzyiwzcd5x98dw" + "commit": "1aa8cd5e3673c1c55941afa61cbf7a7a45474078", + "sha256": "1s95d2pzivq52ci4disnfr95knh0kdr0jqi0br8c8zaxys3p43c8" }, "stable": { "version": [ @@ -73006,11 +73182,11 @@ "repo": "joostkremers/parsebib", "unstable": { "version": [ - 20190126, - 901 + 20200303, + 2324 ], - "commit": "1357cb0e5916dfe63477d92f16c863a4c5e67b0e", - "sha256": "09b24j074dwawfm3b379m948f9pv859qsnrmz8k9qx97ls4jjmbw" + "commit": "6537b4d2a8cf34455b769b95dfd65de6a4a0e1d3", + "sha256": "1gy5rqnfnyhfa44vxy7qqqh7xada1d1gg34msczcalhhy6lm59if" }, "stable": { "version": [ @@ -73192,35 +73368,6 @@ "sha256": "1jg2rs010fmw10ld0bfl6x7af3v9yqfy9ga5ixmam3qpilc8c4fw" } }, - { - "ename": "passthword", - "commit": "a52b516b7b10bdada2f64499c8f43f85a236f254", - "sha256": "19zv80kidb6a3985n3zij507hvffcxhcvlfxd01gwx64wvfc0c3c", - "fetcher": "gitlab", - "repo": "pidu/passthword", - "unstable": { - "version": [ - 20141201, - 923 - ], - "deps": [ - "cl-lib" - ], - "commit": "30bace842eaaa6b48cb2251fb84868ebca0467d6", - "sha256": "0yckh61v9a798gpyk8x2z9990h3b61lwsw0kish571pygfyqhjkq" - }, - "stable": { - "version": [ - 1, - 4 - ], - "deps": [ - "cl-lib" - ], - "commit": "58a91defdbeec9014b4e46f909a7411b3a627285", - "sha256": "1g0mvg9i8f2qccb4b0m4d74zkjx9gjfv47x57by6cdaf9yywqryi" - } - }, { "ename": "password-generator", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -73833,11 +73980,11 @@ "repo": "jeremy-compostella/pdfgrep", "unstable": { "version": [ - 20200124, - 2236 + 20200306, + 209 ], - "commit": "e250376d97fc5240e07d81108bbca9b5a9ab50f4", - "sha256": "17yqvvgkgxmcl8nc0mb9yaz884zcdnz7dwvfi4mxjzp1l05fvwjk" + "commit": "1576fc98754d3bdaa40573a037a80f1973110756", + "sha256": "1c3p3vdhy6wibxwpc76bvvm0583zmjmxs9pa453z3msbq33kc7j8" } }, { @@ -74209,25 +74356,25 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20200224, - 2013 + 20200310, + 1730 ], "deps": [ "cl-lib" ], - "commit": "d415c154fa59f1a85c4f2812d21ba29bb39677b8", - "sha256": "07ncr5jmn5lrmxdc0c6dw92cqkasc8yivjn9q4ri0wy08zfh298i" + "commit": "21877375d718e57d5e10808f06f78ba0c4d420c8", + "sha256": "0a1s1ygxday0602xk5dg19v1wjmz8dm4ajiwiflvyhqas4wcv9j2" }, "stable": { "version": [ 2, - 3 + 5 ], "deps": [ "cl-lib" ], - "commit": "1ba7e2ddc37df4f453e7d8cffccc13981af658b1", - "sha256": "0v13dljkspx01w88q7nb7dcjni1blp5682wpvlvpx3phnfyjqs5g" + "commit": "21877375d718e57d5e10808f06f78ba0c4d420c8", + "sha256": "0a1s1ygxday0602xk5dg19v1wjmz8dm4ajiwiflvyhqas4wcv9j2" } }, { @@ -74838,8 +74985,8 @@ 20200122, 1256 ], - "commit": "6744215d82ce9e82416d83e5b27fb9bac9e8d461", - "sha256": "0hbm881w84nm4g67085xzikz422vkb08y98hfk2n3kqmznvp8i51" + "commit": "a1c30ca634107551c20c846b5316ca5697adb06d", + "sha256": "0b7rnzk1zkrzh978bmh2dsy78f0sb4ia1w06khyqiby52m27q9k1" }, "stable": { "version": [ @@ -76253,14 +76400,14 @@ "repo": "polymode/poly-org", "unstable": { "version": [ - 20190605, - 2103 + 20200304, + 1057 ], "deps": [ "polymode" ], - "commit": "8b0de75b1f9b65c22f7e3fbc205c9408214c8a1f", - "sha256": "04x6apjad4kg30456z1j4ipp64yjgkcaim6hqr6bb0rmrianqhck" + "commit": "9f89c1f590f616e2cd93df4f441cd1e9818cc7ac", + "sha256": "0r5vlvz2kinblxnzpshxa6mww3al4kwj8gy19hzrq3gj9jpr4ymb" }, "stable": { "version": [ @@ -76391,11 +76538,11 @@ "repo": "polymode/polymode", "unstable": { "version": [ - 20191208, - 1239 + 20200307, + 1519 ], - "commit": "9eb9dce9c9a1d8c92e837818f576463c5bcf8952", - "sha256": "1ygwcq435nb8ndw4flf220psgvz93gxypdqgvgbfd4s2ad9yx1vw" + "commit": "44601aace1e9cef9b89379cc7b4e2144cca60b6a", + "sha256": "0wl2lc5niq89axbxi2frls2iq0ns6pmdqdaknnppgrasvfjxfwj3" }, "stable": { "version": [ @@ -76827,11 +76974,11 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20200226, - 241 + 20200304, + 631 ], - "commit": "8a9af547e6fc63e9a1c4741349fabdf625f703c4", - "sha256": "03n5sbyh0acrmpwc69d834lrxxfybxgjn0lg7iphwfdv11xkf3g4" + "commit": "4ff106ed5c6e3dc9ddba7e158c7ae9085a43b0bc", + "sha256": "1468g9n1dxnsws31zvzm9y6sfcpxx24qj24jmsv7x6r4qk00bq29" }, "stable": { "version": [ @@ -77198,7 +77345,7 @@ "unstable": { "version": [ 20190930, - 2105 + 2106 ], "deps": [ "dash", @@ -77206,8 +77353,8 @@ "hydra", "s" ], - "commit": "fd362d2be7ed80889715ed8a30a61780a18ce6ea", - "sha256": "0vnmvpsm46izxlh0l0p89rhy6ifzzfpzk7j3kkf2608s6dy8hgcy" + "commit": "20362323f66883c1336ffe70be24f91509addf54", + "sha256": "16krmj2lnk7j5ygdjw4hl020qqxg11bnc8sz15yr4fpy1p7hq5cz" }, "stable": { "version": [ @@ -77293,8 +77440,8 @@ "deps": [ "dash" ], - "commit": "5782653a7e58fa2ba26feb3c1ea34a81761da7b0", - "sha256": "0cdqgnrqmwk4wm8xc3kppm8zvccv2qalckfi4k1w847s91q60zv5" + "commit": "a9bb7ec3dcf83b4352f2a68134b6fd1d4977b27f", + "sha256": "04awq9h795ji90bp7z1d9cmg9s2sjx32snbzyp81gb55z02abihd" }, "stable": { "version": [ @@ -77700,14 +77847,14 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20200206, - 1749 + 20200307, + 1701 ], "deps": [ "pkg-info" ], - "commit": "341150c0e77c63075f53e346dae87a4c60ea3b5b", - "sha256": "1kywmyckgf8swjbnzc2vcbpsqhrdnxcqaxwwwxwdkapy640nnslv" + "commit": "588692ad56395ed4fd072bac496b33992096bfe4", + "sha256": "1dysdh4nwxxz6yqimy65ssyvkyki0lk8j0v120csh9igb97ryy6v" }, "stable": { "version": [ @@ -78152,11 +78299,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20200206, - 1448 + 20200302, + 1348 ], - "commit": "2a17093f6a7b168fedabc623602edec35aef8d8a", - "sha256": "0pm7hv3c88mpmbi3xsmlqqffxvphnh2cslm2rpqbgffk5kp98ach" + "commit": "f737203ced2446ec54be7b31b21c47e731404e12", + "sha256": "1fg2siway0gz2b6sq9klijmi3pb6vg54s638d02yzs32340a2qsf" }, "stable": { "version": [ @@ -78223,11 +78370,11 @@ "repo": "ksjogo/proportional", "unstable": { "version": [ - 20200206, - 1211 + 20200309, + 1556 ], - "commit": "4c20c876b93b9b5d82931dabb42396d5ff471f50", - "sha256": "1sck0kjzlr5rcbclj9whrwz7lxik7is9av7ai720hzrlv0yvqgmq" + "commit": "0e4537af7ba2bc9dbb449c38350bce012b382f51", + "sha256": "0k4kwmyja5nb6rmbbq71vzxw7nnxr0w8f9vzws14an28niwr4s8p" } }, { @@ -78259,8 +78406,8 @@ 20170526, 1650 ], - "commit": "4ff0fb841cfb8c6850613094d55bf51448dfd16b", - "sha256": "15wlrzz93wfpk7fkpl3n1vqvrlj8swxg9zjflja4dgn7sgy9f5bv" + "commit": "94b39efdf70de21bc757dc2aceaf5ed36c6535a3", + "sha256": "0mrkzh3cikcg2wddz9hla79pc5isjifcqx025radcc6m0jmg7hjv" }, "stable": { "version": [ @@ -79083,8 +79230,8 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20200228, - 645 + 20200311, + 637 ], "deps": [ "async", @@ -79092,8 +79239,8 @@ "pyim-basedict", "xr" ], - "commit": "99e04546a5cc05b17866f83a7dd26163e3d7ee59", - "sha256": "0hx7qph91jxzip9n0xqfx2zc2f9mwmgkgp8jrj943dindcrbrfy0" + "commit": "61f33ac62bbfb8c5e4b757d6f880286fbced5bdf", + "sha256": "1pq83b67mwj4b1wyxkpqd66cw8w3wm0x6w030wxqz03qg94gdi3d" }, "stable": { "version": [ @@ -79238,8 +79385,8 @@ 20170402, 1255 ], - "commit": "fb38afb55a6f27f17c113589c406b527dfa5c332", - "sha256": "04n9qyi1gnr6wfk6k2q8q6f0zz02lg9v9bbwrvr6jj976vaz4mfa" + "commit": "47ec7e7a2937c78136c560b458bc2467bee2acd9", + "sha256": "01sn57g8za6w89vyg7vyfh8v1jj32f329macfjlvgkamqrpmyj4q" } }, { @@ -79604,15 +79751,15 @@ "repo": "pythonic-emacs/pythonic", "unstable": { "version": [ - 20191021, - 811 + 20200304, + 1901 ], "deps": [ "f", "s" ], - "commit": "ba9af8ce302579a2b2097b867a35a9fc0bc4bceb", - "sha256": "1q43ngd0nj5j9aca71qi0ss137kp46klr6xdlm8ghy55ppym2g5i" + "commit": "f577f155fb0c6e57b3ff82447ac25dcb3ca0080f", + "sha256": "10faqkfbr7n1zlbrs9c9slm2f7wr2liav8r367s00bw3vb2vm8nb" }, "stable": { "version": [ @@ -79827,11 +79974,11 @@ "repo": "quelpa/quelpa", "unstable": { "version": [ - 20200129, - 743 + 20200304, + 1835 ], - "commit": "e7283c5e79197288ff4b875315816d49df6404e5", - "sha256": "0g1r03iaw0i803wlh3adicxb7p8lkl1hv1x7afp5fv7chmp0fp4i" + "commit": "497c281fce65c671aa2bfe780aea5dff4f097d13", + "sha256": "05k096qky4hn9m27gv3pri95mhn57m0vl8lp8phz5br9gm1isp9h" } }, { @@ -79842,15 +79989,15 @@ "repo": "quelpa/quelpa-use-package", "unstable": { "version": [ - 20190210, - 1838 + 20200307, + 805 ], "deps": [ "quelpa", "use-package" ], - "commit": "207c285966382a1f33681f6ac2d7778d4b21cb21", - "sha256": "01hzxfy8l1aqlfyj01p0b6pdzlm2vbc5r00skamx6id3s6qg1d9i" + "commit": "00ce667293c7cd5dc79d4b6077785fcc57455775", + "sha256": "1xxvfd0ijcz01nsd143xgzsp815x3qpsrk6dmw6j1w3gbr2iqh9z" } }, { @@ -80740,8 +80887,8 @@ "loc-changes", "test-simple" ], - "commit": "2cca776d28c4d6ebef033758ef01f2af2e9b3b96", - "sha256": "0jinap8v2491za6bxsdq0i68jifbnrwzrn8rcl3v861zdkax0sa7" + "commit": "94f283593304c2f673cb4940900197d9cb099faa", + "sha256": "00dzw6nqqsgdlcvpnq1zc2568l5hz7vynqx6vkvvbj3jafc6nwj7" }, "stable": { "version": [ @@ -81433,11 +81580,11 @@ "repo": "purcell/reformatter.el", "unstable": { "version": [ - 20191103, - 357 + 20200304, + 2250 ], - "commit": "6c5e7f64c5ac1178dff5ca28d9809c08398fb3e6", - "sha256": "01qsd8fdwmxn2513jhhdg5jwh7wy0nchwnnz0k3srhjlk41qady1" + "commit": "af393979570b801263bd57d7f136dc5bfd1106d1", + "sha256": "04ikh7rmm2rs3wjzgl8b0jgpp49kwafffix942av3bmcd4dw3a4d" }, "stable": { "version": [ @@ -81679,16 +81826,16 @@ "repo": "mtekman/remind-bindings.el", "unstable": { "version": [ - 20200224, - 1037 + 20200301, + 2213 ], "deps": [ "map", "omni-quotes", "popwin" ], - "commit": "be4c34a52711d9f942994ec3fc0ee27e4aaa7c3f", - "sha256": "03gz7ca4486j58mrjr16akwwy9d9190fl3cv82hx849h48rabavf" + "commit": "730b6d7b30e397f8f11a6d3d5c269df21a33c450", + "sha256": "16fk0xnp5awsq45i0wpdkzy6hwccayvwwiag9kar8kmb6nqs2y17" } }, { @@ -82303,17 +82450,16 @@ "repo": "dajva/rg.el", "unstable": { "version": [ - 20191230, - 943 + 20200307, + 1623 ], "deps": [ - "cl-lib", "s", "transient", "wgrep" ], - "commit": "ed638db439e5010d1968a6ce904b7c21383506e8", - "sha256": "1qm26d6ra5d30rk62rik56gsndi35xi01pmjdkm2afbs1n1707ix" + "commit": "e19c06f4c556bda6457da3d50c14b12cb97679d9", + "sha256": "0k9rz6as3867b23979lrmb0sn26rbl08n6n71pxqxr8s85nljlml" }, "stable": { "version": [ @@ -82885,8 +83031,8 @@ 20200221, 36 ], - "commit": "3d025d9c97359442f7190ec42a63ff7e5fd85a9a", - "sha256": "1c8llhbhvrv5kwmci7rlsjqv3gr4gxi45g6c21fqrblyhas95s3n" + "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5", + "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x" }, "stable": { "version": [ @@ -82905,14 +83051,14 @@ "repo": "Andersbakken/rtags", "unstable": { "version": [ - 20200130, - 1624 + 20200310, + 1909 ], "deps": [ "rtags" ], - "commit": "3d025d9c97359442f7190ec42a63ff7e5fd85a9a", - "sha256": "1c8llhbhvrv5kwmci7rlsjqv3gr4gxi45g6c21fqrblyhas95s3n" + "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5", + "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x" }, "stable": { "version": [ @@ -83146,11 +83292,11 @@ "repo": "purcell/ruby-hash-syntax", "unstable": { "version": [ - 20190109, - 2227 + 20200304, + 2214 ], - "commit": "577ab383c142e3a0697ce73480158a8b489038da", - "sha256": "06hm4pl3mzlyx4d3v94rm2w33q9wnwpdl7qas3fnks691d9apg7x" + "commit": "d64036278dcfb4fa0603e6697142e02c2876f634", + "sha256": "02s494r9iy47jd74cd0z1dz1igh8rw2jbyybahy9pivmcn7fnqkr" }, "stable": { "version": [ @@ -83383,11 +83529,11 @@ "repo": "rust-lang/rust-mode", "unstable": { "version": [ - 20200229, - 1547 + 20200303, + 932 ], - "commit": "86650056717be0661feae32e294ff991c087ed4d", - "sha256": "0m7cribk9xfmgil103491mwi0z9ykg19pn3qifdg4i80bs0h8xhj" + "commit": "eb5270bc1cef48d30f33c2a312bff0638a9ff821", + "sha256": "1iip9qhcr3rzvpns71l44vwmm80n5ccldc8zw48xl2ghlxpk2r08" }, "stable": { "version": [ @@ -83430,8 +83576,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20200226, - 1915 + 20200304, + 2028 ], "deps": [ "dash", @@ -83445,8 +83591,8 @@ "spinner", "xterm-color" ], - "commit": "99396915c78556f4ad0da8caf9cb2a269582c39f", - "sha256": "0azr2kv77amr60ms64c2366sn9ak7959krz4whjl4wsdsd5rhqy4" + "commit": "61032eacf0b3b7579f627ce78bca2eddbfa31a10", + "sha256": "0mxrmgdhgjlixff1fm7fyn87yn3cakhyjk8vdhdr37k0qh339k0c" } }, { @@ -83890,8 +84036,8 @@ 20190413, 1246 ], - "commit": "5696d0703583d3d53b34683bbc59d3b1cb284a78", - "sha256": "1kkcqdnphvmiwvcvr2balqpszcf87bjy9la682w9b846g53pgmin" + "commit": "cc2dfa14eb3922d93c15f30734e8211c77ceada1", + "sha256": "11n26dksppjylg5jafxf4j859n6c1062v85qci8fx762wicz0bkf" } }, { @@ -85430,8 +85576,8 @@ 20190930, 730 ], - "commit": "6eda3828bb8530ecd69a3823bd5569a5f779c239", - "sha256": "0ij85i0zy9wi1cgm0j8cvqpv9802kfy7g4ffx381l7k28m35lqh2" + "commit": "03ea43b1f1c648968fe1109fb5c50febcf9e154d", + "sha256": "1v194qzgxq5r34xaqgky1ir2bikaphv8csnxlgwbkggzpxnlwqi0" } }, { @@ -85727,11 +85873,11 @@ "repo": "riscy/shx-for-emacs", "unstable": { "version": [ - 20200203, - 41 + 20200308, + 2356 ], - "commit": "e90dccf40320ee0df306cab3f94fdb79504698b5", - "sha256": "0g4w5w53pknphxr7i7kwksq1789qi8rk8yk9gp4s788iq1f0i6vr" + "commit": "0fec00c1eef75feeae0f71591762ba6a80bc2725", + "sha256": "0zl5lcy80m1pzwl4239lhcf0zb6px5jwbgjib136zh94l5k35wdb" }, "stable": { "version": [ @@ -85781,20 +85927,20 @@ "repo": "rnkn/side-notes", "unstable": { "version": [ - 20191217, - 919 + 20200311, + 547 ], - "commit": "6f01a16919f3efadfe628cfd9405426b539bebad", - "sha256": "1m280zp44bxly1r1y217i9rx4j3hzgy7zqzy0p7afiyy26n6jl46" + "commit": "f78d7ba1173cf6056a95935add30cd30b7a7d347", + "sha256": "0fv1l3vrm50qbxs0dc1qyy1m3i08w46lh3z6nz8p32va5yjwfjmj" }, "stable": { "version": [ 0, - 2, + 3, 1 ], - "commit": "96c4677ba4dc91c8100c93d3af6f165c21db3e05", - "sha256": "1gway2ljpi1ac0ssy9r11pvy50j6c5y10wfs4bizlqhzdpjfinh2" + "commit": "f78d7ba1173cf6056a95935add30cd30b7a7d347", + "sha256": "0fv1l3vrm50qbxs0dc1qyy1m3i08w46lh3z6nz8p32va5yjwfjmj" } }, { @@ -85839,21 +85985,6 @@ "sha256": "1gzfdk3ks56h8q4xk69aaxkhkg9jhs55iqdicyvq7x9wmjn6b7xw" } }, - { - "ename": "signature", - "commit": "a52b516b7b10bdada2f64499c8f43f85a236f254", - "sha256": "0y5xspcsjap662n1gp882kjripiz90wwbhsq27c0qwl1zcx5rrkj", - "fetcher": "gitlab", - "repo": "pidu/signature", - "unstable": { - "version": [ - 20140730, - 1949 - ], - "commit": "c47df2e1189a84505f9224aa78e87b6c65d13d37", - "sha256": "1g4rr7hpy9r3y4vdpv48xpmy8kqvs4j64kvnhnj2rw2wv1grw78j" - } - }, { "ename": "silkworm-theme", "commit": "9451d247693c3e991f79315868c73808c0a664d4", @@ -86213,15 +86344,15 @@ "repo": "skeeto/skewer-mode", "unstable": { "version": [ - 20200103, - 2247 + 20200304, + 1142 ], "deps": [ "js2-mode", "simple-httpd" ], - "commit": "123215dd9bfa67ce5cc49cd52dd54c0ba7c7e02c", - "sha256": "0in27qfkshy84m0iyy2vfvvlapawxhxxpi2jzpqq6sps40kax4xh" + "commit": "e5bed351939c92a1f788f78398583c2f83f1bb3c", + "sha256": "07fv33arh77kdfglg6yv28gvryh0z7ddxylhdyr5plvvglpbwi88" }, "stable": { "version": [ @@ -86411,15 +86542,15 @@ "repo": "anwyn/slime-company", "unstable": { "version": [ - 20190117, - 1538 + 20200304, + 1107 ], "deps": [ "company", "slime" ], - "commit": "7290cbad711a62f76c28e5638d1a4d77197a358c", - "sha256": "0kslq8kq8dc192bpiaalyqisv3841h3dxy1wxk8hw3nyyww08mgx" + "commit": "e9153e42ec8f2089ea129ce24488dd3b5e0b9e47", + "sha256": "1dz8q9fjiip2xnw64cim0p5adbpc4lbljdiqjc5dq7bhwpff07jl" }, "stable": { "version": [ @@ -86628,15 +86759,15 @@ "repo": "mmgeorge/sly-asdf", "unstable": { "version": [ - 20200217, - 2332 + 20200306, + 433 ], "deps": [ "popup", "sly" ], - "commit": "feb25636fb729a08c92e8ba801fae5382f2668e3", - "sha256": "1j73s7xhlys97mwcnm4dpgfhdg7pf5nv2xqiz67fdbpdxwd4s6wj" + "commit": "32ce14994e8faee9321605cec36d156b02996c46", + "sha256": "09x8l37wwqw74xc2frwzbfdb1if8rb3szg5akdk3v2qhik4sm3dd" }, "stable": { "version": [ @@ -87736,14 +87867,14 @@ "repo": "bbatsov/solarized-emacs", "unstable": { "version": [ - 20200113, - 37 + 20200309, + 2116 ], "deps": [ "dash" ], - "commit": "b51d4f43fa5b814fd2de1f9348888c733af89b1c", - "sha256": "1jh6x447br0zdglazy58a6j1gbngi3x7750v6cwzzrrfiz9cb4h6" + "commit": "8de268144ab2171896906c8553be7763d5c45fa5", + "sha256": "1z19axaaipia56c9b4nvw4wlcr89wapnwza2gc3mdph3jkwwfjfl" }, "stable": { "version": [ @@ -87815,6 +87946,26 @@ "sha256": "06zqs7p22h1jkm3zs1i16wvch6rnzzb3m8d5r9r51clzpasf6zy8" } }, + { + "ename": "somafm", + "commit": "6003d09cefb7da19baa39b6c4a96d265844abbce", + "sha256": "1p3ngn8rfbwvgfnpx4x6g5wspicxh9mmvlsrbax6a7whx0y1bg4f", + "fetcher": "github", + "repo": "artenator/somafm.el", + "unstable": { + "version": [ + 20200224, + 48 + ], + "deps": [ + "cl-lib", + "dash", + "request" + ], + "commit": "b143b5c6161e3760f42a7a5405f5f7e97079e09a", + "sha256": "01ak3sr2hp2mmn81j1qdgyvrm9np979fpg2ngbnijnb8ai3gn30f" + } + }, { "ename": "sonic-pi", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -88849,14 +89000,14 @@ "repo": "purcell/sqlformat", "unstable": { "version": [ - 20190420, - 2256 + 20200303, + 802 ], "deps": [ "reformatter" ], - "commit": "f7f46be6f06b83642c312151f3b5276f8830d9d7", - "sha256": "00z60y08likwqfd27ibvzhy62qs29i4d4y4vq3p3slx43rfdgvxs" + "commit": "f18a0bb425a5052022af699df322ba90e6d65e20", + "sha256": "10sqq8k27p4fhhwrlq5p1283wrkykkx76fmp4806jiqh4617932f" }, "stable": { "version": [ @@ -89089,11 +89240,11 @@ "repo": "cjohansson/emacs-ssh-deploy", "unstable": { "version": [ - 20190917, - 530 + 20200306, + 1012 ], - "commit": "93a0e189a06d49b03627c65fe77652bee9f129d4", - "sha256": "1ijmnn3f6ymm04fbp6xmsvc1nrxgcj0k90462ffyl6adbzv4f82a" + "commit": "1bb2f821d4a78d483c147759348a29531486cdc4", + "sha256": "1d79lgl7082fkawl08qlykc7x75whdikk899fv5shbbrwp7hq3l3" }, "stable": { "version": [ @@ -89353,16 +89504,16 @@ 20171130, 1559 ], - "commit": "b505a5f524c9c92cf9f055a7038d19bb168bdfa8", - "sha256": "161mxajfl8rqik3cpapblngwwh7hwl8b6rym3rydcbya8i38015a" + "commit": "af37d392baa6f2e7445e9f714da743fd10153adf", + "sha256": "0bc34ri3d90fcjsin5nvli3ncqrh8x9iw8rhzdrwsbr9ildmr1ib" }, "stable": { "version": [ 0, - 21 + 22 ], - "commit": "ce4e2a7493ce77f86d94afb1fbe9539baa337c02", - "sha256": "16gwdad18rc9bivyzrjccp83iccmqr45fp2zawycmrfp2ancffc7" + "commit": "9acc95666619699d4cdf0526305155407081d8de", + "sha256": "0rhdgakd4vc0549m6zjwcmsnvh2i3mbv5laks25wnfmsxr8dwqns" } }, { @@ -89942,14 +90093,14 @@ "repo": "aaronbieber/sunshine.el", "unstable": { "version": [ - 20190905, - 1832 + 20200306, + 1711 ], "deps": [ "cl-lib" ], - "commit": "5e57899b2201dd36ae7242aa13ca82efcded3b7c", - "sha256": "1l7mls11k9v524c2f4d2xk6b8gydl5mgrpjf7vnngwz63mdy263n" + "commit": "88256223539edcfe57017778a997a474c9c022f6", + "sha256": "01kgf0w9lqprkgi0ag5zmgd9s07yj51vdfj7jbz8sws60996x8xx" } }, { @@ -90315,14 +90466,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20200227, - 1405 + 20200309, + 2017 ], "deps": [ "ivy" ], - "commit": "fcf5dcfd5796637d64164fd17956c5bc54e25612", - "sha256": "1hx00axmjfgc14ixj16pg7029zj7rsx2i80sw6f2bvp543l2aicq" + "commit": "5f1d9ce04599c52818244c2cb8cb066a601610b8", + "sha256": "1gsyf210jq4ij5r47k5sajpjq3z0rgihz84g6y3647k12a00biap" }, "stable": { "version": [ @@ -90865,11 +91016,11 @@ "repo": "jabranham/system-packages", "unstable": { "version": [ - 20200227, - 1741 + 20200310, + 34 ], - "commit": "c6fa6650202300265fbeb82db7d2223ab98951bc", - "sha256": "1b8ksr15bfmmmcq4d1vhpwd6sljsh1hpal21140z4hvplll35n1y" + "commit": "cf64fdbbb066b6ddfcbd91f778433125d8c16abc", + "sha256": "0ajp8zpml47anv1wdj2qx8l0paq5qsxvgmj2kiyhdh1qilxvfl3y" }, "stable": { "version": [ @@ -91200,11 +91351,11 @@ "repo": "11111000000/tao-theme-emacs", "unstable": { "version": [ - 20191120, - 327 + 20200306, + 1306 ], - "commit": "d5b9693fcabf2281319acaf09e685e3eedf27e8f", - "sha256": "1spwnhff3mlhi5ffqfz7fyy8d5wq4qk7q57ba7p7wxq6i08mwbms" + "commit": "20d38a10b9d9cc49fdf99b99a39f2b03a1f077d6", + "sha256": "1g04j5j5w69qr59r9mlv50859bmfirrivlp01li14a0jy8jymcxv" }, "stable": { "version": [ @@ -91424,14 +91575,14 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20200226, - 1557 + 20200311, + 1602 ], "deps": [ "visual-fill-column" ], - "commit": "ee6f2a278b5f198cc6bf3d08b74e5ad2fffd6f05", - "sha256": "0q8x007p4888j1ljvh92wf012vdkiayawlqd43vhxmakl3zbgaq4" + "commit": "4697b363f3633e98528d7cfc1e237a9236feb106", + "sha256": "0dzf28w6ivrzfsy3wglq34mm44vs4148f5r0hjp695xdlz1hv7wa" }, "stable": { "version": [ @@ -92434,18 +92585,18 @@ 20200212, 1903 ], - "commit": "9a0b5eebf6a21a1941b56d4b27c0c90f37626c8a", - "sha256": "0daj7c6bz286dc1gdgjh0zhb0qvzjxm4qsjscig447m61hjjjbzj" + "commit": "483ed864d69f307e9e3b9dadec048216100c0757", + "sha256": "024jm8xvnmi4z3a5801sd3kdvabfk9zk8kfqrxbp0n5jnrmbbm51" }, "stable": { "version": [ 2020, - 2, - 24, + 3, + 9, 0 ], - "commit": "e67ec8ea5cb8c5e6213b0c00b12a242ac31db8f9", - "sha256": "15if11riz19vq33jnsc497ya99fflpksshp2zrf5q24l8pq9lz3g" + "commit": "2ece938967751345394c81381efeea4e3165570f", + "sha256": "15wzhpd1djzviq9r46srzbrwj8zdfmwg7ca9zjm86nff0asv6i01" } }, { @@ -92525,8 +92676,8 @@ "repo": "ananthakumaran/tide", "unstable": { "version": [ - 20200111, - 1236 + 20200308, + 259 ], "deps": [ "cl-lib", @@ -92535,8 +92686,8 @@ "s", "typescript-mode" ], - "commit": "fd79540360dc8cc96f4a9cfc92d1d51f96fd2b28", - "sha256": "0zjs30gi0sqgr6qlvmzq5xcwjd4prni8zn38bd2qxr79r62s1sw7" + "commit": "10e5c19de798aba2d57fb1ec83ad3d1369e6547a", + "sha256": "137kkpsdg4mg2rxidnhzq0a6lqgfld3q1zv91j1k0s2m0q2pb3ck" }, "stable": { "version": [ @@ -92783,11 +92934,11 @@ "repo": "xuchunyang/tinypng.el", "unstable": { "version": [ - 20190620, - 942 + 20200306, + 911 ], - "commit": "5910738ce129d93789c98f5722d33d1f40d15afc", - "sha256": "1mgq8hspkhq6iz84850s9rq0xkhla28dlvcjj0cip4s3npw5fdan" + "commit": "f7632e073ce13ef5ce30ae5584cb482a8bb9ffff", + "sha256": "1ywhj03j64pp2qmsp2g08xr7pq2qx3i0iwly2hl89hig87va0dpl" } }, { @@ -92831,14 +92982,14 @@ "repo": "kuanyui/tldr.el", "unstable": { "version": [ - 20191006, - 1059 + 20200302, + 1744 ], "deps": [ "request" ], - "commit": "b7f3e3e2171eab5707a42641f4470b69777feaea", - "sha256": "0gy5vjffw0bqvhv0gsc654imvridmc7pg88b3nwlfxkrwzi48vxc" + "commit": "7203d1be3dcbf12131846ffe06601933fa874d74", + "sha256": "1bw6la463l2yfm7rp76ga4makfy4kpxgwi7ni5gxk31w11g26ryk" } }, { @@ -92886,8 +93037,8 @@ 20190902, 1055 ], - "commit": "379b457fcff091d2fa47223ade58f457fd6eed28", - "sha256": "1pbc4ni9sw99r6z9zm1khlyvf1sxy1813ilv73ai7q2619y6njja" + "commit": "5deaec41ed0e5c51715737d7f74c5ae1b3c00387", + "sha256": "041fpryiz9584m0sl31jz6bs86621mr7lk6pyhiml46n60iccfzp" }, "stable": { "version": [ @@ -93125,10 +93276,13 @@ "stable": { "version": [ 2, - 0 + 2 ], - "commit": "222d5b155dd544cb158b2f84be8ad304b0c69df1", - "sha256": "164mip0cibs3c8c4khnbzs8f2pmj57ng5q7hspzv7wk8nvc6d39i" + "deps": [ + "duo" + ], + "commit": "2fa2c92bf2c66d87ddcd519277e469f67c6615a9", + "sha256": "1i5n2f6jdr9p5mdq0g5j0kf19b3kirj00n36qc6nww3kzldwc4c1" } }, { @@ -93453,6 +93607,15 @@ ], "commit": "011f420c3496b69fc22d789f64cb8091834feba7", "sha256": "1nhbinwv1ld13c0b0lxlvfm9s6bvxcz2vgfccqg45ncg9rx70rsw" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "commit": "12e523d70ff78cc8868097b56120848befab5dbc", + "sha256": "01j4ci0c52r2c31hc9r4p7nsb6s8blmvg50g9n5v5h3afjl1c35v" } }, { @@ -93589,8 +93752,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200301, - 1232 + 20200309, + 2057 ], "deps": [ "ace-window", @@ -93602,8 +93765,8 @@ "pfuture", "s" ], - "commit": "5f82d4414b8e89d45720fbd80acc18be073ff6d7", - "sha256": "1azk87gjclilk90fii9hjqr266015mwz58b7wm94zjp65dx1ig36" + "commit": "81b69d9ee26326178cef08d5aef2811df4f659ed", + "sha256": "138iw9sva5s6d2asl1ch0723q3q8zqlyllhxrac3phgmqzjdw68c" }, "stable": { "version": [ @@ -93632,15 +93795,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200114, - 1715 + 20200302, + 558 ], "deps": [ "evil", "treemacs" ], - "commit": "5f82d4414b8e89d45720fbd80acc18be073ff6d7", - "sha256": "1azk87gjclilk90fii9hjqr266015mwz58b7wm94zjp65dx1ig36" + "commit": "81b69d9ee26326178cef08d5aef2811df4f659ed", + "sha256": "138iw9sva5s6d2asl1ch0723q3q8zqlyllhxrac3phgmqzjdw68c" }, "stable": { "version": [ @@ -93670,8 +93833,8 @@ "cl-lib", "treemacs" ], - "commit": "5f82d4414b8e89d45720fbd80acc18be073ff6d7", - "sha256": "1azk87gjclilk90fii9hjqr266015mwz58b7wm94zjp65dx1ig36" + "commit": "81b69d9ee26326178cef08d5aef2811df4f659ed", + "sha256": "138iw9sva5s6d2asl1ch0723q3q8zqlyllhxrac3phgmqzjdw68c" }, "stable": { "version": [ @@ -93694,16 +93857,16 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200114, - 1715 + 20200302, + 553 ], "deps": [ "magit", "pfuture", "treemacs" ], - "commit": "5f82d4414b8e89d45720fbd80acc18be073ff6d7", - "sha256": "1azk87gjclilk90fii9hjqr266015mwz58b7wm94zjp65dx1ig36" + "commit": "81b69d9ee26326178cef08d5aef2811df4f659ed", + "sha256": "138iw9sva5s6d2asl1ch0723q3q8zqlyllhxrac3phgmqzjdw68c" }, "stable": { "version": [ @@ -93727,16 +93890,16 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200301, - 1156 + 20200309, + 2057 ], "deps": [ "dash", "persp-mode", "treemacs" ], - "commit": "5f82d4414b8e89d45720fbd80acc18be073ff6d7", - "sha256": "1azk87gjclilk90fii9hjqr266015mwz58b7wm94zjp65dx1ig36" + "commit": "81b69d9ee26326178cef08d5aef2811df4f659ed", + "sha256": "138iw9sva5s6d2asl1ch0723q3q8zqlyllhxrac3phgmqzjdw68c" } }, { @@ -93754,8 +93917,8 @@ "projectile", "treemacs" ], - "commit": "5f82d4414b8e89d45720fbd80acc18be073ff6d7", - "sha256": "1azk87gjclilk90fii9hjqr266015mwz58b7wm94zjp65dx1ig36" + "commit": "81b69d9ee26326178cef08d5aef2811df4f659ed", + "sha256": "138iw9sva5s6d2asl1ch0723q3q8zqlyllhxrac3phgmqzjdw68c" }, "stable": { "version": [ @@ -94281,11 +94444,11 @@ "repo": "emacs-typescript/typescript.el", "unstable": { "version": [ - 20200221, - 2312 + 20200309, + 846 ], - "commit": "a8b7e76e85c1f8b4e353498e3e2d52f1dbcfb6d9", - "sha256": "13s4jclbs5563vjxh44ynzxh5k5hq5h1l9icf33wxwwqwk8b93lj" + "commit": "1767de109515a992b965d275cb5550d336d957df", + "sha256": "0wzgxha155i2nb9idqv634rmxlkf4hd1sg53lipll0phzwd4s7k9" }, "stable": { "version": [ @@ -94622,11 +94785,11 @@ "repo": "ideasman42/emacs-undo-fu", "unstable": { "version": [ - 20200229, - 2346 + 20200305, + 28 ], - "commit": "8b0b289bbd83fac489baee3f46be2225a868e0f4", - "sha256": "1d4chzmx248pyk8qaswxyw4gzyk8r844gzzxh08dnl48406zhcy2" + "commit": "aae7ec9784e8fab9b33adf25eac25e745653f19f", + "sha256": "02xlfjl9z822qixk9gxwv18n8ykdq793fd0qm9g0qsz0sn57mr8n" } }, { @@ -94697,11 +94860,11 @@ "repo": "purcell/unfill", "unstable": { "version": [ - 20191227, - 2026 + 20200304, + 2218 ], - "commit": "bb5755b2bb7a4d1fbfb525ab7bf9a36e4dede319", - "sha256": "0a9gyidkr2i2x9i7jxgdi82ygnb16nij7rrrqb4sslh4yv1hi0qy" + "commit": "02c36a04364bcb586477ab79d2b5e0d4e6ae6d47", + "sha256": "0pp9ywxkvvfay2pblbqcknf2c3q5izig552r5zksmxbac1rlsvcm" }, "stable": { "version": [ @@ -96044,11 +96207,11 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20200225, - 2133 + 20200310, + 2338 ], - "commit": "01555842722ee5ee3abfca1bffc60a188dd5d5ac", - "sha256": "1wa9jvz3yph0cxpda4s8lvnlpnlj4vpmvbvg5kvz6pi8kv39ajws" + "commit": "b5230c8482e82f652403000f24e1fecfb263f380", + "sha256": "16mrbsfkagrq7ng25lc4rs2c8fz63b5m9vfjmnpk5jf8kg0kknwq" }, "stable": { "version": [ @@ -96483,11 +96646,11 @@ "repo": "joostkremers/visual-fill-column", "unstable": { "version": [ - 20190422, - 2154 + 20200303, + 2318 ], - "commit": "9a3a2ef3c7c76666a0c9271a821256eec9daab2a", - "sha256": "1z535rddy8q4gxdmsf7p1z3hm2vav0zcjh9kpxnq3v49scq1nd5j" + "commit": "a19fbe8bcfab678516ffcaa84b516527a0ce45cf", + "sha256": "157f8d302vv7ds03y21j4rz5jvqbkm4639ak25zfhshd5lyacxyj" }, "stable": { "version": [ @@ -96746,11 +96909,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20200224, - 307 + 20200309, + 615 ], - "commit": "b9bccf38dfeb495bfd93d55618b3791ebad24588", - "sha256": "053x5zpfsj0n0a8gdzra7awg3y3py2a2nxv14vn4g8r7hrhdwac0" + "commit": "03b8a06a0a531d13f18ef7f00ed4617eb4eaa1ad", + "sha256": "0485d07y12knsxisalv5824nmqw2gx08jrdgams7l3ra4z961lfj" } }, { @@ -96874,11 +97037,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20200113, - 2320 + 20200302, + 2210 ], - "commit": "6eda3828bb8530ecd69a3823bd5569a5f779c239", - "sha256": "0ij85i0zy9wi1cgm0j8cvqpv9802kfy7g4ffx381l7k28m35lqh2" + "commit": "03ea43b1f1c648968fe1109fb5c50febcf9e154d", + "sha256": "1v194qzgxq5r34xaqgky1ir2bikaphv8csnxlgwbkggzpxnlwqi0" } }, { @@ -97019,15 +97182,15 @@ "repo": "cmpitg/wand", "unstable": { "version": [ - 20200211, - 2238 + 20200302, + 1536 ], "deps": [ "dash", "s" ], - "commit": "fe4bf7b35b61eda15437a212e96d08395d307f73", - "sha256": "1rfiyh2v28zpdv8sd6hjz5fgv3knyhgz1ymp9ycl9m4y93s78wbq" + "commit": "731b5ca33269fe563239bff16da6c41489432b80", + "sha256": "0r5mbslwf3x0mrndz65w4pp88xii019zg5p6x214zxpr87s75zdp" } }, { @@ -97070,14 +97233,14 @@ "repo": "wanderlust/wanderlust", "unstable": { "version": [ - 20190919, - 859 + 20200124, + 858 ], "deps": [ "semi" ], - "commit": "7a919e422a48f5021576e68282703de430558879", - "sha256": "0k2jklkpqm33bimxy4vnssdc9xa7wfnvay3ng0av1bwxfgxfrmdr" + "commit": "7af0d582cd48a37469e0606ea35887740d78c8b5", + "sha256": "08gr4q5i4z1bs5qbfxmf9imjin1v1qvsk7x37qvr84p16kdr9vxn" } }, { @@ -97337,11 +97500,11 @@ "repo": "fxbois/web-mode", "unstable": { "version": [ - 20200229, - 1859 + 20200301, + 1948 ], - "commit": "f271e1b97989e7de8e33cb49a97a829ebec1911d", - "sha256": "192zkjlz3dm1p6lrivc0qqws7mfyv1nvbgcq71gfpm9x085rqyn4" + "commit": "b0bb4ab82ba64b6fa789212f03ad808bdaf77d68", + "sha256": "0v79xm0w8fr342jp27jlkph3av3kbzwdyip6djwykid4j6bcnv2i" }, "stable": { "version": [ @@ -97911,11 +98074,11 @@ "repo": "purcell/whitespace-cleanup-mode", "unstable": { "version": [ - 20190106, - 2022 + 20200304, + 2227 ], - "commit": "121854747776df1b78d0ef89efb6d01c2c1e8c89", - "sha256": "1qli6vwdnm73jnv37lyf1xb5ykav322xjm1fqmgb1369k2fgkl44" + "commit": "5fac49636cd72a0043e2473c9a09a788cfd68d5f", + "sha256": "0myx8vayakmhb5hbrskk58rkb1f0jdw7kinvk8fvv73g050yk28d" }, "stable": { "version": [ @@ -97981,20 +98144,19 @@ "repo": "purcell/whole-line-or-region", "unstable": { "version": [ - 20190411, - 215 + 20200305, + 221 ], - "commit": "15f17488f98868f1628a3f9d91a812b1f89bc73a", - "sha256": "18qzmpw41bqw2ymynya3hgn9skj13r5s6d2b14r78hvmv4bc9h9r" + "commit": "71f84725e2643b2ee74f27c60c4fd8b79c9c3c97", + "sha256": "1rs446cwbp6i79wi7srzaxg9hdahagcjkjill34j70hdy1r4xjas" }, "stable": { "version": [ 1, - 3, - 1 + 6 ], - "commit": "a60e022b30c2f4d3118bcaef1adb77b90e0ca941", - "sha256": "0ip0vkqb4dm88xqzgwc9yaxzf4sc4x006m6z73a3lbfmrncy2c1d" + "commit": "0d11174ba5e1145167000aa8f65c273a3d0db6b3", + "sha256": "1zw4aabadhsn81i3bwdl4717fq6a0njypavw2riyzbz465axd60i" } }, { @@ -98065,15 +98227,15 @@ "repo": "rolandwalker/button-lock", "unstable": { "version": [ - 20150223, - 1354 + 20200309, + 1323 ], "deps": [ "button-lock", "nav-flash" ], - "commit": "f9082feb329432fcf2ac49a95e64bed9fda24d58", - "sha256": "06qjvybf65ffrcnhhbqs333lg51fawaxnva3jvdg7zbrsv4m9acl" + "commit": "9afe0f4d05910b0cccc94cb6d4d880119f3b0528", + "sha256": "1d893isxvchrqxw6iaknbv8l31rgalfc4hmppf0l87gxp5y9hxa2" }, "stable": { "version": [ @@ -98553,14 +98715,14 @@ "repo": "p3r7/with-shell-interpreter", "unstable": { "version": [ - 20200217, - 1112 + 20200306, + 1445 ], "deps": [ "cl-lib" ], - "commit": "62c3b0bd16c6fc4a0ee42f4d6a2dd7f66beab7cc", - "sha256": "1hp3i9njipzppdlwl7a3xhdrvvmc0ynmh85nmj0csxzpnahyp12d" + "commit": "055b46755b7cbc324a8d92e092de671b9bc97098", + "sha256": "10xf2aqxkqdls0ym2a5dvwz96zzziw7v0y493krw2jchzpwkwryk" } }, { @@ -98985,14 +99147,14 @@ "repo": "joostkremers/writeroom-mode", "unstable": { "version": [ - 20200225, - 2011 + 20200303, + 2331 ], "deps": [ "visual-fill-column" ], - "commit": "c806c41f7c2ecb3f945aef7f0c25e3e223ededc0", - "sha256": "0wi8l1nz4g8ygxvffpa525lm80l0jwj92argsa5i11sh7w6hjksv" + "commit": "20c761b80031f2b44b9d9fb476e044e477359016", + "sha256": "1kx2xhvi579vhajvgl4spf9jd597fqa2bjh16yqfx2nikissvkhy" }, "stable": { "version": [ @@ -99215,11 +99377,11 @@ "repo": "xahlee/xah-css-mode", "unstable": { "version": [ - 20190705, - 750 + 20200309, + 1750 ], - "commit": "ada8513eadca5c5797a384040acca2fceced3e26", - "sha256": "0x9zbck87s4cfk99i2kq1a0rf5lvy5bms58d75fd8gn7xz42cf9x" + "commit": "43dbab2b8c35bd6892fe80bf064b41bd731545ff", + "sha256": "0m6l2k22pfcp6s3dadm3w1mr7ar590xl64zjsr0dl9d8spc6gbz1" } }, { @@ -99260,11 +99422,11 @@ "repo": "xahlee/xah-fly-keys", "unstable": { "version": [ - 20200215, - 124 + 20200311, + 1947 ], - "commit": "064cb19b1d3d133ea0f123e570f0c6c3351af9c7", - "sha256": "0vsm7lbv0sw0zxiprgq756fcl1hz8aj5v1lczwzd7v7sxzkcslv6" + "commit": "bdaf860b9e5ff9514890b991ddd45033513c4ac3", + "sha256": "0g2xb5mdg07ip1isvhzdwxvvxbjvv3xarkrfblgq0fai82f6yzpv" } }, { @@ -100504,11 +100666,11 @@ "repo": "ryuslash/yoshi-theme", "unstable": { "version": [ - 20190505, - 728 + 20200307, + 704 ], - "commit": "70365870ff823b954aa85972217d8f116c45d939", - "sha256": "1myrvw0brl6cn3gljbplgxj3mr3mzicfymg7sir8hrk4d5g498yn" + "commit": "25bde9dc4ca380941b6539757371aef91ca35968", + "sha256": "0p3qrp0wrqissbvz8bnpbrj67c2697mq1pni9c247fiijbcnl48j" }, "stable": { "version": [ @@ -100655,11 +100817,11 @@ "repo": "bbatsov/zenburn-emacs", "unstable": { "version": [ - 20200227, - 751 + 20200305, + 737 ], - "commit": "f42847d617d4314d4b8e272f2b58007e479b964d", - "sha256": "1ydfkynfclx7djji1hjfvm1pf6ndfjy43y0piqk3v14n6mxz78al" + "commit": "7dd796840376342426f60018a6cf209228452f3e", + "sha256": "0zzg95sifg6ybh3ava67z688fycklqragkr3baxlhl2jfnwsps2l" }, "stable": { "version": [ diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index ccda1b4d4cb..30e8af7facd 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "focuswriter"; - version = "1.7.4"; + version = "1.7.5"; src = fetchurl { url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2"; - sha256 = "1fli85p9d58gsg2kwmncqdcw1nmx062kddbrhr50mnsn04dc4j3g"; + sha256 = "19fqxyas941xcqjj68qpj42ayq0vw5rbd4ms5kvx8jyspp7wysqc"; }; nativeBuildInputs = [ pkgconfig qmake qttools ]; @@ -22,6 +22,6 @@ mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ madjar ]; platforms = platforms.linux; - homepage = https://gottcode.org/focuswriter/; + homepage = "https://gottcode.org/focuswriter/"; }; } diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 1db952cf1a5..466d52236d0 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/neovim/gnvim/default.nix b/pkgs/applications/editors/neovim/gnvim/default.nix index a9b2abd0cb3..e9f42d2b9b5 100644 --- a/pkgs/applications/editors/neovim/gnvim/default.nix +++ b/pkgs/applications/editors/neovim/gnvim/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "11gb59lhc1sp5dxj2fdm6072f4nxxay0war3kmchdwsk41nvxlrh"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "00r5jf5qdw02vcv3522qqrnwj14mip0l58prcncbvyg4pxlm2rb2"; + cargoSha256 = "0ay7hx5bzchp772ywgxzia12c44kbyarrshl689cmqh59wphsrx5"; buildInputs = [ gtk webkitgtk ]; @@ -43,8 +40,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "GUI for neovim, without any web bloat"; homepage = "https://github.com/vhakulinen/gnvim"; - license = licenses.mit; - maintainers = with maintainers; [ minijackson ]; - inherit version; + license = licenses.mit; + maintainers = with maintainers; [ minijackson ]; }; } diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix index 2b4abb1f162..338708e3f82 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/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix index a46a643e136..7f94b354dd2 100644 --- a/pkgs/applications/editors/rednotebook/default.nix +++ b/pkgs/applications/editors/rednotebook/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "rednotebook"; - version = "2.16"; + version = "2.18"; src = fetchFromGitHub { owner = "jendrikseipp"; repo = "rednotebook"; rev = "v${version}"; - sha256 = "1cziac9pmhpxvs8qg54wbckzgjpplqb55hykg5vdwdqqs7j054aj"; + sha256 = "1m75ns6vgycyi3zjlc9w2gnry1gyfz1jxhrklcxxi6aap0jxlgnr"; }; # We have not packaged tests. diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index cab7ac119b6..f10578b1168 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -8,7 +8,7 @@ with lib; let verMajor = "1"; verMinor = "2"; - verPatch = "1335"; + verPatch = "5033"; version = "${verMajor}.${verMinor}.${verPatch}"; ginVer = "2.1.2"; gwtVer = "2.8.1"; @@ -26,7 +26,7 @@ mkDerivation rec { owner = "rstudio"; repo = "rstudio"; rev = "v${version}"; - sha256 = "0jv1d4yznv2lzwp0fdf377vqpg0k2q4z9qvji4sj86fabj835lqd"; + sha256 = "0f3p2anz9xay2859bxj3bvyj582igsp628qxsccpkgn0jifvi4np"; }; # Hack RStudio to only use the input R and provided libclang. diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 372d9508174..d6db89e5c5e 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 16f1ba4346e..706d3fd7176 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/vim/common.nix b/pkgs/applications/editors/vim/common.nix index e5ee1da7580..03b7d57b49d 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.2.0227"; + version = "8.2.0343"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "1yi7l2yd214iv6i8pr52m272mlzps5v3h6xdgr1770xfz4y1yc0h"; + sha256 = "063i52h8v7f87zamrw2ph057f0x2nzwf1s0izrm2psy41cyf4wa3"; }; enableParallelBuilding = true; @@ -22,7 +22,7 @@ rec { meta = with lib; { description = "The most popular clone of the VI editor"; - homepage = http://www.vim.org; + homepage = "http://www.vim.org"; license = licenses.vim; maintainers = with maintainers; [ lovek323 equirosa ]; platforms = platforms.unix; diff --git a/pkgs/applications/editors/vim/macvim-sparkle.patch b/pkgs/applications/editors/vim/macvim-sparkle.patch deleted file mode 100644 index e0ba5145b3e..00000000000 --- a/pkgs/applications/editors/vim/macvim-sparkle.patch +++ /dev/null @@ -1,106 +0,0 @@ -diff --git a/src/MacVim/English.lproj/MainMenu.nib/designable.nib b/src/MacVim/English.lproj/MainMenu.nib/designable.nib -index bdbcfdb9e..5efc78ab6 100644 ---- a/src/MacVim/English.lproj/MainMenu.nib/designable.nib -+++ b/src/MacVim/English.lproj/MainMenu.nib/designable.nib -@@ -24,11 +24,6 @@ - - - -- -- -- -- -- - - - -@@ -206,6 +201,5 @@ - - - -- - - -diff --git a/src/MacVim/English.lproj/Preferences.nib/designable.nib b/src/MacVim/English.lproj/Preferences.nib/designable.nib -index 889450913..38afc3416 100644 ---- a/src/MacVim/English.lproj/Preferences.nib/designable.nib -+++ b/src/MacVim/English.lproj/Preferences.nib/designable.nib -@@ -88,14 +88,10 @@ - - - Checks for updates and presents a dialog box showing the release notes and prompt for whether you want to install the new version. -- -+ - - - -- -- -- -- - - - -@@ -186,16 +182,13 @@ - - - MacVim will automatically download and install updates without prompting. The updated version will be used the next time MacVim starts. -- -+ - - - - - - -- -- -- - - - -diff --git a/src/MacVim/MacVim.xcodeproj/project.pbxproj b/src/MacVim/MacVim.xcodeproj/project.pbxproj -index 648c4290d..c7dd99d1e 100644 ---- a/src/MacVim/MacVim.xcodeproj/project.pbxproj -+++ b/src/MacVim/MacVim.xcodeproj/project.pbxproj -@@ -66,8 +66,6 @@ - 1DFE25A50C527BC4003000F7 /* PSMTabBarControl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D493DB90C52533B00AB718C /* PSMTabBarControl.framework */; }; - 52818B031C1C08CE00F59085 /* QLStephen.qlgenerator in Copy QuickLookPlugin */ = {isa = PBXBuildFile; fileRef = 52818AFF1C1C075300F59085 /* QLStephen.qlgenerator */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - 528DA66A1426D4F9003380F1 /* macvim-askpass in Copy Scripts */ = {isa = PBXBuildFile; fileRef = 528DA6691426D4EB003380F1 /* macvim-askpass */; }; -- 52A364731C4A5789005757EC /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52A364721C4A5789005757EC /* Sparkle.framework */; }; -- 52A364761C4A57C1005757EC /* Sparkle.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 52A364721C4A5789005757EC /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 52B7ED9B1C4A4D6900AFFF15 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 52B7ED9A1C4A4D6900AFFF15 /* dsa_pub.pem */; }; - 8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 29B97318FDCFA39411CA2CEA /* MainMenu.nib */; }; - 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; }; -@@ -124,7 +122,6 @@ - dstPath = ""; - dstSubfolderSpec = 10; - files = ( -- 52A364761C4A57C1005757EC /* Sparkle.framework in Copy Frameworks */, - 1D493DBA0C52534300AB718C /* PSMTabBarControl.framework in Copy Frameworks */, - ); - name = "Copy Frameworks"; -@@ -250,7 +247,6 @@ - 32CA4F630368D1EE00C91783 /* MacVim_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MacVim_Prefix.pch; sourceTree = ""; }; - 52818AFA1C1C075300F59085 /* QuickLookStephen.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = QuickLookStephen.xcodeproj; path = qlstephen/QuickLookStephen.xcodeproj; sourceTree = ""; }; - 528DA6691426D4EB003380F1 /* macvim-askpass */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "macvim-askpass"; sourceTree = ""; }; -- 52A364721C4A5789005757EC /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = ""; }; - 52B7ED9A1C4A4D6900AFFF15 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dsa_pub.pem; sourceTree = ""; }; - 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; - 8D1107320486CEB800E47090 /* MacVim.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MacVim.app; sourceTree = BUILT_PRODUCTS_DIR; }; -@@ -264,7 +260,6 @@ - 1DFE25A50C527BC4003000F7 /* PSMTabBarControl.framework in Frameworks */, - 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */, - 1D8B5A53104AF9FF002E59D5 /* Carbon.framework in Frameworks */, -- 52A364731C4A5789005757EC /* Sparkle.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -@@ -443,7 +438,6 @@ - 29B97323FDCFA39411CA2CEA /* Frameworks */ = { - isa = PBXGroup; - children = ( -- 52A364721C4A5789005757EC /* Sparkle.framework */, - 1D8B5A52104AF9FF002E59D5 /* Carbon.framework */, - 1D493DB30C52533B00AB718C /* PSMTabBarControl.xcodeproj */, - 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */, diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index ede12f50fec..92992b8896a 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -27,13 +27,13 @@ in stdenv.mkDerivation { pname = "macvim"; - version = "8.1.2234"; + version = "8.2.319"; src = fetchFromGitHub { owner = "macvim-dev"; repo = "macvim"; - rev = "snapshot-161"; - sha256 = "1hp3y85pj1icz053g627a1wp5pnwgxhk07pyd4arwcxs2103agw4"; + rev = "snapshot-162"; + sha256 = "1mg55jlrz533wlqrx028fyv86rfhdzvm5kdi8xlf67flc5hh9vrp"; }; enableParallelBuilding = true; @@ -43,18 +43,7 @@ stdenv.mkDerivation { gettext ncurses cscope luajit ruby tcl perl python.pkg ]; - patches = [ ./macvim.patch ./macvim-sparkle.patch ]; - - # The sparkle patch modified the nibs, so we have to recompile them - postPatch = '' - for nib in MainMenu Preferences; do - # redirect stdin/stdout/stderr to /dev/null because ibtool marks them nonblocking - # and not redirecting screws with subsequent commands. - # redirecting stderr is unfortunate but I don't know of a reasonable way to remove O_NONBLOCK - # from the fds. - /usr/bin/ibtool --compile src/MacVim/English.lproj/$nib.nib/keyedobjects.nib src/MacVim/English.lproj/$nib.nib >/dev/null 2>/dev/null $out/bin/fusee-interfacee-tk + cat app.py >> $out/bin/fusee-interfacee-tk + chmod +x $out/bin/fusee-interfacee-tk + + # app.py depends on these to run + cp *.py $out/bin/ + cp intermezzo.bin $out/bin/intermezzo.bin + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/nh-server/fusee-interfacee-tk"; + description = "A tool to send .bin files to a Nintendo Switch in RCM mode"; + longDescription = "A mod of falquinhos Fusée Launcher for use with Nintendo Homebrew Switch Guide. It also adds the ability to mount SD while in RCM. + Must be run as sudo."; + maintainers = with maintainers; [ kristian-brucaj ]; + license = licenses.gpl2; + }; +} diff --git a/pkgs/applications/misc/gomatrix/default.nix b/pkgs/applications/misc/gomatrix/default.nix new file mode 100644 index 00000000000..5d412469617 --- /dev/null +++ b/pkgs/applications/misc/gomatrix/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "gomatrix"; + version = "101.0.0"; + + src = fetchFromGitHub { + owner = "GeertJohan"; + repo = "gomatrix"; + rev = "v${version}"; + sha256 = "1wq55rvpyz0gjn8kiwwj49awsmi86zy1fdjcphzgb7883xalgr2m"; + }; + + modSha256 = "13higizadnf4ypk8qn1b5s6mdg7n6l3indb43mjp1b4cfzjsyl91"; + + meta = with lib; { + description = ''Displays "The Matrix" in a terminal''; + license = licenses.bsd2; + maintainers = with maintainers; [ skykanin ]; + homepage = "https://github.com/GeertJohan/gomatrix"; + }; +} diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 2f314508b74..907a198ee3d 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -1,24 +1,23 @@ -{ stdenv, mkDerivation, lib, fetchFromGitHub, qmake, qttools }: +{ stdenv, mkDerivation, fetchFromGitHub, qmake, qttools }: mkDerivation rec { pname = "gpxsee"; - version = "7.22"; + version = "7.25"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "0gxkx255d8cn5076ync731cdygwvi95rxv463pd4rdw5srbr0gm5"; + sha256 = "0lml3hz2zxljl9j5wnh7bn9bj8k9v3wf6bk3g77x9nnarsmw0fcx"; }; - nativeBuildInputs = [ qmake ]; - buildInputs = [ qttools ]; + nativeBuildInputs = [ qmake qttools ]; preConfigure = '' lrelease lang/*.ts ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = with stdenv; lib.optionalString isDarwin '' mkdir -p $out/Applications mv GPXSee.app $out/Applications wrapQtApp $out/Applications/GPXSee.app/Contents/MacOS/GPXSee @@ -26,8 +25,8 @@ mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { - homepage = https://www.gpxsee.org/; + meta = with stdenv.lib; { + homepage = "https://www.gpxsee.org/"; description = "GPS log file viewer and analyzer"; longDescription = '' GPXSee is a Qt-based GPS log file viewer and analyzer that supports diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix index d1daec28482..af121758c3c 100644 --- a/pkgs/applications/misc/gummi/default.nix +++ b/pkgs/applications/misc/gummi/default.nix @@ -1,37 +1,33 @@ -{ stdenv, pkgs, makeWrapper, pango -, glib, gnome2, gnome3, gtk2-x11, gtkspell2, poppler +{ stdenv, pkgs +, glib, gnome3, gtk3, gtksourceview3, gtkspell3, poppler, texlive , pkgconfig, intltool, autoreconfHook, wrapGAppsHook }: stdenv.mkDerivation rec { - version = "0.6.6"; + version = "0.8.1"; pname = "gummi"; src = pkgs.fetchFromGitHub { owner = "alexandervdm"; repo = "gummi"; rev = version; - sha256 = "1vw8rhv8qj82l6l22kpysgm9mxilnki2kjmvxsnajbqcagr6s7cn"; + sha256 = "0wxgmzazqiq77cw42i5fn2hc22hhxf5gbpl9g8y3zlnp21lw9y16"; }; nativeBuildInputs = [ - pkgconfig intltool autoreconfHook makeWrapper wrapGAppsHook + pkgconfig intltool autoreconfHook wrapGAppsHook ]; buildInputs = [ - glib gnome2.gtksourceview pango gtk2-x11 gtkspell2 poppler - gnome3.adwaita-icon-theme + glib gtksourceview3 gtk3 gtkspell3 poppler + texlive.bin.core # needed for synctex ]; - preConfigure = '' - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${pkgs.gnome2.gtksourceview}/share") - ''; - postInstall = '' install -Dpm644 COPYING $out/share/licenses/$name/COPYING ''; meta = { - homepage = http://gummi.midnightcoding.org/; + homepage = "https://gummi.app"; description = "Simple LaTex editor for GTK users"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ flokli ]; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 5af7650982a..ab240aee12e 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "hugo"; - version = "0.66.0"; + version = "0.67.0"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "177vqxzmldpkpaj7giqlbl39091fa2ga2pnshdj6gc393rw52f0a"; + sha256 = "0rgwrcs1ydwccyf714zpn3427p8zlwynn0q1v8k5j63zxr91jdbq"; }; modSha256 = "1f320zbqnv2ybsp3qmlgn3rsjgp2zdb24qjd3gcys30mw48cx3na"; diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index cdba8c3f686..f5553cac6b5 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -2,6 +2,7 @@ harfbuzz, fontconfig, pkgconfig, ncurses, imagemagick, xsel, libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor, libxkbcommon, libXi, libXext, wayland-protocols, wayland, + installShellFiles, which, dbus, Cocoa, CoreGraphics, @@ -12,8 +13,6 @@ libcanberra, libicns, libpng, - librsvg, - optipng, python3, zlib, }: @@ -55,8 +54,7 @@ buildPythonApplication rec { ] ++ stdenv.lib.optionals stdenv.isDarwin [ imagemagick libicns # For the png2icns tool. - librsvg - optipng + installShellFiles ]; propagatedBuildInputs = stdenv.lib.optional stdenv.isLinux libGL; @@ -82,6 +80,7 @@ buildPythonApplication rec { buildPhase = if stdenv.isDarwin then '' ${python.interpreter} setup.py kitty.app --update-check-interval=0 + make man '' else '' ${python.interpreter} setup.py linux-package --update-check-interval=0 ''; @@ -94,6 +93,8 @@ buildPythonApplication rec { ln -s ../Applications/kitty.app/Contents/MacOS/kitty "$out/bin/kitty" mkdir "$out/Applications" cp -r kitty.app "$out/Applications/kitty.app" + + installManPage 'docs/_build/man/kitty.1' '' else '' cp -r linux-package/{bin,share,lib} $out ''} diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 531f8d851f1..03483a1a2b8 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 00000000000..ace1e5add43 --- /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/notable/default.nix b/pkgs/applications/misc/notable/default.nix index 085dff7ce04..9a00959de02 100644 --- a/pkgs/applications/misc/notable/default.nix +++ b/pkgs/applications/misc/notable/default.nix @@ -2,13 +2,13 @@ let pname = "notable"; - version = "1.7.3"; + version = "1.8.4"; in appimageTools.wrapType2 rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/notable/notable/releases/download/v${version}/Notable-${version}.AppImage"; - sha256 = "1a7xpdk23np398nrgivyp8z54idqm72dfwx67i2rmxa3dnmcxkvl"; + sha256 = "0rvz8zwsi62kiq89pv8n2wh9h5yb030kvdr1vf65xwqkhqcrzrby"; }; profile = '' @@ -22,8 +22,8 @@ appimageTools.wrapType2 rec { meta = with lib; { description = "The markdown-based note-taking app that doesn't suck"; - homepage = https://github.com/notable/notable; - license = licenses.agpl3; + homepage = "https://github.com/notable/notable"; + license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index e1045663a3b..1fc0162f8d0 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/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index d2ee27ed1d1..aac371164fa 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "Nukesor"; repo = pname; rev = "v${version}"; - sha256 = "03aj4vw8kvwqk1i1a4kah5b574ahs930ij7xmqsvdy7f8c2g6pbq"; + sha256 = "1qp9h1xlfxwswcqi1qn2hfybxl547z13xjbvfgsx1nc8yj51bi3c"; }; nativeBuildInputs = [ installShellFiles ]; - cargoSha256 = "08zqhj3b0v4fxj8vi323zrxg4xvbp9gndm2khzs6daacglbwbvhk"; + cargoSha256 = "00va292bjdp42bkqdkjqajmzc2nshhqa1fj0yfwdf3rrx4nhssjd"; postInstall = '' installShellCompletion utils/completions/pueue.{bash,fish} --zsh utils/completions/_pueue diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index 0375b99af48..bb3a92e72c3 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -57,6 +57,7 @@ python3.pkgs.buildPythonApplication rec { psycopg2 requests certifi + setuptools ]; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index b98b0eee2aa..7ec72eae6fa 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 d38383c30ec..9b1e9f091e2 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 201a3eda3cc..6616f7e4294 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/patches/vaapi-fix.patch b/pkgs/applications/networking/browsers/chromium/patches/vaapi-fix.patch index db9d6082756..b5372d1a255 100644 --- a/pkgs/applications/networking/browsers/chromium/patches/vaapi-fix.patch +++ b/pkgs/applications/networking/browsers/chromium/patches/vaapi-fix.patch @@ -1,6 +1,6 @@ --- a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc +++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc -@@ -635,6 +635,7 @@ +@@ -641,6 +641,7 @@ void VaapiVideoDecodeAccelerator::AssignPictureBuffers( // |vpp_vaapi_wrapper_| for VaapiPicture to DownloadFromSurface() the VA's // internal decoded frame. if (buffer_allocation_mode_ != BufferAllocationMode::kNone && @@ -8,24 +8,22 @@ !vpp_vaapi_wrapper_) { vpp_vaapi_wrapper_ = VaapiWrapper::Create( VaapiWrapper::kVideoProcess, VAProfileNone, -@@ -650,7 +651,8 @@ - // only used as a copy destination. Therefore, the VaapiWrapper used and - // owned by |picture| is |vpp_vaapi_wrapper_|. +@@ -665,7 +666,8 @@ void VaapiVideoDecodeAccelerator::AssignPictureBuffers( + PictureBuffer buffer = buffers[i]; + buffer.set_size(requested_pic_size_); std::unique_ptr picture = vaapi_picture_factory_->Create( - (buffer_allocation_mode_ == BufferAllocationMode::kNone) + ((buffer_allocation_mode_ == BufferAllocationMode::kNone) || + (buffer_allocation_mode_ == BufferAllocationMode::kWrapVdpau)) ? vaapi_wrapper_ : vpp_vaapi_wrapper_, - make_context_current_cb_, bind_image_cb_, buffers[i]); -@@ -1077,6 +1079,14 @@ + make_context_current_cb_, bind_image_cb_, buffer); +@@ -1093,6 +1095,12 @@ VaapiVideoDecodeAccelerator::GetSupportedProfiles() { VaapiVideoDecodeAccelerator::BufferAllocationMode VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() { + // NVIDIA blobs use VDPAU -+ if (base::StartsWith(VaapiWrapper::GetVendorStringForTesting(), -+ "Splitted-Desktop Systems VDPAU", -+ base::CompareCase::SENSITIVE)) { ++ if (VaapiWrapper::GetImplementationType() == VAImplementation::kNVIDIAVDPAU) { + LOG(INFO) << "VA-API driver on VDPAU backend"; + return BufferAllocationMode::kWrapVdpau; + } @@ -33,7 +31,7 @@ // TODO(crbug.com/912295): Enable a better BufferAllocationMode for IMPORT // |output_mode_| as well. if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT) -@@ -1089,7 +1099,7 @@ +@@ -1105,7 +1113,7 @@ VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() { // depends on the bitstream and sometimes it's not enough to cover the amount // of frames needed by the client pipeline (see b/133733739). // TODO(crbug.com/911754): Enable for VP9 Profile 2. @@ -44,7 +42,7 @@ // an extra allocation for both |client_| and |decoder_|, see --- a/media/gpu/vaapi/vaapi_video_decode_accelerator.h +++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.h -@@ -204,6 +204,7 @@ +@@ -204,6 +204,7 @@ class MEDIA_GPU_EXPORT VaapiVideoDecodeAccelerator // Using |client_|s provided PictureBuffers and as many internally // allocated. kNormal, @@ -52,3 +50,25 @@ }; // Decides the concrete buffer allocation mode, depending on the hardware +--- a/media/gpu/vaapi/vaapi_wrapper.cc ++++ b/media/gpu/vaapi/vaapi_wrapper.cc +@@ -131,6 +131,9 @@ media::VAImplementation VendorStringToImplementationType( + } else if (base::StartsWith(va_vendor_string, "Intel iHD driver", + base::CompareCase::SENSITIVE)) { + return media::VAImplementation::kIntelIHD; ++ } else if (base::StartsWith(va_vendor_string, "Splitted-Desktop Systems VDPAU", ++ base::CompareCase::SENSITIVE)) { ++ return media::VAImplementation::kNVIDIAVDPAU; + } + return media::VAImplementation::kOther; + } +--- a/media/gpu/vaapi/vaapi_wrapper.h ++++ b/media/gpu/vaapi/vaapi_wrapper.h +@@ -79,6 +79,7 @@ enum class VAImplementation { + kIntelIHD, + kOther, + kInvalid, ++ kNVIDIAVDPAU, + }; + + // This class handles VA-API calls and ensures proper locking of VA-API calls diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index e600d134e9c..434bd77b6d1 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/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 67936928d29..f9356fc802e 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,965 +1,965 @@ { - version = "74.0b7"; + version = "75.0b2"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ach/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ach/firefox-75.0b2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "371391df688dab86c5126b1af61cdd94a05ffe5fd001c465406000f5d50eb66bbb24d0d18e4b4d4293f06f02913344ed6ab1241841441dbd9696e20ae806efc8"; + sha512 = "159fc50feb7ea1d8f567b94756476b8325de2a2255aceaadb7975cebd763ff44cc74c621532b840f5aef7156024f605ffefc3fb1b3609a44925d7a280b63f183"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/af/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/af/firefox-75.0b2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "8ae751f86a6cef220e586f64fe0253a9d86b69c90034665ea94bcaa9981b2a9e8844988a8940853f58837577c00a275b8f5c316bab51709c829b0135524e372a"; + sha512 = "224a98e4028513e30897fe73de8dee67a90844990eb13564e7fc32c4aa9426730da7d4b528666ecd5a76a6ce68c0eb3d0564b09823e12721424c471fa7cfe191"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/an/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/an/firefox-75.0b2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "a141d87b3e9d447174b34b8c835542d2287f88fda576171a86147251331b2dff62d1ac404566bf98348cf8d9ecd21c48be5b06fa989cfb276fe9ddca3aa35852"; + sha512 = "7973ab3c94616e0eb1b2b36209836c3ed81c55927f26da9bfc672eeb5f6f36d8447bf9dac705219b38edd1d217c6b7d701ce11285f37d37219ddbc0340fbaf61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ar/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ar/firefox-75.0b2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "e964ce1088b8e129d66bdf815a0585ad1861b77c36106c088774f642f687b0097fbbc22cea7b8b7fac8598ea6e076ff74c41804333788ddbde2fa80d8e466e36"; + sha512 = "11dfb7553ca61b7abe857ab7dc75db73e3a3002b9d4dce98f005d0c298ff119d29b64309fb8e5c62fafa08f9ff426c14f45956e5f6cfb7cb9af7dde41190bf43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ast/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ast/firefox-75.0b2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "8833edd124f20d62213f8e22925caecad4b5cff3b6bdad997930c60a351da87dbd4d4516c441570a621314dc1d86666448c1de95bfa7a84ed1d0494088529a83"; + sha512 = "23f00418b48d660c64c4480cd6c983da80fd8990f3ae055a0e4792f01b881b69251f4ec123ef3d961623b94dd7a968a82f27d29aa87731ca77e4ac4b1ec32464"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/az/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/az/firefox-75.0b2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "04856c83309a1f1c0f8ac99e998495702fa70d0dc65f6adf7a21f81e96da016dcd9b4c8d3363bff03f0bedeedcadd9fc101c54500f3b319f5e1e09269a283997"; + sha512 = "85e1c4ef9870c9aaf670d107b5810782b7e148f6edf61123c4326be0809b1103f9bc5a05e87d06771fb8faf405d9f648df364d99cae9be32ae2242d1c488b5c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/be/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/be/firefox-75.0b2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "cbf7858cc233b87163fd985396367dd6459cbfdfbfdbd54d3bcf9419233f03934011f1df9381725c250d6b69bb02a5b7c4a752d1d282e358998494d74c6385bb"; + sha512 = "34bb18b6f6ecd032ce0984513e590e422d01ed5b92b8960a7a4e64b2a5f5b2f19aeeaa6b7227a96cf6b6e97168674a34cc3332d019dc5d3257504c7188ab8418"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/bg/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/bg/firefox-75.0b2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "4d142b7dc4ae68106a39196d79c92ed857354e1a4896ec30b94de26a764da07434b713faf7ddc74886e20735969b5b2dc316f9ac1b5a57b43545d9282a675441"; + sha512 = "2481e01d1656a26458cca5f1f9eb7d7f101dc98e7aa7ee620889b630393a70a82132758323d4ec37c5ee640874419cdd2d5464d64e820876cb924679f03eba64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/bn/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/bn/firefox-75.0b2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "916a3f4f76a944ffd13d26d630985e85bfea416d714ff95423a0761341e569a2100397ee06c32005c3f98f7926a1dba6cde817a1d94f638168edab2005c5ad63"; + sha512 = "6dc0d391e179cc13465f60c98f9a6425f6fc4f28f2340928a35bc3abfb623c28decbd179012d162cff661dc807974f5df34427879d4838ab481ffa75c0957e77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/br/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/br/firefox-75.0b2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "d127065bfd273aae19cc9194a2f5df9a4ae797f9d1b2c8bf50df0fd177c4cc5651e5acc752ee45aeaf1b6bc419680de0a55d8c022df71fbcb6a2188b9fd99207"; + sha512 = "6fce902e7e23277c8446df902349e626ae5dce2435ce56e57824c7a0b5729ae95b10878525f9b5251e9c91e1cbd97cc1ea7792136b271cf88626fc97cee5f4be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/bs/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/bs/firefox-75.0b2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "0b4706f44d63070e2d0438c0fe43d9f157cc770c6777df17e71243a6c7a9ee694aca554de5a7857dc8f450acdcde93a5c75a874cdb7cfa46d16d39b3cd97d791"; + sha512 = "cd46d5f1e8d68a7390b2bdd4338829db0e25e5dcf0a52d538db311b957809c33f7fc9cfef92a73357743ddb9b3ed0ce593c9c0cc8428f7f891edc3292c00d37d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ca-valencia/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ca-valencia/firefox-75.0b2.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha512 = "73103b02b91cf205d0cd69e0af10bf7c864062703f4b11a4c47beffeeb656aa8e73796f30edcb458382bd31c728b28ce2a122681aee5b41db666cb3c647e76ed"; + sha512 = "e79af87bd369b75319565bc6301cf312022b85562ccf6cd2abd6fd59a26b1081a62f166c7efb4fbb6ad1ccb7befa8a8eec557addd9c4115f7da1594a633d243c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ca/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ca/firefox-75.0b2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "6bef2c5a242d7cdbe511cdb4491fae34c5897900b5a61aaad34f6511916fdd937f39fe53c29249eb0309191a5f7c7ba3c2c6e44522bc3033c0adb6086967bcfc"; + sha512 = "4241eae0654e5466a1c04aff0de003a676c775470329a973204a2413590fc4558aec96ac33e9e14cf1ab7eb52054ec34e7ebbb149648dd4e8d33cefe2b3c18c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/cak/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/cak/firefox-75.0b2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "91893441b0ca1ad8d2887a52569374ec4fa51522bdff7b468fb2664414406b54ee6910c5c9fdc70b2b9ec502c999829594c24a20240acdf2f2fef7dda06e7e2e"; + sha512 = "5bb2b8a2eeffdb7a06c16244458ad8f305725741f05c0fa367534da99d0bf0c4399e05453b64c505f441c4036f3e5e7a4e5729852a848b8ff4210d674ce7f065"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/cs/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/cs/firefox-75.0b2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "dd1da900168651d2ed545f1084f2968f7678b462773f2547a11034360170d981ba9bd813d9392ade20755e72145eaf6c1e6d0b6e2d128d1f884f0d8756d49227"; + sha512 = "50c6ba425d3be7e12667d80bd6e57907082bd3c155b8d3b6bedae64054046d3bb02d8894445cd5d27e3251507730c06bd3eddc96a11c36c4e9c7a3b9cdf796ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/cy/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/cy/firefox-75.0b2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "a7a343140c7fb381278de6475fb5204ac4d38eb07bc3813b1d84f649e69aea3807336831cf364a4a90aa8c6c6d54a202da764f59ad70c8e5509866fcf3e8e1dc"; + sha512 = "0dee8828858c2e0013788b680b8f907e6464e219fc6745af8d0e7d08575291e926f2be56ea7becb1b231f1fa0feb1827b5779b7f720606729a37847f7d8322db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/da/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/da/firefox-75.0b2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "e0ed22aff77496deb13843e7907e8c02f86ff9b73aa97236aff4d1ea1c6127ceb69cf7722fad2dc8a3766d863b7f728fb0ae29f64cdfb0209bc41d9db9700ee3"; + sha512 = "d69320ec8c0ffbead25906f9957d73ee9bee8c7ff922e7d2d2e3cca3487ded5e836d41b8faca42627f722c1f2d43fd918e6db6e9d93268155865f1ebfaf6a5e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/de/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/de/firefox-75.0b2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "a8234fcd9d02f7ca55c99ad2bb8584f525196670111e9dc4fe8c28d3592030cf98a4619939408853f04f004828c15269ba1ab0b63b97fe04dcbf61f0318cf5b0"; + sha512 = "a64fe63ef81c8ceca0c1baa0bf55f0aa34b662fd9d0417a262e7d539164ac2f0b32eae89bcc74cec4113356fdb1ecce890509877bbef9af2eb6f7e91c2c2ca33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/dsb/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/dsb/firefox-75.0b2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "98933acc4e74a1d88e4fbf8bbcdcd0310eea9af7ce88d708146408a157529fd727104fd827fa445a139721c1e1f1523637b0cb6ccc20ae0267ea723928384155"; + sha512 = "776c66f6421f250f22063cb77c5313df75b20b7b06a396c8124f7836b56e7a18fbf9ea996d9ebffb58a00ca0a27957199e4a53b777f5ed04281317926a95a84a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/el/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/el/firefox-75.0b2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "a6656de1898fbaa3a67c1b7e0c7c45dd9f5a6f3117bf2b044bf266556750606b3eb0c00ace7e32f32ce37367d5196d28bc5bbec3a6ddb5f0fc7629f6a2156a90"; + sha512 = "5daaea449ade4d15deb93864b0313f3b8f780b6f51e1ff63098a37fe83b39151bff5526d8685171fdcc2ff7ee874f697e689e47a60e37d01ffdf2a9d3efbc38f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/en-CA/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/en-CA/firefox-75.0b2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "b1be0cbdc584520038e3df24607e8342ee71745f11c7e89f574d45270d2f024a4974d353549098ff3e5300a5c618f7274615f05858d2b9c5df090464d473387a"; + sha512 = "2d3f4aaafd042888a2b192419fc5fd5e841a922a1b24ff8cc95d52343750e64ae8a0deda694faf3a1ec11e447f25d8303f5905b1f98349ba5f0e705eae4fd615"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/en-GB/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/en-GB/firefox-75.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "072c48287c0346c28bed4ccae0b71b984f4b656f917b0a6c6f20ac4fbffc9bc8248070fd584ea3444f40a65ac02202b09d26548c417d8a9abe8f54e385daa609"; + sha512 = "e977d28c7f2a54793098e6557dbdba56a8a6b0069912188c59f246a004147d17454a338df4f4335144e9d4e5a52a510bc94076d3f38c8fb28797a08c59a903fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/en-US/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/en-US/firefox-75.0b2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "70a350c3122e8565aabb3155bbf532f75958ea0ab83576f98b1f1a819fc54ccbffab6e0db3f5996814cd199b1a30aedf586b6bc3e6b2037c7374cbcf78fc3dea"; + sha512 = "e30d89b9ea552e7758f550632b41c19a34dcd75291a71def8aeccb4a51ddc0a3da16e181a8c9d441da0d671a89d0f7a481e19599f4815beb96aaf7a95e10e078"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/eo/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/eo/firefox-75.0b2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "35d35b253084fee933c828ff38b8219cb742ace5c36f407fe1235cd5aebd956b813111b9cb05306ce5f85ca42634d4ab903ad409c3055ee0ae4975c007e029fa"; + sha512 = "5d086d6725cf99aa3894974d78cf0e337de0244163e3fe8507aeea9386233d14ae7a1f1550c563a5fb59f0cae51d579c4f0e578c9fb56ee48d39be6d644451d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/es-AR/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/es-AR/firefox-75.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "0448e25a909dc951812bf5b8ff3eb39e1ba0825900ad4a4d78b3c182830a37fe8c6f226128341178e0b6612b4c9ebbb826d2484505ffed4e23097ec1210e8238"; + sha512 = "ff818af501719ec198d21b5a53d54603fd591d266a2028827283ddbf5bccfceb4382e7ee9ad1119936a2301b067882f91fb04a354426d4587134e065033b4028"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/es-CL/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/es-CL/firefox-75.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "703c9e4cfbf94522c1b4526bb68e7ea6941169fe1f45ef155f96587701064dd3d1c2056fb59a582fd14b4a41ff4d9b82094b40f4c95da6c8d5da66d96b012e80"; + sha512 = "2bb98c8dbcdb4d2ff0eb660517e1adb99d7917e9cfc6429e870ed3ce168f4c2292feef353e870293bf76f7d9cea4095c6d22c59fb9ccaa9f336c93e9009f8d50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/es-ES/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/es-ES/firefox-75.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "e4666af45ec236cf8f14b69ff0bbcaa4070ed9205a04cf5dd37823feb1230e66f726d980de97326c1ebc7b93c2b3b43cab61efbb1983d8882a78abba5eeab313"; + sha512 = "4992db4b3e0d5273e73fd7f88e7284809a5922c2b700b695830da7ccc11c40a23954a03a602bf319678a432da218be8de825b15e2eb62b6eb62a0f34787ba0f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/es-MX/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/es-MX/firefox-75.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "1aba3fb4f7d34c55b433fe886eba74b0c71ff2a759a015fa31becc8c8a207b70b816d6cdd1ab648d3b8fa220268c8c95d19689fea65dd963de6750f1ea0f2905"; + sha512 = "df8fd54ca32af5e0d579a2fdff569688248f4abfd30ed677d56a0ad850fd603ac14aef086fe8ac167d1819d0e7b354de77c948613a9ccc3e9c9adefbab99d077"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/et/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/et/firefox-75.0b2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "485cf19a8bf5a8e877ddec241a98d580b8ebd187c0b92185b116fdfb3936d31cd379f10211241b591f8927a077d7482668abc411ba67c4d5b83ef5e47e0ce6ae"; + sha512 = "ac96ffaac54039cab3b59063614ba8eb5e731ad0912e83f4b61f812c927f0f075d9d9a6123a3e1211bf96c886a925273f16fbd31d75709a195379b763e936fed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/eu/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/eu/firefox-75.0b2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "4bb9b8f3a38379011240c4ee9d0d1db9457271c5bbcddf691e42d33e281e2a63d781e962375e8dd55860ca49c872922384ddcc1f1d9ead98fafa213d2095de32"; + sha512 = "4ced029f5d52fdd172d9f25e8dd062278758b6987fae56554e657dc32c2323caa52ef89021564d9fcd4663e75e0a8163e925c32048d77acfc92a0db9ac171248"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/fa/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/fa/firefox-75.0b2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "995e24fdcddf91ab5eb2d5809b84997506c8c3967fbc2735a120c11fc69cb87c02a2d1f0b6c477946a5406bb585c73ca6361110dad6a3927745b24fa509d5018"; + sha512 = "c4f131631f72b98b9fc919596bfbfea8b605f2108b5094e9e265df84317a825de9a06cfc4ae52f7901138b429f9c7ffaa4b719b18e1485007c6ffe96d689f690"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ff/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ff/firefox-75.0b2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "f504e9157265dabd9340b2974051ed9da7b4f8f56cf652c44d96fb949a3381dea16b9782a7d029f2c3e19793a9fb4aeab703f30773dbc1b9e70e937b00e4e77b"; + sha512 = "c0f61fe82231d8a22f550d8399e05e7ece426fb2f1d15d36b6c43ba3c3872f07f76102a69759fab6533bf08a8248ca7dac3c59d723b3f54161e959d85c24348a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/fi/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/fi/firefox-75.0b2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "f97ad7cc1c1e170bef9e2da7ea51df57b32445a3b13478372735af5336251cf4da6ac2955edfb70c1ff9fd9eb997eecdac6e63c867ae80e18f2391ecaab1406f"; + sha512 = "39bab8b71d79b58157278d3f480353d637c54cd5f13e75323d9eb2ec95980bc004e828c612f080414f85838460e82f90a490dba51d312a5147788fa7fc5c5fd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/fr/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/fr/firefox-75.0b2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "aabf2b7b4d3e564a9aa250c3bdbc3c3f3ece0c69a6047f76bff316534637ddc00eb24d1e59c419ffb9b7c4193b7a151682cf75b4470c378ed5305c1cd9329843"; + sha512 = "93a42248cddfd6d3c4151c6f53d2ab00f9200537056005998c7d9e5a3e8444a0f47c621d850829bc0e0f0b21cab9611c1ad5487f0bd8b2a3d41da7d1256119a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/fy-NL/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/fy-NL/firefox-75.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "057bb572d45eef62599debed8390f45a53f5b9ed720ac37bf46c3a6f352235598f17a1627989f50c0e10a5f22d1882a8170024bb9583bc2fa7923cff32feef48"; + sha512 = "23acca680d2d1a585103a26eb9aa1d8e84d35865fc3854d3a2055ec8337d42aac3d2bb0eac21930816577b60eb4bd6d47580fbce5f7a5e47791dbf798c50487f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ga-IE/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ga-IE/firefox-75.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "9872d3692571fde83a8237a41c51c64e8a1c099174262b33032b281fc76b5f564b29f3ad1ccc7dc5ba4c8ef709810cc1a3ccdc34942361453ef15ede006b42a7"; + sha512 = "05cfd56f53d033a70c1e1ec08e1355e281ef525f6389ce849c87b92bc6edbb4c953e054326eb094c5862dd74db64839e36ec31cf8ad3fc2248ce2ea309a40bac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/gd/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/gd/firefox-75.0b2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "c3e5613572ecccc67989c5d3ac5f590092bb05fb43166b931ea49fdf7cd0cca150a6208970009ffc8063d7d87dd9e5b371a9d317af8b9094240ac9314eb8499c"; + sha512 = "aab0c4ce13a418c9de0fc5655bb5d5269dcd07ac67e75bec66c419f06348043c2c69816704b770398e95ea0a65cea531600bf9322545bb40394b3c599b71cf58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/gl/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/gl/firefox-75.0b2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "766b0ce2b5b4a78e0470dd708a83423e8e756a7f44a6bb7e74ef06699e48bc848c2f1e5e452db090f1a8b8c33fe20036f1059500a14c878824516868056ac45a"; + sha512 = "61f4b6e54d98939b361fdce716be0701a51fe789085db0df4dbeac5a64258fb3ef3dc30ee6cdc1539d9facce481cdff5076dc19bfffce31f459e6377f7fa6872"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/gn/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/gn/firefox-75.0b2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "f6937fec4839c3a06fe36e78958b549cd1bb0ee6ce2490ba3f05716a6853807781a51c7ddd4eb8c5c10c38624818f9ee70a3115fe53e426b27c8d9162691e3d6"; + sha512 = "fc77cb70f71f832ca7f9c6b6ac9e7e6e75737c669b229e3dd68c9061a0b5b239cd3e5d4c501a45b8b964c862230736c21a1431dffbee82dabcb4b9f7b95ed09f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/gu-IN/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/gu-IN/firefox-75.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "005223824b6ec5e3ed8c404ac9fea73b1ca57412247ed625c667709e81be1727b04a0a1b0b59add46864601b04efaf01dcb592016b3e25c026204444a6c411a4"; + sha512 = "c5e4d9e031b97c61b1026073fa3f772158b803c688c8bcf35fb6725b86daf9a3fa970788b8468f4e95303adf73c400ba7b72c52e008d0b6a835867c73a583164"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/he/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/he/firefox-75.0b2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "29ff04367e36a3df0e5d93d69bcedc6c698692a42cc80fb2f51171b784c030de832593a617e35483bb6acd849b77b5d19340a31a0322e1421d5ccc07a1b90161"; + sha512 = "49ab14bae6d4e7211904a8da54558e70276897fbde5252760bab17aabd845f6d961e79b79c775e338564b94534a4610742968fa8abf09a4bbd49cf7241b86f8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/hi-IN/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/hi-IN/firefox-75.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "6c78e91ed89ea3ccd7d67d46548993aae9375648ede8edd76cbbf6bcaa97ceb55f13506b8c9418b6fa94fcf15e0d4052196334f3f2b804439c3fa9db564e9b4e"; + sha512 = "f7b89b02f01de7f9157160523c30388064cfd1c9bb2f24788e41d3f6eff706a76d50c562c7f270d3b1287d8d886988f42d0480f39694aa6d1be141bcd926c6a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/hr/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/hr/firefox-75.0b2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "0935d78afd0739eb510f24e0ca21d9007bf89c3d587b2661e0bca2383b0a7361071a529c67c213312b390ace44e79b07826d0ddba4ed5756bd800027ecfeaba2"; + sha512 = "d8319df0d4ca8c3bb403fca56565fcd16916e1057470046173853fc9d299a04226eb2e00a1cd14206d9e576b73f64722ad65e7c0dc6c99de498bde7ea5b35f11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/hsb/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/hsb/firefox-75.0b2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "1372280c8770db01aeb2fa5992a5ae702318b84e972c379752ca7c1a15e00dc44cc7a5e9fc212c928e987aa0599f240a73828c7296769064e41b8699bf4d1173"; + sha512 = "bcff9cb8396e05dfe124fb3bcff48cd526322920ff38800988a1c82dc9adb6927b8df41ad52b9bd3cee18a72e6f065c8dee0239137b84581d555cb9a69e3ee78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/hu/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/hu/firefox-75.0b2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "6ad396d94908a40b4263866163c6de6ac3a414b27fc57a9b272df2db3b5bedb6f1a0fb31170bff456858fe8185761e58f44011a77295c41afc8dab1d7ab6550d"; + sha512 = "a570bfc699c1e3e5e9bb733eb1b92a8d8d31313aed84d57039a20cf3c821b51de36523c17d03dc4e1f05d57e53b07ca1457317452170cba84bb5a98ebcd59c41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/hy-AM/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/hy-AM/firefox-75.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "c59a6adf717d489b9de000be2f9cd4c166f3b25217d2add4f790d6261cfd8395aafa5a40cf8f41a3596916b265df5734236e7ccb02e9d7958e90e6e96d616468"; + sha512 = "72758745bc2fd3ff651d5df2ec3a7af7697f299f488da5096fe2b740dc2a3340ef29cc4ed107318533c4b1e7438688169f5bf2d103b307c615bbb9400a334091"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ia/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ia/firefox-75.0b2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "c971f1eddfa61f0abb9053c106688eb42dbdcae9bf96ad3b4860280c7939d38599c9cc00f41056eb5297eacd6b90bea7efd2722ddd3f4b33284468837a8a0439"; + sha512 = "9fb6659aad83d753c244e4efacf55e5918692964c84d6428f069e90710693da7b82a47ceedccbfda32eba6f3a8948e01ec32695c9261bc254c4b7e1b8f84eeb3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/id/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/id/firefox-75.0b2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "7d161578a96265e1a3fca8efcb6f54b93b3831a1b7f1ecfb7dfb5717bf9859767a136a3182482bd06946bf8b50fb8fb4a118a7e4ecc16d3a3ccd9cef54303d5e"; + sha512 = "c54aba052fe2f4d4e9eb08a69b0bcddcd4e3dc84ec6be643d34eeaa638e50d17658f530100577d5d6acc97dc7a5b4baa640bfd0329648390cbdb22713ef70911"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/is/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/is/firefox-75.0b2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "aa462c1c49ccae93dfd16bb7f2fcaec55eb26b093332b24658a120349c9e2de233a6bf75585221c187b668f77b2bb675ac44ec9a1d5896f0845c91eeedf969fe"; + sha512 = "01f552f0224e2ad316e84d3ac55051f1403cf2338d5c07767db463db05bc19728b7f096a3d30bc03cdf86bf81bc799a310241d33b8a4e7e5dbf3db61bfbde263"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/it/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/it/firefox-75.0b2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "50a3d1a7dc05531cbed59ad0bb3289706c1e4558a2b160ec80f2762979ba13f84bb5ac689ffa21c58e1ee6cd3b60fc4bb96ece54aa0b2755adf28c10231dbeeb"; + sha512 = "bbe8a2f64dfb54a3a4b13d7bb14a0746a28bd16be46608744696bb12aee1b6acd0ad4991e2ff7867e9679a3bc51c8d47690e08705b6c860cac1e27530aab24de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ja/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ja/firefox-75.0b2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "255c6b9291a38d431210c014433ce8d986245e30dc3bafcf13c1dfcdcead06e1988a1e960a9f3a23d37f1d527635630e2e76c3aae4a81b0ae3edd9c6daf161d3"; + sha512 = "437e74242ac37576dc01be92bf4fa57900d282b0919e4fac8a073bcfaf681ac2dfe58c2461ea18e912fcee85b97ff40df3f8f1c649ea442a557388544887f7b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ka/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ka/firefox-75.0b2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "6cce90df66e85fa5d3fc96f9962d9140dad36f6fff840a5e80af608cca20c2557a79f5e01338d0fe64f6a0d1d6b15c72c883147cb3fe932a368ad04353b26ba3"; + sha512 = "d7d4374c1f2ea6e2c2c40e3d425093065dcf624b50532116e576f60fad51b85251ed7284a63b4cc2cc368d1bd80eadce8d82a581789e02ca5249a2811fcccdb4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/kab/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/kab/firefox-75.0b2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "3170509b386ae0d0390dbde71fbd9397ce587bec4a47e2328796ca04c9b379585a2311b28c373ee34672b549db6c1e69471fec65de581d11d177eae536407af4"; + sha512 = "235f9ad96c86ac81ee8b7fe9ade89559751969ef48eab577276e0289cededc708bc05eaa413febae13ca4eede96772915ab4b6726dd8bd5bc6b7ee545971c791"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/kk/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/kk/firefox-75.0b2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "71ef08a02731831cf6fc863012f58bca054017dc854f17ade9ef885c391c437b40bda9c89c1a06f9258047b1c9e74250f67ccf07fa8ed0c47d52a425b447e21b"; + sha512 = "d443ac7f6ef50da01038c7bba9bf4a2eb12b53410a5201f64162eb2a287f5f4f16d3408715ddfa58471d53e0e58edf46778141118a9b67dea410af683540f82d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/km/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/km/firefox-75.0b2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "a1411bbca99f8c45c5b7a3d3793df3496d653c61d022cb7bc5d223e3dfc4b6f27228a888e429656930c05442b8e8087bca6553848f01304760483e2486ef071d"; + sha512 = "b3d35fb421b9dbef950fbea28e80b530c9433a9d51760d1d43043637a6b497a3e2a890de8b2eee9b911e60a95308669035298fb429648a21151e3f08dc6a32ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/kn/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/kn/firefox-75.0b2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "a7d8e7349e65f21085b4fdf69284eeb70d0cafa528d034b5c2220cc2ba6aa2edcc846d736d288307115cb3e6139597dd47316b3d0a0a9e327b72b61f901c4eba"; + sha512 = "65d0bd986874b9619caa455f9585d309a30a87b482d0375de27e46a70dc84b5ffc4d066202b7b597d1ac7b28e7be91550bccebb419c4a24a847180c62b7c46de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ko/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ko/firefox-75.0b2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "e6afa5b7d32e641b5f4c04d4afdc91c7cd7422102658b932ca927daaf6652e035d8d9ce6348a9bbe07cd562f69f74bea7746df8c85aa292751b4cc3ec764600f"; + sha512 = "bf43ec6311e6ba2259e802b1ba569516d5117207738ff4259b2346b97ff85b8048e5c1a6d2b4b3c27a91ebc40ad6a85eaba84250be79e41f4570294448a1dcde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/lij/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/lij/firefox-75.0b2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "4ae2955412987487c37d24f8a4a935b14a84048627e6fbfca15a8f4fb5eb4f4339ed3c32afc1be2e9c5725a7caf6d0894ba2fd80eb79150cbf364c3927ed80f5"; + sha512 = "1af356fa06b39b9d638b13822e82f4961a237e3587f8b671baf5862a87898f440f564f9836284af6e2e3e8b1f3ec462af1e9c9621ae51289fd0b1bf827a2bf1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/lt/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/lt/firefox-75.0b2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "df9b514e06272fd0eb3f73e14d9a9ae9c22e5e3e7bf456a63a95054158f2c3fe81bb6750cbc6ed3a53d5a3f11f63a801b6c6d412df50bc08bc3ebde71028efc8"; + sha512 = "a4ea24a874261b51032a1021878ed2c0102bbcddedbe887c8f5893f428c1d3fe6cd906b3dc53b5b51654c35e03245244aba8a2811deb7c3cd9f6d0e2dae3bdcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/lv/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/lv/firefox-75.0b2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "28471815ab78ba35fed8b77fc2722920e848eba3ee8cf9cda62dccecb055b8684e2ff5587f477b38b286a515899b1b9c23b38fd04a8f510a3dc4a48d05bd3c9e"; + sha512 = "a8f385bb407d498ca291d088101adf0a4f93b8fcfb9abd3fc36311fd8e4e36424f888f5abcbc1662ec4f7dabba891ef765b10c4a9dd8364898e803fafb82f7a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/mk/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/mk/firefox-75.0b2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "3cc80253d3dd1b5a55035a5b2ac0ba1b10b8cae71537fd277ed95c91fa5d88e75f0c95a4373a0a2c5f9d887709679cdbd154b1babbd1089f6c63cf2484a3176a"; + sha512 = "453a3e2726115ff8aa057445bf05fbd9bf5c796fe8efad9590aa09ee8ef3d70cd6de3008503c336770ea3cd259d226962c1a6e198bf2519742e14cf3846b1975"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/mr/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/mr/firefox-75.0b2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "e7d702978faac40984d1fc5ceb7b689ca6e5acb30c3b4e119431013a8efcd89421ff57ff74ae8283ed3c818cc171c1cbba461d17106e22f1cb7ebc1e1080d832"; + sha512 = "91bde3db18f77850affe7c3b981b8d233febe8e95d8528443a80c0b569b587d2e605ae6109206463ab273c9a28ca8db51cd6920ac30664cbbde9148fcab6cd36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ms/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ms/firefox-75.0b2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "6912c3bf5b7dabffb89b9814c4d451aab946233a489a76ad2d456856b56d94c3403179436facb4aa344844fd130b550b7223113db7155084be2176c07c4b04e5"; + sha512 = "8e758ecfbd281cf443dfff4950b1065337fa92b1c47c4a73f9e78f5ff1c19ef46e3d1ea1e9458646a9beb6367dde72062144a2d1d2a94a0e0ac1b40a2991fe3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/my/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/my/firefox-75.0b2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "07a5cd6d3376b0e4b4dcc4db5801cf9e8cc17e2ba7269953c10c8620e597f837bdb29cbe4707da17f87e3778f42257b4ac71511dc8941b72c4a7b7e5e1f8373d"; + sha512 = "1129e76bbd5ba3c96e8110b3b00eab0975fe38749da46846ddd37299f73840b987826ad80a3d3f2dfc4ad0ff38305fe45f736fa90c671162a3a9563eb1a1e755"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/nb-NO/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/nb-NO/firefox-75.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "d974a6686d12df092f84aa6bf4519de0700565fe2c96b5a80b9b994bef08e1f2879d602019d8f9f42db771586558f2b50dc474478fe8880d08c95a3b17a800b7"; + sha512 = "3aa4e29466e7d6e3e3d34a570d967d4c14b3fc3977912161d30a6845d75abe6ec745ed77d08716a11ad8a6d6e6656f1c5861453af27c10184795ec29bb22a386"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ne-NP/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ne-NP/firefox-75.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "832b0d811e6adf9f0539f359f3b13d3e0f8fa8583e3d862979e6c44d3da94b4375c5ccff27ba9dc23936dc666fba8cbf1e55dfd6b8bf563f9ba35dc46d600502"; + sha512 = "4f9e880dc686e04249553c5be99fc9628105aeee67af7db88cd0662bc4a9fd37e8b9b18921b608e275d7e0b5f2c03923552705094e6749e0a3d0421e82a2bfa8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/nl/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/nl/firefox-75.0b2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "436421d93e8daf719fbea0a0e5f71163f150091e00ccd2bf64f9eab9be8359247c57fa7b66d16786644f9d96738d57316b75feff4da1a2a75f5d4a302fc6cd08"; + sha512 = "e271a6208e6b7fe662284f76f22482d854be8e700923c96b2426036588f02a52c9698ef05bbe8422dcbc4a899eac3bfe247f28146e2f64ebe0699669219051ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/nn-NO/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/nn-NO/firefox-75.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "cb3cf186419c3303cacc92326d901a4f1b79991ec5054a8438047df06e052ed981eac7cad8a6bf5a360c673f232d623ad40af83537de962caa361e0e8839210c"; + sha512 = "e7a2b1e038cae097babc40eca692da1a4066f01a18ad958378533ea03cdc49e917e13c18aae0fc40dfc99723e3f86b25b1ae35f2d400f83add63c4151a4807a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/oc/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/oc/firefox-75.0b2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "28b65b10cda0c34ec99975d3612576619a897eb2bff5ed215068b133c3c32793810994cfc15877529fe1fcdd9abe48001a873ad929f1f6578a91dafb075375eb"; + sha512 = "d9c3701024ac70fb83ccff3e2b843d224115608b7fad1d6db672af3716e9fe7a80efb8d92a366d085376dea51daf099299acca629113779622b39eb19750dfca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/pa-IN/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/pa-IN/firefox-75.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "a4068e759d8af078c3e7f9cf58c00c2fbebe09fc2c204373d5850d195c9d6923721d43091aae2cd27430967254a16dc3f1dbad44da9eadd3974f5b38257a21bf"; + sha512 = "68d13fab28380f7ea29898dc2ff91d6a2d591a2bccf0498023494466827b4b4eb7ca7769b93e042dc855994d590d770b80b9c5d1b636f6923534a595cf6d356d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/pl/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/pl/firefox-75.0b2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "49e50aa82149d9c0bb06d6351326c43a08198e321cda4b8023b02a48d53931447dffe70c3fab55eeae979898749cf884b57a4b49bcdc223231ba9034ed9ce089"; + sha512 = "69b5807c0cf3053f87e5a8b2fe51dfa40146685afbab623a7824f6fe6fbe786dbd17c683d697f6b61adf78f800b84c0c5a16e7caef54a6b3dc02d0ffd5ca89ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/pt-BR/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/pt-BR/firefox-75.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "0c2b334dc66242cf7653665a66536b23be1bcf5b8e8278714b437b894f80a679f13bc92e409ff9674f60015c8046e97b9847f4d613eecb64787b766898bdf9e3"; + sha512 = "f9ae02b7c9c72a97b8d28ef1e1196dfbbd5ae30acd82939c8b7fe37a1de0c73492ad286e4ff05c0b5f8c2784e0a1b2b68445b94bf765b501c062f33ad1ea8e61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/pt-PT/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/pt-PT/firefox-75.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "ecd47ca036187a034913b59510081d009b6932e8e7d328ff917aa99c717523da96468f843b25e5044dafa15d1858e8331d6558dd344e31263de27d0dfd76c2c3"; + sha512 = "e89bada391d72440f6fb60933f33e78642a595dafb277d4d20768fd418c6049f6969cad8d1b95c76670cf7a033acdf438348e0a6efce9c699a7a2276d2b03f56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/rm/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/rm/firefox-75.0b2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "fd6d6db19134f494e72991f300e1990b78db9391b0a3a447eccc57add51ba7a1008a492532149d39afc561ee188a7836c3a0fc75c222c59400dbf60dc28080ae"; + sha512 = "281ff5d841f3dcf7e2ef42a159a5a43426fca475bda02f70a34b7fce50a0e313f61cb11d25f0876314aca3f3c285504098c60f0e79385653f8b877994e5e5275"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ro/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ro/firefox-75.0b2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "62ec3ba94ca44e2ca92fb0dc02834d39b91f7a1ce6446407531019332f1b9d129bdd8ef9de7c0cc26cd8857ae82d03539f7d0f2a51e5f755d4311fa3ae410eb5"; + sha512 = "62bd91413af9017d6d4b70145f4c763fa7b35d78719ed14ca808ab3a38a4a3717eff3584a29b4c38de05c78365351cdc5a07bb3a56d46c65ee5447a3a0226276"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ru/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ru/firefox-75.0b2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "2b89defde47592774464b8570b81636d94d77a891c22e353e5bafede7c370b4331aa8aa49b2701239ca58eb8d08d74a7525661a57374f1686a427346fc425f9f"; + sha512 = "40e917d1a07ebe8a1cc6af2b399187f4f918ac3d509eeb8c6125147313b469847e34f8b9e705b400123d4327ad1b13f2b4de24f70e33236f7bd4260b4b13ca94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/si/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/si/firefox-75.0b2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "8a86deb917486f679316b9f8d2d7bc54ea175d87f972cd9697d1ddd3e1fc357059fb6383a777d409d5b3a110ae7f74505e327eace3593ec4b4fb35290edbc0d3"; + sha512 = "58874b4198c1a7b374ed0d72cc223733889a3bad6f717151dbfe7e584df3059527d6a4ba055575d1c2dea74393f3d70705185e0c2cc589306c5f1e62a31aecfb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/sk/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/sk/firefox-75.0b2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "ea15d6e49b8987f4c6136de6fec19a627d71434378f2839046a3fe443ee340a925773bcb09c5dfd3779cd1118aebdac808f54c5872245b11ab882564f81467aa"; + sha512 = "6cc148e5f962006d2f5a5651c99e170b706c0e51ed82736aa51a3a15e8b254a67f6df6d7067e261d0a269e71995e1555de7fed81b02776885dab67881cd17cfd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/sl/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/sl/firefox-75.0b2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "3dd20c0ee05318cc7f80a27d895af4952bb13b8ee3af1fd733a0bc03902f470fa31fd8b3231d608e76df3885c6036f27ddc5241bb889fbb43b09467d34fe77bd"; + sha512 = "1abfd77e7ef638d1d1fe1e1d8b31631f0a93e982c22c6affc9fc9af77dacc81d53afa95f63fee1a1b444ea7db88826a4f6a851c87b6518f2c6a77329c4aa2c8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/son/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/son/firefox-75.0b2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "513c17a2d91d28f5ac958d45f872a931b3f3db198355a70b72e0238938811e2387fa5d15b0106feb3fcaaf455e19e7603c37b27dd39d8d81dff4106face87481"; + sha512 = "80e7fd5e34fbf115b4462913449d58e8bdd725f45120d068b8ea6624293cc944ddc218e3854b7e6935675ee1640446f063858515c70bc1a7990a3c10ac812529"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/sq/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/sq/firefox-75.0b2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "ce96e1f7f0f0152afc053d4f2ae2c8774cd79e12ee250de311fe39c22b933fdba701dddbc2430c5aaa3ddef8d4920c2a04d9373fe8e8aab7a3bab9a6863ba68c"; + sha512 = "9e5088a05c22a448bb1212d2296d0b8690189d6bba8053661445e891b6e8c2716ef76a82e6659eda9c434f92a7f063e13845ce20944df571ff318eef764c2ef2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/sr/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/sr/firefox-75.0b2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "67691bade82b21bffbe312b6dd3db5c7aab2bcc28ec59cd0ac378ede98d92c15d98b2c4ccdd6d7bcb77d88f760e7c8880d3db5d93286cf6a71a79816adcdb0ce"; + sha512 = "18bfaaf378edb31b99bee33a60ffb06138dc6c7ff34c166de30255ffdfbcd7c2cda214678bfd0e11d4f5afc4a666d6c3ab7d1ffc92137abbd08c9e704f4d1d7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/sv-SE/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/sv-SE/firefox-75.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "5e890e03090c8d3317f8910c16602e9d26df02d91a05159d4610a3b8f0c3b8a026e6256c59406d40d979f93a20f162e1d344d6c430b33e86709dd66b211246ad"; + sha512 = "f27fed18480927afae490b8f0c2c4c925045e56bb355404ef499289909e256fafc694cf51f030fd69ea395ad5b5e593f991ac428274af745bf39336d247e868d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ta/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ta/firefox-75.0b2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "30a030bfb1e92f3375411c9bd38b8c75db01783ed45bd6d1b3919442bf386ffbabca7a3064ca22800e22b9255b81d415e8487f00a50e0641c9f8bff297d0a4c5"; + sha512 = "200b41c6db82f1282155cdb348b8496bc61c9e248e6049e7dbaaec3732b4711f32b38b3ea349b47f1228bd8c712b15db3b9296babc177169795fe1819144ca93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/te/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/te/firefox-75.0b2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "bc2685e7a6e4e1e744367e01222b192cb35a5cbbc0e5e5f8e3c03e9ef8dd54b599f854bd045d03b02c2fadc36bd778b9f4c72e660357f96e7fe8e49a9b555331"; + sha512 = "193a3b9cf98de69ab236f9efd59e23deee25eec41e409a93c9949789d242957f2b58bf724fe3effa28111595c9d1e49a657a5d7f6c1b77a285386b712bee67aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/th/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/th/firefox-75.0b2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "8cb0fdf71183382c11d3d8244cca52dc9ab1d95a929809e016867ebfdfe1e9ff722a6a54d8e829cd659d218097df8ad503286fa2d60aeab0bc29d514cc1cb304"; + sha512 = "3ab9a77fb25870271c9cc415c31f1ec0258a66b3f1855c761dac367cfb509b6c73630c88f022cae271cc553adce8ffe63fb1bbd489067b92772286fbcd765c16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/tl/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/tl/firefox-75.0b2.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha512 = "807581a2d4f4b87938058ba8173cfeb944cc54790c01d6477fe9a9b75848341f785768b4b011c33f3010ddc02fb1937cceea27a8260e3d53c386acbc21d7152e"; + sha512 = "f386b2d32e2656ef8e9a0afe0050eb7c8d8a1a00b92badeb6b5c2c6d8e046a2ca7b038677af56e725d15ca4c6111a04e1c929cad0575a034745e2476497c2cdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/tr/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/tr/firefox-75.0b2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "089f764a47b35d5a96edb36f3f056fefd2a2e649036b713a28a482a5cf5a61f5ccadd5e8f20588a0c40bf707f556ae238688b605db189e9a1efc2dcb7d9ecdc4"; + sha512 = "802c72564706b4e447f0cc2835046b44395519d0c2d7fcf6c8f8478540649362a49144dba942e1c1e33e69ff69708437a985665389ea2b1307f8c386690f9664"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/trs/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/trs/firefox-75.0b2.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha512 = "35622a3df18be8710530531cf934b5d3c79b942e4f1024edc75b810bd71d45d52ce88ef051fd051083f45b50152602b76d854d2ae56bb64a38739be937884a87"; + sha512 = "60f8f09625d8d2633ca7b08fa3f66573ce0d23035f16773a338fc96944c66e6bc77af36b128589634fc99f86009bb1016ee2d1ed503407c2ff085d20c5e2fb12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/uk/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/uk/firefox-75.0b2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "77a2383129c6f60f77458e3e17bc57015f91d8f58d9d0211dda918d075b57398d7cf80cc2409eef2c6053c843667e6b094733026533e5ae665845bc925a67f40"; + sha512 = "d3b63163cacd6ba99e3f7dc9d5ac81e98155e77c0315ce9adc2e23cfce614f67b519ebc5ee8aa4f1aaf932c7f619f828487f41c6a712557c3f8289f9b3205f2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ur/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ur/firefox-75.0b2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "45d49bb2de384d12749c45f02cc726627123f9b50f920f144a2aebae694407226497df5c0273eda168f11f2adec22495cafc82c114f711c858b9b207d997e1f3"; + sha512 = "ae76e9dfd1b22a7cdd15c4b4b8b2a508168359cbc6b15ec9b52e489f2670799e1056eb6d7fd6fd28680b721a4912bba982ab259a02b050834e31030960b2a8d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/uz/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/uz/firefox-75.0b2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "14bdd8d672660b0cfa8099276870e54b725d1effdd7128666dc77e942c7295e466544806ea134d48b56e8c5b37518876c5a14c79419fa232f30e35cadc217948"; + sha512 = "6216b85a6b4329f378d057d72418a283c4e9e1454f918636c7dd0845e63a00827259397e82c7875d1157bf05dba32d706cef94239cd9ef6ffe03fb02255659f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/vi/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/vi/firefox-75.0b2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "3633f9e834c5ff0dd0a888a35f414d87ca35ff0acf63fa41ca4169531f20c21a7debc649c583ed2826b1217b209e42355625a7d822c8e354d4d973aeeb07c359"; + sha512 = "ba8fff9fdeb195f42409a10d0fdcb6e8889a6cc49fd3c787013109b32692e19109b9029d69a8458b05b51d8df1dcf085c818a0c1ff5a48d32f68d251e41e9681"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/xh/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/xh/firefox-75.0b2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "b49201efcbaa9254d94940d87529ea15c1ec18682098e46bb4c6df96d20396e6884538bd93ef79a0539d52bea808f9c9e621f4a157b0fa48310bc89ecc659052"; + sha512 = "0493e6e0d685809ac5f757a829cc0ca0564d8d778dadec422698c369f9aecdccf94be594919273b9bdcd23677f0e8a760e01dd40439262c98c9ae5f17b7888cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/zh-CN/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/zh-CN/firefox-75.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "5d00ab9e02db12e34a69d5a8301075f695e103c73bc5d3942e8aa6312010fd9bcbbfae2db19dffb12e369e4abcda0919842a839eae48e27b63a9a40a2d152943"; + sha512 = "efe3823502fd81587460486dd7df33fbb878e8dc657c3d65d8e3f112374d3452abdfb797eb95ea7d4e3fd7003a2b906e78643ff1f344088e9a8a577f554affb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/zh-TW/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/zh-TW/firefox-75.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "8b5c6e59a6a93c1e569ab0549deb0ed529ff7463b999c39e1f737805d71edab8553bed6bce5335aa75657c1356fb847d8389829f74e0d8977765fe6b5f7ae615"; + sha512 = "d3561f2f043480c2c6bb2e0d455a752c2a00f800fd049a21c80cddd03ddf04d184f3bf352446dd3a858bcab5a42543992ebcc86246815205a455095b5884df75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ach/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ach/firefox-75.0b2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "4182a91809587cb00b5b15cf244385625dbd1043f64ec67719fd4532315f02983c605554fcec94e3ac9e152c5a69519b9f3cb274c4dfa4850b509669214ab970"; + sha512 = "7b9cf2172a3e4a7e7bfea4ecec10adba14944dad36db06d3ed60c36a5d893c67a0c6eb9e65f612040e7c3e2b7a9e966c53be7c2d5faca60e37fad2c497194d44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/af/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/af/firefox-75.0b2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "37505dd57623b9b8ed5c9481b3c355790f4a83758629fecde8f286126455f83b4908f0dcafaa6b53a78ac2d1c0d77e8f8d3721d3677461729561b0460c0e3da5"; + sha512 = "3dd2f4ac297e6e358657f90beaac9093816d339f84c21dbe3f87283c6712b1ab70c6fd9e70d05bc79a8997ba314711c37ace35c7c7e8a4140b9da99d953968f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/an/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/an/firefox-75.0b2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "bdf45ce1f39caee0addced219c3702e888d749249c81082f0fd851375029557c995cad40bd3ead24aba1c52b96b440b3004b43994a4a9268c1bd041a7dd92e07"; + sha512 = "e04e6875c8873fdeceae22c486b0a5f718085f35a5e46b4f3340ce4654709e4421060be73bccb315db4ac4a93991b5e844653b19518fc122150dd6c6ad84e89f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ar/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ar/firefox-75.0b2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "c69b667ef5066064fffdbe8adce20784c23e0985e30490d4ab7905da6cebdbf49557ddc321221130e6e7af63753bc7b9bbd290960ce1b86591cccf0ec53fd171"; + sha512 = "0c1728f66fc037ffef1ab0f68d5a7e5ca3207467ad03981c0681981c562b6f51df0026b8b323dc4f0e15ccfcca470c1705776353c0b2d4802aeb8879fe306548"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ast/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ast/firefox-75.0b2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "a697e44af702f500d72e8142cd76230b886b893a310dad7136b583204f8201b0718b97f5b11cbe3af4baa0e95f46fe6f1e69ccf4b9ed42c34d782c320d6d2f19"; + sha512 = "1b8fb16468b2db02e8e16d6f11d4924960f48dec2996ff087d94106d4b80c2250acc6e07f510ae4f7db65f590944df8a44eacede55deb915259fa719ad30514e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/az/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/az/firefox-75.0b2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "ebe0786c3790da17fc1dd5ca0f10ab3fb854e90b08c3093aeb14d5df09b58d8ae0954b7bb99d159736f0cbb70391d81a47dcc9e229b02ed5fbb2b9ac7e19cda4"; + sha512 = "500ea5cea770c8d8e5e89d367e9239fe4ad065f43ceb2c1ecb2ca997dc27989a489586b6f387149d6d97d204a2cedfef7ee3eb745bc91d140ee8ff162d6327be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/be/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/be/firefox-75.0b2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "74003379f102a2c8c8079eab756afe16ab1037d985fbd266bfc80abaa5ce6dfe911b20ddcbe5dc228e87dcda4f0f7f874cf2dd762dff90c89c5e865c77304d1a"; + sha512 = "5c258e46db0b6a22b6a658dbbb4a321226b54ca66fcbf8e41d345ace9c1fb36fcfb415d06dcbe0da14cb9ef9d952146f232ebe962b975d5a45df70b30e0b0b50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/bg/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/bg/firefox-75.0b2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "71ad6c25955e6c840e583ad8a7f83c5de21445f0784c36f2073e42a036a16e58ca768ba43468bf5432148ff6d254b5cc547341cc38dcf844c7f40c3225df21c1"; + sha512 = "a970851cfb8c1231399d2fadd15390f7a7a9a317169b85543d262b7c1003c84e11140fa364312938271c0288e4a10804628f6ee286dd68d1bccf1cabf4c015d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/bn/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/bn/firefox-75.0b2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "840e225c9112502bccdda79146dd5c9b920f1eed97afe7423e539f750f02a0b343bf3313ba8826145efdf318fdd17bbff5de142fcd3e1178334af55fecec67dc"; + sha512 = "a8442613f7aefa8bb4ab963e2271612cddb102bb8274e09cc80436e85ad606fa3d4938188c85c0a10aa01479976dadc4c4d6c2a17835980191e9dfc4608a9482"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/br/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/br/firefox-75.0b2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "6dfaa0af20e6b874fe675b879da9e7edb80b0486ef283d3e957be8d7804781c083f9ee12c9b5da758e9e38806cd35cc0ec78ea3aca3f7e2dd994e6c06c167abd"; + sha512 = "a3d32c2ee9fc1abb86162f04ebc7d13d3bf03d1596874c2198e031e2f993d0140fdbdc47f22bb7c821ade80f2cf12471f9d8191c5b7f7c87849a5577e4638531"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/bs/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/bs/firefox-75.0b2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "ee62dbead4c185915d72facdb7ddfd42f6e543d3dcb48ede83cb0026581e0b4236e3b29c89053c302441b51b13333d3cc46500eb389fc1c72c7d467da0f21d06"; + sha512 = "a5d54761563e2a62d0aae4b946b39f2d04d57f2a1245266c11bb4bd872d73cf7738c3a9d7c2ad47ee4c13175bf4f142e45a3a7f62582bef03a946ae98b7c038f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ca-valencia/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ca-valencia/firefox-75.0b2.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha512 = "56ef6d6859e260058cdcca261452524eead1cd1f57811f64776f3703e16e44599c665c2071f1c29188fbb5f02481467d1bb569722460970f951f7c50ed44f2bd"; + sha512 = "0b6d18b4f6cc77704997a7fa9d81dc58e70c1f4c08403164b93ab915683c7005410f5f90204a8e609a54dfba5cdaafdb268450d075182efdbc73701f07adc1ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ca/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ca/firefox-75.0b2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "32249eeeeb5bfd1155d9a7e8ec13d5da92a49193ff6d3298df01f525ff08186ca2a6e7e14bbcba048abbffa1fcad3ca0ee3394f8ee548b6470f9c961a26a8276"; + sha512 = "c65b0437b82cb4ea3b1eff84fc75ebcbf65cbaae22631471fbc8ccf4e2a6ff846adb88e4d93566fcfd394fd4ef4c4d15e63e41c11ded3678fe69032765dbd3d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/cak/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/cak/firefox-75.0b2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "00b5766bc6b96dd85222d9a9e9ba58b22bd0f78d42c0ed929279242a3973efee0b7c6fbaa5b8796b3b6488a3c2883a06e221916201740c8352be134fa2f988ba"; + sha512 = "2eb289a7c474279422dbd4fd6396f08946790e3ec98a6c5c40e217efc47a9099d16f01205027c995c0441e5787f48d95d6c40216ced393219eca3d55159a5459"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/cs/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/cs/firefox-75.0b2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "2d6ffdbb0ac90d626f613942f3c1e474e39dd73c7f54ee9587882ef09006f78f5bc9e9738d25d63e55123c9e8652b4b5484e9881720e911f1f5e01d55209884d"; + sha512 = "bf15d558e81ae3a766801b532b9cc2ac5511b2ca6eafaef012a4f9dc8fba06c6ae0e906541db01b59d566453b916bcad79749e1b036573c4a01a04a95a0dd60c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/cy/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/cy/firefox-75.0b2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "867b673671dbe387069de42909aaccd04f4c164ee73cd1ae4170fc0333c54a48ba557b2d3956b60953f39463b86a6d6525b2a5e325e22c22cfa3c446f7fc3340"; + sha512 = "66883ec6b398b6071b13c55027a3e3343e3e71b6de5ce7ea72c052c9991636a09737509d8127d2a27fb6550e0937ea21954c85d6daa8492c87c2287d542d73ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/da/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/da/firefox-75.0b2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "d0cfbf8493cb53096d1667b2a453b569c1ea9fc3815f95de9128fe784416671ef770fc3e70701ba0a5a935563b3b055cf3db5cd849520ec2d75d52527111156b"; + sha512 = "d496d35be0076336a5ce37097026959ff8ce391c07b7ecdaa543d45740af18e3d466470478c9639c4f3b8a5d6ea76dade7196f65e411bd90e5dad9ec1c10a258"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/de/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/de/firefox-75.0b2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "c52ec2293b4f7d61ddf1860a63d76e01555023f203420bc6fb53bfb24e407aefb4276896b343bfea2517bed9674fb39431bf1a38124288b6376d480b9432a51f"; + sha512 = "7df38aa573d796c23e00715ca333c7a1f90d560513c17ae35afa80ddf2783ed4f091cf2e0d8b25174186008ef818e5aabe993e2f013af7d9b61fb0ad0c954886"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/dsb/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/dsb/firefox-75.0b2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "9ad7846365072c32a841f30e1c040c56144e95fe4d9f4cab9adb282ce9a5dbd481d498fc71b0330feadaa68f23a35ca512c1ebe3d07f7a4032567a6225c875c9"; + sha512 = "d72d5940904da04577dd0ec0f90128bf4c89b8261f54ade9a265547957fa9ebb7687ade1503a0b8bfbffac094953cd0d1fcc836e26203545ad497221152a2847"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/el/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/el/firefox-75.0b2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "526d4562e8b1e239b2e15ab89c90646fff6b85daa309a9388dfdc60c4be743ce39a03505af58f827e9549fa4b8e658bffa2a5a7f22921a94f54c1737b6df11b0"; + sha512 = "d05716e457a5eb13a51b0bbfda6eba4f9ce775f567e4750831a1a3fe2d5d2beb8668d80dd7375e7b4db2603d589a6209634d6704ef34a851f1a8a750d1ec40db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/en-CA/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/en-CA/firefox-75.0b2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "6a7c18c9581327c40f128acc56e8a9f4c7575b85472ebf120047d3f5abb220fdc03f78b5a182c9e3ac93970d24ecec3a57224cd02ca2537ab5b86e594cb7bc2f"; + sha512 = "0821949d86082a2556ed163fa2c977e79293f45b6dfbf2517c3a01cb4ad5d50491e6db900106c4141a93461cb456d613c5be3aeb9afc8d4f502df0fae15c1b58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/en-GB/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/en-GB/firefox-75.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "48cc9068571767366a5086f340a5d4566e1d8261e4bb715fa3463106db4c02a5af316b37775e4720344ae2068eb35fe004bf893ac1ebe923336f13978e2ac955"; + sha512 = "df4bba4600e6100772a373c6bad0064c0ba3d04c7db50a2a8780bece46666e254402d3cfae20114b29a1cadf19d978d47127c0e39619d40876b0fa3df4b2a84b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/en-US/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/en-US/firefox-75.0b2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "e50c0d061aba197a2f2e153731dc5169fab02416733669a593387338a1acfba1bbaa2d26aa0ffc75fc972524ad70ceabceec30912e06cb827a25036607acb7d8"; + sha512 = "56f6fa58f059e2c757e564a3cc25121d816c2afc347bb47fcf2c5de23b384cdaadf291f02636aa179eab0e6ef185b3b79653f5bdccf6a92d825c3a7c2c9a11a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/eo/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/eo/firefox-75.0b2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "23586c04536846ef9b0750fde66b04efa265f97a5d8c30c7f5e435010b80b0d6556caa9b6c579126080fd3d58abd957dabe5723779af1936ebe4c21c185d333a"; + sha512 = "9ff03e25d258168238f0d6c2654ae4896fad897e0c9b797911716e7496846b853601e0dba92db5b1c86ae94476752d9dd5714242dce620cabb5ebddaeae062c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/es-AR/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/es-AR/firefox-75.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "6d2c87e248b8e4e395af916d6b91eba9451e1b6664b31d843409b06e4589daa044392a1f4f31cab9411350c753d21a817411cf7149dde4eaa87ec20ab724f63f"; + sha512 = "05be15de79e1c2807427a927ca3d580d3bbdb5d4df0e4be06e23462a843d125df22471d5793be410a24b262b1796fbbaabcd27cdfa12cd0769b68967ebc9f5f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/es-CL/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/es-CL/firefox-75.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "b9576b60cb40716707c5037de36ce278c9d8410bdb68ea0e1bacab310e8c0679fe80d0a5ada111e9f605a4eb313a7d7519fde7dede3de43eed40cd88386f16ec"; + sha512 = "22e4bb6047ed7ad134ed1c33880e44dc7067a2e1510452483004075763b30f91dd1221cf3ac0069e2f31cf0a360305bbcbd116e62133b56ad509ac3c4035bce6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/es-ES/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/es-ES/firefox-75.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "602e5a02e5a534650036067f87fb844ddc564aa54ee219ada4098ebd4e7c60635c59b0ec1435f2a7d963cf0fc35e0850e0a86007e4562155bc1bc07b78349e95"; + sha512 = "0930851d3c29384c619347fe6098764119b1a994640c744ab57f2b727164f6596b7c2c160459e483a9947fbecc55d6a1781ebfe52e8b6ed28403f3464f56c98e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/es-MX/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/es-MX/firefox-75.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "0088acbde6764febe9b37b8485110d34bf72c20b1aa4fa9435712c3b58609ac082c7d1ea203157394ecd9d7609f35fa05e784e6fc5273f14d8c216a392d4ce9f"; + sha512 = "ce7b0b898fdf70b6751ee95ca098e5b1bd6a8798313cb1cce0201d8457bb90b10faa2ed2bcba04113e10a76f92f3b3b0b8beab7771fefb9cf2cdcac3a4385041"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/et/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/et/firefox-75.0b2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "a88ad46ba958dde4ce6589e05bb941707b894ac8b5289f7dc4763d5960a7a4754fbf5dc669ef8318867482a9fff61e711e2c13befc08dc1201ddf5c3273051c4"; + sha512 = "0d8961cde7ca4bcdb16bcf579158ceebbff44f07565267765178ddbb9a5318e58d60b2f70bc1fe0a939d06d1705f986770b9fb17a8d22149feb1d66c44e89d38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/eu/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/eu/firefox-75.0b2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "c24c9ac1869ab82ea8ce162cf441e45356583e4e5466058460ddf925c25a88580bad7672ba82abad090faf29dc804e098abf0aba72f1cec18736bab1f3410c1d"; + sha512 = "f77101548344ab87593ea80be86fcf6f27ef6db48f394db549815c1faed4fd439a28ba87321befcbf79f0c9dda93169abd1cf68649f626da694032fb291a0434"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/fa/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/fa/firefox-75.0b2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "16e30c57680a2ad0c7557f4819a0aa28e4e066d3a7b39ef9e1b99fe69d0c8825120f086ad628f3cd0fb85c28d9059a9ead5f9dbc695777ad06bb7430857a966a"; + sha512 = "c65ad5b2726dc17ae327ee02704ef1eddf29bdea9b27096ca571dfc4f12449a4f1a6cb8550e401d6ecb106a2ac0ffdbd536a12f41d6fb4944012f106adb0b72b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ff/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ff/firefox-75.0b2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "e4b53574e12f35124c3fad67f53524b8788ed2625156fd5d73742414c179a71892732643cc9d29dae3e036820f1ce1701552a4ac29c2a9de0af89094e9dbd937"; + sha512 = "09baa6e459175ca1042b489b63c0f6e8248e4039d6addb2d873dee777cc94b5e3e4b0c77f78f8462239f6886e74deeaff528c271a03433589caf4db6c2202c4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/fi/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/fi/firefox-75.0b2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "0005ff250d51f48dbac887e2a9c4d74253f4c01a8cd1f4fceceefd2596dc5290f24147f3ec7b7e4b487b7c6036c05a74025fc7f736daba943e599d93c9c5e789"; + sha512 = "52d3945bb5f16874c28a37230c0b2a593d368842dea2aaca9cae6c017f182eaf165fb3658a6a1a0881d54c88fa5dd7ff42806f8eb95653095364f66f0598b26a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/fr/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/fr/firefox-75.0b2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "419ed2989376b876c13851f98c4d278b79b81f9dd5be9c2121e2fc365681e7348e077f5e70013cfa8d271ce7d10cab487f1479c031d3a4d428885ae3614db2bb"; + sha512 = "8bd4b0d20ca32693f34c8aba6f01fe1a2b0a3a7730ef1948de81dbe8944dba09ca6d24f87a131831d7276f9ecc44234778cedf4d1f814784e65607d13829990c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/fy-NL/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/fy-NL/firefox-75.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "ebba32714ef12a12a7a1c1cc485cc5d0287c3d7657278a599f906cd5c214612bf1be0a786d2c8079b483406c4c1161fb96b50f046cd9c878bddae5f927453588"; + sha512 = "851cb969a20e1927f06a6d33a0851f6e63ed14defea566de90ed2c98e592a00cfd1bf34de55c125449c2355002870b7cf5e3548d37055a5cc16a36192f9c92d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ga-IE/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ga-IE/firefox-75.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "86d2d878625c230cb251f2f88dda89fcd82e6ab8535b1eb7476a11f023145c6d5b38f3615920b11079357e8af7ff17801326380543e6b0a5d9e4d9e1356a8ea8"; + sha512 = "79ab060d152b810917803cffab7aef198670a98d8d72d9ebde1c3d3dfb6882ba19cc27e6454654d7a164dd712280d257b33e954f628ed7d59c8d3915031c2767"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/gd/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/gd/firefox-75.0b2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "ed5cfc312da1b7c336f449301a37b8ff6f5c83c8ae0aee3ef83bae8f3e4accf56da7680694327a5ae6294df7015037f31afdc30a409678406fdc83c821aaf490"; + sha512 = "4800e3ec3a0a53ef9a2cd605ec93d4609f862afe1f3c2e7bc7d64ebc5b5ca17ead6aa2027a5da7b28648d7e4db2059987872d74225ad765f68a4cc5c45f14a1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/gl/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/gl/firefox-75.0b2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "701fe5b9dee8b64314b3e1bfce55ae3d1d33aceb871650098c8e10826f5e88e6c734698937cbaf2f0fbe07e2e6c914270842a3df399cdbc82a3556b1ec048a45"; + sha512 = "8fa1cd71b985fbac1f0e4d817a1c3c7c7ccef1a1e8c59fe14593f4ac09a6f6f55919c060adf25f3fee9aec706e5ae07a14ea3d7c945d6820129a712ea237b232"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/gn/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/gn/firefox-75.0b2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "40be9288775e6411f7f682cac10ba9d5ca3618a7b8d64086278c4fe9e2766c6bb24b5c1444d344643adfa93a2751f1855107d66b4b2260e0da3f4f473b71d2b4"; + sha512 = "8eb3a9b75d70ef358559414b39853177fc65bc7d7756f446ce65a5c9c94ece92d59f76d74c17dbdf877ffd977aa41cc2e52b3ab10122908e422566f12a016c6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/gu-IN/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/gu-IN/firefox-75.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "057941bb40197fca1069bf7eb787b2bafcf998d1cc83af1b64abee3c17cb5a0b5d2975f4183ed33dbbc2c056e3e316f29b8aaf21f2c711b7a474000dc159d5b5"; + sha512 = "741004043f30eaf344a1bd6ad36f7de64d935f7b056dd9daa516df64dff3632dae02d300afc27ff1c0cdcc5208e64dadec64b1df8139098efdc05f7d95a066d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/he/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/he/firefox-75.0b2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "f75b88b8de0aca5e31594a592b3827d2f0925d9c307200dbf8c2cf0ea04239d371412daabecc29a689ce5cd273ffdcfcd40fb03c2e91fe9162fe48bde5178a74"; + sha512 = "b6afd8db87c18cc0b5cb7ba45386555ca45b27baa469272dba66ad4b3fe11db7e5c6c48742691febcbe7963729bf34c778dbb6248c01c1db3a685f38a17d6bfe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/hi-IN/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/hi-IN/firefox-75.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "f4890834127bac76196e2b94461f28916b4467e35b43f40a6153e43ce90eee60903ac7d1d7cdbfc1eec8d27fa47e2cde6d2c95a1a996a5179b9d1cd9b160d927"; + sha512 = "b73988b29f52012ed911bdc97e1978ad8e56e640666879358a1cb79f88c56676e25f578a64b449372522a27abcfd37c44071955e273f4291ccf15fccceedb645"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/hr/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/hr/firefox-75.0b2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "ffd75c9101ebcea645f704c2fda287a7365f473a8d9efea75df889ad7a9d36c1c170690adafe20a1b2b09cd39014ea4913b440044d08b0e9c2f412dd17ed2ea4"; + sha512 = "603ac12312015dc9f9f24d0ae48b50b55d8f109e31566823f387ffc17a1b99fa958d14f6214d7aa8efc4cb71e090901fdca2068e491218cb17acf914e3f8570c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/hsb/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/hsb/firefox-75.0b2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "0c0912b483c984f6ea58e2a35f07a2932c3ea56e1e49324d979638ec8d6652d89c6690672f17dcf6ba4a751d8d2395b9a1e2a6503f3c8476f8e3a199e2ce3843"; + sha512 = "a15a1c2a67ab12f2dc506e9138bcfde2740de9dddbcbe825300555b7c72be7b78ef15433eba60a132f8c8537cd1b42f05272eee399dc3f69e8defbe5ac696fa6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/hu/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/hu/firefox-75.0b2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "716dc8e392758954849fc7928864bed6cd0fe40aaa51872f4dfdbccb28edeed138b1eed6f7d1c401bdb7b080c7c5fbd0e62c0133bff270c68421fb48579783eb"; + sha512 = "829f16afa6bd4d1909633e3f4cd0134a4d397b32c1b85b1203f54217f23577da0eda8bb207b07a46a7c9c09bccd392f4dd89ade408d2460720ba5667842b9a4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/hy-AM/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/hy-AM/firefox-75.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "bf28485aa9ff76aa20db8be6020763e46151d87d3e4f8fbe8c8e72af9e81198ec645d47cfac29254fe802304269fa00addbd75aac6fc2928880b92feb87e11d3"; + sha512 = "acca12ef2379c4c833b3cae7510fbc01f71edc3d6a9b6ca39dc560fd892b8ade2aa05eab318a79db5bac0e1d98af6c31599bac029ee7f58195c062d3bbdf3a23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ia/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ia/firefox-75.0b2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "1a3811dce3493851734afc5b955533edee0029783a5cabce62e72649a0cdadab52206dc72d414ae2b92f34b425f111bf5b399f07c15f7b5c81f7eec3ddfb82fa"; + sha512 = "c33bf450f946110bf8c72023c1c6079287c944af445f63e4d8154de3fa5be8f6905c9b479d79aa82883aed95741f6d53776b87245e7d0d71af3988f54591f344"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/id/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/id/firefox-75.0b2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "67b851f947407b7735d7335bc3d9fad5ea736e9bdf03cde7a28b3854b398263ca6956c2baef014bd6969b254d203d0784afc53127f66270ab8df1922ea8f1ca1"; + sha512 = "f3c9aa62d4a35b43aa60d6d577ac6136d1646e5d577a0a1b7e02781dd33f7579fc5dca0c82c1ed0be226c0b3fb8fd1cbf1eac4d17a8cbde2fefef026e9e4518c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/is/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/is/firefox-75.0b2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "5eea1c115b5725fefaad5be3cd401fbac96ea50886ec3bdfff586cfb08c48b2f5611a797f476f34f43706c0708ef460e7b0b75e104f87ad358369f07743a9b76"; + sha512 = "e3fdd7ab88f947359973827320c4b27150c83ddf9c650d4358198d8466c7da92df2e50252a8988ea346c72ae491a6013558795b968ec947ab9215ae285416a40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/it/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/it/firefox-75.0b2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "0f44fdc04418f28d24638cc1893bb8aa6ca790e8afdf5d29da8b13e491f3acc53a0edc91c61679feef7eb4a2714308c36453f19a20c16d939dd7c248ba35dad3"; + sha512 = "1d02f91f1612e3e94e9c39307fcca3ec90148a46c6289ab4b6509fa6dd5249e1fb3677980adfbd43166c104f265f5059ca732f56a37ca19bbe9937dbc0971113"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ja/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ja/firefox-75.0b2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "e951694a4d8f1f9570a869cc5a0dcca733fa3d9c4089528ea55ee8ee70251dbc0e873530c87df293c2259dca59b8c92ae247897846c93b0f9e2b510643ccbdd3"; + sha512 = "cdc66861781be3233ba9461aaac720ed2e0f1517b97dd76d002cba7ae5c9ca4f3fa11b69e0f87a284e52c96ca6274ec6386d8392ce47e433c65eecb20a5e9cd6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ka/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ka/firefox-75.0b2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "f4613efe42a9b2ac03d85e5d8164031d869d8e253c681f2d002e180eb2bf214a33671da7a39d9e0149ceef1ea27f783a5b69be7d2e02e0497c474b2149477f4e"; + sha512 = "95e2d1276083f356d8c176ef2deee23b933f8dea4056d68e6befa45ed4848d985eecc2cb6024bb51fa9768ef9463b84cb66180fe1ca7da752a5828bd721a7344"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/kab/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/kab/firefox-75.0b2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "e59813d89542a9fc68291a3a8cb75de567b247142596147f54e6a2e83170444d684003274e449649055225c0c8b882d96924a265b8d2de98711299e21776563d"; + sha512 = "d9d7eca0eac6554d1917c750c9f6b3fd1a0f838e3dece2f1e6e7f3e943051978ddc430fda3b73bed8b21fe3b07a7c509f2fdc61e061e8ab227beb277b7e3388f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/kk/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/kk/firefox-75.0b2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "b944ab903eb5b7075f3ea633e1ec40b4c688a2a97103f81ac80f6de77a3bfd4384de1314010b82937c986240e8e8dd40841a07c27e72c56b962a428aed24aa39"; + sha512 = "a3b7c99fec93983aa18541b3b0ef11e57366f38da522ebb283bffeabc504e21672f4eee2b93e2f364dc6c2656b39fbdd4beb74880b86b6bfd88a09f6764b2c8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/km/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/km/firefox-75.0b2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "83eec772f2bb78198a955dad41ad6d68d9247006bb3430bc058da6da2d0d42c4a691ae20a4cee1a7b8c3495f6b07c15cb1487e7e3d4b30b3cf79ec42ab76dfae"; + sha512 = "f5c35db5f9b64656b4cec5361587371374bf7577e7d5aabe329d34e9f02d4b4c27508ef8fe7743c8453c61e3534cd5b85178460778174eb7e19ad15260f9d682"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/kn/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/kn/firefox-75.0b2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "f9f85e4a01b56b74c062b9b06a7a372426ab43ff2635fecf9b9eeb1c83d60682f17a19d1451e773593a0cefe15e39711a70e73ac3ce76a43b1274175faec06ad"; + sha512 = "c94cae5a2bd8797bba6cdb689d885f106a94b34c06ceaec11798a1a3bbc36a64ebac4d2bfe978e92ddf5cd4c9aa23a4924def8e6b54c457ad54b25d4768b3b3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ko/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ko/firefox-75.0b2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "f0da90b5634db1db5576b8506f208a7e3810473d63c78228833eadffb512b202dd2866fab1964150a271c61c869589adef317c6be82978d5caeae148058dd819"; + sha512 = "2ca35e7e02b4ac0188be48666636bc9adda6a3e98f0725c65ee8e5ac941837f056479697fbcbbd1f9f8f87d7f48f52fd8aefbfe3db5ba472cb38f9e33162c96c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/lij/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/lij/firefox-75.0b2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "2d580111b1b20aade3eb7dfd607ecb7b7003b268dbad127eac13625d62396562c0e2d39f04597c1225f43ea84555307f9a3805df23743a1a5304175d5bd7a0c0"; + sha512 = "6d1584249c1ba837d6be87f2bf57a52c4cc0dcacc3de82b26e57a55171db872de809773ee42a74017552b38718e5cd2fd9a57332730b303c379ea62b4047486c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/lt/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/lt/firefox-75.0b2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "b786f7f6b5ec6910d994f48d625365a386ed461f86a4397cd9ab074b164ff30c2c88ab8d4edad93b55d082bc806f7648c048c4a76ec6a68dd18b5f65dc6c6e4e"; + sha512 = "ceca1e4224cec7c4bb9eedcf5c5e563ec7592add530aef1d701d06023359ce519a3e4c885cf3e691aec7fb732705f8a8f9ef919495a6a55a4eb1324956a6dd7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/lv/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/lv/firefox-75.0b2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "cfdf66bd7eef43a619cdf3cfa67fbc863a0bd886adde00d1d5286d17608f4e3c605001a0e5fff1b01fbba3f28b371cffca78b4ee82fe8f2c487e6df32c2d8ae6"; + sha512 = "005ef32f152e7eb8021ee3872105c9915a647440a5302a951abb7a1967210719b38923c3355150c7dc76f2ce52dc508ac6defcf1d6f7ee834ed59b8ffa166122"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/mk/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/mk/firefox-75.0b2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "d27d5ff71a465081b931ba2d3dbe8d69ff7e8532f630f541ffb24861808e43988e11f4fb3427809197cee3e7fc488dfa7bf0ea274b5aafd8e1bcf910b4e3e239"; + sha512 = "98c87f7d897b9857955ca24f3bae177e9329010fd22445da16f71897e88f74cf641410c0cb77573bb74a51dc54943fe06082f6963b0594e1c1caf727a573961a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/mr/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/mr/firefox-75.0b2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "b455f77ec2a081f4ce8f45e5bca6348c7b62a524e7d5439e1f79417ea57b33508aa97fa9fad149d207f59a8507dbf0be8fb18d19b72c822b030cf7061b0d5d20"; + sha512 = "fdb22c0feec80297fe3339a9f08756e419b3439df2ed23c91d26eb6d870f55501785a11fb3eb98113df031aeb3d4f0462a790f16740862054fe90fc35878a8ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ms/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ms/firefox-75.0b2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "a81696357fa5138622e5f2032ceb5c271749bf412d5e6e5b88087918397732727ccb57186193ff36e80f9109aa4b5c0313245c2bb62d73b6821e10f1ccaf64e0"; + sha512 = "e6c5ada949b9950b218d189904ba050e476f6f9705b1b125ac5df974c25031d804e1fb1852d3d2bec1e87900b4757e5a62a793d97fc597fa3ff136939f9e733d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/my/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/my/firefox-75.0b2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "1c280d2d0b608b5c718a7c829b6b8a10f806d6206ca88d7246b4401d9c60c9905dc4aad659b4ffdd183897a3b7f497ce5adc963f5813ec498d0db313a6597c25"; + sha512 = "0666911bab682f27bc89b33ce186cb229ededa1637d7ffa9007c4de2fe74412a89b9774ceb04007052b85093b9752df3844403ce22f07481ad502145a2f34742"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/nb-NO/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/nb-NO/firefox-75.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "425cf32bb16362a3a7270413ec6c95ef81a1f35c3fe18e21f55773ae68ceeb9d07c3ef309e8593e613a0238a5946e1b431b37dddf7ce44c336b35ecdc4115927"; + sha512 = "46d4851f65d91e4585c24f7d89f271a18e92611431e2c4a6a5f369c066e7b4dbe07b7816e586668faa2b6d8d8f0eda04616fc48664287d08f7b17e84de26a96b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ne-NP/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ne-NP/firefox-75.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "91abdccdcdfb2af196d5ee78837143d515198649c4345c9d19d79a01b35381e6fb813f9c99e4b69ff5efadfafdd11deb53418190bf223122ca40d9449d3cdc80"; + sha512 = "d2bb3f29f6939e36c66bd9a7e92a9c81784458ff75bcf570c6efbedba3e526a75ee797d9fb836e0d20e78d7bed5a64ed9d640ae71900f64a98c0a928809c40c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/nl/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/nl/firefox-75.0b2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "61e31c484176e95852e02181f2a3f892603b3e2ee021d6f2a000016f76db99e9c82989792379f39520edf9374ee57f49b08ae4245d629a4aa8910add52b36725"; + sha512 = "bc8acde71daf8794956c5014e35eae1fdf557b1b9de7bb955b8f8a457e81d043880b9978e3b14fda504a53efb2768c5745ffef32c89e1bbbde77469429d7f686"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/nn-NO/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/nn-NO/firefox-75.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "cd51b29ff5c5815496974f80190dfe34e6ec6cd4eef605f94306e7576d332eceb1007edba11d2d0d072b1b02601efc7f2fa8f27ff5ab14a92dd75c29db25998e"; + sha512 = "a5911405c58a400c332b697ade2c7756e416575dceb9b3a6f8ddde8759aa79e54454f53449688d080b7c6859f6595c7cd79b71ee88062158b95a4525b23e1076"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/oc/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/oc/firefox-75.0b2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "f6a5f5f3ca08b6439d02e5a8fbdf5805374d10b2512b8cda0eb45e5b0d0c4001f40144f5984791ddd8c7c147d9e96d399dc466d0004da00f245d1251d24dda7a"; + sha512 = "7b0323fbf64f9a6c693f85972b3c6999314bbf72a3291330e1fa7c9905d1d2a3c5783cd0ed0535363c197cd4a78a2ec7dd0a6c6bd48497a254f53eece2b35633"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/pa-IN/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/pa-IN/firefox-75.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "42d4d089260373e5d16895c44b2f47610b96c0a01a0bb70c39876c376e70a58dca27efdc4a0d21996fd9479d0dd1255d6a7a448f6be8fe5d45fe675180d70d55"; + sha512 = "20830ece0ef0129dc5ce188f55aa1c699052f12819e40cb4a0d9dd300f9c15a464f0957d060d61fd0db56aaf0081b6c8e587990e7b91989e880feccc8d22eed9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/pl/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/pl/firefox-75.0b2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "cbe18d3fa35ec9c4f8a43e42bf4a5b5e38c8fb8b0624eb594a340ec866f0f8eee77093cb7fc3ad9cf85aa8c8177a43ddcc1d0f34933d34c414c4d7f6c74d5ff7"; + sha512 = "3dc0c22bb4fba597fb225b98a1ed112759d9f3f83d5620a05fd7aa20cf2d0cf79802dc1455a346206376bb11ec325da4a043bde87f61226c043a935a7d975d23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/pt-BR/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/pt-BR/firefox-75.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "92e983cb0139204f51e97d4fe0510750f98cf93fe20f8a4b5bcd24874e266b7ebdff00170b25acdc492a7eff65f1c9c6aa1c44b29d8209c04fe5c6a43eb3ac5d"; + sha512 = "b97e061bcbb1eb7593676d1b96f4601c130a64cfc1836e0f49fa058d18a6e9d935e02b58f4a65cd227cc3364e79add782d379cf729ae41e7a6544cfcf280a26a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/pt-PT/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/pt-PT/firefox-75.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "1a576f343b3b93b786038ec5fe0dbcbb3df4eeacfb94c447d5242622e207dcf360500942957d0019c124c32698448c23e231b336b8681526d4d2cdd8ec78202f"; + sha512 = "21f6d41bbef5b12aeab46aba2cc05797d4852dd7effcc00d5346604424dfbb5efcb673567b1933b4d723be80f9fdbcca98eb69cad8059d8e6f716675e2255ede"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/rm/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/rm/firefox-75.0b2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "c5e1ca70aec643d00531d4a485e515d17bc7be7242bb66c7df5818ed68f69e33542e57719fc0cd8852e4efcc4d73d76bc2646dc75e428052c078e260d9c8d2b2"; + sha512 = "fb13e69e606e4508a02221a1778a72e24524ba61f1683f5e076b4105e84fba03d8b27f29e2eb6ff3941da688b2ff5288a72af081db875ada83c6ae82149ab91b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ro/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ro/firefox-75.0b2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "ddff96dc6073cfeb7462b160280e996335e3dbc48ca717ff3ab09d93d686d9b5697144fe0dad7be12bb293557e431522844f9265e71d3839ad6e070b75a213fc"; + sha512 = "0d1f1df7d7516f10bc7c3f6144656936feeb7068839db29f97495697235ea9ab50a1587146bb069cc1e025b6a7345ccbba041043ec5b467bc9ce878403d8e7dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ru/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ru/firefox-75.0b2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "c33ac5097ab81d90cbfbcadd38b9d9906f660559ef5cf0d8978f603680d3e30505f8c65b55edf5b83fa91db2643cb893a8ae1d8d7542316d082868e341a19294"; + sha512 = "be89a374b149f4ae21b544b75146bcdd71a90c0a3be44e4abde75d3b0eae11afb9b7cc6447e33019aad216f0ff1ae46e80b612aaa0b8f27590d75ef9454098df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/si/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/si/firefox-75.0b2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "f99a34d222b07758af6a49067f2993d49ba5099b8ea8987ebae00a5ad908ff71782aadc49086152d84f1f1698a55ab027362247a15e05f62fabfadb7f45fc2d2"; + sha512 = "12693ba3b6fea7b54d8f128e37b0529f22b45e975c6a0b890a7fcad37db7679a85b0a79adeeb3a15737b6f5135d98e87506b51751a77e054553f67285a2ddcfe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/sk/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/sk/firefox-75.0b2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "a18af4cc09828a567b9c6bf162a8800034f4b094bac20c15dbcad8a33b2a17792bd1470f77f75d8da8f954b69cee74929d8aa7ef4fd47a078f84b03824658a52"; + sha512 = "94294db92a4053c209b7350d5979c3310e683da4292d4bbcf2eaf0e1729a15cc12773dfed0dd9a3e097807a3c889388fc95f28781ffa924e9128625a7fb888dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/sl/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/sl/firefox-75.0b2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "401c261b1a523c90aecf1432bd01bfa151087d36a8331d0f4138330bc21272c4980c90dee46d2ba323a20825367bb54a15fc22ce14c7b3b91c8901d6e243f86b"; + sha512 = "70d556713742972870b6cbe5805a5a9b55360ee501ce8162164abd809be3ddd0f4220b7f151aa5bfa5d67cb2307ddd3ec0d353c1a40d94692381ca5023b5a8e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/son/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/son/firefox-75.0b2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "63cc0aeb2b8b74166bdcb5db839ae7cb2befe7f444397337f73dd8b56bd763f7844283f72837b775ab923d70dc44797f8f99f3a155cec361cec9ba6e83ff6a7b"; + sha512 = "886b2fdd7cd5ea376cf17ffd07f5ba3521fce40265a6e45fe9b586c6e57519648cd8cab57e0004288318de706a075ec5bd89b13bae3e34eaa3fc6861c9620a70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/sq/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/sq/firefox-75.0b2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "04667fa706cbe244ee04c2e36dd7fc496899d3b09d0a251dbf15371c9e0ae00a999131642c2b137ce0f23ea1149da1d487753fa7cad96fca8de11c5225617001"; + sha512 = "6a4f4b87286df05d4c5ee9f2810e7aa5d77fead041061223a21d51dd4705cef15bdc2060ed85ee1e2a4c54555698df6ab8880554b1a476d5d27947d95a13a31c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/sr/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/sr/firefox-75.0b2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "8254f5af29e06e3a83ad2b9746e90fa9b9b9eb876b64a849bedbbd2375a01a2e5d369ad8f3686bf524504cf085f463171aa9b0acbaa823b8a50c123d19dd5bea"; + sha512 = "ba5bdc0c0de9a1f773497fdd50a84eb4314ab6caeed3514e7ce63acea8ca1ffd7d9544ff4d3a12142dcedd19d0ec933ecf5ec522a3bd2943064fa39e0f84da34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/sv-SE/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/sv-SE/firefox-75.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "89a165c71ddccc04f8b6c86bd199267bd8fdcf274db601c68903868b67b5d3c3205c4b359076adef4ec48e95ad03f2034b7cae9fae981c584214a2cf4d607806"; + sha512 = "30e581b784a7290f4a4238839afcf76948987cc1fe8f073a264d65c3adca97b243e1ae335e0104044f0e768ffaf0d9c3553f95ef4b7d53c5d06b656e23e5fae5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ta/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ta/firefox-75.0b2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "0a8f218a94ebe7e667c62c0c2c2752fe0df57885abad3916dc9ecba186f1420c77c1011b05f9512c37b75eebf9062f345f0d7580b9c7dba36c8043b581965e43"; + sha512 = "31c2f580cd9ad62413161b437fefd13ab793d94ed2532537c1ceac939ec57d84c82cff07d300a743dd6c7be08db7010320b78a9a70f96c0363add4a059f9a053"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/te/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/te/firefox-75.0b2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "3a4cc3a66e8ed7a42a31c69c314ad6935fbdc3062d3a82c35e7f215f0a3e29e841c196e32f5368e2b24ce8a7abb71c65307004478269d156f68de78a945f3e1d"; + sha512 = "52bd53f013d149df4ddf4026419293c7cf16f72eeebbe7db2167688e149ae8e4bba724ace2a56c93a6177908581bac163eb4db6d5f9a2ffa48f2665e2a80e35c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/th/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/th/firefox-75.0b2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "fcd070aaec8d12509047fbc4cd3a7040830e9af6b5ece30ada6388cf458daf0a26e381db22515a440d6bfaad700a0d628c3036996dd9d6b3263b192b45da33aa"; + sha512 = "f81c421dcedf9755836e8554bddac1394b94185f22b83b3628622023b325e7dcbbc8e008d082d6478546dc1a1f6bf7181fbd41f1d746986dbf8b273639e95fc1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/tl/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/tl/firefox-75.0b2.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha512 = "cec3476e88d5d1551fe8a6e75416d0397001eada288d270273b004777a099bdfd2b63eaa5e2f81994bc86b0a720f35602308089a469adabfe457a48b8f11a88a"; + sha512 = "6a29bbb380253caec23fc7493ef52bcac4688979292803c4063d6d318870346eb917d8f57b17279ab45171cf1554d7314e5f4f84bd94ff466b504db9e1461be4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/tr/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/tr/firefox-75.0b2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "22e71e68ccfeb4774570a94033ad7de3d90c8f327886b7c3555082b03b46bea090eaf16d63208897cfaa47094d7eeb8ee89d1d43af78cf8af2753b669d0c1fa0"; + sha512 = "346c02d8dd9e6330e83c9984d757d23ec8648172803f808cc096af6e8e7ca768b1bba36a8c35689644bcbc02e63b118d738471270180101eec8e00d7cbfced49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/trs/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/trs/firefox-75.0b2.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha512 = "a6d7673761a590e7d714f8e5949e9962a7f693bf35ac9e5425c84d1d9173b220d9af3e1468c9c83aa930f31cbd2df9844f65a1b749883ec35fd5ddd4ec310463"; + sha512 = "c3201998646d7bf8b1449571597cd0fe2911a4bd74c265afb21b706161a5667bb5556d8e1be4dbfefa29e753bc6544adc26e966dfcb79acc38485e6c618bf282"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/uk/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/uk/firefox-75.0b2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "2944b38a4b71702aa04d11c68cc5fc0253614015d8ee7b63f9138ccb90a2190c52131722477218f99e917260ae7beb0736f8d8fcf275093f423fe884e9370a67"; + sha512 = "24b01dbd82c4cef9ffd8b88db4415eaf1bb9d83c7bd307663636bb372a1525789354ab15021b591e7aa697db511c71d078cf3fccf89024f13b19099925e9ed54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ur/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ur/firefox-75.0b2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "e42728c0a24a131d831fd65c1b0006a28be594dd5011fe5a510f7b1b62c7937d06b1f0077a1ac2d454211e27f5d03c8d60f3fc725a58eebbe72f6064d875c6ee"; + sha512 = "720d058c4e4d2cf4a08460ac4ed4616bf492704c8db10d28faa3117d6d3662a3325155f99414a7d61421eeee96be4d36ab11304e029751eed423fae3487cd2b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/uz/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/uz/firefox-75.0b2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "9f777b1fd31953b903123250250f7dc55d63513c49b69c3ba782702f8faf4a831b1fc84137e8554b4af6e23d1203a89ab2a61947a39f3f9a801acc1312a7ebe8"; + sha512 = "59554a7a87b11e679487ecf9bd0ff6001f86bf14a0f73768b1984ca36cc2ee4774e99dacecc238d633556bb04816451ad82cb5ed2d26b2b811bddecee01e53eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/vi/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/vi/firefox-75.0b2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "7023655042219b9e818fb921bd6da1941b7c75a22f7570559d06c2e10de2bb81191b266323fdd132c4c7ae881d932eae78c93dc6d8d5e20a6adf6325f87778a3"; + sha512 = "030c10b2314545644b402d6b5b011c7b782c06be1f7460782f02e2071230cd9adb018558db7f98f8c2c64e7e7a6d835b38a14bb7080f1dbd160cbd113348b1f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/xh/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/xh/firefox-75.0b2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "6475fa9eb12145e13a9433fc4f1d28a8e40bbab39e9c33337deafd7021982a22e64f795382c2cea09d767df2600b39824f8cbca948a2fc6ad24fb6a94b3737a5"; + sha512 = "25bfbc493a66ecedbf1a625d96e3c98dd6c1d835823c2f2afede41329a1dadd146459e6b44d49a4f966d9eccec1e2e1d8046f00573ffa4ba8cb43c8a0802e18a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/zh-CN/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/zh-CN/firefox-75.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "51bd5cacf3dbcd6df7c887226641464ebe723bec4952f071da9dcfde89d714217f8677b8819425a8f1f3ce272a4228b08b4eeebe9c3aa61fe473138b891f385a"; + sha512 = "dea1bde6eaa34ce31d7775c3f86bdedf442bb67623a890549a470386e93e93bdcf7f50a7006a1230ea3880b0031a2ea7590b94862f1a098cebfb7664f9aa6380"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/zh-TW/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/zh-TW/firefox-75.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "741766345cb235586333866fcce8b33e80895b4e313306f26971f013e53189dfe4e119e1d9d6e94b09b334496cf8c49240a86c9ce1032d7ad5b5fada3e352767"; + sha512 = "22224a9a06c8b528d0847e10a95003d19fbc7cdadddc605e1188da7de845d38f511319e73de6201b7daf9b2b3b59a2eb12a6ced03cafcc1bbcd86e51422a2497"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 00c8ff548d2..e84a48660c6 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,965 +1,965 @@ { - version = "74.0b7"; + version = "75.0b2"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ach/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ach/firefox-75.0b2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "2dca0c3b07364118aa4b7950769e94b75e932836ed139eee3c91168236d7e0f3bb4775a6463550e7a4b20ba57a75e62bf31c4db5ad1c46c47fb256dbaf78820d"; + sha512 = "73f8521550149a0c62c841b23289371f945a94aafdab6752b6b4838594147c68dee1352608fdca2682251db3fed691ddf606e0a7874e2a35c905c30a2dedf4a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/af/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/af/firefox-75.0b2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "e39a8d3a8cce92984fe786d6e1d8272eea27ed049ae1fc1a6c9f5202665c84436fbbd48f04ea16b16a046521536f741c92f217c09db13d84483ed934091b3b83"; + sha512 = "e6933f3de32fa91f4835553bb8aa48ad20ea45288087bda59920d6edb616809d12cbf9966c722040d0473a35f5a4aa0a7c17fe38d8a0c2eef5fbc5d7451ec709"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/an/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/an/firefox-75.0b2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "75e5e95ce56a748d6c193374741f6f2c53503dcb0aa8ea33e2695b74937ade76ae723ca7b397157aecc46d04419be3de19e020427083e5002043438e1461154c"; + sha512 = "186edc252065ea668412630d7ae37a6cc465d41104578886c6f01bd90d8a605afe6e023cb9d566d53b43d9fe411fc56a4322e2140983279521e1f73fdd2c251e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ar/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ar/firefox-75.0b2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "fffbb5e730f1ca4925c0fca2597b29a359bb3835c5338024f15614c720a11087d36edb9a7eab4b99e42e75b3f622c80a709cc7ce08aee6acab23287f030f5683"; + sha512 = "cc5c4cad6ffd695590264ef222fae56004c3b626c8e36cdb3b118daf62e84c912f112df7bc8471cb9c549f385cc878c12ed06b1ecbca164f12f26cda3213e7d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ast/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ast/firefox-75.0b2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "b820e187245a7c22f959600e52d386188c1f9a7fa914ff03a9da9a7901ed2c090b7a057967121ac0c061047099ba800a33944fb5c629b8a41ea3e789b3385203"; + sha512 = "62ef8d3ff486543b45751f4aa43a3b009ebc9c909d1e0904622c212fd534bba14014ec8389ef5d21815fc3d5909757c7289a814f3a836d94188819b94ebe2640"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/az/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/az/firefox-75.0b2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "69b5a0f326c9c9cdb2f98709e0400da6fdf05c4abe7bbf385dc0593daee61f1e4874ef6ec6f1fc12f5a1ef6b290b6b44664c8977b17496133f7bb95683937ad6"; + sha512 = "c2161b2f4a3decc15ac5e780126b94a805d521bf8999379643f4ff8f9c1630fb07094528e37f2aea8c8789925acee7c77d0c6a179d4428b984ab329a973a5a0f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/be/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/be/firefox-75.0b2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "2734e21739a5fd0fddc3ea52d85ae268aa12f45d83e2a3a2529d96657bf03396d84bf9549decba412988e637989014b88cba773c2586a1fb04a0dfc439d71caf"; + sha512 = "9e49307c8bb04dbc83532414a5f09ce8cb202fcd68e145d2ef132a20ee47988d459ef1851ea610ddd527f335bb68a7f1fa04041914097fd65f6fd03ea6499ebb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/bg/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/bg/firefox-75.0b2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "d67ad4c4f282db155b41368df5094d6cd614d4e4deccb348b2873f710c3522ecd30511da368df97c4b9eb53a0588c134c7af298bf9abab602014d18d7586ef74"; + sha512 = "ee5fe8387cffa96d449d4dd5a2671558a6f36645b15cdd017ebdbe7316d3e0740f05efb6ca5175ca917a937f4483175c9a20cad2fd956bff5110cd7d641a12c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/bn/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/bn/firefox-75.0b2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "0d8b5dcaf19166878c8fdbc1dc2b1743398cbcf7506089098dba170a5999a205653a048ebfd2017c4a69da4b71c8202245b64fa0835db14d41879e8a9772a511"; + sha512 = "4409a8d09e837a95fbfaaa5c8476fe25d50926c11be2927c0415b8a7e71f18ddc392a90ffcd5c142ce4c5847ad493f3a51680e802eb2f709aa8148375c9ccd30"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/br/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/br/firefox-75.0b2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "9d26f9c77c6e723cf942d5a656282857db008542a451fd2db59911f07acc7387a8ccc874c1c9ee25bc8e20248dedc72d9e1289c36d1018487929bf0d53093924"; + sha512 = "cf71b0554eb8058e3f2457518d473b7170f9fa654c2f5033db830f633e7cb8ee16f08f651c245f4146f85b537b30f3adf235786d66c625cca61438ed502d7ccd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/bs/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/bs/firefox-75.0b2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "b7d973d03d5c25c08b2515510ccf3115ebe498c73a23823254e8955f47e065c8ca2ecfd651c1762d36d7841d48a15b76792fa2ce9282f5115fa9bfed8f411b40"; + sha512 = "743b0b485eaab640a54c6777c8849356b847d7fb4ccb56318007dbb01480410fbc119e7721393afbe2886af59d51b9aeefeaf495e670562dd16a350e803fec74"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ca-valencia/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ca-valencia/firefox-75.0b2.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha512 = "94912a03c29f673de7e0bc1ea8af77ec5b28e3694f042573e3f44d0b1298d2a8520ee5c062697ba838532d2247662ff771426de00ac6cc50d011a0bff1bc0348"; + sha512 = "547c80bf05a23023ede2d7268e0c023756e196c3a18f81ef084cac330ee0c7bb69021f33ff926162a2ca7afd2c0b4ff08107a4e18560382810b5d7110cef02ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ca/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ca/firefox-75.0b2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "6ff2ef52764e1bdd04861373cab88ed59bd4640e420a1e9567a974b1920957f14ac1e578bf32e1cb57297455aeca40cb84609d1adfab86a751306a0554008f70"; + sha512 = "86648dfaa650d18bd934efd57c5de495c963728f45e375b6e6f4c71caa163fadbec2b5064ce370e981bd668445314fff64374e15a17d2c8c337cb1f088edc486"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/cak/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/cak/firefox-75.0b2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "0a870236f57d9927361906b4098383dbc8430766b3b915e5a872ccd2c8b56b56d78edbe025aea8e8a120bf8a95c9159e26065fb24541d9e4a4860174b1d9b78f"; + sha512 = "023afccafe29bb6f70657cb0c1b9e285a661127599f0b4e350f814370b4afd17a82157e836ccc394e8bb6b535a7e7341981f006363c03a46a723e4cb480c180a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/cs/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/cs/firefox-75.0b2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "38dcb5650759007495e76bd62a18b95c63db7f63e77e5d0c488722d00b4f7ae00df3adcb771d7a73454655b8192e3008988e742733eb56f043481e40c357b847"; + sha512 = "7d14b78faf8151ee01e8899a85fa8f9851c6958f4c3d7a99f7cd934fed8b704c40d2dfe53e24ac5b7a44bf67da2131eb7cd8161c315d4e0cf9bd7cdb1bc75446"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/cy/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/cy/firefox-75.0b2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "d07b503f1cf8b4b11a94fd2adea08ad0c37474d779d2cf7590e6700464260c81b0221ce5344f17e19634e1e6cd5f0a5addf50dce2cd4eacb10b6ff3783ef2424"; + sha512 = "5fec2412e904bc231c4203aeb40f3f7a6386c56476f83e80e94c2395c20f09436b6d2195c42861130606d101639eeb2fa2f710d5f5e23422cf39befcf46c840e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/da/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/da/firefox-75.0b2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "5386f303e45ec533e7fefc75d29252c9612126ee1d1415745c9f3bb9d2f9c12ec1cf5f93d488f83dcb51177b17f26ded417b5c93d0ccf207749bce8f1dd9de63"; + sha512 = "b78ba1e8748775d3655305b3cb925e13423cc11e4429c806902b029a195105cc1ec83c57245c97ee046149f94488c8b09bcc043a0220cba87809a98f20d34e42"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/de/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/de/firefox-75.0b2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "26003755df79996a18fde1e1f0dc73178a3eda884be22a5848dca65d9d1b60677cd6dc67435e3e40100149d894185b0b3347e418f302b21bc056d1f982547de7"; + sha512 = "e5afe83d665cae93e9c25827a9079953a55dc1523027bfa8e2e8ecd0b347465f48e190233e3c7e08dcd647211a5063172bf05d55efb567a4f29c5123485bc2c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/dsb/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/dsb/firefox-75.0b2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "a0512e2996326fd8bfa63a97509dfbae54ed8114af1ffd4e260e0389ea6e64207095cd5cd9fb4e5c4a2b98ab61a91498db2838d72e6d259a200c636bd9521eb5"; + sha512 = "f9455b9cfc3b65b18960d870db977fa57ae03801fd42c6313aa114851897a14f1a64c02351a95f5a841476c41b55a39f6fc47bb5173e21b2a7da0f6536d73582"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/el/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/el/firefox-75.0b2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "832df3733c81629f0d432ac7fbf0ba0523104532673f0b584525b5238c9a18eb30d2919ef47361a70b5a8dbd11742767a1b7f57030814dce05f07a9b54a17475"; + sha512 = "d697998bcc27f468bce353b6f8a4bb0c01f0cbdbeda5a0ffa92054b590eb8f2255654740db2e31fc95513c7a6a4de703772ed35122e7c4e3e9b21ab3cd9e7626"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/en-CA/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/en-CA/firefox-75.0b2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "e50ef2f8a7ef4defcb7aa151ca5a8140d28da1111dba92b1ef8a618a65dbe812345f3737f1945e0f0c31d14e3fbffa833ff8f50e0390efc004d81bd2eb5705b9"; + sha512 = "362ce03dfe65b802b153360be1540cd1c760e81bea0d35e2a59af701fec1a489abf30d52b1b1b0f66acafbc91c2bba3bc60bbd1f2a05844b7f53b25696712066"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/en-GB/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/en-GB/firefox-75.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "127ecc18969dc3226ca7e8a0b75cd7bd5ae96ab4f325655a049d4f57fd5471ed3e83e8587edb96e3a2c4cff0b370871266cd4d7b468791ce2e28eeed7ed91286"; + sha512 = "d674575f46fe24fc85af4dea8d0c18b2c1c8a0e92eaac76447a476c5532891d87247f6497663fcce546a85e92076f23fdf3890c8c8e3a902e3cd6a4eab6b84fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/en-US/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/en-US/firefox-75.0b2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "c4f47f02ec25a34590159f3e04b8e49841aad1092156b54b342869a3330cb7b36317196f3c65f57e73e4ecc6cc53f4cb19168425930febc100c53f626631fb78"; + sha512 = "092e13a53b18c2c09a4c79b2fe15d49468b60509bd6668bf5710f425a0cc0d4f89216e3bc1e252b7781186bd553cf015c53c5bced5aefe2cbe43666fd5337f3e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/eo/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/eo/firefox-75.0b2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "07f5f34b74c768d8748a32103163fd6d0d390241e8cc7a1c7e0c90d627d822457ffa5406d06ff28b7b18ab1f9ec4cbe42a9712d56a5881351efa40ea6deb7dbd"; + sha512 = "199ac2eb0253659dc0c862869a72879d1d90d5b2d7d01a68dcc674e0b0b815f04823edea1d9794626e86489120da08585ef10c0852a636f1897df23e363579f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/es-AR/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/es-AR/firefox-75.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "6f3531ab56ed0dffa9a1e22c86dca8f7869cfdf9b9adf8ae3c7d5ed12a567c1033db7b5c15daf98edbbecf0b450ff5a064e48ede479ada4b72ccaf0c851932ca"; + sha512 = "0faeb4ef0fc8033156f922bf25367351e389596ccad6b2b435678bafd563ac0624bae5f5a49183e442ea93f1d76e8ac8e53121c6d8dfbea1f254c84d7d323f46"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/es-CL/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/es-CL/firefox-75.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "c969ce949167600c414b9f0ab649a72cd9b9c12e766b6b92ddf36735939d4d5471bf8312e309db5b2b6e1f508b0af33ebe35b8e76b67af663b300893b539cc5c"; + sha512 = "f0bb330857416097308928d8cafd09c3d1fec559f78ac94e2fd3624381074d511eb8d5e2764feb1f33494f09be6b9fd3cd63e182296a8ddca06b84c673e2b0bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/es-ES/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/es-ES/firefox-75.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "e5060f9a575b6cb430265f214a554b21794673db9334665d6cb72c476bebd3c1b2797c8fb3447297c2a06f0e243a6da5da7f9d22a403472d81dc8f754eead226"; + sha512 = "37b149761f68bc8b2326e0c4ec9eed789ee2d04edc0e42219b9faba420835c7b4a7f2cde76a02fc4f7bd452059572fd2b4551fe9d879fa74c34f066689ba2934"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/es-MX/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/es-MX/firefox-75.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "48048e589d5b57c75a5eb7e3048f541766129f5c63d7e3773d5d62fdefa5afb02338e14f76d44c6ca0c4ca0a688cf259fe98d0fe23759808b9c45414d5009389"; + sha512 = "80ffc2ab7314fc8a435aef01926f159166f4bd7d88fe1b44061abb80feb606115ba976cd321a2ba1384f2152499a59481e9ac622f1ab57d096eaa05b73f92869"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/et/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/et/firefox-75.0b2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "3f196d585242bc7387233223210f444bbff50309ed2638e16a19f42f48c06701af560e65f127addf861536151717e099f548fc837d5bcb7982831c0e20384055"; + sha512 = "87f00de95bf58fd3bcf54569843973eaa8a435d7a4d861346f7bd08ffa475bac7c43a2ab178b1907b9614cc6fbbf7af611163fb5c13e685f7c748e3451d01110"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/eu/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/eu/firefox-75.0b2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "9b831ad80c7e5234243607b3391d422015fdc5276e083291e75ec1b2074c69e824c49481bee0ca9f7d23ec31f02a9fb72540dcf0634afed2a8427ece7d4e0503"; + sha512 = "551e2df324eaa2741619c3f2fa3a6b3d90e3f85d1b410ceeb372541bddf2b049aaeb165cd33f4b20a7164cd7fa5e8d201860f429e35adb071eac22e9ff87f4e7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/fa/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/fa/firefox-75.0b2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "8318bd18537396c99f496ef5d43b1d70756cbf7ebd153c6dcc272c13eacc57737a48c186e055bb9fcd10936510b038560257ea03ae1bc8afd563df4e703b05a5"; + sha512 = "15f7a4b78ed89634d7ce99c0ea68c8bd1251c8c88f6d789f8bbd0f3b37c5d5f651b973478679c05d29c1b04ec0c6b6f230363f444406f451d9422fbda7770df0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ff/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ff/firefox-75.0b2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "d2c46c0569d98f96415f451d2956e0a86fb030b254852cc552c48b546e31f75c5a6bc54a97607f3653ab330f1b3ea5d988fc933f1d0654919f2abf4d1e7c396c"; + sha512 = "4c01c5163f14c531e9eb864b7deda329ea9914ea023cb7efb64cf4f56d48fd13d08dd4057207c4543a6b60bc23037d9c343ac36901d6819c422cfc14ea75b38a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/fi/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/fi/firefox-75.0b2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "8b1cac6cbb141bc7dbf8bd33f6cf8b0abc7b97f38df83181241948b8d376d67c77125795a24ff64506e9ee5f986508005120b7952bafcbcd76fe0e802c23bdba"; + sha512 = "a5c1063a00ae0f9dde7e51556aa42846230a5c802c94c84c06d4bd91cbe767363c40962b8e9d940f1e99141e73267fdaf8b35c85122b3fceecaf57a939507273"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/fr/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/fr/firefox-75.0b2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "41b55258d992c751aeb60ea8c9819f05fa5365d98a0d305c3129c989c46d1022e667edf654856b666c84e48eb799f3194acbe8c2a278baab8ca5984656317e54"; + sha512 = "42015fa91befd39501ede0fc44ba98835703bf939e7dc4de9ca6c26390350c0e1196ace4eebd4f8d9e162c8f515249eb61a56ed370cf7279831a75c6abca570a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/fy-NL/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/fy-NL/firefox-75.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "cb2368446de46f90a567c6a2d698e6fc0e48aca18093c7feff581b5b7fd15d5699e3d4bbf02254b3c54cb28acf95c29b1f86cf8e2fcd40b0759dfd068907ae6a"; + sha512 = "c775dbaf216863c0dfc91bb1d26cd9ba9908684d981b7c9ac416fb0fe5f1dde7c64ebf13b8864bdb4c56e7051c3e33e677e757c225876a6e1f88955ebe01cc05"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ga-IE/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ga-IE/firefox-75.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "0c55d65e2b1ebab4c2e976c76eff205c6232b0f9ddbdace008c9d27d9bf25773e91b516a2536b1e7f069b4c7b468703da22d1814cc2fdd3ac1eff798184147df"; + sha512 = "958277939ca65eaae828ed5e9a0f76b612be6f803176ddf0cceb13d1e60baa35a051ff95ecf344c1ca2d5cb6474dcc446c272053141d49b8f4604dbd70df8793"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/gd/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/gd/firefox-75.0b2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "4723a47718cf1dec08bd9b3d6e0e7a4f857b5ff16ebba926f26cc6bd2000bfd19c238d05df1362d602da57864578fc2fc14c9f9c6c49e6b430a5118b22636cf0"; + sha512 = "db79dc9ab736973d08e6e180a4b7b10e903c7627eb0e0222c044d4b3f4d4d3edbb9f2f73d0e6f19d304e4fa75208db6395c0fad28d1e3875386036bb30086c41"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/gl/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/gl/firefox-75.0b2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "69e719b5f65c0b8392f1515bd46ac0d22d763ac3911b082bd1201f7dd70db53862a60a0a43157f3e3cc468bd133eda0d5ef915b225159736d936e754237b711d"; + sha512 = "212a697f1289dcf582201a2f0be56b739a71d2ddc0157c65b567c7dbcf6f51922ab2d0743dd979134b1127661addde43612d18f6a4b88b530578fdfccaee4063"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/gn/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/gn/firefox-75.0b2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "cfcdc2deda122556e89f7b32b97e0cd5a9a01970babd11c3fcec205de1adb0744674dba06d0a5b725c379d2a98dee592724d5310f4c8ce55d9fb46e58dbf113c"; + sha512 = "713022f28bac680227d1bd5e2bedd36aff2950c0c2e498ef1205a02d6b3ec0bb7dfd754d18a43e7b141b535ddfb71b1ca711b1b4dd955c66ff469f43db71a8ff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/gu-IN/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/gu-IN/firefox-75.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "b2c9551e6cb5c047c6169e5bb1e3eaa6272391fe3905554762b21037b832e2db75497b3e3d680e886821390a5df1df8c28cef64022e4fea77e439c97b5608ba8"; + sha512 = "f0c80568e5050cb4758f8269b951f622441799e0d8ae70d1e3cc1c3a7af0972f6323ade7844f3b3002f8a701a2a1b29af320ee95e72a349ba9d9903cc4aee012"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/he/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/he/firefox-75.0b2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "ec076d4f9f178c3ad69f38e10796057e6650c4771002ae3ab06b7334634482db783ad1ff946e291e55d6112bcd1fd07e37cb8a475af268ddb6fc4541e4ba31fb"; + sha512 = "5a5746afb795c4708559218d3de66042f220f6357d634e20c001d45a3b86df99fc6b277875837ad13138bf86f2d9577c27fc5573817c31e434de41d5f13a6dbc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/hi-IN/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/hi-IN/firefox-75.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "3c7e6b5343c6bbce4aba4069f543a09fba4df38350e30bd792028209d1f3f6a862a5ad8b08ece57b0e10b49775d97a5846a0fe71872cb3b8e7de0ff11059eb23"; + sha512 = "b03942c6d93f3baaf0944ebeb27aea39fa331806375135f91e9c8e45ad1ef62c9468d05d4c776f2c4766c0db31183fd23fa16a18f860ebd75dc0b79ff2abdf0d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/hr/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/hr/firefox-75.0b2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "44b3186b2de73acc348b2114818c3361dc6e09b8a865f6ca81af5956a7a5bbf84932d39e2a970d8eb314524bff6c0b59923e50ddff203c3844a7e075b01d16f6"; + sha512 = "c090bb4ed245ed043218fb202f00e227bdf8a5425f78a9a311b1684df0d1987c1f54904f89a46a8408c28726e06798da5755ca83c0b7383561f9035ed4b8c105"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/hsb/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/hsb/firefox-75.0b2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "b367e8059e20aaabbb53bcdcf6b84d2687e748d832b1eba6fbc23ff097b5b8351d303fcfaf6cc12cb9921231072838c3c865ea1737e25ed533f523cf70cce194"; + sha512 = "71155f0231fcaa744be1828967a1194b5ecfcd30b2ead3fa0294be46ee7ed3476636304862c3fd222359ac8fadfb5279882bd2f7965eadf39641cb611c12d6cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/hu/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/hu/firefox-75.0b2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "bdf99f29203f13973eb100e83827ae669bc0d42bd12488a3653caab92c1b73edeef5304db2678bf6ad59a86e40aa14c552518765468bacde63ec4b4b12da09a2"; + sha512 = "f35a883d82dca691e4537fd9860d72c8f68127f4b91a7dc1641342eeb2207700fe31965750e6916e1633728ee022bb9c940fef37d3d973bb4b1f1689779a74cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/hy-AM/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/hy-AM/firefox-75.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "4677da96c94600d9becd6870acc2911e385093775969afde671c900700eaa56b25a4292862ebf3873a704897995c87bb249bc17d0da8394bca4d71d13bb85369"; + sha512 = "b0c61c67db761c1c6833aebce55c02e17aaa7200150379ef9ba59d94d8a40ba61054863f80d0c6740a1fdab4abcf221b98407c4600507b0a1f363d4356fb1503"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ia/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ia/firefox-75.0b2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "277cf81214b0cb0a41f9dce8704d387eee36e6d947e7f625239fd84bca25d850d6f43db92a88bf68b3aeb12bc6e2174421fe0a006b80b89bade5de949914bd71"; + sha512 = "711ab43445da8d8f72411148fefcaddb346e253b191558ebe9fd363154bf6eb320a7bf5715e9c47bfa154623c2a4a96461aeecd69234155b130672bda1a991ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/id/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/id/firefox-75.0b2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "26b3e8b4d375e57bcc3c1b7a641f27240106a1c42fc97913eb3fe4cf5f51885ca9d004cd95df1a798270a7a16c5407ec519e2ceeef4626480e7a3440e45f237c"; + sha512 = "a622c5f7a0e06eccd3f3a8da31b23837dc78ca1bfd3714c002ad551c6e12de8331e1ae12665395ddd174aaecf3b793f5190b51e34c33934f68636c5e49996a00"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/is/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/is/firefox-75.0b2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "ad3bd0a308f8444ba01b84175b3bd72dec2c234edac61d5ad839644d4a09b89fbda61951229ac43b4f152c5ad8af7055477fac2fdaf71c2ff737ea73089339f3"; + sha512 = "2ed96a3de14709ce8c03e86b12ae1b77b707bc17bbccb05b0462680f19c0579e458be29c48aa293d6eb841aeece5ae8acd7b38209716c8d3c769297741e283e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/it/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/it/firefox-75.0b2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "a6c2ae689f748c8c306122057b267191e59e9b8bf273600beeff7181586c54c3c014b74aa88dc286132b8c998607b0246012a12255025899e7c44619a3940a9c"; + sha512 = "302a12bedc6d20a568552da06c5a03cfae9f85d34cf8c6c5be1385025f3214affc23d1392fb237bd6f215ad12fcb0600230e87202ade6b9cc3ae5c13e0878f5d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ja/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ja/firefox-75.0b2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "1418d6e286a20860d7b7073e5f3a15127545e27cc8692a50c178e7d5311948716823bb9ab713450f6bc3fe2d443165971a8e6ad2c8251ffbb2379d4953b37714"; + sha512 = "76217b47ae6936673906c0d60e15a516a855aed316df646f50a05228c52e63c19da8463c779ad95008ad190139152efd9c94603c2e71d3eaf28128832a70965d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ka/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ka/firefox-75.0b2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "039af653f9e75736027acec1f0e405c350ec66f4d343044297089601bae01fa76d6baae8a9b2eedfd31981d8022f4ff350817fb2505ad3f5e59aafce3441fde7"; + sha512 = "f61d5547e24b91b03c876aeb63764b9d382061aabfc43373cd0bd72be1173296ac0470b78861bec755ed83b0336debee3b63c93fb7b8f2b58cbdb4098b43004b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/kab/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/kab/firefox-75.0b2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "688930d5d2e67d03695abbcaad36880a052a4196fbe8ff406cbd7bfa0e540394836b15762e2ff64627a4f4e9abc16a58cbcd2d362624bf84db2efd6a4008c612"; + sha512 = "79368f5f6a68586927cc8831a1b0ec5af4141e17326f919cda3f526c86fe210dcb80fb598a04441d23559016c99d2e090aebec2ce4fb34e45fdbb686db5a5466"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/kk/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/kk/firefox-75.0b2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "1f794ac9678b81af8cfb8ebc6c379d9e0603f2da337c23df1161170d54dc3967d6f89411e7b550da0ad1a2b7cd5db11ed5040d4056b333ce5dc66c1cd4629534"; + sha512 = "dc8ccef23f39f21b1d669968f72bbdb63ddad45b869b3ec0ac1a81c0f6b00bf5eb272426e4a44d002b51391bc86ca91b7271d48877824d094455ad059cb9b624"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/km/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/km/firefox-75.0b2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "54057be25090fcfef69ab8ca2e4bacdfb96769f4e797fe83932bea198605a183e8bd8941484cf0e91c3e3a4fd4ffbc384be09894cf381b777649cbe340bfbb6e"; + sha512 = "79ee964f99857f95d86a9d7ed45e52cbb19711a94aba236ab594a0bd98585f82957e113c02dcc0e094a23e5857107df2c8d3a88dbdda8fb9a04095b350155361"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/kn/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/kn/firefox-75.0b2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "6e36f0aff051302132e5f83667638171b3bd7437b9d0fb3160d0f069b1131c617df6668d0de0a866e905073e57d6ac1990c9f00d59d6cfb179dd4eaff6384aa2"; + sha512 = "47648e65c7ca94b8208d6465544ecaff521e03b7abe333954edcf62ae24d1f0e886cbf63c637eb8aa6c97d3af1fcda88e8b4dedc037469a7e25eee7ef55fb276"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ko/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ko/firefox-75.0b2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "6be107f8f29914633196903bb687f7d23ecbfe70f4655247a5a260ef01a0841cd843600791867de64575caa63e0d3f09935eaa7ff154673d72fe044e5dce7c4e"; + sha512 = "dff738fabdaadfd325701b5e070e755f8e30c69e954b3a51706d6cf10e8888e55641ed9ac1f1d3434bcbf453bc86b9e4755cb596fba2c6928aa1e10dcdbecea9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/lij/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/lij/firefox-75.0b2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "7b2ce6efa438363584daec053c99a4f61133ecf151070c9fb7a44b340a60f3c132ab92b9df50ec7ffc8ae556951876d3a4a3ef32551fdba4a359d7fb80da13de"; + sha512 = "64a5d2546d0c10e9007c947b7ebada5f779ea5447c371014cd06edc4d6ee4e2511b8d3b5b39c8498f879734e7dc65f375bf32cde445a0331cf81465d61c90df8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/lt/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/lt/firefox-75.0b2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "723dbdbd1881f8f072a63ec43050855dbf147e811eedd983f568fa33516f150fae2af615c565689690b3e9effb119bb0b3934022c3a5800ee9d5eecad4e42c05"; + sha512 = "0ecc945a159d80dd86a8b66061b9278a92a4b8f6f41dcd6f260202f1b57a8c0f582e7f92fbca675de8227893ed5f86a29a7dd79bbf95264dfbb2592fb499ca9a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/lv/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/lv/firefox-75.0b2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "3da0b6dcb24bacee313a5c654ede55885f538d4c18385533ba92b32543da0e6a790c242c9b6cee92c4320292aa2c7a4975241feab89647d430fe0f7cefec350f"; + sha512 = "d0bcb0a69c29be9ebbc103830c0c3aaf264e07c6de0716fbdf38eadaec70d7d2928f64256e66a7e5bf916e6306e3dbc1105be12129e26254f2e5c969d348345d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/mk/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/mk/firefox-75.0b2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "e84a8051a9e8fdcf9e27084166e8da04898dc143045feae305c676a02c6381e3d0f3ef2cc4a74c6395075d9172fd75b4763ce262c42284669d542c56ff0056d9"; + sha512 = "86924cb5f2215b84aa92e20db474ebcbaf9428692f1dadf92af5a84f6eabfdb8ba86f304671f5190b0241ad564b639fb6a3311145f989c9815caac588a5b652a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/mr/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/mr/firefox-75.0b2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "23b8ce5221190e3d147752e8267d27edde8f4f2981e4c329a5e223063839881417204076335df8c5f50f9a0a754d4b391020ea7ba5222c64ad7ccfef3ef0da68"; + sha512 = "c3eda294490d43f5d3565d17da214c8743f21016758c3892958abeded0acfafa01239c3b9921a8ace6d973252952ecd48c968f915ebb58632accd6ff378ccaf9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ms/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ms/firefox-75.0b2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "6b9d37b331fc1f45cbf0ebfc005f47375a24cf0bbd7e68940c6804d9afaa82aac048ad4bdfd0a018c2ba4d275a145a2a64f3c62b1f46193b2d59f7a9f0ca8b5c"; + sha512 = "a05273b907ef572864b90af5a1118feb52d47379c9e642c23be5767c6505b180f7a45575d9853e754d8ca7d0e73cc955980d29cf628b9a5cdf553a385822e9f9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/my/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/my/firefox-75.0b2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "bf2d1cec77a74608db287c5079db8a7681f18486ace763e59b59ba0833c2e1f61d10127fbe34678fcd15f4864b1e94be2160fcffd14a62612e7a543d8380661f"; + sha512 = "2b566d3ec5ea31599f1ef580cb18c5e1b85a73f6ec186c00e64f11e668da3b7c8eed1f8fafbe4fc8e33ad51859b4b02ef1596af591e9c519bfdc798320d0e013"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/nb-NO/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/nb-NO/firefox-75.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "2c93b5c1bbb1d629e9d3fe38170b610e8f2f4332a12ae841959955051e6e6f4d56c6162f7298b9ebba78c36c81c150dd28c10b18d194c3ba7116733df5bcf7da"; + sha512 = "7608a9470683703efdda2fcc4168bcb4b77ee006fc1a94329de91676b9922d1540770a760dff84ca10b2c5a91e6f8b1adf96d9cf8d9b333427be373d5f4def3b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ne-NP/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ne-NP/firefox-75.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "e6443dedebdb4d11e3a07adccdf92d221f7ea05e257389792962331d9f3f8839d24509dc996b39843ae9079828a21975a026f6e0dc75e06296e2c392781f70e9"; + sha512 = "17d488b5a8db722470fa0665f3985f9756a1e5f76a92f3770c4688b96148503697bef4ebee523071b7769ed859bb6cc70b5a4997f7126bf428da5433decd3d17"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/nl/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/nl/firefox-75.0b2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "b6c0e5a0ef7af5cb1c9ff89e682e9aeb0b954ba754591dc54c8a73fa1de8e3f37f5f78f614e5aa82eca5289dfd62782f9128e984f79fc3d36486a2dbd4affc54"; + sha512 = "e773852f0f9a9dc60fb2de5b85d33f281aefc6b32d0b6e4036af6d46dce0aabad88f0d772180a14f876c42112c65339a87177d53477f672f83f438ad933b3df7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/nn-NO/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/nn-NO/firefox-75.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "9b2c0e29d4bc92685ef2c914c783dbbc663cd6bc9ea6f15e398ab8f8fb238159ad0dd84647c28b2c9e5991e75195fa2f305690d9f7f98360c8d40754c10d4bab"; + sha512 = "e0dc703dbd18b1e08fe7e6b6d1d359389497aa4339bedb5bb3916de0c1bac40acbc0ef8bde51cfcd05167c98dd81c9b06e53bde773f4c2a0d51bcc9afd8317e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/oc/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/oc/firefox-75.0b2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "9a50ee9b626f3f96e9d08a5f5df174f8b89692ea2fc3b927f260e9579174273f78a9d11efbd1007b4165331dd52e52bbaed83a77ed458aef166b764a2bc5d559"; + sha512 = "067eea40605f84011c9cb7cae951c5a4d3ba2952971a613148946f5f83a4dfe19576f6b9acde65dd2d266bf2bf5ab83ef94e4a169ec54a70091e89b6ce7ba8a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/pa-IN/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/pa-IN/firefox-75.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "9f29ce7b0002e41a08c64129a08a0946dd622fe69e6dcc30747d432990bcf4fa209256e74b1a7ed51364fc142449e010f6dcd61606441f1c4cfaeb4440269ae8"; + sha512 = "edbd11856f14a1c2e4dc430752a9dc78b3f5f6d6587208e936b436aff6e2384c8604e9dfb90f292690f7ab7952b2b6598b04635972640336a17b01a03b7d7c62"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/pl/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/pl/firefox-75.0b2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "c8ae484055f3b0dbc81043355903f8f8b60c3c07f431b904d4a181488461a810b8912099cc0ac23adf026e377a71a2248ba216f840ad35193d774367d484a1cf"; + sha512 = "78b9c89b93edec1e3a53697f3212c7084c714147e44437620b966f2a90b8b2c917bc219c3b8cba27b08bc327515e0993a7380b3316d2efb385be7af120e72de1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/pt-BR/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/pt-BR/firefox-75.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "7708ab164dbffcec1a90a42b18bf6520e0d1657cc33a7e96a2b241b170649c2a3808b3877bd413af835d269c3ecadcdead912bf471c6f84f811a293612257087"; + sha512 = "3ad8e83f2169ab552cb6e03f60d343762571824cef104f7884352583a5d77caa2a1e8c85c29793e43555dafd8761df684c8d6d11b733ff899d5da2b7d42822b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/pt-PT/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/pt-PT/firefox-75.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "229d4ce0e510f178d08474dc663a598bddb85bcbf23db6a98aaa2179d9e8824be65da0b49313854dd96077abcbb401c1fbeb9a5e3fcff1fce457b52bf97112a6"; + sha512 = "83f4200e1de395c37fdc626aa6dfd3ee35597743d5f4d32832c143e917983426a725b0ae3f73090a35abdb96fb2c7aa55fc4595668641ad868e9b596679ed2e4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/rm/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/rm/firefox-75.0b2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "1ad93043f33239894c9d38b49347445fd0e462dce882bbaea39242be93d71233fdc621c2778980bcba089d5d72e60a751fba4df663b19c0cb061bbefac5ad637"; + sha512 = "5c25da1ff0d73ecb7b77901341350c7f8caea4c8ee2d40740ad6f5ea70a7a83127df8efefeca2ef3b1f3240013540fc4f70208955c62c25e0ad9bc7c56763f92"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ro/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ro/firefox-75.0b2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "4968c4a27122bac5f4bbbcf2f55064d6d42b35e7877da3a2cabc0c877e4bd70b1a5c9beb81edc4e13cd0bf34495332cc137b08a6dd223a52b8033e4a1cf10126"; + sha512 = "fd60dbebfec4b2514ca7151fffc9516c94cddf4bfb75e337735e0025746d1d19ca90762c84b97ca15893e81e29a1f62fafb4c970fcf1ea8e191fe74238078537"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ru/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ru/firefox-75.0b2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "5fe2e24d79d716822463a3aa89ea63a578819a028e1f4715a5852ea1f8b05cae906b4140dc21c6fe8a2f9a33c3d37363f254dd0cc38b4c480a7e80becd2fccd8"; + sha512 = "db1015936799ed1ba14a4ae81adc5046e9b51b99fdf01d3e88e9925bdacd8367d97662278e2512cb15eadc4fe9fb40a6c4f66bdb6c7492dc6f411afa6e31b430"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/si/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/si/firefox-75.0b2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "10e1023ff62b4e66244a8f0e9d937b338087934d12cd9ddbb1d5935612d47668bb2e704406662efe962eec89b2dd4ea53c2369c524cfcce0b38dbed01cc3fa1b"; + sha512 = "16b685a3d27a94ea3bf1c35054d2b5c6b718e528598f0a749382470986adceeaa96e194090a4d0a0d3ddd3ae8b70b57f4a31307e81c1dc15dd7e30d4db8ea359"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/sk/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/sk/firefox-75.0b2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "15fdb81e23eddf249eb5c2fd2f0f5ea824560a8a34f3080efa29ef484251379b9eb86afb66987311fc892c38021f81fc2664fc41d0f9eef6135e426188083a34"; + sha512 = "60b18d7786cdee2789cab02ad9fb28754ea9cc5325fe780b46f3e0766ef37cf0a7ffeff4ec1c207db3b0e14bfedf2a1598fcd0adb4ba28c63ba6411d2c95c79c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/sl/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/sl/firefox-75.0b2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "44cd71b632c0012133d68537aa4cfb5512f992ddf227901d35f9ac6034e38cf36190c4c75b95e0ab93ca172e0317922a62497e9458edb0b724d8b66ccbb06190"; + sha512 = "55fa56427b0f6e6667ccc12f6b326111e7b19b88b231d084925d57a7d8c1528b81efb0be1dab5c0a857efdc112189d6d72f86736793264a866dae120ac28acbd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/son/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/son/firefox-75.0b2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "419ee0cc45d6d0bef462f093b017856cbf33e1dbb190d822ea0b85bf91452f583244a876771e1680de1e68bcb0977039187dcef56b44b1cc14e4e5e2e7c3478d"; + sha512 = "7a6aa2228a562910e1e1b0f358669d4da66112977373c7bb88e3138bcdcec8cce0c8c7530700b28872f5f38e6ac06a338c6740959b4ff7d75091f2c378c4a905"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/sq/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/sq/firefox-75.0b2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "787ca501dcda265430e825fd890b6760b2295c812ae882bb7d07ce40f349ad2dcf4852bbfff0c6cdb56011f3948afafaf0dbe76842e0f011f9e4e15214e07b9a"; + sha512 = "4a2eaec9124333ee83d461762ba1d8fd12c9c108b1bcb7203e4a6d437e510b26eeec2706f8338f85ce161292758e719798cc20c6b79a0466be22dbdfa0939f88"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/sr/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/sr/firefox-75.0b2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "8bf08f9460852e66649d60b551d3d628f7507c2302f56d457f2649437d6523e74ea702115895fe2ab8ecd4a3994969b89d24094c0c41cf8ef81eca140c63f80b"; + sha512 = "a6fe13a64012c7383313304da2c8b4dac691416ba50d364fd6a40679353449700e2e320103fb542d8a979509730de2c84728fefd4b1fb2ebb203f7c7fc52b808"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/sv-SE/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/sv-SE/firefox-75.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "75f71a1c906d86ab92c0bfa6b2d07e54b3b411037614f27b463f7f97b39a73df920300ac3c227a7c35a062c99903fee84fa685050cb9eb25bcdbacc99650ad12"; + sha512 = "54568bca3be19e5d9777a2d0cccccd936b2b3b559b238635c89dd392a1c7f72504aa2198413d6954cae18000ded74593147a11abd9000ef10f61071d531b0e28"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ta/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ta/firefox-75.0b2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "cc147836101fd0b17d24f696fa0e5d4a4fdc2579f21deaf95757a3213d967e6e934691af5c7fa84bee9a5e0a3dab37067c8d44be821eb5f145fdbb5cd96c30dd"; + sha512 = "a6b68224395e3ddba38740d283e1841ce43a28a1f4cbe6810ea71d6b7cd40001dfafe2fb053d212faa5133e2805366575566de2bea3bc8d3acaf7b782c3cdbaf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/te/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/te/firefox-75.0b2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "f4ec0d17d604caad1b3eb37b413b9685bcd39517e680e1636ab007cc4cdb253e71a2643c85436be72de2fa62bda13dad6787e2e8fdda3689e421818d2bfa4fa5"; + sha512 = "e20d28c7cd95bbbe5b1680301d94894bf0b8c60aad997515d73f792c7fdf17c3efa4314c210082886bc8957b00a7f919959815e15b994bb616bd7c0ed0d40100"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/th/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/th/firefox-75.0b2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "f09b98036d5822d588a1afd3befeca14748d9f7938ff101f0555d740f5586462c07ebf76c90a3238636a3d37fe3f5a90b26fcae1de8658cc0db712e2ce3d2116"; + sha512 = "11564e0ba2770f87549c272faecb746323e19f46d9c6e116ef44a977d571c4ab917d89d1c0cab702074242d36f544fa4a6810bedd2b1088af6d3e23cdd78a924"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/tl/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/tl/firefox-75.0b2.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha512 = "28ff7d5cbd6a41ad2887dee8c04b4e129d588cd20758a2f2233cc69e6ea24cfe7013f5f21524be30139e243fd6bcae1193949b653360db65d8544e6cb654459c"; + sha512 = "072602e5f2973d7412dc8d3e4d0aa4a76aeecd493e2a1444d9348e66ee9dbcff1d8c09f35ba676dbf2f056aa0e843e87c2da6d73c6f3efd38281fea7f60c5d12"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/tr/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/tr/firefox-75.0b2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "2b676a0d0db8edb3f1af3174b7543f6cd704a61197ce9f505eecc53f7431c66c1b0853a0d5cf57c9ec601377bbf66efddbe648ec992b4e518e85bc83c8f052e1"; + sha512 = "2b5ca4ee7ff322fbb986cf4946fcb65617606f8f317cdf357a81c2a9beb6492b3167286cce7a18083df5bc99a5782f98953ec79f6ed314d84b734f41c5b76254"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/trs/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/trs/firefox-75.0b2.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha512 = "0a934e3106d9e99e6bc2d93d7f50d6a87e146f0a5d771a6a9f52a18db8cbc59ded661443d6bed42c148e6981e8d809f3449b27bce9194d584f6d457edab1b549"; + sha512 = "10ed6b3cdef78a903ac32bf02dd767a016a33e7d59de0dbc9586d8afaf16ddf8bbceb557909753ca52e1c0fe1b24da5b72c3749bdb7a56986bfe30f49e2f6d9e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/uk/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/uk/firefox-75.0b2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "3860b93570cb44849ba351b15318425c8a5a2e3dc82f6a229cfaba21d22245f74b56672ab82fc48d52c250c528b9bccf53d25b6d358e5b02493b6fdd82037f4d"; + sha512 = "2e640904dc0e6735510ec50a2f735f3647fde090f2c4a48b34ae2d123e39ad2b71923e58101a646da86d54865dac69b2c5ec7d4d54d30cf9521008e9ad6c0f04"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ur/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ur/firefox-75.0b2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "89ff25d895fd5a484ea78ee6be21b7789998215847445d8aec7487966042fd88e5703938274245b940807d7f668f21b41b8eca5eff0d5ac715f3958ed8a32dce"; + sha512 = "6aa743480ea70566a12f4486ed8bba83482c34387773f6ac7735ac4ed6a14a9e7e53fca77d5fd295c6cfeeb395fb309efa41af0bd00d77355e4b2a2da2575e2f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/uz/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/uz/firefox-75.0b2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "60cb02c912f359915ceb6732a1b8c358177966bb24ac7849362b865b1570b31266e9a9f2790384eb2ba6c15298642e8e112ee85c9cae1da65b62eea5332f65a1"; + sha512 = "3292332ce5efa59d889c0f32daab5279a37b342c98e6f4aa05e90a3db8c91f8517c26fe83a5cd59b17400e7bea0e256ae8a44b58f9b620e58497bf3fc0a52b96"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/vi/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/vi/firefox-75.0b2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "b19c3a265bd2f218d1f7012397c081690f8c949d4146c0d504409858b323a9084c00e04e540904d82c31ebe586a47d1cadf3f9ed74be0d20544af7ab95583486"; + sha512 = "8969ebe5a3148b85daf23f7a4299e755461c722b4696a700e2b6c66164ce14c60d2891691afb4093cc394021718c670ca6bd113bc8dbb7f6ae705299fc51f9f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/xh/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/xh/firefox-75.0b2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "d0e177251ee7c2f756083f1f19993d16c365d77f4be3811a11e6f93384cf58c23ae8579a9a65cf289264e0e45705226b4cd1365dda3f8731d95c2b0d20912066"; + sha512 = "570a250b522b5061ee9b3fbfddecd9018c93baed7e813847ab9fd9426855ecc6bd940e15dd08b5bb0d3b34991245104ee95a5da4f74c7aca895fe086e0b66973"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/zh-CN/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/zh-CN/firefox-75.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "30bf6bc54b91826ed9fa30988f069afa7b13e35d3ca0441f10107abb367c970080217123b22bf4ddf046db99394e9df46d825d91e5fd4ff717f3f025b3d54159"; + sha512 = "b86320fe1ddbed83cf9ceba5d60c0d40e0e137f509a13b70be7b2024052bc5589fb3bc84ded1b3987bff6416dfca11a094f7e6fe881f04b35899fcce2854ce0e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/zh-TW/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/zh-TW/firefox-75.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "b10365171ba6fc4265f9684524d1270c7dbbc1890fe01154c7c4286335523a3ee7bc98fe8e86f874a584fdf30bd64746c9e3c62ffc48b55e97f9f728ec844910"; + sha512 = "0d5cc478d801dc2a70bac8a38bde654311d32ba5059f0047d07e8fd321fa593ae56baf3b8c8f6e93dfc9c3ea4a9c5298079271220da0b92010e65eab2b7dd707"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ach/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ach/firefox-75.0b2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "54cf3f1a2b73f95e6ebd276c5b9ca40ee598c67e8a8f308ca969a79532614a10c9dd4e06f0a5f2d580a514009938a493676d46c969a257c1d3d90ea20d588a4d"; + sha512 = "f95b9ba5463a59a45fd34abceb5026c1f3834064cc318f91cf76aa118be5a796482b5fea14803f36b973c7a9f9f07af83561248feb7f92c82c1ec793471715c4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/af/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/af/firefox-75.0b2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "dede24db1ca9c1064b8afa51e87187e9eddfe8f3f159bf268227e941c7d9edd08823927c10b6681eb79c335db567575c0e0a10eeb24561deff0e587d4d5d6f78"; + sha512 = "4f68f211b7f2bd2e6c3f42f9698eba479b2c9dc60f8970cee1f0dad2f9a231ab8a1f093da4d1fca0589842e94bbda148ec79fc09290e1a85e7c505cb4f006020"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/an/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/an/firefox-75.0b2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "841d9c1b70a1ec0a58939abfd7c5932c7db76ccf1b77f7950ef3e4a7541219120d638562d96159d9f6606ad9090db04796c7b5e1048192fadf5a490ee2489135"; + sha512 = "744962dde4cacbe6d9ba67fe7dc01a4267fa16578127a48d7ef59a2ef6768dc70f681bfc73405e827a1cf1b0b7d217133663ac47601fd35ece900d851c7ff78e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ar/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ar/firefox-75.0b2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "7e12b8cae568f82de67d8f4848a092ddab634fb8c3ef3caeba4f7bceacdb260a12cce70df7fd80c30ac3b227647755141fb367aafe692db31c0e58415a9fbf85"; + sha512 = "f71b142c885ed61f78921fa058ff107cf4079c1a7f0c5fb67ed07a30188d878086cf4cc3b07c3ec2d6a7febf4f2126c739b3dd14f2462d2a8cca418ef4b26b2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ast/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ast/firefox-75.0b2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "c3b52dc3eb427e24e2566c383f8acc1119f6f6db5447ff6aeffccd65c97f370532252aca2bfc7bc83ae1c98824c8ee9e39b76a50ab3b5849669621ca9446e136"; + sha512 = "3b30a05ccc6d10af86f7342d8b184f78e789275031ef317548acb051ca7f5e3b6e668f67087818a750999265674573cb55f2860690bb69a155d4e762bae59f52"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/az/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/az/firefox-75.0b2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "7d61d36d5dddb26de5face1f53aa74104b3a451eed26a194d4918cfd5e1c8983007b2ec37c60327d1c733b6595521c88d327a2b71e3e237b0ba2b52f06d6c659"; + sha512 = "a054387e9bbafa9c99013066627f028bca1bb59fe01168113957eb7b28aea6b367050bbaf73271ea332beb7d634f2374de0f7b29b5e72b37ccc65065efae0bd8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/be/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/be/firefox-75.0b2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "233258a22818b7a3b6726dfa3fa8d3e702d3ee28440ff987676472e8b865bc23907adab61ce994648617a9e83fd530afce567f77536c3fcdb7434c9d1663ca5c"; + sha512 = "e865a0721f0ac9d6ef36b511b241d869cb2b9d6b76897c7a3b6f96c66c38b00da032ba8ad94fed9cd65a9c56736742f56fc0073768e594374ef39abdfe36c8d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/bg/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/bg/firefox-75.0b2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "8a5170979d50e1e2546fbad96dcba9d5fbc1618b4c6faf770c417e44308dd22ee0aa27a5b18f5f073f7b555f064744c4b1b627e6648afc2c5a120093c747682c"; + sha512 = "0da867e56f18f268abb91da626a4519546d6ac73fc8eba66c52cab33de81456117791126094f4ee95169d64cf046c6800006ca8b85250fd0e240f0280376b62e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/bn/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/bn/firefox-75.0b2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "76a3a07092cf6d921b94031a2b3baa8e7d356df3b49dfa9e0d7310c87f020236d7b8525532e26a77156a465bc70bdc477f285223e4f3adba81dab63165023951"; + sha512 = "2ecffd8e81e3c8d570b2931a0579cf30a111710703eef07c24358506f9ed9a2b09952bc481bda2632417af9993560ac0dbe1784b98ba34b21784c626429339ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/br/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/br/firefox-75.0b2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "b64af8927deeda0460144e05ef1c8bf8eae4fa3932fdf8f1e0d23a9df417296e7e195946b2d5090c8986af0b5561a26a3098cd0b01b4dd1353ac8b55a192ae8a"; + sha512 = "6ae78396927fc66c2a3a4097c6fa6f7f5e4c60757242e06e621ec0dc97b482425514a31a989de7aa2ce32c5e1caa99e77b9f8849d708f8f2af45a1004f919137"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/bs/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/bs/firefox-75.0b2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "ec02811bdc0ee960fa05e676a1d5d92dac953e8db66919d2e1f2ec1f4ef426438b242bf34e0e1fe10d7735605e17da0efbc5b50a7caea2827cd41d0f2cc22e3d"; + sha512 = "e40f191a49741e48b4dec8871f290ca2ef72b11a37f57956bfa57b24bc1c3983e949e13cf22fe11a878744f401e9bc6fb699a5d78edbf55620c6b7b4efda42fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ca-valencia/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ca-valencia/firefox-75.0b2.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha512 = "5d2191d153d02525a50667faf39f8454da9fd87154e205fc00d085bd2e8ffb4216f5b08716ef6464e0788ea100f4241bfe2d746f57a503e9098929fb5674f286"; + sha512 = "bf57f081cc6bdf3d0305ebbb01e98311b5ba40bd23773d93dd568bdf214ff867e495da4ddc6201d8b398f53976270ce81658017f10fc2f225419c373e68813a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ca/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ca/firefox-75.0b2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "74ff21b0633a76c726bb3de02d6f148083e72e1db622ddf8f188e5181bff9808475db7d7f94a0384f6b17682ef74b0f531c1e00aed2ac572f5690ebf5cb8c6cf"; + sha512 = "14ff3f4e17101054c64f408458d778771584581429a757f6d5d7bcaa31a51df1f2c0712b88a216b9792496ac92f6d3e56439660b56e2c1eb062094c74eb393ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/cak/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/cak/firefox-75.0b2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "3a303ff95a0ac27ed0c8b4993b858305e36c95d69e144af2b7ac9eb08de5527739f37c97f7cc762094ec9b68f86a2a676b1c59768b447ca95cb4f7674e86e579"; + sha512 = "a600dc50aa7eb2c2fc5f3cc2f5ff31cf19f3aaaa680319599f77cbb615b6545c1fefbc1f75a3dfd455bfc0e7881d9793ae05b193842ce56bda5eb4c42da37c5d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/cs/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/cs/firefox-75.0b2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "15e5a4c4c6a81c3c23ddca3deb09766c22525681075e3f488b0e4bf9c2dac5fdeb859aa41522d76eac5ae342b7cf9b962968d186bd86d1a5d942ba554bb7980a"; + sha512 = "117f94c4f3b892070b071e16660e7b6dc62df90f62783fc456a220a3840917b5344379f88164a2b796cf7b9565025a5752498575ea7b68afc24a55dd2f975ed9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/cy/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/cy/firefox-75.0b2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "3d8b06c9cbd823c331184c5372748881d91b6673f2bcb2c201bd052ca7bc6db36f502fb5b6d8b5880df34574ca860fee32f675c32157c9cc2fd022f1bb420672"; + sha512 = "87ac39c6ce202d6eca6823a7d249ac122f36487c40b6386a179fb86657fb855baf149db5e73d4f9aa437de43bcb24f32b16772da29057e4a2e02044890dc314b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/da/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/da/firefox-75.0b2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "8bf4415f1c2402767a7d7cb30fb32f5f7f3ebe8131790c4bc5d8520447b4970a4e55b7b102e532bb24ed8ca431027f7d407932cae0ea7b06f23415854910c677"; + sha512 = "9d89aaebbe4e8110d12bc1ccb9c84b03b4f39eda2f542c15eb77befa6cb28fd8bc6f6bd1e91a115ab4c5ff2c12df48ae97c8dbc06860911995ab6687f7a36ee7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/de/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/de/firefox-75.0b2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "8163578f08c87792a890c52fb1b7a5af1ed16b7065013593d72e7af6b8321467b2230eb5537e5443bf86c8a4eafd47710a9181e4fb3c22f5039dc40fd2f9fa84"; + sha512 = "e1e6df8039fbdf1071606cb6146b5b7e8c7cc793e4495c845ee68d6245820bb8f4e41c42e4c7dc4135bb21a0489bf2366cdea47c99fc56e89a89f77215167c50"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/dsb/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/dsb/firefox-75.0b2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "3c7fe1cd45fa52f5d0f385c2549f4b146291fafd8828ed4a5e68f8b79c5163ca81f052149222f80c48246da45bfc0ec35769dedccb4b3af66a1b35b983007ee1"; + sha512 = "b3630e5ca8a4ff299717e8458d9d3f8cf6d06c470e634e557c675c89f4c861f6cdcb3ed6ae4c8af4e17bdc0c3e6ceb10584fa08e600ae1355dae8ebc1d20acd8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/el/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/el/firefox-75.0b2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "a5319e5daaa3721e6b47fd7b338acb1ccc6f9f316d127d4fc83fe5be13411e68b0fa597f5ab5f44a290eeb848fd58b5db28fa25749ca4a8180cd32e765bcfbd8"; + sha512 = "9d6a637eedec5d5d4a794384201309b1bc57848760ed1af3c0afd1fb2bd70cba465710cd618bdb610cbc171253f4b8b3270b004af10a5604e0bd373dd0eae420"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/en-CA/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/en-CA/firefox-75.0b2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "bb9a61e88c9d847fb579b35e4fd603c7d1b18114de00b155cd7816bb72f4bfbb3f5988703f2c2333446fb9e0092c0656c5d6cddc41f84a0c004fce9f057787b9"; + sha512 = "1658adcd506c209366efacbd730a0576c77591ba672a9d0714b6296b9ea24cd5f291a6a8003da6cb5d8667efb5c8db41dcbd0dbe83140ee45d8977f51882f4da"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/en-GB/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/en-GB/firefox-75.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "6e2afbf7ca225ce980928931073be020e9c4421d8780449a8ce5d46e3e1cd122d5be813054b2abf57c9e5f8f680ae1dc05ea733336e7e9479c3b04116a119f51"; + sha512 = "61720522cce0fafc76173331fae77d293b952bb05c5b6fede29f1b3ab3ecaa2a546c9a16a16ef4f62ebd19c04f0925db232d4de5b3da172b5468f9657b0d59f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/en-US/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/en-US/firefox-75.0b2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "d0a72bac65daf49aba93e84c781830fb4f6fa365d8e5aa23571aa52fb0f0058465afe7b84b40330d6e5abd8403ca075fc787343af724664ce1d328a0d7523864"; + sha512 = "a45899b9efdf8de1ecae76d19c5c8a081ddc81ac2b04991c5000a3d7379d13ceaf192419bbcc87fbbfb9dea50fc6b99ffd7845f11ba47e280dee51fd5d832edb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/eo/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/eo/firefox-75.0b2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "3ccb3970b2623a31e741d7c88aa2e5f3c71bdca83ffded16508939fe9d2ed431b2b83d09deb00e2d5fadb0915b8d17c8a7e1073f5585167c28bbe41c9e03d94d"; + sha512 = "97409a0943ac848f96c54dc6e7ca8c955b6ed2aeed078833f8a69e187e550bc588c3b5ec82d4f56061cbcb689e5548a8a9b7f9171e637d04a096b91b4d4421d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/es-AR/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/es-AR/firefox-75.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "c59405042b68ef5f7e50428700440972c082436950d03e2988ff2187c28767d709ac4a4cda71241c3c2f619db2f9e5cad38e3c9631300fa86ada966d6659015c"; + sha512 = "75c37f77ab57a1503de3ea27b55d4d77393d426b490413c4c35ff1072534da38bd31a2e78c5655bdc9b5d5f32ccc9517e83bca1be1a10fda7cbb3ba289e0ba3d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/es-CL/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/es-CL/firefox-75.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "12666d98f08d3de2385d47e6b864c548c9dbc95dc34a1dc52b2a893650859bd383586e7870cceb591471e3e9edb47027198896971e29d2e5eff4ec3bbab978f7"; + sha512 = "d9c58844f4b241d749dc0cbd1d04a8e490a6296d0c3cd26da062b043060488794923728e29adfe171834b331ce9461465f14b71f6064e49a39d458256a99ac08"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/es-ES/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/es-ES/firefox-75.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "0af2573f041b1b7e4fa8b1698c221e986bf83389966f5937b66d13e68a544fb366871e1a5316b675a5af00db9992478b00a1569953c194754dd6bb449bda4da3"; + sha512 = "9f4e74d5f01ce99e5bb9ee47f262b0442bc4ecfdf25a45e204bbc207a0bc49698b2e82bbb8ea8a80b5b912d6dbd4a3e0e42de75d3becb0a2fc2ebfb3c2bdabe9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/es-MX/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/es-MX/firefox-75.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "6eaa4cb7db3d5c129853a8457eff48fc619c8da16127bb4158633f001a8459578550f9feb3883bf1590857dd9ecfc99666372306ff86d6275d66523d2ea7f590"; + sha512 = "612a5d746e31afd8d4f3be3b56c0bf28166474e68a16b237d6c65c974a6f5e1589c3c29165e52936117969c856ea1b5488649d22bdd08a4db05dee8a80142207"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/et/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/et/firefox-75.0b2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "fb0fcef92df95bf3d9be3ff49a87bee5e98d123008d07455557fe2f282ca53a3763103ffcde2d63c395c45ffc24e994b4d182dc6b72f78118ed972ce007f5405"; + sha512 = "cd59ba16ededf91c6abbe45d059822fdb1e7f450fcc4a7c90816ebcf4aa7d9bca86ca23c105b1fde01944b06e188b240f8622b7664207fd680d73063164df81b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/eu/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/eu/firefox-75.0b2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "63528ff70397a343c23660b6e281924056c3d15581f9d090b1f546422074bbc4727732c763d03670bee0d7e58dcfc5753418a885b10a36b09c11c1ab3b55a643"; + sha512 = "4a6d6c84ee790000a0e50b296d41956d9fb1708a20d55ab0d093147d823fb3b1d3b209cf83bea40c4a17ccd5f2fdfb898425ddc105bd11f7375fafdbe138d12f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/fa/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/fa/firefox-75.0b2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "1a5416eb730a81ace3675542f7c870f1c0b083a86dfadc7b027244caa283a29486175c6a2cf1ffac3ed8d2e0a1600dad1e2d63216a91c6322164308cd1e590ce"; + sha512 = "12f2a70b386a6dcb7184c0afcb28b6f01daa0e2a5df0cb83cd9407659086036a379cf3e87a4c00466b1e6d730811f1394d2fe870a33149915a9551571054bd38"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ff/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ff/firefox-75.0b2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "29017cf396ad93e5c9ed098ee6324a0a49183965c1983935187d3de644cd3522c2fec34b61d12b4527d4cff307e0f2945b616711ac5ebfddaa982ec3467697e6"; + sha512 = "de6af7697f9450035c4bd14daa319c020f53943521e9867e3784c6c68183192d5a4076e1f416bf062d76d16cb2ce113c3aa2a462a879b360c8641cfe49e7cae0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/fi/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/fi/firefox-75.0b2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "653ec6123b84002602413e89c152d6cb406be55d9a9fa5ff72839c0b90d3bf1a87a32d2e113ae907721f53f85397621d7a06bf3e38a32bc274b89bf1a7487e98"; + sha512 = "3b5a6b5ff92c79978dde410bade97b835bbc8159db7659557c6ce22675e33bb96c49478596ee3b3a8acfc67d8f4a24e02ddac18ee481a95250b975c174c4dab9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/fr/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/fr/firefox-75.0b2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "7845a7c8c1e9f844e4f01414bd52f172bf397c6eb8bfa0033c0216c30f8c14ff7ccc5a213428d187f571e8fc4ff393dbe37180510da4a1b4154f63b2a4285e55"; + sha512 = "1038cf04afdeb236ef0b12ad096d0431c8576105e861c09bcaecd1b27a2ee02f56834eb874b8007f50534bd43a92859c51dd0aa0150cd258cb22368337da1d71"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/fy-NL/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/fy-NL/firefox-75.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "9cd9f134c4ce2b5d465c608f211acb45f50d9d3a0c200e9080fbbeba13f25f5faed6b6baa1a9149f88b3806f4027e72866e004e3934d0331f10e25673fb213cb"; + sha512 = "c5139756c49eb6977f053003238df9b771fd61645d540482875775ab76157eac29be84869390d62261ddafc1b6005ce1df58bbfb7cbaf8d22ae4e98daf6d5d9a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ga-IE/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ga-IE/firefox-75.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "2a75c341c77530075d8598efef163f245040c602a62380fa0792b32c746e455ffd2a1220fecdf321db665cb6ac0d1d7963a7750e733ca59f1c413449ec1df9e8"; + sha512 = "d9a5baf26001f438f20cb7799a6da9086039743e184814914199c57a64cf7cc993bdfb477ea61bcee43e2f7db05ccc02edff99a093a1e2a1f41de0ba72cca2f2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/gd/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/gd/firefox-75.0b2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "5bed7e36547adcfed70f68ffe5112029e5a03dd900f9f35efb7ac2d5c9e18e051bb26000ae9b157f9d2855db701122fdec826944e1ced7a67d78d257801c17e9"; + sha512 = "d9c4f1ac7d5abb7c90b7cdb6aef437c5f3ba2f524db43a34cf65df3822b811293a5d4bc56707fe254cbb57f7a00cb0773a1619113f3b455ceac50c388fc8a2d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/gl/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/gl/firefox-75.0b2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "fa5c6453ba164c5c14c33bcdba3defe56bc19df2494a26f4666477d950606f69e69fe2d3d162b9dea506308b28b8728e0cfd31c343b0b1ffcd164c2f580246b8"; + sha512 = "32b7e11e9f5c76b12c3012fcd90d5b0bc2ceed289780db6fe32e53ecb3dbe9fc31a83c5a684496aa35d3c51693c14265a24725131b9e0b6653c811dd2b60d933"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/gn/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/gn/firefox-75.0b2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "29a584ba3ec860fb44b06bad43fa9ef02cabf5bb14ae65e54f732d195af11b9acd3dcca5be7939b3790126cdd4882109a645dd31cb0da41e8469f81edcc87b99"; + sha512 = "89c763e8ddb051304e8b192a8071fde4c4dc4c0d1b233cde51faad5b2d8899609ba5c06399569203780959a70207041b59a0b8ebd0c1f08891afaa37a3e44a9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/gu-IN/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/gu-IN/firefox-75.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "553942bf2da825b5173b4076b534db357a56f180e77663c132cb1392a678ab2d42d532d073aa99c0de40e0f0ebb622d321c01fc0f2f20d2ec6ba426588219955"; + sha512 = "4ed360cf1f16896f2bc7d9f90f66943ca4f8bf27336a4cce928760b820572b50bb4403137fbe9344c117e7a289cfaf70006d702e1aa6bc4eb15150fbb743119c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/he/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/he/firefox-75.0b2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "7dcdb7443875614d0ef9820390c672b324a4742c4b3f50bcf0b42caaadd5c113777ae684406f5a5beed975c81d12e9d2df4e0211e4187dafe2cad351d23d5140"; + sha512 = "f1aa69b9ecb760d4797dc15a15dc7237704e51575cb02ed7019652e81c0f862db3494b6aa5059a1e7c6b7159cd712666e7f279ec95466ef57af85e1ebe4dde85"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/hi-IN/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/hi-IN/firefox-75.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "2267a22af52773bbd793ec9591ac0fe42db52b61d396a040bf2583ca58c8a97a651dac26922335aa35c830523f4d0074568d45c5e74c4aef7b541d0a76a08189"; + sha512 = "fdc7f76be1affb5e93cb316844724ee8929e84d6fd629797d3c0e150144595b0d6d2b06763d7f6a63210622b3da9a4181e5f704d2ea2383664857561806c2cd6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/hr/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/hr/firefox-75.0b2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "8b0cdf350f423fd695b291296a345cf8d5b194d0a762f99b6d0d066b723f9e374ea40f93e08657c9e6ca8d824ca6a5465c7fc935688c1c859a6c783a1b409cea"; + sha512 = "dae36784f556cb0e4d371620b333b167b16e810eab97d4f4857320a9d61f14ae392a4b2a472fd43565a807ba2d75d4dd4848a25effe1e2e7747dbbc30d893cd6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/hsb/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/hsb/firefox-75.0b2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "214d1b272b9d1c6aeae23c221ed76b0966e0d9d2b9c52f53b65f3eac6727e4d9e840f427ff62f37fb8a1103f2a81c2baff18f5f9ca6e3b776ccf00127a2796ed"; + sha512 = "04c175a3ca68db0d848a6ed2eead84cedbd7078d741b43e725fb51f5a4124487c3e30f18c940eebb7702154061e67b9e63a53d7d219b8ba25121cc47de3a8049"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/hu/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/hu/firefox-75.0b2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "37f1f312899525e83103062d1d51074303459ba845570781b0ed34702cff5779329615cb38846db9728f8ae242ead2c7ce7dc8207e8dfb8419c1f9146570f4b5"; + sha512 = "d6503a482ff7c43cc136e23126524c22e5636a7c5c8210052f353cbafc5d4a040c31572fd3271972dfe116ce3ac0d924ab509f677f4d8217bde282f76820180d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/hy-AM/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/hy-AM/firefox-75.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "64fd466a0d9d6e32cfda8a320f189f40bd8426c41e5401097936d1bc92cd760ea8ed2dd86366a914311a7994d904e55ef7310433cb91b7edfbb3b3a5248005b0"; + sha512 = "4082fc2ef233e02b384cd576ec79bb2697bbbb8a04f469a1574f89fd9854ccf4138aed2569c2381697db2e073a471fe1e5a1b25b58b14a492d26d54229a1c6df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ia/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ia/firefox-75.0b2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "e13b02893891cae774fba02de7d2f15d57d0912f3985d2d5ec2d4c9299f54cdd0fb7d0f75a2e1643ff2be4e85944ab71df822b3dfa4e189b7728d4f97cbe3dd0"; + sha512 = "f3e24a2778346cfe24a00f6cd966a2ba7b59906a0cf28e240313c72305ff9ad1a307b4db6846a6ff02b89deb72b3c9c4233f0f7c00e9e6f5f5dd949e04b12789"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/id/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/id/firefox-75.0b2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "1aa455734b272e4b1d31c8c252604fd9d8a37def3fa6085cf6927815a661344c22d2b100c1c155b508d1b2a809dcaa68ba1090020a852699756c7f494ac1980b"; + sha512 = "4728f20776da754eb696036f69b6a341d912856bd0d9c105954f56d1181abe6b3b71a125b836d86061dfb39ed6282c4eadc3c9a0a33f39c24e9b34ae8ce047fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/is/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/is/firefox-75.0b2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "60a50ea36dfb707ce877074fd68ca8fe95d9367f57350e35af9a252c1235a34b05f4d8ec2d76daa2f4bdc1026086924c53ea1f75d130286a124425b3d6dc603b"; + sha512 = "0eee6d75916bc89554bbd9cc6736a289c816cfcd76c61999fe546489f5907ee23d9240686cc2f85fc56b005b4519883692d17225ea2daab7165f6bf0023d6290"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/it/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/it/firefox-75.0b2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "6d6119b936c957d54bc4c5dfcd2df3ee42543024a89e48ec5cb08645d7b7ce9f53a8437a92afcd2c4cf4395724324599f9bde922fd0c88e6ccd2ed76a1141359"; + sha512 = "e61500f91e7351ea75b5fce63c0b3a258881449d16750cb84a8b91e65fdabae42cf2e8142ec06e408fc221c86e372a60a282a8635bdf103bfd65c097bf51d709"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ja/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ja/firefox-75.0b2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "8f76e03d072e9d6c4bf9b6fda4425f29f4645e089886d8ed9a648ea82a7a602ee6296ff7c5c0e505195bbf9e051d758095d23c622cdb5b606a285b550b3b0488"; + sha512 = "f4e8bcc5435864de90bf69820f18c8b2647fd8da250089e4940e752d36b2ecb5a437794874c3cfa5d3cd96ddeda4f6cbdf4c17725a31d57474e4d6330eafa801"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ka/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ka/firefox-75.0b2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "f173d6bd7ced596da30f9c76366d1caec34548e08d676286bdacb1ae336f01174b391588eba9b725f25079271d9e8378f5248ab9896532dbe395f925912f1f56"; + sha512 = "b516b2f8af0f306b78a67af63d9576b358f17f40f71520e82be35fc8dfab29b61ce5e4dd56cd52b6bed2e029597524db4a059fdc63f58ffa4013b1c6bed39cde"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/kab/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/kab/firefox-75.0b2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "ae1633a7dc1ef1120f5922ac237020d54e1e3783f339948394d3811e87baff35a8fbfbc17fe1efd7b0c5ee0ef5fbd4b28f9ca734a3cf03e6c19255ae5ad9d2eb"; + sha512 = "7a5c35f97deb3132f2575071eb81b5118f16403f37274f1f0d6677811de7b88059c2094aa3c35a7350a5a0f3308e904378e6095662af49188ad714b1bea920cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/kk/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/kk/firefox-75.0b2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "6389efbbb824b59a1817fff041b3529a1466b310b8b93229b2d8cacaf6b009210ceef136b579c154b232cd0b756e13676487fc8018a00ab22ba800eefb183e55"; + sha512 = "f7a21230d6f2102d0ef34e3407339e289f3c426fbea1e22044653908dab9430422d85000ea5c30fc2b07905a10aa2afa3662904f6ca388031ba30c91de760d0d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/km/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/km/firefox-75.0b2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "e57271974dac3818ad52838fc9db0e486eff210ce85a74ccad57a76072aae7a7eb46fb88b8080473098619279c515122a22d986b38c53c34b5cb6d80303f2220"; + sha512 = "b2b66527be2330554a69380ad44b56fb2b1c297ad9aab118446e55bacc35b7958f704b5acb543b826919db6c36e91514cbccb4aff3856dd9ee58dea9bda43cbf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/kn/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/kn/firefox-75.0b2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "49d5f860bba705238eebe7f94dc2efba3f05c69f3c1813a27479e514031ffc1f6ff0e1c6316424bd73f2c750f5bfceb07212486122c5b3575ffa7930690cf214"; + sha512 = "b110a46b8c5d6f4e7a9cfcd126a80fee7ba95cc35082845ad8aeec0f6778dfcde805377ab395e70a5e9dce518c53449a5586d9ae6eb8c19dce0eed6b4757b8cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ko/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ko/firefox-75.0b2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "47f90c68de6663bd0ae774cda94c2a0a85a92e743834c74f667049f18faa4836e403da8abcbe04b8dfb5f12f6518925e672967fe23754dd045e37a26a3d8d285"; + sha512 = "9a35c7a81cd8ee930f8164bb59e58c321f35aa47abe5f0e28faf320216b1555b89516aca94bd49a1b76c892abf29dace03a7055e571198bf981c4beeaf965973"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/lij/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/lij/firefox-75.0b2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "5ccb1acea6a156d972854b6396a1a6d3c7d8bfc297113fd8354f9062d954bdebd5c0566ae4886453fdc4aca27dd3e1732c0d45d91d859fdcfda230f50e1bf826"; + sha512 = "21a09cac09faa88963e185d2e1f732aacbe2dd8629a389a851bb149eb1b09e4aa21a78996021ac43f7861cd67646e6008e63420c690bd8072138bc707d937b04"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/lt/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/lt/firefox-75.0b2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "1a877afa01166cf14116633aaf2d3fe3112c0adf5e45272bc71de9b6c56343da0c1c87a459529a318262cd80e5d0d3a436f92b79ec4cc5b92329dcc15fe11871"; + sha512 = "67864e1188716ae7e93f8a824709d597124ecdd4d76dd61ffc6a1dcc7048429e17440c8d096475811c7a00db2c42c778477f3c32f26e2facfdf538f562fd580e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/lv/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/lv/firefox-75.0b2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "37403fcda86c796c082941e8e8e14b621c0de2a7080b413b7868b79ebc0fa5ae6069a8127739a7d271de109e7a9fc8f7562fa5d342b03926f05e247d7d5299da"; + sha512 = "de68b8cce2abe936bed8015c88a9dd998bd99d177b127ffcc205c975aafd3f51eff40b83d8b8e18cf66ce8dbb9931a9a9ca27684dcd2e2bdaaffd7b96607dc4d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/mk/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/mk/firefox-75.0b2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "f87d35121c20aaccb8b344940d86114f3ba34878f9cba2c5031e10e54d29e7fc548ef1a58882cd5e8bcb97b170760581e6df787ba1ad05960d61c5f67e6aa878"; + sha512 = "c5f0baa178293cf993fbfe73f54a7052a249dc070a3c1538df27949c38c14d1e3d486d7bac26a5c97bd744c051dbae265b4bea215b1bc96ac732fe57a7766439"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/mr/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/mr/firefox-75.0b2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "07b5750823b4973c494b9b4f9c76d4269097489c7362630fb59eb995b12a58f3b69dc9931d802f40f3109e939ffa026402455afd57e487225564169cb14a198c"; + sha512 = "61e9f28f0c8505d6a132195aad5ba56ef5c9c41caffb22b323b764029b1af0f92dc43cea70580246fd11bac75908023553f3bc2238d842ee1f6962ac6c059ae5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ms/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ms/firefox-75.0b2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "c13597c3dceab6935def4c629b24a52fce3ff3406fc3fea395c68444993cd2d9ac25a10647a2d4818db49faa36a69faff61e5b648886b4c662caaf69e435158b"; + sha512 = "4196f1eb297eca219ed58c58db77d691580f9a33158769f0559a2d1a815f4170c89d282bc01d4a94884b5dce6bf83fc6a6a687041eb02fd38f6dc0aaae78f555"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/my/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/my/firefox-75.0b2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "1dd123936837ef7d806449df7458ee0879d3da33d16824587e55830a88f5c52dac9c66d4d4678e9cad35ea1456ccc6a9f282caf3e6b8888145729123aad33556"; + sha512 = "4c1b2e13bbf33ae4d8c213e94a0d1d41fcdf1471304e9eede6ed74d28eab659be559f2a5ffcade436b624604e26255e37941afcb8d9f36cfdca2c3fb9031f758"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/nb-NO/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/nb-NO/firefox-75.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "b9c4ddcc16a8403f82f1b2c9bbf390fdd94efbcf442a9010b8a127193826cd4c21258edadbb887dabe5cc5aa642842e371be01cc3fffd353ecf3c2815a2dee2e"; + sha512 = "fc6d764124ae4182c01a96c12ba13ed807a7715d1ead7a7ae57c0c65d394166f0b80a18b12c351f87d8f28f894700d3e0892a42156cb6601fa34d173413ec121"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ne-NP/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ne-NP/firefox-75.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "1bdd91de19876c54223c43543b73df2d9c37d27a8986544d48707810f12657626c2491ba09313c0fc51733232c4b5008e0236148feecc415b9d3bcb52b126536"; + sha512 = "f285ea0cf2e4e6cd5da9ea2e04c5a942de5a9ba639c0c6be32fe64cb2d4076b15a0b8478a6b8e25d0bb7555b8148fda33313e5c78d91c5397d3cb8af7a5ab09d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/nl/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/nl/firefox-75.0b2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "6cfd830592b5342b18a0c0382b33be36fa060df7fa8892ae6aba2b7dac37f2578108491e2eeddeab73546336c354ef0456206c37be4638942ad28124c14a7792"; + sha512 = "1e7e423cc24de27099375279a8f46572310a245709ab3b8450c7c1257ae28e219a1867477aaf50f68762eb1cb32b831ce3b73a1d4d7fcacef1fa4f6bc6a864f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/nn-NO/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/nn-NO/firefox-75.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "b092affa3674da00ead882e26b27fe61d3719b69ac0ceb5ece2e88225c26d78c066a47ddb642e539a77f01263ba85f503b7dbfe1bad0529f1cb68275cfef6ef4"; + sha512 = "a1e70c2c4eac55f9f6ef46cf741fe421449e5ef1cdf1a125e07a86037c1d5ee7a329d0e2041338856ae8385778207ebb95163cce1a124da64a5ff334c73fb5dc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/oc/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/oc/firefox-75.0b2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "44971c64acd96da8c144671c82be145ec46118f0f38bde69580c83d2e7a6b6f0d6bb1a9b6f21cd2e84b70725aea9c388ca2b4d6545061bd4a4f9f4f5eaf2d929"; + sha512 = "ac4abba844e7d9bca5d10889ec5150c2fe357bc5e2fcc1a47cb4ae1489645ec884de70a0190b7cc7ea943f1233dae708e33be8c9e4453a39e10c89b418a05e32"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/pa-IN/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/pa-IN/firefox-75.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "0583f4b15cce5c1c4fe70d0f9c9d446035510c158fee6da27a135b9efaeac7007177b4ded5983c8130f1d1e9c377990545318f5955a99737426424dad50e448a"; + sha512 = "59e0ac652e3a619d5a9ba1d94014e583fe85118f4fe54779abb657e9ac5f59865483007bc6c254fce6f29270b24b74805ee6b9d227eca6ca61a651e051be6bd7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/pl/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/pl/firefox-75.0b2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "75046f40fe1dd1950091f61e487c6b8c9f424db14f05872c528e602fdac0a0f00ff147194f953fae941cb3bb93b75367c7434c1db95d8a31e7961278fa820a27"; + sha512 = "3ba13b4616bd7381268e618cf0c00ea4ed807c38ff81e1f1b45457f9ab780e6676bfc563cea62df8767bbfe6962d91b8f1d7de63fc101242d18d2b1bbc045a1d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/pt-BR/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/pt-BR/firefox-75.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "25df8753b7363b4cfca6882fbd1941e8d4b532708f17ff7299f685c9ea2d15df61b12bd0ad293daa80e6b184d53ef2e36aafcbb4b2a7cd5b976bf81700d4c68a"; + sha512 = "e115b3c9cbd88ea0fd43b58e9ba7996f3a95004269c5825b23244c9d30c75fb2f63abc4ebe6e645a91e21c798c4dfd7627604f44c0862547e156aa8f28e13d13"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/pt-PT/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/pt-PT/firefox-75.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "f06faae5ecf8c873c8fd2c1999adf23b8b08c1b782f33e929bc97630d4094a098324454c87af9321332ab39f8543013bd827f10299237dda8d7decfaf29fb59b"; + sha512 = "7f53c4ba63b41c1f69c3ce11d401464d685983a906f44911a4a984073193c75b64d4df3d295fac9df004b4c8858d586424381d5607228d24663d4a3114e80a2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/rm/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/rm/firefox-75.0b2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "9b026decebb2be032a7ebef1e5d7a18643bb3ebfd31baff4022d1fbed444edf93ba4db70c9df2f899de3d4f9c1fe8c0a218e0ec40015f0d46ee156c5181d1235"; + sha512 = "a397e6373787d0614f77641a10658dd72484364549f39ce89599554ec41b883a1c32b3a6a8df26a0b9065664012fd88e1c88d04d493ad4b2b5b39745113f4e99"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ro/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ro/firefox-75.0b2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "6977c73f7207944ba646cc6593aefbc5b24b94d8e63b95508412967b6da6c5076e6875827789330bebd02c50b0f6b9a1d40dd49e3c079e614ee0e273cf2a8c59"; + sha512 = "7eea48885af4efae7083c92797039d940594a26762551a5ec91479005414a8bdd7e0b57ae7e7f64d9fe80ed5d1da9dfb9c5b04aa1f721a7edaebde2c3885f790"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ru/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ru/firefox-75.0b2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "49c458fc0c307904c25e7d55dd1b4acf41020777ed559828cd01bf416585a1479c853909dbe29d2d90b1d52471f8628cabecbcd98918dad7eca7a0cf4096f1a7"; + sha512 = "1362e789bb4890ce7791fb3c3d2e48428adab90ea5fa3f7644cf6fde6f6e0ad13ae01d318265013c48c8d0fb1d4bf67d2bf1001c6a49a2ab2fc0cc71813f6b3f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/si/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/si/firefox-75.0b2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "54078ba7d22c1a280347d18ed30dbef9079adac167e8b79f3bec686693acebcca90bad4ba8747d173fc762499bfbbb6bf8fd23906666ed005f568ae8c5683392"; + sha512 = "f0369e0f40aa26933cd34b3e34e25a4fd3dc0f28ab85f58e4c5973732e1dd0c9539c9b2e83c82f70524fc0cd2d735a977ae2c62043470f2a590d9cd6e1f35643"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/sk/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/sk/firefox-75.0b2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "47fc04108bdebcefa46cb366d071adcc45508609530bf02eddc65eb6d13b34ca223b2a9e552563b475c2f8dfeda58101ed8af21312170330bc8c48ae79427a35"; + sha512 = "2c24711825bdf49ec2cc5ac558ab1dee43c4282966cf9dc00f4ec5c0f20761c31e57a79640b7465a50010d65270c5f730c4ba08bf268e9b85d87e3e800e77bb1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/sl/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/sl/firefox-75.0b2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "cba41a4178b971c136b3853d96568152a1583a00c9d859327e41dbdc278fa7bb31b2bde537551bbc5549c2d506cc09871bc53aa3da486018210b0f86634b3865"; + sha512 = "b25e7a1c421d98455bb141a48d29e3f6b57974b1869b5950c898c56a285fabc6c10b1308a64e033fce77ce9376c580a3d877a42c1cf336d4c17f99dc8c375789"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/son/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/son/firefox-75.0b2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "2a4fbdec227edeb83448ea9575b991b574e467d2e2ff14d75f000a1d912d3bac6cb6caa6cb7fa3c61236d2729decfa5f0aa9f0e756e503dcde076bc095ffb786"; + sha512 = "10011f2340274dbf7bd6183bebbeacbfa41f45eb8a2b255ef996f9c7285781bd80f4ba5e3411093dcccd7431cf57936ab87c8fb27c4458e19a8f0a5489ddaecf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/sq/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/sq/firefox-75.0b2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "c0743b88f8c33e8bfa934f0b63eb67a9ea55489b01167e5bdde91362f7217375d2e2834eccce5a7e61543ae81fbc45c296a7fa31126f61cd0f2dd8b04c807df4"; + sha512 = "e65105f1d8bb2aedfff769c5dfc55426cb846008d1d4bcc639a45c1fc24a00b2bdb8d1a1072755e552c7878526b75bac33d4a9bef6eb4637bbdc5a0d97020cc3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/sr/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/sr/firefox-75.0b2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "20faa1be8b168ca94c8c4a8a22c4ebb3f1aa3555358b0d8ae765a13ff5a185a7c16ed8bd9f9f1e137cd02cd3f5119acf912649e46d84a180e285c4f5f9b25f0d"; + sha512 = "3d0bfadf39fbdd5b51c8187fac2ac6643bcceb06252365532b0369ca4beb0e09ef5116704f208d5fd66e23b321828a24dda7dd277c475967711128a6f8f3bdca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/sv-SE/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/sv-SE/firefox-75.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "cf272cbb87e59751eb5f24c1d07b1a5926aef006d6c199b58c3cd90f853b9ebc78d11d03a2c7600c0cfefd07499c0946f26465e22c29cf69b74f6e0c8474a15e"; + sha512 = "036773f6324a6c6872ed0fa312c7ee63a891fceef9ba51f402e135b1572bacfd31c7b137014118ac91f13607056430eedcf082aa4889c68af4f4249035bbf7ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ta/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ta/firefox-75.0b2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "8ea559be2b493eb925dcb01dc5091b7bf776ce7af47fc95dbc33e1e1038ddd5bbe31c85c19e616746e1c6fbac42f4476bd1f2b62df03850a144bfa880ac6c27b"; + sha512 = "c9e4290b20655e9ad5e2f9bcf8982cfdb8c0492318ffdc716b0c257bd707b0d7db69bd6b48802e17026a3416cf1c78f6d10e782cdcdcaa0cc4a382517e1ea9e7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/te/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/te/firefox-75.0b2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "10190b94faac8db9385119b21d8fa46b930eca4a4371dc53415995d132430a9aa83d7e6af4d406d96a831b4318ff160be1f301d7f91b02a082d90285f03b6ef0"; + sha512 = "53a4c90bbd7854031dd180fddab6452f29c33f56111ba40d9bd634bb5e87584016581137e1b100ed247565557b8a556c6a473d2c46e1bd65f78fe5506420091a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/th/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/th/firefox-75.0b2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "b95d95ce5bb0f42502aa88d24884a14f84af84133ab0702cc84c0c8c2e3b4ca1471133da971e85aee81f5979d99af575712366fe38f470e030275f73071c20f2"; + sha512 = "f75d583ec397c57cac3bd1c384393c818020c3f46ed3b196060497fc2f09a36df3d31cb7b6637e3697a50e04c5222cde0c50fffafabf3415cb097552b67061f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/tl/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/tl/firefox-75.0b2.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha512 = "149891af8ad8016d33e7db3144a9c5167be895cd7bb098972a51f35a5f4f97ae03fb3349c7d0c2222217d7f133d483344a3a4796c1be89402f8843cd7cfa5cf4"; + sha512 = "607e6371397bf29c10893b5a72ff706c6cab84024c93832aedd1e7a57c1431c47350023424614680350536a3e8c6909a3ad89392d15208bdbceb6d63e1a2d95d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/tr/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/tr/firefox-75.0b2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "bb152289951ca25f42b227c8e851c5fc8cd6788d654d64478417760b4999e10103247ac21216ecdc6d4e3faa5e39bcb3ecd3b0f4c03cccb67ca546fa673de03f"; + sha512 = "c28d89bcae7ffc6145a1d8393a7cf4e9e63025f09ec54c42a7d5d7e6a0584f02ab52fbd4346c74e54b116ff461dedf7c533a77f2b2175e34b53f7a2b725023bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/trs/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/trs/firefox-75.0b2.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha512 = "f1f47c635364e7da15a80ed33bb2c0841dbaf2734bb24fc21b33967e909e1cd047496c1c30fa83d3ba11802e46eccadedac14b033705a66f542b3b084b9e729d"; + sha512 = "eb505f85d35dade14f853bfbf4086f3ce28faed1f497a35f612f30bcf35d49fab6ea32bf2b00e436d12d255ae37dce6ff1fbdb1eb3dd1743064181404bb28774"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/uk/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/uk/firefox-75.0b2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "a5cae41b115e9ef41bc5f5bfe618dd7f317333083b83ec9c52a0a56e4962135cf3d644d136fb03b5b12d1e0609bb2c554cec87215a279ff42cd3b3a6b3a357a2"; + sha512 = "5045d30636c9f3d893ffe5a90e87f22d91718e36e720962e4d6d505106922290bed710ccb9ba50897228836f5df6844de21384143275460ef50aee37ca175ad6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ur/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ur/firefox-75.0b2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "077667c2264347c301c3744a0f65fa2546e2168b8aeadf13b8b86a251bbcc16b65d10d0e91aa9368a4aecd86abe3f2b6685b16bdf8e2bc1b9003bb41fb4f0ef2"; + sha512 = "78daf235a6cd6301b356a887bb0b8318e9a8f7785ace0c3a398fbd982e4131acd8c43f818addc516f0f14b56d41ae41d51ba07f2848c0630baa057b323a5f268"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/uz/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/uz/firefox-75.0b2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "6b4aa50c39d355f9a8d55d1bc58e07b17a72bbdcd5e9b45816dd00e7f45105bad90e1ea0d38990af8d7c481a45f7de4f164cda6db2b35f85b1b903f403211c16"; + sha512 = "ed6edd3f1c54e2675c650ff48e5102f54c258cc999506ace655a99f19dccfb9e3140e4c63d6bede4d72b6f84a6eb300ba485d932316b83922288d3ed6ac66e00"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/vi/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/vi/firefox-75.0b2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "a2e91a40f0ff57f800ba2ebb6a6f7bf355b2780acb4e72d759cd01d1ddec134d0f7e33852cee2e15c1382ca6f432d58a7ff653e1885b21b9657a85b9c52f11f7"; + sha512 = "125e68eb19e1f1fbfc8a8ac0809bfeac48ec37da172052921cb0710d8ddbcb031c72139c81c6349a4ef3946eb6d10e49d398e561e2b09c23752182ad979c932b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/xh/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/xh/firefox-75.0b2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "d86daca8654c7b3ba1687ad6be2f00f42fa66caaf6086339045323b2f1c7d127b07f3e7c6104147402ab4aaf9265610b4514d8e6f7c73c1698711aedf0800ad0"; + sha512 = "bdd6749ddbe15d1332a749a9f9d954b4f018c91c3975b61af2863509fb97169f2c1afe31bfcfb2b3ee68fb30a5b7cbe6fcb4e94ed751d5a1710c743b3a6bd9de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/zh-CN/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/zh-CN/firefox-75.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "169e02a6bdc822547feea77359ac35932dade565c99d9b9cbff9d6d3a7a007b5dfe98d006f9b4b12d03e8fa0a96ba3fb2552c7c15196c5c269f07ae21fe9bd98"; + sha512 = "2da359cbc166375462ce9f75f60ee802b2b63bfd21afa661d3bdce7ee41a3c76639c81f6700292d352739f8d3988de3a33e27464d7a8d7023e52440865e92c12"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/zh-TW/firefox-74.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/zh-TW/firefox-75.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "3eb488a91dda4c3ab1b8eb421519e196da4bd78f66bc49716f1c743e961ef397f3d24cac2e30e7c21c8c898d8b96f84a34de8d0a0c85908a68fa8225978544b4"; + sha512 = "99869cdc515c28505d025348013d7617a16ab79bc4b024240b893628e1884221fece1bee33013a62f800e2633bc1edbac256e74c411ea10b32b6802eac9e7855"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 9228dfebbdc..02c90006f34 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,965 +1,965 @@ { - version = "73.0"; + version = "74.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ach/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ach/firefox-74.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "9b93c28d9236318f779df24675207e14976a3a303852f111e3e54f81fe24019f48d16c13c92dcf8301d2f7a40f127c75ca940adda251437d45edd1c11d961395"; + sha512 = "e5d3f75026891916b44fe962b8a01bb76e434269c2e9c10c8815765a8fe3b5eadcd63ade57ac2b103a8b66fe26ea6715f6c6d1ef675390e339c4d82c7f6a2723"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/af/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/af/firefox-74.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "b6828a008030b775176d165082cfa9c6eecfe5857ab0702702c7298b4d946f0aced8338182c5dc84437b7b02e42a33c6df6c1d38b0b4da6cf0bebc3f364d7f96"; + sha512 = "0a901248b2ebf5a8cf9755abda8bc170a295f65fca461e39d4957595295b61b7be91af3d5ce72c20fb1848a2d2bd017d6d6ce1e13415383d1087bb824a9e56ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/an/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/an/firefox-74.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "b1676964b0b9a935b4be440d82dca37c75362a4d47b227435d04d84ebde94eec469faf9fceff32235112bd816ae85f5290e776b9e983c9a3566b89205800ca06"; + sha512 = "ce2ccb8f33acf35b58462573efe1ae5c37ba79c6174340b0e5391d90f826b2ba40aa1925d1aa247f15ab4f1272f552a15167019161f3ba53edcb6b994592d83d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ar/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ar/firefox-74.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "058be707b6348036150124d85010f9d8475efd2a6d910a3f4ed114d2b51cb63775b35e83e0799635755c5c016b21595efb20ec5c53a362280dfb424efffe0d54"; + sha512 = "8f7e36ce99b292084528ff29f78a85808f9259d7c6f6b20aba1a1b20de97238a9efc5fc6aefb6ddd1137f98a27e1f6ce62db3f8bac0fb2d8a7659a6f1ffe7049"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ast/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ast/firefox-74.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "6e36766b939f42f6f8cf551e5ebafbf57a857ab584579797c84eccaf1a669e2f9daeb13b1a897b90153eb502c97f63a55ed7a2bab2de4feb92719e2aaf42ba52"; + sha512 = "042d6eec61bbc6d4b98bae661ac3fe30120ad8c732ee450b363cc6ffc78ba8367eb72d42fcf6244b72822d6a333045d7cbd38498ef12901566d3b2576d34d181"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/az/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/az/firefox-74.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "f6c065ac0af3cb2ef1dca288810192b8ee5906f7fa03bab713a8abea4b811c78b4278340bc5226ddd4113851f9b753268965905e020f74875d2ef3d2c2ecafbd"; + sha512 = "3ad861f357fb538d45388b9b2959043b157422144e426053e84b3094ac99a61af1bcbcd4697ba4da9bae70ce50915aaeea62b82f03e465669c54c9ddba4482a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/be/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/be/firefox-74.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "710c468adc051a5895ef429585f9d94f4f6ac533703f2674c9433c04011e411bde0827739c28d300a2e90cea13db0dac4bca1f37a711ff0bdf19d5c4853b7570"; + sha512 = "cbaaf387a9cdd6918d0a8dfe81ce02c0c6de644d791bd4ffb26dc84679a2129abfea068569967389672d7097e03c73b8999466b816942b14739eaa9d4c7c8772"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/bg/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/bg/firefox-74.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "328586ac2b3182c455f3abab8b6177e97d7389c4150f8708807b52f632d84e88cf342358818514b93b5d8428c6c870b21f1138803e8a7256c95487f5dff5e9db"; + sha512 = "7cce07ef87dd0d0c2a7040238c2a3f9f2d52eb2e13f1037031d5e8e1c9ffd4b64f018b2e6ca76dd3bf9556603da2454bd5e0ec86af9bf38b4001fa9cdc3f1707"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/bn/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/bn/firefox-74.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "c7730bc40976685b40161a6238d0982775ec02429923443265d5165d12adb8b863190c4e57c082c09c4c6ab3348be035e338f3c34d78503b521928f3722139eb"; + sha512 = "3208c555544130df757d30a89769b9ed30a458712a109868d5d2d09212caba02b5c2200a30ae12546113c96b6ea32996367013aae11cfcfe358cbf60f2a26f87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/br/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/br/firefox-74.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "2083a6598a60dfae7093828fa8c47a149b2af18180b360817333de126077a067a81a1b7aa98aadbbba51cab5a8e66811a8a3513e68f5fb6e0320807cce782502"; + sha512 = "2840bc7fda4e4713dbba8f09c0295b8c566de5aa86486db33be1f05b56ac02204227559b546b18c4531539e3a4beec13b8c61c2e9aa756bb38329a5dc2d6ab81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/bs/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/bs/firefox-74.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "4e5f04c7ecd8b4707c5107bc0e862a9ea0f099ce070c6d271c4d5b034330a0595a07c3de2117b1199dd475492edda863e02d541eb2f7e507710e06665741d5c0"; + sha512 = "c0155a15069791538342d767e36ded097deae8ba66b27f6ed34ee00b31ce045fba718e58452dda47b53fa4f26dbc44420b5d1c2d6b6610c5a57d3a58c63eaef0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ca-valencia/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ca-valencia/firefox-74.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha512 = "103ba1a390de36018e8ab834d7ae144dd8187e8211d94c18fe2d84935efdeec64093531f2e3dade16fbc123930549ac2282d1c5c915ecef38428726420915925"; + sha512 = "29051c03f47f5c7d9c9b1ec62d4e94b3732f2e695f92300f1f035226cd81f308f3bdfe987bdbfbed19b15618e89bc1955be3086828a6f495488730d7cc76b014"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ca/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ca/firefox-74.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "90f2e9b575e390d57c6ac91f784e20cc740049096747bedeba1fe467e77a2b7b88e119f66e7be46d8f3261ec66aefa73a7ce11e3ea5b4520dcd1fc2467a7d169"; + sha512 = "8cc5c4a3302cae8449fbb215c456073a03d86cc555737ef0481480b695ff6e72d59a4ec54d8205423eb588f4aa9273711a2a61722241335d68461aa6597ec4ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/cak/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/cak/firefox-74.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "fffd827c9b8b5d5e83eab130ac7c34cae00c166314757576f3fae5f978d090bb9bc6e793eb1265d91c34ee95f4321f1e02d579680990d383e385a346c16ac61c"; + sha512 = "ba11aa53222ad1947a0a8d41b2a0d5e16afdf2857a0415e28c21fee8b27464741c0d10f8655182c5b2992362f040290aa6dfa720b3f76968f26407e9e9183ca6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/cs/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/cs/firefox-74.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "f544d707deced655448ce595ff700671d796180d3df9e5e651176a72daed9e203bf8d8bfe6fbd6c57907cefca7bab5e9beda2b785c7306a87e426df88335982d"; + sha512 = "59c3c417a4a686ab3ef0073f8e153964f2e516c98f6772cb1be93e6f25ff9d34a830042043ef9ef7436445e9932f862f59ac1c00ee55cdf273f4c514473df1cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/cy/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/cy/firefox-74.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "a039a02f17483c4d9b7a5563af4fcc72a73c35ebe9d9d383b3e1ae8013e0dd5b9660ec650a6f11a21d4359605f6252faf1dd99fa8b9525edda5336a3f28138b6"; + sha512 = "06225ca6ee4fa5e7b4c790b0904faac902ff260acfc52df60f87d0a146c6bb299b74ce0163ffa6c2dd951bb8a6abc79f99ceff03ddac1481c548eac7ab717708"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/da/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/da/firefox-74.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "f8829df5163a12e806ed29a640159cc220dd8a39eba48b51e03c5524f5976ff4452eb19064441b4e81fd0e30a8c3058117f5a022e2b7a8e76e5e8898eb4ab54a"; + sha512 = "0e0f3db805b0d63182060cd94dd0611ddedd2bdb0e9dd41e29ab8ea5e14c31ada265c284000de07fb3315e83a5c49bae7ad5d7976bf6eaff819de80270a8eaea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/de/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/de/firefox-74.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "45c2ec4167c4f6cec18c306fb04c1eb0a430809220157c5757ca7565da3150ab82490c946afd7b255ebc75118fe2a2ee8228a31149545e5901b15b5c9fd113ca"; + sha512 = "35a674acf20ac903d208bad89ff681ede7fb4c9ce2bfaa3ae0696ccdfe38e065c8e19cc9afbd711aa3ef0591a3fbb0f196e71e2bb2d3407d9084f12b297d0eab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/dsb/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/dsb/firefox-74.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "f67dc560d458660eb16eed78edce3157c31e195721cd350722c189fbd3936b13e9d230f00e5079a52fcf229bac352f7e6f88c5972c26b3797c470278b352d2e9"; + sha512 = "7aa789662ef83d31d7bb68ec95405becf328df9127b02d128638b6726ace88038b75b94262ff12774c2f4538e789ac75d8447935b0160b7967b8b46b4f576d55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/el/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/el/firefox-74.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "247eaa4b6bbbb34e809232f5f907d67e01e95c77397734a5fee7483a6215ab8492e138e1b593a9b1a4b647c7aadf662e14a51e6dfc2b4acb4151be61767393ed"; + sha512 = "67bde03970d1e5ec54badb0964ff2080158e49c8f6a39243c58e7152d17d7908ecf79c6513e1e492f2816d5e5daa31bbb60631be6d56545b55a37bc36d3d1fa3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/en-CA/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/en-CA/firefox-74.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "d4705fcbccb47d765ed3a56ae7895b285d57486c2c95ac9e12e13b1b403e6cf713291960315808350d452c05ce7441ef3da4042e29d1e2e59ff50bfb3bf567f2"; + sha512 = "322cda1175c9550d10317149761f7fe4bb0a518adb1a7d4cbb96801f9cf3ecd86ca23b30109ccb513b398c1de7e4c9d3f86571a97fd8b3904c81cab1f18bf45c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/en-GB/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/en-GB/firefox-74.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "3a27d69fdc1c1d4aa47a3181bf7d9842c0833da8ce1c132da7b289f6d49054e6b666184d1866506bc05f802c9e817e0ca659ac3ea228c91866b64df66ef7dc8b"; + sha512 = "80200e9e82544cdc88d39d620be89c6794d9f9c094fede1f3b0dcc59ae782ae1335954a8ef230ed30bb4295c067ea9bb080bd1415fceda0acec1f7886c667d47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/en-US/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/en-US/firefox-74.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "1acb3149e99d0e38eb624c98a6471b4d8e3fa6eedb13cc516f581aaa561f1de9d3238e6ec9364e937532d2beacd9aba2ccad72872f114013e7490412c56195c5"; + sha512 = "6efa1ab5c884348ce011a5c3d370f04941ad37d14fbc36646f650ae877f2d3fa34960ab35368f8811132127d205c9d00bbca9d8d40f01a4d32f126bd20d9b0c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/eo/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/eo/firefox-74.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "d8a598569daeda5e5fdc5c5fd2580e85f5933bb1ebec806373755442d3c660c5b0ad38b24bc41e0b05c734489fe27836f5d22718709d1447bd36b1480b2f02f4"; + sha512 = "afb711b4f859997c26973bb0c76dc1f1b30c2fc2b3bd7bad29e7a804d20cbdec746678767fc906f18263fecb0d2199ee96d569f9d13d7a23070804f7b2dcc3e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/es-AR/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/es-AR/firefox-74.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "531eea7a2cb3d98b2a61226f72ac1cc33ac94844787f5db0db84a81655f1909a1f9633353b5b0aaa25aa892d15a1789ada008274b955ada991e5eea1c71ab168"; + sha512 = "8411449eb3699f43d2c430791b31f76d65e446a171757a6f6a461966640e23ddd94bf94f832537b0b6bbc2f4618b7384856cbeb2a8a5e0130a40ce9362561ebc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/es-CL/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/es-CL/firefox-74.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "9901d90be922471ab32b5780ece1ea3f5756250229a8d30a336890823dc8dfadc96992f582c3671afef94802b2003d64a7f77ff469ba5a7ce104b34852f123ea"; + sha512 = "20400f859333966edf138b391206595c8c57cdfd57803fcecec993d6149019662d02b31a9e7c82bbbd3a57a827f29940ed1b4112a73e4cf4be6a1f327e834265"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/es-ES/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/es-ES/firefox-74.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "5615f29da4d69a93b1b07f90f248aada987d56626fd61684ae2d0c4c2d7d2398d30e0de41ce9eb2a7e066b1f34ea07d06f50ccc91dee41dfa2427ed8f2ee8166"; + sha512 = "b9017bc5587d16dd2cd5f1d3ac8ee6eda2768a4a6f15fbd05ecb437cb9cd341bf12a795a8dd110474abed874549855550af1f4d6836b13c4e020f6b66ef6f7f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/es-MX/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/es-MX/firefox-74.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "49453184964bb88329f6385afa382f440e2400333cf53e737491f248e43c5522e171bc85da86e3c2e5b6e2aca6c1136c529d91dec58cfade30ff67fc552d09c9"; + sha512 = "ec482c757317556b4e77e46bf885d99824b4a48577e3efde0c89d7bcb9464199c005ac4aae380294049f5c72b1f792c41fcc6592bac97cf4b7961925e82a5f58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/et/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/et/firefox-74.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "1e5e2f0bbed1e9dff29f646b8038fb27c46ef8cbf6a978e324efe9522c78983133ea3a675f077f837ffc53816c6120b7ff680fd1ba5a761de74162764aedbcfe"; + sha512 = "afd3cf4f9384cccc079160f3bee5a87d0ced59387b1ee653200c73f541bfaf414f983110e29ef54bf45c869dc7b9e82f50baad2691c0bcbabf1f2f49283ba144"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/eu/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/eu/firefox-74.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "c99b22564d7d3d16aff4ec9749ce1699b61ddf271ebcd9b24934271b31bacc68936d11f166730f93b5346acbef3116ee67b336364c33bbe3fca1fa18d41c6c9c"; + sha512 = "b09cd73ed933b56266955a82ebb2b6dc0f9f6ef372680172e5198f4ecc369e9bbeb98cf09a6278c4363c9a88c3367806453821da5293fbda18cf961c09cf94b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/fa/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/fa/firefox-74.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "91ca6ec0f36895609184a1be784848ca208534dffa9c554f7d271d16585e9d220cfef7da176ae23e4836f7e8d26493088f863f59dc9f6af5b58e7006d7e4a37c"; + sha512 = "8661510591646f2b581866a2f2c1816eefafedaea05f7daffb7a4ba51423de1390f9f234b03021ecbc1a344a2537585ad1284d69efb5b0e314d53cdae09f194d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ff/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ff/firefox-74.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "07e0096e432fc7e95d26ae4af3cda0238f28272bda6239f54e891df28a50d414301da8218813ed36b959a2db004c55dfc6f1d3a5b1a31a321fed72d6cdc47f11"; + sha512 = "b42acd23ac34c4998e1cf27a1b74d12fbb954dc65ce7351d7721f91c16338e30239c79660c8d6c07eedcd9601fff6d7b7c94b69f7e86dbaf8001341a9bad8b20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/fi/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/fi/firefox-74.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "1199ed222e7092a852d3911e576057d52add578acd68a28ec334e377644aed48cf8ea0ca145f6996181bb006a067b3560112599d4bf9dd07528f31a0036d7fd0"; + sha512 = "25ec4fa9f055d2929d400614442bf771941236d6b54741ba1961d6775c070612367d61a23fb21ff3a8773b55614960e722372287c98079947afcbea6dc65a0cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/fr/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/fr/firefox-74.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "9d287d14eedf1f32c6b5b8b0556191892541db4ef23e7a7a4aeec956ea26e0a5361f15560aac45970cd702909f654058549114cba98f7204adbc1decfe66c074"; + sha512 = "2fe23f3c5b82b831f2cdc9b07381160078cf0ff92df5e464d249f896ab9467b8e4464d5415267014b9f620601e7bdeef884fd1eccfeffcd6c0df454df4c7853a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/fy-NL/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/fy-NL/firefox-74.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "db42296b84eb0a383728e79b024aff82fc3f5da1f35292b5b9a78ec65b8c7955dc502b2a2107ecb845b0816343cf05abeca075a4291bcee78ce8be8d4337b696"; + sha512 = "3620d8f7e24f31a261c73fa6f34c88761148f5ddfd3341575e12e82e1889dd59d0cb21ee8bdbb43b92d9033d274bc4e98ae4a29adb95a750f07abe9e605a4f03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ga-IE/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ga-IE/firefox-74.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "789b435790aaade6a52b9ce4aca30bfaf9d9e2899d2cc640b095227712ff06b503b36d64c3330a8c4ca7b867cbb4ee324e66a5f338ac3e01c85773955ff3c70f"; + sha512 = "75362b8c7bf608a2049d217a442364d0cf3e7dc31419997e43cb25a821d8a31e1d923a2770f9b360cb32923e4338c16718697fab9b16c018a7670299d55da462"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/gd/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/gd/firefox-74.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "bb6aa1596ecc3b71562d4e83a0ab1e49d28a2c4de75b4f5056f8d38b83e65b79231e06ffdabc61ddccf358a79583be568db3374d748686379da2163ceb8494f6"; + sha512 = "e888397bc7655e55c4c91376b7165a1dcbbd320e591cafddeef7726caf8c7eb5acca6fd82600ff05a22cf0e1514b9a2cecc8d34d8ae75142cf47a2134cd50407"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/gl/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/gl/firefox-74.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "1315eaedb0bb6336377fd61a3b02cb0391cb81441f1c6c4dc3935bb9bf707fb0d5b8b32ca6c9c6bbef77a5d5c0d4cd476234348f398acdaa24280437b0e0eac2"; + sha512 = "66c695344af848e4d96c727abf72cfbe348dab0eb61cdd24feaeb462f90aadd55b6115c9e6ac6af7a3ec0691f2d8233008915eb51303da637a9b6167336347f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/gn/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/gn/firefox-74.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "6d810e69ad78fe5fc07c2f04c2b2ace6550183fcd9e1e9e3af863c219948999bd0c2c095a8f85806d6b8b6da0d6e88e59789aa55b3eedd821c0dc59e37114005"; + sha512 = "c266adc6f166a57994ae92df8df47c9d6fd7a406b4d3b0f157a33196b31c04b8ad2fbf5c491b80b7fa200c98887b4b4a5ffd3750930984f18c8c86bf43d6b956"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/gu-IN/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/gu-IN/firefox-74.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "ed0574ba20986bae45a9ffde86d4b4568de296d4c8809f102c25c85f155ab0bed03f20ac7cfe3eef7225c77193343950ed7bc3714f5e56e709c47aaa02a823ca"; + sha512 = "4924605c3be69db7639708e76cab66758c4bfd217f8a1bc1340b772db1d31f5df19099dc30ca3422db53a7bddf548c87e8338535e1454fd4d9ace57a24b71832"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/he/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/he/firefox-74.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "d4c1f23b270bfd827c4babdb24a7a7e97aad1620f886c27430ee4136ded392a4921395fc87fc031608e6e056ebafcc74766b028aebca787bc51025f38d2b0173"; + sha512 = "faabb65699d0c83321178d845d7831c82078dd592d6a602a6b25eb56d5424c4c479345cd4ff331bda79e9dce616a06141973bfd7c221b20b3a8ebe899ffa2130"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/hi-IN/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/hi-IN/firefox-74.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "485ec6ddeeb2e6fe9f0a141a33f55491eedd3dfae5793802118ba8bac53322b1f2abc3f14e3eed3c8c9bf5b8beb9e53e3d80d0c2a05fbba850697aa262151298"; + sha512 = "6d331d8ac6ba025785b49af71067bf2fdc406caf9f1c82fa90e26b4f56a1a2eaf4043fbf5ff6a477ac69836377cfa2205e029bd9125982b7c4076d90111bae1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/hr/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/hr/firefox-74.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "1d1ccb53fafdef570efe7991902413a6cdc005f5fafd3a395c0ea9d7d764357525429c5f34825a0437242b2e816c86d207c91c92c557bb0b0eafa9bbe86debb5"; + sha512 = "8229ec61969f2378f02e49f5071b49417c871799986a8ff9a77b177aa1753d410e76eef80675facc76b4c55799ddc4a16984cea4e1a321a96090afc98e741abf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/hsb/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/hsb/firefox-74.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "79a71e0255cbaaf49afd0077f0a73a2d8f21037055b6f43a8a16ce6f512712b536fefcc911cbbd6c5ba4db493b1c9d0ecb23e99bfeeccf92a9159dec57328da0"; + sha512 = "d78cd5a9dd7c5049e9b705412268a568b62e2a56602896659af9144ae9ae2ef0e25b7da6d470c7423bc2fec3fe14487b7d966ddeba69d5a451c6e3558808edcf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/hu/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/hu/firefox-74.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "0d5ef5c1589e184fa78ba6cb8bd86530f30dd94ce1e9f2e3a4116539d1f676d60672cb5fc20db3a9e513ec6e7e6fe4b98e340c457ecce583f73bbebf47913eb6"; + sha512 = "e0da837fdb4071e88bc74de77fb57367eb2d69fc6f319b1672c32e3d051facfbacbc93806f5067674342898cf9adb44158a99882c66428b65427b952d53842e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/hy-AM/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/hy-AM/firefox-74.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "4198b61f6708feb15d6d20e0a447d8d9f9ae353c77565fbd5c185e74043d7c896ad8a0c5744e4ed4eee813761df9053b0ad578b8a34ce89ff475d477245e23b8"; + sha512 = "6f9ad04f2f48830cdbb1c9fbd781f50199593fcd3da0b8853b305c6c61dc627eb7669968aa69beb1ab6c0c93ec15a942e85b2984d55cd40d0b9447e28db458e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ia/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ia/firefox-74.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "79f01a78363ce26e31d32c21aa8191db748be7f831aa5143bccdaa35912c23bd5ca3586796b931cb84f92cf28c495fe239b1bf7b6feeca9581bb0c8a94a9c1a6"; + sha512 = "4e399cfa525c847a0aed0b1c46d85bd981af6a3a68b07ec63860d53cb0d0e9cd004402522e2b54ffe81d95a6b594fb16290d9a5e01cff5cbe7264bef5e12a6e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/id/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/id/firefox-74.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "afd876da8a8914f88c043f7ffaf8296e14278503e7ff1b94f8563cfc13c2ecf1e0ecf52c18b5c2c16799878de836056f403c67ffd9333a77d3ad3142f9236769"; + sha512 = "50255eef2e33bb5737826a9864af5837e3b5e626e22361c5a3fae52a84afd0469d3de1db05317f1c8734f34c0a3e85e7853217660eb8fddb8cdaa0998535ebf8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/is/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/is/firefox-74.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "3d98244f97a7c0169f272de877ef3193d4c09392a92ec2ee931d95df610617e00529c1e2c86d31115b4df88dd1a15fee6b6d166a55535396e6203b9b104e0d14"; + sha512 = "69e96b479069ef1bf07df49cf77e623ed56d71ddcb44417b5d8b7d410bcd93f18c2a49bbae6a128e16998bae99617aa2128aa2d13afa0987f3b3c98cb9f39a8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/it/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/it/firefox-74.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "22c2dad95a21743ff3350ac8765340fd96c006dcfcadc68c3fca1814d0b6669066d8f76136cc7c4fc6717929d41df0b0b5a01d40de36b9d1c4eeb8529ed1850d"; + sha512 = "a240412ffb762df4063532b6c07b5e1bed86b9d77d31ae2ffa58b2e7aa596ce6ab906e03a416039cea1ced3904a152b225106690e2f793c4061f0858fb807f07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ja/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ja/firefox-74.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "6297f970de4b35aa7e3ad43fc5112ac0a36bedc5b2431f143e65344cebae74ca36da7af3fa23e1c522e62ae13d2069ff2f1114867e0b0960f9f740904f18ae82"; + sha512 = "dd419563541b90833e50f3a65d54638719df741e5cdbe53d6dcee39f7623745925cb6777ec07097e9c25dd69deb0c7a183ae26055e623869df6e7a65bc020c6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ka/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ka/firefox-74.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "2e4ef3085f01d66e7d2b85b058f7be2a7122f1cfd53757494bc6e66a2fb9840013c2f3f68ef7bcd363f6d3f84926449650e8ff2e1f6641dae70893ff1dc00ff5"; + sha512 = "a1ad0cdb38c4fe1e2d87bf076cf16fb463f9f6fbdc60173768807570b6b1d4b7ebef9826d59e8666aba4598282556787e808371de37935c83c870d1514b855ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/kab/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/kab/firefox-74.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "eda0492c8528bb4eb9ddda9f2d585aa63794ba34231b58b5ccf66dd9bc49feca36a837a786c1f0d182398fe5cf5cdc735c45bb56d1aa743554697b6c6a9d1b8f"; + sha512 = "d7f80172e0ae8ca780ad2f83fce0f75f53dc9a86d14908f14bf12c36ce4beededad592db90f35981e8c86ceafd41075c561e7b9b45340a27aae4489fa6cd8cc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/kk/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/kk/firefox-74.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "6d8b29ae3a21f952e7e0633bdee2f82d53d015e134812a24c2bec73e21b923add3fb7470097bd96a6ad41d7cb1488574475c51140db7616d66024178774282c3"; + sha512 = "d7c42163e48e7612d819247300a06d99f474a68016d099626c7493d6a836b9f6a0b641f686a2e110fea76c1df2f91c9d1b768c90011f9001cf708c5c4f6e8d95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/km/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/km/firefox-74.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "95773f7848250ad0c7f4e4a76ccd956e94dbe9994e451b349f862b3854cf2daa021de7b47c014b14e588189413bbabfb84bf3c2245550a4f824c56ab3964645a"; + sha512 = "3d9e3e5d211260e5816419b77b9dcc8aa77bf967c795949f9483978ebcd588928b9c36cac637d7f7601239278cb72860a2f047e22c3cc9af8fa8ef56500c6fe7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/kn/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/kn/firefox-74.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "f1c66d17d7c8957ff804b77ef49e5389703506019bb3fe24e44f31f6958e65a83f90082f399a351e8bb3c869f2663c1737ee618cc6ee8732a753bcb50893140d"; + sha512 = "ce3247275a30028580a0797838d7040e3f048bbee92684a39abe65a7d0425e883460aed711d4d7aa88295a5423a09872fddf51ac0d122fed50ca5d370fa27a84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ko/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ko/firefox-74.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "2661bfba5959c05752c818119ff29e22bdea6ffcd52eccf1f3dcb2f68c9c0f83ed900a9bf77e99de9e2fd1b4bd153339e5a212e5b7b4c365ea12b02f6fd75637"; + sha512 = "a869918da7166a3de1918115c4fd080c0e17455bfcb54141332f5046fc546e4cfeb301640c5c1475b5b562d6cc7c29bb970423982bbdaeeb5da469b59262c6b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/lij/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/lij/firefox-74.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "e1c6d44e2301ec9223798dfef54aa2bd1cf0553ea0691089f5c345ef7cf276727dd420261ae3a4b40855d58e241ea41af2e7856fecf334f534b6ff4459bc0155"; + sha512 = "c5cace7eafa3fd6572bd00575c2e342ab1614b9647ba0fbe5b79faf65bc89c31deeca52fbc7618533dc48f6d60911a4af0020cd40fb28fc33f1c1538d3c3100f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/lt/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/lt/firefox-74.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "42316a0775d8cfb8a12545485762268feb74052c6d022b092644dec77048cc4e5f6a2e00288739f0a0b39b5530bc43f2946eaaa16711140bbf2ead3d1c28993b"; + sha512 = "a53f8f6c7585d2301a8490a75ee7e90d3f47b1503e8521b1b80de49a062531749c2302b92a2332b5cab7f9a4453dcaddf623ad63c5f78dfef11ca190bb73e6b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/lv/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/lv/firefox-74.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "51118140b18c9f911e1ce9932d08cd5dc9e0a9f6cc31160e51c3e06f640322b3ffd28f74eae5fc7b5bc2a9423e820fbab8392b96f55770e8e4503dfd86cd6111"; + sha512 = "26e7d07a0cfff802cd2a52e303af0df2227bd40616809acadcaf6787ed302e8ea5686de2a1cff800121f3899120c77de4df4eac246c9768b741b5e5e411e5d3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/mk/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/mk/firefox-74.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "96b5fefd5f1c7f37db059db505864210a872597e8d3f11247c6e68f30122eae15784d5eff7d94a48a38679ca6ea7338a82dc8b0cc65061d03be0c12aa570eefe"; + sha512 = "e07991906c0c4d73a83205add07eeb7522ab51d32133f9d3601dc0e99479073f1f55e617913f7ab02f5022d898aa023d473652577d2e48e86f6c5d87635940dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/mr/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/mr/firefox-74.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "fc5a084fc9d71eaa4a31b4445390ebeea93f828ce0f492802dd38da3a2d5a71f865c5884efb9883545fdb3f2aeb374f93eea133de6c0809b75a924d14ae973a4"; + sha512 = "ce1f14f12949f7bb6493d72878fe81642619fa00dcb35c7de6d818a25c6cf1349c983ccb3976b796673340adecfcfd344042ef59c0eeca159cd1c60bd59d18ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ms/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ms/firefox-74.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "c084b4c6e2e9ed3f646b18d14cd7d8f76e46ccd0152a74ee101b0fd532dc91acfef8f26d827e759c2bfd8828ff762a430cec3fc9d0b9e7423166951aaceb8b72"; + sha512 = "a2f3a1a8152835045c944cd70dd86a8053ab5cbdde7097d6d2e3c06485717ef8efd762f97c81b88f8f2bbed5e6d3d14e6adf192b286eebe413529bb60326a742"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/my/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/my/firefox-74.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "8fed2a79499f57b0401da536a557809b152d65fccc91c76fcd2deacbab35b370dcc1c812c8e8217aa4b61e9a02fd41359b84080313fc572fec936ec3ab15935d"; + sha512 = "e6280fa3a25bd44bfdfd80ae28b6909417731a81dc86bc728d70a3baa35f29d172c9495de43a87911b36e5bba187d4aba3d6680204ffd62b966bf0044ee7f6b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/nb-NO/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/nb-NO/firefox-74.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "d316c653e922c6f71d14bd9b6baae661a1d2d93a9ef2ec2c1ac368cdd5797df5896f927c909feef7ccd5323bc4290585ecf119f0bbc6eabe4c69c67127b82c98"; + sha512 = "d0ea04c9f898eeef36ee46918b345f6a307877d6aee8f9ab958e1600c74494e3851563aadc8a34f0997d285cc0f2118052dac009a0efec3034d6c3eee72d119e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ne-NP/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ne-NP/firefox-74.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "1ecd87e201addeabc43050279bb175511bedbc5e2e1a541641e5bf6eeadd1edeabaae9e6d7a7cc53d6a4a46d84f256f0abf8bbe9d211dd6b7d8b3bb91b341443"; + sha512 = "2baa7e1108390ca2baa28eb55afafecc7a67e746d3cf1a883fa515c623a9aaf996efcc4d54b6ba661f05f1ee00ad607ae75ed286847e7f9e74713e1a96df5cf7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/nl/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/nl/firefox-74.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "77d9e23944e5fdc8e08394b46811146d95560663e91a534c115986772b5c0b5c9c2e20dabde58ddbc643b3bf0f600c3b0b2f8f31045cf92ea8353610e0c78c67"; + sha512 = "e6c2a98851617b9d6e0f2f2005b049de15cc6dc89793c977c0566be9ec1000041c5f2e423cfd5e71351913765c37ed37e62b4defaec4c59b7d2c5e698dada651"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/nn-NO/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/nn-NO/firefox-74.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "6923adac5fc7c616ad94ff4f45db0c5ba20c5c77cc23661196212b419437db8d1d8b9feab9f68556545b3553b6e22858c2f0c7a2afa81f7b4e914446e92fe418"; + sha512 = "df2ae022d88000d677a487f5c409d57d1ea703ca5a91770863da62f74ffd3ebf7e58e463ab9e67d44514c630b7226b7b623797dd2e90185341afe532311ef039"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/oc/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/oc/firefox-74.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "eddd11c121dc1933272d1557d220a5590e5fe695cedb261e382d2a0e560646f1f4706dcc46f4bbf1b6c10df2f0b59e15d43398a32975c9505317aaf86bfc8a49"; + sha512 = "8c52efdaab0e3b9eb2f4e99710c8c7cd9d1d1e894d4c38cd877fde81fd52f5d135f039c9b8619995c384dfe4aa44fda37121d9e0cb87003b8e9dc5eb013ec0cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/pa-IN/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/pa-IN/firefox-74.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "cd2eb4dd3b29299786d094699dbc162be2c073f25b6feda13e9f631f36530dc9abfde5f473c0276fa8b099010c66938f4e8bd9346a2d1761c59f63190944b553"; + sha512 = "fdb7acfb49db508be8334685ce47216fe84976205bd83b159d5e573c004417d6adbb49f7d471af81edf026d417f2abfd5411d0e360ab36c1b591282d767873c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/pl/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/pl/firefox-74.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "e039394e335b13bd55a214a8345645e1d5640d2dbcf76234cdb5710c2ae0b81e568b8ff8456780edbb74fa2ab186eed004c1d54a04560406909702555a318db2"; + sha512 = "ef4430578cb71488d0bae269610d962603f4da4a5e7e614acb90f700f4d487127faf8afff3000a9e46f81bb6a271fc2f6b40f06c881bad2096ce4a0de38dbd8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/pt-BR/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/pt-BR/firefox-74.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "4649c45fdf1b8b3a93e8a5f88b88c47104b6d1781c89fba4cb9630a8998f3e4e28ad3aafa0265d04a3c10323916fce73d834cc95e5968a10b4a28a9ccf70aee1"; + sha512 = "0987da83232c8319a890c8f0f62cf43dd9e0a8c82b8e06b3f1277cf83d6eb09e73df163b0a9faf420ac9db8924b1ad8ef84f1d0e81ea54682a831f941dd40700"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/pt-PT/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/pt-PT/firefox-74.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "44d65ac6e2df986638de77b01c7c544a846f92444de25208247c93ef2701d0398f77de10e9035c8fd383cc998adccbfe2dd76edebb646ba1f29a639786b61259"; + sha512 = "4c052c11785da470cdad1a098ac1b1c8527a49e88a735319aa9385f4139c8f5f9e8fed496d1832cc502ff34be570dd5578c6b0d3af93731891753d842d3c07d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/rm/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/rm/firefox-74.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "6c9694d25cbe53e129148080e365b4964f5e683ede81d7a17fdc94045359480cf57cb8e4004b36645c6cc9c987845ac723e11407302eeca1e2e1fca9924eff2f"; + sha512 = "462d3e3514141bc7e604fa9666800b30bb15a01757bdb8e1119cc0d97dc4d585a0998b94459ae92f9ecddbbaabf2f1aa342c13acb03135620b0706246f0f7e38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ro/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ro/firefox-74.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "b1e98c052f5b51047ebb5c28f83e7c36a74b85d0aab3226438bdbc502619a2f9767cfee6f9a2f72653ab8102f058cdfe40dd7f6cf11f88652ea8f00a0985d9cf"; + sha512 = "47bc24b33127efa652d2223fd6a624b6d8237911e10b8629f7b8ebba3320a4133f5751b9ec62f2acde9aaa45df0f0454e12a8b9defb366f8d2164db0356880ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ru/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ru/firefox-74.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "681214c7286392c8267cf73bfd4a57fe3cc9710992019aa645e052a8839234f4f65ccef2e98e6f4e8b4d099a0d2932c8d909291ad46cb581036930715a916565"; + sha512 = "57f796bcf9d755e49639af0f4d7e38878d8f0fa0a4466f3c92fc8ea62c5fe365c10a81871017c3cc83915f80cd3db40669f470b53303bf3433c618c87c0c8502"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/si/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/si/firefox-74.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "daf1cbb9ae4e3892b138fe0f3aaab8aa11fe175c1bed70d374e5da7baf0c77a3d1e836647a8a0e36b1b2791c3fa638c63ca960a361751b7dbaac5d87a1e73e56"; + sha512 = "d028506d4edeede079c14cc2f97d7d9cc665ff54f163a691ad84da2731250e119ecc8e69dc4351a7bb58e9d2402a1ccfb26d30a2fac8b3881ba149c71fdbb9a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/sk/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/sk/firefox-74.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "4d34b4c6eda6297461191388266d5d281be23b4e4390db9999832f384431bd5f5f323be80fa1cbc645b7d1bcb8bd6e80077ae2f0ba66239308eb3b72c062bb37"; + sha512 = "f56f3c77fcb6c12539f1b264f565f371a7c4e5635fb644ec706b19bfb6cb10d546e217e06f04af0b5f96754c65f70f2c7008219e4428e7e17e76296f04f903f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/sl/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/sl/firefox-74.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "7ab8ea5037264ef3853376c000582b7a423ebf366d84e50fbb642f8510609cbfc7d8cff6b48eea499cf7dd14da3dfbda635871fa7b2990beb386b5e6b1db35f4"; + sha512 = "e3e284a74f742939ec99ecae43240be1e4ae6ab3e600d08cc07aa3df41aa15d9685256f4b976eb83409884209b1e3bea8522d6e3855f75eb67b88a842715e5eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/son/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/son/firefox-74.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "afda3965d5934b4cbc3ce0c9df16d286cb3f2054c5bf5a174349691d12abed45d47e0c79a5b4e730cf6791a118daab6cc4e7438ee2e50529002fb9a99db4eb88"; + sha512 = "baad547898d92d1c783463a8defccd2b87164773dccf45c8c3442da063a4e6379ccf75452e70993d7cff8654ee37bdacb281a608c5786f6baf31d2dfd5b0cce6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/sq/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/sq/firefox-74.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "6a1535b6440a805f60b5085f4e34e54453e36f01cd10536b169cfcd8cb67d61bf325469d33981e261855deb0ea158a68710b4606a912c1a2d8769f0c83ec33d4"; + sha512 = "c38aa06a66a551d609a343528275f58c4a4f43b99066e5bb40f7653a0f2797d516819424164ff9d31d206598cea68e74db7c5023d05edb875dab8b7070d6b800"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/sr/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/sr/firefox-74.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "a5cf593a21ed3c2a825cfb4a7280b1b4a8d4905cf85cd69edcb36f733189ced40a9a5c6e86cbc9870cd9bc1442f4c7ef19621e43181335d0b9d7090a3d4b102e"; + sha512 = "68d2d885f01e5bbd2e689752822e8562ea2825e806fac97e8c356ad98be05374f2feb2a329524128e67e26505b3ad8989260df3c9a9c12e55e936b19efa77d27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/sv-SE/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/sv-SE/firefox-74.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "bdf87d4f3a960ac38dfc39183d7a7a7ae68d45e52d4f356a47a122a1a93fcb6d49cac463c6173c87495c39f717c68533e0234f828c45071a9ab59b3b0dbb87af"; + sha512 = "a7f612ccb43b4df144f48a635d0135967a1ecc27c61e637605b08f2e2d3edb038770df691ee07d1f734aef7044cd52a46973dd907ae988bc20da4937f0d51ec8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ta/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ta/firefox-74.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "808628662c860b996124c367ff3d9ae89fd622648b46a985da4c3be50baeecf5b5d4de7de0488b2f46810dd7e8d91dd6923397830c58d27fbbf847772ba42c74"; + sha512 = "f172d687b513750551f2ae314a8d9676c3714fb9909a0a6ac1dda26dacdddc5cbb37c6123700bb43aaa25ed8d7dc725b92be36028d9abde9a1e27ddd1769affb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/te/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/te/firefox-74.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "22190521d45ad61965b5e863d877bf92da4633bfc7638f2f83825f478dda5ca5ad333707a874c0b992b2b9e8613c96f6e5f7144a9e51e696edce88cc36bd8c1c"; + sha512 = "e7989468298980f55157554d8ea79a4d2f6089179eb813e66244489dc9744ba0c509bd45dde97c489e823ab3c3d7dc3dea0603228e025b998573001d6e51e786"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/th/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/th/firefox-74.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "0131790f8fc79abff771b28e4b3f4f894c680f790e9999be22ebb968a869b17dc18c4fb15f992bcc025863eaed5887662a3ccb98c4d3e85f385ec00c37f1b891"; + sha512 = "914d4815daae91dc0c0a8322252e026172ee2f8de3e08f5dc9cb455565540985928ff5650c5a597acca7538b75668d249aa123bc5539595a346046e9ea68bb8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/tl/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/tl/firefox-74.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha512 = "5c20780883b844c5f3206c4c2d7fb0d341afdfa5b30f87d0356445cf279b0be7396433e1f6ef7aa20c88016f540eb773a66aee172c678a172f378b7ffa28c2d6"; + sha512 = "698c3404d574501c9acd61a38d778730ca7ce1b0003375ab2ce470530cec3a792ff5a6d9aed7788af293edc246c704f7ee96352bef792d2a43c14f56fc0ede41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/tr/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/tr/firefox-74.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "211842a6177af5397be00b18d42e038c2a82a185305dc2bc36803713d16461321ec96838c21873a23816198bcd2d9e1b5298b2885afa60506702e8f07b803b7b"; + sha512 = "bdd0aca34a6fdcec44af39a9db78e7d786586a782203bc98b6484f971dd09f45ab5976e5729a028a29adc4c05baafbfb5058773426dae329c7b09aa6fb2130d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/trs/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/trs/firefox-74.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha512 = "3d1292229c645bbd3529763c4729be8ed044bb8081f0127b39f62a3b21c670889c915fd982866451ce494299438caf7380e4b72b971c4163a2e9e96575550439"; + sha512 = "36e2c6bc099ec381565afcdf36fc69e8a01234a5dca7500fd2e0e642fbb294c819eb869ecdd57bdb1407c2de224db5b6a4e6b82a90daceb77346f561f99cf839"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/uk/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/uk/firefox-74.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "58da46b39c491278be85ff9a37eabe993166b9f950aabf6b5776634779d2427bd8c044e7b851462d59584051299c954fd5e35491a32a2c893678ca0fce0b4a8c"; + sha512 = "cf7a6ae1535b09ccdd0d3354e682e5441324a914d7852fde12ddca3ab67e211860e6f2e87144185b6348d70a6243899c48d29be906f915ddc12a025a72b153bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ur/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ur/firefox-74.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "c0f35fb5e3967fcefb7bd708e621abb138a3972b52d871ffd5f9e636c9d27e040e5f99313c72ae31cfa2313c9edc2ac9b64e9ec1710a5b1288bf7d1a7be80136"; + sha512 = "976eb06f7b0de8abb1a512b3f142920ebc4d3b35ab719913d5d01201921ae3380b8c5da8dd3e18de3b96eb139deb69502684d6fd1d33e378325103204cfa4004"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/uz/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/uz/firefox-74.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "68d335c31ac07a2790c4fc142b3f17c527bcb289e0f6e19a228dce248062c89df18874fe22a73623f6d94309fe4089a072dcaab533bdcdc1855c539395222b45"; + sha512 = "e0e750a921ac766d46726ea1c0073604dd4a17ba29713dae7ee42679a0b305c5723f6d3776603c79719e4100717a9cdc0b0016521a20ffee762b4f8cd614630e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/vi/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/vi/firefox-74.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "e7c846995285b3194a12b14a844c4cb01871012d1f7df241c3b9ad73191c567c04127a4d7a7aa2ed33ecf6deff8d483a92b2b3511ffe180e4f61cdb114a3285d"; + sha512 = "12561e674ef47a5d1817dd535f050b027ce316c75cef5802a8e365a4568609e44ff85840d27b91e81b5c46e4595b7e52736e2a43ed495db63b74fb2e2df1b376"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/xh/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/xh/firefox-74.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "cc9b6e46fbfe9fae1be6e501069932e35b8e53a91bee226ed8b7179cff98e3092e984dfb194fdc0e4554b983bdf203b28e271ff40565bb30a140aff24bf88e02"; + sha512 = "365fdd88ddf29ac41d5cf388ade3dfe08bcba361153d244e45cb1f451969044956ca2387bae7e5f783c8cf0862e89141a39f52af873533139f49d2539f9401ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/zh-CN/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/zh-CN/firefox-74.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "d967c3de22a110ed948a055d3d1e5f29ff473a8eebf1cc08d960135dac0bdb3a812c240cf46f789be8de5a5769bec2518d60dff5b31c8149275c0650b387053d"; + sha512 = "29451eab0d61193258338fe19382c0fe2851bc02af668c4ab7e2702b782718ff80f5773622c7580a731214ae11a199e6158985f678f98e51cf18e0afdcd035cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/zh-TW/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/zh-TW/firefox-74.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "3e9838ef076f360f09c30deb25298d23c7c067ee4956061b5d19c51eba91e28bacb9e22cf6fc6f7df929d1fd541f5aae383137aefeb3c0f2f0d41625875578e9"; + sha512 = "7724fd993d38cc7169901b6f589868ef3e884ee25b9957cd05b30b06a3cd25f3fd7d7ecb500c6b286272aec6031e18b5df6e03c739d81d92b73de932d4029293"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ach/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ach/firefox-74.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "62f98561f7dc2b856474d5915ab1ce9f9939cfc4102d33532c2f933fc1887be5995abe4b16fa715647ee1b7b5a68e5fd9f263e928d05b6f6ae35ce924aaaea2b"; + sha512 = "8c1773be02e8f9c40a77ff4078ee4e5d035b891e7de70f412d22cad305b0554f87c77ddad8663ff0d0dd36f621b58c7a143364ac3cd5c8ce5e2c87ea81fba400"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/af/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/af/firefox-74.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "cb203a3cddc9fd71178c1d158f31ca55b15f3388761c4347a3b2fdbde921effc335ea6f2b49b4fbda624b79621df9196b2e08bc42caeeab9feedac05a25aa04c"; + sha512 = "678c058ecbd6bcf6bb749ec2677c0486b94af43b28a950dfada30516a70e8ec45fb2c76e4acc8c30125d07e5b4fe7c4387d73ab130e57bcb8592318225685356"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/an/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/an/firefox-74.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "77bec37a0584e2cb00dbbe6278f21f3814a73ffcd026b33c2c4ccf13e13561263e314aee2c39595d037a9a49e54510844db44d521d3c550a19f1c2bddb66be00"; + sha512 = "7512f534594f36aebd9f9aa2524f568c35d55167fe89090313578aded6e87404fd8df3f34bb1da658349374537146cb02cc3119a87346f2eaf1c5cc38dec0cf5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ar/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ar/firefox-74.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "c84047c4267fd8f872876a87a809604a1d65245804b5cdf45ccbca764d9ec9b39cd6edb13e282a7ab0278bcd17111487d5a22a36d9cfb7c1544353111395216a"; + sha512 = "51a65a604f8adbb07d1ec59a8013e3d0c2e0658b2691714c64971203e463f8934aaf9d2e71bc1685c255172eb474bea0823d1205d84cc3a530befe80ed257d01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ast/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ast/firefox-74.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "8d87ec12eefa47af400d0c3da5c103587019d3f4584ccb5ff7fc02017451be0417673a3b539ce3191339f9afd8bf9e562aa962883bbabe3355cbfba2c7748cbe"; + sha512 = "ed032607ca192adcbc20a03b5b5742641500ad36de0685524ce36b33e49f74f83e491b9b5c5278d8f62ac19f701a9e393470d608c4de0c855e3ff91127c472ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/az/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/az/firefox-74.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "0801cdd56ed2217f52bdde2f541112540853f79385d3488a2d01e9e95e5d8e8cd4f3d2433f9c272dc7309445f11ae36ab4edd0bc24ad343cce46ef3d74826261"; + sha512 = "a8583b604f720549ac3ec92fc89174cf8ac56b68c230e69d718662e1a788aa2038101a2d76199b6030dfcedf27d66659b78eb4e361c2e74f5e66a49ca8ca256e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/be/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/be/firefox-74.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "34a7d7abb122fa4fe4d38cda591fc88a5b5e38bf0415a89a87cc04fe14216408c56b3c7a67a29eff8409cea95bb82df4ed885110e0b39a5606e8278ef30085d1"; + sha512 = "3f917c28730d23e7d0c03053d0d86c8ef75c173e31529dc312d6d86a87852229c4a6d2727af2c2071959772a3deef5662b5075e52f37fa63b37c6cbed9cfa2e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/bg/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/bg/firefox-74.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "a1deaa04a797865ab9d62d1c820ed837c723bb66723397218d9afc114c4d1146c64f3c49ac558c69476938ef5c4f815b300bc25e53cedeef41c9022a6173e24f"; + sha512 = "4f960a211d2838308000aed8f20465dee70768734d111b5208a04fdf71af00bf8d4bcfd352d5d5490345a9e21a05c13b8ca1a1102181f785f4710cc56e60d04d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/bn/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/bn/firefox-74.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "8fa4631d3a5c4aabb0ddd587f66a8802530864dbf99e1035d3a13efda65cba93a7824e72abfb6388ebdad045d981ac818368406ac345fa4bfb65b8560a9e1943"; + sha512 = "7d8378c33447dc528937409dc1c0eec947ef7c147cf026bc7f0a78fe4e76ec692f0a7dfa964bd93fe5093b1c2caec39b42fbcebe92ac9771d9e3598bf00c2fc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/br/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/br/firefox-74.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "c9de94ec51f4cb7bc77c5db2b5d359cfe24d60c76fd6c368907f6dfae8c2166b6b0a4954d791e808a52b145cc5acba1e2bf82237d63b357fb2920b1e4a057bcd"; + sha512 = "59a4dba230c0a8e5c7754ead9088ef3407669a4d9340b2f3736fcf4a3d2049568b131ca929fd12b8167e08280b6cfc04f843f1dccbf06a1d7826bb264dac772f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/bs/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/bs/firefox-74.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "08bd5b8a337e0968c618903ba137d9340f83282bae27f286d4fd65f89c7ecdd36d771cf7a63767102e1885c7588d29645feab07e1c7c970c0ba9e5b8c38db7be"; + sha512 = "65a44a974e5aa9b9e28a01de9e954dbb36f5acdbe2537ade59d9d956074dac9382dfe7ebdc7df2269d82fcd8b9fe5c73e49eff9dd2692c7a3690b1bc8e54ecc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ca-valencia/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ca-valencia/firefox-74.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha512 = "5036cfd9bda8de708d90a3ba216bb74526a2a4b00bf16a435b8e346deeb713080049a3f39b2e9f5bc73799203c91eddce07df3bd0affa49135b3cea2d2c4081f"; + sha512 = "6cd4cf9b69dc35f4f5bab782305b6b4fc5044b807a5409ed4a8b13836c551f1df233c77614b989767755ce5357d597b9cd24f0011e62ad298ee5521766931f1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ca/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ca/firefox-74.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "1576e57936866754bcce40c8daa9fcbb7b8c4b86c44c66dd0288764a12cfb7b03c9274327d06e3d1e98808a720acb5c01fb1cbd83b1cc580208e29754cfb8864"; + sha512 = "2bf061c948f012281468a0b7cf15bb8b806cef95b2e7b667b94825030ea134d110a261bee14717732fc176cad78988aa2c6d8acdcfba851dc8ea4122a1ad36b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/cak/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/cak/firefox-74.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "715ff756b1781ee74a12025163443ae22fa54891f8978356acb816db254f0e9ab999b8855e6b542329a42fae6a3f3bd319295b9b17953234c1107668f3414009"; + sha512 = "c5e1c05b9649521470fcfd0eb89a4a7467c7cbe9e8f15916e6d5ac4ad88dde2e4eb62527e1436a2e48dd4d6d3aba7ea28ffdf6615ed31fc7d4b8dbbc729af515"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/cs/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/cs/firefox-74.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "835be53ef8be7772decc01e0ddc9115075c26f15bef7b4cc659022e2c7c6997bcdebd8ab4efa431e61af92c13b59734e4e9a433efd068ac2bc93fd79aa706f44"; + sha512 = "1f0d647db99680521bdff74038fa31e9881a71789a2cb18f552bd770bfef25760231fd27436608fc393829c14b2018de211a10bff6890c931b8a78fb3af888e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/cy/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/cy/firefox-74.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "be5702229cad8438312ee14e24b3267bea91e131736bc8dd4796798285dacec2863843f844bcac47eb64dd9a2ebb6966f161a3530db7743dfb8ccb3b5cab9fe0"; + sha512 = "b19948cfcb0f10978e7aeb859f3741b797a473163823232b20dd6327475df1a1a3c752769903cee00d048952ecca9f73c0de59300f596f10154dd150b58cde28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/da/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/da/firefox-74.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "bda6c747c1eb8de22850aa418fcdf57f5a39d96546cccff3d82ffd1be93bd1be499abcce60f5e1b76595eddb1fdd4e3dee3855fb25fdb8c1f2ad82ba97a9d854"; + sha512 = "7978f11614514d9aa7c18007729645af4a3a50a3d13ac500d0c23ddbd80bb50724d7b627f62c7a6c05a74c9e6182cc49243b6a0a1966b433335d22fa535eed73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/de/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/de/firefox-74.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "aa7510f2dc6846ace6a9754a4105197b238a22bcb034ea22453b7550aa00b3ad87d6aa9a7e909366daccf21427659802e7bc3eb285ceb4e38bb1c906cc782399"; + sha512 = "819a4947a53ff27d421af3e09326c2f0451eefd9b0d95dc7427bf600780a9350c0ae84ff062816d5599eef1b44e2d4c742ef2c07ab83ed9cdc0b7382972706ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/dsb/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/dsb/firefox-74.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "9a97a6b634685f02e3af6492378a3db600ccc80678ec9d9fb75e08ea123ae6d3016254a2fea5b4736530480671e7095fc21840e6c3db50bcc8343a800897b704"; + sha512 = "2e688088ee0c3712a5de56d855b013ecae815c482584711a4a27273f6a17a692552b70b2dc9d9beb108693b2c095c2e7365e661e8fbb84404fe27736964d8b88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/el/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/el/firefox-74.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "7b15f63414a9b08fe54ca249b99e80a9a2a62a0a9462911b31c4220c7941eea7e1f4d170d969770fa1a0bf76b25cf539ee0eb5c41106fab3200ed32ea580fe94"; + sha512 = "5b703bd93ad3e43027d2f85ad9f2916b9103d69a1380ffa529800800188d3227837ca84f835a6007197231ddc9f93bd60f00bbf8954cca6f14702eb4ce101292"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/en-CA/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/en-CA/firefox-74.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "92c8f0132880dd0d3af36e1ee489ec87a7169ce76afda68367f977a3dba346aed727d04a9ada0aa96c1c26e6b029e27b2edaa266074f49399ba10f7cedc12bbe"; + sha512 = "c94222ea766fb7d8131686d9ec3c2d3ac59e8a91c6d1e65366776eb717804120c4221f8568a3537fce247f12e2f8085a22df6d31a405a1b654a074727b4cc1ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/en-GB/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/en-GB/firefox-74.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "b4cc2106924be7ed68a96a97fe3410ddf6a0dd57861a6e93185f396ec92ad40dcf901de8785e9814a9e9499b5828c34c61910c88a257e1f45103f737030d7376"; + sha512 = "24e91c045d36be25346e598af8d8ac187cf37b2c790957887a7d3fa42b102dacd05c236476ed1dff20e21d51c88aac2d5123352d868580704a0dff88747bd62b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/en-US/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/en-US/firefox-74.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "5b8bd3558e30d65d9368e86c79695c7cd5d5fca159a678394285bd5a72f74cd70775dadf176d22ee99dfc939333bb3c64225385e2e9330e04298a62718821cd0"; + sha512 = "19e3bde2ad51783ca5aa492ffe9a097e91db66a5d18c28c6ea36f6cfca7e14e41172cfca9f9c223bf42632c2235fb5a942ffac470e2c210d1b7992c75c48beed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/eo/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/eo/firefox-74.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "e80c74cef34d4be438792e7436fa14e3008029c7ddba9884f3a5bd6f1a20ca51612e5f3a1e6c5939d69740921b0717b2ce5bf20c1a740ec6d167cd28809492c2"; + sha512 = "160912a75ca11a38c360924f206ed7baf53e0e0be4d42440c10e3e7e3a9ced4f4884db329917954af23ec5bb01b70ea7f567310c85242073d3d13c4ba19629c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/es-AR/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/es-AR/firefox-74.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "2dfd113477eac29985af07c05a3d2c0574104f91e44e8625fe5ec51bc5debc262d2f812761edff5a63ebff408f2e560eaced510ce34256f497317e0af5066b49"; + sha512 = "cfa240589014caf944d54971f7ed8f5b2f8656b03bffe7bc28628e07198f308406277b4ae8584a9b79d2e218f952f22c345982a264a47a7e2f129c297da134da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/es-CL/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/es-CL/firefox-74.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "7cd5fe37c8eefe0ef5488feb3a4c9640f8cc25e5c01c31d84e755a84d7c42e2b1ee89fcd78cd797b3bb34c465d06966ff5f994b7b6412008628646a987abac52"; + sha512 = "228cda9199e333c030b43ed1fcc46d0f1d782f904e796f546092927597e661505477634219ea518972764049fce3a9db2e1e31ea766caea612a765d9532b5f50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/es-ES/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/es-ES/firefox-74.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "7d2a3fec526f8e812597c1184a3a811c0a1f7d1545aea8f826ac934e1b694d35692aa8f47bb2a42f7a5c183075e620e29a77a927d99dea54326bc690110c575e"; + sha512 = "569c63b7b4599afb94fc725242661ae33d01de58012dd6bf46c020b55fcf5fc1dea1a95371f36e68aad6ae89f7e674e99e96139553fff3839a60a6ec36c418cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/es-MX/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/es-MX/firefox-74.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "03df019ca336e8b6ae455b91058c5ffbdeeed6bec6f039962c00d8b8d83668783e072f91a82439092bcc4794c1be0e52dc6f88303147f97fd67d81feb14d58a1"; + sha512 = "debb715bf2034640e573208b048c4f519a51a3b34c4500d27452f25f0f2d939f6812bf1f68856699a776ec8092696954e409381178b3328d417e97747f8ab720"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/et/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/et/firefox-74.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "85d6ef77f080e8617cf490d945d45f453d04a635e1b410fa1ad78c86afd5d43a9a39c8ef7be0b4676b057d7131168a1d8ad0dab5a4fbe230266f96d25baa8fee"; + sha512 = "2ce02c48e6fc9407a09f89926e8452c385e8df739eb014f45d0d286d11d5c3f9c84220c99379ee7ce20f658617c3b28b8e59724c0a62a5fc961dcc47a1172cd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/eu/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/eu/firefox-74.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "e20b16ff5539c00627bb44efc87fcbbc4017006d6a74e0a6e9421b91c297327b42405fd6b65e8b98d71028a8ca35323b7c55da9c4ab77fe7a511c2a75aec6f03"; + sha512 = "25356e53f1334cbcba60d44739fcd69a03945d923a36dda4accbb2a471927df1977ed956f993d510d60df8fcace4dfb2fe773b49f3ebde6d227e1f474ec8483b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/fa/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/fa/firefox-74.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "ecb9935bd89a41128955005ce003700e15efb007a98f0653f88145cc21af2ed719a0edc342b4343712814a9bd16011322cb454f36e4236d0c73a5b5306d45035"; + sha512 = "d680434838694f6666c8decfee363e2aa5de22ecfdf690895bc7c027bdc2466c67518e69444d48413f1538e7c3751cda716df8fb2cb83ad68beff6b0975d3dc1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ff/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ff/firefox-74.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "6bd4c591f7e6a7c0d08ccc64d7086f1863e1a2d8760c63b02a250a8b47e9c50a0f36191d7ef18d85ead4046678095cc101670511d9790962312ae1d6032ad9f0"; + sha512 = "3b6f7bb0dd61c2872b8ae2e9dff50d9c6e21f2755d8dac5eeb44708af3441ecfe43ba5eeba31a2de09fdd246afdaaae8ab8ce10f2f83495588cef561446956cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/fi/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/fi/firefox-74.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "60237eaa42baefa008a1fe6fcfe30694c63e832df64a12175b34967a2358ad2bc0b08854a45ce698fdf9d4b2ef21dcf63e87cabd624254fc71dea5b9e1610b17"; + sha512 = "0462288f84a7d4cc97758919cd8d6a2d275757ac91980752f538d0cc785813acf79f4e6908fda1eddbc34db2b574d5c381c03b8cef90c796f837706071a98044"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/fr/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/fr/firefox-74.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "6f7b38cea8b38d746623ed37fe2be83d5a3ab3c9ed2b6be88e78c0c28ccafea70ce0a11088e35a45427d3c5e3a84939c3c6c2be16b15e7270d4296088ba8c3fe"; + sha512 = "9a40af49d33a5c391a084d181d74bf418e5fb24ccc4aac96959f719624913b7b7d11b6977e4673046c89dcb5935a1b496b82b8a0b9729595689b158a7a96adc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/fy-NL/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/fy-NL/firefox-74.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "dc0eedb90ccbeb5a0de494c3a60c94704582d1b681e3281c3ab3b60fe3d1140bb5463d66e2ed36c8549a581a8e28d1b0a09ee1fef903baa6680a7c43c3d6b8fc"; + sha512 = "97bc9a69879981a6f6ff32f534b31b986523a7d956644ad15de94913aa648af6b163a4a6125e6cb6869eb48d1d903773c3cd4f07a625da191b9fe34aa4b6dfa7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ga-IE/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ga-IE/firefox-74.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "9c64b6586f102dfe190c8a600474bcf4a32c7b268a7ba3cb60d673636aa340407d492a7fb377308d6f0b6759b76069f4e5f573499f36ad570905060d00d85d21"; + sha512 = "72d3dbc9799be8c37880cae2603423e128040b99409148a8c316ef9400b259963078bcf9a86dbe3d69bd017276312ed9631512972dd718c6ffb0fa2f3d351a90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/gd/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/gd/firefox-74.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "5f3e92b500a371e5228a2bd7c176e116e8eee7210f14dbe130ecb2a1f5f337e2a413702aec2685fec27245c281c97931bcc08c0fc7ca0cc4954c3e507e42fd16"; + sha512 = "637f08600c79790df3f683c7aadd1a7597e09f387d6f1e929ab7eb6301cf462df85e2a68a1ef5480cde0afc716c63dccee08f173c96358d461f3b5798ca2d75b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/gl/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/gl/firefox-74.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "8fcb6890fc7664f11a833585e14e0d70f6d4f4d52b9a8cf4917a86b452d96f9b1ce76502a15bba116dec18b31b61976ccf8680949c67e53c93cec786373f2654"; + sha512 = "964541eb0d5ae8a7cef59b17d2e4002bf34b2137beb72593c2fee6e578e4e02f06bc443effa7d958631d46d097f482119aedcab4862f3881a8c68527bb88a998"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/gn/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/gn/firefox-74.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "6729111f3c0e4511ae70afd2db2c9dbf9640d01c16b711cbbd1ce7c4ee689cdb844a03b2aaf93215aa85b91d3a519f135ee5fe895cb2f96c77e296ed8528b942"; + sha512 = "8c808172327308ea1eb4eca12642ee2628a01e1461ab33d56e326c4e5f675f3294a563f83bb42bb3b4eaa15311f89ae59c6de65c0fc565464611b89ca03d9a6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/gu-IN/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/gu-IN/firefox-74.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "9152dd76206762dfe6fbb4ede85d2aa606c1c5455945fd6cdb31aa65267042a292f99378a7ba51c793cf50753d51ec21e896938b58d6092eef032d5c2ca89d43"; + sha512 = "9338b5d59f01b32d608a7e3202992e6e44e9f62f947bb8ab6aa64e539f8105dfd0e6436705276efde769a196e7de7a63190a98fd2d6664e2aa74365e0997fb7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/he/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/he/firefox-74.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "bdbf71a917eeb72a47fdca61253b5f7861ab8b20d05b61833e5d6359f808fd34c518f192c8eb55883530f0b82c56f0d289c78dc369badbb59050ab092f2d2794"; + sha512 = "fbac46c204f656f07f1ed43fdab6cfe2b3db33a0c46030e23eb716eda26064329fbbf97ce0a07c031ee06d90c1b76c432dc4ab1b55b9b53b26fbcd8e640819e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/hi-IN/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/hi-IN/firefox-74.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "1cd239f79716e277518ad870bad8d01be7f558e60f1ef69d632a87e4fea570dae219fbf63d57ede37e2128888860f1899e2d702e24117071885d71e5a95061fc"; + sha512 = "3b5bb0426fde394e9102d13af677974bf522a6635921071bf5dc453d76431a10279a8622c8aa6642385c0803e30275058575e1dd0e986726e4f9e4f2ef742ce0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/hr/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/hr/firefox-74.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "47e3c93ea8a5c7094d02840a0c4dfcd74d91cb81a718a42505284f29d7dc7ae779c21ce04413eb4889369a22867f4562afb132769430ebeefe2095c23352edc6"; + sha512 = "cdc430d37f861e65248d95f29aa384ba4910e9e2fbaff9f3bf236cc9b93ee16c71c1128fea51c84772859002e00d3015ac2028a3103d13cde9ef2335f650095e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/hsb/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/hsb/firefox-74.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "dbf79eab22d233809bcaa8bf9464abc143bd120f6c9258b95d61538104cb18584208a9f55206f27be5a8b7f9b2ad7ed42f58562d37b14f86a61dca0b18fa4401"; + sha512 = "07d4c85e8838022d4626ceac115b9d41a88db711107dced35a80967a359f72395b657219e92a7cf5e4f5a4e6c521a36101d4a219c58e56b63dfe0b25bc942155"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/hu/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/hu/firefox-74.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "d8878f168fd05f6334477078ef647f70ab1e89e144756238b12dc8da7b7b703fd56958cdb4119c66e66cf3f8c0260d2fe9ce65d9d9e094c52c775b1234e2a8d5"; + sha512 = "cd2b6d36f7b6f12d77e43333f1741828804e0434e1394142a554ac7fe3e42d46dd66617c58921114a7472092b7714618247ec30d46abba5fc40b7306ce5f88ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/hy-AM/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/hy-AM/firefox-74.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "9348b29a96e8cacc331b544ef219049e1228ecfb4c282ea1e9a859eeb5f16d261d6ba48d6d6bf1d2cb9be6d7ca2f3f6ecfb5f58e42a54fe9eaa04742b3a42532"; + sha512 = "ae4b468bfa3f03ebf5f7793acfb6f3785238bd4a6e78c0e7542c49627b5436d55d8e0108c7db0bb755009962020010e767e49105a8374087d1ca5d50eb7b7340"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ia/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ia/firefox-74.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "b8abbd7321a68fb1eb3418a8b8b871e4f27fcce07a26bed73d91482bc22030217599b515bdca16c4f409581ea3f73afca7dc506c85e4b19e0f4d9c27abd0a602"; + sha512 = "87fdedb6b07be5709ff0c5de383eaa12707bbd64487559a5a75d475abe72a9b7877645fb61911d0a95b27616318cac2208a6344b90d4c1bfdaef6d11208fc62c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/id/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/id/firefox-74.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "b70c61f469f18b06baf12efecf1b4f9d617bb47721810d6069c7d3e1491cdc5701a4bce4f3c26a54825ea4ed48706a69aae731aa3514488fd90533bd128625eb"; + sha512 = "b42fae3bdeaef76715c1698ed39f710e3932b39d7db67fa00c94e085c5ec23afea7bddfce99d444991126c67f3a9d81976362a3f32f99d7f24c81a0a70487bde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/is/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/is/firefox-74.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "2fd9b1e7cd86c28dd43d6e0b39fb4bfafa82c05dfdeace15c792d5f2c21b80b67a664f2abe0c9f9d4dc3a1e4fc214e38428124d740aa7f63ebc4c82210e7d646"; + sha512 = "0e9888e900536eee6199d7847f4b92cf6314c63b35877b08bc0f51f2f4877e1f965bf760a59a080a517a9ca1b8da814abe465a893b0816d3e5e00f1b02da67c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/it/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/it/firefox-74.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "44f2b7ca7f2e5f14107a243b1d711b487e8c71e73808f849756e65f3e61040917104836e912ba8c356754ee1b04986eabe85f4cfab10e1b49a5867dd33242648"; + sha512 = "396e0b54e912317e3861c5eb25d32f7cbf3ea558bb115c7c6f0a7732a18b246c9a97dc8ca3172a1b21ed3238f5358a9a70c0976d83ffc7640f4d522adbe4317c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ja/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ja/firefox-74.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "86d5e55c23ec5077f32c290a4200d2b53e28184d2e01ead019a8d8d810724e692b9364cf28d7088c881bbd32cba55a6c649cae448fb92b7b1c9f309134b9ad1c"; + sha512 = "0c8620750bcdc116ca0c9d26d8cda350afd1de3f8cab93f98df685c12a3f1551d537cde094f74675c8156a48e6c88d77ec077ae20f3bb0bc7b72d3ed023cc622"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ka/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ka/firefox-74.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "11b4a38f291728dfa67ce79c050cac6197e73f1de746991cb85906f648df14b72bc1d94c4e287e89575cef201a98cc91774df3872d974dfc1c3d644b596e7bbd"; + sha512 = "2e91dc34ee5656cf39aeafab2c7648b9465fc56a3afed40ae5a9e391bf8c0a897551bf402409db0d265ea196bfb0abbf100290fbbb108c79979266f1e2b0dece"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/kab/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/kab/firefox-74.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "7d817167020b89bc460e3b5ac6bad95c32c62b2e7ac816d69a4e943fad80ee06dece53762cdc6b8dbac27958cc4b851e12d777eb08c84638f0c0234a9681053e"; + sha512 = "fe91f60852d0c6922884b1954f753cc04db696d28ecfe91505fc3cb23d2fd0c23dc010c37e0326fc3b782672400cb65f887ff799b6f6b039783d5f80c7373367"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/kk/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/kk/firefox-74.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "998241399f8019c1385b2e005bf55f715ef734e0720ac3482726ac9bac82c0d656eb38511793ae96fadd810949c8ca084e4cd0810a7a0a1d0a07c9c88b69ffa8"; + sha512 = "581a46df5cb334c8cfd0925c78752887e636388d4e76ff41687ab2193f1a26c87be848a02753e427f297fa5169e7e203767b66ad96fd0825276aaad527f1fb88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/km/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/km/firefox-74.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "530210e9760266ae5680333cf94d8cdce20fcb2e8762503413b42e7bd593a163d0c9c37392aac6b89526a2109f6edfe3f6baa0ee1e0c8e85fb7938badfbd8d66"; + sha512 = "8e53ba868d2d0a9dad832e68710c6958d55ccc70d75f16a138983bf5d1ec24ffda1e320d40fda0ea62bcad5e01419c81db52fd0b1eb3ef11cd90c4aa92b11be7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/kn/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/kn/firefox-74.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "43bc6d75ae2efdd31c9bc02e1808da3999ab5d1fe64df2194343bcbc9436adab4e530b67ff088727bd379c099911afd8733d6b3bd73872a6e9e5ceb14c2c7346"; + sha512 = "ea0e3dcad9bee6b37b2de3178eec5c980b1f85ca38f47c4049f8f1d614dce581b8ed7ea7f8751443e737db62e09bc9888358f9d68690cd8c8d9ab16a4e62e727"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ko/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ko/firefox-74.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "08ac6c0704f13ac266adcdd8ba8eeb62e18ddf4c3e4633acef3df31f07b6a5d4608a15d4c3bfc25b3c16556ada6296843f1ef7115bd37515cd1d5110dbf85064"; + sha512 = "a486e93785532f05f4004253f369d384d2949b86eff8fc88dc49cbb76def0214a35f4675d86728c2e3ab6d1786b90546d223d7fcb8f70092f35e7d117a20f76b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/lij/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/lij/firefox-74.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "7ed520a475ab533d33e392e7fb24f2444caf9fe5cb06aa5499740d36b8fbfc899af7c8f6495c46f9e363606d33fe067da9fa72a2d41a820731d764d698eeb075"; + sha512 = "ae06bc4a21640d47034596522415c275faa16fd12866582aeab9b0b8cf8dac4b854bb22067f36419fc1c45810c499ac60f9319127199cd30f8dca1c1daa8e035"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/lt/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/lt/firefox-74.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "6e49543423ec6c0e968b85702fec46587c01fb5a35c28e1617f3e206512c5b072856a7bd455549ad31c2828d1f6baac40f5916b8e38c622c84b7a54a6468ce3b"; + sha512 = "d79206839e72915a5ad36674d624974aa4c2e09fc9b24eb82b54648f5e86cc97ca9c65c1e5fc97aa80b0afeae4cbd06a36fbc5cc6f0b8e915a820fde6d330d1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/lv/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/lv/firefox-74.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "c8c7e30bde45f99026b3874ee70d4b9ac44d1a4921b448883faf54c9e1323066464d4eed3671b372a8e342e9bae9226ac64525a1ca285d7015f1854e5d4eda3a"; + sha512 = "c7c1a9d6cab35e29492440a94c31514fd21ce9f6d6828e1f83addbc60b67ad83553913b102312ce3b4d9014f222f16d25cf510cf6a816c9212324fc4fe7baacf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/mk/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/mk/firefox-74.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "e22388afa540e7abe6575525663ac7365555d7d515ad49233bfb3de16db778a634dc166b8e9680f837978cf6662bf1f460f95ae40520116988822050de731a65"; + sha512 = "59dbf4c86c78ec02db97900b0db1ecf6d2f94c34bb8c5c7bcd60f2a3e8748655873d5994a9e4bf7a8762cd9646a14e180d1e330cdb2464bc146a1d365a7f789d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/mr/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/mr/firefox-74.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "ad71b75a9b309c9166b72416ec06edc90a6621ff27fcaed07c16a42147664e3b116db8e3ffc9bdba8ddda862dbd29074b62feb9ffbebab6d36437bd5a50318d1"; + sha512 = "d11f86f1b515d047cbb68fedf17b535776ffd42c20f7cb60c7c3dd39afaab6f07744ca0a4da0b9a40379bd24a9ff1699f901b8221e587f440faa2243088506b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ms/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ms/firefox-74.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "f4c3f8d93cfbf89b862929d74eacd3398531f43617288aefcdf7b0f4b5857e9a790802755791a202aab465349bd4f979d257d5925b45a8a28b4245ba10d5d0e3"; + sha512 = "a8d2447ca79e9d66344a4f1ffee66ad7de50ed5c0e01c9f32303011324229d0fe414f39e8844b5e4a06732509e17a17dca9cc729c87e51cf8b2ecb925c194815"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/my/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/my/firefox-74.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "4ca9a42291faa8bb4c39a9efc0f8067407ee486e37a0b32576d2519a0189efd2c86ea45ea6c19f44d321d485ccf7479a58d9fc84bc3022fa211046adcd1cac8c"; + sha512 = "9062c54b41a7bf1b7465cc649f90790a912576457ac1203aa6bbd14d927bdddaa41f31a9e7ddd7934c24d2db8357f8366d1b45a50a8f35462eb2b05028d673e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/nb-NO/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/nb-NO/firefox-74.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "fd54231a3888ae659df17b64d1f8150d112bc9191387f3621b0edf8a97571b90613d387c8fcd1944a263bc20c4c2f701bc4eac3765e6d2c4529c93c70cd07780"; + sha512 = "fba107427926346ecac412016c7a6e58fd1e6652d13b6df632ccbbe3568ec34e8927771036394cd52a232b5aae975394061f6ace87958b84e6d8ca685930bc58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ne-NP/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ne-NP/firefox-74.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "1530837c31b3f062ef0d13063d7ac071e0434a3bc9d44f53d17675cee3f6cec4f19305ce01a5ffba0c9be9d2661a6f563790d54449408eb95449c62a378e0217"; + sha512 = "9b1b57700f22ee7827fdc7b391d05117b4286e0a27e90a45d25ec4afc7d9738a7d400f2720fcfdcaac311b6d6e4605c5a2e77ea2ae337cbd1acf5071b217c1f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/nl/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/nl/firefox-74.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "914ac5e5a1495d753ca9bbefc8fc57375252bcbdb35c6b92a37ac12bb3218edbfd7caf641a52bf1448950c3ba84bbc13b7396199ef0c6b1678090fa40d3ea26c"; + sha512 = "f208d274f971c53db962b731226039e6cf0f33ef59ecb64614000be634daf40bbf89730c13affd5445986cef9c1f9a1d1c32f94c1cfd7133dd254f3e8a1cbac4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/nn-NO/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/nn-NO/firefox-74.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "3218d09d98d61d7c804d6ecd8be2ed48dee8f0fd9c2cea42e44a1c38485e3cb466955eb84e23ca308f1d724afdd33931d780d9f76b5d54ce942d00f0d31463b7"; + sha512 = "126eed4ad3a922c0b2e4f2f575be874a739d37d97fc19f83fcec01b8a029fc79c0132790e69c61622ef811f8f7bd16ebb1f742a8991f6e0aad0dd7a52af3ab34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/oc/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/oc/firefox-74.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "a7bf0def44278d66532b7e4edbc0deaafaa3a0be1a3ac41ba22848893c4ad8e651114e0d39e49eb49458dfb257280c32cf8bd6bb503c8f3198db1872324a7345"; + sha512 = "f0bba67e75513aaea00371bd3b6eadfcc765b5bceb8712f82dc1a0432bf9360e979190ca569fb9c677faa23200a62766775536910d29689a51bb496c2d82cf38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/pa-IN/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/pa-IN/firefox-74.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "d052c6d72e88a31492567d03097c3efba10ab0dc4d8fd0cd489ebbe45949896effb514a7af1fa30356f3cb97a0b08caa47472d0032558197e608b1ec130bd7bb"; + sha512 = "2e60b06a677e21149ed55e9b1f2cc3a4555fcaf78df90dd81f7a6fe56140ba1cdb6eaf29141c123b46e21c27bc116e1e8b97feedd86391fdc564ba20df078059"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/pl/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/pl/firefox-74.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "a4dc584b9222558203be7dab78c58f5e7fb86dcba9ee565d2978ed7d8da1cdc2cc3c9bb8f93ccba8f1c5ccd9074bb642ee99d0225056a54522cb499575ce1e11"; + sha512 = "a834560790d35559db67db2e6f826fbd8788eeef8ae47cfb48e0f3a8b7416b389e6c37150a8dda1d80e133d8a9219ff30e3d9a4422ce8d2de83ef6ef7f638049"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/pt-BR/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/pt-BR/firefox-74.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "5ecc7aa9752a373c511a208dad606774f589e36b5daa1434c8e7d76bbd835c8f2b9c6b20c176bee0ab6fc7b4355af1f25243563eb4d97d988059bf3d08e7d279"; + sha512 = "ea8a2de3fc7f89ca15e118c9d4a2b75604fcb295c3ec1cb2b9b1961fe6a0abfc1bc9813f5fc7cc71e1ca10516d390cc7d36de03b57ef72e7fe7a45095fac8678"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/pt-PT/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/pt-PT/firefox-74.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "31c3585e7612f71b2d7369d477930aebafcc54ca8d21ed6f84ef0073144ca5fdfd1bc45e6f19b702c26ab5c6797c52420d8fa5451b889c7706f509b6c4dd5ad1"; + sha512 = "b6eb4096e7cdc2823667a99c654004c95b526a495d0dd1f24ea45643c8135cc01403417e7cd4d2aeb5fd935d153d44bbae53c6a581d9601c245a320f8114fd9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/rm/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/rm/firefox-74.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "eb82d612861e1a0434edc04dd79ce33e42d116e27b001139371b7fa2802b94a46c7035152be2248941cb7ae576484da743175491c63121be8651dfe9b74a0d82"; + sha512 = "8de865c608b288feab89de6677974cbbb2897678514945907f421159049b2b63a332c9302a01e5ec4b355486085838930ef4b44ced7fdf78e5cd0a1f65186cf1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ro/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ro/firefox-74.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "c5229abd0b1fce59debd4d72af3d7bcf8a3f37c5abdf9f1a6b4851c19b7191492da42901683e57c9233efff16cd99bc1499d8e16ddf7a405807c7d00a41c205e"; + sha512 = "848f4b90fdce6455a563bb38b097d9b4853aaee8e43ec0d9101f41a4046719527a714c0b5d2ad07461ac5dfb34e0cd10060b5169276004c6f7cee839e2b3d669"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ru/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ru/firefox-74.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "3b965b0cba404679e6c9756367dfa3dd8ecb028b440cc7bb949df353f5a27efdece0878eb44f950b3bfa7e8842483b929ff70ba1fd25bce5ed0a23d7b505c0cb"; + sha512 = "9b624a07fccf6f2aa1707e8d4e04894e6a2d3f467dbde806bcd11eaa7ff3cf8cced1ee1ac237037c309472588db247d175151393001ab03ee9e281fcef91890f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/si/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/si/firefox-74.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "569f2910116f51cb3be82cc2d07f76d4f8b61cdb6ca96024290cd5e523c6711009106658a09305ebf2c596928de35eca1bdc578541a9eb14fe853fead902c7c3"; + sha512 = "c6f2d9666b32e635d35ba7c94dbc2c68c497a44b1cf464038ceacc0278a7348f11150c8e879ea5814f43ab9e9fc5ab14b0bfb553e52cf6e26c826cd3da154572"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/sk/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/sk/firefox-74.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "109afe184afc873727c4c880280ce38f6577f0688c42c7a18b692d54a4eeb3f24dd8c5ca1a062df886bb171c50d30d6707125005baa29a1db9ec5091746164e9"; + sha512 = "c89e44eebcbd0945b1c462f748a71286167739d75d9b0e65529be07793bfb20dfe01eaed8280b94047d2523e0a0592145eb7af524f4de630388ea3c2c1638aa5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/sl/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/sl/firefox-74.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "63af29eadaa34738b715aa23609a20decd0a805a252a80051ed54fb8a332f6ae7eb17f73159469a755eb736a1523b0552ac3dc01de5fe2a5903e21e0286c833c"; + sha512 = "e93922b8a6e946e39febb8d690d251d01d69cd82f4f07546209f21cb89532c342e6f4e37319821fd6786bc5bf5f7927a28463e5f2d1bc8fe87bba1817af5af00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/son/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/son/firefox-74.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "348898f1a01cbe5191c31c8a806547b74890762163a8aeee07b61aebc969a36567255f00bf8bda7f0dfb29b81396ab71ff39054dc1910c7b7a2ec225aaeb7ff9"; + sha512 = "f7d2757cad117522d9964885d002d717772012b9952d1e03a53bce775967e927c7cba1358fcf6165f8732f761aeb148b393d32f7cd0e540d449605cadbc8a0f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/sq/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/sq/firefox-74.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "278e02254b09df8469c3ca0fd56e72b9b663be621e930a1f261276e58242c84ec9ce717a0924bfec01953e15a0a36c746a17ff43a30e98c6862697995e7f7fac"; + sha512 = "b19f1832a460298e36509bd3e8a8dbcaf300373954ccbec9c4f402fe4e60bb9b24a79e52e62c63c0ac9cf5abbb32187215cf7690781dd88b3649eab1f4b60cf9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/sr/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/sr/firefox-74.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "1d7f2d1f341d2621500bc4eb0885c6e2709c4621d34fcf8c1f35d3054af17b0c0490acb92867841ab605b8a6b764d9689ccf7eb6325a136f00531068c2a83d29"; + sha512 = "15a93a42b3d19d3d2da4e06ea0b071c05cbf82dd820d43f52e263900f233894112cd40132de93a85e544d7961ee7be11766be0e4c827b805025b0353bc4cdb7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/sv-SE/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/sv-SE/firefox-74.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "38772f54d574a7b0dda06a535adf934e60e06d1753c4df4a9dd52dfe1cc08dc1fcdb1e0350e889facdfbdde95707cd70d705b9f7fc6f2d030ea92bf59de820ce"; + sha512 = "c1c7cb83323e39d13bd04a65ab3bbacd9cca1ef90bf1870afd49ab72f0819bbcda8ef5c50db08537babd35e3ef117441915d87ee4b4dfd4548b023faf834adaa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ta/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ta/firefox-74.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "c75d17e579c45961c92d9a0c238276a9371f27d438182b366c8804d7d4899e9d4cb689455b5d1dfb6100165bd1b4fef1215059779eec7fd215e485fd26f4db33"; + sha512 = "56ce445bdf12c7ab1bc31fd2f06f5ed3f63c0935e91d23e0e153a81362b1b44b1c874a3f36c2f3b7adf7821f1d08aa80aa55bc01594144fbd92da62e13ba8cc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/te/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/te/firefox-74.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "5d791b6bb7ad154970646e83e77513e92e284d32169d9ec6f8ae66e252be3ab6618e927cf73693d81986a2bc10ed27dc2f46ef8b39065eae028828282153803b"; + sha512 = "2381931f7fab5578e870d589975eae78c4b45f14d75497d1524b9500ce8305ded0aca89409371cdab866be0b32e714ebd1efeedf83d176c12b4518d07b096c6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/th/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/th/firefox-74.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "6015ae88939f2bcaeb2f354ae0003695fb111e60ac0c137cd4d6cdfbb1ef27699b76bd1d02587af1996002a39955e7c1ed537f906328695b820b024c8b91ddd9"; + sha512 = "0cc8606b5b15bd3cfc8e37f13c73eabf454c9997102c5bd4fb325b99f029c75bdbb6d48352c4dce40c3790c9446e6c2236885f2aa33ec171ff81a51b7277b780"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/tl/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/tl/firefox-74.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha512 = "471e73795238f2f65550ffc73b604f1ef41b92470b811c440fee5d2cfe41b77c3fcc38be0d2ed85f7f86c005407095780a12e8ffad02fd5f435c6492feefb8bf"; + sha512 = "5f7bcd704a3c960b2d89788e841dcac15eae1fa575205ce67bf75726a5477a0356c968e77146297ed96206e5f05083477155fc3db2c9ddef53bae373104d12cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/tr/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/tr/firefox-74.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "464f2df89fd62ee8649786516df21a10ad9bc0faf90f6970144dd2b3397c58643c1f7d1ada6f9f7d7710777b903de89e2bc04c7ab7b057e8fa07ec667bf62f9a"; + sha512 = "8fdf1faad4615db6c2aa577391c7a9aa2600e486234d9d20ec0cc340552f98e199565ee391ec48d2c660fb347cbf3ff733c16d58350c4ed1a47076108d731a0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/trs/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/trs/firefox-74.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha512 = "d9462735ef137af2defa7d580567479e97d5527b8941880a27979f496a0d74da39cce10eb3503dda54b4a732433182d3725123ecf0b49ebb503bfd56fdf5a286"; + sha512 = "1a08a191f34c3fe120d0d7915f872750f903e6692819c0ee1bf1341539346f8f816e89e79970a81e610fb78b0b1fd0327655e7a5db10c717c60a3ab425cc1b01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/uk/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/uk/firefox-74.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "966b2fd86876b694c66e68f7e8c33e380e021be7e24196816f741ec491eddbbee33318f922b03eb8c66c5302e0d5eb582aaa1d341860b82d7c7a4a7949254bf3"; + sha512 = "0e93003cc99f7251e6596b960a89eb4348e260fdebb348ed9356e850e5d5a589d1affe131bc94a3d370ba340062d3d8b59f18eaa0d446f677f767f3a4e26884d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ur/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ur/firefox-74.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "03fa60920c5cbb89035fbd665135b2911bdeaa3d4387c38184aa6f7589369390ae8bfcc0ebca83749f5c2e811a8a74d0ad5dbb62a1befd009f674c7a21449fbe"; + sha512 = "ab5c15ed6f63d6c7b38e592f28e57cc895e191aa60e2eec819129c684a73480315925965ca0c4b69612c873637e56262b2c3372a59d451c11d73bcc888c92194"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/uz/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/uz/firefox-74.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "e66657c54a7edaaa80d932f8447d9edffc2e7625c6241de6ad47272c77586b5eeacb299f3cb9f75a43791d145762883632ec409c1c2b5d32d8d81d42e54cf62b"; + sha512 = "58a83c8ee2582112eb4bb04e875ebad5c3f31fb7f6be790cecaa4f599b2e2f2c3935df019578d5c79dc2df2e3f177796830dcd7b8d96e1435f0cc8cc338d4cf7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/vi/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/vi/firefox-74.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "2fc3f94a80262819d72525e5ddce77344d482d22ac33992931c79d15d4476d4c564be306a35468358b7b02c167d294510c197496894fb8107062fe897bcb049f"; + sha512 = "70c26fa5f2922979919f30454ef5714f69b61089af76158e2f4c59204e9ca800e7af620d60cf8ac6208b791677e00d5337ded25b4bbd7a64dd46d353bb728d84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xh/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/xh/firefox-74.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "806db4368b5c5f248f3992140a23734451f9b8122caf249466c63cea69e063a1274b620009d7e6e8ea45bd43f29997995ff0d23580a8bd2376e950926e9807f4"; + sha512 = "1dab6166eeb18ec291b7c96662c74583adeeed7fec56414cdf827b1d0d2976374d84437df6ebd131628fee9607b91307e074cfa0d3c4ea65423d37dde0951fa7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/zh-CN/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/zh-CN/firefox-74.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "b4ea2b4c2f54a7c3dc2f16754aa38555e81221062827c3339fac543528cc52062b9e9c910dc597b21f2ad1a267ca2cf1faa8362f3c9c78b52480169251b073da"; + sha512 = "2f4c9461b178b646da63da07893fb3dc598ac2aa65e384ac4e0406eb748625bebb06b6e7d348b4324eddc794d0818e87958398d65a8d3354faec26854dfa7d07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/zh-TW/firefox-73.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/zh-TW/firefox-74.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "ed2e55f3279472c9e3b2bc0b51762b797f61c4fdb3fe95c652e5d2243516ea17f2dadc1711bd19154389215ede42a97bac9a607aabc14ac24d5e43a2913420cb"; + sha512 = "f1e0e92ba60358f3b5e1edc1f3fd2a58482a4723785ed9e8d914519b6550617f5d19468ce9b8a5a5f81a212ae0e387d3f39335755838e074cbbf765f2440027a"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 4aa8105559b..82f1c267e77 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -93,15 +93,6 @@ stdenv.mkDerivation ({ patches = [ ./env_var_for_system_dir.patch - ] ++ lib.optionals (stdenv.isAarch64) [ - (fetchpatch { - url = "https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/09c7fa0dc1d87922e3b464c0fa084df1227fca79/extra/firefox/arm.patch"; - sha256 = "1vbpih23imhv5r3g21m3m541z08n9n9j1nvmqax76bmyhn7mxp32"; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/09c7fa0dc1d87922e3b464c0fa084df1227fca79/extra/firefox/build-arm-libopus.patch"; - sha256 = "1zg56v3lc346fkzcjjx21vjip2s9hb2xw4pvza1dsfdnhsnzppfp"; - }) ] ++ patches; @@ -301,6 +292,9 @@ stdenv.mkDerivation ({ inherit browserName; } // lib.optionalAttrs gtk3Support { inherit gtk3; }; } // +lib.optionalAttrs (lib.versionAtLeast ffversion "74") { + hardeningDisable = [ "format" ]; # -Werror=format-security +} // # the build system verifies checksums of the bundled rust sources # ./third_party/rust is be patched by our libtool fixup code in stdenv # unfortunately we can't just set this to `false` when we do not want it. diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index b94a33bfa87..cf44639ad57 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "73.0.1"; + ffversion = "74.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "1vdz711v44xdiry5vm4rrg7fjkrlnyn5jjkaq0bcf98jwrn9bjklmgwblrrnvmpc9pjd2ff3m7354q7vy6gd6c3yh2jhbq91v2w5yl9"; + sha512 = "245n2ilfgx3rd0xlxzpg4gcwddcy0cgaqnaf5pwixjx0n8py1imiylwlsbihf70s41cq5q8awckchs287yysr4v6pdfqqbj7s0f02ki"; }; patches = [ @@ -33,10 +33,10 @@ rec { firefox-esr-68 = common rec { pname = "firefox-esr"; - ffversion = "68.5.0esr"; + ffversion = "68.6.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "39i05r7r4rh2jvc8v4m2s2i6d33qaa075a1lc8m9gx7s3rw8yxja2c42cv5hq1imr9zc4dldbk88paz6lv1w8rhncm0dkxw8z6lxkqa"; + sha512 = "2ipajk86s7hfz7qky9lh24i5fgzgpv9hl12invr1rr6jhpp0h6gbb44ffim0z9lmcj49cr01cgqis0swhb4vph8dl1jvgfq9rjmsml4"; }; patches = [ diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 3d711f92d1c..46a759cf27a 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 b003a1b3f5c..5274d30e68a 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/next/default.nix b/pkgs/applications/networking/browsers/next/default.nix index 22f0cf928ab..d4726fab651 100644 --- a/pkgs/applications/networking/browsers/next/default.nix +++ b/pkgs/applications/networking/browsers/next/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "next"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "atlas-engineer"; repo = "next"; rev = version; - sha256 = "1gkmr746rqqg94698a051gv79fblc8n9dq0zg04llba44adhpmjl"; + sha256 = "1gqkp185wcwaxr8py90hqk44nqjblrrdwvig19gizrbzr2gx2zhy"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index f5eea57b483..686ffee9148 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 67e91870f1a..cb846060a3d 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 12e20e9c13b..88ca9b3da94 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 6decad2f9fb..ee7c4ab9cbd 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/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index a5e2b374326..5178b7a2bd4 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -15,13 +15,13 @@ with lib; stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.16.5"; + version = "1.17.3"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "12ks79sjgbd0c97pipid4j3l5fwiimaxa25rvmf2vccdrw4ngx4m"; + sha256 = "0caqczz8hrwqb8j94158hz6919i7c9v1v0zknh9m2zbbng4b1awi"; }; buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix index 72bd82be6c1..b7decc0c141 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 1ad30335b94..ec152fdc464 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/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index da943c2aa7e..6862ed23e74 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -112,8 +112,8 @@ in rec { terraform_0_11-full = terraform_0_11.full; terraform_0_12 = pluggable (generic { - version = "0.12.21"; - sha256 = "128mrqib8rigy6kk6fby0pjh4jh2qm2qwkrlbn0wgfln0637d9ff"; + version = "0.12.23"; + sha256 = "1lr2gfk5dmj6rhv5rvzn3fggb34za73ryjy0vdzx4kf3qj12r0wz"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 49f55370bc4..1058b21d3e9 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "terragrunt"; - version = "0.21.11"; + version = "0.23.2"; goPackagePath = "github.com/gruntwork-io/terragrunt"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "gruntwork-io"; repo = "terragrunt"; rev = "v${version}"; - sha256 = "1w64skk67i0sxjd2mkyqh3nglc32wc7schk7h8fwszpa1rw4dfcn"; + sha256 = "1r3q7faxys0h147cr9154pcix1qgj36v41ja9hhbggm4c7vig4s1"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix index 51cb455ce7c..16105dbadcb 100644 --- a/pkgs/applications/networking/cluster/terragrunt/deps.nix +++ b/pkgs/applications/networking/cluster/terragrunt/deps.nix @@ -5,8 +5,17 @@ fetch = { type = "git"; url = "https://code.googlesource.com/gocloud"; - rev = "28a4bc8c44b3acbcc482cff0cdf7de29a4688b61"; - sha256 = "0j40msxm72m8gs87rpwkk19iagjj387r42xwxszmrna7il8g0sbl"; + rev = "d96ccb2ba7586bb79a416471882d347754a78ce5"; + sha256 = "18f1l28665x1a8j8a5bh2i7wb2vrwj050d1g5qda50isgqaybixd"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; }; } { @@ -243,6 +252,15 @@ sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz"; }; } + { + goPackagePath = "github.com/jstemmer/go-junit-report"; + fetch = { + type = "git"; + url = "https://github.com/jstemmer/go-junit-report"; + rev = "cc1f095d5cc5eca2844f5c5ea7bb37f6b9bf6cac"; + sha256 = "1knip80yir1cdsjlb3rzy0a4w3kl4ljpiciaz6hjzwqlfhnv7bkw"; + }; + } { goPackagePath = "github.com/mattn/go-colorable"; fetch = { @@ -378,6 +396,33 @@ sha256 = "17g8fb9vy2sqq8vgz8jdvf6c6d2290gm2qs0i4yzsd86mgn4dlrg"; }; } + { + goPackagePath = "golang.org/x/exp"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/exp"; + rev = "f17229e696bd4e065144fd6ae1313e41515abbdc"; + sha256 = "0q1fij8izg7xcnx7wqh0zdnya11k3d9a5fqm0yb2r93jhlf3x128"; + }; + } + { + goPackagePath = "golang.org/x/lint"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/lint"; + rev = "910be7a94367618fd0fd25eaabbee4fdc0ac7092"; + sha256 = "08gskshgfwxhmm9i4vgd4q7kqd5i7yihqh33v6r07br6kqd0g995"; + }; + } + { + goPackagePath = "golang.org/x/mod"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/mod"; + rev = "ed3ec21bb8e252814c380df79a80f366440ddb2d"; + sha256 = "1fp6885dclq77mh73v7i54v2b9llpv4di193zc8vmsbbkkc483cl"; + }; + } { goPackagePath = "golang.org/x/net"; fetch = { @@ -414,13 +459,31 @@ sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; }; } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "49b8ac185c84c5092be0953fb92b7660db9b8162"; + sha256 = "0ccsm8p9i83f0s0z5c7jwyzj7jgcg60zf20hzrmp705669wn5y67"; + }; + } + { + goPackagePath = "golang.org/x/xerrors"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/xerrors"; + rev = "9bdfabe68543c54f90421aeb9a60ef8061b5b544"; + sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c"; + }; + } { goPackagePath = "google.golang.org/api"; fetch = { type = "git"; url = "https://code.googlesource.com/google-api-go-client"; - rev = "890e5eb51fe205e56dc55eb68d63e82039730816"; - sha256 = "05r2wsjnmszsz4y59w8q6qknc7zq1mc56kya61i2133dqxyc55ai"; + rev = "e9c39defab7fc4be8ec95d4ce422dbeae4070400"; + sha256 = "01wjr07xnb9s32y2jc6d0rba3jxwccd2wydm6cql41yhyr3x84rd"; }; } { @@ -446,8 +509,17 @@ fetch = { type = "git"; url = "https://github.com/grpc/grpc-go"; - rev = "501c41df7f472c740d0674ff27122f3f48c80ce7"; - sha256 = "0hla9rjvyi6wjak4cw39ic8jkdcd0lsymhrz9sa52bfybxsczf38"; + rev = "f495f5b15ae7ccda3b38c53a1bfcde4c1a58a2bc"; + sha256 = "09phrrsafgq6hnbw8cawvx44bdpk1p584fys17x1bwn0j0451zzs"; + }; + } + { + goPackagePath = "honnef.co/go/tools"; + fetch = { + type = "git"; + url = "https://github.com/dominikh/go-tools"; + rev = "afd67930eec2a9ed3e9b19f684d17a062285f16a"; + sha256 = "1rwwahmbs4dwxncwjj56likir1kps9937vm2id3rygxzzla40zal"; }; } ] \ No newline at end of file diff --git a/pkgs/applications/networking/datovka/default.nix b/pkgs/applications/networking/datovka/default.nix index 12bad094fca..976541177dd 100644 --- a/pkgs/applications/networking/datovka/default.nix +++ b/pkgs/applications/networking/datovka/default.nix @@ -11,11 +11,11 @@ mkDerivation rec { pname = "datovka"; - version = "4.14.1"; + version = "4.15.0"; src = fetchurl { url = "https://secure.nic.cz/files/datove_schranky/${version}/${pname}-${version}.tar.xz"; - sha256 = "0jinxsm2zw77294vz9pjiqpgpzdwx5nijsi4nqzxna5rkmwdyxk6"; + sha256 = "1f311qnyiay34iqpik4x492py46my89j4nnbdf6qcidnydzas8r1"; }; buildInputs = [ libisds qmake qtbase qtsvg libxml2 ]; diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix index e5b3e1d52f4..e4612579e0f 100644 --- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix +++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix @@ -1,23 +1,21 @@ -{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper, openssl }: +{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl }: with rustPlatform; buildRustPackage rec { pname = "cfdyndns"; - version = "0.0.1"; + version = "0.0.3"; src = fetchFromGitHub { owner = "colemickens"; repo = "cfdyndns"; rev = "v${version}"; - sha256 = "1mcdjykrgh0jq6k6y664lai8sbgzk6j7k0r944f43vg63d1jql5b"; + sha256 = "1fba0w2979dmc2wyggqx4fj52rrl1s2vpjk6mkj1811a848l1hdi"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; + cargoSha256 = "04ryin24z3pfxjxy4smngy66xs7k85g6gdzsl77cij8ifb29im99"; - cargoSha256 = "1d7jpffkw2m2v37bfdqsl9sqwsl19cgglpa00lwy4ih09kzbc2n9"; - - buildInputs = [ makeWrapper openssl ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; installPhase = '' mkdir -p $out/bin @@ -30,6 +28,5 @@ buildRustPackage rec { license = stdenv.lib.licenses.mit; maintainers = with maintainers; [ colemickens ]; platforms = with platforms; linux; - broken = true; }; } diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 30665b24081..20ddc6c93d4 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -52,6 +52,8 @@ python3Packages.buildPythonApplication rec { sqlalchemy terminaltables zxcvbn + # plugins + transmissionrpc ]; meta = with lib; { diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/pkgs/applications/networking/ids/suricata/default.nix index d0829fd73a9..04c87b7c25b 100644 --- a/pkgs/applications/networking/ids/suricata/default.nix +++ b/pkgs/applications/networking/ids/suricata/default.nix @@ -34,11 +34,11 @@ in stdenv.mkDerivation rec { pname = "suricata"; - version = "5.0.1"; + version = "5.0.2"; src = fetchurl { url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz"; - sha256 = "034b0nl0hkh0v26gwbawi2wdv7mb9p54cfg8gc9b8hsw49k3c1wh"; + sha256 = "1ryfa3bzd8mrq2k5kjfwmblxqqziz6b9n1dnh692mazf5z4wlc3z"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index 947abc39c21..9d1df501369 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 00000000000..10a2d11a148 --- /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 2fcf65dfc1c..c7d8ce4b56d 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/instant-messengers/ripcord/default.nix b/pkgs/applications/networking/instant-messengers/ripcord/default.nix new file mode 100755 index 00000000000..6efb900b3b5 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/ripcord/default.nix @@ -0,0 +1,69 @@ +{ lib, mkDerivation, fetchurl, makeFontsConf, appimageTools, + qtbase, qtsvg, qtmultimedia, qtwebsockets, qtimageformats, + autoPatchelfHook, desktop-file-utils, imagemagick, makeWrapper, + twemoji-color-font, xorg, libsodium, libopus, libGL, zlib, alsaLib }: + +mkDerivation rec { + pname = "ripcord"; + version = "0.4.23"; + + src = let + appimage = fetchurl { + url = "https://cancel.fm/dl/Ripcord-${version}-x86_64.AppImage"; + sha256 = "0395w0pwr1cz8ichcbyrsscmm2p7srgjk4vkqvqgwyx41prm0x2h"; + name = "${pname}-${version}.AppImage"; + }; + in appimageTools.extract { + name = "${pname}-${version}"; + src = appimage; + }; + + nativeBuildInputs = [ autoPatchelfHook desktop-file-utils imagemagick ]; + buildInputs = [ libsodium libopus libGL alsaLib ] ++ + [ qtbase qtsvg qtmultimedia qtwebsockets qtimageformats ] ++ + (with xorg; [ libX11 libXScrnSaver libXcursor xkeyboardconfig ]); + + fontsConf = makeFontsConf { + fontDirectories = [ twemoji-color-font ]; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -r ${src}/{qt.conf,translations,twemoji.ripdb} $out + + for size in 16 32 48 64 72 96 128 192 256 512 1024; do + mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps + convert -resize "$size"x"$size" ${src}/Ripcord_Icon.png $out/share/icons/hicolor/"$size"x"$size"/apps/ripcord.png + done + + desktop-file-install --dir $out/share/applications \ + --set-key Exec --set-value ripcord \ + --set-key Icon --set-value ripcord \ + --set-key Comment --set-value "${meta.description}" \ + ${src}/Ripcord.desktop + mv $out/share/applications/Ripcord.desktop $out/share/applications/ripcord.desktop + + install -Dm755 ${src}/Ripcord $out/Ripcord + patchelf --replace-needed libsodium.so.18 libsodium.so $out/Ripcord + makeQtWrapper $out/Ripcord $out/bin/ripcord \ + --run "cd $out" \ + --set FONTCONFIG_FILE "${fontsConf}" \ + --prefix LD_LIBRARY_PATH ":" "${xorg.libXcursor}/lib" \ + --prefix QT_XKB_CONFIG_ROOT ":" "${xorg.xkeyboardconfig}/share/X11/xkb" + + runHook postInstall + ''; + + meta = with lib; { + description = "Desktop chat client for Slack and Discord"; + homepage = "https://cancel.fm/ripcord/"; + + # See: https://cancel.fm/ripcord/shareware-redistribution/ + license = licenses.unfreeRedistributable; + + maintainers = with maintainers; [ infinisil ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index ce9c1327db3..3592665ef0b 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -23,7 +23,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.32.0"; # Please backport all updates to the stable channel. + version = "1.32.1"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1ggblpw2xxhm78sqadswcv0314zagksj34z8pywjnr8h9zkcyiap"; + sha256 = "0sfzz1z57l20prj2s8hdl8ip1hrlzb5fqnccqcfd101a6mjnp9i9"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 500f8f3fe87..78b7a6d81a2 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.55.0.141"; + version = "8.56.0.103"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -63,7 +63,7 @@ let "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" ]; - sha256 = "0yfbxrnf2mjihrsvp0r81kbxh3rfh53y7sbfp3bwqky951a93qis"; + sha256 = "01qyi92dh4xalzaqzj9n3bz59y91rx45gkyw4k9ckjknbjwb3c90"; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index 9c57ac829af..1cc3cf9cdd5 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -4,13 +4,13 @@ let arch = if stdenv.is64bit then "amd64" else "x86"; in stdenv.mkDerivation rec { pname = "teamspeak-server"; - version = "3.10.2"; + version = "3.11.0"; src = fetchurl { url = "https://files.teamspeak-services.com/releases/server/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2"; sha256 = if stdenv.is64bit - then "03c717qjlbym02nwy82l6jhrkbidsdm1jv5k8p3c10p6a46jy9nl" - else "1ay0lmbv2rw9klz289yg0hhsac83kfzzlbwwhjpi28xndl2lq4bf"; + then "18hsr119dq46rvhz5sb9snn2gfxwiig37g6bfzk24x6wlga3xihq" + else "1lyazw328azi0asvgvcsxglc1saqih6ss0g8pc8f5pzqngk9p953"; }; buildInputs = [ stdenv.cc.cc ]; diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix index 76cc393f26a..a214f222d56 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 db325cf1387..4f71fcf3b74 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/irc/weechat/scripts/weechat-autosort/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix index c39b7fe1596..23a6996bcdd 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { description = "Autosort is a weechat script to automatically or manually keep your buffers sorted"; homepage = https://github.com/de-vri-es/weechat-autosort; license = licenses.gpl3; - maintainers = with maintainers; [ ma27 emily ]; + maintainers = with maintainers; [ emily ]; }; } diff --git a/pkgs/applications/networking/maestral/default.nix b/pkgs/applications/networking/maestral/default.nix index 708957bdf01..49348610be5 100644 --- a/pkgs/applications/networking/maestral/default.nix +++ b/pkgs/applications/networking/maestral/default.nix @@ -1,24 +1,40 @@ -{ stdenv, lib, python3Packages, fetchFromGitHub -, withGui ? false, wrapQtAppsHook ? null }: +{ stdenv +, lib +, fetchFromGitHub +, python3 +, withGui ? false +, wrapQtAppsHook ? null +}: -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "maestral${lib.optionalString withGui "-gui"}"; - version = "0.4.2"; + version = "0.6.1"; + + disabled = python3.pkgs.pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral-dropbox"; rev = "v${version}"; - sha256 = "0xis0cqfp3wgajwk44dmi2gbfirmz0a0zi25qxdzpdn0z19hp88m"; + sha256 = "06i3c7i85x879np158156mba7kxz2cwh75390sc9gwwngc95d9h9"; }; - disabled = python3Packages.pythonOlder "3.6"; - - propagatedBuildInputs = (with python3Packages; [ - blinker click dropbox keyring keyrings-alt Pyro4 requests u-msgpack-python watchdog + propagatedBuildInputs = with python3.pkgs; [ + blinker + bugsnag + click + dropbox + keyring + keyrings-alt + lockfile + Pyro5 + requests + u-msgpack-python + watchdog ] ++ lib.optionals stdenv.isLinux [ - sdnotify systemd - ] ++ lib.optional withGui pyqt5); + sdnotify + systemd + ] ++ lib.optional withGui pyqt5; nativeBuildInputs = lib.optional withGui wrapQtAppsHook; diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index ffe75eaac7c..5f5e66597ac 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 00000000000..1e1909e7109 --- /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 274d9d4718e..dc473eaaadd 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 f8d8c2627fe..e5ef5567800 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 8d4fa98ef72..ef943518c77 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 da7c5d4af74..4408994ba8f 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 7c18a33193d..00000000000 --- 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 -+ Copyright (C) 2011, Filipe Coelho -+ -+ 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 -+ -+static JackAudioSystem *jasys = NULL; -+ -+class JackAudioInputRegistrar : public AudioInputRegistrar { -+ public: -+ JackAudioInputRegistrar(); -+ virtual AudioInput *create(); -+ virtual const QList 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 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 JackAudioInputRegistrar::getDeviceChoices() { -+ QList 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 JackAudioOutputRegistrar::getDeviceChoices() { -+ QList 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 -+ Copyright (C) 2011, Filipe Coelho -+ -+ 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 -+ -+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 qhInput; -+ QHash 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 29961e9077f..39ab0ee0efa 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/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix index b52320c9681..a5e8d85f128 100644 --- a/pkgs/applications/networking/p2p/soulseekqt/default.nix +++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix @@ -1,59 +1,57 @@ -{ stdenv, lib, fetchurl, mkDerivation +{ stdenv, lib, fetchzip, mkDerivation +, appimageTools , autoPatchelfHook -, dbus , desktop-file-utils -, fontconfig -, libjson -, pythonPackages +, imagemagick , qtmultimedia -, squashfsTools -, zlib }: mkDerivation rec { pname = "soulseekqt"; version = "2018-1-30"; + name="${pname}-${version}"; - src = fetchurl { - urls = [ - "https://www.dropbox.com/s/0vi87eef3ooh7iy/SoulseekQt-${version}.tgz" - "https://www.slsknet.org/SoulseekQt/Linux/SoulseekQt-${version}-64bit-appimage.tgz" - ]; - sha256 = "0d1cayxr1a4j19bc5a3qp9pg22ggzmd55b6f5av3lc6lvwqqg4w6"; - }; + src = fetchzip { + url = "https://www.slsknet.org/SoulseekQt/Linux/SoulseekQt-${version}-64bit-appimage.tgz"; + sha256 = "16ncnvv8h33f161mgy7qc0wjvvqahsbwvby65qhgfh9pbbgb4xgg"; + }; + + appextracted = appimageTools.extractType2 { + inherit name; + src="${src}/SoulseekQt-2018-1-30-64bit.AppImage"; + }; dontBuild = true; - - nativeBuildInputs = [ autoPatchelfHook pythonPackages.binwalk squashfsTools desktop-file-utils ]; + dontConfigure = true; + + nativeBuildInputs = [ imagemagick autoPatchelfHook desktop-file-utils ]; buildInputs = [ qtmultimedia stdenv.cc.cc ]; - # avoid usage of appimage's runner option --appimage-extract - unpackCmd = '' - export HOME=$(pwd) # workaround for binwalk - appimage=$(tar xvf $curSrc) && binwalk --quiet \ - $appimage -D 'squashfs:squashfs:unsquashfs %e' - ''; - - patchPhase = '' - cd squashfs-root/ - binary="$(readlink AppRun)" - - # fixup desktop file - desktop-file-edit --set-key Exec --set-value $binary default.desktop - desktop-file-edit --set-key Comment --set-value "${meta.description}" default.desktop - desktop-file-edit --set-key Categories --set-value Network default.desktop - ''; - installPhase = '' - mkdir -p $out/{bin,share/applications,share/icons/} - cp default.desktop $out/share/applications/$binary.desktop - cp soulseek.png $out/share/icons/ - cp $binary $out/bin/ - ''; + # directory in /nix/store so readonly + cd $appextracted + + binary="$(readlink AppRun)" + install -Dm755 $binary -t $out/bin + + # fixup and install desktop file + desktop-file-install --dir $out/share/applications \ + --set-key Exec --set-value $binary \ + --set-key Comment --set-value "${meta.description}" \ + --set-key Categories --set-value Network default.desktop + mv $out/share/applications/default.desktop $out/share/applications/SoulseekQt.desktop + + #TODO: write generic code to read icon path from $binary.desktop + icon="$(readlink .DirIcon)" + for size in 16 32 48 64 72 96 128 192 256 512 1024; do + mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps + convert -resize "$size"x"$size" $icon $out/share/icons/hicolor/"$size"x"$size"/apps/$icon + done + ''; meta = with lib; { description = "Official Qt SoulSeek client"; - homepage = http://www.soulseekqt.net; + homepage = https://www.slsknet.org; license = licenses.unfree; maintainers = [ maintainers.genesis ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index cada3f93f55..c29bd3a486c 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 9317ccab4ea..3e2b7cf67f2 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 a2b14443c1a..0b36b3266ef 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/fava/default.nix b/pkgs/applications/office/fava/default.nix index 6693d35dbd1..d62c6c0e4cc 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -5,11 +5,11 @@ let in buildPythonApplication rec { pname = "fava"; - version = "1.12"; + version = "1.13"; src = fetchPypi { inherit pname version; - sha256 = "0309y25l7aijk7il9hpjia23yc5dfac0h78xdmzb0w0ynxbjsmi6"; + sha256 = "1pjfa5xb2imhcf7q037h8g0bp9nrnj1xyblgqphnjnz6hbr58a59"; }; checkInputs = [ python3.pkgs.pytest ]; diff --git a/pkgs/applications/office/paperwork/backend.nix b/pkgs/applications/office/paperwork/backend.nix index 7f82780fbe9..c28a4bc916d 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 3506ea8b551..c3930115365 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/softmaker/freeoffice.nix b/pkgs/applications/office/softmaker/freeoffice.nix index ff54f8ff90f..b114194d563 100644 --- a/pkgs/applications/office/softmaker/freeoffice.nix +++ b/pkgs/applications/office/softmaker/freeoffice.nix @@ -2,13 +2,13 @@ callPackage ./generic.nix (args // rec { pname = "freeoffice"; - version = "973"; + version = "974"; edition = "2018"; suiteName = "FreeOffice"; src = fetchurl { url = "https://www.softmaker.net/down/softmaker-freeoffice-${version}-amd64.tgz"; - sha256 = "0xac4ynf1lfh8qmni5bhp4ybaamdfngva4bqaq21n1m4pgrx1ba5"; + sha256 = "0z7131qmqyv1m9phm7wzvb5z7wkh27h59lsa3zc0zjkykikmjrp2"; }; archive = "freeoffice${edition}.tar.lzma"; diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index ee494092884..3794a676d4c 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/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index f24cc014cdd..54530cb8dce 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "5.0.82"; + version = "5.0.83"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "02a9dlsdd7dh56dwvsjskr899bqi8ijcvzc71xcjwaik6rp8xw88"; + sha256 = "1abkwxdi154hnry8nsvxbklvbsnvd7cs2as0041h2kbiz824pv31"; }; buildInputs= [ wrapGAppsHook gsettings-desktop-schemas gtk3 gnome3.adwaita-icon-theme dconf ]; @@ -131,7 +131,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.zotero.org; + homepage = "https://www.zotero.org"; description = "Collect, organize, cite, and share your research sources"; license = licenses.agpl3; platforms = platforms.linux; diff --git a/pkgs/applications/radio/rtl-sdr/default.nix b/pkgs/applications/radio/rtl-sdr/default.nix index 4e9badaa6c5..69c568c3a1b 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/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix index 8ca42ab94ac..6c8615fd631 100644 --- a/pkgs/applications/radio/urh/default.nix +++ b/pkgs/applications/radio/urh/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "urh"; - version = "2.8.2"; + version = "2.8.3"; src = fetchFromGitHub { owner = "jopohl"; repo = pname; rev = "v${version}"; - sha256 = "0cypm602zl3s4qggmafj4c246h65qgzsj3bsimvc5zz7jspk6m77"; + sha256 = "17104livp6fv2zg56sqv90lqb7ywqhq2qfnal1hriwwh1b92glv8"; }; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 7163c201dbf..85f6ac42126 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/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix index 729aef4e21c..b7dc9571247 100644 --- a/pkgs/applications/science/logic/acgtk/default.nix +++ b/pkgs/applications/science/logic/acgtk/default.nix @@ -2,15 +2,16 @@ stdenv.mkDerivation { - name = "acgtk-1.5.0"; + pname = "acgtk"; + version = "1.5.1"; src = fetchurl { - url = http://calligramme.loria.fr/acg/software/acg-1.5.0-20181019.tar.gz; - sha256 = "14n003gxzw5w79hlpw1ja4nq97jqf9zqyg00ihvpxw4bv9jlm8jm"; + url = https://acg.loria.fr/software/acg-1.5.1-20191113.tar.gz; + sha256 = "17595qfwhzz5q091ak6i6bg5wlppbn8zfn58x3hmmmjvx2yfajn1"; }; buildInputs = [ dune ] ++ (with ocamlPackages; [ - ocaml findlib ansiterminal cairo2 fmt logs menhir mtime ocf + ocaml findlib ansiterminal cairo2 cmdliner fmt logs menhir mtime yojson ]); buildPhase = "dune build"; @@ -18,7 +19,7 @@ stdenv.mkDerivation { inherit (dune) installPhase; meta = with stdenv.lib; { - homepage = http://calligramme.loria.fr/acg/; + homepage = https://acg.loria.fr/; description = "A toolkit for developing ACG signatures and lexicon"; license = licenses.cecill20; inherit (ocamlPackages.ocaml.meta) platforms; diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index b77f5110521..ea3b0585099 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "elan"; - version = "0.7.5"; + version = "0.8.0"; src = fetchFromGitHub { owner = "kha"; repo = "elan"; rev = "v${version}"; - sha256 = "1147f3lzr6lgvf580ppspn20bdwnf6l8idh1h5ana0p0lf5a0dn1"; + sha256 = "0n2ncssjcmp3x5kbnci7xbq5fgcihlr3vaglyhhwzrxkjy2vpmpd"; }; - cargoSha256 = "0vja1cq6z7jlr4nzfdzn4gl8l31yld82zmgzwihnalif13q3fcps"; + cargoSha256 = "1pkg0n7kxckr0zhr8dr12b9fxg5q185kj3r9k2rmnkj2dpa2mxh3"; nativeBuildInputs = [ pkgconfig ]; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' pushd $out/bin mv elan-init elan - for link in lean leanpkg leanchecker; do + for link in lean leanpkg leanchecker leanc; do ln -s elan $link done popd diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index ae8b0ada806..ac65a72c94b 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/logic/potassco/clingcon.nix b/pkgs/applications/science/logic/potassco/clingcon.nix new file mode 100644 index 00000000000..1203822d86e --- /dev/null +++ b/pkgs/applications/science/logic/potassco/clingcon.nix @@ -0,0 +1,43 @@ +{ stdenv +, fetchFromGitHub +, cmake +, bison +, re2c +}: + +stdenv.mkDerivation rec { + pname = "clingcon"; + version = "3.3.0"; + + src = fetchFromGitHub { + owner = "potassco"; + repo = "${pname}"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "1q7517h10jfvjdk2czq8d6y57r8kr1j1jj2k2ip2qxkpyfigk4rs"; + }; + + # deal with clingcon through git submodules recursively importing + # an outdated version of libpotassco which uses deprecated header in .cpp files + postPatch = '' + find ./ -type f -exec sed -i 's///g' {} \; + ''; + + nativeBuildInputs = [ cmake bison re2c ]; + + cmakeFlags = [ + "-DCLINGCON_MANAGE_RPATH=ON" + "-DCLINGO_BUILD_WITH_PYTHON=OFF" + "-DCLINGO_BUILD_WITH_LUA=OFF" + ]; + + meta = { + inherit version; + description = "Extension of clingo to handle constraints over integers"; + license = stdenv.lib.licenses.gpl3; # for now GPL3, next version MIT! + platforms = stdenv.lib.platforms.unix; + homepage = "https://potassco.org/"; + downloadPage = "https://github.com/potassco/clingcon/releases/"; + changelog = "https://github.com/potassco/clingcon/releases/tag/v${version}"; + }; +} diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix index 7249eb991d3..d3ceeadbf9a 100644 --- a/pkgs/applications/science/logic/satallax/default.nix +++ b/pkgs/applications/science/logic/satallax/default.nix @@ -9,6 +9,11 @@ stdenv.mkDerivation rec { sha256 = "1kvxn8mc35igk4vigi5cp7w3wpxk2z3bgwllfm4n3h2jfs0vkpib"; }; + patches = [ + # GCC9 doesn't allow default value in friend declaration. + ./fix-declaration-gcc9.patch + ]; + preConfigure = '' mkdir fake-tools echo "echo 'Nix-build-host.localdomain'" > fake-tools/hostname diff --git a/pkgs/applications/science/logic/satallax/fix-declaration-gcc9.patch b/pkgs/applications/science/logic/satallax/fix-declaration-gcc9.patch new file mode 100644 index 00000000000..1933fc25c4d --- /dev/null +++ b/pkgs/applications/science/logic/satallax/fix-declaration-gcc9.patch @@ -0,0 +1,21 @@ +diff --git i/minisat/core/SolverTypes.h w/minisat/core/SolverTypes.h +--- i/minisat/core/SolverTypes.h ++++ w/minisat/core/SolverTypes.h +@@ -47,7 +47,7 @@ struct Lit { + int x; + + // Use this as a constructor: +- friend Lit mkLit(Var var, bool sign = false); ++ friend Lit mkLit(Var var, bool sign); + + bool operator == (Lit p) const { return x == p.x; } + bool operator != (Lit p) const { return x != p.x; } +@@ -55,7 +55,7 @@ struct Lit { + }; + + +-inline Lit mkLit (Var var, bool sign) { Lit p; p.x = var + var + (int)sign; return p; } ++inline Lit mkLit (Var var, bool sign = false) { Lit p; p.x = var + var + (int)sign; return p; } + inline Lit operator ~(Lit p) { Lit q; q.x = p.x ^ 1; return q; } + inline Lit operator ^(Lit p, bool b) { Lit q; q.x = p.x ^ (unsigned int)b; return q; } + inline bool sign (Lit p) { return p.x & 1; } diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index eeb3a6b6d36..e5764461819 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, stdenv +{ callPackage, fetchurl, fetchpatch, stdenv , ocamlPackages, coqPackages, rubber, hevea, emacs }: stdenv.mkDerivation { @@ -30,7 +30,13 @@ stdenv.mkDerivation { enableParallelBuilding = true; # Remove unnecessary call to which - patches = [ ./configure.patch ]; + patches = [ ./configure.patch + # Compatibility with js_of_ocaml 3.5 + (fetchpatch { + url = "https://gitlab.inria.fr/why3/why3/commit/269ab313382fe3e64ef224813937314748bf7cf0.diff"; + sha256 = "0i92wdnbh8pihvl93ac0ma1m5g95jgqqqj4kw6qqvbbjjqdgvzwa"; + }) + ]; configureFlags = [ "--enable-verbose-make" ]; diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index f613f94b9cc..3ee62fad44d 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 de84d35c2e8..bba26610a07 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 3ccd89cf2c1..0ac2ea7d1b3 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 89ae354e7c7..8f2f740f248 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 @@ -12,13 +13,22 @@ assert withThread -> libpthreadstubs != null; stdenv.mkDerivation rec { pname = "pari"; - version = "2.11.2"; + version = "2.11.3"; src = fetchurl { url = "https://pari.math.u-bordeaux.fr/pub/pari/unix/${pname}-${version}.tar.gz"; - sha256 = "0fck8ssmirl8fy7s4mspgrxjs5sag76xbshqlqzkcl3kqyrk4raa"; + 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/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 8370685f00a..c23debdd7a4 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "1zzvxkpman75lxhhvyggwzvrlc6v0rd5ak76rmcny51i4xirmrc0"; + sha256 = "0nsg6dzg5r7rzqr671nvrf1c50rjwpz7bxv5f20i4s7agizgv840"; }; patchPhase = '' @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The ultimate desktop calculator"; - homepage = http://qalculate.github.io; + homepage = "http://qalculate.github.io"; maintainers = with maintainers; [ gebner ]; platforms = platforms.all; }; diff --git a/pkgs/applications/science/math/sage/patches/docutils-0.15.patch b/pkgs/applications/science/math/sage/patches/docutils-0.15.patch new file mode 100644 index 00000000000..63f5d2e146d --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/docutils-0.15.patch @@ -0,0 +1,24 @@ +diff --git a/src/sage/misc/sphinxify.py b/src/sage/misc/sphinxify.py +index 4849c2bffa..76b7bc8602 100644 +--- a/src/sage/misc/sphinxify.py ++++ b/src/sage/misc/sphinxify.py +@@ -25,6 +25,7 @@ from __future__ import absolute_import, print_function + import os + import re + import shutil ++import warnings + from tempfile import mkdtemp + from sphinx.application import Sphinx + +@@ -120,7 +121,10 @@ smart_quotes = no""") + # buildername, confoverrides, status, warning, freshenv). + sphinx_app = Sphinx(srcdir, confdir, outdir, doctreedir, format, + confoverrides, None, None, True) +- sphinx_app.build(None, [rst_name]) ++ with warnings.catch_warnings(): ++ # Quick and dirty workaround for https://trac.sagemath.org/ticket/28856#comment:19 ++ warnings.simplefilter("ignore") ++ sphinx_app.build(None, [rst_name]) + sys.path = old_sys_path + + # We need to remove "_" from __builtin__ that the gettext module installs diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 4530cbf69f4..cd465a8c413 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -52,6 +52,11 @@ stdenv.mkDerivation rec { # Parallelize docubuild using subprocesses, fixing an isolation issue. See # https://groups.google.com/forum/#!topic/sage-packaging/YGOm8tkADrE ./patches/sphinx-docbuild-subprocesses.patch + + # Fix doctest failures with docutils 0.15: + # https://nix-cache.s3.amazonaws.com/log/dzmzrb2zvardsmpy7idg7djkizmkzdhs-sage-tests-8.9.drv + # https://trac.sagemath.org/ticket/28856#comment:19 + ./patches/docutils-0.15.patch ]; # Since sage unfortunately does not release bugfix releases, packagers must @@ -125,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/math/symmetrica/default.nix b/pkgs/applications/science/math/symmetrica/default.nix index 18daabb9e7e..b363137fb99 100644 --- a/pkgs/applications/science/math/symmetrica/default.nix +++ b/pkgs/applications/science/math/symmetrica/default.nix @@ -1,62 +1,36 @@ { stdenv -, fetchurl +, lib +, fetchFromGitLab , fetchpatch +, autoreconfHook }: stdenv.mkDerivation rec { pname = "symmetrica"; - version = "2.0"; + version = "3.0.1"; - src = fetchurl { - url = "http://www.algorithm.uni-bayreuth.de/en/research/SYMMETRICA/SYM2_0_tar.gz"; - sha256 = "1qhfrbd5ybb0sinl9pad64rscr08qvlfzrzmi4p4hk61xn6phlmz"; - name = "symmetrica-2.0.tar.gz"; + # Fork of the original symmetrica, which can be found here + # http://www.algorithm.uni-bayreuth.de/en/research/SYMMETRICA/index.html + # "This fork was created to modernize the codebase, and to resume making + # releases with the fixes that have accrued over the years." + # Also see https://trac.sagemath.org/ticket/29061#comment:3. + src = fetchFromGitLab { + owner = "sagemath"; + repo = "symmetrica"; + rev = version; + sha256 = "0wfmrzw82f5i91d7rf24mcdqcj2fmgrgy02pw4pliz7ncwaq14w3"; }; - sourceRoot = "."; - - patches = [ - # don't show banner ("SYMMETRICA VERSION X - STARTING) - # it doesn't contain very much helpful information and a banner is not ideal for a library - (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/symmetrica/patches/de.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "0df0vqixcfpzny6dkhyj87h8aznz3xn3zfwwlj8pd10bpb90k6gb"; - }) - - # use int32_t and uint32_t for type INT - # see https://trac.sagemath.org/ticket/13413 - (fetchpatch { - name = "fix_64bit_integer_overflow.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/symmetrica/patches/int32.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "0p33c85ck4kd453z687ni4bdcqr1pqx2756j7aq11bf63vjz4cyz"; - }) - - (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/symmetrica/patches/return_values.patch?id=1615f58890e8f9881c4228c78a6b39b9aab1303a"; - sha256 = "0dmczkicwl50sivc07w3wm3jpfk78wm576dr25999jdj2ipsb7nk"; - }) + nativeBuildInputs = [ + autoreconfHook ]; - postPatch = '' - substituteInPlace makefile --replace gcc cc - ''; - enableParallelBuilding = true; - installPhase = '' - mkdir -p "$out"/{lib,share/doc/symmetrica,include/symmetrica} - ar crs libsymmetrica.a *.o - ranlib libsymmetrica.a - cp libsymmetrica.a "$out/lib" - cp *.h "$out/include/symmetrica" - cp README *.doc "$out/share/doc/symmetrica" - ''; - - meta = { - inherit version; + meta = with lib; { description = ''A collection of routines for representation theory and combinatorics''; - license = stdenv.lib.licenses.publicDomain; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; - homepage = http://www.algorithm.uni-bayreuth.de/en/research/SYMMETRICA/index.html; + license = licenses.isc; + maintainers = with maintainers; [raskin timokau]; + platforms = platforms.unix; + homepage = "https://gitlab.com/sagemath/symmetrica"; }; } diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 406d74c4cd3..4d6e4bea34e 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "wxmaxima"; - version = "19.03.0"; + version = "20.02.4"; src = fetchFromGitHub { - owner = "andrejv"; + owner = "wxMaxima-developers"; repo = "wxmaxima"; rev = "Version-${version}"; - sha256 = "0s7bdykc77slqix28cyaa6x8wvxrn8461mkdgxflvi2apwsl56aa"; + sha256 = "106a7jrjwfmymzj70nsv44fm3jbxngr8pmkaghhpwy0ln38lhf54"; }; buildInputs = [ wxGTK maxima gnome3.adwaita-icon-theme ]; @@ -21,12 +21,10 @@ stdenv.mkDerivation rec { gappsWrapperArgs+=(--prefix PATH ":" ${maxima}/bin) ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Cross platform GUI for the computer algebra system Maxima"; license = licenses.gpl2; - homepage = https://wxmaxima-developers.github.io/wxmaxima/; + homepage = "https://wxmaxima-developers.github.io/wxmaxima/"; platforms = platforms.linux; maintainers = [ maintainers.peti ]; }; diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix index 4c759308a5c..1bb74ec17a3 100644 --- a/pkgs/applications/science/misc/rink/default.nix +++ b/pkgs/applications/science/misc/rink/default.nix @@ -10,12 +10,11 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; sha256 = "0vl996y58a9b62d8sqrpfn2h8qkya7qbg5zqsmy7nxhph1vhbspj"; }; + + # Upstreamed in https://github.com/tiffany352/rink-rs/pull/53 cargoPatches = [ ./cargo-lock.patch ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0q2g1hkqyzq9lsas4fhsbpk3jn5hikchh6i1jf9c08ca2xm136c2"; + cargoSha256 = "0shlh0m9k0iqxpv9zmiw7a6v197swrvpz9x6qzhximzkdwni9gz9"; buildInputs = [ pkgconfig ]; propagatedBuildInputs = [ openssl gmp ncurses ]; diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index cbf7f4db8c4..c17ffb00118 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/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index 946cc112586..a7dffd0bfab 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -8,31 +8,18 @@ buildPythonApplication rec { pname = "glances"; - version = "3.1.3"; + version = "3.1.4"; disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "v${version}"; - sha256 = "15yz8sbw3k3n0729g2zcwsxc5iyhkyrhqza6fnipxxpsskwgqbwp"; + sha256 = "1lr186rc3fvldy2m2yx1hxzdlxll93pjabs01sxz48kkpsvbiydi"; }; # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply): - patches = lib.optional (doCheck && stdenv.isLinux) ./skip-failing-tests.patch - ++ [ - (fetchpatch { - # Correct unitest - url = "https://github.com/nicolargo/glances/commit/abf64ffde31113f5f46ef286703ff061fc57395f.patch"; - sha256 = "00krahqq89jvbgrqx2359cndmvq5maffhpj163z10s1n7q80kxp1"; - }) - - (fetchpatch { - # Fix IP plugin initialization issue - url = "https://github.com/nicolargo/glances/commit/48cb5ef8053d823302e7e53490fb22cec2fabb0f.patch"; - sha256 = "1590qgcr8w3d9ddpgd9mk5j6q6aq29341vr8bi202yjwwiv2bia9"; - }) - ]; + patches = lib.optional (doCheck && stdenv.isLinux) ./skip-failing-tests.patch; # On Darwin this package segfaults due to mismatch of pure and impure # CoreFoundation. This issues was solved for binaries but for interpreted @@ -64,6 +51,7 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://nicolargo.github.io/glances/"; description = "Cross-platform curses-based monitoring tool"; + changelog = "https://github.com/nicolargo/glances/releases/tag/v${version}"; license = licenses.lgpl3; maintainers = with maintainers; [ jonringer primeos koral ]; }; diff --git a/pkgs/applications/system/glances/skip-failing-tests.patch b/pkgs/applications/system/glances/skip-failing-tests.patch index e3116af6a2c..f47f1218aea 100644 --- a/pkgs/applications/system/glances/skip-failing-tests.patch +++ b/pkgs/applications/system/glances/skip-failing-tests.patch @@ -50,11 +50,3 @@ diff --git a/unitest.py b/unitest.py def test_006_swap(self): """Check MEMSWAP plugin.""" stats_to_check = ['used', 'free', 'total'] -@@ -191,6 +196,7 @@ class TestGlances(unittest.TestCase): - self.assertTrue(type(stats_grab) is list, msg='Folders stats is not a list') - print('INFO: Folders stats: %s' % stats_grab) - -+ @unittest.skip("Fails on NixOS (TODO)") - def test_012_ip(self): - """Check IP plugin.""" - print('INFO: [TEST_012] Check IP stats') diff --git a/pkgs/applications/version-management/cvsq/default.nix b/pkgs/applications/version-management/cvsq/default.nix index f9cabb94b97..c030d8b0878 100644 --- a/pkgs/applications/version-management/cvsq/default.nix +++ b/pkgs/applications/version-management/cvsq/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "cvsq"; - version = "1.10"; + version = "1.11"; src = fetchurl { url = "http://www.linta.de/~aehlig/cvsq/cvsq-${version}.tgz"; - sha256 = "1a2e5666d4d23f1eb673a505caeb771ac62a86ed69c9ab89c4e2696c2ccd0621"; + sha256 = "0491k4skk3jyyd6plp2kcihmxxav9rsch7vd1yi697m2fqckp5ws"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index a7008bf44b3..8df8d96e641 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -70,6 +70,8 @@ let git-codeowners = callPackage ./git-codeowners { }; + git-codereview = callPackage ./git-codereview { }; + git-cola = callPackage ./git-cola { }; git-crypt = callPackage ./git-crypt { }; @@ -138,6 +140,10 @@ let git-test = callPackage ./git-test { }; + git-trim = callPackage ./git-trim { + inherit (darwin.apple_sdk.frameworks) Security; + }; + git-workspace = callPackage ./git-workspace { inherit (darwin.apple_sdk.frameworks) Security; }; diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix index fa3970c4b15..ed0c8680d75 100644 --- a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix @@ -1,18 +1,20 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "git-bug"; - version = "0.6.0"; - rev = "fc568209f073b9d775a09e0dbb8289cf9e5749bf"; + version = "0.7.0"; + rev = "71580c41a931a1ad2c04682e0fd701661b716c95"; goPackagePath = "github.com/MichaelMure/git-bug"; src = fetchFromGitHub { inherit rev; owner = "MichaelMure"; repo = "git-bug"; - sha256 = "1s18lzip52qpf52ad6m20j306mr16vnwhz9f7rirsa6b7srmcgli"; + sha256 = "0mhqvcwa6y3hrrv88vbp22k7swzr8xw6ipm80gdpx85yp8j2wdkh"; }; + modSha256 = "1cfn49cijiarzzczrpd28x1k7ib98xyzlvn3zghwk2ngfgiah3ld"; + buildFlagsArray = '' -ldflags= -X ${goPackagePath}/commands.GitCommit=${rev} @@ -21,10 +23,9 @@ buildGoPackage rec { ''; postInstall = '' - cd go/src/${goPackagePath} - install -D -m 0644 misc/bash_completion/git-bug "$bin/etc/bash_completion.d/git-bug" - install -D -m 0644 misc/zsh_completion/git-bug "$bin/share/zsh/site-functions/git-bug" - install -D -m 0644 -t "$bin/share/man/man1" doc/man/* + install -D -m 0644 misc/bash_completion/git-bug "$out/etc/bash_completion.d/git-bug" + install -D -m 0644 misc/zsh_completion/git-bug "$out/share/zsh/site-functions/git-bug" + install -D -m 0644 -t "$out/share/man/man1" doc/man/* ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/git-and-tools/git-codereview/default.nix b/pkgs/applications/version-management/git-and-tools/git-codereview/default.nix new file mode 100644 index 00000000000..90281407848 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-codereview/default.nix @@ -0,0 +1,21 @@ +{ lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage { + pname = "git-codereview"; + version = "2020-01-15"; + goPackagePath = "golang.org/x/review"; + + src = fetchFromGitHub { + owner = "golang"; + repo = "review"; + rev = "f51a73253c4da005cfdf18a036e11185c04c8ce3"; + sha256 = "0c4vsyy5zp7pngqn4q87xipndghxyw2x57dkv1kxnrffckx1s3pc"; + }; + + meta = with lib; { + description = "Manage the code review process for Git changes using a Gerrit server"; + homepage = "https://golang.org/x/review/git-codereview"; + license = licenses.bsd3; + maintainers = [ maintainers.edef ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix index 571125ee113..9ec4e253042 100644 --- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix @@ -26,10 +26,7 @@ buildRustPackage rec { sha256 = "1sx6sc2dj3l61gbiqz8vfyhw5w4xjdyfzn1ixz0y8ipm579yc7a2"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "10852131aizfw9j1yl4gz180h4gd8y5ymx3wmf5v9cmqiqxy8bgy"; + cargoSha256 = "1wjbwd3scx71l2fpxgvgwaw05lkpw13rm6d2i1x5crhs7py96ky6"; nativeBuildInputs = [ cmake @@ -51,6 +48,10 @@ buildRustPackage rec { meta = with stdenv.lib; { inherit (src.meta) homepage; description = "Decentralized Issue Tracking for git"; + # This has not had a release in years and its cargo vendored dependencies + # fail to compile. It also depends on an unsupported openssl: + # https://github.com/NixOS/nixpkgs/issues/77503 + broken = true; license = licenses.gpl2; maintainers = with maintainers; [ Profpatsch matthiasbeyer ]; }; 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 c7488e84d5d..ceb734f0f67 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/git-trim/default.nix b/pkgs/applications/version-management/git-and-tools/git-trim/default.nix new file mode 100644 index 00000000000..ab558ec42d9 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-trim/default.nix @@ -0,0 +1,33 @@ +{ stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, libiconv, Security }: + +rustPlatform.buildRustPackage rec { + pname = "git-trim"; + version = "0.2.4"; + + src = fetchFromGitHub { + owner = "foriequal0"; + repo = pname; + rev = "v${version}"; + sha256 = "0gfmv9bwhh6bv0s9kfbxq9wsvrk3zz3ibavbpp9l8cpqc3145pqy"; + }; + + cargoSha256 = "0xklczk4vbh2mqf76r3rsfyclyza9imf6yss7vbkm9w4ir3ar9f3"; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + + postInstall = '' + install -Dm644 docs/git-trim.md.1 $out/share/man/man1/git-trim.1 + ''; + + # fails with sandbox + doCheck = false; + + meta = with stdenv.lib; { + description = "Automatically trims your branches whose tracking remote refs are merged or gone"; + homepage = "https://github.com/foriequal0/git-trim"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix index ee4cc61c63f..57caada72b5 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "gitstatus"; - version = "unstable-2020-02-26"; + version = "unstable-2020-03-06"; src = fetchFromGitHub { owner = "romkatv"; repo = "gitstatus"; - rev = "c0e5a24299c1a1a71434dac1de6ea650e80fbe49"; - sha256 = "0fj84cvr5a895jqgg86raakx6lqyyhahf1dgzgx05y2gfvnxxh8m"; + rev = "c07996bc3ea1912652f52a816b830a5a3ee9b49c"; + sha256 = "07s8hwx3i5mnafi2xfim44z3q2nsvlcibfdxj17w8mkjhfpywi00"; }; buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation { sed -i "1i GITSTATUS_DAEMON=$out/bin/gitstatusd" gitstatus.plugin.zsh ''; installPhase = '' - install -Dm755 gitstatusd $out/bin/gitstatusd + install -Dm755 usrbin/gitstatusd $out/bin/gitstatusd install -Dm444 gitstatus.plugin.zsh $out ''; 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 1279e5dd6c9..e4cd58bf0f0 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 ++ [ - "-DUSE_BUNDLED_ZLIB=ON" - "-DUSE_ICONV=OFF" "-DBUILD_CLAR=OFF" - "-DUSE_SSH=OFF" - "-DUSE_HTTPS=OFF" "-DBUILD_SHARED_LIBS=OFF" - "-DUSE_EXT_HTTP_PARSER=OFF" + "-DREGEX_BACKEND=builtin" + "-DUSE_BUNDLED_ZLIB=ON" + "-DUSE_HTTPS=OFF" + "-DUSE_HTTP_PARSER=builtin" # overwritten from libgit2 + "-DUSE_ICONV=OFF" + "-DUSE_SSH=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 1b67b933cb1..f868c6b3c8f 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 04ba4c7c48f..9fc89d520ae 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 3a354133e87..d356991815e 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 2772ef5b6f4..ddad51dfb63 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,11 +1,11 @@ { - "version": "12.8.2", - "repo_hash": "1d27s61kglryr5pashwfq55z7fh16fxkx1m4gc82xihwfzarf4x9", + "version": "12.8.6", + "repo_hash": "0plcigppmg6ckmq8myj3m9adshdvqj7czx8fms71bsa9zx060wib", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v12.8.2-ee", + "rev": "v12.8.6-ee", "passthru": { - "GITALY_SERVER_VERSION": "12.8.2", + "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 af97873463e..9b3e4da2024 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.2"; + version = "12.8.6"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "1zc44y5yl799vqg12w3iaivk4xwj9i4k6f198svplipa760nl9ic"; + sha256 = "1rf9qmyjllkwkyi7la1dzyjh0z9sw21zdzihd7v9ngwqssfk5zfk"; }; # Fix a check which assumes that hook files are writeable by their diff --git a/pkgs/applications/version-management/gitlab/gitaly/deps.nix b/pkgs/applications/version-management/gitlab/gitaly/deps.nix index 5ab063d1dea..83a2f0f5f74 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/deps.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/deps.nix @@ -1319,8 +1319,8 @@ fetch = { type = "git"; url = "https://github.com/ugorji/go"; - rev = "d75b2dcb6bc8"; - sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps"; + rev = "v1.1.4"; + sha256 = "0ma2qvn5wqvjidpdz74x832a813qnr1cxbx6n6n125ak9b3wbn5w"; }; } { diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index dc2d1e29719..a2a3a6d05b7 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/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix index 797bc782496..6668631ca9a 100644 --- a/pkgs/applications/version-management/nbstripout/default.nix +++ b/pkgs/applications/version-management/nbstripout/default.nix @@ -2,7 +2,7 @@ with python.pkgs; buildPythonApplication rec { - version = "0.3.6"; + version = "0.3.7"; pname = "nbstripout"; # Mercurial should be added as a build input but because it's a Python @@ -14,7 +14,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "1x6010akw7iqxn7ba5m6malfr2fvaf0bjp3cdh983qn1s7vwlq0r"; + sha256 = "13w2zhw8vrfv6637bw5ygygj1dky55fvvncz11hq0abwkkzb3wb2"; }; # for some reason, darwin uses /bin/sh echo native instead of echo binary, so diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix index 0a1f4c72da6..aa2cdfab82a 100644 --- a/pkgs/applications/version-management/sit/default.nix +++ b/pkgs/applications/version-management/sit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, cmake, libzip, gnupg, +{ stdenv, fetchFromGitHub, rustPlatform, cmake, libzip, gnupg, # Darwin libiconv, CoreFoundation, Security }: @@ -20,10 +20,7 @@ rustPlatform.buildRustPackage rec { export HOME=$(mktemp -d) ''; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0kijx7s7zh6yisrsjz213h9x5jx43ixr44vy5rb3wwbn9dgsr528"; + cargoSha256 = "092yfpr2svp1qy7xis1q0sdkbsjmmswmdwb0rklrc0yhydcsghp9"; meta = with stdenv.lib; { description = "Serverless Information Tracker"; @@ -31,5 +28,8 @@ rustPlatform.buildRustPackage rec { license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ dywedir yrashk ]; platforms = platforms.all; + # Upstream has not had a release in several years, and dependencies no + # longer compile with the latest Rust compiler. + broken = true; }; } diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index c0075d50672..34e0d33bcbc 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -5,10 +5,10 @@ mkDerivation rec { pname = "clipgrab"; - version = "3.8.7"; + version = "3.8.11"; src = fetchurl { - sha256 = "1mjkq487w168537qzw4pd010lp25vm1s2zji6cykcaa2cxcd6p7p"; + sha256 = "0jpfdmyzjasq4x1xvk7b1cmhhq6fz6ydvvbwz2wclph367x496xk"; # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz! url = "https://download.clipgrab.org/${pname}-${version}.tar.gz"; }; @@ -49,7 +49,7 @@ mkDerivation rec { Dailymotion and many other online video sites. It converts downloaded videos to MPEG4, MP3 or other formats in just one easy step. ''; - homepage = https://clipgrab.org/; + homepage = "https://clipgrab.org/"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/pkgs/applications/video/jellyfin-mpv-shim/default.nix new file mode 100644 index 00000000000..7842c48a78a --- /dev/null +++ b/pkgs/applications/video/jellyfin-mpv-shim/default.nix @@ -0,0 +1,49 @@ +{ stdenv, buildPythonApplication, fetchFromGitHub, fetchurl +, mpv, python-mpv-jsonipc, jellyfin-apiclient-python +, pillow, tkinter, pystray, jinja2, pywebview }: + +buildPythonApplication rec { + pname = "jellyfin-mpv-shim"; + version = "1.4.1"; + + src = fetchFromGitHub { + owner = "iwalton3"; + repo = pname; + rev = "v${version}"; + sha256 = "195vplq4182pq62sn6ci0a8p57k6zv8pk1gmifmwdv69wzaph043"; + fetchSubmodules = true; # needed for display_mirror css file + }; + + # override $HOME directory: + # error: [Errno 13] Permission denied: '/homeless-shelter' + # + # remove jellyfin_mpv_shim/win_utils.py: + # ModuleNotFoundError: No module named 'win32gui' + preCheck = '' + export HOME=$TMPDIR + + rm jellyfin_mpv_shim/win_utils.py + ''; + + propagatedBuildInputs = [ + jellyfin-apiclient-python + mpv + pillow + python-mpv-jsonipc + + # gui dependencies + pystray + tkinter + + # display_mirror dependencies + jinja2 + pywebview + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/iwalton3/jellyfin-mpv-shim"; + description = "Allows casting of videos to MPV via the jellyfin mobile and web app."; + license = licenses.gpl3; + maintainers = with maintainers; [ jojosch ]; + }; +} diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 7ccf0e24762..c5eafe94c78 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -13,13 +13,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "43.0.0"; + version = "44.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "0ra9kgvhh5yhbr0hsia1va5lw45zr4kdwcdjhas5ljjyj75mlyxc"; + sha256 = "072sw51svaizqi9f6kscic23wxcjarwgb7nv52yd5si5w8s0qh9r"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 9e9e6657291..6075a7bb219 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -4,13 +4,13 @@ with lib; buildGoPackage rec { pname = "containerd"; - version = "1.2.6"; + version = "1.2.13"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "0sp5mn5wd3xma4svm6hf67hyhiixzkzz6ijhyjkwdrc4alk81357"; + sha256 = "1rac3iak3jpz57yarxc72bxgxvravwrl0j6s6w2nxrmh2m3kxqzn"; }; goPackagePath = "github.com/containerd/containerd"; diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index 091ea0fa1c5..28614efa7f3 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -53,10 +53,7 @@ in ./default-seccomp-policy-dir.diff ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1d7y07wkliy5qnlyx5zj6ni39avhs3s48sqgvwxm5g5zrahg2a85"; + cargoSha256 = "1s9nfgfqk140hg08i0xzylnrgrx84dqss0vnvhxnydwy9q03nk7r"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index c82e29eb9a6..35b88d7e447 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -33,13 +33,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "0.12.2.1"; + version = "0.13"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "16hjkkr1fp542ycyp87pj626mzfrza5mcb82hhkp4a8m8bqmpzp4"; + sha256 = "0c5acf916yv2zv3xjvxk1sa4h3n2wljc5hw61php7q37pbjc1ppn"; fetchSubmodules = true; }; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A fast and lightweight fully featured OCI runtime and C library for running containers"; - license = licenses.gpl3; + license = licenses.gpl2Plus; platforms = platforms.linux; inherit (src.meta) homepage; }; diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix index 8e0bd8e54ed..6b4db2d5f0c 100644 --- a/pkgs/applications/virtualization/docker-slim/default.nix +++ b/pkgs/applications/virtualization/docker-slim/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "docker-slim"; - version = "1.27.0"; + version = "1.28.1"; goPackagePath = "github.com/docker-slim/docker-slim"; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "docker-slim"; repo = "docker-slim"; rev = version; - sha256 = "1pd9sz981qgr5lx6ikrhdp0n21nyrnpjpnyl8i4r2jx35zr8b5q8"; + sha256 = "13lws9vgzq3chlqxc8aggz3i5kmir3vld2af0fx15kvcb9kpd79a"; }; subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ]; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index e4093ea87e7..7f7b3a227e8 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/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index f4a81068781..7e557842bc8 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "podman"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "containers"; repo = "libpod"; rev = "v${version}"; - sha256 = "1rbapks11xg0vgl9m322mijirx0wm6c4yav8aw2y41wsr7qd7db4"; + sha256 = "047nji6vbrdb1pm8ymxz4dv07xdnp5c624bq2cfy58m5l4f1dn75"; }; goPackagePath = "github.com/containers/libpod"; @@ -38,7 +38,7 @@ buildGoPackage rec { ''; meta = with stdenv.lib; { - homepage = https://podman.io/; + homepage = "https://podman.io/"; description = "A program for managing pods, containers and container images"; license = licenses.asl20; maintainers = with maintainers; [ vdemeester saschagrunert marsam ]; diff --git a/pkgs/applications/virtualization/railcar/default.nix b/pkgs/applications/virtualization/railcar/default.nix index 8dd3c270b23..7b56da0f7bc 100644 --- a/pkgs/applications/virtualization/railcar/default.nix +++ b/pkgs/applications/virtualization/railcar/default.nix @@ -11,15 +11,11 @@ rustPlatform.buildRustPackage rec { sha256 = "09zn160qxd7760ii6rs5nhr00qmaz49x1plclscznxh9hinyjyh9"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1k4y37x783fsd8li17k56vlx5ziwmrz167a0w5mcb9sgyd2kc19a"; - - buildInputs = [ libseccomp ]; - # Submitted upstream https://github.com/oracle/railcar/pull/44 cargoPatches = [ ./cargo-lock.patch ]; + cargoSha256 = "10qxkxpdprl2rcgy52s3q5gyg3i75qmx68rpl7cx1bgjzppfn9c3"; + + buildInputs = [ libseccomp ]; meta = with lib; { description = "Rust implementation of the Open Containers Initiative oci-runtime"; diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index fd0bd92faa6..bacd175197d 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -69,5 +69,10 @@ in stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ ragge steveej ]; platforms = [ "x86_64-linux" ]; + knownVulnerabilities = [ + "CVE-2019-10144: processes run with `rkt enter` are given all capabilities during stage 2" + "CVE-2019-10145: processes run with `rkt enter` do not have seccomp filtering during stage 2" + "CVE-2019-10147: processes run with `rkt enter` are not limited by cgroups during stage 2" + ]; }; } diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 6c15b2ea2ce..5d3044bdbc7 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 00000000000..174bb8d9e70 --- /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 690b72f3eeb..fdb393a94eb 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 "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/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index 9507ada4011..69337976f88 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -21,10 +21,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0l6x59bzzilc78gsi5rlgq9zjvp8qjphfsds776ljzmkbdq8q4iz"; + cargoSha256 = "0xybd6110b29ghl66kxfs64704qlhnn9jb5vl7lfk9sv62cs564i"; postInstall = lib.optionalString (bins != []) '' wrapProgram $out/bin/dwm-status --prefix "PATH" : "${stdenv.lib.makeBinPath bins}" diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index 7895d8c124a..062a8c4b8d8 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/applications/window-managers/i3/wmfocus.nix b/pkgs/applications/window-managers/i3/wmfocus.nix index 677108e2163..c4e22546d1c 100644 --- a/pkgs/applications/window-managers/i3/wmfocus.nix +++ b/pkgs/applications/window-managers/i3/wmfocus.nix @@ -1,21 +1,18 @@ -{ stdenv, fetchFromGitHub, rustPlatform, - xorg, python3, pkgconfig, cairo, libxkbcommon }: +{ stdenv, fetchFromGitHub, rustPlatform +, xorg, python3, pkgconfig, cairo, libxkbcommon }: rustPlatform.buildRustPackage rec { pname = "wmfocus"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "svenstaro"; repo = pname; rev = version; - sha256 = "0jx0h2zyghs3bp4sg8f3vk5rkyprz2dqfqs0v72vmkp3cvgzxbvs"; + sha256 = "17qdsqp9072yr7rcm6g1h620rff95ldawr8ldpkbjmkh0rc86skn"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1xmc28ns59jcmnv17102s2084baxqdvi0ibbyqwb108385qnixzf"; + cargoSha256 = "1nsdvzrsgprwq7lsvfpymqslhggdzfk3840y8x92qjb0l2g4jhw1"; nativeBuildInputs = [ python3 pkgconfig ]; buildInputs = [ cairo libxkbcommon xorg.xcbutilkeysyms ]; @@ -27,9 +24,9 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Visually focus windows by label"; + homepage = "https://github.com/svenstaro/wmfocus"; + license = licenses.mit; maintainers = with maintainers; [ synthetica ]; platforms = platforms.linux; - license = licenses.mit; - homepage = https://github.com/svenstaro/wmfocus; }; } diff --git a/pkgs/applications/window-managers/leftwm/cargo-lock.patch b/pkgs/applications/window-managers/leftwm/cargo-lock.patch deleted file mode 100644 index 54b7e47cc07..00000000000 --- a/pkgs/applications/window-managers/leftwm/cargo-lock.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 915ab04..3d5956d 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -370,7 +370,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - - [[package]] - name = "leftwm" --version = "0.1.9" -+version = "0.1.10" - dependencies = [ - "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix index 25a219c2be4..ade3904b95c 100644 --- a/pkgs/applications/window-managers/leftwm/default.nix +++ b/pkgs/applications/window-managers/leftwm/default.nix @@ -1,41 +1,35 @@ { stdenv, fetchFromGitHub, rustPlatform, libX11, libXinerama, makeWrapper }: -let +let rpath = stdenv.lib.makeLibraryPath [ libXinerama libX11 ]; in rustPlatform.buildRustPackage rec { - pname = "leftwm"; - version = "0.1.10"; + pname = "leftwm"; + version = "0.2.2"; - src = fetchFromGitHub { - owner = "leftwm"; - repo = "leftwm"; - rev = version; - sha256 = "190lc48clkh9vzlsfg2a70w405k7xyyw7avnxwna1glfwmbyy2ag"; - }; + src = fetchFromGitHub { + owner = "leftwm"; + repo = "leftwm"; + rev = version; + sha256 = "0x8cqc7zay19jxy7cshayjjwwjrcblqpmqrxipm2g5hhyjghk6q0"; + }; - buildInputs = [ makeWrapper libX11 libXinerama ]; + cargoSha256 = "1kphv3vnr8ij7raf0niwz3rwly986xi5fgwqg2ya0r46ifqkgvrc"; - postInstall = '' - wrapProgram $out/bin/leftwm --prefix LD_LIBRARY_PATH : "${rpath}" - wrapProgram $out/bin/leftwm-state --prefix LD_LIBRARY_PATH : "${rpath}" - wrapProgram $out/bin/leftwm-worker --prefix LD_LIBRARY_PATH : "${rpath}" - ''; + buildInputs = [ makeWrapper libX11 libXinerama ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; + postInstall = '' + wrapProgram $out/bin/leftwm --prefix LD_LIBRARY_PATH : "${rpath}" + wrapProgram $out/bin/leftwm-state --prefix LD_LIBRARY_PATH : "${rpath}" + wrapProgram $out/bin/leftwm-worker --prefix LD_LIBRARY_PATH : "${rpath}" + ''; - cargoSha256 = "0mpvfix7bvc84vanha474l4gaq97ac1zy5l77z83m9jg0246yxd6"; - - # patch wrong version in Cargo.lock - cargoPatches = [ ./cargo-lock.patch ]; - - meta = { - description = "Leftwm - A tiling window manager for the adventurer"; - homepage = https://github.com/leftwm/leftwm; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ mschneider ]; - }; + meta = with stdenv.lib; { + description = "Leftwm - A tiling window manager for the adventurer"; + homepage = "https://github.com/leftwm/leftwm"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ mschneider ]; + }; } diff --git a/pkgs/build-support/appimage/appimage-exec.sh b/pkgs/build-support/appimage/appimage-exec.sh new file mode 100755 index 00000000000..1273effe5fe --- /dev/null +++ b/pkgs/build-support/appimage/appimage-exec.sh @@ -0,0 +1,142 @@ +#!@shell@ +if [ -n "$DEBUG" ] ; then + set -x +fi + +PATH="@path@:$PATH" +apprun_opt=true + +#DEBUG=0 + +# src : AppImage +# dest : let's unpack() create the directory +unpack() { + local src=$1 + local out=$2 + local appimageSignature="" + local appimageType=0 + + # https://github.com/AppImage/libappimage/blob/ca8d4b53bed5cbc0f3d0398e30806e0d3adeaaab/src/libappimage/utils/MagicBytesChecker.cpp#L45-L63 + eval "$(r2 "$src" -nn -Nqc "p8j 3 @ 8" | + jq -r '{appimageSignature: (.[:-1]|implode), appimageType: .[-1]}| + @sh "appimageSignature=\(.appimageSignature) appimageType=\(.appimageType)"')" + + # check AppImage signature + if [[ "$appimageSignature" != "AI" ]]; then + echo "Not an appimage." + exit + fi + + case "$appimageType" in + 1 ) echo "Uncompress $(basename "$src") of type $appimageType." + mkdir "$out" + pv "$src" | bsdtar -x -C "$out" -f - + ;; + 2) + # This method avoid issues with non executable appimages, + # non-native packer, packer patching and squashfs-root destination prefix. + + # multiarch offset one-liner using same method as AppImage + # see https://gist.github.com/probonopd/a490ba3401b5ef7b881d5e603fa20c93 + offset=$(r2 "$src" -nn -Nqc "pfj.elf_header @ 0" |\ + jq 'map({(.name): .value}) | add | .shoff + (.shnum * .shentsize)') + + echo "Uncompress $(basename "$src") of type $appimageType @ offset $offset." + unsquashfs -q -d "$out" -o "$offset" "$src" + chmod go-w "$out" + ;; + + # 3) get ready, https://github.com/TheAssassin/type3-runtime + *) echo Unsupported AppImage Type: "$appimageType" + exit + ;; + esac + echo "$(basename "$src") is now installed in $out" +} + +apprun() { + + eval "$(rahash2 "$APPIMAGE" -j | jq -r '.[] | @sh "SHA256=\(.hash)"')" + echo sha256 = \""$SHA256"\"\; + export APPDIR="${XDG_CACHE_HOME:-$HOME/.cache}/appimage-run/$SHA256" + + #compatibility + if [ -x "$APPDIR/squashfs-root" ]; then APPDIR="$APPDIR/squashfs-root"; fi + + if [ ! -x "$APPDIR" ]; then + mkdir -p "$(dirname "$APPDIR")" + unpack "$APPIMAGE" "$APPDIR" + else echo "$(basename "$APPIMAGE")" installed in "$APPDIR" + fi + + export PATH="$PATH:$PWD/usr/bin" +} + +wrap() { + + cd "$APPDIR" || exit + # quite same in appimageTools + export APPIMAGE_SILENT_INSTALL=1 + + if [ -n "$APPIMAGE_DEBUG_EXEC" ]; then + exec "$APPIMAGE_DEBUG_EXEC" + fi + + exec ./AppRun "$@" +} + +usage() { + cat < [AppImage options] + +-h show this message +-d debug mode +-x : extract appimage in the directory then exit. +-w : run uncompressed appimage directory (used in appimageTools) + +[AppImage options]: Options are passed on to the appimage. +If you want to execute a custom command in the appimage's environment, set the APPIMAGE_DEBUG_EXEC environment variable. + +EOF + exit 1 +} + +while getopts "x:w:dh" option; do + case "${option}" in + d) set -x + ;; + x) # eXtract + unpack_opt=true + APPDIR=${OPTARG} + ;; + w) # WrapAppImage + export APPDIR=${OPTARG} + wrap_opt=true + ;; + h) usage + ;; + *) + usage + ;; + esac +done +shift $((OPTIND-1)) + +if [[ $wrap_opt = true ]] && [[ -d "$APPDIR" ]]; then + wrap "$@" + exit +else + APPIMAGE="$(realpath "$1")" || usage + shift +fi + +if [[ $unpack_opt = true ]] && [[ -f "$APPIMAGE" ]]; then + unpack "$APPIMAGE" "$APPDIR" + exit +fi + +if [[ $apprun_opt = true ]] && [[ -f "$APPIMAGE" ]]; then + apprun + wrap "$@" + exit +fi diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index c56aae4c599..993032c5601 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -1,71 +1,39 @@ -{ stdenv, libarchive, radare2, jq, buildFHSUserEnv, squashfsTools, writeScript }: +{ stdenv, buildFHSUserEnv, writeScript, pkgs +, bash, radare2, jq, squashfsTools, ripgrep +, coreutils, libarchive, file, runtimeShell, pv +, lib, runCommand }: rec { - - extract = { name, src }: stdenv.mkDerivation { - name = "${name}-extracted"; - inherit src; - nativeBuildInputs = [ radare2 libarchive jq squashfsTools ]; - buildCommand = '' - # https://github.com/AppImage/libappimage/blob/ca8d4b53bed5cbc0f3d0398e30806e0d3adeaaab/src/libappimage/utils/MagicBytesChecker.cpp#L45-L63 - eval $(r2 $src -nn -Nqc "p8j 3 @ 8" | - jq -r '{appimageSignature: (.[:-1]|implode), appimageType: .[-1]}| - @sh "appimageSignature=\(.appimageSignature) appimageType=\(.appimageType)"') - - # check AppImage signature - if [[ "$appimageSignature" != "AI" ]]; then - echo "Not an appimage." - exit - fi - - case "$appimageType" in - 1) - mkdir $out - bsdtar -x -C $out -f $src - ;; - - 2) - # multiarch offset one-liner using same method as AppImage - # see https://gist.github.com/probonopd/a490ba3401b5ef7b881d5e603fa20c93 - offset=$(r2 $src -nn -Nqc "pfj.elf_header @ 0" |\ - jq 'map({(.name): .value}) | add | .shoff + (.shnum * .shentsize)') - - unsquashfs -q -d $out -o $offset $src - chmod go-w $out - ;; - - # 3) get ready, https://github.com/TheAssassin/type3-runtime - *) echo "Unsupported AppImage Type: $appimageType";; - esac - ''; + appimage-exec = pkgs.substituteAll { + src = ./appimage-exec.sh; + isExecutable = true; + dir = "bin"; + path = with pkgs; lib.makeBinPath [ pv ripgrep file radare2 libarchive jq squashfsTools coreutils bash ]; }; + extract = { name, src }: runCommand "${name}-extracted" { + buildInputs = [ appimage-exec ]; + } '' + appimage-exec.sh -x $out ${src} + ''; + + # for compatibility, deprecated extractType1 = extract; extractType2 = extract; + wrapType1 = wrapType2; wrapAppImage = args@{ name, src, extraPkgs, ... }: buildFHSUserEnv (defaultFhsEnvArgs // { inherit name; - targetPkgs = pkgs: defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs; + targetPkgs = pkgs: [ appimage-exec ] + ++ defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs; - runScript = writeScript "run" '' - #!${stdenv.shell} - - export APPDIR=${src} - export APPIMAGE_SILENT_INSTALL=1 - cd $APPDIR - exec ./AppRun "$@" - ''; + runScript = "appimage-exec.sh -w ${src}"; } // (removeAttrs args (builtins.attrNames (builtins.functionArgs wrapAppImage)))); - wrapType1 = args@{ name, src, extraPkgs ? pkgs: [], ... }: wrapAppImage (args // { - inherit name extraPkgs; - src = extractType1 { inherit name src; }; - }); - wrapType2 = args@{ name, src, extraPkgs ? pkgs: [], ... }: wrapAppImage (args // { inherit name extraPkgs; - src = extractType2 { inherit name src; }; + src = extract { inherit name src; }; }); defaultFhsEnvArgs = { diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index b078bf2fbbd..7ae1c87e993 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -41,7 +41,9 @@ let libc_bin = if libc == null then null else getBin libc; libc_dev = if libc == null then null else getDev libc; libc_lib = if libc == null then null else getLib libc; - cc_solib = getLib cc; + cc_solib = getLib cc + + optionalString (targetPlatform != hostPlatform) "/${targetPlatform.config}"; + # The wrapper scripts use 'cat' and 'grep', so we may need coreutils. coreutils_bin = if nativeTools then "" else getBin coreutils; @@ -361,7 +363,13 @@ stdenv.mkDerivation { done '' + # There are a few tools (to name one libstdcxx5) which do not work + # well with multi line flags, so make the flags single line again + '' + if [ -e "$out/nix-support/libc-cflags" ]; then + substituteInPlace "$out/nix-support/libc-cflags" --replace $'\n' ' ' + fi + substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index ff9949bc8dd..28c0d2dfcae 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -319,6 +319,8 @@ rec { enableParallelBuilding = true; } '' + mkdir layers + # Delete impurities for store path layers, so they don't get # shared and taint other projects. cat ${configJson} \ @@ -330,13 +332,12 @@ rec { # created, and that no paths are missed. If you change the # following head and tail call lines, double-check that your # code behaves properly when the number of layers equals: - # maxLayers-1, maxLayers, and maxLayers+1 + # maxLayers-1, maxLayers, and maxLayers+1, 0 paths() { - cat $paths ${lib.concatMapStringsSep " " (path: "| grep -v ${path}") (closures ++ [ overallClosure ])} + cat $paths ${lib.concatMapStringsSep " " (path: "| (grep -v ${path} || true)") (closures ++ [ overallClosure ])} } - # We need to sponge to avoid grep broken pipe error when maxLayers == 1 - paths | sponge | head -n $((maxLayers - 1)) | cat -n | xargs -r -P$NIX_BUILD_CORES -n2 ${storePathToLayer} + paths | head -n $((maxLayers - 1)) | cat -n | xargs -r -P$NIX_BUILD_CORES -n2 ${storePathToLayer} if [ $(paths | wc -l) -ge $maxLayers ]; then paths | tail -n+$maxLayers | xargs ${storePathToLayer} $maxLayers fi diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index f0dcf236c0e..f42b35e6494 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -258,4 +258,26 @@ rec { maxLayers = 2; }; + # 17. Create a "layered" image without nix store layers. This is not + # recommended, but can be useful for base images in rare cases. + no-store-paths = pkgs.dockerTools.buildLayeredImage { + name = "no-store-paths"; + tag = "latest"; + extraCommands = '' + chmod a+w bin + + # This removes sharing of busybox and is not recommended. We do this + # to make the example suitable as a test case with working binaries. + cp -r ${pkgs.pkgsStatic.busybox}/* . + ''; + contents = [ + # This layer has no dependencies and its symlinks will be dereferenced + # when creating the customization layer. + (pkgs.runCommand "layer-to-flatten" {} '' + mkdir -p $out/bin + ln -s /bin/true $out/bin/custom-true + '' + ) + ]; + }; } diff --git a/pkgs/build-support/fetchsvn/builder.sh b/pkgs/build-support/fetchsvn/builder.sh index c386a3f3489..ed3e65f0769 100644 --- a/pkgs/build-support/fetchsvn/builder.sh +++ b/pkgs/build-support/fetchsvn/builder.sh @@ -2,10 +2,6 @@ source $stdenv/setup header "exporting $url (r$rev) into $out" -if test "$sshSupport"; then - export SVN_SSH="$openssh/bin/ssh" -fi - if test -n "$http_proxy"; then # Configure proxy mkdir .subversion diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix index 68433d1471d..06f0ea0a3d1 100644 --- a/pkgs/build-support/fetchsvn/default.nix +++ b/pkgs/build-support/fetchsvn/default.nix @@ -1,7 +1,13 @@ -{stdenvNoCC, subversion, glibcLocales, sshSupport ? true, openssh ? null}: -{url, rev ? "HEAD", md5 ? "", sha256 ? "" +{ stdenvNoCC, buildPackages +, subversion, glibcLocales, sshSupport ? true, openssh ? null +}: + +{ url, rev ? "HEAD", md5 ? "", sha256 ? "" , ignoreExternals ? false, ignoreKeywords ? false, name ? null -, preferLocalBuild ? true }: +, preferLocalBuild ? true +}: + +assert sshSupport -> openssh != null; let repoName = with stdenvNoCC.lib; @@ -32,13 +38,16 @@ else stdenvNoCC.mkDerivation { name = name_; builder = ./builder.sh; - nativeBuildInputs = [ subversion glibcLocales ]; + nativeBuildInputs = [ subversion glibcLocales ] + ++ stdenvNoCC.lib.optional sshSupport openssh; + + SVN_SSH = if sshSupport then "${buildPackages.openssh}/bin/ssh" else null; outputHashAlgo = "sha256"; outputHashMode = "recursive"; outputHash = sha256; - inherit url rev sshSupport openssh ignoreExternals ignoreKeywords; + inherit url rev ignoreExternals ignoreKeywords; impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars; inherit preferLocalBuild; diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix index 2dcca75e299..9759235e30e 100644 --- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, echo_build_heading, noisily, mkRustcDepArgs, rust }: +{ lib, stdenv, mkRustcDepArgs, rust }: { crateName, dependencies, crateFeatures, crateRenames, libName, release, libPath, @@ -35,16 +35,13 @@ build_bin = if buildTests then "build_bin_test" else "build_bin"; in '' runHook preBuild - ${echo_build_heading colors} - ${noisily colors verbose} - + # configure & source common build functions LIB_RUSTC_OPTS="${libRustcOpts}" BIN_RUSTC_OPTS="${binRustcOpts}" LIB_EXT="${stdenv.hostPlatform.extensions.sharedLibrary}" LIB_PATH="${libPath}" LIB_NAME="${libName}" - source ${./lib.sh} CRATE_NAME='${lib.replaceStrings ["-"] ["_"] libName}' diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index c146ffef5ff..013b99a77b4 100644 --- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, echo_build_heading, noisily, mkRustcDepArgs }: +{ lib, stdenv, echo_colored, noisily, mkRustcDepArgs }: { build , buildDependencies , colors @@ -31,10 +31,25 @@ let version_ = lib.splitString "-" crateVersion; completeDepsDir = lib.concatStringsSep " " completeDeps; completeBuildDepsDir = lib.concatStringsSep " " completeBuildDeps; in '' - cd ${workspace_member} - runHook preConfigure - ${echo_build_heading colors} + ${echo_colored colors} ${noisily colors verbose} + source ${./lib.sh} + + ${lib.optionalString (workspace_member != null) '' + noisily cd "${workspace_member}" +''} + ${lib.optionalString (workspace_member == null) '' + echo_colored "Searching for matching Cargo.toml (${crateName})" + local cargo_toml_dir=$(matching_cargo_toml_dir "${crateName}") + if [ -z "$cargo_toml_dir" ]; then + echo_error "ERROR configuring ${crateName}: No matching Cargo.toml in $(pwd) found." >&2 + exit 23 + fi + noisily cd "$cargo_toml_dir" +''} + + runHook preConfigure + symlink_dependency() { # $1 is the nix-store path of a dependency # $2 is the target path diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index 94b64a1225c..70d48bef8c9 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -4,7 +4,7 @@ # This can be useful for deploying packages with NixOps, and to share # binary dependencies between projects. -{ lib, stdenv, defaultCrateOverrides, fetchCrate, rustc, rust }: +{ lib, stdenv, defaultCrateOverrides, fetchCrate, rustc, rust, cargo, jq }: let # This doesn't appear to be officially documented anywhere yet. @@ -29,14 +29,14 @@ let " --extern ${name}=${dep.lib}/lib/lib${extern}-${dep.metadata}${stdenv.hostPlatform.extensions.sharedLibrary}") ) dependencies; - inherit (import ./log.nix { inherit lib; }) noisily echo_build_heading; + inherit (import ./log.nix { inherit lib; }) noisily echo_colored; configureCrate = import ./configure-crate.nix { - inherit lib stdenv echo_build_heading noisily mkRustcDepArgs; + inherit lib stdenv echo_colored noisily mkRustcDepArgs; }; buildCrate = import ./build-crate.nix { - inherit lib stdenv echo_build_heading noisily mkRustcDepArgs rust; + inherit lib stdenv mkRustcDepArgs rust; }; installCrate = import ./install-crate.nix { inherit stdenv; }; @@ -88,7 +88,7 @@ stdenv.mkDerivation (rec { src = crate.src or (fetchCrate { inherit (crate) crateName version sha256; }); name = "rust_${crate.crateName}-${crate.version}${lib.optionalString buildTests_ "-test"}"; - depsBuildBuild = [ rust stdenv.cc ]; + depsBuildBuild = [ rust stdenv.cc cargo jq ]; buildInputs = (crate.buildInputs or []) ++ buildInputs_; dependencies = map lib.getLib dependencies_; buildDependencies = map lib.getLib buildDependencies_; @@ -114,6 +114,8 @@ stdenv.mkDerivation (rec { in lib.substring 0 10 hashedMetadata; build = crate.build or ""; + # Either set to a concrete sub path to the crate root + # or use `null` for auto-detect. workspace_member = crate.workspace_member or "."; crateVersion = crate.version; crateDescription = crate.description or ""; diff --git a/pkgs/build-support/rust/build-rust-crate/lib.sh b/pkgs/build-support/rust/build-rust-crate/lib.sh index d4d9317496f..0f08c133e55 100644 --- a/pkgs/build-support/rust/build-rust-crate/lib.sh +++ b/pkgs/build-support/rust/build-rust-crate/lib.sh @@ -1,3 +1,11 @@ +echo_build_heading() { + if (( $# == 1 )); then + echo_colored "Building $1" + else + echo_colored "Building $1 ($2)" + fi +} + build_lib() { lib_src=$1 echo_build_heading $lib_src ${libName} @@ -132,7 +140,41 @@ search_for_bin_path() { done if [[ -z "$BIN_PATH" ]]; then - echo "failed to find file for binary target: $BIN_NAME" >&2 + echo_error "ERROR: failed to find file for binary target: $BIN_NAME" >&2 exit 1 fi } + +# Extracts cargo_toml_path of the matching crate. +matching_cargo_toml_path() { + local manifest_path="$1" + local expected_crate_name="$2" + + # If the Cargo.toml is not a workspace root, + # it will only contain one package in ".packages" + # because "--no-deps" suppressed dependency resolution. + # + # But to make it more general, we search for a matching + # crate in all packages and use the manifest path that + # is referenced there. + cargo metadata --no-deps --format-version 1 \ + --manifest-path "$manifest_path" \ + | jq -r '.packages[] + | select( .name == "'$expected_crate_name'") + | .manifest_path' +} + +# Find a Cargo.toml in the current or any sub directory +# with a matching crate name. +matching_cargo_toml_dir() { + local expected_crate_name="$1" + + find -L -name Cargo.toml | sort | while read manifest_path; do + echo "...checking manifest_path $manifest_path" >&2 + local matching_path="$(matching_cargo_toml_path "$manifest_path" "$expected_crate_name")" + if [ -n "${matching_path}" ]; then + echo "$(dirname $matching_path)" + break + fi + done +} \ No newline at end of file diff --git a/pkgs/build-support/rust/build-rust-crate/log.nix b/pkgs/build-support/rust/build-rust-crate/log.nix index 25181c787e2..a7e2cb4f463 100644 --- a/pkgs/build-support/rust/build-rust-crate/log.nix +++ b/pkgs/build-support/rust/build-rust-crate/log.nix @@ -1,30 +1,56 @@ { lib }: -{ - echo_build_heading = colors: '' - echo_build_heading() { - start="" - end="" - ${lib.optionalString (colors == "always") '' - start="$(printf '\033[0;1;32m')" #set bold, and set green. - end="$(printf '\033[0m')" #returns to "normal" - ''} - if (( $# == 1 )); then - echo "$start""Building $1""$end" - else - echo "$start""Building $1 ($2)""$end" - fi + +let echo_colored_body = start_escape: + # Body of a function that behaves like "echo" but + # has the output colored by the given start_escape + # sequence. E.g. + # + # * echo_x "Building ..." + # * echo_x -n "Running " + # + # This is more complicated than apparent at first sight + # because: + # * The color markers and the text must be print + # in the same echo statement. Otherise, other + # intermingled text from concurrent builds will + # be colored as well. + # * We need to preserve the trailing newline of the + # echo if and only if it is present. Bash likes + # to strip those if we capture the output of echo + # in a variable. + # * Leading "-" will be interpreted by test as an + # option for itself. Therefore, we prefix it with + # an x in `[[ "x$1" =~ ^x- ]]`. + '' + local echo_args=""; + while [[ "x$1" =~ ^x- ]]; do + echo_args+=" $1" + shift + done + + local start_escape="$(printf '${start_escape}')" + local reset="$(printf '\033[0m')" + echo $echo_args $start_escape"$@"$reset + ''; + echo_conditional_colored_body = colors: start_escape: + if colors == "always" + then (echo_colored_body start_escape) + else ''echo "$@"''; +in { + echo_colored = colors: '' + echo_colored() { + ${echo_conditional_colored_body colors ''\033[0;1;32m''} } - ''; + + echo_error() { + ${echo_conditional_colored_body colors ''\033[0;1;31m''} + } + ''; + noisily = colors: verbose: '' noisily() { - start="" - end="" - ${lib.optionalString (colors == "always") '' - start="$(printf '\033[0;1;32m')" #set bold, and set green. - end="$(printf '\033[0m')" #returns to "normal" - ''} ${lib.optionalString verbose '' - echo -n "$start"Running "$end" + echo_colored -n "Running " echo $@ ''} $@ diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix index 6aad02992c1..71004566468 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix @@ -8,6 +8,14 @@ let } // args; in buildRustCrate p; + mkCargoToml = + { name, crateVersion ? "0.1.0", path ? "Cargo.toml" }: + mkFile path '' + [package] + name = ${builtins.toJSON name} + version = ${builtins.toJSON crateVersion} + ''; + mkFile = destination: text: writeTextFile { name = "src"; destination = "/${destination}"; @@ -89,7 +97,7 @@ let in rec { tests = let - cases = { + cases = rec { libPath = { libPath = "src/my_lib.rs"; src = mkLib "src/my_lib.rs"; }; srcLib = { src = mkLib "src/lib.rs"; }; @@ -220,6 +228,40 @@ let ]; }; }; + rustCargoTomlInSubDir = { + # The "workspace_member" can be set to the sub directory with the crate to build. + # By default ".", meaning the top level directory is assumed. + # Using null will trigger a search. + workspace_member = null; + src = symlinkJoin rec { + name = "find-cargo-toml"; + paths = [ + (mkCargoToml { name = "ignoreMe"; }) + (mkTestFileWithMain "src/main.rs" "ignore_main") + + (mkCargoToml { name = "rustCargoTomlInSubDir"; path = "subdir/Cargo.toml"; }) + (mkTestFileWithMain "subdir/src/main.rs" "src_main") + (mkTestFile "subdir/tests/foo/main.rs" "tests_foo") + (mkTestFile "subdir/tests/bar/main.rs" "tests_bar") + ]; + }; + buildTests = true; + expectedTestOutputs = [ + "test src_main ... ok" + "test tests_foo ... ok" + "test tests_bar ... ok" + ]; + }; + + rustCargoTomlInTopDir = + let + withoutCargoTomlSearch = builtins.removeAttrs rustCargoTomlInSubDir [ "workspace_member" ]; + in + withoutCargoTomlSearch // { + expectedTestOutputs = [ + "test ignore_main ... ok" + ]; + }; }; brotliCrates = (callPackage ./brotli-crates.nix {}); in lib.mapAttrs (key: value: mkTest (value // lib.optionalAttrs (!value?crateName) { crateName = key; })) cases // { diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 3fdfc0636f9..f42f951680f 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -14,9 +14,6 @@ , cargoUpdateHook ? "" , cargoDepsHook ? "" , cargoBuildFlags ? [] - # Please set to true on any Rust package updates. Once all packages set this - # to true, we will delete and make it the default. For details, see the Rust - # section on the manual and ./README.md. , legacyCargoFetcher ? false , buildType ? "release" , meta ? {} @@ -114,15 +111,37 @@ stdenv.mkDerivation (filteredArgs // { EOF export RUST_LOG=${logLevel} - '' + stdenv.lib.optionalString validateCargoDeps '' - if ! diff source/Cargo.lock $cargoDepsCopy/Cargo.lock ; then + '' + (args.postUnpack or ""); + + # After unpacking and applying patches, check that the Cargo.lock matches our + # src package. Note that we do this after the patchPhase, because the + # patchPhase may create the Cargo.lock if upstream has not shipped one. + postPatch = (args.postPatch or "") + stdenv.lib.optionalString validateCargoDeps '' + cargoDepsLockfile=$NIX_BUILD_TOP/$cargoDepsCopy/Cargo.lock + srcLockfile=$NIX_BUILD_TOP/$sourceRoot/Cargo.lock + + echo "Validating consistency between $srcLockfile and $cargoDepsLockfile" + if ! diff $srcLockfile $cargoDepsLockfile; then + + # If the diff failed, first double-check that the file exists, so we can + # give a friendlier error msg. + if ! [ -e $srcLockfile ]; then + echo "ERROR: Missing Cargo.lock from src. Expected to find it at: $srcLockfile" + exit 1 + fi + + if ! [ -e $cargoDepsLockfile ]; then + echo "ERROR: Missing lockfile from cargo vendor. Expected to find it at: $cargoDepsLockfile" + exit 1 + fi + echo echo "ERROR: cargoSha256 is out of date" echo echo "Cargo.lock is not the same in $cargoDepsCopy" echo echo "To fix the issue:" - echo '1. Use "1111111111111111111111111111111111111111111111111111" as the cargoSha256 value' + echo '1. Use "0000000000000000000000000000000000000000000000000000" as the cargoSha256 value' echo "2. Build the derivation and wait it to fail with a hash mismatch" echo "3. Copy the 'got: sha256:' value back into the cargoSha256 field" echo @@ -131,7 +150,7 @@ stdenv.mkDerivation (filteredArgs // { fi '' + '' unset cargoDepsCopy - '' + (args.postUnpack or ""); + ''; configurePhase = args.configurePhase or '' runHook preConfigure diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh index ff0cda7eaf0..1a46e075dbe 100644 --- a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh +++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh @@ -9,6 +9,37 @@ find_gio_modules() { addEnvHooks "${targetOffset:?}" find_gio_modules +gappsWrapperArgsHook() { + if [ -n "$GDK_PIXBUF_MODULE_FILE" ]; then + gappsWrapperArgs+=(--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE") + fi + + if [ -n "$XDG_ICON_DIRS" ]; then + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS") + fi + + if [ -n "$GSETTINGS_SCHEMAS_PATH" ]; then + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH") + fi + + # Check for prefix as well + if [ -d "${prefix:?}/share" ]; then + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$prefix/share") + fi + + if [ -d "$prefix/lib/gio/modules" ] && [ -n "$(ls -A "$prefix/lib/gio/modules")" ]; then + gappsWrapperArgs+=(--prefix GIO_EXTRA_MODULES : "$prefix/lib/gio/modules") + fi + + for v in ${wrapPrefixVariables:-} GST_PLUGIN_SYSTEM_PATH_1_0 GI_TYPELIB_PATH GRL_PLUGIN_PATH; do + if [ -n "${!v}" ]; then + gappsWrapperArgs+=(--prefix "$v" : "${!v}") + fi + done +} + +preFixupPhases+=" gappsWrapperArgsHook" + wrapGApp() { local program="$1" shift 1 @@ -17,72 +48,46 @@ wrapGApp() { # Note: $gappsWrapperArgs still gets defined even if ${dontWrapGApps-} is set. wrapGAppsHook() { - # guard against running multiple times (e.g. due to propagation) - [ -z "$wrapGAppsHookHasRun" ] || return 0 - wrapGAppsHookHasRun=1 + # guard against running multiple times (e.g. due to propagation) + [ -z "$wrapGAppsHookHasRun" ] || return 0 + wrapGAppsHookHasRun=1 - if [ -n "$GDK_PIXBUF_MODULE_FILE" ]; then - gappsWrapperArgs+=(--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE") - fi + if [[ -z "${dontWrapGApps:-}" ]]; then + targetDirsThatExist=() + targetDirsRealPath=() - if [ -n "$XDG_ICON_DIRS" ]; then - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS") - fi - - if [ -n "$GSETTINGS_SCHEMAS_PATH" ]; then - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH") - fi - - if [ -d "${prefix:?}/share" ]; then - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$prefix/share") - fi - - if [ -d "$prefix/lib/gio/modules" ] && [ -n "$(ls -A "$prefix/lib/gio/modules")" ] ; then - gappsWrapperArgs+=(--prefix GIO_EXTRA_MODULES : "$prefix/lib/gio/modules") - fi - - for v in ${wrapPrefixVariables:-} GST_PLUGIN_SYSTEM_PATH_1_0 GI_TYPELIB_PATH GRL_PLUGIN_PATH; do - if [ -n "${!v}" ]; then - gappsWrapperArgs+=(--prefix "$v" : "${!v}") - fi - done - - if [[ -z "${dontWrapGApps:-}" ]]; then - targetDirsThatExist=() - targetDirsRealPath=() - - # wrap binaries - targetDirs=( "${prefix}/bin" "${prefix}/libexec" ) - for targetDir in "${targetDirs[@]}"; do - if [[ -d "${targetDir}" ]]; then - targetDirsThatExist+=("${targetDir}") - targetDirsRealPath+=("$(realpath "${targetDir}")/") - find "${targetDir}" -type f -executable -print0 \ - | while IFS= read -r -d '' file; do - echo "Wrapping program '${file}'" - wrapGApp "${file}" + # wrap binaries + targetDirs=("${prefix}/bin" "${prefix}/libexec") + for targetDir in "${targetDirs[@]}"; do + if [[ -d "${targetDir}" ]]; then + targetDirsThatExist+=("${targetDir}") + targetDirsRealPath+=("$(realpath "${targetDir}")/") + find "${targetDir}" -type f -executable -print0 | + while IFS= read -r -d '' file; do + echo "Wrapping program '${file}'" + wrapGApp "${file}" + done + fi done - fi - done - # wrap links to binaries that point outside targetDirs - # Note: links to binaries within targetDirs do not need - # to be wrapped as the binaries have already been wrapped - if [[ ${#targetDirsThatExist[@]} -ne 0 ]]; then - find "${targetDirsThatExist[@]}" -type l -xtype f -executable -print0 \ - | while IFS= read -r -d '' linkPath; do - linkPathReal=$(realpath "${linkPath}") - for targetPath in "${targetDirsRealPath[@]}"; do - if [[ "$linkPathReal" == "$targetPath"* ]]; then - echo "Not wrapping link: '$linkPath' (already wrapped)" - continue 2 - fi - done - echo "Wrapping link: '$linkPath'" - wrapGApp "${linkPath}" - done + # wrap links to binaries that point outside targetDirs + # Note: links to binaries within targetDirs do not need + # to be wrapped as the binaries have already been wrapped + if [[ ${#targetDirsThatExist[@]} -ne 0 ]]; then + find "${targetDirsThatExist[@]}" -type l -xtype f -executable -print0 | + while IFS= read -r -d '' linkPath; do + linkPathReal=$(realpath "${linkPath}") + for targetPath in "${targetDirsRealPath[@]}"; do + if [[ "$linkPathReal" == "$targetPath"* ]]; then + echo "Not wrapping link: '$linkPath' (already wrapped)" + continue 2 + fi + done + echo "Wrapping link: '$linkPath'" + wrapGApp "${linkPath}" + done + fi fi - fi } fixupOutputHooks+=(wrapGAppsHook) diff --git a/pkgs/data/fonts/jetbrains-mono/default.nix b/pkgs/data/fonts/jetbrains-mono/default.nix index 258114715f3..8a7e841df67 100644 --- a/pkgs/data/fonts/jetbrains-mono/default.nix +++ b/pkgs/data/fonts/jetbrains-mono/default.nix @@ -1,18 +1,19 @@ { lib, fetchzip }: let - version = "1.0.3"; + version = "1.0.4"; in fetchzip rec { name = "JetBrainsMono-${version}"; url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrainsMono-${version}.zip"; - sha256 = "16am5fxvda24jfl8lb9jf8mkcqfc97scj8hvwgd3m771db0dpflf"; + sha256 = "1m6wppz6mrh7475d92yvwrjgbwkkcfq444v0im90f5c7fsf3dzbd"; postFetch = '' mkdir -p $out/share/fonts unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*.eot -d $out/share/fonts/eot unzip -j $downloadedFile \*.woff -d $out/share/fonts/woff unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2 ''; diff --git a/pkgs/data/fonts/jost/default.nix b/pkgs/data/fonts/jost/default.nix index ecada2eda7b..3c1403da263 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/fonts/recursive/default.nix b/pkgs/data/fonts/recursive/default.nix index 9636d50a54f..8aab8c0cd72 100644 --- a/pkgs/data/fonts/recursive/default.nix +++ b/pkgs/data/fonts/recursive/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "1.042"; + version = "1.043"; in fetchzip { name = "recursive-${version}"; @@ -14,7 +14,7 @@ fetchzip { unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2 ''; - sha256 = "1zcrvnzwd39fim2jxa3by6jgdrx7fdp64iw2bd181iwzinv1yqsa"; + sha256 = "0y7wg3ssr4j0r8dyxd0i0ji8bjvipzsqf0l6wznl5sfxk41mvjvd"; meta = with lib; { homepage = "https://recursive.design/"; diff --git a/pkgs/data/icons/capitaine-cursors/default.nix b/pkgs/data/icons/capitaine-cursors/default.nix index 46d6c1a731e..09491b904ef 100644 --- a/pkgs/data/icons/capitaine-cursors/default.nix +++ b/pkgs/data/icons/capitaine-cursors/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchFromGitHub -, inkscape, xcursorgen }: +, inkscape, xcursorgen, bc }: stdenv.mkDerivation rec { pname = "capitaine-cursors"; - version = "3"; + version = "4"; src = fetchFromGitHub { owner = "keeferrourke"; repo = pname; rev = "r${version}"; - sha256 = "0pnfbmrn9nv8pryv6cbjcq5hl9366hzvz1kd8vsdkgb2nlfv5gdv"; + sha256 = "0652ydy73x29z7wc6ccyqihmfg4bk0ksl7yryycln6c7i0iqfmc9"; }; postPatch = '' @@ -19,24 +19,27 @@ stdenv.mkDerivation rec { buildInputs =[ inkscape xcursorgen + bc ]; buildPhase = '' + for variant in dark light ; do # https://github.com/NixOS/nixpkgs/blob/master/pkgs/data/fonts/emojione/default.nix#L16 - HOME="$NIX_BUILD_ROOT" ./build.sh + HOME="$NIX_BUILD_ROOT" ./build.sh --max-dpi xhd --type $variant + done ''; installPhase = '' install -dm 0755 $out/share/icons - cp -pr dist $out/share/icons/capitaine-cursors - cp -pr dist-white $out/share/icons/capitaine-cursors-white + cp -pr dist/dark $out/share/icons/capitaine-cursors + cp -pr dist/light $out/share/icons/capitaine-cursors-white ''; meta = with stdenv.lib; { description = '' An x-cursor theme inspired by macOS and based on KDE Breeze ''; - homepage = https://github.com/keeferrourke/capitaine-cursors; + homepage = "https://github.com/keeferrourke/capitaine-cursors"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = with maintainers; [ diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 5c2f71bf2f7..96617bb0f27 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/3ff0be5c9ee1ead33e07158b9a4a579fa2fb7a7f.tar.gz"; - sha256 = "15jqdjxyzcmg50zvl7szv6s2zi4k82as5wi6mkiwwpbdricg50pl"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/fcb0ed924c8504d54870d6dc2092b9dab8305732.tar.gz"; + sha256 = "0b7dxgj40y9svddrx14scnxls20ww4f717zhz3lwigb16dm4crpi"; } diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 96fd9ad33f1..9afe4a9e400 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/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index 152b08a960d..05292e97772 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "matcha"; - version = "2020-03-01"; + version = "2020-03-11"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "09nb6xsysfg477zcm9y49iaczxksxrd4zh3n8dp7rlzc2h2kicpn"; + sha256 = "1np2964g5f0vwdvfmi8gidsk9jj7v43nkshiqnfdbvmwa85ldpfl"; }; buildInputs = [ gdk-pixbuf librsvg ]; diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix index 0fb061519e6..08f178b30e8 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/gnome-3/extensions/paperwm/default.nix b/pkgs/desktops/gnome-3/extensions/paperwm/default.nix new file mode 100644 index 00000000000..7a79b691a4d --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/paperwm/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-paperwm"; + version = "36.0"; + + src = fetchFromGitHub { + owner = "paperwm"; + repo = "PaperWM"; + rev = version; + sha256 = "1ssnabwxrns36c61ppspjkr9i3qifv08pf2jpwl7cjv3pvyn4kly"; + }; + + uuid = "paperwm@hedning:matrix.org"; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/share/gnome-shell/extensions/${uuid} + cp -r . $out/share/gnome-shell/extensions/${uuid} + ''; + + meta = with stdenv.lib; { + description = "Tiled scrollable window management for Gnome Shell"; + homepage = "https://github.com/paperwm/PaperWM"; + license = licenses.gpl3; + maintainers = with maintainers; [ hedning zowoq ]; + }; +} diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix index b5303021772..85739a6ec2e 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/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index 840fbff60eb..9849afb2c2d 100644 --- a/pkgs/development/arduino/arduino-core/default.nix +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -3,7 +3,8 @@ , withGui ? false, gtk2 ? null, withTeensyduino ? false /* Packages needed for Teensyduino */ , upx, fontconfig, xorg, gcc -, atk, glib, pango, gdk-pixbuf, libpng12, expat, freetype, +, atk, glib, pango, gdk-pixbuf, libpng12, expat, freetype +, cairo, udev }: assert withGui -> gtk2 != null; @@ -32,6 +33,7 @@ let teensy_libpath = stdenv.lib.makeLibraryPath [ atk + cairo expat fontconfig freetype @@ -42,11 +44,13 @@ let libpng12 libusb pango + udev xorg.libSM xorg.libX11 xorg.libXext xorg.libXft xorg.libXinerama + xorg.libXxf86vm zlib ]; teensy_architecture = 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 00000000000..79b053592a9 --- /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 +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 664335c3dad..d3723243766 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 7ff8d7529ca..ee020fbeea8 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -43,7 +43,7 @@ with stdenv.lib; with builtins; let majorVersion = "9"; - version = "${majorVersion}.2.0"; + version = "${majorVersion}.3.0"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -76,7 +76,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; - sha256 = "01mj3yk7z49i49168hg2cg7qs4bsccrrnv7pjmbdlf8j2a7z0vpa"; + sha256 = "1la2yy27ziasyf0jvzk58y1i5b5bq2h176qil550bxhifs39gqbi"; }; inherit patches; @@ -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/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index 07a003691d6..b153687980a 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -133,7 +133,7 @@ if test "$noSysDirs" = "1"; then if test "$crossStageStatic" == 1; then # We don't want the gcc build to assume there will be a libc providing - # limits.h in this stagae + # limits.h in this stage makeFlagsArray+=( 'LIMITS_H_TEST=false' ) @@ -203,31 +203,31 @@ postConfigure() { preInstall() { # Make ‘lib64’ symlinks to ‘lib’. if [ -n "$is64bit" -a -z "$enableMultilib" ]; then - mkdir -p "$out/lib" - ln -s lib "$out/lib64" - mkdir -p "$lib/lib" - ln -s lib "$lib/lib64" + mkdir -p "$out/${targetConfig}/lib" + ln -s lib "$out/${targetConfig}/lib64" + mkdir -p "$lib/${targetConfig}/lib" + ln -s lib "$lib/${targetConfig}/lib64" fi } postInstall() { # Move runtime libraries to $lib. - moveToOutput "lib/lib*.so*" "$lib" - moveToOutput "lib/lib*.la" "$lib" - moveToOutput "lib/lib*.dylib" "$lib" + moveToOutput "${targetConfig+$targetConfig/}lib/lib*.so*" "$lib" + moveToOutput "${targetConfig+$targetConfig/}lib/lib*.la" "$lib" + moveToOutput "${targetConfig+$targetConfig/}lib/lib*.dylib" "$lib" moveToOutput "share/gcc-*/python" "$lib" - for i in "$lib"/lib/*.{la,py}; do + for i in "$lib/${targetConfig}"/lib/*.{la,py}; do substituteInPlace "$i" --replace "$out" "$lib" done if [ -n "$enableMultilib" ]; then - moveToOutput "lib64/lib*.so*" "$lib" - moveToOutput "lib64/lib*.la" "$lib" - moveToOutput "lib64/lib*.dylib" "$lib" + moveToOutput "${targetConfig+$targetConfig/}lib64/lib*.so*" "$lib" + moveToOutput "${targetConfig+$targetConfig/}lib64/lib*.la" "$lib" + moveToOutput "${targetConfig+$targetConfig/}lib64/lib*.dylib" "$lib" - for i in "$lib"/lib64/*.{la,py}; do + for i in "$lib/${targetConfig}"/lib64/*.{la,py}; do substituteInPlace "$i" --replace "$out" "$lib" done fi @@ -247,13 +247,6 @@ postInstall() { NEW_RPATH=`echo "$PREV_RPATH" | sed 's,:[^:]*bootstrap-tools/lib,,g'` patchelf --set-rpath "$NEW_RPATH" "$i" && echo OK done - - # For some reason the libs retain RPATH to $out - for i in "$lib"/lib/{libtsan,libasan,libubsan}.so.*.*.*; do - PREV_RPATH=`patchelf --print-rpath "$i"` - NEW_RPATH=`echo "$PREV_RPATH" | sed "s,:${out}[^:]*,,g"` - patchelf --set-rpath "$NEW_RPATH" "$i" && echo OK - done fi if type "install_name_tool"; then diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix index d1665574de3..4bebd63956e 100644 --- a/pkgs/development/compilers/ghc/8.4.4.nix +++ b/pkgs/development/compilers/ghc/8.4.4.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation (rec { name = "${targetPrefix}ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; + url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; sha256 = "1ch4j2asg7pr52ai1hwzykxyj553wndg7wq93i47ql4fllspf48i"; }; diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix index ead28a3076a..e276d9b12b9 100644 --- a/pkgs/development/compilers/ghc/8.6.5.nix +++ b/pkgs/development/compilers/ghc/8.6.5.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation (rec { name = "${targetPrefix}ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; + url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; sha256 = "0qg3zsmbk4rkwkc3jpas3zs74qaxmw4sp4v1mhsbj0a0dzls2jjd"; }; @@ -187,7 +187,7 @@ stdenv.mkDerivation (rec { strictDeps = true; # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; + dontAddExtraLibs = true; nativeBuildInputs = [ perl autoconf automake m4 python3 sphinx diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix index 0070bc23f73..3e10041c5c8 100644 --- a/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -24,13 +24,13 @@ in stdenv.mkDerivation rec { pname = "intel-graphics-compiler"; - version = "1.0.3041"; + version = "1.0.3151"; src = fetchFromGitHub { owner = "intel"; repo = "intel-graphics-compiler"; rev = "igc-${version}"; - sha256 = "1d3vxq4v8jdjgl5jdm9qpxzgaw98r84dzs9lk9ph02khfkajqhjm"; + sha256 = "1c2ll563a2j4sv3r468i4lv158hkzywnyajyk7iyin7bhqhm2vzf"; }; nativeBuildInputs = [ clang cmake bison flex llvm python ]; diff --git a/pkgs/development/compilers/llvm/10/clang/clang-extension-handling.patch b/pkgs/development/compilers/llvm/10/clang/clang-extension-handling.patch new file mode 100644 index 00000000000..a74d10989ff --- /dev/null +++ b/pkgs/development/compilers/llvm/10/clang/clang-extension-handling.patch @@ -0,0 +1,18 @@ +Compressed diff from +``` +git show d21664cce1db8debe2528f36b1fbd2b8af9c9401 87dac7da68ea1e0adac78c59ef1891dcf9632b67 3a0f6e699bb6d96dc62dce6faef20ac26cf103fd +``` +with the purpose of avoiding linker errors arising in the polly-flavoured clang. + +diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt +index 781c3eb7f2f..dc1413f4b59 100644 +--- clang/CMakeLists.txt ++++ clang/CMakeLists.txt +@@ -864,6 +864,7 @@ add_subdirectory(utils/hmaptool) + + if(CLANG_BUILT_STANDALONE) + llvm_distribution_add_targets() ++ process_llvm_pass_plugins() + endif() + + configure_file( diff --git a/pkgs/development/compilers/llvm/10/clang/default.nix b/pkgs/development/compilers/llvm/10/clang/default.nix index fcabe6d430f..13fe4bedd46 100644 --- a/pkgs/development/compilers/llvm/10/clang/default.nix +++ b/pkgs/development/compilers/llvm/10/clang/default.nix @@ -1,7 +1,6 @@ { stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld , fixDarwinDylibNames , enableManpages ? false -, enablePolly ? false # TODO: get this info from llvm (passthru?) }: let @@ -9,7 +8,7 @@ let pname = "clang"; inherit version; - src = fetch "clang" "1npwv0j6812q9jar79bb5m2j4lmvp11680in45nlma8czrs52w0v"; + src = fetch "clang" "1w7ixr16a9f0g5kv4irvhwq973wn0d418kb0p9rabyfscm05wfmq"; unpackPhase = '' unpackFile $src @@ -34,12 +33,12 @@ let "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ stdenv.lib.optionals enablePolly [ - "-DWITH_POLLY=ON" - "-DLINK_POLLY_INTO_TOOLS=ON" ]; patches = [ + # 10.0.0rc3-only + ./clang-extension-handling.patch + ./purity.patch # https://reviews.llvm.org/D51899 ./compiler-rt-baremetal.patch diff --git a/pkgs/development/compilers/llvm/10/compiler-rt.nix b/pkgs/development/compilers/llvm/10/compiler-rt.nix index c9eed4d0070..2d71268c662 100644 --- a/pkgs/development/compilers/llvm/10/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/10/compiler-rt.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "compiler-rt"; inherit version; - src = fetch pname "11qiass6gbpq3m1srqlk5gm0zcm8j4jk2cmingra237qhaxz8wv9"; + src = fetch pname "0qv40mv91630l6f75w9g5y6v97s5shz94n82rms12gcd8mir6qp5"; nativeBuildInputs = [ cmake python3 llvm ]; buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; diff --git a/pkgs/development/compilers/llvm/10/default.nix b/pkgs/development/compilers/llvm/10/default.nix index 0f9d302f7cf..f2a8883a9a7 100644 --- a/pkgs/development/compilers/llvm/10/default.nix +++ b/pkgs/development/compilers/llvm/10/default.nix @@ -6,7 +6,7 @@ let release_version = "10.0.0"; - candidate = "rc2"; + candidate = "rc3"; version = "10.0.0${candidate}"; # differentiating these is important for rc's fetch = name: sha256: fetchurl { @@ -14,7 +14,7 @@ let inherit sha256; }; - clang-tools-extra_src = fetch "clang-tools-extra" "1yi34b6lspcpig0gnws2ba0shgmrs2jgjb3hp08mm0dg3blzk8ss"; + clang-tools-extra_src = fetch "clang-tools-extra" "03669c93wzmbmfpv0pyzb7y4z1xc912l95iqywyx01xgdl1xws0r"; tools = stdenv.lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); @@ -39,7 +39,6 @@ let clang-polly-unwrapped = callPackage ./clang { inherit clang-tools-extra_src; llvm = tools.llvm-polly; - enablePolly = true; }; llvm-manpages = lowPrio (tools.llvm.override { diff --git a/pkgs/development/compilers/llvm/10/libc++/default.nix b/pkgs/development/compilers/llvm/10/libc++/default.nix index 2d2bc4db2d7..767b1cbbc58 100644 --- a/pkgs/development/compilers/llvm/10/libc++/default.nix +++ b/pkgs/development/compilers/llvm/10/libc++/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { pname = "libc++"; inherit version; - src = fetch "libcxx" "0d83z1dbr6kkwcq72kqpdkvnndjvcjx7w80qlkvqlv7r2zai5kjg"; + src = fetch "libcxx" "1cjxiby8nq95g02rgx08iy86pswpi66b9wmxqjiyga1s92nb19j0"; postUnpack = '' unpackFile ${libcxxabi.src} diff --git a/pkgs/development/compilers/llvm/10/libc++abi.nix b/pkgs/development/compilers/llvm/10/libc++abi.nix index 3715ce36ec0..8ad52b5ed57 100644 --- a/pkgs/development/compilers/llvm/10/libc++abi.nix +++ b/pkgs/development/compilers/llvm/10/libc++abi.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { pname = "libc++abi"; inherit version; - src = fetch "libcxxabi" "001rnpgya6y0vcsy5jqcc7ria666mswbzw4avdps6dgs6caqrfpd"; + src = fetch "libcxxabi" "1xs7dr91qzz7lq9am4q3vcj2jf1gx23ar1jbnhn763011hl94vs0"; nativeBuildInputs = [ cmake ]; buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; diff --git a/pkgs/development/compilers/llvm/10/libunwind.nix b/pkgs/development/compilers/llvm/10/libunwind.nix index 7a8fb13dad2..74a8687179f 100644 --- a/pkgs/development/compilers/llvm/10/libunwind.nix +++ b/pkgs/development/compilers/llvm/10/libunwind.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "libunwind"; inherit version; - src = fetch pname "0194s3qqqz4qcrzdfy7c931sm3d9hnjk624gldja85mwz1v1x9a8"; + src = fetch pname "1dm7l75ajnjy6kbg2157v2g5gfia3n47fc56ayryyp2jdvbgprwl"; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/compilers/llvm/10/lld.nix b/pkgs/development/compilers/llvm/10/lld.nix index cea5ab3ee06..6323866ae88 100644 --- a/pkgs/development/compilers/llvm/10/lld.nix +++ b/pkgs/development/compilers/llvm/10/lld.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "lld"; inherit version; - src = fetch pname "0z0a1h94hx0wj5289gvp99bvvj2ghid94xj2c5acmh1df8cx1vna"; + src = fetch pname "1w9c9xmzbdnkwgal612hqz2lxj9jgqpfzxr2rllcspmf6v7arvf4"; nativeBuildInputs = [ cmake ]; buildInputs = [ llvm libxml2 ]; diff --git a/pkgs/development/compilers/llvm/10/lldb.nix b/pkgs/development/compilers/llvm/10/lldb.nix index 63df2d08454..fd318314dea 100644 --- a/pkgs/development/compilers/llvm/10/lldb.nix +++ b/pkgs/development/compilers/llvm/10/lldb.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (rec { pname = "lldb"; inherit version; - src = fetch pname "0nh26a4mxd54k5f9gpizr55vdalkzym2l82kvfh3lm8lvimypga1"; + src = fetch pname "06qzh13cr20wrd5925698yq696bhl68zbvm7kjxp7c2rx5swxmg8"; patches = [ ./lldb-procfs.patch ]; diff --git a/pkgs/development/compilers/llvm/10/llvm-extension-handling.patch b/pkgs/development/compilers/llvm/10/llvm-extension-handling.patch new file mode 100644 index 00000000000..cf4b1eaacf7 --- /dev/null +++ b/pkgs/development/compilers/llvm/10/llvm-extension-handling.patch @@ -0,0 +1,146 @@ +Compressed diff from +``` +git show d21664cce1db8debe2528f36b1fbd2b8af9c9401 87dac7da68ea1e0adac78c59ef1891dcf9632b67 3a0f6e699bb6d96dc62dce6faef20ac26cf103fd +``` +with the purpose of avoiding linker errors arising in the polly-flavoured clang. + +diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt +index a02c2a5a23f..faf8f561faa 100644 +--- llvm/CMakeLists.txt ++++ llvm/CMakeLists.txt +@@ -1069,6 +1069,7 @@ endif() + # after all targets are created. + include(LLVMDistributionSupport) + llvm_distribution_add_targets() ++process_llvm_pass_plugins(GEN_CONFIG) + + # This allows us to deploy the Universal CRT DLLs by passing -DCMAKE_INSTALL_UCRT_LIBRARIES=ON to CMake + if (MSVC AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows" AND CMAKE_INSTALL_UCRT_LIBRARIES) +@@ -1093,5 +1094,3 @@ endif() + if (LLVM_INCLUDE_UTILS AND LLVM_INCLUDE_TOOLS) + add_subdirectory(utils/llvm-locstats) + endif() +- +-process_llvm_pass_plugins() +diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake +index fd69786544a..8fbb33a22fd 100644 +--- llvm/cmake/modules/AddLLVM.cmake ++++ llvm/cmake/modules/AddLLVM.cmake +@@ -884,53 +884,71 @@ function(add_llvm_pass_plugin name) + if (TARGET intrinsics_gen) + add_dependencies(obj.${name} intrinsics_gen) + endif() +- message(STATUS "Registering ${name} as a pass plugin (static build: ${LLVM_${name_upper}_LINK_INTO_TOOLS})") +- set_property(GLOBAL APPEND PROPERTY LLVM_COMPILE_EXTENSIONS ${name}) ++ set_property(GLOBAL APPEND PROPERTY LLVM_STATIC_EXTENSIONS ${name}) + elseif(NOT ARG_NO_MODULE) + add_llvm_library(${name} MODULE ${ARG_UNPARSED_ARGUMENTS}) + else() + add_llvm_library(${name} OBJECT ${ARG_UNPARSED_ARGUMENTS}) + endif() ++ message(STATUS "Registering ${name} as a pass plugin (static build: ${LLVM_${name_upper}_LINK_INTO_TOOLS})") + + endfunction(add_llvm_pass_plugin) + +-# Generate X Macro file for extension handling. It provides a +-# HANDLE_EXTENSION(extension_namespace, ExtensionProject) call for each extension +-# allowing client code to define HANDLE_EXTENSION to have a specific code be run for +-# each extension. ++# process_llvm_pass_plugins([GEN_CONFIG]) ++# ++# Correctly set lib dependencies between plugins and tools, based on tools ++# registered with the ENABLE_PLUGINS option. ++# ++# if GEN_CONFIG option is set, also generate X Macro file for extension ++# handling. It provides a HANDLE_EXTENSION(extension_namespace, ExtensionProject) ++# call for each extension allowing client code to define ++# HANDLE_EXTENSION to have a specific code be run for each extension. + # +-# Also correctly set lib dependencies between plugins and tools. + function(process_llvm_pass_plugins) +- get_property(LLVM_EXTENSIONS GLOBAL PROPERTY LLVM_COMPILE_EXTENSIONS) +- file(WRITE "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def.tmp" "//extension handlers\n") +- foreach(llvm_extension ${LLVM_EXTENSIONS}) +- string(TOLOWER ${llvm_extension} llvm_extension_lower) +- +- string(TOUPPER ${llvm_extension} llvm_extension_upper) +- string(SUBSTRING ${llvm_extension_upper} 0 1 llvm_extension_upper_first) +- string(SUBSTRING ${llvm_extension_lower} 1 -1 llvm_extension_lower_tail) +- string(CONCAT llvm_extension_project ${llvm_extension_upper_first} ${llvm_extension_lower_tail}) +- +- if(LLVM_${llvm_extension_upper}_LINK_INTO_TOOLS) +- file(APPEND "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def.tmp" "HANDLE_EXTENSION(${llvm_extension_project})\n") +- +- get_property(llvm_plugin_targets GLOBAL PROPERTY LLVM_PLUGIN_TARGETS) +- foreach(llvm_plugin_target ${llvm_plugin_targets}) +- set_property(TARGET ${llvm_plugin_target} APPEND PROPERTY LINK_LIBRARIES ${llvm_extension}) +- set_property(TARGET ${llvm_plugin_target} APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${llvm_extension}) +- endforeach() +- else() +- add_llvm_library(${llvm_extension_lower} MODULE obj.${llvm_extension_lower}) +- endif() ++ cmake_parse_arguments(ARG ++ "GEN_CONFIG" "" "" ++ ${ARGN}) + ++ if(ARG_GEN_CONFIG) ++ get_property(LLVM_STATIC_EXTENSIONS GLOBAL PROPERTY LLVM_STATIC_EXTENSIONS) ++ else() ++ include(LLVMConfigExtensions) ++ endif() ++ ++ # Add static plugins to each plugin target. ++ foreach(llvm_extension ${LLVM_STATIC_EXTENSIONS}) ++ get_property(llvm_plugin_targets GLOBAL PROPERTY LLVM_PLUGIN_TARGETS) ++ foreach(llvm_plugin_target ${llvm_plugin_targets}) ++ set_property(TARGET ${llvm_plugin_target} APPEND PROPERTY LINK_LIBRARIES ${llvm_extension}) ++ set_property(TARGET ${llvm_plugin_target} APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${llvm_extension}) ++ endforeach() + endforeach() +- file(APPEND "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def.tmp" "#undef HANDLE_EXTENSION\n") + +- # only replace if there's an actual change +- execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different +- "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def.tmp" +- "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def") +- file(REMOVE "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def.tmp") ++ # Eventually generate the extension header, and store config to a cmake file ++ # for usage in third-party configuration. ++ if(ARG_GEN_CONFIG) ++ set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) ++ set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") ++ file(WRITE ++ "${llvm_cmake_builddir}/LLVMConfigExtensions.cmake" ++ "set(LLVM_STATIC_EXTENSIONS ${LLVM_STATIC_EXTENSIONS})") ++ install(FILES ++ ${llvm_cmake_builddir}/LLVMConfigExtensions.cmake ++ DESTINATION ${LLVM_INSTALL_PACKAGE_DIR} ++ COMPONENT cmake-exports) ++ ++ file(WRITE "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def.tmp" "//extension handlers\n") ++ foreach(llvm_extension ${LLVM_STATIC_EXTENSIONS}) ++ file(APPEND "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def.tmp" "HANDLE_EXTENSION(${llvm_extension})\n") ++ endforeach() ++ file(APPEND "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def.tmp" "#undef HANDLE_EXTENSION\n") ++ ++ # only replace if there's an actual change ++ execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ++ "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def.tmp" ++ "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def") ++ file(REMOVE "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def.tmp") ++ endif() + endfunction() + + function(export_executable_symbols target) +diff --git a/llvm/cmake/modules/CMakeLists.txt b/llvm/cmake/modules/CMakeLists.txt +index 9cf22b436fa..af757d6199a 100644 +--- llvm/cmake/modules/CMakeLists.txt ++++ llvm/cmake/modules/CMakeLists.txt +@@ -136,6 +136,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + FILES_MATCHING PATTERN *.cmake + PATTERN .svn EXCLUDE + PATTERN LLVMConfig.cmake EXCLUDE ++ PATTERN LLVMConfigExtensions.cmake EXCLUDE + PATTERN LLVMConfigVersion.cmake EXCLUDE + PATTERN LLVM-Config.cmake EXCLUDE + PATTERN GetHostTriple.cmake EXCLUDE) diff --git a/pkgs/development/compilers/llvm/10/llvm.nix b/pkgs/development/compilers/llvm/10/llvm.nix index 4496b5abcf4..eb93d8648f9 100644 --- a/pkgs/development/compilers/llvm/10/llvm.nix +++ b/pkgs/development/compilers/llvm/10/llvm.nix @@ -31,8 +31,8 @@ in stdenv.mkDerivation (rec { pname = "llvm"; inherit version; - src = fetch pname "01azqqygm83s6l1g35kqkc7da06dkc8jxpb4zsd420lmhfhw4gws"; - polly_src = fetch "polly" "00nvnh0jhi1s5gcyfnb30h9g2j18z79kipiy878bkawg53f4z2xf"; + src = fetch pname "1pa322iwqg071gxdn5wxri263j6aki6ag36xbdzbyi3g8m8v8jci"; + polly_src = fetch "polly" "0p9dmv4hxwx4f5k1v4r9b5jp7fbi71ajpmrv3xf3vmp6m4i3r0pc"; unpackPhase = '' unpackFile $src @@ -54,6 +54,11 @@ in stdenv.mkDerivation (rec { propagatedBuildInputs = [ ncurses zlib ]; + patches = [ + # 10.0.0rc3-only + ./llvm-extension-handling.patch + ]; + postPatch = optionalString stdenv.isDarwin '' substituteInPlace cmake/modules/AddLLVM.cmake \ --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ diff --git a/pkgs/development/compilers/llvm/10/openmp.nix b/pkgs/development/compilers/llvm/10/openmp.nix index ff6d77c1bf6..cff2ad36536 100644 --- a/pkgs/development/compilers/llvm/10/openmp.nix +++ b/pkgs/development/compilers/llvm/10/openmp.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "openmp"; inherit version; - src = fetch pname "1fpvpsbrrpngm8zplhdbkhnk79mhfdf3xsw1rwcfcv564gilla3w"; + src = fetch pname "0axdxar18rvk9r4yx7y55ywqr3070mixag9sg2fcck1jzwfgymjb"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ llvm ]; diff --git a/pkgs/development/compilers/mercury/default.nix b/pkgs/development/compilers/mercury/default.nix index 0327e0dc215..5c26d5ab117 100644 --- a/pkgs/development/compilers/mercury/default.nix +++ b/pkgs/development/compilers/mercury/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "mercury"; - version = "14.01.1"; + version = "20.01.1"; src = fetchurl { url = "https://dl.mercurylang.org/release/mercury-srcdist-${version}.tar.gz"; - sha256 = "12z8qi3da8q50mcsjsy5bnr4ia6ny5lkxvzy01a3c9blgbgcpxwq"; + sha256 = "0vxp9f0jmr228n13p6znhbxncav6ay0bnl4ypy6r3lw5lh7z172p"; }; buildInputs = [ gcc flex bison texinfo jdk erlang makeWrapper diff --git a/pkgs/development/compilers/rust/0001-Allow-getting-no_std-from-the-config-file.patch b/pkgs/development/compilers/rust/0001-Allow-getting-no_std-from-the-config-file.patch new file mode 100644 index 00000000000..0b9359221a7 --- /dev/null +++ b/pkgs/development/compilers/rust/0001-Allow-getting-no_std-from-the-config-file.patch @@ -0,0 +1,52 @@ +From 036c87c82793f1da9f98445e8e27462cc19bbe0a Mon Sep 17 00:00:00 2001 +From: John Ericson +Date: Sat, 22 Feb 2020 14:38:38 -0500 +Subject: [PATCH] Allow getting `no_std` from the config file + +Currently, it is only set correctly in the sanity checking implicit +default fallback code. Having a config file at all will for force +`no_std = false`. +--- + src/bootstrap/config.rs | 3 +++ + src/bootstrap/sanity.rs | 4 +--- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs +index 110c8b844d5..83a6934d477 100644 +--- a/src/bootstrap/config.rs ++++ b/src/bootstrap/config.rs +@@ -350,6 +350,7 @@ struct TomlTarget { + musl_root: Option, + wasi_root: Option, + qemu_rootfs: Option, ++ no_std: Option, + } + + impl Config { +@@ -610,6 +611,8 @@ impl Config { + target.musl_root = cfg.musl_root.clone().map(PathBuf::from); + target.wasi_root = cfg.wasi_root.clone().map(PathBuf::from); + target.qemu_rootfs = cfg.qemu_rootfs.clone().map(PathBuf::from); ++ target.no_std ++ = cfg.no_std.unwrap_or(triple.contains("-none-") || triple.contains("nvptx")); + + config.target_config.insert(INTERNER.intern_string(triple.clone()), target); + } +diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs +index 8ff7056e628..76e721ed8e3 100644 +--- a/src/bootstrap/sanity.rs ++++ b/src/bootstrap/sanity.rs +@@ -194,9 +194,7 @@ pub fn check(build: &mut Build) { + + if target.contains("-none-") || target.contains("nvptx") { + if build.no_std(*target).is_none() { +- let target = build.config.target_config.entry(target.clone()).or_default(); +- +- target.no_std = true; ++ build.config.target_config.entry(target.clone()).or_default(); + } + + if build.no_std(*target) == Some(false) { +-- +2.24.1 + diff --git a/pkgs/development/compilers/rust/1_38_0.nix b/pkgs/development/compilers/rust/1_38.nix similarity index 95% rename from pkgs/development/compilers/rust/1_38_0.nix rename to pkgs/development/compilers/rust/1_38.nix index 13d2139bffd..1521c961859 100644 --- a/pkgs/development/compilers/rust/1_38_0.nix +++ b/pkgs/development/compilers/rust/1_38.nix @@ -18,5 +18,5 @@ import ./default.nix { x86_64-apple-darwin = "b2310c97ffb964f253c4088c8d29865f876a49da2a45305493af5b5c7a3ca73d"; }; - selectRustPackage = pkgs: pkgs.rust_1_38_0; + selectRustPackage = pkgs: pkgs.rust_1_38; } diff --git a/pkgs/development/compilers/rust/1_41_0.nix b/pkgs/development/compilers/rust/1_41_0.nix deleted file mode 100644 index b73d9b8ef26..00000000000 --- a/pkgs/development/compilers/rust/1_41_0.nix +++ /dev/null @@ -1,48 +0,0 @@ -# New rust versions should first go to staging. -# Things to check after updating: -# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin: -# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github -# This testing can be also done by other volunteers as part of the pull -# request review, in case platforms cannot be covered. -# 2. The LLVM version used for building should match with rust upstream. -# 3. Firefox and Thunderbird should still build on x86_64-linux. - -{ stdenv, lib -, buildPackages -, newScope, callPackage -, CoreFoundation, Security -, llvmPackages_5 -, pkgsBuildTarget, pkgsBuildBuild -, fetchpatch -} @ args: - -import ./default.nix { - rustcVersion = "1.41.0"; - rustcSha256 = "0jypz2mrzac41sj0zh07yd1z36g2s2rvgsb8g624sk4l14n84ijm"; - - # Note: the version MUST be one version prior to the version we're - # building - bootstrapVersion = "1.40.0"; - - # fetch hashes by running `print-hashes.sh 1.40.0` - bootstrapHashes = { - i686-unknown-linux-gnu = "d050d3a1c7c45ba9c50817d45bf6d7dd06e1a4d934f633c8096b7db6ae27adc1"; - x86_64-unknown-linux-gnu = "fc91f8b4bd18314e83a617f2389189fc7959146b7177b773370d62592d4b07d0"; - arm-unknown-linux-gnueabihf = "4be9949c4d3c572b69b1df61c3506a3a3ac044851f025d38599612e7caa933c5"; - armv7-unknown-linux-gnueabihf = "ebfe3978e12ffe34276272ee6d0703786249a9be80ca50617709cbfdab557306"; - aarch64-unknown-linux-gnu = "639271f59766d291ebdade6050e7d05d61cb5c822a3ef9a1e2ab185fed68d729"; - i686-apple-darwin = "ea189b1fb0bfda367cde6d43c18863ab4c64ffca04265e5746bf412a186fe1a2"; - x86_64-apple-darwin = "749ca5e0b94550369cc998416b8854c13157f5d11d35e9b3276064b6766bcb83"; - }; - - selectRustPackage = pkgs: pkgs.rust_1_41_0; - - rustcPatches = [ - (fetchpatch { - url = "https://github.com/QuiltOS/rust/commit/f1803452b9e95bfdbc3b8763138b9f92c7d12b46.diff"; - sha256 = "1mzxaj46bq7ll617wg0mqnbnwr1da3hd4pbap8bjwhs3kfqnr7kk"; - }) - ]; -} - -(builtins.removeAttrs args [ "fetchpatch" ]) diff --git a/pkgs/development/compilers/rust/1_42.nix b/pkgs/development/compilers/rust/1_42.nix new file mode 100644 index 00000000000..8717aaf76a2 --- /dev/null +++ b/pkgs/development/compilers/rust/1_42.nix @@ -0,0 +1,44 @@ +# New rust versions should first go to staging. +# Things to check after updating: +# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin: +# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github +# This testing can be also done by other volunteers as part of the pull +# request review, in case platforms cannot be covered. +# 2. The LLVM version used for building should match with rust upstream. +# 3. Firefox and Thunderbird should still build on x86_64-linux. + +{ stdenv, lib +, buildPackages +, newScope, callPackage +, CoreFoundation, Security +, llvmPackages_5 +, pkgsBuildTarget, pkgsBuildBuild +} @ args: + +import ./default.nix { + rustcVersion = "1.42.0"; + rustcSha256 = "0x9lxs82may6c0iln0b908cxyn1cv7h03n5cmbx3j1bas4qzks6j"; + + # Note: the version MUST be one version prior to the version we're + # building + bootstrapVersion = "1.41.0"; + + # fetch hashes by running `print-hashes.sh 1.42.0` + bootstrapHashes = { + i686-unknown-linux-gnu = "a93a34f9cf3d35de2496352cb615b42b792eb09db3149b3a278efd2c58fa7897"; + x86_64-unknown-linux-gnu = "343ba8ef7397eab7b3bb2382e5e4cb08835a87bff5c8074382c0b6930a41948b"; + arm-unknown-linux-gnueabihf = "d0b33fcc97eeb96d716b30573c7e66affdf9077ecdecb30df2498b49f8284047"; + armv7-unknown-linux-gnueabihf = "3c8e787fb4f4f304a065e78c38010f0b5722d809f9dafb0e904084bf0f54f7be"; + aarch64-unknown-linux-gnu = "79ddfb5e2563d0ee09a567fbbe121a2aed3c3bc61255b2787f2dd42183a10f27"; + i686-apple-darwin = "628134b3fbaf5c0e7a25bd9a2b8d25f6e68bb256c8b04a3332ec979f5a1cd339"; + x86_64-apple-darwin = "b6504003ab70b11f278e0243a43ba9d6bf75e8ad6819b4058a2b6e3991cc8d7a"; + }; + + selectRustPackage = pkgs: pkgs.rust_1_42; + + rustcPatches = [ + ./0001-Allow-getting-no_std-from-the-config-file.patch + ]; +} + +(builtins.removeAttrs args [ "fetchpatch" ]) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 79173871095..4517db4c384 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/compilers/zz/default.nix b/pkgs/development/compilers/zz/default.nix new file mode 100644 index 00000000000..7ac59cc5869 --- /dev/null +++ b/pkgs/development/compilers/zz/default.nix @@ -0,0 +1,28 @@ +{ lib, rustPlatform, fetchFromGitHub, makeWrapper, z3 }: + +rustPlatform.buildRustPackage rec { + pname = "zz-unstable"; + version = "2020-03-02"; + + src = fetchFromGitHub { + owner = "aep"; + repo = "zz"; + rev = "2dd92b959f7c34bf99af84b263e3864a5c41a0fe"; + sha256 = "14ch5qgga2vpxvb53v4v4y6cwy3kkm10x1vbfpyfa7im57syib85"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + cargoSha256 = "1m9az3adbkx2ab6fkg64cr7f9d73jbx8kx2pmgpw29csmh9hzqjy"; + + postInstall = '' + wrapProgram $out/bin/zz --prefix PATH ":" "${lib.getBin z3}/bin" + ''; + + meta = with lib; { + description = "🍺🐙 ZetZ a zymbolic verifier and tranzpiler to bare metal C"; + homepage = "https://github.com/aep/zz"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index b9961289480..c1894d3666c 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -25,6 +25,12 @@ let params = rev = "v${version}"; sha256 = "1c34v1k37rk7v0xk2czv5n79mbjxjrm6nh3llg2mpfmdsqi68wf3"; }; + + "8.10" = rec { + version = "1.2.0"; + rev = "v${version}"; + sha256 = "1xs4mr3rdb0g44736jb40k370hw3maxdk12jiq1w1dl3q5gfrhah"; + }; }; param = params.${coq.coq-version}; in diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix index 49288d3cb32..300c5a9f448 100644 --- a/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/pkgs/development/coq-modules/dpdgraph/default.nix @@ -1,6 +1,18 @@ { stdenv, fetchFromGitHub, autoreconfHook, coq }: let params = { + "8.11" = { + version = "0.6.7"; + sha256 = "01vpi7scvkl4ls1z2k2x9zd65wflzb667idj759859hlz3ps9z09"; + }; + "8.10" = { + version = "0.6.6"; + sha256 = "1gjrm5zjzw4cisiwdr5b3iqa7s4cssa220xr0k96rwgk61rcjd8w"; + }; + "8.9" = { + version = "0.6.5"; + sha256 = "1f34z24yg05b1096gqv36jr3vffkcjkf9qncii3pzhhvagxd0w2f"; + }; "8.8" = { version = "0.6.3"; rev = "0acbd0a594c7e927574d5f212cc73a486b5305d2"; @@ -18,7 +30,6 @@ let params = { }; "8.5" = { version = "0.6"; - rev = "v0.6"; sha256 = "0qvar8gfbrcs9fmvkph5asqz4l5fi63caykx3bsn8zf0xllkwv0n"; }; }; @@ -30,7 +41,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "Karmaki"; repo = "coq-dpdgraph"; - inherit (param) rev sha256; + rev = param.rev or "v${param.version}"; + inherit (param) sha256; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/coq-modules/hierarchy-builder/default.nix b/pkgs/development/coq-modules/hierarchy-builder/default.nix new file mode 100644 index 00000000000..ee9c6cb75cf --- /dev/null +++ b/pkgs/development/coq-modules/hierarchy-builder/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, which, coq, coq-elpi }: + +let + versions = { + "0.9.0" = { + rev = "v0.9.0"; + sha256 = "1yss9f732r7bjaswgn46vd1rr3688ir0vz37wxkmy598xhrnd2ak"; + }; + }; + version = x: versions.${x} // {version = x;}; + params = { + "8.10" = version "0.9.0"; + "8.11" = version "0.9.0"; + }; + param = params.${coq.coq-version}; +in + +stdenv.mkDerivation rec { + name = "coq${coq.coq-version}-hierarchy-builder-${param.version}"; + + src = fetchFromGitHub { + owner = "math-comp"; + repo = "hierarchy-builder"; + inherit (param) rev sha256; + }; + + propagatedBuildInputs = [ coq-elpi ]; + buildInputs = [ coq coq.ocaml coq.ocamlPackages.elpi ]; + + installPhase = ''make -f Makefile.coq VFILES=structures.v COQLIB=$out/lib/coq/${coq.coq-version}/ install''; + + meta = { + description = "Coq plugin embedding ELPI."; + maintainers = [ stdenv.lib.maintainers.cohencyril ]; + license = stdenv.lib.licenses.lgpl21; + inherit (coq.meta) platforms; + inherit (src.meta) homepage; + }; + + passthru = { + compatibleCoqVersions = stdenv.lib.flip builtins.hasAttr params; + }; +} diff --git a/pkgs/development/coq-modules/simple-io/default.nix b/pkgs/development/coq-modules/simple-io/default.nix index e74b158d33a..07ce35875d1 100644 --- a/pkgs/development/coq-modules/simple-io/default.nix +++ b/pkgs/development/coq-modules/simple-io/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { }; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.7" "8.8" "8.9" ]; + compatibleCoqVersions = v: builtins.elem v [ "8.7" "8.8" "8.9" "8.10" ]; }; } diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 1bffb71e8f9..1bf13c18821 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -210,7 +210,7 @@ let disallowedReferences = lib.optional (!allowGoReference) go; - passthru = passthru // { inherit go go-modules; }; + passthru = passthru // { inherit go go-modules modSha256; }; meta = { # Add default meta information diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0901af4e7b3..90819d64c33 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 @@ -1072,8 +1073,35 @@ self: super: { # Generate shell completion. cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix; - stack = generateOptparseApplicativeCompletion "stack" (super.stack.overrideScope (self: super: { - })); + + stack = + let + stackWithOverrides = + super.stack.override { + # stack-2.1.3.1 requires pantry-0.2.0.0. + pantry = self.pantry_0_2_0_0; + }; + in + generateOptparseApplicativeCompletion + "stack" + (appendPatches stackWithOverrides [ + # This PR fixes stack up to be able to build with Cabal-3. This patch + # can probably be dropped when the next stack release is made after + # 2.1.3.1. + (pkgs.fetchpatch { + url = "https://github.com/commercialhaskell/stack/pull/5156.diff"; + sha256 = "0knk6f9fh1b4fxkhvx5gfrwclal4vi2va4zy34gpmwnjr7knf42y"; + excludes = [ + "snapshot-lts-12.yaml" + "snapshot-nightly.yaml" + "snapshot.yaml" + ]; + }) + # This patch fixes stack up to be able to build various GHC-8.8 changes. + # This can hopefully be dropped when the next stack release is made + # after 2.1.3.1 (assuming the next stack release uses GHC-8.8). + ./patches/stack-ghc882-support.patch + ]); # musl fixes # dontCheck: use of non-standard strptime "%s" which musl doesn't support; only used in test @@ -1192,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 @@ -1306,11 +1340,6 @@ self: super: { # https://github.com/haskell-servant/servant-ekg/issues/15 servant-ekg = doJailbreak super.servant-ekg; - # Needs ghc-lib-parser 8.8.1 (does not build with 8.8.0) - ormolu = doJailbreak (super.ormolu.override { - ghc-lib-parser = self.ghc-lib-parser_8_8_3_20200224; - }); - # krank-0.1.0 does not accept PyF-0.9.0.0. krank = doJailbreak super.krank; @@ -1401,4 +1430,70 @@ self: super: { # https://github.com/bergmark/feed/issues/43 feed = dontCheck super.feed; + pantry_0_2_0_0 = appendPatches (dontCheck super.pantry_0_2_0_0) [ + # pantry-0.2.0.0 doesn't build with ghc-8.8, but there is a PR adding support. + # https://github.com/commercialhaskell/pantry/pull/6 + # Currently stack-2.1.3.1 requires pantry-0.2.0.0, but when a newer version of + # stack is released, it will probably use the newer pantry version, so we + # can completely get rid of pantry-0.2.0.0. + (pkgs.fetchpatch { + url = "https://github.com/commercialhaskell/pantry/pull/6.diff"; + sha256 = "0aml06jshpjh3aiscs5av7y33m3d6s6x5pzdvh7pky476izfg87k"; + excludes = [ + ".azure/azure-linux-template.yml" + ".azure/azure-osx-template.yml" + ".azure/azure-windows-template.yml" + "package.yaml" + "pantry.cabal" + "stack-lts-11.yaml" + "stack-lts-12.yaml" + "stack-nightly.yaml" + "stack-windows.yaml" + "stack.yaml" + ]; + }) + ]; + + # https://github.com/serokell/nixfmt/pull/62 + nixfmt = doJailbreak super.nixfmt; + + # https://github.com/phadej/binary-orphans/issues/45 + binary-instances = dontCheck super.binary-instances; + + # Disabling the test suite lets the build succeed on older CPUs + # that are unable to run the generated library because they + # lack support for AES-NI, like some of our Hydra build slaves + # do. See https://github.com/NixOS/nixpkgs/issues/81915 for + # details. + cryptonite = dontCheck super.cryptonite; + + # The test suite depends on an impure cabal-install installation + # in $HOME, which we don't have in our build sandbox. + cabal-install-parsers = dontCheck super.cabal-install-parsers; + + # 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-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index d42c2c5f6cf..1b5f64bea6b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -90,4 +90,8 @@ self: super: { # https://github.com/kowainik/relude/issues/241 relude = dontCheck super.relude; + # The tests for semver-range need to be updated for the MonadFail change in + # ghc-8.8: + # https://github.com/adnelson/semver-range/issues/15 + semver-range = dontCheck super.semver-range; } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 42223a656f8..3c684570533 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.1 + # LTS Haskell 15.3 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -104,7 +104,7 @@ default-package-overrides: - aeson-schemas ==1.0.3 - aeson-utils ==0.3.0.2 - aeson-yak ==0.1.1.3 - - aeson-yaml ==1.0.5.0 + - aeson-yaml ==1.0.6.0 - al ==0.1.4.2 - alerts ==0.1.2.0 - alex ==3.2.5 @@ -266,7 +266,7 @@ default-package-overrides: - autoexporter ==1.1.15 - auto-update ==0.1.6 - avers ==0.0.17.1 - - avro ==0.4.6.0 + - avro ==0.4.7.0 - aws-cloudfront-signed-cookies ==0.2.0.1 - base16-bytestring ==0.1.1.6 - base32string ==0.9.1 @@ -354,13 +354,14 @@ default-package-overrides: - bv ==0.5 - bv-little ==1.1.1 - byteable ==0.1.1 + - bytebuild ==0.3.4.0 - bytedump ==1.0 - byte-order ==0.1.2.0 - byteorder ==1.0.4 - bytes ==0.17 - byteset ==0.1.1.0 - - byteslice ==0.2.1.0 - - bytesmith ==0.3.5.0 + - byteslice ==0.2.2.0 + - bytesmith ==0.3.6.0 - bytestring-builder ==0.10.8.2.0 - bytestring-conversion ==0.3.1 - bytestring-lexing ==0.5.0.2 @@ -373,7 +374,7 @@ default-package-overrides: - cabal-doctest ==1.0.8 - cabal-flatpak ==0.1 - cabal-plan ==0.6.2.0 - - cabal-rpm ==2.0.2 + - cabal-rpm ==2.0.4 - cache ==0.1.3.0 - cacophony ==0.10.1 - calendar-recycling ==0.0.0.1 @@ -390,7 +391,7 @@ default-package-overrides: - cassava-megaparsec ==2.0.1 - cast ==0.1.0.2 - category ==0.2.5.0 - - cayley-client ==0.4.11 + - cayley-client ==0.4.12 - cborg ==0.2.2.1 - cborg-json ==0.2.2.0 - cereal ==0.5.8.1 @@ -406,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 @@ -443,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 @@ -498,7 +499,7 @@ default-package-overrides: - core-text ==0.2.3.3 - countable ==1.0 - cpio-conduit ==0.7.0 - - cpphs ==1.20.8 + - cpphs ==1.20.9 - cprng-aes ==0.6.1 - cpu ==0.1.2 - cpuinfo ==0.1.0.1 @@ -576,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 @@ -584,7 +585,7 @@ default-package-overrides: - declarative ==0.5.2 - deepseq-generics ==0.2.0.0 - deferred-folds ==0.9.10.1 - - dejafu ==2.1.0.1 + - dejafu ==2.1.0.3 - dense-linear-algebra ==0.1.0.0 - deque ==0.4.3 - deriveJsonNoPrefix ==0.1.0.1 @@ -661,6 +662,7 @@ default-package-overrides: - elerea ==2.9.0 - elf ==0.30 - eliminators ==0.6 + - elm2nix ==0.2 - elm-bridge ==0.5.2 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 @@ -705,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 @@ -724,11 +726,11 @@ default-package-overrides: - fft ==0.1.8.6 - fgl ==5.7.0.2 - filecache ==0.4.1 - - file-embed ==0.0.11.1 + - file-embed ==0.0.11.2 - file-embed-lzma ==0 - filelock ==0.1.1.4 - filemanip ==0.3.6.3 - - filepattern ==0.1.1 + - filepattern ==0.1.2 - fileplow ==0.1.0.0 - filtrable ==0.1.3.0 - fin ==0.1.1 @@ -783,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 @@ -836,9 +838,9 @@ default-package-overrides: - ghcid ==0.8.1 - ghci-hexcalc ==0.1.1.0 - ghcjs-codemirror ==0.0.0.2 - - ghc-lib ==8.8.2.20200205 - - ghc-lib-parser ==8.8.2.20200205 - - ghc-lib-parser-ex ==8.8.5.2 + - ghc-lib ==8.8.3.20200224 + - ghc-lib-parser ==8.8.3.20200224 + - ghc-lib-parser-ex ==8.8.5.3 - ghc-paths ==0.1.0.12 - ghc-prof ==1.4.1.6 - ghc-source-gen ==0.3.0.0 @@ -866,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 @@ -882,7 +884,7 @@ default-package-overrides: - gluturtle ==0.0.58.1 - gnuplot ==0.5.6.1 - google-isbn ==1.0.3 - - gothic ==0.1.3 + - gothic ==0.1.4 - gpolyline ==0.1.0.1 - graph-core ==0.3.0.0 - graphite ==0.10.0.1 @@ -903,6 +905,7 @@ default-package-overrides: - hamtsolo ==1.0.3 - HandsomeSoup ==0.4.2 - happy ==1.19.12 + - HasBigDecimal ==0.1.1 - hashable ==1.3.0.0 - hashable-time ==0.2.0.2 - hashids ==1.0.2.4 @@ -959,7 +962,7 @@ default-package-overrides: - hinotify ==0.4 - hint ==0.9.0.2 - hjsmin ==0.2.0.4 - - hkgr ==0.2.4.1 + - hkgr ==0.2.5.2 - hlibcpuid ==0.2.0 - hlibgit2 ==0.18.0.16 - hmatrix ==0.20.0.0 @@ -1056,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 @@ -1078,7 +1081,7 @@ default-package-overrides: - hw-mquery ==0.2.0.2 - hw-packed-vector ==0.2.0.1 - hw-parser ==0.1.0.2 - - hw-prim ==0.6.2.39 + - hw-prim ==0.6.2.40 - hw-rankselect ==0.13.3.2 - hw-rankselect-base ==0.3.3.0 - hw-simd ==0.1.1.5 @@ -1121,6 +1124,7 @@ default-package-overrides: - ini ==0.4.1 - inj ==1.0 - inline-c ==0.9.0.0 + - inline-c-cpp ==0.4.0.2 - insert-ordered-containers ==0.2.3 - inspection-testing ==0.4.2.2 - instance-control ==0.1.2.0 @@ -1163,6 +1167,7 @@ default-package-overrides: - ix-shapable ==0.1.0 - jack ==0.7.1.4 - jira-wiki-markup ==1.0.0 + - jose ==0.8.2.0 - jose-jwt ==0.8.0 - js-dgtable ==0.5.2 - js-flot ==0.8.3 @@ -1172,7 +1177,7 @@ default-package-overrides: - jsonpath ==0.2.0.0 - json-rpc ==1.0.1 - json-rpc-generic ==0.2.1.5 - - JuicyPixels ==3.3.4 + - JuicyPixels ==3.3.5 - JuicyPixels-extra ==0.4.1 - JuicyPixels-scale-dct ==0.1.2 - junit-xml ==0.1.0.0 @@ -1197,7 +1202,7 @@ default-package-overrides: - lackey ==1.0.11 - LambdaHack ==0.9.5.0 - lame ==0.2.0 - - language-avro ==0.1.0.0 + - language-avro ==0.1.2.0 - language-c ==0.8.3 - language-c-quote ==0.12.2.1 - language-haskell-extract ==0.2.4 @@ -1282,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 @@ -1326,13 +1331,14 @@ 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 - mixed-types-num ==0.4.0.1 + - mixpanel-client ==0.2.1 - mltool ==0.2.0.1 - mmap ==0.5.9 - mmark ==0.0.7.2 @@ -1350,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 @@ -1545,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 @@ -1612,7 +1618,7 @@ default-package-overrides: - pretty-sop ==0.2.0.3 - pretty-types ==0.3.0.1 - primes ==0.2.1.0 - - primitive ==0.7.0.0 + - primitive ==0.7.0.1 - primitive-addr ==0.1.0.2 - primitive-extras ==0.8 - primitive-offset ==0.2.0.0 @@ -1733,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 @@ -1741,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 @@ -1767,7 +1773,7 @@ default-package-overrides: - SafeSemaphore ==0.10.1 - salak ==0.3.5.3 - salak-yaml ==0.3.5.3 - - saltine ==0.1.0.2 + - saltine ==0.1.1.0 - salve ==1.0.8 - sample-frame ==0.0.3 - sample-frame-np ==0.0.4.1 @@ -1786,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 @@ -1809,6 +1815,9 @@ default-package-overrides: - serf ==0.1.1.0 - serialise ==0.2.2.0 - servant ==0.16.2 + - servant-auth ==0.3.2.0 + - servant-auth-server ==0.4.5.1 + - servant-auth-swagger ==0.2.10.0 - servant-blaze ==0.9 - servant-cassava ==0.10 - servant-checked-exceptions ==2.2.0.0 @@ -1836,6 +1845,7 @@ default-package-overrides: - servant-swagger-ui-redoc ==0.3.3.1.22.3 - servant-websockets ==2.0.0 - servant-yaml ==0.1.0.1 + - serverless-haskell ==0.10.1 - serversession ==1.0.1 - serversession-frontend-wai ==1.0 - ses-html ==0.4.0.0 @@ -1881,7 +1891,7 @@ default-package-overrides: - skylighting ==0.8.3.2 - skylighting-core ==0.8.3.2 - slist ==0.1.0.0 - - small-bytearray-builder ==0.3.3.0 + - small-bytearray-builder ==0.3.4.0 - smallcheck ==1.1.5 - smoothie ==0.4.2.10 - snap-blaze ==0.2.1.5 @@ -1907,7 +1917,7 @@ default-package-overrides: - Spintax ==0.3.3 - splice ==0.6.1.1 - split ==0.2.3.4 - - splitmix ==0.0.3 + - splitmix ==0.0.4 - spoon ==0.3.1 - spreadsheet ==0.1.3.8 - sql-words ==0.1.6.3 @@ -1970,6 +1980,7 @@ default-package-overrides: - symengine ==0.1.2.0 - sysinfo ==0.1.1 - system-argv0 ==0.1.1 + - systemd ==2.2.0 - system-fileio ==0.3.16.4 - system-filepath ==0.4.14 - system-info ==0.5.1 @@ -2039,7 +2050,7 @@ default-package-overrides: - text-printer ==0.5.0.1 - text-region ==0.3.1.0 - text-short ==0.1.3 - - text-show ==3.8.4 + - text-show ==3.8.5 - text-show-instances ==3.8.3 - text-zipper ==0.10.1 - tfp ==1.0.1.1 @@ -2167,14 +2178,14 @@ 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 - unordered-containers ==0.2.10.0 - unordered-intmap ==0.1.1 - unsafe ==0.0 - - urbit-hob ==0.3.1 + - urbit-hob ==0.3.2 - uri-bytestring ==0.3.2.2 - uri-bytestring-aeson ==0.1.0.7 - uri-encode ==1.5.0.5 @@ -2228,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 @@ -2313,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 @@ -2333,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.0 + - zip ==1.3.2 - zip-archive ==0.4.1 - zippers ==0.3 - zip-stream ==0.2.0.1 @@ -2348,7 +2359,6 @@ extra-packages: - ansi-terminal == 0.10.3 # required by cabal-plan, and policeman in ghc-8.8.x - aeson-pretty < 0.8 # required by elm compiler - apply-refact < 0.4 # newer versions don't work with GHC 8.0.x - - aws ^>= 0.18 # pre-lts-11.x versions neeed by git-annex 6.20180227 - binary > 0.7 && < 0.8 # keep a 7.x major release around for older compilers - binary > 0.8 && < 0.9 # keep a 8.x major release around for older compilers - blank-canvas < 0.6.3 # more recent versions depend on base-compat-batteries == 0.10.* but we're on base-compat-0.9.* @@ -2386,6 +2396,7 @@ extra-packages: - network == 3.0.* # required by network-bsd, HTTP, and many others (2019-04-30) - parallel == 3.2.0.3 # newer versions don't work with GHC 6.12.3 - patience ^>= 0.1 # required by chell-0.4.x + - pantry == 0.2.0.0 # required by stack-2.1.3.1 - persistent >=2.5 && <2.8 # pre-lts-11.x versions neeed by git-annex 6.20180227 - persistent-sqlite < 2.7 # pre-lts-11.x versions neeed by git-annex 6.20180227 - prettyprinter == 1.6.1 # required by ghc 8.8.x, and dhall-1.29.0 @@ -2836,6 +2847,7 @@ broken-packages: - arbor-monad-metric - arbor-monad-metric-datadog - arbtt + - archive-tar-bytestring - archiver - archlinux - archlinux-web @@ -2909,8 +2921,6 @@ broken-packages: - atomic-primops-vector - atomo - atp-haskell - - ats-format - - ats-pkg - ats-setup - ats-storable - attempt @@ -2957,29 +2967,17 @@ broken-packages: - awesomium - awesomium-glut - awesomium-raw - - aws - aws-configuration-tools - aws-dynamodb-conduit - - aws-dynamodb-streams - - aws-easy - - aws-ec2 - aws-ec2-knownhosts - aws-elastic-transcoder - - aws-general - - aws-kinesis - aws-kinesis-client - aws-kinesis-reshard - - aws-lambda - - aws-lambda-haskell-runtime - aws-mfa-credentials - aws-performance-tests - - aws-route53 - aws-sdk - - aws-sdk-text-converter - - aws-sdk-xml-unordered - aws-sign4 - aws-simple - - aws-sns - axel - axiom - azubi @@ -3095,7 +3093,6 @@ broken-packages: - binary-ext - binary-file - binary-indexed-tree - - binary-instances - binary-protocol - binary-protocol-zmq - binary-search @@ -3181,6 +3178,8 @@ broken-packages: - bitcoin-rpc - bitcoin-script - bitcoin-tx + - bitcoind-regtest + - bitcoind-rpc - Bitly - bitly-cli - bitmaps @@ -3359,7 +3358,6 @@ broken-packages: - cabal-install-bundle - cabal-install-ghc72 - cabal-install-ghc74 - - cabal-install-parsers - cabal-lenses - cabal-meta - cabal-mon @@ -3430,6 +3428,7 @@ broken-packages: - carte - cartel - Cartesian + - cas-store - casa-abbreviations-and-acronyms - casadi-bindings - casadi-bindings-control @@ -4386,8 +4385,6 @@ broken-packages: - edentv - edge - edges - - EdisonAPI - - EdisonCore - edit - edit-lenses - editable @@ -5085,7 +5082,6 @@ broken-packages: - git-repair - git-sanity - gitdo - - github - github-backup - github-data - github-release @@ -5284,7 +5280,6 @@ broken-packages: - gtfs-realtime - gtk-jsinput - gtk-serialized-event - - gtk-sni-tray - gtk-toy - gtk2hs-hello - gtk2hs-rpn @@ -5504,7 +5499,6 @@ broken-packages: - haskell-bitmex-client - haskell-bitmex-rest - haskell-brainfuck - - haskell-ci - haskell-cnc - haskell-coffee - haskell-compression @@ -5520,9 +5514,7 @@ broken-packages: - haskell-go-checkers - haskell-in-space - haskell-kubernetes - - haskell-lsp - haskell-lsp-client - - haskell-lsp-types - haskell-ml - haskell-mpfr - haskell-names @@ -7070,6 +7062,7 @@ broken-packages: - liquid-fixpoint - liquidhaskell - liquidhaskell-cabal + - Liquorice - list-fusion-probe - list-mux - list-prompt @@ -7182,7 +7175,6 @@ broken-packages: - ls-usb - lscabal - LslPlus - - lsp-test - lsystem - ltext - ltk @@ -7803,7 +7795,6 @@ broken-packages: - nix-eval - nix-freeze-tree - nix-tools - - nixfmt - nixfromnpm - nixpkgs-update - nkjp @@ -8026,7 +8017,6 @@ broken-packages: - pangraph - panpipe - pansite - - pantry - pantry-tmp - papa - papa-base @@ -8166,7 +8156,6 @@ broken-packages: - persistent-map - persistent-migration - persistent-mongoDB - - persistent-mysql - persistent-mysql-haskell - persistent-protobuf - persistent-ratelimit @@ -8989,7 +8978,6 @@ broken-packages: - sajson - salak-toml - Salsa - - saltine - saltine-quickcheck - salvia - salvia-demo @@ -9108,7 +9096,6 @@ broken-packages: - semigroups-actions - semiring - semiring-num - - semver-range - sendgrid-haskell - sendgrid-v3 - sensei @@ -9388,7 +9375,6 @@ broken-packages: - smuggler - snake - snake-game - - snap - snap-accept - snap-auth-cli - snap-blaze-clay @@ -9573,7 +9559,6 @@ broken-packages: - stable-marriage - stable-memo - stable-tree - - stack - stack-bump - stack-fix - stack-hpc-coveralls @@ -9624,7 +9609,6 @@ broken-packages: - statsd - statsd-client - statsdi - - status-notifier-item - statvfs - stb-image-redux - stc-lang @@ -9812,7 +9796,6 @@ broken-packages: - Tablify - tabloid - tabs - - taffybar - tag-bits - tag-stream - tagged-exception-core @@ -10140,6 +10123,7 @@ broken-packages: - tree-sitter-json - tree-sitter-php - tree-sitter-python + - tree-sitter-ql - tree-sitter-ruby - tree-sitter-tsx - tree-sitter-typescript @@ -10699,7 +10683,6 @@ broken-packages: - xchat-plugin - xcp - xdcc - - xdg-desktop-entry - xdot - Xec - xenstore @@ -10976,5 +10959,3 @@ broken-packages: - ztar - zuramaru - Zwaluw - - zxcvbn-dvorak - - zxcvbn-hs diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index da63ec0c22a..5824ce2f5e6 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -635,11 +635,19 @@ self: super: builtins.intersectAttrs super { spago = let + # Spago needs a patch for MonadFail changes. + # https://github.com/purescript/spago/pull/584 + # This can probably be removed when a version after spago-0.14.0 is released. + spagoWithPatches = appendPatch super.spago (pkgs.fetchpatch { + url = "https://github.com/purescript/spago/pull/584/commits/898a8e48665e5a73ea03525ce2c973455ab9ac52.patch"; + sha256 = "05gs1hjlcf60cr6728rhgwwgxp3ildly14v4l2lrh6ma2fljhyjy"; + }); + # Spago basically compiles with LTS-14, but it requires a newer version # of directory. This is to work around a bug only present on windows, so # we can safely jailbreak spago and use the older directory package from # LTS-14. - spagoWithOverrides = doJailbreak (super.spago.override { + spagoWithOverrides = doJailbreak (spagoWithPatches.override { # spago requires dhall-1.29.0. dhall = self.dhall_1_29_0; }); @@ -710,4 +718,8 @@ self: super: builtins.intersectAttrs super { # break infinite recursion with base-orphans primitive = dontCheck super.primitive; + # dhall-1.29.0 tests access the network. This override can be removed when + # dhall_1_29_0 is no longer used, since more recent versions of dhall don't + # access the network in checks. + dhall_1_29_0 = dontCheck super.dhall_1_29_0; } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 7f596626cde..2caf04f479a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2974,8 +2974,8 @@ self: { }: mkDerivation { pname = "Chart-fltkhs"; - version = "0.1.0.5"; - sha256 = "1fyi7h3n7n3r0y71j938h4gppr7ywdgj5s2qjjpykh144xqixmdf"; + version = "0.1.0.6"; + sha256 = "0wj0im5y76ag10li9ra285z1hdbsx467p2q72clpqa1whasfja2q"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -3297,8 +3297,8 @@ self: { }: mkDerivation { pname = "Color"; - version = "0.1.3.1"; - sha256 = "0a4ljaqb1a8v622v99n37abas7xhzlmykbz5lm1q9xjs596qx357"; + version = "0.1.4"; + sha256 = "155h0zyl7gqpks4441ib4vjcdqpijmza0hx19lifg6kjvygpfj6d"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base data-default-class deepseq vector ]; testHaskellDepends = [ @@ -5097,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 @@ -5114,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 @@ -8870,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"; @@ -9562,8 +9558,8 @@ self: { }: mkDerivation { pname = "HaTeX"; - version = "3.22.0.0"; - sha256 = "06n5r66giqwg9235fdzlky181ll1n7qlqhc9nv8gsb8dv9a6a6yv"; + version = "3.22.1.0"; + sha256 = "1an10gxrhb6kxrp2hgmya6bx06xmr6y4dhvz5wnz6jqavnv2mmwh"; libraryHaskellDepends = [ base bibtex bytestring containers hashable matrix parsec prettyprinter QuickCheck text transformers @@ -11550,22 +11546,6 @@ self: { }) {}; "JuicyPixels" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl - , primitive, transformers, vector, zlib - }: - mkDerivation { - pname = "JuicyPixels"; - version = "3.3.4"; - sha256 = "0qacrnz2qcykj3f6c4k2p8qd31pa2slpv3ykfblgizrfh3401q6x"; - libraryHaskellDepends = [ - base binary bytestring containers deepseq mtl primitive - transformers vector zlib - ]; - description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "JuicyPixels_3_3_5" = callPackage ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl , primitive, transformers, vector, zlib }: @@ -11579,7 +11559,6 @@ self: { ]; description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "JuicyPixels-blp" = callPackage @@ -12511,6 +12490,20 @@ self: { broken = true; }) {}; + "Liquorice" = callPackage + ({ mkDerivation, base, binary, bytestring, HTF, mtl }: + mkDerivation { + pname = "Liquorice"; + version = "0.0.1"; + sha256 = "067vnmm74wrdjpy4syabn8l2gr11s4pfarn6156mfhf981svnzqd"; + libraryHaskellDepends = [ base binary bytestring HTF mtl ]; + testHaskellDepends = [ base binary bytestring HTF mtl ]; + description = "Algorithmic Doom map generation"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "List" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -18424,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 @@ -23528,6 +23535,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson-combinators" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, fail, hspec + , scientific, text, time, time-compat, unordered-containers + , utf8-string, uuid-types, vector, void + }: + mkDerivation { + pname = "aeson-combinators"; + version = "0.0.2.1"; + sha256 = "1a087940jpbnc2rc7cs4xj6kq1wv7b5ibhaimj7f6jglrn9xjgf0"; + libraryHaskellDepends = [ + aeson base bytestring containers fail scientific text time + time-compat unordered-containers uuid-types vector void + ]; + testHaskellDepends = [ + aeson base bytestring hspec text utf8-string + ]; + description = "Aeson combinators for dead simple JSON decoding"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "aeson-compat" = callPackage ({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, base , base-compat, base-orphans, bytestring, containers, exceptions @@ -24082,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 @@ -24240,16 +24267,16 @@ self: { }) {}; "aeson-value-parser" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, mtl + ({ mkDerivation, aeson, attoparsec, base, bytestring, hashable, mtl , scientific, text, transformers, unordered-containers, vector }: mkDerivation { pname = "aeson-value-parser"; - version = "0.16"; - sha256 = "07l08rbx7xdp0jnr672skmisaa5wikpn6h43m6i9l7l7x1937b38"; + version = "0.18"; + sha256 = "1n288jb8ksjb6psgal4q6p7ad13sdak3llk54nc0gg5w2r20x634"; libraryHaskellDepends = [ - aeson attoparsec base bytestring mtl scientific text transformers - unordered-containers vector + aeson attoparsec base bytestring hashable mtl scientific text + transformers unordered-containers vector ]; description = "API for parsing \"aeson\" JSON tree into Haskell types"; license = stdenv.lib.licenses.mit; @@ -24267,29 +24294,6 @@ self: { }) {}; "aeson-yaml" = callPackage - ({ mkDerivation, aeson, base, bytestring, string-qq, tasty - , tasty-discover, tasty-hunit, text, unordered-containers, vector - , yaml - }: - mkDerivation { - pname = "aeson-yaml"; - version = "1.0.5.0"; - sha256 = "0cx54xqv2w4lcnnmcwapbizxjzxaf0x2xbr7lbhcy380nx99pi73"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring text unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring string-qq tasty tasty-discover tasty-hunit - unordered-containers yaml - ]; - testToolDepends = [ tasty-discover ]; - description = "Output any Aeson value as YAML (pure Haskell library)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "aeson-yaml_1_0_6_0" = callPackage ({ mkDerivation, aeson, base, bytestring, string-qq, tasty , tasty-discover, tasty-hunit, text, unordered-containers, vector , yaml @@ -24310,7 +24314,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "Output any Aeson value as YAML (pure Haskell library)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "affection" = callPackage @@ -24931,8 +24934,8 @@ self: { }: mkDerivation { pname = "alarmclock"; - version = "0.7.0.2"; - sha256 = "0sp9h8vy8i4pvyadnb1ibpxpfxjikdr9ds3y9y8321cmkprlbs87"; + version = "0.7.0.4"; + sha256 = "0am8q26yj29k82y9bsgrlqxam1wllzdnxjbwqx4cgmjkzr7x802j"; libraryHaskellDepends = [ async base clock stm time unbounded-delays ]; @@ -31108,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 @@ -31196,8 +31217,8 @@ self: { }: mkDerivation { pname = "arduino-copilot"; - version = "1.5.0"; - sha256 = "0g2mhav0v9q9f3wbb7i42zdkx6wfl3mp6ikmvg4sglv5356z4xw6"; + version = "1.5.1"; + sha256 = "0j7j2npipgd6jrlm9gn76ia3xbpnbiicn125ii673qzfgfzmgwrh"; libraryHaskellDepends = [ base containers copilot copilot-c99 copilot-language directory filepath mtl optparse-applicative unix @@ -31470,8 +31491,8 @@ self: { }: mkDerivation { pname = "arithmetic"; - version = "1.5"; - sha256 = "0angjp341sfij8lqns74k6pwazdc679bd19fxphqab91cj9p9s56"; + version = "1.6"; + sha256 = "1k448bgs99i5lg87jvbfy63p4h1n2g6ldb4a0vig5ym7q5yhjkdc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -33360,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 @@ -33396,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 @@ -34012,8 +34029,8 @@ self: { }: mkDerivation { pname = "aura"; - version = "2.2.0"; - sha256 = "0cgba7f5nnbapxyb180kd5v69jj47zb2j43r5xf233dxw6ac7a8w"; + version = "2.2.1"; + sha256 = "01biz0slwjn9pbjfpg2lc1fywjyk9y0zvhjrbv4kx9nxnbrb7b2b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -34515,42 +34532,6 @@ self: { }) {}; "avro" = callPackage - ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors - , binary, bytestring, containers, data-binary-ieee754, deepseq - , directory, doctest, doctest-discover, extra, fail, gauge - , hashable, hspec, hspec-discover, lens, lens-aeson, mtl - , QuickCheck, random, raw-strings-qq, scientific, semigroups - , tagged, template-haskell, text, tf-random, transformers - , unordered-containers, vector, zlib - }: - mkDerivation { - pname = "avro"; - version = "0.4.6.0"; - sha256 = "127w8pny2ah05wa44khqs53vdyh54jlxvihxhpqk94wx8ggg00vx"; - libraryHaskellDepends = [ - aeson array base base16-bytestring bifunctors binary bytestring - containers data-binary-ieee754 deepseq fail hashable mtl scientific - semigroups tagged template-haskell text tf-random - unordered-containers vector zlib - ]; - testHaskellDepends = [ - aeson array base base16-bytestring bifunctors binary bytestring - containers directory doctest doctest-discover extra fail hashable - hspec lens lens-aeson mtl QuickCheck raw-strings-qq scientific - semigroups tagged template-haskell text tf-random transformers - unordered-containers vector zlib - ]; - testToolDepends = [ doctest-discover hspec-discover ]; - benchmarkHaskellDepends = [ - aeson base bytestring containers gauge hashable mtl random - raw-strings-qq template-haskell text transformers - unordered-containers vector - ]; - description = "Avro serialization support for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "avro_0_4_7_0" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors , binary, bytestring, containers, data-binary-ieee754, deepseq , directory, doctest, doctest-discover, extra, fail, gauge @@ -34584,7 +34565,6 @@ self: { ]; description = "Avro serialization support for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "avro-piper" = callPackage @@ -34698,13 +34678,13 @@ self: { broken = true; }) {awesomium = null;}; - "aws_0_18" = callPackage + "aws" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , base64-bytestring, blaze-builder, byteable, bytestring - , case-insensitive, cereal, conduit, conduit-combinators - , conduit-extra, containers, cryptonite, data-default, directory - , errors, filepath, http-client, http-client-tls, http-conduit - , http-types, lifted-base, memory, monad-control, mtl, network + , case-insensitive, cereal, conduit, conduit-extra, containers + , cryptonite, data-default, directory, errors, exceptions, filepath + , http-client, http-client-tls, http-conduit, http-types + , lifted-base, memory, monad-control, mtl, network, network-bsd , old-locale, QuickCheck, quickcheck-instances, resourcet, safe , scientific, tagged, tasty, tasty-hunit, tasty-quickcheck, text , time, transformers, transformers-base, unordered-containers @@ -34712,48 +34692,8 @@ self: { }: mkDerivation { pname = "aws"; - version = "0.18"; - sha256 = "0h7473wkvc5xjzx5fd5k5fp70rjq5gqmn1cpy95mswvvfsq3irxj"; - revision = "1"; - editedCabalFile = "0y3xkhnaksj926khsy1d8gks2jzphkaibi97h98l47nbh962ickj"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base base16-bytestring base64-bytestring - blaze-builder byteable bytestring case-insensitive cereal conduit - conduit-extra containers cryptonite data-default directory filepath - http-conduit http-types lifted-base memory monad-control mtl - network old-locale resourcet safe scientific tagged text time - transformers unordered-containers utf8-string vector xml-conduit - ]; - testHaskellDepends = [ - aeson base bytestring conduit-combinators errors http-client - http-client-tls http-types lifted-base monad-control mtl QuickCheck - quickcheck-instances resourcet tagged tasty tasty-hunit - tasty-quickcheck text time transformers transformers-base - ]; - description = "Amazon Web Services (AWS) for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "aws" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , base64-bytestring, blaze-builder, byteable, bytestring - , case-insensitive, cereal, conduit, conduit-extra, containers - , cryptonite, data-default, directory, errors, exceptions, filepath - , http-client, http-client-tls, http-conduit, http-types - , lifted-base, memory, monad-control, mtl, network, old-locale - , QuickCheck, quickcheck-instances, resourcet, safe, scientific - , tagged, tasty, tasty-hunit, tasty-quickcheck, text, time - , transformers, transformers-base, unordered-containers - , utf8-string, vector, xml-conduit - }: - mkDerivation { - pname = "aws"; - version = "0.21.1"; - sha256 = "047zfpc3bzdxgh6adfi1xls3j300vhyzcykzf9wyasxksw4xnrxl"; + version = "0.22"; + sha256 = "1l3f94mpih7slz37ikyjkyrwvlf110w87997d8sbnbd8glwlcb8r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -34761,9 +34701,9 @@ self: { blaze-builder byteable bytestring case-insensitive cereal conduit conduit-extra containers cryptonite data-default directory exceptions filepath http-client-tls http-conduit http-types - lifted-base memory monad-control mtl network old-locale resourcet - safe scientific tagged text time transformers unordered-containers - utf8-string vector xml-conduit + lifted-base memory monad-control mtl network network-bsd old-locale + resourcet safe scientific tagged text time transformers + unordered-containers utf8-string vector xml-conduit ]; testHaskellDepends = [ aeson base bytestring conduit errors http-client http-client-tls @@ -34773,8 +34713,6 @@ self: { ]; description = "Amazon Web Services (AWS) for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "aws-cloudfront-signed-cookies" = callPackage @@ -34876,8 +34814,6 @@ self: { ]; description = "Haskell bindings for Amazon DynamoDB Streams"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "aws-easy" = callPackage @@ -34901,8 +34837,6 @@ self: { ]; description = "Helper function and types for working with amazonka"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "aws-ec2" = callPackage @@ -34932,8 +34866,6 @@ self: { ]; description = "AWS EC2/VPC, ELB and CloudWatch client library for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "aws-ec2-knownhosts" = callPackage @@ -35007,8 +34939,6 @@ self: { ]; description = "Bindings for Amazon Web Services (AWS) General Reference"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "aws-kinesis" = callPackage @@ -35034,8 +34964,6 @@ self: { ]; description = "Bindings for Amazon Kinesis"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "aws-kinesis-client" = callPackage @@ -35121,8 +35049,6 @@ self: { ]; description = "Haskell bindings for AWS Lambda"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "aws-lambda-haskell-runtime" = callPackage @@ -35141,8 +35067,6 @@ self: { testHaskellDepends = [ base hspec ]; description = "Haskell runtime for AWS Lambda"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "aws-lambda-runtime" = callPackage @@ -35232,8 +35156,6 @@ self: { ]; description = "Amazon Route53 DNS service plugin for the aws package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "aws-sdk" = callPackage @@ -35285,8 +35207,6 @@ self: { ]; description = "The text converter for aws-sdk"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "aws-sdk-xml-unordered" = callPackage @@ -35307,8 +35227,6 @@ self: { ]; description = "The xml parser for aws-sdk package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "aws-ses-easy" = callPackage @@ -35395,8 +35313,6 @@ self: { ]; description = "Bindings for AWS SNS Version 2013-03-31"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "axel" = callPackage @@ -36126,8 +36042,8 @@ self: { ({ mkDerivation, base, containers, hspec, QuickCheck, time }: mkDerivation { pname = "bank-holidays-england"; - version = "0.2.0.2"; - sha256 = "1r82plqk1danqby90snmp4zjzdkwryvhbzj1c67b0h0k9w42v781"; + version = "0.2.0.4"; + sha256 = "1lqjcpxacjkvgy0900av004xsshyjqx1hq1q0ig42f8r6r4cnf3m"; libraryHaskellDepends = [ base containers time ]; testHaskellDepends = [ base containers hspec QuickCheck time ]; description = "Calculation of bank holidays in England and Wales"; @@ -38829,8 +38745,6 @@ self: { ]; description = "Orphan instances for binary"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "binary-list" = callPackage @@ -40789,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 { @@ -41160,17 +41117,17 @@ self: { }: mkDerivation { pname = "bitwise-enum"; - version = "0.1.0.3"; - sha256 = "192hv1ln2jb2ms36vrk110j79wsxgqgdwbq47slyq3fcd77l908i"; + version = "1.0.0"; + sha256 = "11klr2qxbly9ppcv7b1pcrvqfw6h0l3qqwy0wzlv05jqhaywjxwc"; libraryHaskellDepends = [ aeson array base deepseq mono-traversable vector ]; testHaskellDepends = [ - aeson base deepseq mono-traversable QuickCheck test-framework + aeson array base deepseq mono-traversable QuickCheck test-framework test-framework-quickcheck2 vector ]; benchmarkHaskellDepends = [ - aeson base deepseq gauge mono-traversable vector wide-word + aeson array base deepseq gauge mono-traversable vector wide-word ]; description = "Bitwise operations on bounded enumerations"; license = stdenv.lib.licenses.bsd3; @@ -45069,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 { @@ -45115,26 +45087,6 @@ self: { }) {}; "byteslice" = callPackage - ({ mkDerivation, base, bytestring, primitive, primitive-addr - , primitive-unlifted, quickcheck-classes, run-st, tasty - , tasty-hunit, tasty-quickcheck - }: - mkDerivation { - pname = "byteslice"; - version = "0.2.1.0"; - sha256 = "0dwvxj0rxk7jfb4yjwrr7jwxwv0f5bz8h21wrr4hw7max2wfanll"; - libraryHaskellDepends = [ - base primitive primitive-addr primitive-unlifted run-st - ]; - testHaskellDepends = [ - base bytestring primitive quickcheck-classes tasty tasty-hunit - tasty-quickcheck - ]; - description = "Slicing managed and unmanaged memory"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "byteslice_0_2_2_0" = callPackage ({ mkDerivation, base, bytestring, gauge, primitive, primitive-addr , primitive-unlifted, quickcheck-classes, run-st, tasty , tasty-hunit, tasty-quickcheck @@ -45153,7 +45105,6 @@ self: { benchmarkHaskellDepends = [ base gauge primitive ]; description = "Slicing managed and unmanaged memory"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytesmith" = callPackage @@ -45163,8 +45114,8 @@ self: { }: mkDerivation { pname = "bytesmith"; - version = "0.3.5.0"; - sha256 = "1axjb1p819cfpwrmilc8qakw7acipx47hdrilwj6ib0nn5agya8f"; + version = "0.3.6.0"; + sha256 = "0idkkmmw5n8dv7hx236s1543n0k6gsj9s0yk6fggbaqydlsxn641"; libraryHaskellDepends = [ base byteslice bytestring contiguous primitive run-st text-short wide-word @@ -46618,8 +46569,6 @@ self: { ]; description = "Utilities to work with cabal-install files"; license = "GPL-2.0-or-later AND BSD-3-Clause"; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "cabal-lenses" = callPackage @@ -46790,26 +46739,6 @@ self: { }) {}; "cabal-rpm" = callPackage - ({ mkDerivation, base, bytestring, Cabal, directory, filepath - , http-client, http-client-tls, http-conduit, optparse-applicative - , process, simple-cabal, simple-cmd, simple-cmd-args, time, unix - }: - mkDerivation { - pname = "cabal-rpm"; - version = "2.0.2"; - sha256 = "1cnnibn10sv39ilsy222rr9q5pl56jshnpjp80pih4fzvq8myjbw"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bytestring Cabal directory filepath http-client - http-client-tls http-conduit optparse-applicative process - simple-cabal simple-cmd simple-cmd-args time unix - ]; - description = "RPM packaging tool for Haskell Cabal-based packages"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "cabal-rpm_2_0_4" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, filepath , http-client, http-client-tls, http-conduit, optparse-applicative , process, simple-cabal, simple-cmd, simple-cmd-args, time, unix @@ -46827,7 +46756,6 @@ self: { ]; description = "RPM packaging tool for Haskell Cabal-based packages"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-scripts" = callPackage @@ -47388,8 +47316,8 @@ self: { }: mkDerivation { pname = "cachix"; - version = "0.3.6"; - sha256 = "14iz8ihzrcq075zk6cz8dmp2c9ygsfvi0ksa0969k8746hgwwxf9"; + version = "0.3.7"; + sha256 = "14rz8rncvnv8x9idfg69acck38bygnbnccdn7ghhz4ailiamf50b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -48515,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 @@ -48538,6 +48528,43 @@ self: { broken = true; }) {}; + "casa-client" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , bytestring, casa-types, conduit, conduit-extra, cryptonite + , exceptions, http-conduit, http-types, memory, network-uri + , resourcet, template-haskell, text, th-lift, unliftio-core + , unordered-containers + }: + mkDerivation { + pname = "casa-client"; + version = "0.0.1"; + sha256 = "1l8lhk7bbrpjip693a3p6kp92aryajb6aw1w4ycak7nrb947dvjw"; + libraryHaskellDepends = [ + aeson attoparsec base base16-bytestring bytestring casa-types + conduit conduit-extra cryptonite exceptions http-conduit http-types + memory network-uri resourcet template-haskell text th-lift + unliftio-core unordered-containers + ]; + description = "Client for Casa"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "casa-types" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , bytestring, hashable, path-pieces, persistent, text + }: + mkDerivation { + pname = "casa-types"; + version = "0.0.1"; + sha256 = "0f8c4a43rh6zr5cwingxyjfpisipy4x4xc0lpasfjaj4vhjgwqkp"; + libraryHaskellDepends = [ + aeson attoparsec base base16-bytestring bytestring hashable + path-pieces persistent text + ]; + description = "Types for Casa"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "casadi-bindings" = callPackage ({ mkDerivation, base, binary, casadi, casadi-bindings-core , casadi-bindings-internal, cereal, containers, doctest, HUnit @@ -49465,27 +49492,6 @@ self: { }) {}; "cayley-client" = callPackage - ({ mkDerivation, aeson, attoparsec, base, binary, bytestring - , exceptions, hspec, http-client, http-conduit, lens, lens-aeson - , mtl, text, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "cayley-client"; - version = "0.4.11"; - sha256 = "0acsrb2dawcrc088497b3480z3v5ilb2qvgwrxyy13ri36khadgf"; - libraryHaskellDepends = [ - aeson attoparsec base binary bytestring exceptions http-client - http-conduit lens lens-aeson mtl text transformers - unordered-containers vector - ]; - testHaskellDepends = [ aeson base hspec unordered-containers ]; - description = "A Haskell client for the Cayley graph database"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "cayley-client_0_4_12" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, bytestring , exceptions, hspec, http-client, http-conduit, lens, lens-aeson , mtl, text, transformers, unordered-containers, vector @@ -50286,8 +50292,8 @@ self: { }: mkDerivation { pname = "cgrep"; - version = "6.6.30"; - sha256 = "1ald0461mnd65g5czp3d8dzdvy8pmdxhzj35sghcnxi6qs18xp69"; + version = "6.6.32"; + sha256 = "0d1d81bkqd2wvcls5l1msli42cvcdrp0xy7i3s0yb10kfgd1y0qw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -50850,8 +50856,8 @@ self: { ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }: mkDerivation { pname = "checkers"; - version = "0.5.2"; - sha256 = "1mqfy6lrivc36kxbfr9zyp70pyq3k2xrmavkadznh999d54x11kq"; + version = "0.5.4"; + sha256 = "09g1430hjqxy01w0rgp0d03z2y8nw2zjyvfxs0kl9j0gyv57a10v"; libraryHaskellDepends = [ array base QuickCheck random semigroupoids ]; @@ -52333,13 +52339,13 @@ self: { , filepath, ghc, ghc-boot, ghc-prim, ghc-typelits-extra , ghc-typelits-knownnat, ghc-typelits-natnormalise, ghci, hashable , haskeline, integer-gmp, lens, mtl, primitive, process, reflection - , template-haskell, text, time, transformers, uniplate, unix + , split, template-haskell, text, time, transformers, uniplate, unix , unordered-containers, utf8-string, vector }: mkDerivation { pname = "clash-ghc"; - version = "1.0.1"; - sha256 = "00g5j3f8j9virq32mmbk8qi6nkjcgagw6n9n8kwv9x3xyl4cpjkq"; + version = "1.2.0"; + sha256 = "1rv8bjs563c8r543crj69dnp1610bch3dsxb5c0wckf799l8bmpn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -52347,7 +52353,7 @@ self: { concurrent-supply containers deepseq directory filepath ghc ghc-boot ghc-prim ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise ghci hashable haskeline integer-gmp lens - mtl primitive process reflection template-haskell text time + mtl primitive process reflection split template-haskell text time transformers uniplate unix unordered-containers utf8-string vector ]; executableHaskellDepends = [ base ]; @@ -52360,23 +52366,25 @@ self: { "clash-lib" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base, binary , bytestring, clash-prelude, concurrent-supply, containers - , data-binary-ieee754, deepseq, directory, errors, exceptions - , filepath, ghc, ghc-typelits-knownnat, hashable, hint, integer-gmp - , interpolate, lens, mtl, parsers, prettyprinter, primitive - , process, reducers, tasty, tasty-hunit, template-haskell - , temporary, text, text-show, time, transformers, trifecta - , unordered-containers, vector, vector-binary-instances + , data-binary-ieee754, data-default, deepseq, directory, dlist + , errors, exceptions, extra, filepath, ghc, ghc-boot-th + , ghc-typelits-knownnat, hashable, haskell-src-meta, hint + , integer-gmp, interpolate, lens, mtl, ordered-containers, parsers + , prettyprinter, primitive, process, reducers, tasty, tasty-hunit + , template-haskell, temporary, text, text-show, time, transformers + , trifecta, unordered-containers, vector, vector-binary-instances }: mkDerivation { pname = "clash-lib"; - version = "1.0.1"; - sha256 = "0icp6lgn5iix8iqcr2dqcjwx7qzx4r61lxqjjdrkfrj87kxaa9v1"; + version = "1.2.0"; + sha256 = "0w5ilrqagc7xj14ngjg0rgcc3vhkxhsrz21rgl9qhygcs1cam5j2"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-terminal attoparsec base binary bytestring clash-prelude - concurrent-supply containers data-binary-ieee754 deepseq directory - errors exceptions filepath ghc hashable hint integer-gmp - interpolate lens mtl parsers prettyprinter primitive process + concurrent-supply containers data-binary-ieee754 data-default + deepseq directory dlist errors exceptions extra filepath ghc + ghc-boot-th hashable haskell-src-meta hint integer-gmp interpolate + lens mtl ordered-containers parsers prettyprinter primitive process reducers template-haskell temporary text text-show time transformers trifecta unordered-containers vector vector-binary-instances @@ -52412,24 +52420,27 @@ self: { , data-default-class, deepseq, doctest, ghc-prim , ghc-typelits-extra, ghc-typelits-knownnat , ghc-typelits-natnormalise, half, hashable, hint, integer-gmp - , lens, QuickCheck, reflection, singletons, tasty, tasty-hunit - , template-haskell, text, th-lift, th-orphans, time, transformers - , type-errors, vector + , lens, QuickCheck, quickcheck-classes-base, recursion-schemes + , reflection, singletons, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, text, text-show, th-abstraction, th-lift + , th-orphans, time, transformers, type-errors, vector }: mkDerivation { pname = "clash-prelude"; - version = "1.0.1"; - sha256 = "0cqsr561cx27kqrdf56af1ggq4d1wadzlmbx4wm14l4z6vc2579p"; + version = "1.2.0"; + sha256 = "181ccw3ajdfhmlwjs9jiqy10b7whsp3pcqyxw166s8rda7h3pvpj"; libraryHaskellDepends = [ array base bifunctors binary bytestring constraints containers data-binary-ieee754 data-default-class deepseq ghc-prim ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise - half hashable integer-gmp lens QuickCheck reflection singletons - template-haskell text th-lift th-orphans time transformers - type-errors vector + half hashable integer-gmp lens QuickCheck recursion-schemes + reflection singletons template-haskell text text-show + th-abstraction th-lift th-orphans time transformers type-errors + vector ]; testHaskellDepends = [ - base doctest ghc-typelits-knownnat hint tasty tasty-hunit + base doctest ghc-typelits-knownnat hint quickcheck-classes-base + tasty tasty-hunit tasty-quickcheck template-haskell ]; benchmarkHaskellDepends = [ base criterion deepseq template-haskell @@ -56465,8 +56476,8 @@ self: { }: mkDerivation { pname = "composite-aeson"; - version = "0.6.2.0"; - sha256 = "10pz27ky65zm4qa8h3c79m4ly55dhw3np5x5zqza7133dk96hyyj"; + version = "0.7.1.0"; + sha256 = "1jv9frfv1ixqyby8zgldp2nkc051fnz0nqwcrnk1mqhav7rf3ilx"; libraryHaskellDepends = [ aeson aeson-better-errors base composite-base containers contravariant generic-deriving hashable lens mmorph mtl profunctors @@ -56479,7 +56490,7 @@ self: { profunctors QuickCheck scientific tagged template-haskell text time unordered-containers vector vinyl ]; - description = "JSON for Vinyl/Frames records"; + description = "JSON for Vinyl records"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -56491,8 +56502,8 @@ self: { }: mkDerivation { pname = "composite-aeson-refined"; - version = "0.6.2.0"; - sha256 = "1m86gb9p1rbn4r385xrin0qn6wp26qqd1hhl7557i01226v48w5w"; + version = "0.7.1.0"; + sha256 = "12nqw9mg25vblz5my5rrd0w2nwgpvykw0nnlmaibpj7z5z5fnfv6"; libraryHaskellDepends = [ aeson-better-errors base composite-aeson mtl refined ]; @@ -56509,8 +56520,8 @@ self: { }: mkDerivation { pname = "composite-base"; - version = "0.6.2.0"; - sha256 = "0svp3n9652qq4np7mwcws099jsiz56kwa26r0zqa3r64kl4kc3v2"; + version = "0.7.1.0"; + sha256 = "11sbpl43z65gkafz0y69b33irg51ag4hjg7yswaqiwv1b6qn80w4"; libraryHaskellDepends = [ base exceptions lens monad-control mtl profunctors template-haskell text transformers transformers-base unliftio-core vinyl @@ -56531,12 +56542,12 @@ self: { }: mkDerivation { pname = "composite-ekg"; - version = "0.6.2.0"; - sha256 = "1wkgnzd4k46vsyxd0gwdsklv92ggprzi0l522sj98qdm6gxfy8if"; + version = "0.7.1.0"; + sha256 = "1w2vlbzaxrxj95q3k2vmvzd34d51cz1pj4fv3x34icmp4rx92qvz"; libraryHaskellDepends = [ base composite-base ekg-core lens text vinyl ]; - description = "EKG Metrics for Vinyl/Frames records"; + description = "EKG Metrics for Vinyl records"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -56549,8 +56560,8 @@ self: { }: mkDerivation { pname = "composite-opaleye"; - version = "0.6.2.0"; - sha256 = "1gnnzn6h15m79my02i0s397y0pdhifq4cq71j3lpc7g7nza0cwc6"; + version = "0.7.1.0"; + sha256 = "1p5nrq5i5ssdiqy38p0qraig8r3z1djfa2hrb7wg5pandiplngr8"; libraryHaskellDepends = [ base bytestring composite-base lens opaleye postgresql-simple product-profunctors profunctors template-haskell text vinyl @@ -56560,7 +56571,7 @@ self: { product-profunctors profunctors QuickCheck template-haskell text vinyl ]; - description = "Opaleye SQL for Frames records"; + description = "Opaleye SQL for Vinyl records"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -56573,8 +56584,8 @@ self: { }: mkDerivation { pname = "composite-swagger"; - version = "0.6.2.0"; - sha256 = "0b5kqdqq4hnzjcfclw25ql2fjvr4z0zh88l9n8pv7pw3qdgh0qd1"; + version = "0.7.1.0"; + sha256 = "0npzy42ls7r8i4zldkn3569l5nfdcm905mycd5zda7pkjyyi36q4"; libraryHaskellDepends = [ base composite-base insert-ordered-containers lens swagger2 template-haskell text vinyl @@ -56583,7 +56594,7 @@ self: { base composite-aeson composite-base hspec insert-ordered-containers lens QuickCheck swagger2 template-haskell text vinyl ]; - description = "Swagger for Vinyl/Frames records"; + description = "Swagger for Vinyl records"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -57295,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 { @@ -58115,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"; @@ -58139,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 @@ -58179,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 ]; @@ -58203,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 ]; @@ -58230,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 @@ -58550,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 @@ -59126,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 = [ @@ -60822,8 +60914,8 @@ self: { }: mkDerivation { pname = "cpkg"; - version = "0.2.4.5"; - sha256 = "1f6l98nhl4y8az1vpacjqpqk8ngmir5kfq5wijdy4gl5dl4ik7il"; + version = "0.2.4.6"; + sha256 = "0ll0qxn7s29ys8w71dvfz3qy0f5rzihz0q3axg1g73pmhqbxqi2m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -60892,37 +60984,19 @@ self: { }) {}; "cpphs" = callPackage - ({ mkDerivation, base, directory, old-locale, old-time, polyparse - }: - mkDerivation { - pname = "cpphs"; - version = "1.20.8"; - sha256 = "1bh524asqhk9v1s0wvipl0hgn7l63iy3js867yv0z3h5v2kn8vg5"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base directory old-locale old-time polyparse - ]; - executableHaskellDepends = [ - base directory old-locale old-time polyparse - ]; - description = "A liberalised re-implementation of cpp, the C pre-processor"; - license = "LGPL"; - }) {}; - - "cpphs_1_20_9" = callPackage ({ mkDerivation, base, directory, polyparse, time }: mkDerivation { pname = "cpphs"; version = "1.20.9"; sha256 = "07qb1k9iq76a3l0506s08mw3a16i7qvp0hrmn7wxvwj3f6pg53cp"; + revision = "1"; + editedCabalFile = "1zsyi2h2b7kcmbda2kr3a1xg81d26a92zqg78ziqqyc5aw1j5z6b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory polyparse time ]; executableHaskellDepends = [ base directory polyparse time ]; description = "A liberalised re-implementation of cpp, the C pre-processor"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cprng-aes" = callPackage @@ -64940,8 +65014,8 @@ self: { ({ mkDerivation, base, constraints }: mkDerivation { pname = "data-compat"; - version = "0.1.0.0"; - sha256 = "0j9gx0sg2bwqigw9w3kg286bm6imqa35jkgkzagdjg9mfkgy6kwy"; + version = "0.1.0.1"; + sha256 = "1hbb9rx5x9pw5nzi7x9pxswr0w8vqvw1yf3brmgfxshwlq1ac0rh"; libraryHaskellDepends = [ base constraints ]; description = "Define Backwards Compatibility Schemes for Arbitrary Data"; license = stdenv.lib.licenses.mit; @@ -65835,8 +65909,8 @@ self: { }: mkDerivation { pname = "data-msgpack"; - version = "0.0.12"; - sha256 = "11zlw465lpa371y7cpz9r4gn1c4cw0rjrpl5l3h6h0y3zc28p7sw"; + version = "0.0.13"; + sha256 = "1x2qgipyjb5h5n1bx429rwdaamw4xdm7gwj08vlw6n6sycqwnq04"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -65862,8 +65936,8 @@ self: { }: mkDerivation { pname = "data-msgpack-types"; - version = "0.0.2"; - sha256 = "19c7285mrs9d1afgpdq4cprv44fif76ahahg3xpzijc5lhgxmzal"; + version = "0.0.3"; + sha256 = "05jg19sk42cpn2h1mfaam5khwlda4v99z6v0sdzi4kzkswpfj1i5"; libraryHaskellDepends = [ base bytestring containers deepseq hashable QuickCheck text unordered-containers vector void @@ -67072,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 @@ -68342,22 +68416,6 @@ self: { }) {}; "dejafu" = callPackage - ({ mkDerivation, base, concurrency, containers, contravariant - , deepseq, exceptions, leancheck, profunctors, random, transformers - }: - mkDerivation { - pname = "dejafu"; - version = "2.1.0.1"; - sha256 = "08rm5f4kxwd46si0qkaf2yzsffpndhb3l4x639k11l6n28165nhg"; - libraryHaskellDepends = [ - base concurrency containers contravariant deepseq exceptions - leancheck profunctors random transformers - ]; - description = "A library for unit-testing concurrent programs"; - license = stdenv.lib.licenses.mit; - }) {}; - - "dejafu_2_1_0_3" = callPackage ({ mkDerivation, base, concurrency, containers, contravariant , deepseq, exceptions, leancheck, profunctors, random, transformers }: @@ -68371,7 +68429,6 @@ self: { ]; description = "A library for unit-testing concurrent programs"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "deka" = callPackage @@ -68664,6 +68721,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dependent-hashmap" = callPackage + ({ mkDerivation, base, constraints, constraints-extras + , dependent-sum, hashable, hedgehog, mtl, unordered-containers + }: + mkDerivation { + pname = "dependent-hashmap"; + version = "0.1.0.1"; + sha256 = "14jfak4jp0xvjmfh680gygvbf9yg1gzaidjh6wpnrhyv484ldcpl"; + libraryHaskellDepends = [ + base constraints-extras dependent-sum hashable unordered-containers + ]; + testHaskellDepends = [ + base constraints constraints-extras dependent-sum hashable hedgehog + mtl unordered-containers + ]; + description = "Dependent hash maps"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dependent-map" = callPackage ({ mkDerivation, base, constraints-extras, containers , dependent-sum @@ -69000,8 +69076,8 @@ self: { ({ mkDerivation, base, criterion, deepseq, hspec, QuickCheck }: mkDerivation { pname = "derive-storable"; - version = "0.1.2.0"; - sha256 = "1rh2nm4cb34x9rdg9jpz15kidvkvlzja1354v8z5jwpc0pqkp50s"; + version = "0.2.0.0"; + sha256 = "0cr13ydc3p5zsrzimha4xkaj5hmf2bj3hylzjh2llgcgi2l8vc53"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; benchmarkHaskellDepends = [ base criterion deepseq ]; @@ -69086,8 +69162,8 @@ self: { ({ mkDerivation, aeson, base, bytestring }: mkDerivation { pname = "deriving-aeson"; - version = "0.1.2"; - sha256 = "0f26pnvarfarlb2jz1ing3997cd9ajhygkcafhl0yc7i7mi0ysm4"; + version = "0.2"; + sha256 = "0d9f4xjczks79vrlw93q7jg32s3ygwl488v6ql8lr4rfvbxzik23"; libraryHaskellDepends = [ aeson base ]; testHaskellDepends = [ aeson base bytestring ]; description = "Type driven generic aeson instance customisation"; @@ -69671,8 +69747,8 @@ self: { }: mkDerivation { pname = "dhall-fly"; - version = "0.2.4"; - sha256 = "0bx8il9cq4ma2n2wl5xxzngl26621zgpj54lk884nqwk6glg124m"; + version = "0.3.0"; + sha256 = "01152n1g8wfhbsl6znd6jnwb2rkdzcr3wcmdixnp6j3sxbgqbqln"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -69708,6 +69784,8 @@ self: { pname = "dhall-json"; version = "1.6.2"; sha256 = "044hq25h872rjlcp24fzf0nslxg4a6hmq8ylcljzk003lmq0c2xz"; + revision = "1"; + editedCabalFile = "0zljipb4nq0xmdfhqq7vr9c3966mpkd812g4z6xz7ngzrqn41s40"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73391,6 +73469,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "dobutokO2" = callPackage + ({ mkDerivation, base, directory, mmsyn2, mmsyn3, mmsyn6ukr + , mmsyn7s, mmsyn7ukr, process, vector + }: + mkDerivation { + pname = "dobutokO2"; + version = "0.8.2.0"; + sha256 = "1czji489jj0f18shcx4likz8l46zwvq9vabrn1wv1lyh19nnk1k8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base directory mmsyn2 mmsyn3 mmsyn6ukr mmsyn7s mmsyn7ukr process + vector + ]; + executableHaskellDepends = [ + 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; + }) {}; + "doc-review" = callPackage ({ mkDerivation, base, base64-bytestring, binary, bytestring , containers, directory, feed, filepath, haskell98, heist, hexpat @@ -77025,8 +77125,8 @@ self: { }: mkDerivation { pname = "egison-pattern-src"; - version = "0.1.1.0"; - sha256 = "15w0vnph6ba2b1mvlr53qymmdxs6063k77508frybsgb44pq9ns1"; + version = "0.2.1.0"; + sha256 = "0zfqrjmbzh7s88dkqc5mabb2yhb3xz88y10n5npkz9f6cjas4cxf"; libraryHaskellDepends = [ base containers free megaparsec mtl parser-combinators prettyprinter recursion-schemes text @@ -77045,8 +77145,8 @@ self: { }: mkDerivation { pname = "egison-pattern-src-haskell-mode"; - version = "0.1.1.0"; - sha256 = "0zrrr1qbcqz4gypx75q3s4w6i4ifbx82agsli3s2rd2z05lqc4l6"; + version = "0.2.1.0"; + sha256 = "0lgvvw23ii0g62b8q67h4mfm2bd07akl2m8dp8855hm16q1b8w8n"; libraryHaskellDepends = [ base egison-pattern-src haskell-src-exts mtl text ]; @@ -77059,18 +77159,19 @@ self: { }) {}; "egison-pattern-src-th-mode" = callPackage - ({ mkDerivation, base, egison-pattern-src - , egison-pattern-src-haskell-mode, haskell-src-exts + ({ mkDerivation, base, egison-pattern-src, haskell-src-exts , haskell-src-meta, mtl, pretty, tasty, tasty-discover, tasty-hunit , template-haskell, text }: mkDerivation { pname = "egison-pattern-src-th-mode"; - version = "0.1.1.0"; - sha256 = "1xdl9r04nmq46chhcqcbz549431zklkzx81agds765j1s7qqpp24"; + version = "0.2.1.0"; + sha256 = "0libfs39irdnqfvynmpji21p6nyk2s3zsxhlmsz763aya51ymxpy"; + revision = "1"; + editedCabalFile = "13k65z8jai64087ns3b99wznv0ain3z3bailk8fdpnsjf4s2a4qg"; libraryHaskellDepends = [ - base egison-pattern-src egison-pattern-src-haskell-mode - haskell-src-exts haskell-src-meta mtl pretty template-haskell text + base egison-pattern-src haskell-src-exts haskell-src-meta mtl + pretty template-haskell text ]; testHaskellDepends = [ base egison-pattern-src haskell-src-exts mtl tasty tasty-hunit @@ -77243,12 +77344,12 @@ self: { }) {}; "either-list-functions" = callPackage - ({ mkDerivation, base, doctest }: + ({ mkDerivation, base, containers, doctest }: mkDerivation { pname = "either-list-functions"; - version = "0.0.2.0"; - sha256 = "04xl2xrlrmf0znic1vx521d73i6znyyjijp58h6ak0sx45kclw39"; - libraryHaskellDepends = [ base ]; + version = "0.0.4.2"; + sha256 = "1cagf93vaz41hl5vm1xqvzdds82h2cck294apr5b082nscv6r9bc"; + libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base doctest ]; description = "Functions involving lists of Either"; license = stdenv.lib.licenses.asl20; @@ -77679,6 +77780,8 @@ self: { pname = "eliminators"; version = "0.6"; sha256 = "1mxjp2ygf72k3yaiqpfi4lrmhwhx69zkm5kznrb6wainw5r6h0if"; + revision = "1"; + editedCabalFile = "03gq3c04arywpp60n5cb6prvwn0yk7ccc5gfpbxl9vdjp5dbikkd"; libraryHaskellDepends = [ base extra singleton-nats singletons template-haskell th-abstraction th-desugar @@ -80783,26 +80886,24 @@ self: { }) {}; "evdev" = callPackage - ({ mkDerivation, base, bytestring, c2hs, containers, either, evdev - , extra, hinotify, libevdev, monad-loops, paths, posix-paths - , process, rawfilepath, safe, streamly, streamly-fsnotify, time - , unix + ({ mkDerivation, base, bytestring, c2hs, containers, either, extra + , hinotify, libevdev, monad-loops, paths, posix-paths, process + , rawfilepath, safe, streamly, streamly-fsnotify, time, unix }: mkDerivation { pname = "evdev"; - version = "1.2.0.1"; - sha256 = "05l1vvjyc77gjzyswlwnqkicldbdl7wj05z6wz8w8najys16z7s7"; + version = "1.3.0.0"; + sha256 = "0jf9zbz04iyrmsr2fi8iq23nx48n38y7rs6czl226sd2dh10jhp3"; libraryHaskellDepends = [ base bytestring containers either extra hinotify monad-loops paths posix-paths process rawfilepath safe streamly streamly-fsnotify time unix ]; - librarySystemDepends = [ evdev ]; libraryPkgconfigDepends = [ libevdev ]; libraryToolDepends = [ c2hs ]; description = "Bindings to libevdev"; license = stdenv.lib.licenses.bsd3; - }) {evdev = null; inherit (pkgs) libevdev;}; + }) {inherit (pkgs) libevdev;}; "eve" = callPackage ({ mkDerivation, base, containers, data-default, free, hspec @@ -82607,20 +82708,41 @@ 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_1" = callPackage + ({ mkDerivation, base, clock, directory, filepath, process + , QuickCheck, quickcheck-instances, semigroups, time, unix + }: + mkDerivation { + pname = "extra"; + version = "1.7.1"; + sha256 = "0zshxv9dnd8vksncmb8dj4wvq2wdybzwxyhmy2zp6a81icm4azx4"; + libraryHaskellDepends = [ + base clock directory filepath process semigroups time unix + ]; + testHaskellDepends = [ + base directory filepath QuickCheck quickcheck-instances unix + ]; + description = "Extra functions I use"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "extract-dependencies" = callPackage ({ mkDerivation, async, base, Cabal, containers , package-description-remote @@ -82790,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 @@ -83069,7 +83206,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "fakedata_0_6_0" = callPackage + "fakedata_0_6_1" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , exceptions, filepath, gauge, hashable, hspec, hspec-discover , random, template-haskell, text, time, unordered-containers @@ -83077,8 +83214,8 @@ self: { }: mkDerivation { pname = "fakedata"; - version = "0.6.0"; - sha256 = "0rwj9l2m2w688cp505y77g7q67l57gs8fh429mgnygwzvp7s7z0r"; + version = "0.6.1"; + sha256 = "0qqc0hq7lg1s5fpflmnalcsy0043vqd8iiblwa6lvm45h7af8ii2"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers directory exceptions filepath hashable @@ -83248,8 +83385,8 @@ self: { }: mkDerivation { pname = "fast-arithmetic"; - version = "0.6.4.3"; - sha256 = "08fwfk6k081gasfpvil9hhzcc85b6xlpflp2kqi9kwza3pfi3d0s"; + version = "0.6.5.0"; + sha256 = "02ccvk09fqp235bl3r8k234xnl6fmis7hkl34v4wmrwpb3f96hmh"; libraryHaskellDepends = [ base combinat hgmp ]; testHaskellDepends = [ arithmoi base combinat hspec QuickCheck ]; benchmarkHaskellDepends = [ arithmoi base combinat criterion ]; @@ -83645,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; @@ -83855,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 { @@ -85143,22 +85307,6 @@ self: { }) {}; "file-embed" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath - , template-haskell - }: - mkDerivation { - pname = "file-embed"; - version = "0.0.11.1"; - sha256 = "1ml9j5jln9g86qqi7akcxyfy8d2jb46y1sfk817j1s4babzff4x1"; - libraryHaskellDepends = [ - base bytestring directory filepath template-haskell - ]; - testHaskellDepends = [ base filepath ]; - description = "Use Template Haskell to embed file contents directly"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "file-embed_0_0_11_2" = callPackage ({ mkDerivation, base, bytestring, directory, filepath , template-haskell }: @@ -85172,7 +85320,6 @@ self: { testHaskellDepends = [ base filepath ]; description = "Use Template Haskell to embed file contents directly"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "file-embed-lzma" = callPackage @@ -85433,18 +85580,6 @@ self: { }) {}; "filepattern" = callPackage - ({ mkDerivation, base, directory, extra, filepath, QuickCheck }: - mkDerivation { - pname = "filepattern"; - version = "0.1.1"; - sha256 = "0jwvbhjsn4k6kpkg0dvsm7p3a79vzp0ffr1w79wkmm7hzvf5pz7p"; - libraryHaskellDepends = [ base directory extra filepath ]; - testHaskellDepends = [ base directory extra filepath QuickCheck ]; - description = "File path glob-like matching"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "filepattern_0_1_2" = callPackage ({ mkDerivation, base, directory, extra, filepath, QuickCheck }: mkDerivation { pname = "filepattern"; @@ -85454,7 +85589,6 @@ self: { testHaskellDepends = [ base directory extra filepath QuickCheck ]; description = "File path glob-like matching"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fileplow" = callPackage @@ -85991,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 @@ -90976,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 ]; @@ -91147,8 +91294,8 @@ self: { }: mkDerivation { pname = "fused-effects"; - version = "1.0.0.1"; - sha256 = "1v11m8i4ffadfiy3bxwgjcrx5z5gzxv4ciniqzv01b0jxajfkg9g"; + version = "1.0.2.0"; + sha256 = "0dy8m54fm3gndj0bda0savl80w7drj8h113bhbi2439wl3x02y6x"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ base containers hedgehog hedgehog-fn inspection-testing mtl tasty @@ -91411,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"; @@ -94382,6 +94529,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-check" = callPackage + ({ mkDerivation, base, ghc, ghc-paths, template-haskell + , transformers + }: + mkDerivation { + pname = "ghc-check"; + version = "0.1.0.2"; + sha256 = "0xxx1n3xwzfkpbhn2k6s63h8idqy8s15fvy4hbnfkk5fz6mwgvdz"; + libraryHaskellDepends = [ + base ghc ghc-paths template-haskell transformers + ]; + description = "detect mismatches between compile-time and run-time versions of the ghc api"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ghc-compact_0_1_0_0" = callPackage ({ mkDerivation, base, bytestring, ghc-prim }: mkDerivation { @@ -94760,25 +94922,6 @@ self: { }) {}; "ghc-lib" = callPackage - ({ mkDerivation, alex, array, base, binary, bytestring, containers - , deepseq, directory, filepath, ghc-lib-parser, ghc-prim, happy - , hpc, pretty, process, time, transformers, unix - }: - mkDerivation { - pname = "ghc-lib"; - version = "8.8.2.20200205"; - sha256 = "13sq702fv3p8jwvsswxz51lp0h33hd1abxrrflxyqlhz84hn9lk9"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array base binary bytestring containers deepseq directory filepath - ghc-lib-parser ghc-prim hpc pretty process time transformers unix - ]; - libraryToolDepends = [ alex happy ]; - description = "The GHC API, decoupled from GHC versions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-lib_8_8_3_20200224" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-lib-parser, ghc-prim, happy , hpc, pretty, process, time, transformers, unix @@ -94795,29 +94938,9 @@ self: { libraryToolDepends = [ alex happy ]; description = "The GHC API, decoupled from GHC versions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-lib-parser" = callPackage - ({ mkDerivation, alex, array, base, binary, bytestring, containers - , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty - , process, time, transformers, unix - }: - mkDerivation { - pname = "ghc-lib-parser"; - version = "8.8.2.20200205"; - sha256 = "17rhzlwya0v6l146hmg6z3j224sr31s2pszspwyab790pncyrxgq"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array base binary bytestring containers deepseq directory filepath - ghc-prim hpc pretty process time transformers unix - ]; - libraryToolDepends = [ alex happy ]; - description = "The GHC API, decoupled from GHC versions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-lib-parser_8_8_3_20200224" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty , process, time, transformers, unix @@ -94834,7 +94957,6 @@ self: { libraryToolDepends = [ alex happy ]; description = "The GHC API, decoupled from GHC versions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-lib-parser-ex" = callPackage @@ -94844,12 +94966,10 @@ self: { }: mkDerivation { pname = "ghc-lib-parser-ex"; - version = "8.8.5.2"; - sha256 = "0jydlqb2nymrqvyn798vb8k4ak49m0qnnv725mzwlnn77krvnlka"; - revision = "1"; - editedCabalFile = "010wpn9ivczixfg2cj4n4f8924jaw6y4j6fd9z8bih7f53wyldnr"; + version = "8.8.5.3"; + sha256 = "0svjfrsq7r1hvpjp0bk4jqq9z6gm441hsv5zb1yljw9p9b20kbk6"; libraryHaskellDepends = [ - base bytestring containers ghc ghc-boot ghc-boot-th uniplate + base bytestring containers extra ghc ghc-boot ghc-boot-th uniplate ]; testHaskellDepends = [ base directory extra filepath ghc ghc-boot-th tasty tasty-hunit @@ -94858,15 +94978,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-lib-parser-ex_8_8_5_3" = callPackage + "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.3"; - sha256 = "0svjfrsq7r1hvpjp0bk4jqq9z6gm441hsv5zb1yljw9p9b20kbk6"; + version = "8.8.5.5"; + sha256 = "15rp1829zzppz3y014cac1ssmklssn5hsfvadqrzkzmnky2yr215"; libraryHaskellDepends = [ base bytestring containers extra ghc ghc-boot ghc-boot-th uniplate ]; @@ -95296,6 +95416,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-tags-plugin" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , directory, filepath, ghc, lattices, QuickCheck + , quickcheck-instances, tasty, tasty-golden, tasty-quickcheck, text + }: + mkDerivation { + pname = "ghc-tags-plugin"; + version = "0.1.4.0"; + sha256 = "0ci82krwqiprh23p316n1k09z6ja962xscnx9ycqpsyywbgkcqk4"; + libraryHaskellDepends = [ + 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"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "ghc-tcplugins-extra" = callPackage ({ mkDerivation, base, ghc }: mkDerivation { @@ -95374,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 @@ -95412,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 @@ -95672,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 @@ -97346,7 +97557,7 @@ self: { }) {}; "git-annex" = callPackage - ({ mkDerivation, aeson, async, attoparsec, base, blaze-builder + ({ mkDerivation, aeson, async, attoparsec, aws, base, blaze-builder , bloomfilter, bup, byteable, bytestring, Cabal, case-insensitive , clientsession, concurrent-output, conduit, connection, containers , crypto-api, cryptonite, curl, data-default, DAV, dbus, deepseq @@ -97368,11 +97579,11 @@ 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" "-f-s3" "-ftorrentparser" + "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" "-fwebapp" "-fwebdav" ]; isLibrary = false; @@ -97383,7 +97594,7 @@ self: { unix-compat utf8-string ]; executableHaskellDepends = [ - aeson async attoparsec base blaze-builder bloomfilter byteable + aeson async attoparsec aws base blaze-builder bloomfilter byteable bytestring case-insensitive clientsession concurrent-output conduit connection containers crypto-api cryptonite data-default DAV dbus deepseq directory disk-free-space dlist edit-distance exceptions @@ -97896,8 +98107,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Access to the GitHub API, v3"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "github-backup" = callPackage @@ -98005,8 +98214,8 @@ self: { }: mkDerivation { pname = "github-rest"; - version = "1.0.1"; - sha256 = "0dv959xmfpwbkjnjkisgxldkb89ln0wypz4cb65biijqfw0i4399"; + version = "1.0.2"; + sha256 = "0q4dxr0080pkszq9vv3j2wx89yhy15jjbk5m7wd1mwirgwxv214m"; libraryHaskellDepends = [ aeson base bytestring http-client http-client-tls http-types jwt mtl scientific text time transformers unliftio unliftio-core @@ -98241,8 +98450,8 @@ self: { }: mkDerivation { pname = "gitlab-haskell"; - version = "0.1.5"; - sha256 = "01wll1aik3x9bj5z29h12srj7skyqk6v1g4rvrd86zd9zvxqr6cw"; + version = "0.1.7"; + sha256 = "1l7z7sqnipkbf4355zzmjrj9ig8bb9jysyj5r7rgqk8pr1znj524"; libraryHaskellDepends = [ aeson base bytestring connection http-conduit http-types text time transformers unliftio unliftio-core @@ -98898,10 +99107,10 @@ self: { }: mkDerivation { pname = "glirc"; - version = "2.34"; - sha256 = "1nmkwzifch01pnzxn3rm0gvxq9xvwvxkvqfwsdsj6zjmiz68w3ca"; + version = "2.35"; + sha256 = "093cqbvqijjy6xd0fzas13ldrsf9kg59jak88qzl5kks7z9djl0f"; revision = "1"; - editedCabalFile = "13dm3cc5m7g7qhpasq2jbzm7x4dizjipjdsy5amghglrs8m0r90y"; + editedCabalFile = "14kgfgqyfw5vcm77n5iljxw5n28iclc1hpvi44x4vhrnmfpmq62v"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -102683,25 +102892,6 @@ self: { }) {}; "gothic" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, connection - , exceptions, hashable, http-client, http-client-tls, http-conduit - , http-types, lens, lens-aeson, scientific, text, unix - , unordered-containers, vector - }: - mkDerivation { - pname = "gothic"; - version = "0.1.3"; - sha256 = "0hp6p1car5kfzvz24aw04jpgplpyxj3lzgr9hdkj0q24crciwrps"; - libraryHaskellDepends = [ - aeson base binary bytestring connection exceptions hashable - http-client http-client-tls http-conduit http-types lens lens-aeson - scientific text unix unordered-containers vector - ]; - description = "A Haskell Vault KVv2 secret engine client"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "gothic_0_1_4" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, connection , exceptions, hashable, http-client, http-client-tls, http-conduit , http-types, lens, lens-aeson, scientific, text, unix @@ -102718,7 +102908,6 @@ self: { ]; description = "A Haskell Vault KVv2 secret engine client"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gotta-go-fast" = callPackage @@ -105033,8 +105222,6 @@ self: { ]; description = "A standalone StatusNotifierItem/AppIndicator tray"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) gtk3;}; "gtk-strut" = callPackage @@ -107533,8 +107720,8 @@ self: { }: mkDerivation { pname = "haiji"; - version = "0.3.1.0"; - sha256 = "0z0f6w4krfs220342v8sa2ylfk1qnd695pn0i9qxr7k0pwbph2wg"; + version = "0.3.2.0"; + sha256 = "1clxvpqwfsybfap746nq8g6gshdizjhbpafs09mnaxp7fi1196xz"; libraryHaskellDepends = [ aeson attoparsec base data-default mtl scientific tagged template-haskell text transformers unordered-containers vector @@ -107819,8 +108006,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.13.1.0"; - sha256 = "14l85n69zsczyw2fs8kjnnmkl4gk85xj3f4alfa7604nnmic9mvn"; + version = "4.13.2.0"; + sha256 = "0g52lip9i6zanjja0v86v5sypjvnfpfwzzddrpj04pml733nsnfj"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -108183,17 +108370,15 @@ self: { }) {}; "hakyll-shortcut-links" = callPackage - ({ mkDerivation, base, hakyll, hspec, megaparsec, mtl, pandoc - , pandoc-types, shortcut-links, text + ({ mkDerivation, base, hakyll, hspec, mtl, pandoc, pandoc-types + , parsec, shortcut-links, text }: mkDerivation { pname = "hakyll-shortcut-links"; - version = "0.0.0.0"; - sha256 = "1bzkq83rcpvx0cah77q6p27fd7f0l9hrnk8jyzpmngrnvgyjb2sz"; - revision = "1"; - editedCabalFile = "0ds3pb90djvqgz1z1w1kp2zdmwvbqkkgvwm05i34a9rh84lh8y8p"; + version = "0.1.0.0"; + sha256 = "0zhz0yixcv9xabr47rpcncxg3bwjx7la0g0hx37qfws5aqlvsz4v"; libraryHaskellDepends = [ - base hakyll megaparsec mtl pandoc-types shortcut-links text + base hakyll mtl pandoc-types parsec shortcut-links text ]; testHaskellDepends = [ base hspec mtl pandoc text ]; description = "Use shortcut-links in markdown file for Hakyll"; @@ -110119,19 +110304,19 @@ self: { "hasbolt" = callPackage ({ mkDerivation, base, binary, bytestring, connection, containers - , data-binary-ieee754, data-default, hex, hspec, mtl, network + , data-binary-ieee754, data-default, hspec, mtl, network , QuickCheck, text }: mkDerivation { pname = "hasbolt"; - version = "0.1.4.1"; - sha256 = "1p2gffh6ym221sgrhlns209p6s0j3qbmam5a0b3s06663qgzvh5b"; + version = "0.1.4.2"; + sha256 = "0qrfdfyzm61zaxd9m7s93zhrr2qjpgyn24l3gbyll2v8yj38j5rm"; libraryHaskellDepends = [ base binary bytestring connection containers data-binary-ieee754 data-default mtl network text ]; testHaskellDepends = [ - base bytestring containers hex hspec QuickCheck text + base bytestring containers hspec QuickCheck text ]; description = "Haskell driver for Neo4j 3+ (BOLT protocol)"; license = stdenv.lib.licenses.bsd3; @@ -110147,8 +110332,8 @@ self: { }: mkDerivation { pname = "hasbolt-extras"; - version = "0.0.1.2"; - sha256 = "1bcp0v9m5miy26yfk0bm5j2zwc3rnijxlbym0iv599m25fhfqxjk"; + version = "0.0.1.3"; + sha256 = "1zgrw5k056spvqswgji41whjadq1ixayx817ln339mvc45a4nwa7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111133,8 +111318,6 @@ self: { doHaddock = false; description = "Cabal package script generator for Travis-CI"; license = stdenv.lib.licenses.gpl3Plus; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "haskell-cnc" = callPackage @@ -111666,8 +111849,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Haskell library for the Microsoft Language Server Protocol"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "haskell-lsp-client" = callPackage @@ -111707,8 +111888,6 @@ self: { ]; description = "Haskell library for the Microsoft Language Server Protocol, data types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "haskell-menu" = callPackage @@ -116770,8 +116949,8 @@ self: { }: mkDerivation { pname = "headroom"; - version = "0.1.1.0"; - sha256 = "1ddxc5ldgkg7kw8qnj0m9gf9hx2gazidrx6ldac14yqlc4qfm2qb"; + version = "0.1.2.0"; + sha256 = "0xf657k22bpyx45x0bxljv19adb2qwfv2a5724dsnmvndyvn9kxy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117204,10 +117383,8 @@ self: { ({ mkDerivation, base, containers, fakedata, hedgehog, random }: mkDerivation { pname = "hedgehog-fakedata"; - version = "0.0.1.0"; - sha256 = "0qpgdl0r90y1qwzi7iqjxfngpd3scqc7a5p283yknw85zh0bx2bz"; - revision = "1"; - editedCabalFile = "003zbj8wmmdq203wa9dn2hy77my4bq0mfpvvi2mk2423q51p0q99"; + version = "0.0.1.1"; + sha256 = "05s48h0cf599x5psllid0szynvqmfgkrv5cymsgy1b5mdnc868aj"; libraryHaskellDepends = [ base fakedata hedgehog random ]; testHaskellDepends = [ base containers fakedata hedgehog ]; description = "Use 'fakedata' with 'hedgehog'"; @@ -117482,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 @@ -119781,6 +119960,8 @@ self: { pname = "hie-bios"; version = "0.4.0"; sha256 = "1pa8wjj6sml39371f355z46304jzzwpcr62q0qzrpqq8w9017241"; + revision = "1"; + editedCabalFile = "12m0hy4lirnr02h0nh2a85cfm8jv7jgqh24fdn29jkc28gpspm72"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120679,8 +120860,8 @@ self: { }: mkDerivation { pname = "hip"; - version = "1.5.4.0"; - sha256 = "09vv9zshgy6g9333pyny5lcja8662rxnldg1m0vvfiywcjafbn14"; + version = "1.5.5.0"; + sha256 = "1qy74a471bh849cil9b3f92gxgl3434x8hcvrzn83v3xa6vnh2cd"; libraryHaskellDepends = [ array base bytestring Chart Chart-diagrams colour deepseq directory filepath JuicyPixels netpbm primitive process random repa temporary @@ -121344,8 +121525,8 @@ self: { }: mkDerivation { pname = "hkgr"; - version = "0.2.4.1"; - sha256 = "0r6w5n4y5h23ry8cxxl97ibrxn6jr0f2a7iginqbpyd5dzbn9qyn"; + version = "0.2.5.2"; + sha256 = "0n7xxm216jzsvm2si276a0x342iwn0jyfcaq5hfs5l92na456kg2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -121459,7 +121640,7 @@ self: { }) {}; "hledger" = callPackage - ({ mkDerivation, ansi-terminal, base, base-compat-batteries + ({ mkDerivation, aeson, ansi-terminal, base, base-compat-batteries , bytestring, cmdargs, containers, data-default, Decimal, Diff , directory, extra, filepath, hashable, haskeline, hledger-lib , lucid, math-functions, megaparsec, mtl, old-time, parsec @@ -121470,12 +121651,14 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.16.2"; - sha256 = "1jvvmj13n3xv575g5zxfq2nw9bk719yb6ivddxfaf36h10zqpdxl"; + version = "1.17"; + sha256 = "1rdafl9c1z16ci3b812aaic6sbh1292dh5n3xqpnaqx9g68w71d4"; + revision = "1"; + editedCabalFile = "1lkg0h8hc7m0lj0hzylc3paiip2d6a6k9k37289gdynrm04nj258"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal base base-compat-batteries bytestring cmdargs + aeson ansi-terminal base base-compat-batteries bytestring cmdargs containers data-default Decimal Diff directory extra filepath hashable haskeline hledger-lib lucid math-functions megaparsec mtl old-time parsec pretty-show process regex-tdfa safe shakespeare @@ -121483,7 +121666,7 @@ self: { transformers unordered-containers utf8-string utility-ht wizards ]; executableHaskellDepends = [ - ansi-terminal base base-compat-batteries bytestring cmdargs + aeson ansi-terminal base base-compat-batteries bytestring cmdargs containers data-default Decimal directory extra filepath haskeline hledger-lib math-functions megaparsec mtl old-time parsec pretty-show process regex-tdfa safe shakespeare split tabular tasty @@ -121491,7 +121674,7 @@ self: { unordered-containers utf8-string utility-ht wizards ]; testHaskellDepends = [ - ansi-terminal base base-compat-batteries bytestring cmdargs + aeson ansi-terminal base base-compat-batteries bytestring cmdargs containers data-default Decimal directory extra filepath haskeline hledger-lib math-functions megaparsec mtl old-time parsec pretty-show process regex-tdfa safe shakespeare split tabular tasty @@ -121566,8 +121749,8 @@ self: { }: mkDerivation { pname = "hledger-flow"; - version = "0.13.0.0"; - sha256 = "0lgjb35mpjnyqdc4lr5g2q88nhjbh4znkw9xmlc7vlf1bpa27a8a"; + version = "0.13.2.0"; + sha256 = "1zajlqbayr6vm45y3901xwgg6acjn8fwx73mm9bnbsbxfzxn4g7d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121594,6 +121777,8 @@ self: { pname = "hledger-iadd"; version = "1.3.10"; sha256 = "0kdrdbvs5qi8hc807d245xrv589hgx5aly5syb6zk62pi1kf92s3"; + revision = "1"; + editedCabalFile = "0bwpk2h2chhcw74sf1ljkkiy699zdc2dvgq7ixlrlk09yx44jhxc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121654,21 +121839,21 @@ self: { }) {}; "hledger-lib" = callPackage - ({ mkDerivation, ansi-terminal, array, base, base-compat-batteries - , blaze-markup, bytestring, call-stack, cassava, cassava-megaparsec - , cmdargs, containers, data-default, Decimal, deepseq, directory - , extra, fgl, file-embed, filepath, Glob, hashtables, megaparsec - , mtl, old-time, parsec, parser-combinators, pretty-show - , regex-tdfa, safe, split, tabular, tasty, tasty-hunit - , template-haskell, text, time, timeit, transformers, uglymemo - , utf8-string + ({ mkDerivation, aeson, ansi-terminal, array, base + , base-compat-batteries, blaze-markup, bytestring, call-stack + , cassava, cassava-megaparsec, cmdargs, containers, data-default + , Decimal, deepseq, directory, extra, fgl, file-embed, filepath + , Glob, hashtables, megaparsec, mtl, old-time, parsec + , parser-combinators, pretty-show, regex-tdfa, safe, split, tabular + , tasty, tasty-hunit, template-haskell, text, time, timeit + , transformers, uglymemo, utf8-string }: mkDerivation { pname = "hledger-lib"; - version = "1.16.2"; - sha256 = "0b3b68560jszx8frmv8q9bxs1nc33n9c52ns1gcy3a3j3s80ww3g"; + version = "1.17.0.1"; + sha256 = "0kmwrkm4arhzzcfh4dhmikad1kfkv9y5dc58mjhi1jacdiy980r9"; libraryHaskellDepends = [ - ansi-terminal array base base-compat-batteries blaze-markup + aeson ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec cmdargs containers data-default Decimal deepseq directory extra fgl file-embed filepath Glob hashtables megaparsec mtl old-time parsec @@ -121677,7 +121862,7 @@ self: { utf8-string ]; testHaskellDepends = [ - ansi-terminal array base base-compat-batteries blaze-markup + aeson ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec cmdargs containers data-default Decimal deepseq directory extra fgl file-embed filepath Glob hashtables megaparsec mtl old-time parsec @@ -121712,20 +121897,20 @@ self: { "hledger-ui" = callPackage ({ mkDerivation, ansi-terminal, async, base, base-compat-batteries - , brick, cmdargs, containers, data-default, directory, filepath - , fsnotify, hledger, hledger-lib, megaparsec, microlens + , brick, cmdargs, containers, data-default, directory, extra + , filepath, fsnotify, hledger, hledger-lib, megaparsec, microlens , microlens-platform, pretty-show, process, safe, split, text , text-zipper, time, transformers, unix, vector, vty }: mkDerivation { pname = "hledger-ui"; - version = "1.16.2"; - sha256 = "1bsg48i9fmml4ga8jg1ikxig30dn7x5i8qbzbd9nr9lz5wg9xxlh"; + version = "1.17"; + sha256 = "1168h7lc6r61gpaiy07l9dp534hggnlvdcx3a2lmjx4m29ym1frz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ ansi-terminal async base base-compat-batteries brick cmdargs - containers data-default directory filepath fsnotify hledger + containers data-default directory extra filepath fsnotify hledger hledger-lib megaparsec microlens microlens-platform pretty-show process safe split text text-zipper time transformers unix vector vty @@ -121755,27 +121940,27 @@ self: { "hledger-web" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , case-insensitive, clientsession, cmdargs, conduit, conduit-extra - , containers, data-default, Decimal, directory, filepath, hjsmin - , hledger, hledger-lib, http-client, http-conduit, http-types - , megaparsec, mtl, semigroups, shakespeare, template-haskell, text - , time, transformers, utf8-string, wai, wai-cors, wai-extra - , wai-handler-launch, warp, yaml, yesod, yesod-core, yesod-form - , yesod-static + , containers, data-default, Decimal, directory, extra, filepath + , hjsmin, hledger, hledger-lib, http-client, http-conduit + , http-types, megaparsec, mtl, network, semigroups, shakespeare + , template-haskell, text, time, transformers, unix-compat + , utf8-string, wai, wai-cors, wai-extra, wai-handler-launch, warp + , yaml, yesod, yesod-core, yesod-form, yesod-static }: mkDerivation { pname = "hledger-web"; - version = "1.16.2"; - sha256 = "1kipq8b1df1iyp0dsdkbmshzdgii1993kb72drqsbl4ihj6vd96s"; + version = "1.17"; + sha256 = "15flyvaamr7r3dlzk9ihc3bv8z15myfrzzhlbpc5s3gy6q85lmay"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base blaze-html blaze-markup bytestring case-insensitive clientsession cmdargs conduit conduit-extra containers data-default - Decimal directory filepath hjsmin hledger hledger-lib http-client - http-conduit http-types megaparsec mtl semigroups shakespeare - template-haskell text time transformers utf8-string wai wai-cors - wai-extra wai-handler-launch warp yaml yesod yesod-core yesod-form - yesod-static + Decimal directory extra filepath hjsmin hledger hledger-lib + http-client http-conduit http-types megaparsec mtl network + semigroups shakespeare template-haskell text time transformers + unix-compat utf8-string wai wai-cors wai-extra wai-handler-launch + warp yaml yesod yesod-core yesod-form yesod-static ]; executableHaskellDepends = [ base ]; description = "Web interface for the hledger accounting tool"; @@ -122002,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 @@ -122771,16 +122956,16 @@ self: { , interpolate, lens-family, lens-family-core, lens-family-th , logict, megaparsec, monad-control, monadlist, mtl , optparse-applicative, parser-combinators, pretty-show - , prettyprinter, process, ref-tf, regex-tdfa, regex-tdfa-text - , repline, scientific, semigroups, serialise, split, syb, tasty - , tasty-hedgehog, tasty-hunit, tasty-quickcheck, tasty-th + , prettyprinter, process, ref-tf, regex-tdfa, repline, scientific + , semialign, semialign-indexed, semigroups, serialise, split, syb + , tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck, tasty-th , template-haskell, text, these, time, transformers , transformers-base, unix, unordered-containers, vector, xml }: mkDerivation { pname = "hnix"; - version = "0.6.1"; - sha256 = "0q79wdrm3z88mknq6nf7cpg7lwgbx355k95k11rz3iz0sgk9hjwi"; + version = "0.7.1"; + sha256 = "02isypknx732c25iqjym6941mfb5x6s6xrb6mijxy46rwzh3xd9l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122792,9 +122977,9 @@ self: { interpolate lens-family lens-family-core lens-family-th logict megaparsec monad-control monadlist mtl optparse-applicative parser-combinators pretty-show prettyprinter process ref-tf - regex-tdfa regex-tdfa-text scientific semigroups serialise split - syb template-haskell text these time transformers transformers-base - unix unordered-containers vector xml + regex-tdfa scientific semialign semialign-indexed semigroups + serialise split syb template-haskell text these time transformers + transformers-base unix unordered-containers vector xml ]; executableHaskellDepends = [ aeson base base16-bytestring bytestring comonad containers @@ -122830,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 @@ -123408,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 @@ -123522,8 +123732,8 @@ self: { }: mkDerivation { pname = "homplexity"; - version = "0.4.6.0"; - sha256 = "1rdb842kzipb7fbkbpcyndi53933yni2s79lfr8br0b7q1ib33j0"; + version = "0.4.8.0"; + sha256 = "1a873zfasvlnl7xw2z7z3pgbjl8n0lqqcs6lx1sl64p51icg7bbz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -123946,8 +124156,8 @@ self: { }: mkDerivation { pname = "hookup"; - version = "0.3.0.1"; - sha256 = "12jwjgbbdiyffy78b90a2jcz1vz1mfsrmgj0q4w3ly3zl79j2la9"; + version = "0.3.1.0"; + sha256 = "0dyx0zgxis4viqgdkky25q93vh3z551m7nssjfr15rqj25w8zb5y"; libraryHaskellDepends = [ attoparsec base bytestring HsOpenSSL HsOpenSSL-x509-system network ]; @@ -128068,6 +128278,8 @@ self: { pname = "hsimport"; version = "0.11.0"; sha256 = "1z55gpwyb2gwjlll2c32g9r4aqpdybjpnjy785z60wpjdl48qwaa"; + revision = "2"; + editedCabalFile = "00blkkmxc7ldwa7jywrg32pq0nz7z8sidj56qdy5s8cpzx57gwg8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129023,15 +129235,19 @@ self: { }) {}; "hspec-hedgehog" = callPackage - ({ mkDerivation, base, hedgehog, hspec, hspec-core }: + ({ mkDerivation, base, hedgehog, hspec, hspec-core, HUnit + , QuickCheck, splitmix + }: mkDerivation { pname = "hspec-hedgehog"; - version = "0.0.0.1"; - sha256 = "08689r0s7qkj7gkkz20z3qhka69b0lvvmcr3zg28yy5x7wgdbi9v"; - libraryHaskellDepends = [ base hedgehog hspec-core ]; - testHaskellDepends = [ base hedgehog hspec hspec-core ]; - description = "Hedgehog support for the Hspec testing framework"; - license = stdenv.lib.licenses.mit; + version = "0.0.1.1"; + sha256 = "1x61lslkpc67k7rbrggwabx6s60wv2v3iqarrb8746dgn0p225vj"; + libraryHaskellDepends = [ + base hedgehog hspec hspec-core HUnit QuickCheck splitmix + ]; + testHaskellDepends = [ base hedgehog hspec ]; + description = "Integrate Hedgehog and Hspec!"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -129297,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 @@ -130331,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"; @@ -131084,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 @@ -131461,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 @@ -131506,6 +131770,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-download_0_2_0_0" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, conduit + , conduit-extra, cryptonite, cryptonite-conduit, directory + , exceptions, filepath, hspec, hspec-discover, http-client + , http-conduit, http-types, memory, path, path-io, retry, rio + , rio-prettyprint + }: + mkDerivation { + pname = "http-download"; + version = "0.2.0.0"; + sha256 = "1wg5jck0h52dysdn0q5xs7gh8cjyq2qr9vaj7qa4fr3am1753n8v"; + libraryHaskellDepends = [ + base base64-bytestring bytestring conduit conduit-extra cryptonite + cryptonite-conduit directory exceptions filepath http-client + http-conduit http-types memory path path-io retry rio + rio-prettyprint + ]; + testHaskellDepends = [ + base cryptonite hspec hspec-discover http-client path path-io retry + rio rio-prettyprint + ]; + testToolDepends = [ hspec-discover ]; + description = "Verified downloads with retries"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-encodings" = callPackage ({ mkDerivation, base, bytestring, HTTP, iconv, mime, mtl, parsec , text, utf8-string, zlib @@ -132979,6 +133270,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hvega_0_6_0_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , filepath, tasty, tasty-golden, text, unordered-containers + }: + mkDerivation { + pname = "hvega"; + version = "0.6.0.0"; + sha256 = "0znipifss3cz55xj2nw27c4m284sb71gprksabypib3qdigqpwis"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ aeson base text unordered-containers ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring containers filepath tasty + tasty-golden text + ]; + description = "Create Vega-Lite visualizations (version 4) in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hvega-theme" = callPackage ({ mkDerivation, base, hvega, text }: mkDerivation { @@ -133039,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 @@ -133060,27 +133371,51 @@ 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_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.5"; + sha256 = "0gvbsnirlgsj58363zqg960j0ydx2bhgw4lwql71jf9kg7hd4kqb"; + libraryHaskellDepends = [ + base bitvec bytestring deepseq hw-int hw-prim hw-string-parse + vector + ]; + testHaskellDepends = [ + base bitvec bytestring doctest doctest-discover hedgehog hspec + hw-hspec-hedgehog hw-prim vector + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + benchmarkHaskellDepends = [ base criterion vector ]; + description = "Bit manipulation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-ci-assist" = callPackage ({ mkDerivation, base, hedgehog, hspec, hspec-discover, hw-hedgehog , hw-hspec-hedgehog, optparse-applicative @@ -133700,32 +134035,6 @@ self: { }) {}; "hw-prim" = callPackage - ({ mkDerivation, base, bytestring, criterion, deepseq, directory - , exceptions, ghc-prim, hedgehog, hspec, hspec-discover - , hw-hspec-hedgehog, mmap, QuickCheck, semigroups, transformers - , unliftio-core, vector - }: - mkDerivation { - pname = "hw-prim"; - version = "0.6.2.39"; - sha256 = "06f4ygwmfb3ambzw972cninj9v0i7pir97qq0832a1mb19h4222g"; - libraryHaskellDepends = [ - base bytestring deepseq ghc-prim mmap semigroups transformers - unliftio-core vector - ]; - testHaskellDepends = [ - base bytestring directory exceptions hedgehog hspec - hw-hspec-hedgehog mmap QuickCheck semigroups transformers vector - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - base bytestring criterion mmap semigroups transformers vector - ]; - description = "Primitive functions and data types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-prim_0_6_2_40" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, directory , doctest, doctest-discover, exceptions, ghc-prim, hedgehog, hspec , hspec-discover, hw-hspec-hedgehog, mmap, QuickCheck, semigroups @@ -133750,7 +134059,6 @@ self: { ]; description = "Primitive functions and data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-prim-bits" = callPackage @@ -133933,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 = [ @@ -135522,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 = [ @@ -136374,8 +136682,8 @@ self: { ({ mkDerivation, aeson, base, hvega, ihaskell, text }: mkDerivation { pname = "ihaskell-hvega"; - version = "0.2.2.0"; - sha256 = "1az5jwd3gwv7pmzdd2mgpip4qkxisjq1fgwp1czb7lmmsqwk1jgc"; + version = "0.2.3.0"; + sha256 = "02j08ci3ss82g2a26qdnykwb1rggb8w53jqm4xnxc8hqm25fb3mk"; libraryHaskellDepends = [ aeson base hvega ihaskell text ]; description = "IHaskell display instance for hvega types"; license = stdenv.lib.licenses.bsd3; @@ -136919,6 +137227,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "immortal-queue" = callPackage + ({ mkDerivation, async, base, immortal, stm, tasty, tasty-hunit }: + mkDerivation { + pname = "immortal-queue"; + version = "0.1.0.1"; + sha256 = "14a0sy4j0b0x2l8j4ajqizjkzrgbicavy3k5xzz349cvy3dq6fz7"; + libraryHaskellDepends = [ async base immortal ]; + testHaskellDepends = [ base stm tasty tasty-hunit ]; + description = "Build a pool of queue-processing worker threads"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "imparse" = callPackage ({ mkDerivation, ascetic, base, compilation, containers, directory , indents, MissingH, parsec, richreports, split, staticanalysis @@ -137367,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 { @@ -137554,8 +137897,8 @@ self: { ({ mkDerivation, base, hspec, hspec-discover }: mkDerivation { pname = "indexed-containers"; - version = "0.1.0.1"; - sha256 = "0karyvfp49jk5dp4cxvcramf295wjr3xsnh0l9qd0p11vn1h98qk"; + version = "0.1.0.2"; + sha256 = "18njnawx2wbkgq9f5747id11k8cpm604mc2xqhn3iaiyn3zyn28f"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; testToolDepends = [ hspec-discover ]; @@ -138040,25 +138383,27 @@ self: { "inline-asm" = callPackage ({ mkDerivation, base, bytestring, containers, either, ghc-prim - , hspec, megaparsec, mtl, QuickCheck, template-haskell, uniplate + , hspec, hspec-core, megaparsec, mtl, parser-combinators + , QuickCheck, template-haskell, uniplate }: mkDerivation { pname = "inline-asm"; - version = "0.3.1.0"; - sha256 = "1yd5sij6k61z4d6p51c2zsxfn9kn613fzlmqqmgxjvcw5il7mcdn"; + version = "0.4.0.1"; + sha256 = "19djbqfidl8spii2y5a4qi5a6k2dhh9kg4lafxx58w60118rsv6z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers either ghc-prim megaparsec mtl - template-haskell uniplate + parser-combinators template-haskell uniplate ]; executableHaskellDepends = [ base bytestring containers either ghc-prim megaparsec mtl - template-haskell uniplate + parser-combinators template-haskell uniplate ]; testHaskellDepends = [ - base bytestring containers either ghc-prim hspec megaparsec mtl - QuickCheck template-haskell uniplate + base bytestring containers either ghc-prim hspec hspec-core + megaparsec mtl parser-combinators QuickCheck template-haskell + uniplate ]; description = "Inline some Assembly in ur Haskell!"; license = stdenv.lib.licenses.bsd3; @@ -139215,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 @@ -143928,8 +144275,8 @@ self: { }: mkDerivation { pname = "jukebox"; - version = "0.4.3"; - sha256 = "1daqxkyh95b84z8ijb16syx6wbprnjkrzg14n6p8vf672nnfm20g"; + version = "0.4.4"; + sha256 = "0xjyyklwyzblgyakziwyh4420q1fcbqsss35dpxm592wd74wk0mw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -147707,8 +148054,8 @@ self: { }: mkDerivation { pname = "language-ats"; - version = "1.7.8.0"; - sha256 = "0syr7jnwv7j1i6rz7sal8m1lggxzal30mksyjsmlxxs9ancfiy93"; + version = "1.7.10.0"; + sha256 = "1xixsf3n8ld1fjd96qvvvrmrmypd7idyb7syih09f8gq80jkaw5g"; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-wl-pprint array base composition-prelude containers deepseq @@ -147724,22 +148071,6 @@ self: { }) {}; "language-avro" = callPackage - ({ mkDerivation, avro, base, filepath, hspec, megaparsec, text - , vector - }: - mkDerivation { - pname = "language-avro"; - version = "0.1.0.0"; - sha256 = "1nns0qlzrcmlfivv2p4qdhni6ngx3r0926z6kmybmqi3jk7wibhw"; - libraryHaskellDepends = [ - avro base filepath megaparsec text vector - ]; - testHaskellDepends = [ avro base hspec megaparsec text vector ]; - description = "Language definition and parser for AVRO files"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "language-avro_0_1_2_0" = callPackage ({ mkDerivation, avro, base, containers, directory, filepath, hspec , hspec-megaparsec, megaparsec, text, vector }: @@ -147755,7 +148086,6 @@ self: { ]; description = "Language definition and parser for AVRO files"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-bash" = callPackage @@ -147998,8 +148328,8 @@ self: { }: mkDerivation { pname = "language-docker"; - version = "8.0.2"; - sha256 = "00fgxddlim1h7xcklr1q38sxbf8zh1m84mha6yzab5as1x14lhij"; + version = "8.1.0"; + sha256 = "0ifvn8xz8qbwy13kmmadi5xdzvxxbq8nmilrnlls8plb8cwsd5ff"; libraryHaskellDepends = [ base bytestring containers free megaparsec mtl prettyprinter split template-haskell text th-lift time @@ -148934,8 +149264,8 @@ self: { ({ mkDerivation, base, deepseq }: mkDerivation { pname = "laop"; - version = "0.1.0.6"; - sha256 = "1xwyzkn884dwifpi2945pzz830pqillbm6zvy9dwl6dwhgyvlk7y"; + version = "0.1.0.7"; + sha256 = "0czxisy1vc4xinci5qhlw8mj1akydy3d5bfg45rd45dk699chxw4"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq ]; license = stdenv.lib.licenses.bsd3; @@ -149245,6 +149575,57 @@ self: { broken = true; }) {}; + "latex-svg-hakyll" = callPackage + ({ mkDerivation, base, hakyll, latex-svg-image, latex-svg-pandoc + , lrucache, pandoc-types + }: + mkDerivation { + pname = "latex-svg-hakyll"; + version = "0.1"; + sha256 = "119mln1k2qlzddz7fwjpvqzkd9gwi9ijmrlzlcxly63a8ffvylcn"; + libraryHaskellDepends = [ + base hakyll latex-svg-image latex-svg-pandoc lrucache pandoc-types + ]; + description = "Use actual LaTeX to render formulae inside Hakyll pages"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "latex-svg-image" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring + , cryptohash-sha256, deepseq, directory, filepath, parsec, process + , temporary, transformers + }: + mkDerivation { + pname = "latex-svg-image"; + version = "0.1"; + sha256 = "0g27rg4ip5rg2dkfwxv3khnfn8bjpgwrr3sakxvsrhvsxgb6lwf3"; + libraryHaskellDepends = [ + base base64-bytestring bytestring cryptohash-sha256 deepseq + directory filepath parsec process temporary transformers + ]; + description = "A library for rendering LaTeX formulae as SVG using an actual LaTeX"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "latex-svg-pandoc" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath + , latex-svg-image, pandoc-types, text + }: + mkDerivation { + pname = "latex-svg-pandoc"; + version = "0.1"; + sha256 = "17n5gfdl7vdy06pph32yii9sww0mby10mdki6lh9k8wlvm15khv8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring directory filepath latex-svg-image pandoc-types + text + ]; + executableHaskellDepends = [ base latex-svg-image pandoc-types ]; + description = "Render LaTeX formulae in pandoc documents to images with an actual LaTeX"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lattices" = callPackage ({ mkDerivation, base, base-compat, containers, deepseq, hashable , integer-logarithms, QuickCheck, quickcheck-instances @@ -149279,8 +149660,8 @@ self: { }: mkDerivation { pname = "launchdarkly-server-sdk"; - version = "1.0.0"; - sha256 = "1b9561g4pwprixdzs4k2j0776whxjm2w9cfhi45p5zkjb8hv2jhn"; + version = "1.0.1"; + sha256 = "1425n7b587k9c6w3k95lcdhk5blj9blzjgnb67ylr1fizzayxc7h"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring bytestring-conversion clock containers cryptohash exceptions extra @@ -149894,14 +150275,15 @@ self: { }: mkDerivation { pname = "lean-peano"; - version = "0.1.1.0"; - sha256 = "19b959z6amsr6jfc5fmbks67sqhribplnv7rzxyn0ipzswxgsppb"; + version = "1.0.1.0"; + sha256 = "1h673y0rafh1dh8hy95spr2xwqc64pkkd094p6bd4cqvcmy72nd6"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base base-compat deepseq doctest hedgehog QuickCheck template-haskell ]; + description = "A maximally lazy, simple implementation of the Peano numbers with minimal dependencies"; license = stdenv.lib.licenses.mit; }) {}; @@ -151301,14 +151683,15 @@ self: { "libarchive" = callPackage ({ mkDerivation, base, bytestring, c2hs, Cabal, chs-cabal - , composition-prelude, criterion, deepseq, dir-traverse, directory - , dlist, filepath, hspec, libarchive, mtl, pathological-bytestrings - , tar, tar-conduit, temporary, unix-compat + , composition-prelude, cpphs, criterion, deepseq, dir-traverse + , directory, dlist, filepath, hspec, libarchive, mtl + , pathological-bytestrings, tar, tar-conduit, temporary + , unix-compat }: mkDerivation { pname = "libarchive"; - version = "2.2.1.0"; - sha256 = "08i3fm5rfqmdj4csaqdyyyhvnpdjjsgx5sbi0lyyzvk1sih5q968"; + version = "2.2.4.0"; + sha256 = "05d16ckk6iaj75zarqq6hjjmmb2xdd62hcyidfya3jfkw74zh1rp"; setupHaskellDepends = [ base Cabal chs-cabal ]; libraryHaskellDepends = [ base bytestring composition-prelude deepseq dlist filepath mtl @@ -151320,6 +151703,7 @@ self: { base bytestring composition-prelude dir-traverse directory filepath hspec mtl pathological-bytestrings temporary ]; + testToolDepends = [ cpphs ]; benchmarkHaskellDepends = [ base bytestring criterion tar tar-conduit temporary ]; @@ -153033,6 +153417,21 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "linear-tests" = callPackage + ({ mkDerivation, base, hspec, hspec-core, lens, linear, QuickCheck + }: + mkDerivation { + pname = "linear-tests"; + version = "0.1.1.0"; + sha256 = "0qndn8svhynvis1a69p7sircp8sd56hmk9gd4crcadiy8nf99227"; + libraryHaskellDepends = [ base lens linear QuickCheck ]; + testHaskellDepends = [ + base hspec hspec-core lens linear QuickCheck + ]; + description = "Linear Algebra"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "linear-vect" = callPackage ({ mkDerivation, base, random }: mkDerivation { @@ -153167,8 +153566,8 @@ self: { }: mkDerivation { pname = "lingo"; - version = "0.3.0.0"; - sha256 = "0cjxd9yflagps5760h62m948nmhbn0ad8kyldv9k28i59phm8gwx"; + version = "0.3.2.0"; + sha256 = "0qym6svpvxsxbhbppk0lkpp2zbqa13f0njkxnpyz5id581c3v8hx"; setupHaskellDepends = [ base bytestring Cabal containers directory filepath text yaml ]; @@ -155432,8 +155831,8 @@ self: { }: mkDerivation { pname = "log-warper"; - version = "1.8.11"; - sha256 = "0xhvipk5dlv7r2pmgn5mf46rrz092xhm6ar611y5lrr99i2kg172"; + version = "1.9.0"; + sha256 = "13hjbb1kqxilgqslc0c1fh5459278a71ihly24x9v6hhp1y5if91"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156600,8 +156999,6 @@ self: { ]; description = "Functional test framework for LSP servers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "lss" = callPackage @@ -157257,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 @@ -157294,6 +157691,24 @@ self: { broken = true; }) {}; + "lz4-hs" = callPackage + ({ mkDerivation, base, bytestring, c2hs, criterion, filepath, tasty + , tasty-hunit, temporary + }: + mkDerivation { + pname = "lz4-hs"; + version = "0.1.3.0"; + sha256 = "0yx1njh0zwk2qk99ip1f2wlcy3ql35piqbvd6dppr2hwnm5bh1mk"; + libraryHaskellDepends = [ base bytestring ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ base bytestring tasty tasty-hunit ]; + benchmarkHaskellDepends = [ + base bytestring criterion filepath temporary + ]; + description = "lz4 bindings for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lzip" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -157311,8 +157726,8 @@ self: { }: mkDerivation { pname = "lzlib"; - version = "1.0.3.0"; - sha256 = "06xdmrqc5p9nx8rqdx1i0hjlrlyanimvrk8rwb6bv04aprz22q8j"; + version = "1.0.4.0"; + sha256 = "1l7mbxh2cn8vgfxwkzrz9mv5ca2bx4ymbswvjz7b3mgjx0wiy9g8"; libraryHaskellDepends = [ base bytestring ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ @@ -157470,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 @@ -159597,10 +160032,8 @@ self: { }: mkDerivation { pname = "massiv-io"; - version = "0.2.0.0"; - sha256 = "1gypn2srqsnzmx1jd28632w34n7z4x5wadi4m7srxdhwk14vqg2m"; - revision = "1"; - editedCabalFile = "0kg2k84r5sxbg5pjjva639l0h1c4nhahmy1iakwmczkxjnzh6f8a"; + version = "0.2.1.0"; + sha256 = "0p7z4nk0fv9lql17s9d18hi5mrnvr4zry6rghqnhjmhlp97g4yi6"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring Color data-default-class deepseq exceptions @@ -159784,6 +160217,18 @@ self: { broken = true; }) {inherit (pkgs) pcre;}; + "math-extras" = callPackage + ({ mkDerivation, base, hedgehog }: + mkDerivation { + pname = "math-extras"; + version = "0.1.1.0"; + sha256 = "0hzk277a3h9ahnlx538p9f821d1i0npf3n6a8wgg8gmmbyn0sk49"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hedgehog ]; + description = "A variety of mathematical utilities"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "math-functions" = callPackage ({ mkDerivation, base, data-default-class, deepseq, erf, primitive , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, vector @@ -160177,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; @@ -160214,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 = [ @@ -160238,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 ]; @@ -162909,8 +163354,8 @@ self: { }: mkDerivation { pname = "min-max-pqueue"; - version = "0.1.0.0"; - sha256 = "142cfiybs6slzrdhc0k91rr5xxzi07saxcr834iic304cpbzcdrv"; + version = "0.1.0.1"; + sha256 = "09lby8qvjrcdp7ygy4a4dcw8w3y689qzazbcd55249z7ljjw731s"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers hedgehog ]; benchmarkHaskellDepends = [ @@ -163009,6 +163454,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mini-egison_1_0_0" = callPackage + ({ mkDerivation, base, egison-pattern-src + , egison-pattern-src-th-mode, haskell-src-exts, haskell-src-meta + , hspec, mtl, primes, recursion-schemes, sort, template-haskell + }: + mkDerivation { + pname = "mini-egison"; + version = "1.0.0"; + sha256 = "1x78p2s706kb6w4ci6w0av19zhw4i64bbl6xmvwrjs66xjgxrai6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base egison-pattern-src egison-pattern-src-th-mode haskell-src-exts + haskell-src-meta mtl recursion-schemes template-haskell + ]; + executableHaskellDepends = [ base sort ]; + testHaskellDepends = [ base hspec primes ]; + description = "Template Haskell Implementation of Egison Pattern Matching"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "miniball" = callPackage ({ mkDerivation, base, vector }: mkDerivation { @@ -163070,8 +163537,8 @@ self: { }: mkDerivation { pname = "minilight"; - version = "0.4.2"; - sha256 = "0bs4ix1yazq660jn9yz3yyfxx6scj2dgy37n13461l7ax1y9xp7s"; + version = "0.4.3"; + sha256 = "1qsmrb6bfwrv302pmm26nkkfky10h0mdkflvj3lfjmnz0bv7aw4g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -163111,8 +163578,8 @@ self: { }: mkDerivation { pname = "minimorph"; - version = "0.2.1.0"; - sha256 = "1phpsd0j8c987sw99p4hyywr4ydcxf5aq4h6xqdl3acwi0dv4zhj"; + version = "0.2.2.0"; + sha256 = "1fmnlv2qr8vnxk82b208fp7ckp920zrj9z9xv7lv6d5lgnsasf2c"; libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit text @@ -163310,8 +163777,8 @@ self: { }: mkDerivation { pname = "miniutter"; - version = "0.5.0.0"; - sha256 = "0hgsk54s07497rsgsck8lhpfbrxavx1chq90hsw14w3ggr1xnc7f"; + version = "0.5.1.0"; + sha256 = "0871hhpj5fl5si6rwg9l1lpdarlva3y888rgrrb4gaqsssnh0kk1"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary containers minimorph text ]; testHaskellDepends = [ @@ -164049,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 = [ @@ -164083,8 +164550,8 @@ self: { ({ mkDerivation, base, mmsyn2, mmsyn5, mmsyn6ukr, vector }: mkDerivation { pname = "mmsyn7s"; - version = "0.6.3.0"; - sha256 = "03gfnz0h9agi8zr1567b4ccrq1mhcm86f19minmx43gsipgr0gj4"; + version = "0.6.6.0"; + sha256 = "0hmsf7l3p2b2zj5ydjzxzkgqsj53yjwn71vgw8qzhbxjihk5x6l2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mmsyn2 mmsyn5 mmsyn6ukr vector ]; @@ -164099,8 +164566,8 @@ self: { }: mkDerivation { pname = "mmsyn7ukr"; - version = "0.15.2.0"; - sha256 = "1yrzlw1ai6w589ql7xnxcazb0yg2ixnk67fakndjn3gvk3h84gbx"; + version = "0.15.3.0"; + sha256 = "02556sgfwi0fzlwj0x22hmyi9pgq0j7w4yfpjy2ni1px8vanwq5j"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -164755,6 +165222,21 @@ self: { broken = true; }) {}; + "monad-choice" = callPackage + ({ mkDerivation, base, invariant, MonadRandom, mtl, transformers }: + mkDerivation { + pname = "monad-choice"; + version = "0.1.0.0"; + sha256 = "0vhfiqrnkfhqkhnh9h4npl3rfam321iikabr3przywfcfd4gap4z"; + revision = "1"; + editedCabalFile = "19acnk2dy5zan230g268nyvdx1y8piav3x9z6jsjbi2d7zm9sr38"; + libraryHaskellDepends = [ + base invariant MonadRandom mtl transformers + ]; + description = "Monad, monad transformer, and typeclass representing choices"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "monad-chronicle" = callPackage ({ mkDerivation, base, data-default-class, mtl, semigroupoids , these, transformers, transformers-compat @@ -165131,8 +165613,8 @@ self: { }: mkDerivation { pname = "monad-logger"; - version = "0.3.31"; - sha256 = "0awr06bh5d51kci2w2xsj34qvh98sb6dm48a4k05k8awv8hrrpmd"; + version = "0.3.32"; + sha256 = "14f1igbrkvwxxyhk58apc7swpzadaimfyaf75hwmsf5xc7xvjxyr"; libraryHaskellDepends = [ base bytestring conduit conduit-extra exceptions fast-logger lifted-base monad-control monad-loops mtl resourcet stm stm-chans @@ -172875,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"; @@ -174178,8 +174660,8 @@ self: { }: mkDerivation { pname = "nix-deploy"; - version = "1.0.4"; - sha256 = "1wmwrnm6wflkdaq0m84az1q6245iyvkzd2r47vdy9a2a1szqnvl3"; + version = "1.0.5"; + sha256 = "0jsrmslai8xn1nkijg1196gkn10dagqgm8p39r7jsfaa4jvwm040"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -174344,8 +174826,6 @@ self: { ]; description = "An opinionated formatter for Nix"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "nixfromnpm" = callPackage @@ -175011,8 +175491,8 @@ self: { ({ mkDerivation, base, primitive, vector }: mkDerivation { pname = "nonlinear-optimization"; - version = "0.3.12"; - sha256 = "129wvjrxxzcjzp4k2jjyn186xknglbcqj5jiah48mcrg44iash3r"; + version = "0.3.12.1"; + sha256 = "1hva2djjgdk9gjng4zqx9h9m0k3jgjhgjypx2yc3ddhfbs9x2wn0"; libraryHaskellDepends = [ base primitive vector ]; description = "Various iterative algorithms for optimization of nonlinear functions"; license = "GPL"; @@ -175024,8 +175504,10 @@ self: { }: mkDerivation { pname = "nonlinear-optimization-ad"; - version = "0.2.3"; - sha256 = "13a7j23ry8fkpvpc061ishcb4x2dnhnjbv3pcbywwri0w86g4g7d"; + version = "0.2.4"; + sha256 = "0wqi1y4f2sqn7wg1bj3i73kwdawg9ni6lq1s87m6sshy34n0vbx5"; + revision = "1"; + editedCabalFile = "0m3320spwzlyiyfjwdkxn92c858pivskrgazby1c1b3qp3nl2dk6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -175035,6 +175517,24 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "nonlinear-optimization-backprop" = callPackage + ({ mkDerivation, backprop, base, mono-traversable, mtl + , nonlinear-optimization, primitive, reflection, vector + }: + mkDerivation { + pname = "nonlinear-optimization-backprop"; + version = "0.2.4"; + sha256 = "0j7i67m25r4hs81w0j090c8wifvxxs0hzj0l0rj7aa1yrx5iwbhq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + backprop base mono-traversable mtl nonlinear-optimization primitive + reflection vector + ]; + description = "Wrapper of nonlinear-optimization package for using with backprop package"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "noodle" = callPackage ({ mkDerivation, base, directory, filepath }: mkDerivation { @@ -176568,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 ]; @@ -177097,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 @@ -178188,20 +178700,53 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "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.2.0"; + sha256 = "1nxkghxwjkgvdk6xhpssa7aifryn6rr0agbhyc0ybf2c76r1pr8b"; + libraryHaskellDepends = [ + base bytestring clock directory exceptions hashable random stm text + unordered-containers + ]; + testHaskellDepends = [ + async base bytestring tasty tasty-discover tasty-hunit + tasty-quickcheck + ]; + testToolDepends = [ tasty-discover ]; + license = stdenv.lib.licenses.asl20; + 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, async, base, exceptions, http-types, http2 - , http2-client, http2-client-grpc, http2-grpc-proto-lens, lens, mtl - , network, opentelemetry, proto-lens, proto-lens-protobuf-types - , proto-lens-runtime, text, unordered-containers + ({ mkDerivation, aeson, async, base, bytestring, exceptions + , http-client, http-client-tls, http-types, network, opentelemetry + , scientific, stm, text, unordered-containers }: mkDerivation { pname = "opentelemetry-lightstep"; - version = "0.0.0.0"; - sha256 = "1nnpis5ka6fgf0vmvcf68zqnjw69pvs91qm6slsgv58aww6fn9a2"; + version = "0.2.0"; + sha256 = "03fv2lgwkqngp26rdrk2fzvnccdgjc7xsv3sl3adb3xwzppkn0xh"; libraryHaskellDepends = [ - base exceptions http-types http2 http2-client http2-client-grpc - http2-grpc-proto-lens lens mtl network opentelemetry proto-lens - proto-lens-protobuf-types proto-lens-runtime text + aeson async base bytestring exceptions http-client http-client-tls + http-types network opentelemetry scientific stm text unordered-containers ]; testHaskellDepends = [ async base opentelemetry ]; @@ -178210,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 { @@ -179223,6 +179778,33 @@ self: { broken = true; }) {}; + "org-mode" = callPackage + ({ mkDerivation, base, filepath, hashable, megaparsec + , parser-combinators, tasty, tasty-hunit, text, time + }: + mkDerivation { + pname = "org-mode"; + version = "1.0.1"; + sha256 = "0nhpb8x11w0w3jwplk3bx9a2llw77l66wbm31bpgdpr6ak2r0z75"; + libraryHaskellDepends = [ + base filepath hashable megaparsec parser-combinators text time + ]; + testHaskellDepends = [ + base megaparsec tasty tasty-hunit text time + ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "org-mode-lucid" = callPackage + ({ mkDerivation, base, hashable, lucid, org-mode, text }: + mkDerivation { + pname = "org-mode-lucid"; + version = "1.1.0"; + sha256 = "066mdm9a7dkz6yy9g2yhqalvxrxhak1mw0awag3ivswv6djf528q"; + libraryHaskellDepends = [ base hashable lucid org-mode text ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "org2anki" = callPackage ({ mkDerivation, base, parsec, regex-compat }: mkDerivation { @@ -180963,8 +181545,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.2.1"; - sha256 = "0v8jpaz5mwg4qx6a4y7i0d8pk70qd4bla07krlxbix9c56mma33l"; + version = "0.2.3"; + sha256 = "1sk8hhw3ad0jb2ik787pqjgaprd78k7qc0m0chcji3z5bprxp1cw"; description = "A box of patterns and paradigms"; license = stdenv.lib.licenses.mit; }) {}; @@ -181115,7 +181697,7 @@ self: { broken = true; }) {}; - "pantry" = callPackage + "pantry_0_2_0_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, base-orphans , base64-bytestring, bytestring, Cabal, conduit, conduit-extra , containers, contravariant, cryptonite, cryptonite-conduit @@ -181166,7 +181748,47 @@ self: { description = "Content addressable Haskell package management"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + }) {}; + + "pantry" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal + , casa-client, casa-types, conduit, conduit-extra, containers + , cryptonite, cryptonite-conduit, digest, exceptions, filelock + , generic-deriving, hackage-security, hedgehog, hpack, hspec + , http-client, http-client-tls, http-conduit, http-download + , http-types, memory, mtl, network-uri, path, path-io, persistent + , persistent-sqlite, persistent-template, primitive, QuickCheck + , raw-strings-qq, resourcet, rio, rio-orphans, rio-prettyprint + , tar-conduit, text, text-metrics, time, transformers, unix-compat + , unliftio, unordered-containers, vector, yaml, zip-archive + }: + mkDerivation { + pname = "pantry"; + 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 + digest filelock generic-deriving hackage-security hpack http-client + http-client-tls http-conduit http-download http-types memory mtl + network-uri path path-io persistent persistent-sqlite + persistent-template primitive resourcet rio rio-orphans + rio-prettyprint tar-conduit text text-metrics time transformers + unix-compat unliftio unordered-containers vector yaml zip-archive + ]; + testHaskellDepends = [ + aeson ansi-terminal base bytestring Cabal casa-client casa-types + conduit conduit-extra containers cryptonite cryptonite-conduit + digest exceptions filelock generic-deriving hackage-security + hedgehog hpack hspec http-client http-client-tls http-conduit + http-download http-types memory mtl network-uri path path-io + persistent persistent-sqlite persistent-template primitive + QuickCheck raw-strings-qq resourcet rio rio-orphans rio-prettyprint + tar-conduit text text-metrics time transformers unix-compat + unliftio unordered-containers vector yaml zip-archive + ]; + description = "Content addressable Haskell package management"; + license = stdenv.lib.licenses.bsd3; }) {}; "pantry-tmp" = callPackage @@ -182524,8 +183146,8 @@ self: { }: mkDerivation { pname = "parsix"; - version = "0.2.2.0"; - sha256 = "1l2xg0xca1ss4gpl5gmpvbck0f66r8mazai6x561ldqb3kqjx1as"; + version = "0.2.2.1"; + sha256 = "0bkk1186qgnaxv1n5ycs04szrf55ra7jbfzlqbmlx8vaxq9g6xdf"; libraryHaskellDepends = [ base containers fingertree mtl parsers prettyprinter prettyprinter-ansi-terminal text transformers @@ -182615,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 @@ -185001,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 @@ -185401,8 +186021,8 @@ self: { }: mkDerivation { pname = "persistent-typed-db"; - version = "0.1.0.0"; - sha256 = "0wlz2d6v4ks376amp26fxw5wj381kqaghp25mry073krc7yqz6yv"; + version = "0.1.0.1"; + sha256 = "07yjzxg5yfxv1zbp5pkrvj8nrsxyhy4n11zgmd0q9g186q6283qn"; libraryHaskellDepends = [ aeson base bytestring conduit http-api-data monad-logger path-pieces persistent persistent-template resource-pool resourcet @@ -188157,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 { @@ -188772,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 ]; @@ -189532,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 @@ -189656,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 ]; @@ -190337,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 @@ -192301,6 +192956,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "preql" = callPackage + ({ mkDerivation, aeson, alex, array, base, binary-parser + , bytestring, bytestring-strict-builder, contravariant, free, happy + , mtl, postgresql-binary, postgresql-libpq, postgresql-simple, syb + , template-haskell, text, th-lift-instances, time, transformers + , uuid, vector + }: + mkDerivation { + pname = "preql"; + version = "0.1"; + sha256 = "1a5b45vplknan61l0p68559pg7la89ly97mzbqxb5j6v3cifgmcg"; + libraryHaskellDepends = [ + aeson array base binary-parser bytestring bytestring-strict-builder + contravariant free mtl postgresql-binary postgresql-libpq + postgresql-simple syb template-haskell text th-lift-instances time + transformers uuid vector + ]; + libraryToolDepends = [ alex happy ]; + description = "experiments with SQL"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "presburger" = callPackage ({ mkDerivation, base, containers, pretty, QuickCheck }: mkDerivation { @@ -192954,10 +193631,8 @@ self: { }: mkDerivation { pname = "primitive"; - version = "0.7.0.0"; - sha256 = "0xhmin3z2vp8jina1wzxg11nqiz8x63wisv2nw2ggji8lgz48skq"; - revision = "1"; - editedCabalFile = "1g10dsdadv8sy9mhhwx4jknzshvxc4qx6z9lmgqy7060prlbqnn4"; + version = "0.7.0.1"; + sha256 = "1pgpjzlfn037lw7lsszpqmqhbf33fnd86jna1whdd4pl57cbg2yx"; libraryHaskellDepends = [ base ghc-prim transformers ]; testHaskellDepends = [ base base-orphans ghc-prim QuickCheck semigroups tagged tasty @@ -193944,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; @@ -193993,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 + adjunctions base coapplicative distributive lawz mtl + newtype-generics profunctors rings semigroupoids tagged + transformers ]; - executableHaskellDepends = [ - adjunctions base connections containers doctest ilist mtl - ]; - 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 @@ -194667,8 +195338,8 @@ self: { }: mkDerivation { pname = "prosidy"; - version = "1.5.0.1"; - sha256 = "1pbqa89khrm0kqcsdd8sj82km1sc9laiw155prplnnv7xp8xiigy"; + version = "1.6.0.0"; + sha256 = "19c8kz6kdd2flzi1gyddi4yp4fn62wfjahcp66saydb4ipxdxfs4"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base binary bytestring containers contravariant deepseq @@ -194684,6 +195355,21 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "prosidyc" = callPackage + ({ mkDerivation, base, free, hashable, microlens, mtl, prosidy + , text, unordered-containers + }: + mkDerivation { + pname = "prosidyc"; + version = "0.2.0.0"; + sha256 = "19nq969mjnpc51nwa6giv93hz7pyn590yhfbsspr5wp5i9xim39i"; + libraryHaskellDepends = [ + base free hashable microlens mtl prosidy text unordered-containers + ]; + description = "A DSL for processing Prosidy documents"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "prospect" = callPackage ({ mkDerivation, base, deepseq, free, hspec, inspection-testing , kan-extensions, mtl, transformers @@ -196237,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 @@ -199766,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 { @@ -200211,8 +200940,8 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "9.0.7"; - sha256 = "0kgg1qfhgjajzrw22yvcxmiim14pxr2gim1aak3ivnmhn4yff4fg"; + version = "9.0.8"; + sha256 = "1a98zy1n6dlxxyfdganqfcx8hw04i4hjwdj8ggdd4g0jky62jaz2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -202375,6 +203104,8 @@ self: { pname = "reflex-basic-host"; version = "0.2.0.1"; sha256 = "1bax3rcrwi3447wd7apramw0f248ddksl8lrdjgrph26bbh8vc1i"; + revision = "1"; + editedCabalFile = "11bzd169wpdn57d7krgx9bw4x5qzskp9d5abdn74x6ipy34cj5ml"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -202959,6 +203690,8 @@ self: { pname = "reg-alloc"; version = "0.1.0.0"; sha256 = "1lik9r2lp1r1zamk3f1ciyw5iwgpx018jhk43hmc4kjg4d5g8l0r"; + revision = "1"; + editedCabalFile = "1dzisg5cdb2jrcp6xmkzmgzd00phqhgf1iddlm2c10x49lbqsrld"; libraryHaskellDepends = [ base ]; description = "Register allocation API"; license = stdenv.lib.licenses.bsd3; @@ -204907,6 +205640,19 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "replace-megaparsec_1_3_1_0" = callPackage + ({ mkDerivation, base, bytestring, Cabal, megaparsec, text }: + mkDerivation { + pname = "replace-megaparsec"; + version = "1.3.1.0"; + sha256 = "074vbw5gc3sg2qsj9zlcjdgzdjc8yxa369dvx2w2adl0jv4dk5ib"; + libraryHaskellDepends = [ base bytestring megaparsec text ]; + testHaskellDepends = [ base bytestring Cabal megaparsec text ]; + description = "Find, replace, and edit text patterns with Megaparsec parsers"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "replica" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, Diff , file-embed, http-types, QuickCheck, quickcheck-instances @@ -205248,8 +205994,8 @@ self: { }: mkDerivation { pname = "require"; - version = "0.4.3"; - sha256 = "0j6dsyqx637b5p8jmk5h4b0qham0m8m74c8b8y1dywm0c5daayca"; + version = "0.4.4"; + sha256 = "1y7n1dyccwfy5fplinw72fsq1vjzp5nrngvr5g08yfqykaidpc8r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -205274,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 { @@ -205576,8 +206346,8 @@ self: { pname = "resourcet"; version = "1.1.11"; sha256 = "1n94m2c7rxk2bgm8wywrkp9pmqlnv2dl35yaylninzm8xk1xavil"; - revision = "1"; - editedCabalFile = "09sgrzaaishx645hrfflxckyaq0dwk22agjf4sz8nwjafyv3ssh9"; + revision = "2"; + editedCabalFile = "08v09k5i8nr09f1kscq044hzibq6hsykd3v1xr480dp4hljcw5kc"; libraryHaskellDepends = [ base containers exceptions lifted-base mmorph monad-control mtl transformers transformers-base transformers-compat unliftio-core @@ -205594,8 +206364,8 @@ self: { }: mkDerivation { pname = "resourcet"; - version = "1.2.2"; - sha256 = "1rfbfcv3r1h29y0yqr3x6a1s04lbc3vzm3jqnfg4f9rqp9d448qk"; + version = "1.2.3"; + sha256 = "1ig7a22i5hn0ya7d4bg3xq0yy9mqgwawx4sv88db0fvdsnzg868s"; libraryHaskellDepends = [ base containers exceptions mtl primitive transformers unliftio-core ]; @@ -206603,20 +207373,21 @@ self: { "rib" = callPackage ({ mkDerivation, aeson, async, base-noprelude, binary, clay - , cmdargs, containers, directory, exceptions, foldl, fsnotify - , lucid, megaparsec, mmark, mmark-ext, modern-uri, mtl, pandoc - , pandoc-include-code, pandoc-types, path, path-io, relude, shake - , text, wai, wai-app-static, warp + , cmdargs, containers, dhall, directory, exceptions, foldl + , fsnotify, lucid, megaparsec, mmark, mmark-ext, modern-uri, mtl + , pandoc, pandoc-include-code, pandoc-types, path, path-io, relude + , safe-exceptions, shake, text, wai, wai-app-static, warp }: mkDerivation { pname = "rib"; - version = "0.6.0.0"; - sha256 = "0h1yfa1hf5wshfs3cvqi53rgfh25d1v7gj00wkgd32nkx1v3jrsg"; + version = "0.7.0.0"; + sha256 = "0yi8g6c2hfl09l9906v7vljry9jb98xgxrfbngi17d5iqlld9qz4"; libraryHaskellDepends = [ - aeson async base-noprelude binary clay cmdargs containers directory - exceptions foldl fsnotify lucid megaparsec mmark mmark-ext - modern-uri mtl pandoc pandoc-include-code pandoc-types path path-io - relude shake text wai wai-app-static warp + aeson async base-noprelude binary clay cmdargs containers dhall + directory exceptions foldl fsnotify lucid megaparsec mmark + mmark-ext modern-uri mtl pandoc pandoc-include-code pandoc-types + path path-io relude safe-exceptions shake text wai wai-app-static + warp ]; description = "Static site generator using Shake"; license = stdenv.lib.licenses.bsd3; @@ -206628,8 +207399,8 @@ self: { ({ mkDerivation, base, Only, postgresql-simple, text, time }: mkDerivation { pname = "ribbit"; - version = "1.0.0.1"; - sha256 = "0zixx1xmqc8893rczhdzcplmdcx5dx1c4ykf7rg7w8h5yvni1r0y"; + version = "1.1.0.0"; + sha256 = "1pmg7ii6mpl22hlgmripwp44cz4pwp2yqa4z32f21lfr0y9slz8j"; libraryHaskellDepends = [ base Only postgresql-simple text time ]; description = "Type-level Relational DB combinators"; license = stdenv.lib.licenses.mit; @@ -206885,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; @@ -206906,8 +207678,8 @@ self: { }: mkDerivation { pname = "rio"; - version = "0.1.14.0"; - sha256 = "1ss0lbdrmiblxza8lv51kpdw51s7m5qaihxlvf1jp4qg4amdayxw"; + version = "0.1.14.1"; + sha256 = "0ysbjxaby846vp2w60747b7sm1zy30i62qg0bgsr7z52jamrx3qm"; libraryHaskellDepends = [ base bytestring containers deepseq directory exceptions filepath hashable microlens mtl primitive process text time typed-process @@ -207876,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; @@ -208388,6 +209160,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rrule" = callPackage + ({ mkDerivation, base, hspec, megaparsec, parser-combinators, text + , time + }: + mkDerivation { + pname = "rrule"; + version = "0.1.0.0"; + sha256 = "0059rrvvfrcsycc8aczayphscviidrq8ig3j4x3ln3xjfscq2l2l"; + libraryHaskellDepends = [ + base megaparsec parser-combinators text time + ]; + testHaskellDepends = [ base hspec text ]; + description = "Recurrence rule parser and formatter"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rsagl" = callPackage ({ mkDerivation, array, arrows, base, containers , data-memocombinators, deepseq, mtl, old-time, OpenGL, OpenGLRaw @@ -209736,15 +210524,15 @@ self: { }) {}; "saltine" = callPackage - ({ mkDerivation, base, bytestring, libsodium, profunctors + ({ mkDerivation, base, bytestring, hashable, libsodium, profunctors , QuickCheck, semigroups, test-framework , test-framework-quickcheck2 }: mkDerivation { pname = "saltine"; - version = "0.1.0.2"; - sha256 = "0253m8n6s39fnr8wz1z240kaizw3chfm1fgwp51dgqgk0nwrv67x"; - libraryHaskellDepends = [ base bytestring profunctors ]; + version = "0.1.1.0"; + sha256 = "1apcyc39mraqg9394scwqrdc3aaxvry22pl648gyp73z9dfrk5wf"; + libraryHaskellDepends = [ base bytestring hashable profunctors ]; libraryPkgconfigDepends = [ libsodium ]; testHaskellDepends = [ base bytestring QuickCheck semigroups test-framework @@ -209752,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 @@ -212173,8 +212959,8 @@ self: { }: mkDerivation { pname = "sdl2-ttf"; - version = "2.1.0"; - sha256 = "1xw05jgv6x9xplahwf3jjdq6v3mha4s7bb27kn8x66764glnyrf7"; + version = "2.1.1"; + sha256 = "1iyqm1i5k8j4948gvr59rgalqwsdkishs52kp85ncvb6cpylw3qn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -213199,8 +213985,6 @@ self: { ]; description = "An implementation of semver and semantic version ranges"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "sendfile" = callPackage @@ -215533,8 +216317,8 @@ self: { }: mkDerivation { pname = "servant-pagination"; - version = "2.2.2"; - sha256 = "00ki2crhrp87m0dwyrb6rv25cfyag51igm772a54zvgi713qj7rr"; + version = "2.3.0"; + sha256 = "0kza7lr3akx3zviqbxlw74f1y66y8c6kys52n49brvrhqwnv4xwd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -215667,6 +216451,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-purescript_0_10_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, http-types, lens, mainland-pretty, purescript-bridge + , servant, servant-foreign, servant-server, servant-subscriber + , text + }: + mkDerivation { + pname = "servant-purescript"; + version = "0.10.0.0"; + sha256 = "07q4nvdhhzyc3xkad130nkv7ckgmj6fmhrpryzpjdvddgq9320b4"; + libraryHaskellDepends = [ + aeson base bytestring containers directory filepath http-types lens + mainland-pretty purescript-bridge servant servant-foreign + servant-server servant-subscriber text + ]; + testHaskellDepends = [ + aeson base containers lens mainland-pretty purescript-bridge + servant servant-foreign servant-subscriber text + ]; + description = "Generate PureScript accessor functions for you servant API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-pushbullet-client" = callPackage ({ mkDerivation, aeson, base, http-api-data, http-client , http-client-tls, microlens, microlens-th, pushbullet-types @@ -216015,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 = [ @@ -216206,6 +217014,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-subscriber_0_7_0_0" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, blaze-builder + , bytestring, case-insensitive, containers, directory, filepath + , http-types, lens, lifted-base, monad-control, monad-logger + , network-uri, purescript-bridge, servant, servant-foreign + , servant-server, stm, text, time, transformers, wai + , wai-websockets, warp, websockets + }: + mkDerivation { + pname = "servant-subscriber"; + version = "0.7.0.0"; + sha256 = "1c1g6jx36n5n5qjw82854vkbg7mavmrj7vz97vc1zzk5w54wsj8k"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async attoparsec base blaze-builder bytestring + case-insensitive containers directory filepath http-types lens + lifted-base monad-control monad-logger network-uri servant + servant-foreign servant-server stm text time transformers wai + wai-websockets warp websockets + ]; + executableHaskellDepends = [ base purescript-bridge ]; + description = "When REST is not enough ..."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-swagger" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring , Cabal, cabal-doctest, directory, doctest, filepath, hspec @@ -216627,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 @@ -217476,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 { @@ -217632,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 { @@ -220993,8 +221889,8 @@ self: { }: mkDerivation { pname = "skews"; - version = "0.1.0.2"; - sha256 = "0xw9zlv7f77048c47kc3kymwxv9whg286d270n9d1k52c0df8h0p"; + version = "0.1.0.3"; + sha256 = "1rwliykb87mvkpajzkx1fh4qlh7fgh6y5z5np1jrdi0rv3ki7hsn"; libraryHaskellDepends = [ base bytestring deque websockets ]; testHaskellDepends = [ async base bytestring deque envy hspec network websockets @@ -221133,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 { @@ -221602,33 +222511,6 @@ self: { }) {}; "small-bytearray-builder" = callPackage - ({ mkDerivation, base, byteslice, bytestring, gauge - , natural-arithmetic, primitive, primitive-offset - , primitive-unlifted, QuickCheck, quickcheck-classes, run-st, tasty - , tasty-hunit, tasty-quickcheck, text, text-short, vector - , wide-word - }: - mkDerivation { - pname = "small-bytearray-builder"; - version = "0.3.3.0"; - sha256 = "0qd875rvh59kg1vb0q6sz6fw3dr847c09hgz7jzavhj9z3vhkm51"; - libraryHaskellDepends = [ - base byteslice bytestring natural-arithmetic primitive - primitive-offset primitive-unlifted run-st text-short wide-word - ]; - testHaskellDepends = [ - base byteslice bytestring natural-arithmetic primitive - primitive-unlifted QuickCheck quickcheck-classes tasty tasty-hunit - tasty-quickcheck text vector wide-word - ]; - benchmarkHaskellDepends = [ - base byteslice gauge natural-arithmetic primitive text-short - ]; - description = "Serialize to a small byte arrays"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "small-bytearray-builder_0_3_4_0" = callPackage ({ mkDerivation, base, bytebuild, byteslice }: mkDerivation { pname = "small-bytearray-builder"; @@ -221638,7 +222520,6 @@ self: { doHaddock = false; description = "Serialize to bytes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "smallarray" = callPackage @@ -221682,6 +222563,8 @@ self: { pname = "smallcheck"; version = "1.1.5"; sha256 = "195fj7w3v03d1y1nm2ylavzrwxjcdbq0lb6zsw1dwyx5jmwfc84h"; + revision = "1"; + editedCabalFile = "1zhhmad21sv0201hd7fahq769xpmzcj352l0sfalcwqs4kbc3mg0"; libraryHaskellDepends = [ base ghc-prim logict mtl pretty ]; description = "A property-based testing library"; license = stdenv.lib.licenses.bsd3; @@ -222330,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 @@ -222353,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 @@ -223977,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 @@ -225763,29 +226642,6 @@ self: { }) {}; "splitmix" = callPackage - ({ mkDerivation, async, base, base-compat-batteries, bytestring - , clock, containers, criterion, deepseq, HUnit, process, random - , tf-random, time, vector - }: - mkDerivation { - pname = "splitmix"; - version = "0.0.3"; - sha256 = "1k0amgkz7rvyz3lnw7m786ilnr1cibwhx9sc4qynq329gxan5r7w"; - revision = "1"; - editedCabalFile = "178d81ksnmgppbd09ci53r88iyacn3phy55v5i4ybfz5d8rfjpa5"; - libraryHaskellDepends = [ base deepseq random time ]; - testHaskellDepends = [ - async base base-compat-batteries bytestring deepseq HUnit process - random tf-random vector - ]; - benchmarkHaskellDepends = [ - base clock containers criterion random tf-random - ]; - description = "Fast Splittable PRNG"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "splitmix_0_0_4" = callPackage ({ mkDerivation, async, base, base-compat-batteries, bytestring , clock, containers, criterion, deepseq, HUnit, process, random , tf-random, time, vector @@ -225804,7 +226660,6 @@ self: { ]; description = "Fast Splittable PRNG"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "splitter" = callPackage @@ -226272,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 @@ -226845,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 @@ -226940,8 +227823,6 @@ self: { ''; description = "The Haskell Tool Stack"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "stack-bump" = callPackage @@ -228322,28 +229203,26 @@ self: { }) {}; "status-notifier-item" = callPackage - ({ mkDerivation, base, bytestring, bytestring-to-vector, containers - , dbus, dbus-hslogger, filepath, hslogger, lens, network + ({ mkDerivation, base, byte-order, bytestring, bytestring-to-vector + , containers, dbus, dbus-hslogger, filepath, hslogger, lens , optparse-applicative, template-haskell, text, transformers , vector }: mkDerivation { pname = "status-notifier-item"; - version = "0.3.0.4"; - sha256 = "0abck5zvk46kng28qjhvqkxj485zw3l6bsakxpjijb58d1i0g667"; + version = "0.3.0.5"; + sha256 = "165kdg1wb0xpy4z7hlk8654ph2psdibal1p0f32zzrccbnk0w801"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring bytestring-to-vector containers dbus filepath - hslogger lens network template-haskell text transformers vector + base byte-order bytestring bytestring-to-vector containers dbus + filepath hslogger lens template-haskell text transformers vector ]; executableHaskellDepends = [ base dbus dbus-hslogger hslogger optparse-applicative ]; description = "A wrapper over the StatusNotifierItem/libappindicator dbus specification"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "statvfs" = callPackage @@ -229454,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 @@ -234635,17 +235539,17 @@ self: { , gi-gdkx11, gi-glib, gi-gtk, gi-gtk-hs, gi-pango, gtk-sni-tray , gtk-strut, gtk3, haskell-gi, haskell-gi-base, hslogger , HStringTemplate, http-client, http-client-tls, http-types - , multimap, network, network-uri, old-locale, optparse-applicative - , parsec, process, rate-limit, regex-compat, safe, scotty, split + , multimap, old-locale, optparse-applicative, parsec, process + , rate-limit, regex-compat, safe, scotty, split , status-notifier-item, stm, template-haskell, text, time , time-locale-compat, time-units, transformers, transformers-base - , tuple, unix, utf8-string, X11, xdg-basedir, xml, xml-helpers - , xmonad + , tuple, unix, utf8-string, X11, xdg-basedir, xdg-desktop-entry + , xml, xml-helpers, xmonad }: mkDerivation { pname = "taffybar"; - version = "3.2.1"; - sha256 = "1bha6b8p46pr6hw9iawbffdg8lf6cmv1ryw96r2qn1jfikl6h39v"; + version = "3.2.2"; + sha256 = "02b6rmsb89c1h7fr81ljbij30pnl8z4dz6xz367g7a2b9hwq42gz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -234656,11 +235560,11 @@ self: { gi-gdkpixbuf gi-gdkx11 gi-glib gi-gtk gi-gtk-hs gi-pango gtk-sni-tray gtk-strut haskell-gi haskell-gi-base hslogger HStringTemplate http-client http-client-tls http-types multimap - network network-uri old-locale parsec process rate-limit - regex-compat safe scotty split status-notifier-item stm - template-haskell text time time-locale-compat time-units - transformers transformers-base tuple unix utf8-string X11 - xdg-basedir xml xml-helpers xmonad + old-locale parsec process rate-limit regex-compat safe scotty split + status-notifier-item stm template-haskell text time + time-locale-compat time-units transformers transformers-base tuple + unix utf8-string X11 xdg-basedir xdg-desktop-entry xml xml-helpers + xmonad ]; libraryPkgconfigDepends = [ gtk3 ]; executableHaskellDepends = [ @@ -234669,8 +235573,6 @@ self: { executablePkgconfigDepends = [ gtk3 ]; description = "A desktop bar similar to xmobar, but with more GUI"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) gtk3;}; "tag-bits" = callPackage @@ -235029,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 @@ -235437,24 +236339,24 @@ self: { ({ mkDerivation, array, base, bytestring, bytestring-handle , containers, criterion, deepseq, hpath-directory, hpath-filepath , hpath-posix, QuickCheck, safe-exceptions, tasty, tasty-quickcheck - , time, unix, word8 + , these, time, unix, word8 }: mkDerivation { pname = "tar-bytestring"; - version = "0.6.2.0"; - sha256 = "17ha3c9fiqw2zabnzrz4rlafvg2dynga8cc6j4hhzppc25v5blwj"; + version = "0.6.3.0"; + sha256 = "18c5493zwwbri2m50a2najbxaqnprxwng48kdcap7qppbvdmra66"; libraryHaskellDepends = [ array base bytestring containers deepseq hpath-directory - hpath-filepath hpath-posix safe-exceptions time unix word8 + hpath-filepath hpath-posix safe-exceptions these time unix word8 ]; testHaskellDepends = [ array base bytestring bytestring-handle containers deepseq hpath-directory hpath-filepath hpath-posix QuickCheck - safe-exceptions tasty tasty-quickcheck time unix word8 + safe-exceptions tasty tasty-quickcheck these time unix word8 ]; benchmarkHaskellDepends = [ array base bytestring containers criterion deepseq hpath-directory - hpath-filepath hpath-posix safe-exceptions time unix word8 + hpath-filepath hpath-posix safe-exceptions these time unix word8 ]; description = "Reading, writing and manipulating \".tar\" archive files."; license = stdenv.lib.licenses.bsd3; @@ -237748,8 +238650,8 @@ self: { }: mkDerivation { pname = "termonad"; - version = "3.0.0.0"; - sha256 = "11c58k6iyqry5dfdbxsvmca19w10igb4yd1nk2ap6h7zsav2rjgn"; + version = "3.1.0.0"; + sha256 = "15zh50v5hszvr4xz6hwmwaga2g1avrfhnjzzx9dmghjyggwkhfa2"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -238502,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 { @@ -239251,36 +240173,6 @@ self: { }) {}; "text-show" = callPackage - ({ mkDerivation, array, base, base-compat-batteries, base-orphans - , bifunctors, bytestring, bytestring-builder, containers, criterion - , deepseq, deriving-compat, generic-deriving, ghc-boot-th, ghc-prim - , hspec, hspec-discover, integer-gmp, QuickCheck - , quickcheck-instances, template-haskell, text, th-abstraction - , th-lift, transformers, transformers-compat - }: - mkDerivation { - pname = "text-show"; - version = "3.8.4"; - sha256 = "03ia42rfp0znxjj2amiwj5k4f41rbkg7nfvd5j09rjkwy7532jbq"; - libraryHaskellDepends = [ - array base base-compat-batteries bifunctors bytestring - bytestring-builder containers generic-deriving ghc-boot-th ghc-prim - integer-gmp template-haskell text th-abstraction th-lift - transformers transformers-compat - ]; - testHaskellDepends = [ - array base base-compat-batteries base-orphans bytestring - bytestring-builder deriving-compat generic-deriving ghc-prim hspec - QuickCheck quickcheck-instances template-haskell text transformers - transformers-compat - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ]; - description = "Efficient conversion of values into Text"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "text-show_3_8_5" = callPackage ({ mkDerivation, array, base, base-compat-batteries, base-orphans , bifunctors, bytestring, bytestring-builder, containers, criterion , deepseq, deriving-compat, generic-deriving, ghc-boot-th, ghc-prim @@ -239308,7 +240200,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ]; description = "Efficient conversion of values into Text"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-show-instances" = callPackage @@ -240731,8 +241622,8 @@ self: { }: mkDerivation { pname = "threadscope"; - version = "0.2.11.1"; - sha256 = "18s1k3c3013zsvw3midzpwlh7mn2lmz6ryyrh98rhjccz5nl0qvh"; + version = "0.2.12"; + sha256 = "10aalch81w4wrz7asp8amc1353khabqxms9b2r3f30s9kys3703x"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -242197,8 +243088,8 @@ self: { }: mkDerivation { pname = "timezone-olson-th"; - version = "0.1.0.4"; - sha256 = "0xrf3hn8246s6n31bhq5arvn3xkwhfibmlfs5ahn5li2iblkn585"; + version = "0.1.0.5"; + sha256 = "1b28drcgdal7ifghw9bk3k8rmk7k0mjq3kl55xqbnlip6p99pka7"; libraryHaskellDepends = [ base template-haskell time timezone-olson timezone-series ]; @@ -244043,6 +244934,21 @@ self: { broken = true; }) {}; + "tracked-files" = callPackage + ({ mkDerivation, base, directory, hspec, process, text }: + mkDerivation { + pname = "tracked-files"; + version = "0.1.0.0"; + sha256 = "0aw99k1kjiwhpvwk3pqhc34cff9lcv4dzg240rs7p3i4j0zf884v"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory process ]; + executableHaskellDepends = [ base directory process text ]; + testHaskellDepends = [ base directory hspec process ]; + description = "Package to list all tracked and untracked existing files via Git"; + license = stdenv.lib.licenses.mit; + }) {}; + "tracker" = callPackage ({ mkDerivation, base, containers, glib }: mkDerivation { @@ -245098,6 +246004,20 @@ self: { broken = true; }) {}; + "tree-sitter-ql" = callPackage + ({ mkDerivation, base, tree-sitter }: + mkDerivation { + pname = "tree-sitter-ql"; + version = "0.1.0.1"; + sha256 = "07k5vxkwy2l49f1gyvqasqva41n1h4xz381rmy1dd0625mshyvs2"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base tree-sitter ]; + description = "Tree-sitter grammar/parser for QL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "tree-sitter-ruby" = callPackage ({ mkDerivation, base, tree-sitter }: mkDerivation { @@ -245349,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 @@ -246351,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 }: @@ -247905,8 +248853,8 @@ self: { }: mkDerivation { pname = "typed-spreadsheet"; - version = "1.1.4"; - sha256 = "16xbzwaiakimwwkbb0q0nxa08j7842z3894p04ijjvksllkdrlna"; + version = "1.1.5"; + sha256 = "1k48y9nh3i50mskkw5h38fjygspkmraz54xfb7m7n8i8kzl1x18h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -248229,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 @@ -249884,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.1"; - sha256 = "1siz1iq66bvwraws628haqf3q2hycd4a2yihpmqs778mzjnhs26r"; + version = "0.1.0.10"; + sha256 = "0mb7q5lqkn11s11s8w6a4anmbsf3z4c66bg78j1dnwkqivx02k0b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -249898,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; @@ -250349,8 +251297,8 @@ self: { }: mkDerivation { pname = "unliftio"; - version = "0.2.12"; - sha256 = "02gy1zrxgzg4xmzm8lafsf1nyr3as1q20r8ld73xg3q7rkag9acg"; + version = "0.2.12.1"; + sha256 = "18z8db7plbjdgl12p00zj5qd60v89wazgxqc356mwg295w2mydwc"; libraryHaskellDepends = [ async base bytestring deepseq directory filepath process stm time transformers unix unliftio-core @@ -250380,6 +251328,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "unliftio-core_0_2_0_1" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "unliftio-core"; + version = "0.2.0.1"; + sha256 = "16i97jax8rys57l0g0qswfwxh1cl5bgw2lw525rm6bzajw90v7wi"; + libraryHaskellDepends = [ base transformers ]; + description = "The MonadUnliftIO typeclass for unlifting monads to IO"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unliftio-pool" = callPackage ({ mkDerivation, base, resource-pool, time, transformers , unliftio-core @@ -250987,21 +251947,6 @@ self: { }) {}; "urbit-hob" = callPackage - ({ mkDerivation, base, bytestring, criterion, deepseq, hspec - , hspec-core, murmur3, QuickCheck, text, vector - }: - mkDerivation { - pname = "urbit-hob"; - version = "0.3.1"; - sha256 = "16axy690mr7hmqxjb4sd17pizmqy5kdw31rbaf24bfxmaval8ijb"; - libraryHaskellDepends = [ base bytestring murmur3 text vector ]; - testHaskellDepends = [ base hspec hspec-core QuickCheck text ]; - benchmarkHaskellDepends = [ base criterion deepseq ]; - description = "Hoon-style atom manipulation and printing functions"; - license = stdenv.lib.licenses.mit; - }) {}; - - "urbit-hob_0_3_2" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, hspec , hspec-core, murmur3, QuickCheck, text, vector }: @@ -251014,7 +251959,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Hoon-style atom manipulation and printing functions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ureader" = callPackage @@ -254018,22 +254962,21 @@ self: { "verismith" = callPackage ({ mkDerivation, alex, array, base, binary, blaze-html, bytestring - , Cabal, cabal-doctest, criterion, cryptonite, deepseq, DRBG - , exceptions, fgl, fgl-visualize, filepath, gitrev, hedgehog, lens - , lifted-base, memory, monad-control, mtl, optparse-applicative - , parsec, prettyprinter, random, recursion-schemes, shakespeare - , shelly, statistics, tasty, tasty-hedgehog, tasty-hunit - , template-haskell, text, time, tomland, transformers - , transformers-base, unordered-containers, vector + , criterion, cryptonite, deepseq, DRBG, exceptions, fgl + , fgl-visualize, filepath, gitrev, hedgehog, lens, lifted-base + , memory, monad-control, mtl, optparse-applicative, parsec + , prettyprinter, random, recursion-schemes, shakespeare, shelly + , statistics, tasty, tasty-hedgehog, tasty-hunit, template-haskell + , text, time, tomland, transformers, transformers-base + , unordered-containers, vector }: mkDerivation { pname = "verismith"; - version = "0.6.0.2"; - sha256 = "1rjcsdizzhc1lr2mfh0r6dhhabnbz1gjva7xkr3z3mqzsqp9jm5f"; + version = "1.0.0.2"; + sha256 = "0lrc0idpxg4a7mlwb7s3j43zizinszpfwwqfm91cz3fkb5clv21h"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ array base binary blaze-html bytestring cryptonite deepseq DRBG exceptions fgl fgl-visualize filepath gitrev hedgehog lens @@ -254050,7 +254993,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion lens ]; description = "Random verilog generation and simulator testing"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -255055,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 @@ -255520,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 ]; @@ -255539,6 +256483,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "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.1"; + sha256 = "1mbhk50j1a47ydg5kd6bj3nbzqfq1abm1d1vcxc3smw4fgf39g5x"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring case-insensitive http-types network text wai + ]; + testHaskellDepends = [ + base bytestring case-insensitive hspec http-types wai wai-extra + ]; + description = "Enforce HTTPS in Wai server app safely"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-eventsource" = callPackage ({ mkDerivation, wai }: mkDerivation { @@ -259467,6 +260433,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "with-utf8" = callPackage + ({ mkDerivation, base, deepseq, hedgehog, HUnit, safe-exceptions + , tasty, tasty-discover, tasty-hedgehog, tasty-hunit, temporary + , text, unix + }: + mkDerivation { + pname = "with-utf8"; + version = "1.0.0.0"; + sha256 = "06xznaszw7d6rznvzhzw3y4z31b4vx4djms85rq4qsbpfbdrh2zc"; + libraryHaskellDepends = [ base safe-exceptions text ]; + testHaskellDepends = [ + base deepseq hedgehog HUnit safe-exceptions tasty tasty-hedgehog + tasty-hunit temporary text unix + ]; + testToolDepends = [ tasty-discover ]; + description = "Get your IO right on the first try"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "withdependencies" = callPackage ({ mkDerivation, base, conduit, containers, hspec, HUnit, mtl , profunctors @@ -260396,10 +261381,8 @@ self: { }: mkDerivation { pname = "wrecker"; - version = "1.3.1.0"; - sha256 = "0z0a9k88npw09n54mplg2aa98y4p8kmk14v8ks2dc2ilf24lrri7"; - revision = "1"; - editedCabalFile = "1wzpw1cdbrb3mz7qaissdjidwdafhv9jph14066gn9dnyffg1w02"; + version = "1.3.2.0"; + sha256 = "02x20w2xb1w58rb9n9yw2kz08q77prs7bfnmgxc6nmcrrafgg6bv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -261354,11 +262337,9 @@ self: { }: mkDerivation { pname = "x86-64bit"; - version = "0.4.5"; - sha256 = "1dgl53xra7m8rfczfjvibn8gcmacpg3fagz0yysk1b7sjvlim7cp"; - libraryHaskellDepends = [ - base deepseq monads-tf QuickCheck tardis vector - ]; + version = "0.4.6"; + sha256 = "19av4xkh80al9gr67n10ivf7hwwg3gfkph2mbq63q8wdh67gyg8s"; + libraryHaskellDepends = [ base deepseq monads-tf tardis vector ]; testHaskellDepends = [ base deepseq monads-tf QuickCheck tardis vector ]; @@ -261521,16 +262502,14 @@ self: { }: mkDerivation { pname = "xdg-desktop-entry"; - version = "0.1.1.0"; - sha256 = "0ss4marv4lyh94v9x12sy5wfdsiw0jppqpgndmg1w8b3mfk0d6s2"; + version = "0.1.1.1"; + sha256 = "0xlniirgj01v02dp6wx8iw038p4mx2pa3rmwfv3g7k5raa7gzapb"; libraryHaskellDepends = [ base ConfigFile directory either filepath multimap safe transformers unix ]; description = "Parse files conforming to the xdg desktop entry spec"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "xdg-userdirs" = callPackage @@ -261589,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 { @@ -262695,8 +263702,8 @@ self: { }: mkDerivation { pname = "xmlbf"; - version = "0.6"; - sha256 = "02wcjmpgjla568ic621hglzkgqaiq9g1s93fq4iqq4lf20yszr9y"; + version = "0.6.1"; + sha256 = "0xhpg10bqmv9cd4sw0vf2vvvyyas3xd36lwarbh5l78hylmibnlf"; libraryHaskellDepends = [ base bytestring containers deepseq selective text transformers unordered-containers @@ -264027,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 @@ -265482,8 +266519,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.6.17.2"; - sha256 = "0rcfksbxnwcpg5qh9vjkddv39q95mx4nxzgix51bbwa128hhzcwf"; + version = "1.6.17.3"; + sha256 = "0w2i18rjqz9mzldq0bdiaikn5mxws2f9ab0ngmab6rzywcqsvg22"; libraryHaskellDepends = [ aeson auto-update base blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit conduit-extra @@ -265732,16 +266769,16 @@ self: { }) {}; "yesod-fb" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit, crypto-api, fb - , http-client-tls, http-conduit, text, wai, yesod-core + ({ mkDerivation, aeson, base, bytestring, conduit, fb + , http-client-tls, http-conduit, memory, text, wai, yesod-core }: mkDerivation { pname = "yesod-fb"; - version = "0.5.0"; - sha256 = "1ns113f2ylim1b3r2dgwgc65yfy6qxjh9miqfz2fx29fq4250dyy"; + version = "0.6.0"; + sha256 = "0anhnbwc9j11lm2sh8wi15p160vb9g0ng8lqc6g8am61jsxxw40x"; libraryHaskellDepends = [ - aeson base bytestring conduit crypto-api fb http-client-tls - http-conduit text wai yesod-core + aeson base bytestring conduit fb http-client-tls http-conduit + memory text wai yesod-core ]; description = "Useful glue functions between the fb library and Yesod"; license = stdenv.lib.licenses.bsd3; @@ -265801,8 +266838,8 @@ self: { }: mkDerivation { pname = "yesod-form-bootstrap4"; - version = "2.1.2"; - sha256 = "1rx18ik8y55697g9mjdfpgclkny4i9d996fm874ckdmq1qwzn84k"; + version = "3.0.0"; + sha256 = "19lnn0xw13gcvp2jzw01pq47jfhxgwm1c84px3xm582p9vqyygx7"; libraryHaskellDepends = [ base blaze-html blaze-markup shakespeare text yesod-core yesod-form ]; @@ -266446,8 +267483,8 @@ self: { }: mkDerivation { pname = "yesod-recaptcha2"; - version = "0.3.0"; - sha256 = "12bgj16vfmvk6ri55wmx444njhlmf11v4cins8c1a6isjk8alhhc"; + version = "1.0.0"; + sha256 = "1hg5g90ld4jc1ggi6rg0si35rr8r8dq79a221zjzs37hsla2cr7i"; libraryHaskellDepends = [ aeson base classy-prelude http-conduit yesod-auth yesod-core yesod-form @@ -268101,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; @@ -268590,8 +269629,8 @@ self: { }: mkDerivation { pname = "zip"; - version = "1.3.0"; - sha256 = "1wcx48fqvhj823sqgr61rv692hlld3ckp2vyahd8wk3h590sncni"; + version = "1.3.2"; + sha256 = "0nmqp34w82wzlkip9zk05dy4yjnwy8dc2k7n1kq0rrdsb9zsc360"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -268609,6 +269648,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "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 + , QuickCheck, resourcet, temporary, text, time, transformers + , transformers-base + }: + mkDerivation { + pname = "zip"; + version = "1.4.0"; + sha256 = "07g17n6fr86c6c5yhs8ml53mk0g032060vja620bp32irfm00m2r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring bzlib-conduit case-insensitive cereal conduit + conduit-extra containers digest directory dlist exceptions filepath + monad-control mtl resourcet text time transformers + transformers-base + ]; + executableHaskellDepends = [ base filepath ]; + testHaskellDepends = [ + base bytestring conduit containers directory dlist exceptions + filepath hspec QuickCheck temporary text time transformers + ]; + description = "Operations on zip archives"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "zip-archive" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , digest, directory, filepath, HUnit, mtl, pretty, process @@ -269297,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 @@ -269337,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 17fb1ab8ae8..1418cfef057 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 e28a1f5949e..00000000000 --- 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 -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/haskell-modules/patches/stack-ghc882-support.patch b/pkgs/development/haskell-modules/patches/stack-ghc882-support.patch new file mode 100644 index 00000000000..0d906638e7f --- /dev/null +++ b/pkgs/development/haskell-modules/patches/stack-ghc882-support.patch @@ -0,0 +1,104 @@ +diff --git a/src/Stack/Coverage.hs b/src/Stack/Coverage.hs +index d95fa332..f80e121a 100644 +--- a/src/Stack/Coverage.hs ++++ b/src/Stack/Coverage.hs +@@ -235,7 +235,7 @@ generateHpcReportForTargets opts tixFiles targetNames = do + case nc of + CTest testName -> + liftM (pkgPath ) $ parseRelFile (T.unpack testName ++ "/" ++ T.unpack testName ++ ".tix") +- _ -> fail $ ++ _ -> liftIO $ fail $ + "Can't specify anything except test-suites as hpc report targets (" ++ + packageNameString name ++ + " is used with a non test-suite target)" +diff --git a/src/Stack/Package.hs b/src/Stack/Package.hs +index b69337ce..08eb9b9f 100644 +--- a/src/Stack/Package.hs ++++ b/src/Stack/Package.hs +@@ -463,7 +463,7 @@ makeObjectFilePathFromC + makeObjectFilePathFromC cabalDir namedComponent distDir cFilePath = do + relCFilePath <- stripProperPrefix cabalDir cFilePath + relOFilePath <- +- parseRelFile (replaceExtension (toFilePath relCFilePath) "o") ++ parseRelFile (System.FilePath.replaceExtension (toFilePath relCFilePath) "o") + return (componentOutputDir namedComponent distDir relOFilePath) + + -- | Make the global autogen dir if Cabal version is new enough. +diff --git a/src/Stack/Script.hs b/src/Stack/Script.hs +index c63c9f62..70257be1 100644 +--- a/src/Stack/Script.hs ++++ b/src/Stack/Script.hs +@@ -172,8 +172,8 @@ scriptCmd opts = do + + toExeName fp = + if osIsWindows +- then replaceExtension fp "exe" +- else dropExtension fp ++ then System.FilePath.replaceExtension fp "exe" ++ else System.FilePath.dropExtension fp + + getPackagesFromImports + :: FilePath -- ^ script filename +diff --git a/src/Stack/Setup.hs b/src/Stack/Setup.hs +index 8bbfc45c..5c5b028c 100644 +--- a/src/Stack/Setup.hs ++++ b/src/Stack/Setup.hs +@@ -876,7 +876,7 @@ buildGhcFromSource getSetupInfo' installed (CompilerRepository url) commitId fla + (_,files) <- listDir (cwd bindistPath) + let + isBindist p = "ghc-" `isPrefixOf` (toFilePath (filename p)) +- && fileExtension (filename p) == ".xz" ++ && (maybe "" id (fileExtension (filename p))) == ".xz" + mbindist = filter isBindist files + case mbindist of + [bindist] -> do +diff --git a/src/Stack/Storage/Project.hs b/src/Stack/Storage/Project.hs +index dc5318d8..984e6259 100644 +--- a/src/Stack/Storage/Project.hs ++++ b/src/Stack/Storage/Project.hs +@@ -12,6 +12,9 @@ + {-# LANGUAGE UndecidableInstances #-} + {-# OPTIONS_GHC -Wno-unused-top-binds -Wno-identities #-} + ++{-# LANGUAGE DerivingStrategies #-} ++{-# LANGUAGE StandaloneDeriving #-} ++ + -- | Work with SQLite database used for caches across a single project. + module Stack.Storage.Project + ( initProjectStorage +diff --git a/src/Stack/Storage/User.hs b/src/Stack/Storage/User.hs +index 3845b094..09695344 100644 +--- a/src/Stack/Storage/User.hs ++++ b/src/Stack/Storage/User.hs +@@ -12,6 +12,9 @@ + {-# LANGUAGE UndecidableInstances #-} + {-# OPTIONS_GHC -Wno-unused-top-binds -Wno-identities #-} + ++{-# LANGUAGE DerivingStrategies #-} ++{-# LANGUAGE StandaloneDeriving #-} ++ + -- | Work with SQLite database used for caches across an entire user account. + module Stack.Storage.User + ( initUserStorage +diff --git a/src/Stack/Types/Config.hs b/src/Stack/Types/Config.hs +index a5cc22b5..a329d353 100644 +--- a/src/Stack/Types/Config.hs ++++ b/src/Stack/Types/Config.hs +@@ -406,7 +406,7 @@ instance FromJSON CabalConfigKey where + instance FromJSONKey CabalConfigKey where + fromJSONKey = FromJSONKeyTextParser parseCabalConfigKey + +-parseCabalConfigKey :: Monad m => Text -> m CabalConfigKey ++parseCabalConfigKey :: MonadFail m => Text -> m CabalConfigKey + parseCabalConfigKey "$targets" = pure CCKTargets + parseCabalConfigKey "$locals" = pure CCKLocals + parseCabalConfigKey "$everything" = pure CCKEverything +@@ -974,7 +974,7 @@ parseConfigMonoidObject rootDir obj = do + + return ConfigMonoid {..} + where +- handleExplicitSetupDep :: Monad m => (Text, Bool) -> m (Maybe PackageName, Bool) ++ handleExplicitSetupDep :: MonadFail m => (Text, Bool) -> m (Maybe PackageName, Bool) + handleExplicitSetupDep (name', b) = do + name <- + if name' == "*" diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index fce94ecc846..68df200835f 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -12,11 +12,11 @@ (rec { name = "guile-${version}"; - version = "2.2.6"; + version = "2.2.7"; src = fetchurl { url = "mirror://gnu/guile/${name}.tar.xz"; - sha256 = "1269ymxm56j1z1lvq1y42rm961f2n7rinm3k6l00p9k52hrpcddk"; + sha256 = "013mydzhfswqci6xmyc1ajzd59pfbdak15i0b090nhr9bzm7dxyd"; }; outputs = [ "out" "dev" "info" ]; @@ -93,7 +93,7 @@ meta = { description = "Embeddable Scheme implementation"; - homepage = https://www.gnu.org/software/guile/; + homepage = "https://www.gnu.org/software/guile/"; license = stdenv.lib.licenses.lgpl3Plus; maintainers = with stdenv.lib.maintainers; [ ludo lovek323 vrthra ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/development/interpreters/metamath/default.nix index 42335295585..42b95f341ba 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/php/default.nix b/pkgs/development/interpreters/php/default.nix index a31bbe73cae..b3a92893a6c 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -6,7 +6,8 @@ , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, unixODBC , uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2 , gd, freetype, libXpm, libjpeg, libpng, libwebp -, libzip, valgrind, oniguruma +, libzip, valgrind, oniguruma, symlinkJoin, writeText +, makeWrapper, callPackage }: with lib; @@ -255,7 +256,7 @@ let description = "An HTML-embedded scripting language"; homepage = https://www.php.net/; license = licenses.php301; - maintainers = with maintainers; [ globin etu ]; + maintainers = with maintainers; [ globin etu ma27 ]; platforms = platforms.all; outputsToInstall = [ "out" "dev" ]; }; @@ -268,24 +269,48 @@ let }; + generic' = { version, sha256, ... }@args: let php = generic args; in php.overrideAttrs (_: { + passthru.buildEnv = { exts ? (_: []), extraConfig ? "" }: let + extraInit = writeText "custom-php.ini" '' + ${extraConfig} + ${concatMapStringsSep "\n" (ext: let + extName = lib.removePrefix "php-" (builtins.parseDrvName ext.name).name; + type = "${lib.optionalString (ext.zendExtension or false) "zend_"}extension"; + in '' + ${type}=${ext}/lib/php/extensions/${extName}.so + '') (exts (callPackage ../../../top-level/php-packages.nix { inherit php; }))} + ''; + in symlinkJoin { + name = "php-custom-${version}"; + nativeBuildInputs = [ makeWrapper ]; + paths = [ php ]; + postBuild = '' + wrapProgram $out/bin/php \ + --add-flags "-c ${extraInit}" + wrapProgram $out/bin/php-fpm \ + --add-flags "-c ${extraInit}" + ''; + }; + }); + in { - php72 = generic { - version = "7.2.27"; - sha256 = "0jbhc8x2i6xx6p7zc30ahg9xplsqlz334m1w13mhr1qv2xdnkh2v"; + php72 = generic' { + version = "7.2.28"; + sha256 = "18sjvl67z5a2x5s2a36g6ls1r3m4hbrsw52hqr2qsgfvg5dkm5bw"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch; }; - php73 = generic { - version = "7.3.14"; - sha256 = "0wn2qsfrnch90l8nxbpcjd2q0ijzdiiyhvcpbycngki9r6xwppxr"; + php73 = generic' { + version = "7.3.15"; + sha256 = "0g84hws15s8gh8iq4h6q747dyfazx47vh3da3whz8d80x83ibgld"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch; }; - php74 = generic { + php74 = generic' { version = "7.4.3"; sha256 = "wVF7pJV4+y3MZMc6Ptx21PxQfEp6xjmYFYTMfTtMbRQ="; }; diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index b778b62f908..d9d00409095 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -28,6 +28,7 @@ , stripTkinter ? false , rebuildBytecode ? true , stripBytecode ? false +, includeSiteCustomize ? true }: assert x11Support -> tcl != null @@ -237,7 +238,7 @@ in with passthru; stdenv.mkDerivation { '' + optionalString stripTests '' # Strip tests rm -R $out/lib/python*/test $out/lib/python*/**/test{,s} - '' + '' + '' + optionalString includeSiteCustomize '' # Include a sitecustomize.py file cp ${../sitecustomize.py} $out/${sitePackages}/sitecustomize.py '' + optionalString rebuildBytecode '' diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 4166fbb7ccf..099632b1e85 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -44,6 +44,10 @@ with pkgs; pythonAtLeast = lib.versionAtLeast pythonVersion; pythonOlder = lib.versionOlder pythonVersion; inherit hasDistutilsCxxPatch pythonForBuild; + + tests = callPackage ./tests.nix { + python = self; + }; }; in { @@ -92,10 +96,10 @@ in { sourceVersion = { major = "3"; minor = "7"; - patch = "6"; + patch = "7"; suffix = ""; }; - sha256 = "0gskry19ylw91p38pdq36qcgk6h3x5i4ia0ik977kw2943kwr8jm"; + sha256 = "0di1y2cna823qgk6sd2lvpjdm3g2qikdd50i2bjd330dpzqsk806"; inherit (darwin) configd; inherit passthruFun; }; @@ -105,10 +109,10 @@ in { sourceVersion = { major = "3"; minor = "8"; - patch = "1"; + patch = "2"; suffix = ""; }; - sha256 = "1s4lwn5vzsajlc88m6hkghsvnjw4d00l2dsgng0m2w6vyqbl32bm"; + sha256 = "1ps5v323cp5czfshqjmbsqw7nvrdpcbk06f62jbzaqik4gfffii6"; inherit (darwin) configd; inherit passthruFun; }; @@ -119,9 +123,9 @@ in { major = "3"; minor = "9"; patch = "0"; - suffix = "a3"; + suffix = "a4"; }; - sha256 = "09l68jyfhhass3cqyqyp2cv3a3i86qs0x736isidmpbrbxsincva"; + sha256 = "0qzy0wlq0izxk8ii28gy70v138g6xnz9sgsxpyayls2j04l6b5vz"; inherit (darwin) configd; inherit passthruFun; }; @@ -143,6 +147,7 @@ in { stripTkinter = true; rebuildBytecode = false; stripBytecode = true; + includeSiteCustomize = false; }).overrideAttrs(old: { pname = "python3-minimal"; meta = old.meta // { diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index 159637ae9d5..47690320e81 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -94,6 +94,14 @@ in rec { name = "python-remove-bin-bytecode-hook"; } ./python-remove-bin-bytecode-hook.sh) {}; + pythonRemoveTestsDirHook = callPackage ({ }: + makeSetupHook { + name = "python-remove-tests-dir-hook"; + substitutions = { + inherit pythonSitePackages; + }; + } ./python-remove-tests-dir-hook.sh) {}; + setuptoolsBuildHook = callPackage ({ setuptools, wheel }: makeSetupHook { name = "setuptools-setup-hook"; diff --git a/pkgs/development/interpreters/python/hooks/python-remove-tests-dir-hook.sh b/pkgs/development/interpreters/python/hooks/python-remove-tests-dir-hook.sh new file mode 100644 index 00000000000..83bea786db6 --- /dev/null +++ b/pkgs/development/interpreters/python/hooks/python-remove-tests-dir-hook.sh @@ -0,0 +1,15 @@ +# Clean up top-level tests directory in site-package installation. +echo "Sourcing python-remove-tests-dir-hook" + +pythonRemoveTestsDir() { + echo "Executing pythonRemoveTestsDir" + + rm -rf $out/@pythonSitePackages@/tests + + echo "Finished executing pythonRemoveTestsDir" +} + +if [ -z "${dontUsePythonRemoveTestsDir-}" ]; then + postFixupHooks+=(pythonRemoveTestsDir) +fi + diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 020298cc8e9..180bc63857c 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -17,6 +17,7 @@ , pythonCatchConflictsHook , pythonImportsCheckHook , pythonRemoveBinBytecodeHook +, pythonRemoveTestsDirHook , setuptoolsBuildHook , setuptoolsCheckHook , wheelUnpackHook @@ -108,6 +109,7 @@ let python wrapPython ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, flit, ...)? + pythonRemoveTestsDirHook ] ++ lib.optionals catchConflicts [ setuptools pythonCatchConflictsHook ] ++ lib.optionals removeBinBytecode [ diff --git a/pkgs/development/interpreters/python/sitecustomize.py b/pkgs/development/interpreters/python/sitecustomize.py index e03b244dbc0..72ce951328f 100644 --- a/pkgs/development/interpreters/python/sitecustomize.py +++ b/pkgs/development/interpreters/python/sitecustomize.py @@ -21,6 +21,19 @@ paths = os.environ.pop('NIX_PYTHONPATH', None) if paths: functools.reduce(lambda k, p: site.addsitedir(p, k), paths.split(':'), site._init_pathinfo()) -executable = os.environ.pop('NIX_PYTHONEXECUTABLE', None) -if 'PYTHONEXECUTABLE' not in os.environ and executable: - sys.executable = executable +# Check whether we are in a venv. +# Note Python 2 does not support base_prefix so we assume we are not in a venv. +in_venv = sys.version_info.major == 3 and sys.prefix != sys.base_prefix + +if not in_venv: + executable = os.environ.pop('NIX_PYTHONEXECUTABLE', None) + prefix = os.environ.pop('NIX_PYTHONPREFIX', None) + + if 'PYTHONEXECUTABLE' not in os.environ and executable is not None: + sys.executable = executable + if prefix is not None: + # Because we cannot check with Python 2 whether we are in a venv, + # creating a venv from a Nix env won't work as well with Python 2. + # Also, note that sysconfig does not like it when sys.prefix is set to None + sys.prefix = sys.exec_prefix = prefix + site.PREFIXES.insert(0, prefix) diff --git a/pkgs/development/interpreters/python/tests.nix b/pkgs/development/interpreters/python/tests.nix new file mode 100644 index 00000000000..55065c45d57 --- /dev/null +++ b/pkgs/development/interpreters/python/tests.nix @@ -0,0 +1,73 @@ +{ python +, runCommand +, substituteAll +, lib +, callPackage +}: + +let + envs = let + inherit python; + pythonEnv = python.withPackages(ps: with ps; [ ]); + in { + # Plain Python interpreter + plain = rec { + env = python; + interpreter = env.interpreter; + is_venv = "False"; + is_nixenv = "False"; + }; + } // lib.optionalAttrs (python.implementation != "graal") { + # Python Nix environment (python.buildEnv) + nixenv = rec { + env = pythonEnv; + interpreter = env.interpreter; + is_venv = "False"; + is_nixenv = "True"; + }; + } // lib.optionalAttrs (python.isPy3k && (!python.isPyPy)) rec { + # Venv built using plain Python + # Python 2 does not support venv + # TODO: PyPy executable name is incorrect, it should be pypy-c or pypy-3c instead of pypy and pypy3. + plain-venv = rec { + env = runCommand "${python.name}-venv" {} '' + ${python.interpreter} -m venv $out + ''; + interpreter = "${env}/bin/${python.executable}"; + is_venv = "True"; + is_nixenv = "False"; + }; + + # Venv built using Python Nix environment (python.buildEnv) + # TODO: Cannot create venv from a nix env + # Error: Command '['/nix/store/ddc8nqx73pda86ibvhzdmvdsqmwnbjf7-python3-3.7.6-venv/bin/python3.7', '-Im', 'ensurepip', '--upgrade', '--default-pip']' returned non-zero exit status 1. + # nixenv-venv = rec { + # env = runCommand "${python.name}-venv" {} '' + # ${pythonEnv.interpreter} -m venv $out + # ''; + # interpreter = "${env}/bin/${pythonEnv.executable}"; + # is_venv = "True"; + # is_nixenv = "True"; + # }; + }; + + # All PyPy package builds are broken at the moment + integrationTests = lib.optionalAttrs (python.isPy3k && (!python.isPyPy)) rec { + # Before the addition of NIX_PYTHONPREFIX mypy was broken with typed packages + nix-pythonprefix-mypy = callPackage ./tests/test_nix_pythonprefix { + interpreter = python; + }; + }; + + testfun = name: attrs: runCommand "${python.name}-tests-${name}" ({ + inherit (python) pythonVersion; + } // attrs) '' + cp -r ${./tests} tests + chmod -R +w tests + substituteAllInPlace tests/test_python.py + ${attrs.interpreter} -m unittest discover --verbose tests #/test_python.py + mkdir $out + touch $out/success + ''; + +in lib.mapAttrs testfun envs // integrationTests diff --git a/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/default.nix b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/default.nix new file mode 100644 index 00000000000..05798cbaf1b --- /dev/null +++ b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/default.nix @@ -0,0 +1,25 @@ +{ interpreter, writeText, runCommandNoCC }: + +let + + python = let + packageOverrides = self: super: { + typeddep = super.callPackage ./typeddep {}; + }; + in interpreter.override {inherit packageOverrides; self = python;}; + + pythonEnv = python.withPackages(ps: [ + ps.typeddep + ps.mypy + ]); + + pythonScript = writeText "myscript.py" '' + from typeddep import util + s: str = util.echo("hello") + print(s) + ''; + +in runCommandNoCC "${interpreter.name}-site-prefix-mypy-test" {} '' + ${pythonEnv}/bin/mypy ${pythonScript} + touch $out +'' diff --git a/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/default.nix b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/default.nix new file mode 100644 index 00000000000..06219a69fca --- /dev/null +++ b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/default.nix @@ -0,0 +1,11 @@ +{ buildPythonPackage }: + + +buildPythonPackage { + + pname = "typeddep"; + version = "1.3.3.7"; + + src = ./.; + +} diff --git a/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/setup.py b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/setup.py new file mode 100644 index 00000000000..25bac69ea09 --- /dev/null +++ b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/setup.py @@ -0,0 +1,18 @@ +from setuptools import setup + +setup(**{ + 'name': 'typeddep', + 'version': '1.3.3.7', + 'description': 'Minimal repro to test mypy and site prefixes with Nix', + 'long_description': None, + 'author': 'adisbladis', + 'author_email': 'adisbladis@gmail.com', + 'maintainer': None, + 'maintainer_email': None, + 'url': None, + 'packages': ['typeddep'], + 'package_data': {'': ['*']}, + 'install_requires': [], + 'entry_points': {}, + 'python_requires': '>=3.7,<4.0', +}) diff --git a/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/typeddep/__init__.py b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/typeddep/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/typeddep/py.typed b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/typeddep/py.typed new file mode 100644 index 00000000000..e69de29bb2d diff --git a/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/typeddep/util.py b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/typeddep/util.py new file mode 100644 index 00000000000..c1c3ffe7477 --- /dev/null +++ b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/typeddep/util.py @@ -0,0 +1,2 @@ +def echo(s: str) -> str: + return s diff --git a/pkgs/development/interpreters/python/tests/test_python.py b/pkgs/development/interpreters/python/tests/test_python.py new file mode 100644 index 00000000000..011978c6254 --- /dev/null +++ b/pkgs/development/interpreters/python/tests/test_python.py @@ -0,0 +1,50 @@ +""" +Python interpreter and environment tests. + +These need to be executed with the standard library unittest. +Third party test runners such as pytest cannot be used because +that would interfere with the tests. +""" + +import platform +import sys +import unittest +import site + + +ENV = "@env@" +INTERPRETER = "@interpreter@" +PYTHON_VERSION = "@pythonVersion@" + +IS_VENV = @is_venv@ +IS_NIXENV = @is_nixenv@ +IS_PYPY = platform.python_implementation() == "PyPy" + + +class TestCasePython(unittest.TestCase): + + @unittest.skipIf(IS_PYPY, "Executable is incorrect and needs to be fixed.") + def test_interpreter(self): + self.assertEqual(sys.executable, INTERPRETER) + + @unittest.skipIf(IS_PYPY, "Prefix is incorrect and needs to be fixed.") + def test_prefix(self): + self.assertEqual(sys.prefix, ENV) + self.assertEqual(sys.prefix, sys.exec_prefix) + + def test_site_prefix(self): + self.assertTrue(sys.prefix in site.PREFIXES) + + @unittest.skipIf(IS_PYPY or sys.version_info.major==2, "Python 2 does not have base_prefix") + def test_base_prefix(self): + if IS_VENV or IS_NIXENV: + self.assertNotEqual(sys.prefix, sys.base_prefix) + else: + self.assertEqual(sys.prefix, sys.base_prefix) + + def test_python_version(self): + self.assertTrue(platform.python_version().startswith(PYTHON_VERSION)) + + +if __name__ == "__main__": + unittest.main() diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index b437584024f..dffad6b98f5 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -37,7 +37,7 @@ let if [ -f "$prg" ]; then rm -f "$out/bin/$prg" if [ -x "$prg" ]; then - makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set NIX_PYTHONEXECUTABLE ${pythonExecutable} --set NIX_PYTHONPATH ${pythonPath} ${if permitUserSite then "" else ''--set PYTHONNOUSERSITE "true"''} ${stdenv.lib.concatStringsSep " " makeWrapperArgs} + makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set NIX_PYTHONPREFIX "$out" --set NIX_PYTHONEXECUTABLE ${pythonExecutable} --set NIX_PYTHONPATH ${pythonPath} ${if permitUserSite then "" else ''--set PYTHONNOUSERSITE "true"''} ${stdenv.lib.concatStringsSep " " makeWrapperArgs} fi fi done diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix index 37baf241db6..d3d9cf87207 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/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index e02ea05a726..d9ace4deddd 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -24,11 +24,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "SDL2"; - version = "2.0.10"; + version = "2.0.12"; src = fetchurl { url = "https://www.libsdl.org/release/${pname}-${version}.tar.gz"; - sha256 = "0mqxp6w5jhbq6y1j690g9r3gpzwjxh4czaglw8x05l7hl49nqrdl"; + sha256 = "0qy8wbqvfkb5ps8kxgaaf2zzpkjqbsw712hlp74znbn0jpv6i4il"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index f63a341e26e..f16b38e3fd8 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "at-spi2-atk"; - version = "2.34.1"; + version = "2.34.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "05ncp7s5nddjinffs26mcvpbd63vk1m3cv5y530p3plgfhqgjvbp"; + sha256 = "1w7l4xg00qx3dwhn0zaa64daiv5f073hdvjdxh0mrw7fw37264wh"; }; nativeBuildInputs = [ meson ninja pkgconfig ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "D-Bus bridge for Assistive Technology Service Provider Interface (AT-SPI) and Accessibility Toolkit (ATK)"; - homepage = https://gitlab.gnome.org/GNOME/at-spi2-atk; + homepage = "https://gitlab.gnome.org/GNOME/at-spi2-atk"; license = licenses.lgpl21Plus; maintainers = gnome3.maintainers; platforms = platforms.unix; diff --git a/pkgs/development/libraries/audio/libgme/default.nix b/pkgs/development/libraries/audio/libgme/default.nix index b8f1a5c088a..bcd6070831b 100644 --- a/pkgs/development/libraries/audio/libgme/default.nix +++ b/pkgs/development/libraries/audio/libgme/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromBitbucket, cmake }: let - version = "0.6.2"; + version = "0.6.3"; in stdenv.mkDerivation { pname = "libgme"; inherit version; meta = with stdenv.lib; { description = "A collection of video game music chip emulators"; - homepage = https://bitbucket.org/mpyne/game-music-emu/overview; + homepage = "https://bitbucket.org/mpyne/game-music-emu/overview"; license = licenses.lgpl21; platforms = platforms.all; maintainers = with maintainers; [ lheckemann ]; @@ -17,7 +17,7 @@ in stdenv.mkDerivation { owner = "mpyne"; repo = "game-music-emu"; rev = version; - sha256 = "00vlbfk5h99dq5rbwxk20dv72dig6wdwpgf83q451avsscky0jvk"; + sha256 = "100ahb4n4pvgcry9xzlf2fr4j57n5h9x7pvyhhxys4dcy8axqqsy"; }; buildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix index 94c454859ae..a5cbb079475 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 a1b3c51d0e6..00000000000 --- 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 a8b459f4b12..00000000000 --- 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 32632f79d22..00000000000 --- 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/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index 37e85617fb7..89bbdff3bbc 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cimg"; - version = "2.8.3"; + version = "2.8.4"; src = fetchurl { url = "http://cimg.eu/files/CImg_${version}.zip"; - sha256 = "0k7cra95v46i1q3rvklrxxhz3z10yql1ysvfrapcas0m4z6f94ld"; + sha256 = "1y4j2dmk4nnc5rx65c2px7r0nfq5117pmqpvi7klp9wmgcjs29gf"; }; nativeBuildInputs = [ unzip ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A small, open source, C++ toolkit for image processing"; - homepage = http://cimg.eu/; + homepage = "http://cimg.eu/"; license = licenses.cecill-c; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix index 5542a37661a..6b238074fca 100644 --- a/pkgs/development/libraries/dav1d/default.nix +++ b/pkgs/development/libraries/dav1d/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab +{ stdenv, fetchFromGitLab, fetchpatch , meson, ninja, nasm, pkgconfig , withTools ? false # "dav1d" binary , withExamples ? false, SDL2 # "dav1dplay" binary @@ -9,16 +9,23 @@ assert useVulkan -> withExamples; stdenv.mkDerivation rec { pname = "dav1d"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = version; - sha256 = "0acxlgyz6c8ckw8vfgn60y2zg2n00l5xsq5jlxvwbh5w5pkc3ahf"; + sha256 = "1gr859xzbqrsp892v9zzzgrg8smnnzgc1jmb68qzl54a4g6jrxm0"; }; + patches = [ + (fetchpatch { + url = "https://code.videolan.org/videolan/dav1d/-/commit/e04227c5f6729b460e0b8e5fb52eae2d5acd15ef.patch"; + sha256 = "18mpvwviqx0x9k6av98vgpjqlzcjd89g8496zsbf57bw5dadij3l"; + }) + ]; + nativeBuildInputs = [ meson ninja nasm pkgconfig ]; # TODO: doxygen (currently only HTML and not build by default). buildInputs = stdenv.lib.optional withExamples SDL2 @@ -38,6 +45,8 @@ stdenv.mkDerivation rec { subsampling and bit-depth parameters. ''; inherit (src.meta) homepage; + changelog = "https://code.videolan.org/videolan/dav1d/-/tags/${version}"; + # More technical: https://code.videolan.org/videolan/dav1d/blob/${version}/NEWS license = licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix index 84b4b1bab77..5f84440df45 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/eigen/2.0.nix b/pkgs/development/libraries/eigen/2.0.nix index 015aeaed55b..d1527571943 100644 --- a/pkgs/development/libraries/eigen/2.0.nix +++ b/pkgs/development/libraries/eigen/2.0.nix @@ -1,15 +1,14 @@ -{stdenv, fetchurl, cmake}: +{ stdenv, fetchFromGitLab, cmake }: -let - v = "2.0.17"; -in -stdenv.mkDerivation { - name = "eigen-${v}"; +stdenv.mkDerivation rec { + pname = "eigen"; + version = "2.0.17"; - src = fetchurl { - url = "https://bitbucket.org/eigen/eigen/get/${v}.tar.bz2"; - name = "eigen-${v}.tar.bz2"; - sha256 = "0q4ry2pmdb9lvm0g92wi6s6qng3m9q73n5flwbkfcz1nxmbfhmbj"; + src = fetchFromGitLab { + owner = "libeigen"; + repo = "eigen"; + rev = version; + sha256 = "0d4knrcz04pxmxaqs5r3wv092950kl1z9wsw87vdzi9kgvc6wl0b"; }; nativeBuildInputs = [ cmake ]; @@ -17,7 +16,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "C++ template library for linear algebra: vectors, matrices, and related algorithms"; license = licenses.lgpl3Plus; - homepage = http://eigen.tuxfamily.org ; + homepage = "https://eigen.tuxfamily.org"; maintainers = with stdenv.lib.maintainers; [ sander raskin ]; branch = "2"; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix index 63e2707917a..3c6a5cc1ca6 100644 --- a/pkgs/development/libraries/eigen/default.nix +++ b/pkgs/development/libraries/eigen/default.nix @@ -1,16 +1,14 @@ -{stdenv, fetchurl, cmake}: +{ stdenv, fetchFromGitLab, cmake }: -let - version = "3.3.7"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "eigen"; - inherit version; + version = "3.3.7"; - src = fetchurl { - url = "https://bitbucket.org/eigen/eigen/get/${version}.tar.gz"; - name = "eigen-${version}.tar.gz"; - sha256 = "1nnh0v82a5xibcjaph51mx06mxbllk77fvihnd5ba0kpl23yz13y"; + src = fetchFromGitLab { + owner = "libeigen"; + repo = "eigen"; + rev = version; + sha256 = "1i3cvg8d70dk99fl3lrv3wqhfpdnm5kx01fl7r2bz46sk9bphwm1"; }; patches = [ @@ -22,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "C++ template library for linear algebra: vectors, matrices, and related algorithms"; license = licenses.lgpl3Plus; - homepage = http://eigen.tuxfamily.org ; + homepage = "https://eigen.tuxfamily.org"; platforms = platforms.unix; maintainers = with stdenv.lib.maintainers; [ sander raskin ]; inherit version; diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index d515d0c07eb..596de28d2df 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "20.02"; + version = "20.03"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "07f3n8qxjbrn7dhyi90l1zx5klsr3qiw14n0jdk589jgynhjgv5r"; + sha256 = "0wlbh1py9074896fxa8lcfvjj3l943zz8wjl2rn7g21xf0ar9kyv"; }; nativeBuildInputs = [cmake]; diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 205bcd7c600..3788974e124 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -36,7 +36,6 @@ , desktop-file-utils , gtk3 , fuse -, malcontent , nixosTests , libsoup , lzma @@ -140,7 +139,6 @@ stdenv.mkDerivation rec { systemd xorg.libXau fuse - malcontent gsettings-desktop-schemas glib-networking librsvg # for flatpak-validate-icon diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 1734ee9ce58..7f3e796bbf1 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "gdal"; - version = "3.0.3"; + version = "3.0.4"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; rev = "v${version}"; - sha256 = "1rbyxmgmp27a5wvm4g70jr79bazhdl8q9rcch2b78m73njdv73xa"; + sha256 = "00a7q9wv8s1bmdhqxvixkq2afr8aibg3pkc76gg50r8lavf6j84c"; }; sourceRoot = "source/gdal"; diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index 0b5e0af84ba..a227245f6db 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, vtk, darwin }: stdenv.mkDerivation rec { - version = "3.0.4"; + version = "3.0.5"; pname = "gdcm"; src = fetchurl { url = "mirror://sourceforge/gdcm/${pname}-${version}.tar.bz2"; - sha256 = "0g46l7fjvn37sg29m0nb7wlnnpnxmlm9ryp7vam26ni02l73paid"; + sha256 = "16d3sf81n4qhwbbx1d80jg6fhrla5paan384c4bbbqvbhm222yby"; }; dontUseCmakeBuildDir = true; diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index 8d94dacbb61..da76c6dfedc 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -7,14 +7,14 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "geoclue"; - version = "2.5.5"; + version = "2.5.6"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = pname; repo = pname; rev = version; - sha256 = "0a8wmf5v3x4035ixz9jypj7c6qknvs6gjv2zawa3msq1j75rf2r5"; + sha256 = "13fk6n4j74lvcsrg3kwbw1mkxgcr3iy9dnysmy0pclfsym8z5m5m"; }; patches = [ @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Geolocation framework and some data providers"; - homepage = https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home; + homepage = "https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home"; maintainers = with maintainers; [ raskin ]; platforms = with platforms; linux ++ darwin; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index ed32f68635b..873865cdf83 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -5,17 +5,20 @@ stdenv.mkDerivation rec { pname = "libgit2"; - version = "0.28.4"; + version = "0.99.0"; # keep the version in sync with python3.pkgs.pygit2 and libgit2-glib src = fetchFromGitHub { owner = "libgit2"; repo = "libgit2"; rev = "v${version}"; - sha256 = "171b25aym4q88bidc4c76y4l6jmdwifm3q9zjqsll0wjhlkycfy1"; + sha256 = "0qxzv49ip378g1n7hrbifb9c6pys2kj1hnxcafmbb94gj3pgd9kg"; }; - cmakeFlags = [ "-DTHREADSAFE=ON" ]; + cmakeFlags = [ + "-DTHREADSAFE=ON" + "-DUSE_HTTP_PARSER=system" + ]; nativeBuildInputs = [ cmake python3 pkgconfig ]; @@ -30,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "The Git linkable library"; - homepage = https://libgit2.github.com/; + homepage = "https://libgit2.github.com/"; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/development/libraries/glib/setup-hook.sh b/pkgs/development/libraries/glib/setup-hook.sh index 37c750b8db6..5d9c330b62e 100644 --- a/pkgs/development/libraries/glib/setup-hook.sh +++ b/pkgs/development/libraries/glib/setup-hook.sh @@ -24,4 +24,12 @@ glibPreFixupPhase() { addToSearchPath GSETTINGS_SCHEMAS_PATH "${!outputLib}/share/gsettings-schemas/$name" } -preFixupPhases+=" glibPreFixupPhase" + +# gappsWrapperArgsHook expects GSETTINGS_SCHEMAS_PATH variable to be set by this. +# Until we have dependency mechanism in generic builder, we need to use this ugly hack. +if [[ " ${preFixupPhases:-} " =~ " gappsWrapperArgsHook " ]]; then + preFixupPhases+=" " + preFixupPhases="${preFixupPhases/ gappsWrapperArgsHook / glibPreFixupPhase gappsWrapperArgsHook }" +else + preFixupPhases+=" glibPreFixupPhase" +fi diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index d1ff681097d..50ee5097d1b 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -89,6 +89,18 @@ stdenv.mkDerivation ({ less linux-*?/arch/x86/kernel/syscall_table_32.S */ ./allow-kernel-2.6.32.patch + + /* Provide a fallback for missing prlimit64 syscall on RHEL 6 -like + kernels. + + This patch is maintained by @veprbl. If it gives you trouble, feel + free to ping me, I'd be happy to help. + */ + (fetchurl { + url = "https://git.savannah.gnu.org/cgit/guix.git/plain/gnu/packages/patches/glibc-reinstate-prlimit64-fallback.patch?id=eab07e78b691ae7866267fc04d31c7c3ad6b0eeb"; + sha256 = "091bk3kyrx1gc380gryrxjzgcmh1ajcj8s2rjhp2d2yzd5mpd5ps"; + }) + /* Provide utf-8 locales by default, so we can use it in stdenv without depending on our large locale-archive. */ (fetchurl { url = "https://salsa.debian.org/glibc-team/glibc/raw/49767c9f7de4828220b691b29de0baf60d8a54ec/debian/patches/localedata/locale-C.diff"; diff --git a/pkgs/development/libraries/howard-hinnant-date/default.nix b/pkgs/development/libraries/howard-hinnant-date/default.nix index 185af3dff31..df6e4329388 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 744419dcd53..5eb7ef6c076 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 7ea7bccd6b8..9324279ed10 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/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix index af879e8813a..9b1184f1c0b 100644 --- a/pkgs/development/libraries/libevdev/default.nix +++ b/pkgs/development/libraries/libevdev/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { pname = "libevdev"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { url = "https://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz"; - sha256 = "04a2klvii0in9ln8r85mk2cm73jq8ry2m3yzmf2z8xyjxzjcmlr0"; + sha256 = "17pb5375njb1r05xmk0r57a2j986ihglh2n5nqcylbag4rj8mqg7"; }; nativeBuildInputs = [ python3 ]; meta = with stdenv.lib; { description = "Wrapper library for evdev devices"; - homepage = http://www.freedesktop.org/software/libevdev/doc/latest/index.html; + homepage = "http://www.freedesktop.org/software/libevdev/doc/latest/index.html"; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.amorsillo ]; diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix index 01a73f4a130..d5d2b18e5ed 100644 --- a/pkgs/development/libraries/libfido2/default.nix +++ b/pkgs/development/libraries/libfido2/default.nix @@ -1,4 +1,12 @@ -{ stdenv, fetchurl, cmake, pkgconfig, libcbor, libressl, udev, IOKit }: +{ stdenv +, fetchurl +, fetchpatch +, cmake +, pkgconfig +, libcbor +, openssl +, udev +, IOKit }: stdenv.mkDerivation rec { pname = "libfido2"; @@ -9,14 +17,33 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ libcbor libressl ] + + buildInputs = [ libcbor openssl ] ++ stdenv.lib.optionals stdenv.isLinux [ udev ] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; - patches = [ ./detect_apple_ld.patch ]; + patches = [ + # fix build on darwin + (fetchpatch { + url = "https://github.com/Yubico/libfido2/commit/916ebd18a89e4028de203d603726805339be7a5b.patch"; + sha256 = "07f0xpxnq02cccmqcric87b6pms7k7ssvdw722zr970a6qs8p6i7"; + }) + # allow attestation using any supported algorithm + (fetchpatch { + url = "https://github.com/Yubico/libfido2/commit/f7a9471fa0588cb91cbefffb13c1e4d06c2179b7.patch"; + sha256 = "02qbw9bqy3sixvwig6az7v3vimgznxnfikn9p1jczm3d7mn8asw2"; + }) + # fix EdDSA attestation signature verification bug + (fetchpatch { + url = "https://github.com/Yubico/libfido2/commit/95126eea52294419515e6540dfd7220f35664c48.patch"; + sha256 = "076mwpl9xndjhy359jdv2drrwyq7wd3pampkn28mn1rlwxfgf0d0"; + }) + ]; - cmakeFlags = [ "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d" - "-DCMAKE_INSTALL_LIBDIR=lib" ]; + cmakeFlags = [ + "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d" + "-DCMAKE_INSTALL_LIBDIR=lib" + ]; meta = with stdenv.lib; { description = '' @@ -24,7 +51,7 @@ stdenv.mkDerivation rec { ''; homepage = https://github.com/Yubico/libfido2; license = licenses.bsd2; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ dtzWill prusnak ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libgit2-glib/default.nix b/pkgs/development/libraries/libgit2-glib/default.nix index d5edefc5d54..f3e07b50917 100644 --- a/pkgs/development/libraries/libgit2-glib/default.nix +++ b/pkgs/development/libraries/libgit2-glib/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "libgit2-glib"; - version = "0.28.0.1"; + version = "0.99.0.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0a0g7aw66rfgnqr4z7fgbk5zzcjq66m4rp8v4val3a212941h0g7"; + sha256 = "1pmrcnsa7qdda73c3dxf47733mwprmj5ljpw3acxbj6r8k27anp0"; }; postPatch = '' @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A glib wrapper library around the libgit2 git access library"; - homepage = https://wiki.gnome.org/Projects/Libgit2-glib; + homepage = "https://wiki.gnome.org/Projects/Libgit2-glib"; license = licenses.lgpl21; maintainers = gnome3.maintainers; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index 69c4b3aeb74..cd802fde778 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "libical"; - version = "3.0.7"; + version = "3.0.8"; outputs = [ "out" "dev" ]; # "devdoc" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "libical"; repo = "libical"; rev = "v${version}"; - sha256 = "1ppf8jlpiclq3jprhx889y5lgf6lc2q4d8wy2zavzsxgnsqf67il"; + sha256 = "0pkh74bfrgp1slv8wsv7lbmal2m7qkixwm5llpmfwaiv14njlp68"; }; nativeBuildInputs = [ @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/libical/libical; + homepage = "https://github.com/libical/libical"; description = "An Open Source implementation of the iCalendar protocols"; license = licenses.mpl20; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 46f318a776a..446c33e61e6 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -27,11 +27,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { pname = "libinput"; - version = "1.15.2"; + version = "1.15.3"; src = fetchurl { url = "https://www.freedesktop.org/software/libinput/${pname}-${version}.tar.xz"; - sha256 = "0ivpb4sghl80cs7jg3xrs53kckif6wy81cny3a8mry94nszky74p"; + sha256 = "0kb9i1xav8hmrl6g0qdq7jii589i9sjjrbh43fsc5284smyl44jv"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/development/libraries/libinsane/default.nix b/pkgs/development/libraries/libinsane/default.nix new file mode 100644 index 00000000000..d37ae942656 --- /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 166ff2ef5a0..898c659d0f7 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/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index c40e45afaf0..396706b88e6 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libqmi"; - version = "1.24.4"; + version = "1.24.6"; src = fetchurl { url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; - sha256 = "12licfsszr6qxpg9b2b04qm2glk8d42fcy32zr8jzwrgr7gbl5h3"; + sha256 = "1jfq8jdjc9z5c0g7m377svdlniwkr4k9hs7s8fsb5rvdq5xja98k"; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index a4ae61e1264..05c81e3c73e 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "librealsense"; - version = "2.31.0"; + version = "2.32.1"; outputs = [ "out" "dev" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "IntelRealSense"; repo = pname; rev = "v${version}"; - sha256 = "0lw4dqywahi7wfd1dz5nkil55sh7wscsrwkapkvvgyi418pqvmpn"; + sha256 = "1l45hrb3lgjh1kdi4khqhljndc434zf9llzbii6dcv911gxkipjr"; }; buildInputs = [ diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix index bcc3e16dae8..17f9537e418 100644 --- a/pkgs/development/libraries/librelp/default.nix +++ b/pkgs/development/libraries/librelp/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "librelp"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "rsyslog"; repo = "librelp"; rev = "v${version}"; - sha256 = "1q0k8zm7p6wpkri419kkpz734lp1hnxfqx1aa3xys4pj7zgx9jck"; + sha256 = "1il8dany6y981ficrwnxjlc13v5lj6gqia5678p5pj6bcbq7l7lb"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index 08c276c4d55..f3816c2ef0c 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libseccomp"; - version = "2.4.2"; + version = "2.4.3"; src = fetchurl { url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz"; - sha256 = "0nsq81acrbkdr8zairxbwa33bj2a6126npp76b4srjl472sjfkxm"; + sha256 = "07crwxqzvl5k2b90a47ii9wgvi09s9hsy5b5jddw9ylp351d25fg"; }; outputs = [ "out" "lib" "dev" "man" ]; diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 7c6336b5b45..b357a05564b 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "libsoup"; - version = "2.68.3"; + version = "2.68.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1yxs0ax4rq3g0lgkbv7mz497rqj16iyyizddyc13gzxh6n7b0jsk"; + sha256 = "151j5dc84gbl6a917pxvd0b372lw5za48n63lyv6llfc48lv2l1d"; }; postPatch = '' @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "HTTP client/server library for GNOME"; - homepage = https://wiki.gnome.org/Projects/libsoup; + homepage = "https://wiki.gnome.org/Projects/libsoup"; license = stdenv.lib.licenses.gpl2; inherit (glib.meta) maintainers platforms; }; diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index 65de6db3b47..bf6e0a491f2 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, pkgconfig, cmake, zlib, openssl, libsodium }: stdenv.mkDerivation rec { - name = "libssh-0.8.7"; + pname = "libssh"; + version = "0.8.8"; src = fetchurl { - url = "https://www.libssh.org/files/0.8/${name}.tar.xz"; - sha256 = "14nmwfnnrhkwcfk5hn7azl905ivbh4wllmsbw5abd80b5yi4qc23"; + url = "https://www.libssh.org/files/0.8/${pname}-${version}.tar.xz"; + sha256 = "1qk5bm9r6199jbfk54f8w24vkl52051g8s3kmq4z2kdc6vbpy4jb"; }; postPatch = '' @@ -22,6 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SSH client library"; + homepage = "https://libssh.org"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ sander ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libuninameslist/default.nix b/pkgs/development/libraries/libuninameslist/default.nix index 5d4cc61fe7a..2e29aafdbdd 100644 --- a/pkgs/development/libraries/libuninameslist/default.nix +++ b/pkgs/development/libraries/libuninameslist/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libuninameslist"; - version = "20190701"; + version = "20200313"; src = fetchFromGitHub { owner = "fontforge"; repo = pname; rev = version; - sha256 = "sha256:034c8clnskvqbwyiq7si4dad1kbngi3jmnrj064i39msqixmpdzb"; + sha256 = "1rs4mrmfcw7864kssnk559ac1sdlpl8yrd10xspxrnfz08ynqxw8"; }; nativeBuildInputs = [ @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/fontforge/libuninameslist/; + homepage = "https://github.com/fontforge/libuninameslist/"; description = "A Library of Unicode names and annotation data"; license = licenses.bsd3; maintainers = with maintainers; [ erictapen ]; diff --git a/pkgs/development/libraries/libusb/default.nix b/pkgs/development/libraries/libusb/default.nix index adf354c45f2..681b2eef456 100644 --- a/pkgs/development/libraries/libusb/default.nix +++ b/pkgs/development/libraries/libusb/default.nix @@ -1,17 +1,20 @@ -{stdenv, fetchurl, pkgconfig, libusb1}: +{stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libusb1}: -stdenv.mkDerivation { - name = "libusb-compat-0.1.5"; +stdenv.mkDerivation rec { + name = "libusb-compat-${version}"; + version = "0.1.7"; outputs = [ "out" "dev" ]; # get rid of propagating systemd closure outputBin = "dev"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; propagatedBuildInputs = [ libusb1 ]; - src = fetchurl { - url = mirror://sourceforge/libusb/libusb-compat-0.1.5.tar.bz2; - sha256 = "0nn5icrfm9lkhzw1xjvaks9bq3w6mjg86ggv3fn7kgi4nfvg8kj0"; + src = fetchFromGitHub { + owner = "libusb"; + repo = "libusb-compat-0.1"; + rev = "v${version}"; + sha256 = "1nybccgjs14b3phhaycq2jx1gym4nf6sghvnv9qdfmlqxacx0jz5"; }; patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./fix-headers.patch; diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 9d90304042c..65023814171 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -1,5 +1,6 @@ { stdenv -, fetchurl +, fetchFromGitHub +, autoreconfHook , pkgconfig , enableSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isMusl , systemd ? null @@ -10,22 +11,26 @@ assert enableSystemd -> systemd != null; -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { pname = "libusb"; version = "1.0.23"; - src = fetchurl { - url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "13dd2a9x290d1q8nb1lqiaf36grcvns5ripk5k2xm0lajmpc04fv"; + src = fetchFromGitHub { + owner = "libusb"; + repo = "libusb"; + rev = "v${version}"; + sha256 = "0mxbpg01kgbk5nh6524b0m4xk7ywkyzmc3yhi5asqcsd3rbhjj98"; }; outputs = [ "out" "dev" ]; # get rid of propagating systemd closure - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; propagatedBuildInputs = stdenv.lib.optional enableSystemd systemd ++ stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ]; + dontDisableStatic = withStatic; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; preFixup = stdenv.lib.optionalString stdenv.isLinux '' @@ -43,8 +48,4 @@ stdenv.mkDerivation (rec { license = licenses.lgpl21Plus; maintainers = [ ]; }; -} // stdenv.lib.optionalAttrs withStatic { - # Carefully added here to avoid a mass rebuild. - # Inline this the next time this package changes. - dontDisableStatic = withStatic; -}) +} diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 0b9e394559c..0250b09ce1e 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.34.2"; + version = "1.35.0"; pname = "libuv"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "14ax49daz7j86lybi242jiry49jrnnvlyc39k6va700n03py4h9n"; + sha256 = "0pd94h10ay38r8fwj0qqgw908rrj83n768n8mbbpnd5w2c7wy9fz"; }; postPatch = let diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 7aba75a1d23..0d00c9cb253 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation rec { name = "libva-${lib.optionalString minimal "minimal-"}${version}"; - version = "2.5.0"; + version = "2.6.1"; # update libva-utils and vaapiIntel as well src = fetchFromGitHub { owner = "01org"; repo = "libva"; rev = version; - sha256 = "0pys6blkh8ayxmxgfh7qrjzzcrzzn14z5d8q4a34ffqk90b6r93z"; + sha256 = "1x34kf38p5rf52bf54ljr9f7knnbilm7kbszqnfk3lzsqrfc7r2g"; }; outputs = [ "dev" "out" ]; diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index e6a57f1e38c..977081e0ecf 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -1,28 +1,27 @@ -{ stdenv, fetchurl, pkgconfig, xorg, mesa }: +{ stdenv, fetchurl, pkgconfig, xorg, mesa, meson, ninja }: stdenv.mkDerivation rec { pname = "libvdpau"; - version = "1.2"; + version = "1.3"; src = fetchurl { - url = "https://gitlab.freedesktop.org/vdpau/libvdpau/uploads/14b620084c027d546fa0b3f083b800c6/${pname}-${version}.tar.bz2"; - sha256 = "6a499b186f524e1c16b4f5b57a6a2de70dfceb25c4ee546515f26073cd33fa06"; + url = "https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/${version}/${pname}-${version}.tar.bz2"; + sha256 = "b5a52eeac9417edbc396f26c40591ba5df0cd18285f68d84614ef8f06196e50e"; }; + patches = [ ./installdir.patch ]; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ meson ninja pkgconfig ]; buildInputs = with xorg; [ xorgproto libXext ]; propagatedBuildInputs = [ xorg.libX11 ]; - configureFlags = stdenv.lib.optional stdenv.isLinux - "--with-module-dir=${mesa.drivers.driverLink}/lib/vdpau"; + mesonFlags = stdenv.lib.optional stdenv.isLinux + [ "-Dmoduledir=${mesa.drivers.driverLink}/lib/vdpau" ]; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lX11"; - installFlags = [ "moduledir=$(out)/lib/vdpau" ]; - meta = with stdenv.lib; { homepage = https://people.freedesktop.org/~aplattner/vdpau/; description = "Library to use the Video Decode and Presentation API for Unix (VDPAU)"; diff --git a/pkgs/development/libraries/libvdpau/installdir.patch b/pkgs/development/libraries/libvdpau/installdir.patch new file mode 100644 index 00000000000..859715f70d3 --- /dev/null +++ b/pkgs/development/libraries/libvdpau/installdir.patch @@ -0,0 +1,9 @@ +--- a/trace/meson.build 2020-02-15 16:34:58.698832000 +0100 ++++ b/trace/meson.build 2020-02-15 16:39:05.359952802 +0100 +@@ -4,5 +4,5 @@ + dependencies : libdl, + version : '1.0.0', + install : true, +- install_dir : moduledir, ++ install_dir : get_option('prefix') + '/lib/libvdpau', + ) diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index c07a5699f92..9883503414b 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -32,6 +32,11 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/GNOME/libxml2/commit/0e1a49c8907645d2e155f0d89d4d9895ac5112b5.patch"; sha256 = "0klvaxkzakkpyq0m44l9xrpn5kwaii194sqsivfm6zhnb9hhl15l"; }) + (fetchpatch { + name = "CVE-2019-20388.patch"; + url = "https://gitlab.gnome.org/GNOME/libxml2/commit/6088a74bcf7d0c42e24cff4594d804e1d3c9fbca.patch"; + sha256 = "070s7al2r2k92320h9cdfc2097jy4kk04d0disc98ddc165r80jl"; + }) ]; outputs = [ "bin" "dev" "out" "man" "doc" ] diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix index 5ff5209020c..f559a4e5050 100644 --- a/pkgs/development/libraries/libxmlb/default.nix +++ b/pkgs/development/libraries/libxmlb/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "libxmlb"; - version = "0.1.14"; + version = "0.1.15"; outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libxmlb"; rev = version; - sha256 = "05snbv1dvqa96k7xlwi2sj161315kps3baansr9xdpwim5ckmwc6"; + sha256 = "1mb73pnfwqc4mm0lm16yfn0lj495h8hcciprb2v6wgy3ifnnjxib"; }; patches = [ @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library to help create and query binary XML blobs"; - homepage = https://github.com/hughsie/libxmlb; + homepage = "https://github.com/hughsie/libxmlb"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libzdb/default.nix b/pkgs/development/libraries/libzdb/default.nix index b16d897fb5f..4e7168a0211 100644 --- a/pkgs/development/libraries/libzdb/default.nix +++ b/pkgs/development/libraries/libzdb/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation rec { - version = "3.1"; + version = "3.2.1"; pname = "libzdb"; src = fetchurl { url = "https://www.tildeslash.com/libzdb/dist/libzdb-${version}.tar.gz"; - sha256 = "1596njvy518x7vsvsykmnk1ky82x8jxd6nmmp551y6hxn2qsn08g"; + sha256 = "1w9zzpgw3qzirsy5g4aaq1469kdq46gr2nhvrs3xqlwz1adbb9xr"; }; buildInputs = [ sqlite ]; meta = { - homepage = http://www.tildeslash.com/libzdb/; + homepage = "http://www.tildeslash.com/libzdb/"; description = "A small, easy to use Open Source Database Connection Pool Library"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index 1a23e91848e..79933d402f7 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libzip"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { url = "https://www.nih.at/libzip/${pname}-${version}.tar.gz"; - sha256 = "1zsspz6cbbqah11jkcc894jgxihlm8gicfh54yvny9gc3lsvpi3h"; + sha256 = "120xgf7cgjmz9d3yp10lks6lhkgxqb4skbmbiiwf46gx868qxsq6"; }; # Fix pkgconfig file paths @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.nih.at/libzip; + homepage = "https://www.nih.at/libzip"; description = "A C library for reading, creating and modifying zip archives"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix index 7fba3f3baa6..5f5ffef2026 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/malcontent/default.nix b/pkgs/development/libraries/malcontent/default.nix index 3a40be3c4ed..bd8988390c9 100644 --- a/pkgs/development/libraries/malcontent/default.nix +++ b/pkgs/development/libraries/malcontent/default.nix @@ -7,7 +7,12 @@ , wrapGAppsHook , glib , coreutils +, accountsservice , dbus +, flatpak +, gtk3 +, pam +, desktop-file-utils , polkit , glib-testing , python3 @@ -16,7 +21,7 @@ stdenv.mkDerivation rec { pname = "malcontent"; - version = "0.4.0"; + version = "0.6.0"; outputs = [ "bin" "out" "dev" "man" "installedTests" ]; @@ -25,7 +30,7 @@ stdenv.mkDerivation rec { owner = "pwithnall"; repo = pname; rev = version; - sha256 = "0d703r20djvrgy711jvn90i8dwbb0p7qj4j43z101afpkiizq810"; + sha256 = "COh6N3CmLIcxx6tW4jcP0m6TZv0Z1YJUM/nlG0RzYHQ="; }; patches = [ @@ -42,11 +47,16 @@ stdenv.mkDerivation rec { ninja pkgconfig gobject-introspection + desktop-file-utils wrapGAppsHook ]; buildInputs = [ + accountsservice dbus + flatpak + gtk3 + pam polkit glib-testing (python3.withPackages (pp: with pp; [ diff --git a/pkgs/development/libraries/malcontent/installed-tests-path.patch b/pkgs/development/libraries/malcontent/installed-tests-path.patch index f2e75c2a854..ac87ddf6ccb 100644 --- a/pkgs/development/libraries/malcontent/installed-tests-path.patch +++ b/pkgs/development/libraries/malcontent/installed-tests-path.patch @@ -1,8 +1,8 @@ diff --git a/libmalcontent/tests/meson.build b/libmalcontent/tests/meson.build -index a8a815a..0b1d242 100644 +index 610bc35..13e0713 100644 --- a/libmalcontent/tests/meson.build +++ b/libmalcontent/tests/meson.build -@@ -61,9 +61,9 @@ test_programs = [ +@@ -72,9 +72,9 @@ test_programs = [ ], deps], ] @@ -14,7 +14,7 @@ index a8a815a..0b1d242 100644 'libmalcontent-' + libmalcontent_api_version) foreach program: test_programs -@@ -94,4 +94,4 @@ foreach program: test_programs +@@ -105,4 +105,4 @@ foreach program: test_programs env: envs, args: ['--tap'], ) @@ -22,14 +22,32 @@ index a8a815a..0b1d242 100644 \ No newline at end of file +endforeach diff --git a/meson_options.txt b/meson_options.txt -index 96a517d..7cb1ee8 100644 +index 06329d4..72aa505 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -3,4 +3,5 @@ option( - type: 'boolean', - value: false, - description: 'enable installed tests' --) -\ No newline at end of file +@@ -9,3 +9,9 @@ option( + type: 'string', + description: 'directory for PAM modules' + ) ++option( ++ 'installed_test_prefix', ++ type: 'string', ++ value: '', ++ description: 'Prefix for installed tests' +) -+option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests') +diff --git a/pam/tests/meson.build b/pam/tests/meson.build +index 0560dcb..a74dab2 100644 +--- a/pam/tests/meson.build ++++ b/pam/tests/meson.build +@@ -12,9 +12,9 @@ test_programs = [ + ['pam_malcontent', [], deps], + ] + +-installed_tests_metadir = join_paths(datadir, 'installed-tests', ++installed_tests_metadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', + 'libmalcontent-' + libmalcontent_api_version) +-installed_tests_execdir = join_paths(libexecdir, 'installed-tests', ++installed_tests_execdir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', + 'libmalcontent-' + libmalcontent_api_version) + + foreach program: test_programs diff --git a/pkgs/development/libraries/malcontent/use-system-dependencies.patch b/pkgs/development/libraries/malcontent/use-system-dependencies.patch index 315bfe5ec10..8920b1f4a99 100644 --- a/pkgs/development/libraries/malcontent/use-system-dependencies.patch +++ b/pkgs/development/libraries/malcontent/use-system-dependencies.patch @@ -1,8 +1,8 @@ diff --git a/meson.build b/meson.build -index f4a05ba..dd31537 100644 +index 3575224..0abea63 100644 --- a/meson.build +++ b/meson.build -@@ -33,9 +33,8 @@ polkit_gobject = dependency('polkit-gobject-1') +@@ -40,9 +40,8 @@ polkit_gobject = dependency('polkit-gobject-1') polkitpolicydir = polkit_gobject.get_pkgconfig_variable('policydir', define_variable: ['prefix', prefix]) @@ -13,10 +13,3 @@ index f4a05ba..dd31537 100644 fallback: ['libglib-testing', 'libglib_testing_dep'], ) -@@ -120,4 +119,4 @@ test_env = [ - - subdir('accounts-service') - subdir('malcontent-client') --subdir('libmalcontent') -\ No newline at end of file -+subdir('libmalcontent') diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 4e95e477173..8d24aeb4e0c 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -27,7 +27,7 @@ with stdenv.lib; let - version = "19.3.3"; + version = "20.0.1"; branch = versions.major version; in @@ -42,7 +42,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" ]; - sha256 = "02czqdqf64i3az5p1allnxycyjad3x35cj0hz0017mi5pc84ikl1"; + sha256 = "1r6xxrhh86ldwbzrsy4gpv8v49l181mvfkcfq2zlnlmhihzvllv1"; }; prePatch = "patchShebangs ."; @@ -191,8 +191,18 @@ stdenv.mkDerivation { }; meta = with stdenv.lib; { - description = "An open source implementation of OpenGL"; - homepage = https://www.mesa3d.org/; + description = "An open source 3D graphics library"; + longDescription = '' + The Mesa project began as an open-source implementation of the OpenGL + specification - a system for rendering interactive 3D graphics. Over the + years the project has grown to implement more graphics APIs, including + OpenGL ES (versions 1, 2, 3), OpenCL, OpenMAX, VDPAU, VA API, XvMC, and + Vulkan. A variety of device drivers allows the Mesa libraries to be used + in many different environments ranging from software emulation to + complete hardware acceleration for modern GPUs. + ''; + homepage = "https://www.mesa3d.org/"; + changelog = "https://www.mesa3d.org/relnotes/${version}.html"; license = licenses.mit; # X11 variant, in most files platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ vcunat ]; diff --git a/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch b/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch index 8ce3473dd32..acf3d827c56 100644 --- a/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch +++ b/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch @@ -1,4 +1,4 @@ -From 6d22383149e4cdc646c68e29238f41d895a4705b Mon Sep 17 00:00:00 2001 +From 46b10f2bc28fd79d561c8c49bbae3aee6a4cf0e6 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Mon, 6 Aug 2018 15:52:11 -0300 Subject: [PATCH] disk_cache: include dri driver path in cache key @@ -12,10 +12,10 @@ timestamps in /nix/store are zero. 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/meson_options.txt b/meson_options.txt -index 626baf3..579c15b 100644 +index 1a2dd8ebd12..2ac741af5a6 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -341,6 +341,12 @@ option( +@@ -348,6 +348,12 @@ option( value : true, description : 'Enable direct rendering in GLX and EGL for DRI', ) @@ -29,10 +29,10 @@ index 626baf3..579c15b 100644 'I-love-half-baked-turnips', type : 'boolean', diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c -index 0cd92ca..fc1c173 100644 +index d1f14736725..2ed328f292e 100644 --- a/src/util/disk_cache.c +++ b/src/util/disk_cache.c -@@ -395,8 +395,10 @@ disk_cache_create(const char *gpu_name, const char *driver_id, +@@ -402,8 +402,10 @@ disk_cache_create(const char *gpu_name, const char *driver_id, /* Create driver id keys */ size_t id_size = strlen(driver_id) + 1; @@ -43,7 +43,7 @@ index 0cd92ca..fc1c173 100644 cache->driver_keys_blob_size += gpu_name_size; /* We sometimes store entire structs that contains a pointers in the cache, -@@ -417,6 +419,7 @@ disk_cache_create(const char *gpu_name, const char *driver_id, +@@ -424,6 +426,7 @@ disk_cache_create(const char *gpu_name, const char *driver_id, uint8_t *drv_key_blob = cache->driver_keys_blob; DRV_KEY_CPY(drv_key_blob, &cache_version, cv_size) DRV_KEY_CPY(drv_key_blob, driver_id, id_size) @@ -52,13 +52,13 @@ index 0cd92ca..fc1c173 100644 DRV_KEY_CPY(drv_key_blob, &ptr_size, ptr_size_size) DRV_KEY_CPY(drv_key_blob, &driver_flags, driver_flags_size) diff --git a/src/util/meson.build b/src/util/meson.build -index f69ebe9..e2bd8e2 100644 +index 9da29cc7390..5f549bb1d99 100644 --- a/src/util/meson.build +++ b/src/util/meson.build -@@ -158,7 +158,12 @@ _libmesa_util = static_library( - [files_mesa_util, format_srgb], +@@ -170,7 +170,12 @@ _libmesa_util = static_library( include_directories : inc_common, dependencies : deps_for_libmesa_util, + link_with: libmesa_format, - c_args : [c_msvc_compat_args, c_vis_args], + c_args : [ + c_msvc_compat_args, c_vis_args, @@ -70,5 +70,4 @@ index f69ebe9..e2bd8e2 100644 ) -- -2.24.1 - +2.25.1 diff --git a/pkgs/development/libraries/mesa/missing-includes.patch b/pkgs/development/libraries/mesa/missing-includes.patch index 18e7d5437b1..9685a1619a5 100644 --- a/pkgs/development/libraries/mesa/missing-includes.patch +++ b/pkgs/development/libraries/mesa/missing-includes.patch @@ -9,17 +9,6 @@ #include "pipe/p_compiler.h" #include "pipe/p_state.h" ---- ./src/gallium/state_trackers/nine/threadpool.h.orig 2015-05-07 14:10:53.443337212 +0200 -+++ ./src/gallium/state_trackers/nine/threadpool.h 2015-05-07 14:11:04.210307653 +0200 -@@ -24,6 +24,8 @@ - #ifndef _THREADPOOL_H_ - #define _THREADPOOL_H_ - -+#include -+ - #define MAXTHREADS 1 - - struct threadpool { --- ./src/util/rand_xor.c.orig 2017-06-20 00:38:57.199474067 +0200 +++ ./src/util/rand_xor.c 2017-06-20 00:40:31.351279557 +0200 @@ -23,7 +23,9 @@ diff --git a/pkgs/development/libraries/msgpack/default.nix b/pkgs/development/libraries/msgpack/default.nix index bf51f895402..f94bd35c301 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/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 540ea71abfb..8b91246b6fd 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -14,17 +14,17 @@ stdenv.mkDerivation rec { # Note the revision needs to be adjusted. - version = "6.1-20190112"; + version = "6.2"; name = "ncurses-${version}" + lib.optionalString (abiVersion == "5") "-abi5-compat"; # We cannot use fetchFromGitHub (which calls fetchzip) # because we need to be able to use fetchurlBoot. src = let # Note the version needs to be adjusted. - rev = "acb4184f8f69fddd052a3daa8c8675f4bf8ce369"; + rev = "v${version}"; in fetchurl { url = "https://github.com/mirror/ncurses/archive/${rev}.tar.gz"; - sha256 = "1z8v63cj2y7dxf4m1api8cvk0ns9frif9c60m2sxhibs06pjy4q0"; + sha256 = "15r2456g0mlq2q7gh2z52vl6zv6y0z8sdchrs80kg4idqd8sm8fd"; }; patches = lib.optional (!stdenv.cc.isClang) ./clang.patch; diff --git a/pkgs/development/libraries/ndi/default.nix b/pkgs/development/libraries/ndi/default.nix index fcf9457c691..7a4407a17f0 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/nss/default.nix b/pkgs/development/libraries/nss/default.nix index fc2763486d1..3b3f522fdb9 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -5,7 +5,7 @@ let url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz; sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; }; - version = "3.49.2"; + version = "3.51"; underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; - sha256 = "1ck0c4ikr0d747pn63h62b2iqzfgi0yzd25aw95hs9797hn519zs"; + sha256 = "1725d0idf5zzqafdqfdn9vprc7ys2ywhv23sqn328di968xqnd3m"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix index 8fb586bcd73..ace08ef018a 100644 --- a/pkgs/development/libraries/onnxruntime/default.nix +++ b/pkgs/development/libraries/onnxruntime/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "onnxruntime"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "microsoft"; repo = "onnxruntime"; rev = "v${version}"; - sha256 = "0d79adxw09cd6xfyb2sxp38j03h3g7gn4ki85zhp9nicrrm179qz"; + sha256 = "0chbn2wkl1w3msw0zscajinzlaaahg4w3lrpb2l8xgqdwbln0ckj"; # TODO: use nix-versions of grpc, onnx, eigen, googletest, etc. # submodules increase src size and compile times significantly # not currently feasible due to how integrated cmake build is with git diff --git a/pkgs/development/libraries/openjpeg/2.x.nix b/pkgs/development/libraries/openjpeg/2.x.nix index 24f3752ef43..fe0e5aeb691 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/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 5996dda1e74..30085e950a4 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -14,7 +14,7 @@ assert !cudaSupport || cudatoolkit != null; let - version = "4.0.2"; + version = "4.0.3"; cudatoolkit_joined = symlinkJoin { name = "${cudatoolkit.name}-unsplit"; @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { src = with stdenv.lib.versions; fetchurl { url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2"; - sha256 = "0ms0zvyxyy3pnx9qwib6zaljyp2b3ixny64xvq3czv3jpr8zf2wh"; + sha256 = "00zxcw99gr5n693cmcmn4f6a47vx1ywna895p0x7p163v37gw0hl"; }; postPatch = '' @@ -88,7 +88,7 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://www.open-mpi.org/; + homepage = "https://www.open-mpi.org/"; description = "Open source MPI-3 implementation"; longDescription = "The Open MPI Project is an open source MPI-3 implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers."; maintainers = with maintainers; [ markuskowa ]; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index d9028ddfbb5..3c952d60165 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/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index 6cf03bc990c..1c30277df12 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.3"; + version = "1.0.6"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "0hqf0z38gk4id8d6vcms66mh3gllh2xib5mr11069sh9ak6b3mmp"; + sha256 = "0zvp3x9hhpww2ym1inc0z8cwmfqhgqgl2g7csmj6ipp2fqwl6dlj"; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index c0bba5e5c01..19126012003 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -74,6 +74,11 @@ let url = "https://code.qt.io/cgit/qt/qtbase.git/patch/?id=8a3fde00bf53d99e9e4853e8ab97b0e1bcf74915"; sha256 = "1gpcbdpyazdxnmldvhsf3pfwr2gjvi08x3j6rxf543rq01bp6cpx"; }) + (fetchpatch { + name = "QTBUG-78937.patch"; + url = "https://code.qt.io/cgit/qt/qtbase.git/patch/?id=67a9c600ad14ee44501a6df3509daa8234b97606"; + sha256 = "1jiky1w9j8rka78r4q0yabb8w2l5j6csdjysynz7gs1ry4xjfdxd"; + }) ]; qtdeclarative = [ ./qtdeclarative.patch ]; qtscript = [ ./qtscript.patch ]; diff --git a/pkgs/development/libraries/raft-canonical/default.nix b/pkgs/development/libraries/raft-canonical/default.nix index 515fbc602d9..201c332dfdd 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/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix index 8cd74939959..765d634a91f 100644 --- a/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/default.nix @@ -1,4 +1,4 @@ -{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9_0, cudatoolkit_9_1, cudatoolkit_9_2, cudatoolkit_10_0, cudatoolkit_10_1 }: +{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9_0, cudatoolkit_9_1, cudatoolkit_9_2, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2 }: let generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) { @@ -72,5 +72,12 @@ in rec { sha256 = "0qc9f1xpyfibwqrpqxxq2v9h6w90j0dbx564akwy44c1dls5f99m"; }; + cudnn_cudatoolkit_10_2 = generic rec { + version = "7.6.5"; + cudatoolkit = cudatoolkit_10_2; + srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.6.5.32.tgz"; + sha256 = "084c13vzjdkb5s1996yilybg6dgav1lscjr1xdcgvlmfrbr6f0k0"; + }; + cudnn_cudatoolkit_10 = cudnn_cudatoolkit_10_1; } diff --git a/pkgs/development/libraries/science/math/osi/default.nix b/pkgs/development/libraries/science/math/osi/default.nix index 6dc7e746fd3..b6f367ff4fe 100644 --- a/pkgs/development/libraries/science/math/osi/default.nix +++ b/pkgs/development/libraries/science/math/osi/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "osi"; - version = "0.108.4"; + version = "0.108.6"; src = fetchurl { url = "https://www.coin-or.org/download/source/Osi/Osi-${version}.tgz"; - sha256 = "13bwhdh01g37vp3kjwl9nvij5s5ikh5f7zgrqgwrqfyk35q2x9s5"; + sha256 = "1n2jlpq4aikbp0ncs16f7q1pj7yk6kny1bh4fmjaqnwrjw63zvsp"; }; buildInputs = diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix index c2eda9dac48..492ad63f27b 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/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index a6c803be260..f72574cff58 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { # Build individual shared libraries make library \ + JOBS=$NIX_BUILD_CORES \ BLAS=-lopenblas \ LAPACK="" \ ${stdenv.lib.optionalString openblas.blas64 "CFLAGS=-DBLAS64"} @@ -64,7 +65,7 @@ stdenv.mkDerivation rec { # Bundling is done by building the static libraries, extracting objects from # them and combining the objects into one shared library. mkdir -p static - make static AR_TARGET=$(pwd)/static/'$(LIBRARY).a' + make static JOBS=$NIX_BUILD_CORES AR_TARGET=$(pwd)/static/'$(LIBRARY).a' ( cd static for i in lib*.a; do diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix index 2b287c7cc61..38eb1b158c8 100644 --- a/pkgs/development/libraries/sqlite/analyzer.nix +++ b/pkgs/development/libraries/sqlite/analyzer.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation rec { pname = "sqlite-analyzer"; - version = "3.31.0"; + version = "3.31.1"; src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2020/sqlite-src-${archiveVersion version}.zip"; - sha256 = "1dz3s3q9gsxxfj9wp4lqndzpwd1hcvm42yqn02p0l0bs6bw0mp5l"; + sha256 = "0n7f3w59gr80s6k4l5a9bp2s97dlfapfbhb3qdhak6axhn127p7j"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index fe0eb54cf11..a59325ba6ca 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -10,12 +10,12 @@ in stdenv.mkDerivation rec { pname = "sqlite"; - version = "3.31.0"; + version = "3.31.1"; # NB! Make sure to update analyzer.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2020/sqlite-autoconf-${archiveVersion version}.tar.gz"; - sha256 = "1w7i954349sjd5a6rvy118prra43k07y9hy8rpajs6vmjmnnx7bw"; + sha256 = "1bj936svd8i5g25xd1bj52hj4zca01fgl3sqkj86z9q5pkz4wa32"; }; outputs = [ "bin" "dev" "out" ]; @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { meta = { description = "A self-contained, serverless, zero-configuration, transactional SQL database engine"; downloadPage = https://sqlite.org/download.html; - homepage = https://www.sqlite.org/; + homepage = "https://www.sqlite.org/"; license = licenses.publicDomain; maintainers = with maintainers; [ eelco np ]; platforms = platforms.unix ++ platforms.windows; diff --git a/pkgs/development/libraries/tinycdb/default.nix b/pkgs/development/libraries/tinycdb/default.nix new file mode 100644 index 00000000000..19b8640f866 --- /dev/null +++ b/pkgs/development/libraries/tinycdb/default.nix @@ -0,0 +1,36 @@ +{ stdenv, lib, fetchurl }: + +stdenv.mkDerivation rec { + pname = "tinycdb"; + version = "0.78"; + outputs = [ "out" "dev" "lib" "man" ]; + separateDebugInfo = true; + makeFlags = [ "prefix=$(out)" "staticlib" "sharedlib" "cdb-shared" ]; + postInstall = '' + mkdir -p $lib/lib $dev/lib $out/bin + cp libcdb.so* $lib/lib + cp cdb-shared $out/bin/cdb + mv $out/lib/libcdb.a $dev/lib + rmdir $out/lib + ''; + + src = fetchurl { + url = "http://www.corpit.ru/mjt/tinycdb/${pname}-${version}.tar.gz"; + sha256 = "0g6n1rr3lvyqc85g6z44lw9ih58f2k1i3v18yxlqvnla5m1qyrsh"; + }; + + meta = with lib; { + + description = "utility to manipulate constant databases (cdb)"; + + longDescription = '' + tinycdb is a small, fast and reliable utility and subroutine + library for creating and reading constant databases. The database + structure is tuned for fast reading. + ''; + + homepage = https://www.corpit.ru/mjt/tinycdb.html; + license = licenses.publicDomain; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index 4acb2b38b81..f79f79a6259 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/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index 8c2823d74b0..41495b1c2e5 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "wayland-protocols"; - version = "1.18"; + version = "1.20"; src = fetchurl { url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; - sha256 = "1cvl93h83ymbfhb567jv5gzyq08181w7c46rsw4xqqqpcvkvfwrx"; + sha256 = "1rsdgvkkvxs3cjhpl6agvbkm53vm7k8rg127j9y2vn33m2hvg0lp"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix index 8363f774c24..0b57d099319 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/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 4a9a66e2267..104e0c3440a 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -1,36 +1,31 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, fetchpatch -, wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman +{ stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland +, libGL, wayland-protocols, libinput, libxkbcommon, pixman , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa , libpng, ffmpeg_4 }: stdenv.mkDerivation rec { pname = "wlroots"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "swaywm"; repo = "wlroots"; rev = version; - sha256 = "0c0q1p9yss5kx4430ik3n89drqpmm2bvgl8fjlf6prac1a7xzqn8"; + sha256 = "0j2lh9vc92zhn44rjbia5aw3y1rpgfng1x1h17lcvj5m4i6vj0pc"; }; # $out for the library and $examples for the example programs (in examples): outputs = [ "out" "examples" ]; - nativeBuildInputs = [ meson ninja pkgconfig wayland ]; + nativeBuildInputs = [ meson ninja pkg-config wayland ]; buildInputs = [ - wayland libGL wayland-protocols libinput libxkbcommon pixman + libGL wayland-protocols libinput libxkbcommon pixman xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa libpng ffmpeg_4 ]; - mesonFlags = [ - "-Dlibcap=enabled" "-Dlogind=enabled" "-Dxwayland=enabled" "-Dx11-backend=enabled" - "-Dxcb-icccm=enabled" "-Dxcb-errors=enabled" - ]; - postInstall = '' # Copy the library to $examples mkdir -p $examples/lib @@ -51,7 +46,12 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A modular Wayland compositor library"; + longDescription = '' + Pluggable, composable, unopinionated modules for building a Wayland + compositor; or about 50,000 lines of code you were going to write anyway. + ''; inherit (src.meta) homepage; + changelog = "https://github.com/swaywm/wlroots/releases/tag/${version}"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/development/libraries/xxHash/default.nix b/pkgs/development/libraries/xxHash/default.nix index 1ea25fb7209..9d2ed44cb4b 100644 --- a/pkgs/development/libraries/xxHash/default.nix +++ b/pkgs/development/libraries/xxHash/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xxHash"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "Cyan4973"; repo = "xxHash"; rev = "v${version}"; - sha256 = "1f9gl0cymmi92ihsfan0p4zmyf2hxwx4arjimpbmbp719nbcvdsx"; + sha256 = "0bin0jch6lbzl4f8y052a7azfgq2n7iwqihzgqmcccv5vq4vcx5a"; }; outputs = [ "out" "dev" ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { highly portable, and hashes are identical on all platforms (little / big endian). ''; - homepage = https://github.com/Cyan4973/xxHash; + homepage = "https://github.com/Cyan4973/xxHash"; license = with licenses; [ bsd2 gpl2 ]; maintainers = with maintainers; [ orivej ]; platforms = platforms.unix; diff --git a/pkgs/development/misc/newlib/default.nix b/pkgs/development/misc/newlib/default.nix index df0ef999dd6..193ec53d5ad 100644 --- a/pkgs/development/misc/newlib/default.nix +++ b/pkgs/development/misc/newlib/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, buildPackages }: -let version = "3.1.0"; +let version = "3.3.0"; in stdenv.mkDerivation { pname = "newlib"; inherit version; src = fetchurl { url = "ftp://sourceware.org/pub/newlib/newlib-${version}.tar.gz"; - sha256 = "0ahh3n079zjp7d9wynggwrnrs27440aac04340chf1p9476a2kzv"; + sha256 = "0ricyx792ig2cb2x31b653yb7w7f7mf2111dv5h96lfzmqz9xpaq"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/ocaml-modules/earley/default.nix b/pkgs/development/ocaml-modules/earley/default.nix index ab3011361e1..f47231a242e 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 1a98c748e45..decbb411767 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/eigen/default.nix b/pkgs/development/ocaml-modules/eigen/default.nix index 8f26213c23a..3922b5cfec7 100644 --- a/pkgs/development/ocaml-modules/eigen/default.nix +++ b/pkgs/development/ocaml-modules/eigen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildDune2Package, fetchFromGitHub, ctypes }: +{ stdenv, buildDune2Package, fetchFromGitHub, ctypes, libcxx }: buildDune2Package rec { pname = "eigen"; @@ -13,6 +13,8 @@ buildDune2Package rec { minimumOCamlVersion = "4.02"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + propagatedBuildInputs = [ ctypes ]; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 9a9ea28da53..7ffb7a8880b 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchzip, which, ocsigen_server, ocaml, lwt_react, - opaline, ppx_tools, ppx_deriving, findlib -, ppx_tools_versioned + opaline, ppx_deriving, findlib , js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, js_of_ocaml-ppx_deriving_json , js_of_ocaml-lwt , js_of_ocaml-tyxml @@ -15,15 +14,14 @@ else stdenv.mkDerivation rec { pname = "eliom"; - version = "6.8.0"; + version = "6.10.1"; src = fetchzip { url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz"; - sha256 = "0di4q0wzbnk9sxlaj97ivghzh8qvjb8n17h80y4nmqhys97pldif"; + sha256 = "006722wcmhsfhyzv3qbgrrn53fbv9v4i31z52a0pznb6cll45nkm"; }; - buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild js_of_ocaml-ppx_deriving_json opaline ppx_tools - ppx_tools_versioned + buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild js_of_ocaml-ppx_deriving_json opaline ]; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/ocf/default.nix b/pkgs/development/ocaml-modules/ocf/default.nix index 0452b1b7dfe..e90d13de3b3 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/ocsigen-start/default.nix b/pkgs/development/ocaml-modules/ocsigen-start/default.nix index bbdf3d56a47..6d8beb8b07b 100644 --- a/pkgs/development/ocaml-modules/ocsigen-start/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-start/default.nix @@ -1,15 +1,14 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, camlp4, ocsigen-toolkit, pgocaml, macaque, safepass, yojson -, js_of_ocaml-camlp4, lwt_camlp4 +{ stdenv, fetchFromGitHub, ocaml, findlib, ocsigen-toolkit, pgocaml_ppx, macaque, safepass, yojson , cohttp-lwt-unix , resource-pooling }: stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-ocsigen-start-${version}"; - version = "2.7.0"; + version = "2.16.1"; - buildInputs = [ ocaml findlib js_of_ocaml-camlp4 lwt_camlp4 ]; - propagatedBuildInputs = [ pgocaml macaque safepass ocsigen-toolkit yojson resource-pooling cohttp-lwt-unix camlp4 ]; + buildInputs = [ ocaml findlib ]; + propagatedBuildInputs = [ pgocaml_ppx safepass ocsigen-toolkit yojson resource-pooling cohttp-lwt-unix ]; patches = [ ./templates-dir.patch ]; @@ -23,7 +22,7 @@ stdenv.mkDerivation rec { owner = "ocsigen"; repo = "ocsigen-start"; rev = version; - sha256 = "1kp9g679xnff2ybwsicnc9c203hi9ri1ijbpp6221b2sj6zxf2wc"; + sha256 = "1pzpyrd3vbhc7zvzh6bv44793ikx5bglpd5p4wk5jj65v1w39jwd"; }; meta = { diff --git a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix index 6c9e72f95d7..2ac54eb4e3c 100644 --- a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix @@ -5,9 +5,9 @@ stdenv.mkDerivation rec { pname = "ocsigen-toolkit"; name = "ocaml${ocaml.version}-${pname}-${version}"; - version = "2.2.0"; + version = "2.5.0"; - propagatedBuildInputs = [ calendar eliom js_of_ocaml-ppx_deriving_json ]; + propagatedBuildInputs = [ calendar js_of_ocaml-ppx_deriving_json eliom ]; buildInputs = [ ocaml findlib opaline ]; installPhase = @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "ocsigen"; repo = pname; rev = version; - sha256 = "0qy6501jf81qcmkbicgrb1x4pxsjkhr40plwdn09w37d8vx9va3s"; + sha256 = "0hll8qr363pbb65jnr2w36zcbplbwn08xb7826ayiwigakj783p9"; }; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix index d8a8f22ae70..5faaca81039 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "ppx_deriving_yojson"; - version = "3.5.1"; + version = "3.5.2"; minimumOCamlVersion = "4.04"; @@ -12,7 +12,7 @@ buildDunePackage rec { owner = "ocaml-ppx"; repo = "ppx_deriving_yojson"; rev = "v${version}"; - sha256 = "13nscby635vab9jf5pl1wgmdmqw192nf2r26m3gr01hp3bpn38zh"; + sha256 = "1vbhmnhnj1aa4jrp8xqi52nggwj7vrml83z2j0r0qzvl65v02mc0"; }; buildInputs = [ ppxfind ounit ]; diff --git a/pkgs/development/ocaml-modules/ppx_import/default.nix b/pkgs/development/ocaml-modules/ppx_import/default.nix index bdcc6568ffe..f4977992759 100644 --- a/pkgs/development/ocaml-modules/ppx_import/default.nix +++ b/pkgs/development/ocaml-modules/ppx_import/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml +{ lib, fetchurl, buildDunePackage, ocaml , ounit, ppx_deriving, ppx_tools_versioned }: @@ -8,24 +8,21 @@ else buildDunePackage rec { pname = "ppx_import"; - version = "1.5-3"; + version = "1.7.1"; - src = fetchFromGitHub { - owner = "ocaml-ppx"; - repo = "ppx_import"; - rev = "bd627d5afee597589761d6fee30359300b5e1d80"; - sha256 = "1f9bphif1izhyx72hvwpkd9kxi9lfvygaicy6nbxyp6qgc87z4nm"; + src = fetchurl { + url = "https://github.com/ocaml-ppx/ppx_import/releases/download/v${version}/ppx_import-v${version}.tbz"; + sha256 = "16dyxfb7syz659rqa7yq36ny5vzl7gkqd7f4m6qm2zkjc1gc8j4v"; }; buildInputs = [ ounit ppx_deriving ]; propagatedBuildInputs = [ ppx_tools_versioned ]; doCheck = true; - checkTarget = "test"; meta = { description = "A syntax extension that allows to pull in types or signatures from other compiled interface files"; license = lib.licenses.mit; - inherit (src.meta) homepage; + homepage = "https://github.com/ocaml-ppx/ppx_import"; }; } diff --git a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix index 03cadad7ff4..7fd939e58ec 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/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix index 644e1c98c48..bbaf9e27cf4 100644 --- a/pkgs/development/ocaml-modules/ppxlib/default.nix +++ b/pkgs/development/ocaml-modules/ppxlib/default.nix @@ -1,16 +1,23 @@ { stdenv, fetchFromGitHub, buildDunePackage +, version ? "0.8.1" , ocaml-compiler-libs, ocaml-migrate-parsetree, ppx_derivers, stdio }: +let sha256 = + { "0.8.1" = "0vm0jajmg8135scbg0x60ivyy5gzv4abwnl7zls2mrw23ac6kml6"; + "0.12.0" = "1cg0is23c05k1rc94zcdz452p9zn11dpqxm1pnifwx5iygz3w0a1"; + }."${version}" +; in + buildDunePackage rec { pname = "ppxlib"; - version = "0.8.1"; + inherit version; src = fetchFromGitHub { owner = "ocaml-ppx"; repo = pname; rev = version; - sha256 = "0vm0jajmg8135scbg0x60ivyy5gzv4abwnl7zls2mrw23ac6kml6"; + inherit sha256; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/sedlex/2.nix b/pkgs/development/ocaml-modules/sedlex/2.nix index 09390a27343..26c35b98339 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 e10a67a50a0..fe3d4ea0e86 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/XlsxWriter/default.nix b/pkgs/development/python-modules/XlsxWriter/default.nix index f9730eb61ae..d5c24c018b6 100644 --- a/pkgs/development/python-modules/XlsxWriter/default.nix +++ b/pkgs/development/python-modules/XlsxWriter/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "XlsxWriter"; - version = "1.2.6"; + version = "1.2.8"; # PyPI release tarball doesn't contain tests so let's use GitHub. See: # https://github.com/jmcnamara/XlsxWriter/issues/327 @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "jmcnamara"; repo = pname; rev = "RELEASE_${version}"; - sha256 = "05y1py5mn1m65bbwhinzv84jd3xj8snvf2795flw0xbxnkn8nd8p"; + sha256 = "18q5sxm9jw5sfavdjy5z0yamknwj5fl359jziqllkbj5k2i16lnr"; }; meta = { diff --git a/pkgs/development/python-modules/acoustics/default.nix b/pkgs/development/python-modules/acoustics/default.nix index bf3f31d351f..05f0e29f4e2 100644 --- a/pkgs/development/python-modules/acoustics/default.nix +++ b/pkgs/development/python-modules/acoustics/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "acoustics"; - version = "0.2.3"; + version = "0.2.4"; checkInputs = [ pytest ]; propagatedBuildInputs = [ numpy scipy matplotlib pandas tabulate ]; src = fetchPypi { inherit pname version; - sha256 = "ca663059d61fbd2899aed4e3cedbc3f983aa67afd3ae1617db3c59b724206fb3"; + sha256 = "8ccb68ac258ba81a0b9064523e85eae013f9bfce7244d01db42d7d2d21d712cc"; }; checkPhase = '' @@ -26,6 +26,5 @@ buildPythonPackage rec { maintainers = with maintainers; [ fridh ]; license = with licenses; [ bsd3 ]; homepage = "https://github.com/python-acoustics/python-acoustics"; - broken = true; # no longer compatible with pandas>=1 }; } diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/development/python-modules/alot/default.nix index b7005b4168b..0b869e4228b 100644 --- a/pkgs/development/python-modules/alot/default.nix +++ b/pkgs/development/python-modules/alot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, python, fetchFromGitHub, isPy3k +{ stdenv, lib, buildPythonPackage, python, fetchFromGitHub, fetchpatch, isPy3k , notmuch, urwid, urwidtrees, twisted, python_magic, configobj, mock, file, gpgme , service-identity , gnupg ? null, sphinx, awk ? null, procps ? null, future ? null @@ -19,6 +19,15 @@ buildPythonPackage rec { sha256 = "sha256-WUwOJcq8JE7YO8sFeZwYikCRhpufO0pL6MKu54ZYsHI="; }; + patches = [ + # can't compose email if signature is set: https://github.com/pazz/alot/issues/1468 + (fetchpatch { + name = "envelope-body.patch"; + url = "https://github.com/pazz/alot/commit/28a4296c7f556c251d71d9502681980d46d9fa55.patch"; + sha256 = "1iwvmjyz4mh1g08vr85ywhah2xarcqg8dazagygk19icgsn45w06"; + }) + ]; + nativeBuildInputs = lib.optional withManpage sphinx; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix index 3de3277a72d..9ef332827eb 100755 --- a/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "atlassian-python-api"; - version = "1.14.9"; + version = "1.15.4"; src = fetchPypi { inherit pname version; - sha256 = "28ff793cb43152384a810efc6ee572473daf3dc44bf7c1c295efb270a6d29251"; + sha256 = "0vkq3sr4a23ipk74swsmc3ydg3q91asixb7hzl8mzkfpgnnyvr77"; }; checkInputs = [ pytestrunner pytest ]; diff --git a/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix b/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix index 1cacd988157..75c912dfe40 100644 --- a/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.3.0"; + version = "0.4.0"; pname = "azure-mgmt-appconfiguration"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1igl3ikdwcz7d2zcja5nm2qjysjh53vgwzcc96lylypmq6z4aq1s"; + sha256 = "1dn5585nsizszjivx6lp677ka0mrg0ayqgag4yzfdz9ml8mj1xl5"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/azure-mgmt-sql/default.nix b/pkgs/development/python-modules/azure-mgmt-sql/default.nix index 0929ca3ff5c..a81f336df06 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/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix index 719e1eae3cc..0b2442b087d 100644 --- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "7.1.0"; + version = "7.2.0"; pname = "azure-mgmt-storage"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "03yjvw1dwkwsadsv60i625mr9zpdryy7ywvh7p8fg60djszh1p5l"; + sha256 = "01ck1ankgr9ikvfghhdcs777yrl2j2p8cw9q8nfdrjp22lpchabl"; }; postInstall = if isPy3k then "" else '' 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 00000000000..55a12009a15 --- /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/bugsnag/default.nix b/pkgs/development/python-modules/bugsnag/default.nix new file mode 100644 index 00000000000..2f0e67683d9 --- /dev/null +++ b/pkgs/development/python-modules/bugsnag/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, six +, webob +}: + +buildPythonPackage rec { + pname = "bugsnag"; + version = "3.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "17cjh7g8gbr0gb22nzybkw7vq9x5wfa5ln94hhzijbz934bw1f37"; + }; + + propagatedBuildInputs = [ six webob ]; + + # no tests + doCheck = false; + + meta = with stdenv.lib; { + description = "Automatic error monitoring for django, flask, etc."; + homepage = "https://www.bugsnag.com"; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index b05aeebf9d4..6f1e362f8bf 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -2,11 +2,11 @@ if isPyPy then null else buildPythonPackage rec { pname = "cffi"; - version = "1.13.2"; + version = "1.14.0"; src = fetchPypi { inherit pname version; - sha256 = "599a1e8ff057ac530c9ad1778293c665cb81a791421f46922d80a86473c13346"; + sha256 = "1dn279gw5ql8i5n3s5v4rnv96rhhjjfn7xq729qbl5bs2954yf1d"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/ckcc-protocol/default.nix b/pkgs/development/python-modules/ckcc-protocol/default.nix index f1136851f8a..01e2955d08a 100644 --- a/pkgs/development/python-modules/ckcc-protocol/default.nix +++ b/pkgs/development/python-modules/ckcc-protocol/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "ckcc-protocol"; - version = "1.0.0"; + version = "1.0.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1glws7z7kk9qyl1j4446hb6vv3l4s5xca40zb4fzhsh6chm76h11"; + sha256 = "13ihbhjgxyn1xvrbppjvnqm199q5fdwrljs0wm16iwyl56kf3wh3"; }; checkInputs = [ @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Communicate with your Coldcard using Python"; - homepage = https://github.com/Coldcard/ckcc-protocol; + homepage = "https://github.com/Coldcard/ckcc-protocol"; license = licenses.gpl3; maintainers = [ maintainers.hkjn ]; }; diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index ac5ef42bdbe..a2e5862f540 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "cmd2"; - version = "0.9.25"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0w5jh2lanqxsva9fr9p07mmbd5w4v6zmhf6lr0awksvhjx77lhdc"; + sha256 = "sha256-GtSqmkWCHX/1t31sny3f2ek8uTS1oEMSM1rRXG9DuFI="; }; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/convertdate/default.nix b/pkgs/development/python-modules/convertdate/default.nix new file mode 100644 index 00000000000..5a8608c5037 --- /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/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix index 33c1570060e..e33382ffd01 100644 --- a/pkgs/development/python-modules/denonavr/default.nix +++ b/pkgs/development/python-modules/denonavr/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "denonavr"; - version = "0.7.10"; + version = "0.7.12"; src = fetchFromGitHub { owner = "scarface-4711"; repo = "denonavr"; rev = version; - sha256 = "078nhr69f68nfazhmkf2sl7wiadqx96a5ry3ziggiy1xs04vflj7"; + sha256 = "1i7r0f8ldxpy9vkwjla6rfkaq37071d36zfhb1dwm9jgp6ggi34m"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/django-compat/default.nix b/pkgs/development/python-modules/django-compat/default.nix index c492e65854a..9caa1cb730b 100644 --- a/pkgs/development/python-modules/django-compat/default.nix +++ b/pkgs/development/python-modules/django-compat/default.nix @@ -5,8 +5,6 @@ buildPythonPackage rec { pname = "django-compat"; version = "1.0.15"; - # django-compat requires django < 2.0 - disabled = stdenv.lib.versionAtLeast django.version "2.0"; # the pypi packages don't include everything required for the tests src = fetchFromGitHub { @@ -16,6 +14,10 @@ buildPythonPackage rec { sha256 = "1pr6v38ahrsvxlgmcx69s4b5q5082f44gzi4h3c32sccdc4pwqxp"; }; + patches = [ + ./fix-tests.diff + ]; + checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/django-compat/fix-tests.diff b/pkgs/development/python-modules/django-compat/fix-tests.diff new file mode 100644 index 00000000000..58165db96a8 --- /dev/null +++ b/pkgs/development/python-modules/django-compat/fix-tests.diff @@ -0,0 +1,56 @@ +diff -ur a/compat/tests/settings.py b/compat/tests/settings.py +--- a/compat/tests/settings.py 2020-03-06 15:32:07.548482597 +0100 ++++ b/compat/tests/settings.py 2020-03-06 22:19:25.422934249 +0100 +@@ -16,11 +16,12 @@ + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', ++ 'django.contrib.messages', + 'compat', + 'compat.tests.test_app', + ] + +-MIDDLEWARE_CLASSES = ( ++MIDDLEWARE = ( + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', +@@ -43,6 +44,7 @@ + 'django.template.context_processors.i18n', + 'django.template.context_processors.tz', + 'django.template.context_processors.request', ++ 'django.contrib.messages.context_processors.messages', + ], + 'loaders': [ + 'django.template.loaders.filesystem.Loader', +diff -ur a/compat/tests/test_compat.py b/compat/tests/test_compat.py +--- a/compat/tests/test_compat.py 2020-03-06 15:32:07.548482597 +0100 ++++ b/compat/tests/test_compat.py 2020-03-06 15:37:39.202835075 +0100 +@@ -9,7 +9,7 @@ + from django.core.serializers.json import DjangoJSONEncoder + from django.test import TestCase, SimpleTestCase + from django.test.client import RequestFactory +-from django.contrib.auth.views import logout ++from django.contrib.auth.views import auth_logout + try: + from django.urls import NoReverseMatch + except ImportError: +@@ -103,7 +103,7 @@ + Tests that passing a view name to ``resolve_url`` will result in the + URL path mapping to that view name. + """ +- resolved_url = resolve_url(logout) ++ resolved_url = resolve_url(auth_logout) + self.assertEqual('/accounts/logout/', resolved_url) + + ''' +diff -ur a/compat/tests/urls.py b/compat/tests/urls.py +--- a/compat/tests/urls.py 2020-03-06 15:32:07.548482597 +0100 ++++ b/compat/tests/urls.py 2020-03-06 15:34:25.962377799 +0100 +@@ -2,5 +2,5 @@ + from django.contrib.auth import views + + urlpatterns = [ +- url(r'^accounts/logout/$', views.logout, name='logout'), ++ url(r'^accounts/logout/$', views.auth_logout, name='logout'), + ] diff --git a/pkgs/development/python-modules/dominate/default.nix b/pkgs/development/python-modules/dominate/default.nix index 7288dee7763..3881bf2dd86 100644 --- a/pkgs/development/python-modules/dominate/default.nix +++ b/pkgs/development/python-modules/dominate/default.nix @@ -2,17 +2,17 @@ buildPythonPackage rec { pname = "dominate"; - version = "2.4.0"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "1775cz6lipb43hmjll77m2pxh72pikng74lpg30v9n1b66s78959"; + sha256 = "0y4xzch6kwzddwz6pmk8cd09r3dpkxm1bh4q1byhm37a0lb4h1cv"; }; doCheck = !isPy3k; meta = with lib; { - homepage = https://github.com/Knio/dominate/; + homepage = "https://github.com/Knio/dominate/"; description = "Dominate is a Python library for creating and manipulating HTML documents using an elegant DOM API"; license = licenses.lgpl3; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/eth-typing/default.nix b/pkgs/development/python-modules/eth-typing/default.nix index 0fcf7731ee0..437d2d9ce16 100644 --- a/pkgs/development/python-modules/eth-typing/default.nix +++ b/pkgs/development/python-modules/eth-typing/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "eth-typing"; - version = "2.1.0"; + version = "2.2.1"; # Tests are missing from the PyPI source tarball so let's use GitHub # https://github.com/ethereum/eth-typing/issues/8 @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "0chrrfw3kdaihgr2ryhljf56bflipzmfxai688xrc2yk7yiqnll5"; + sha256 = "0k9jydsclk81qpkvl7hpchwclm3c89gyzlk17480wcw90nkps9ap"; }; # setuptools-markdown uses pypandoc which is broken at the moment diff --git a/pkgs/development/python-modules/eth-utils/default.nix b/pkgs/development/python-modules/eth-utils/default.nix index 116fa0273e5..1c373c64e89 100644 --- a/pkgs/development/python-modules/eth-utils/default.nix +++ b/pkgs/development/python-modules/eth-utils/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "eth-utils"; - version = "1.7.0"; + version = "1.8.4"; # Tests are missing from the PyPI source tarball so let's use GitHub # https://github.com/ethereum/eth-utils/issues/130 @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "0hhhdz764xgwj5zg3pjzpx10vh54q7kbvlnj9d67qkgwl3fkfgw2"; + sha256 = "1hfzb3xz3j50dgp51nx2jssh9j07np24fqmpnyr2ycsll90g1j6q"; }; checkInputs = [ pytest hypothesis ]; diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index 75edf5dc424..daec9218a1d 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/gphoto2/default.nix b/pkgs/development/python-modules/gphoto2/default.nix index 2c8a5a0106a..1040a4be3f1 100644 --- a/pkgs/development/python-modules/gphoto2/default.nix +++ b/pkgs/development/python-modules/gphoto2/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "gphoto2"; - version = "2.1.0"; + version = "2.2.1"; src = fetchPypi { inherit pname version; - sha256 = "1fdmlyy3lbc6ggfn60fjizaz5icxd676y7gz9nzfy3l4id7mfyk4"; + sha256 = "118zm25c8mlajfl0pzssnwz4b8lamj9dgymla9rn4nla7l244a0r"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix index d9d66e7a204..fd08f71aa2b 100644 --- a/pkgs/development/python-modules/gym/default.nix +++ b/pkgs/development/python-modules/gym/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "gym"; - version = "0.15.6"; + version = "0.16.0"; src = fetchPypi { inherit pname version; - sha256 = "0qpx4w6k42sb9ncjk4r6i22qjbcxcnha43svhvvq1nh7796xqzgd"; + sha256 = "06h5b639nmzhmy4m1j3vigm86iv5pv7k8jy6xpldyd4jdlf37nn5"; }; postPatch = '' @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "A toolkit by OpenAI for developing and comparing your reinforcement learning agents"; - homepage = https://gym.openai.com/; + homepage = "https://gym.openai.com/"; license = licenses.mit; maintainers = with maintainers; [ hyphon81 ]; }; diff --git a/pkgs/development/python-modules/hickle/default.nix b/pkgs/development/python-modules/hickle/default.nix index 8d45970294c..bc8c741ec2b 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 ebde21a4821..eeaf449971b 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/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index 545f0d00179..a4b7fb3a652 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2020.2.5"; + version = "2020.2.29"; disabled = isPy27; src = fetchFromGitHub { owner = "sethmlarson"; repo = pname; rev = version; - sha256 = "1jz4qma04vkiczlj0fd9ahjf6c3yxvycvhp48c3n3l4aw4gfsbiz"; + sha256 = "1s6f9sdr5l9dqri92s8qr7r1nyvai3vnpcaw06293kc8dribi0m2"; }; # tests require network connection @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "Chromium HSTS Preload list as a Python package and updated daily"; - homepage = https://github.com/sethmlarson/hstspreload; + homepage = "https://github.com/sethmlarson/hstspreload"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/i3ipc/default.nix b/pkgs/development/python-modules/i3ipc/default.nix index 482a51a099e..707a58ff85e 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 ]; - checkInputs = [ xorgserver pytest i3 ]; + postPatch = '' + substituteInPlace test/i3.config \ + --replace /bin/true ${coreutils}/bin/true + ''; + + 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/ipympl/default.nix b/pkgs/development/python-modules/ipympl/default.nix new file mode 100644 index 00000000000..ef023727d70 --- /dev/null +++ b/pkgs/development/python-modules/ipympl/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, ipywidgets, matplotlib }: + +buildPythonPackage rec { + pname = "ipympl"; + version = "0.3.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0m5sh2ha9hlgigc5xxsy7nd0gdadx797h1i66i9z616p0r43gx7d"; + }; + + propagatedBuildInputs = [ ipywidgets matplotlib ]; + + # There are no unit tests in repository + doCheck = false; + pythonImportsCheck = [ "ipympl" "ipympl.backend_nbagg" ]; + + meta = with lib; { + description = "Matplotlib Jupyter Extension"; + homepage = https://github.com/matplotlib/jupyter-matplotlib; + maintainers = with maintainers; [ jluttine ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix b/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix new file mode 100644 index 00000000000..15aed1502b1 --- /dev/null +++ b/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchFromGitHub, requests +, websocket_client, pythonOlder }: + +buildPythonPackage rec { + pname = "jellyfin-apiclient-python"; + version = "1.4.0"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "iwalton3"; + repo = "jellyfin-apiclient-python"; + rev = "v${version}"; + sha256 = "0b4ij19xjwn0wm5076fx8n4phjbsfx84x9qdrwm8c2r3ld8w7hk4"; + }; + + propagatedBuildInputs = [ requests websocket_client ]; + + pythonImportsCheck = [ "jellyfin_apiclient_python" ]; + + meta = with lib; { + homepage = "https://github.com/iwalton3/jellyfin-apiclient-python"; + description = "Python API client for Jellyfin"; + license = licenses.gpl3; + maintainers = with maintainers; [ jojosch ]; + }; +} diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix index a5015f4d326..26b7ab5d622 100644 --- a/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "jenkins-job-builder"; - version = "3.2.0"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1njxww53d92cpgrqlr09w2n0pk6wamjcb0mvpns1mr2pn5hy1jhi"; + sha256 = "0znnw1vnvnm8a6gfrk479s2b9hzlxi4qy57c9a47qphvx3mklm8x"; }; postPatch = '' diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 55ade7db9ca..3faa0a2edc3 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/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index edfe01728a4..9a526169489 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "jupyterlab_server"; - version = "1.0.6"; + version = "1.0.7"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "d0977527bfce6f47c782cb6bf79d2c949ebe3f22ac695fa000b730c671445dad"; + sha256 = "1qnqxy6812py7xklg7xfrkadm0v4z8x6n1035i26h2z7y891ff0j"; }; checkInputs = [ requests pytest ]; @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "JupyterLab Server"; - homepage = https://jupyter.org; + homepage = "https://jupyter.org"; license = licenses.bsdOriginal; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/klaus/default.nix b/pkgs/development/python-modules/klaus/default.nix index d1218ab49b7..a2d171fbb9a 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/lark-parser/default.nix b/pkgs/development/python-modules/lark-parser/default.nix index 1ba7df00ea3..ddf6cabcae9 100644 --- a/pkgs/development/python-modules/lark-parser/default.nix +++ b/pkgs/development/python-modules/lark-parser/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "lark-parser"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; rev = version; - sha256 = "1mjicdvrzh9r9q3xrjrzaiaxk04r60a3l6l0vnp1hq3xfc9ccqc8"; + sha256 = "1i585q27qlwk4rpgsh621s60im1j9ynwyz5pcc8s3ffmjam28vss"; }; # tests of Nearley support require js2py @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = { description = "A modern parsing library for Python, implementing Earley & LALR(1) and an easy interface"; - homepage = https://github.com/lark-parser/lark; + homepage = "https://github.com/lark-parser/lark"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index c7631f0c5b2..f8c1222fb3f 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/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 64629314bfe..7b9393754a4 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "1.10.0"; + version = "1.10.2"; disabled = ! isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1qa4sam1kvglwqwk573mjpsy8cy89yamr4val0g80hq1ribc56ah"; + sha256 = "1y94ay2jz4m55nlyrg283xsjqsxigmj7vzrzf1mskbpjb20335fb"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pony/default.nix b/pkgs/development/python-modules/pony/default.nix index ebda1976e2a..22c14cc0dfb 100644 --- a/pkgs/development/python-modules/pony/default.nix +++ b/pkgs/development/python-modules/pony/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pony"; - version = "0.7.11"; + version = "0.7.12"; src = fetchPypi { inherit pname version; - sha256 = "05vyvsbcb99vjjs7qpbwy8j4m854w74z8di6zqsv8p9wbm38s06i"; + sha256 = "02njpqwfvzxj9icabil8ycmfx8avzih3g1kcdif290qgsy57a28r"; }; doCheck = true; diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index 59dd94b3018..8e479dfaca2 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/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix index e04a2a62d49..d1eeb3e31d0 100644 --- a/pkgs/development/python-modules/pvlib/default.nix +++ b/pkgs/development/python-modules/pvlib/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "pvlib"; - version = "0.7.0"; + version = "0.7.1"; # Support for Python <3.5 dropped in 0.6.3 on June 1, 2019. disabled = pythonOlder "3.5"; src = fetchPypi{ inherit pname version; - sha256 = "ee935ba52f1d4a514cc3baa743db0377af732952faf800f20ffd8071fa2107c2"; + sha256 = "1kqwnkbkdv4m3r68pd39va6wqvhr34a6hx4d6q5lfkibclg35c3d"; }; checkInputs = [ pytest mock pytest-mock ]; @@ -19,8 +19,8 @@ buildPythonPackage rec { # Skip a few tests that try to access some URLs checkPhase = '' runHook preCheck - pushd pvlib/test - pytest . -k "not test_read_srml_dt_index and not test_read_srml_month_from_solardata and not test_get_psm3" + pushd pvlib/tests + pytest . -k "not test_read_srml_dt_index and not test_read_srml_month_from_solardata and not test_get_psm3 and not test_pvgis" popd runHook postCheck ''; diff --git a/pkgs/development/python-modules/pyface/default.nix b/pkgs/development/python-modules/pyface/default.nix index a26d0bdc1a9..db8b05e8d68 100644 --- a/pkgs/development/python-modules/pyface/default.nix +++ b/pkgs/development/python-modules/pyface/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pyface"; - version = "6.1.1"; + version = "6.1.2"; src = fetchPypi { inherit pname version; - sha256 = "1q5rihmhcdyyp44p31f5l4a0mc9m3293rvcnma5p8w0v8j7dbrm7"; + sha256 = "1g2g3za64rfffbivlihbf5njrqbv63ln62rv9d8fi1gcrgaw6akw"; }; propagatedBuildInputs = [ setuptools six traits wxPython ]; @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Traits-capable windowing framework"; - homepage = https://github.com/enthought/pyface; + homepage = "https://github.com/enthought/pyface"; maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; license = licenses.bsdOriginal; }; diff --git a/pkgs/development/python-modules/pyftdi/default.nix b/pkgs/development/python-modules/pyftdi/default.nix index 76c7ea9b5bc..cc197754692 100644 --- a/pkgs/development/python-modules/pyftdi/default.nix +++ b/pkgs/development/python-modules/pyftdi/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pyftdi"; - version = "0.42.2"; + version = "0.44.2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "1bpb2rq7bc3p4g9qrfp4a7qcic79cvv1wh17j231bnpmy48njhvj"; + sha256 = "18k9wnpjxg71v4jm0pwr2bmksq7sckr6ylh1slf0xgpg89b27bxq"; }; propagatedBuildInputs = [ pyusb pyserial ]; diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index cd2994a4dc0..013ce9ae916 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -1,19 +1,25 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, isPyPy, isPy3k, libgit2, pytestCheckHook, cffi, cacert }: +{ stdenv, lib, buildPythonPackage, fetchPypi, isPyPy, isPy3k, libgit2, cached-property, pytestCheckHook, cffi, cacert }: buildPythonPackage rec { pname = "pygit2"; - version = "1.0.3"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "1ql7hkcxrh8yszglrg7d3y0ivh1l56xdc3j34j2fjy4qq06ifv6y"; + sha256 = "klXVB9XYe/It/VeZeniQgBAzH8IfmoPsoSGlP2V76zw="; }; preConfigure = lib.optionalString stdenv.isDarwin '' export DYLD_LIBRARY_PATH="${libgit2}/lib" ''; - propagatedBuildInputs = [ libgit2 ] ++ lib.optional (!isPyPy) cffi; + buildInputs = [ + libgit2 + ]; + + propagatedBuildInputs = [ + cached-property + ] ++ lib.optional (!isPyPy) cffi; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyicloud/default.nix b/pkgs/development/python-modules/pyicloud/default.nix index 1c6fe286db5..7bc52f74701 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 8f96ebe915a..00000000000 --- 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 00000000000..4c8097325bc --- /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 ca606767f4d..8cfce9ba43f 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 9350d4050da..55cbf7d48da 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/pyro5/default.nix b/pkgs/development/python-modules/pyro5/default.nix new file mode 100644 index 00000000000..36559a03239 --- /dev/null +++ b/pkgs/development/python-modules/pyro5/default.nix @@ -0,0 +1,33 @@ +{ buildPythonPackage +, fetchPypi +, lib +, serpent +, pythonOlder +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "Pyro5"; + version = "5.7"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "08n9jqm81pjw9hvzk6kgxwqvh29q3glgccf77kxih5nn77pwdnni"; + }; + + propagatedBuildInputs = [ serpent ]; + + checkInputs = [ pytestCheckHook ]; + + # ignore network related tests, which fail in sandbox + disabledTests = [ "StartNSfunc" "Broadcast" "GetIP" ]; + + meta = with lib; { + description = "Distributed object middleware for Python (RPC)"; + homepage = "https://github.com/irmen/Pyro5"; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/pystray/default.nix b/pkgs/development/python-modules/pystray/default.nix new file mode 100644 index 00000000000..a2652fe1edc --- /dev/null +++ b/pkgs/development/python-modules/pystray/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchFromGitHub +, pillow, xlib, six, xvfb_run, sphinx }: + +buildPythonPackage rec { + pname = "pystray"; + version = "0.15.0"; + + src = fetchFromGitHub { + owner = "moses-palmer"; + repo = "pystray"; + rev = "v${version}"; + sha256 = "0m5raxahyix3lmmbjbrsfd9yhr4vdil8gcy155hh6lqm2b1fmmss"; + }; + + propagatedBuildInputs = [ pillow xlib six ]; + nativeBuildInputs = [ sphinx ]; + checkInputs = [ xvfb_run ]; + + checkPhase = '' + rm tests/icon_tests.py # test needs user input + + xvfb-run -s '-screen 0 800x600x24' python setup.py test + ''; + + meta = with lib; { + homepage = "https://github.com/moses-palmer/pystray"; + description = "This library allows you to create a system tray icon"; + license = licenses.lgpl3; + maintainers = with maintainers; [ jojosch ]; + }; +} diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix index 1b185070bf7..451ff9d0bca 100644 --- a/pkgs/development/python-modules/pytesseract/default.nix +++ b/pkgs/development/python-modules/pytesseract/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytesseract"; - version = "0.3.2"; + version = "0.3.3"; src = fetchPypi { inherit pname version; - sha256 = "1b6hmz9dqfn8il1g5vyz6izsxqjrbvrr2gs8gwwadyz8fx4vghx8"; + sha256 = "0lml55jrvdzy9fm31zpw64fqc4d6p5djg1ax2kgnimzfscxghh8h"; }; patches = [ diff --git a/pkgs/development/python-modules/python-jenkins/default.nix b/pkgs/development/python-modules/python-jenkins/default.nix index aea31053c5a..06a5d234ecf 100644 --- a/pkgs/development/python-modules/python-jenkins/default.nix +++ b/pkgs/development/python-modules/python-jenkins/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "python-jenkins"; - version = "1.6.0"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "1aa6rnzlzdgndiwjdbnklgz5pqy5zd7d6g7bhzsvyf0614z1w010"; + sha256 = "01jid5s09lr3kayr2h1z9n8h9nhyw3jxv9c4b5hrlxijknkqzvfy"; }; buildInputs = [ mock ]; @@ -32,9 +32,9 @@ buildPythonPackage rec { meta = with lib; { description = "Python bindings for the remote Jenkins API"; - homepage = https://pypi.python.org/pypi/python-jenkins; + homepage = "https://pypi.python.org/pypi/python-jenkins"; license = licenses.bsd3; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix index 18e73f56686..8b46b105d69 100644 --- a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix +++ b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "python-mpv-jsonipc"; - version = "1.1.6"; + version = "1.1.7"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "iwalton3"; repo = "python-mpv-jsonipc"; rev = "v${version}"; - sha256 = "08bs6qrcf5fi72jijmr2w7zs6aa5976dwv04f11ajwhj6i8kfq35"; + sha256 = "1a8lcvgwf7a19d4dj1wkkpxk44c2z9gsyz1xv4wpxi3gxlplcmcz"; }; # 'mpv-jsonipc' does not have any tests diff --git a/pkgs/development/python-modules/pywebview/default.nix b/pkgs/development/python-modules/pywebview/default.nix new file mode 100644 index 00000000000..f12d943aad7 --- /dev/null +++ b/pkgs/development/python-modules/pywebview/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchFromGitHub }: + +buildPythonPackage rec { + pname = "pywebview"; + version = "3.2"; + + src = fetchFromGitHub { + owner = "r0x0r"; + repo = "pywebview"; + rev = version; + sha256 = "0anwm6s0pp7xmgylr4m52v7lw825sdby7fajcl929l099n757gq7"; + }; + + # disabled due to error in loading unittest + # don't know how to make test from: None + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/r0x0r/pywebview"; + description = "Lightweight cross-platform wrapper around a webview."; + license = licenses.bsd3; + maintainers = with maintainers; [ jojosch ]; + }; +} diff --git a/pkgs/development/python-modules/quandl/default.nix b/pkgs/development/python-modules/quandl/default.nix index 385c51bcd3b..bd73a021331 100644 --- a/pkgs/development/python-modules/quandl/default.nix +++ b/pkgs/development/python-modules/quandl/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "quandl"; - version = "3.4.6"; + version = "3.4.8"; src = fetchPypi { inherit version; pname = "Quandl"; - sha256 = "15b58nj45bdax0aha6kwjz5pxj3bz8bs6ajwxqp9r89j13xxn94g"; + sha256 = "179knz21filz6x6qk66b7dk2pj1x4jnvxxd5x71ap19f367dkkb3"; }; doCheck = true; diff --git a/pkgs/development/python-modules/setuptools/44.0.nix b/pkgs/development/python-modules/setuptools/44.0.nix new file mode 100644 index 00000000000..194b90cb42a --- /dev/null +++ b/pkgs/development/python-modules/setuptools/44.0.nix @@ -0,0 +1,74 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, python +, wrapPython +, unzip +, callPackage +, bootstrapped-pip +, lib +, pipInstallHook +, setuptoolsBuildHook +}: + +let + pname = "setuptools"; + version = "44.0.0"; + + # Create an sdist of setuptools + sdist = stdenv.mkDerivation rec { + name = "${pname}-${version}-sdist.tar.gz"; + + src = fetchFromGitHub { + owner = "pypa"; + repo = pname; + rev = "v${version}"; + sha256 = "0z3q0qinyp1rmnxkw3y5f6nbsxhqlfq5k7skfrqa6ymb3zr009y1"; + name = "${pname}-${version}-source"; + }; + + buildPhase = '' + ${python.pythonForBuild.interpreter} bootstrap.py + ${python.pythonForBuild.interpreter} setup.py sdist --formats=gztar + ''; + + installPhase = '' + echo "Moving sdist..." + mv dist/*.tar.gz $out + ''; + }; +in buildPythonPackage rec { + inherit pname version; + # Because of bootstrapping we don't use the setuptoolsBuildHook that comes with format="setuptools" directly. + # Instead, we override it to remove setuptools to avoid a circular dependency. + # The same is done for pip and the pipInstallHook. + format = "other"; + + src = sdist; + + nativeBuildInputs = [ + bootstrapped-pip + (pipInstallHook.override{pip=null;}) + (setuptoolsBuildHook.override{setuptools=null; wheel=null;}) + ]; + + preBuild = lib.strings.optionalString (!stdenv.hostPlatform.isWindows) '' + export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0 + ''; + + pipInstallFlags = [ "--ignore-installed" ]; + + # Adds setuptools to nativeBuildInputs causing infinite recursion. + catchConflicts = false; + + # Requires pytest, causing infinite recursion. + doCheck = false; + + meta = with stdenv.lib; { + description = "Utilities to facilitate the installation of Python packages"; + homepage = https://pypi.python.org/pypi/setuptools; + license = with licenses; [ psfl zpl20 ]; + platforms = python.meta.platforms; + priority = 10; + }; +} diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 194b90cb42a..93c6c0ca38e 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -13,7 +13,7 @@ let pname = "setuptools"; - version = "44.0.0"; + version = "45.2.0"; # Create an sdist of setuptools sdist = stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ let owner = "pypa"; repo = pname; rev = "v${version}"; - sha256 = "0z3q0qinyp1rmnxkw3y5f6nbsxhqlfq5k7skfrqa6ymb3zr009y1"; + sha256 = "003iflm3ifjab3g1bnmhpwx1v3vpl4w90vwcvn8jf9449302d0md"; name = "${pname}-${version}-source"; }; diff --git a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix index d89ecb6218c..579b2f173ee 100644 --- a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-plantuml"; - version = "0.17.1"; + version = "0.18"; src = fetchPypi { inherit pname version; - sha256 = "1amvczdin078ia1ax2379lklxr0bwjsrin96174dvssxpzjl04cc"; + sha256 = "08555dndvp12g261wag3qklybdbfnjcmagh4gpl79k2kz5bqrk5c"; }; # No tests included. diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index f39c57e6be6..1e35d4024eb 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.4.2"; + version = "1.4.3"; src = fetchPypi { inherit pname version; - sha256 = "12i5s3qs0lxfs06p5b354scbapldf4isfr00cg1dq47n4gnqwa99"; + sha256 = "0qp9j8c92zbkwlbv5ywrszil6kvlkkf3wkc4krh2vdsrwd9cnf2g"; }; postPatch = '' diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index a2170db1bd4..a6d93465ffc 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/stem/default.nix b/pkgs/development/python-modules/stem/default.nix index 69931a46007..4d4e75d5326 100644 --- a/pkgs/development/python-modules/stem/default.nix +++ b/pkgs/development/python-modules/stem/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "stem"; - version = "1.7.1"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "18lc95pmc7i089nlsb06dsxyjl5wbhxfqgdxbjcia35ndh8z7sn9"; + sha256 = "1hk8alc0r4m669ggngdfvryndd0fbx0w62sclcmg55af4ak8xd50"; }; postPatch = '' diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 3f1c1e53c7c..4acc694a572 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.42.0"; + version = "2.43.0"; # Tests require network connectivity and there's no easy way to disable # them. ~ C. @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1vrs0mydj2j789slzfv5413qxa067zi7p34h2p63612gm3vdrcl9"; + sha256 = "0jikvcapg2xp3w824wz0wn74mx91nl3vmd92a10il3gli2p4wcnp"; }; propagatedBuildInputs = [ requests ]; @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Stripe Python bindings"; - homepage = https://github.com/stripe/stripe-python; + homepage = "https://github.com/stripe/stripe-python"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 0cddbd5a0a4..ed685bc0c48 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 24cc118d8f3..30861d92341 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/python-modules/traitsui/default.nix b/pkgs/development/python-modules/traitsui/default.nix index 7711b24f44e..8e7a5643d70 100644 --- a/pkgs/development/python-modules/traitsui/default.nix +++ b/pkgs/development/python-modules/traitsui/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "traitsui"; - version = "6.1.1"; + version = "6.1.3"; src = fetchPypi { inherit pname version; - sha256 = "080fq9hag7hvcnsd5c5fn74zjmjl6rjq40r0zwdz2bjlk9049xpi"; + sha256 = "0kw1xy5ax6l0lzmk7pfzjw6qs0idv78k3118my7cbvw1n5iiff28"; }; propagatedBuildInputs = [ traits pyface wxPython ]; @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Traits-capable windowing framework"; - homepage = https://github.com/enthought/traitsui; + homepage = "https://github.com/enthought/traitsui"; maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; license = licenses.bsdOriginal; }; diff --git a/pkgs/development/python-modules/ua-parser/default.nix b/pkgs/development/python-modules/ua-parser/default.nix index 9249a1ce044..875f0ee2075 100644 --- a/pkgs/development/python-modules/ua-parser/default.nix +++ b/pkgs/development/python-modules/ua-parser/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ua-parser"; - version = "0.9.0"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "1qpw1jdm8bp09jwjp8r38rr7rd2jy4k2if798cax3wylphm285xy"; + sha256 = "0csh307zfz666kkk5idrw3crj1x8q8vsqgwqil0r1n1hs4p7ica7"; }; buildInputs = [ pyyaml ]; @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A python implementation of the UA Parser"; - homepage = https://github.com/ua-parser/uap-python; + homepage = "https://github.com/ua-parser/uap-python"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index 481f7a9e7b2..b7322b0f179 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "uproot"; - version = "3.11.2"; + version = "3.11.3"; src = fetchPypi { inherit pname version; - sha256 = "1bn8z640408s4h04ymy0y79fm5ss2mx99mkgdbw68a80x0p6982h"; + sha256 = "19rvkxv015lkx0g01sb54y6agdbqbmkpxlyka4z1zf9dx2lx1iq5"; }; nativeBuildInputs = [ pytestrunner ]; @@ -51,7 +51,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/scikit-hep/uproot; + homepage = "https://github.com/scikit-hep/uproot"; description = "ROOT I/O in pure Python and Numpy"; license = licenses.bsd3; maintainers = with maintainers; [ ktf ]; diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 69e81596574..eba5a2b6714 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { phases = "installPhase"; installPhase = '' - install -Dm755 ${src} $out/bin/amm + install -Dm755 $src $out/bin/amm sed -i '0,/java/{s|java|${jre}/bin/java|}' $out/bin/amm '' + optionalString (disableRemoteLogging) '' sed -i '0,/ammonite.Main/{s|ammonite.Main|ammonite.Main --no-remote-logging|}' $out/bin/amm diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 67ded5bbb4a..c977a9d2082 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.119.1"; + version = "0.120.1"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "1p3kjdm4lsbc2lzab3kj1fjvccv8p47bj4s3jnfp2n7qppy7sbbf"; + sha256 = "0cqwwrml7yaqyd52rqcz64gbm1pc0yj5yhqqqj9vqyil8wif30v3"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/development/tools/analysis/hopper/default.nix index f6c5dcaf1ad..14b61eac374 100644 --- a/pkgs/development/tools/analysis/hopper/default.nix +++ b/pkgs/development/tools/analysis/hopper/default.nix @@ -12,12 +12,12 @@ }: stdenv.mkDerivation rec { pname = "hopper"; - version = "4.5.19"; + version = "4.5.21"; rev = "v${lib.versions.major version}"; src = fetchurl { url = "https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-${rev}-${version}-Linux.pkg.tar.xz"; - sha256 = "1c9wbjwz5xn0skz2a1wpxyx78hhrm8vcbpzagsg4wwnyblap59db"; + sha256 = "0s733n3hmzpsnrvfryq7kzsvwshd1y9fzm16a64gnii8cmfalrqc"; }; sourceRoot = "."; diff --git a/pkgs/development/tools/analysis/jdepend/default.nix b/pkgs/development/tools/analysis/jdepend/default.nix index 455ff7722fa..c903833a731 100644 --- a/pkgs/development/tools/analysis/jdepend/default.nix +++ b/pkgs/development/tools/analysis/jdepend/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jdepend"; - version = "2.9.1"; + version = "2.10"; src = fetchFromGitHub { owner = "clarkware"; repo = "jdepend"; rev = version; - sha256 = "1sxkgj4k4dhg8vb772pvisyzb8x0gwvlfqqir30ma4zvz3rfz60p"; + sha256 = "1lxf3j9vflky7a2py3i59q7cwd1zvjv2b88l3za39vc90s04dz6k"; }; nativeBuildInputs = [ ant jdk ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Traverses Java class file directories and generates design quality metrics for each Java package"; - homepage = http://www.clarkware.com/software/JDepend.html; + homepage = "http://www.clarkware.com/software/JDepend.html"; license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 8fe5f7a0cab..fc5244f9644 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -110,17 +110,17 @@ in { # # 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 c98eba0abe6..1b22cb2dc03 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/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 4eb531f59a8..0a6335a3eb7 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { + lib.optionalString useNcurses "-cursesUI" + lib.optionalString withQt5 "-qt5UI" + lib.optionalString useQt4 "-qt4UI"; - version = "3.16.4"; + version = "3.16.5"; src = fetchurl { url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt - sha256 = "0b5c77lqzfk5l7mnnih5c78i36d3skbkw20jjnph79lx9l8qrk4v"; + sha256 = "1z4bb8z6b4dvq5hrvajrf1hyybqay3xybyimf71w1jgcp180nxjz"; }; patches = [ @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails meta = with lib; { - homepage = http://www.cmake.org/; + homepage = "http://www.cmake.org/"; description = "Cross-Platform Makefile Generator"; platforms = if useQt4 then qt4.meta.platforms else platforms.all; maintainers = with maintainers; [ ttuegel lnl7 ]; diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index e4d4994a781..2930cc79374 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -1,6 +1,5 @@ { lib , python3Packages -, fetchpatch , stdenv , writeTextDir , substituteAll @@ -20,11 +19,11 @@ let in python3Packages.buildPythonApplication rec { pname = "meson"; - version = "0.52.1"; + version = "0.53.2"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "02fnrk1fjf3yiix0ak0m9vgbpl4h97fafii5pmw7phmvnlv9fyan"; + sha256 = "Po+DDzMYQ5fC6wtlHsUCrbY97LKJeL3ISzVY1xKEwh8="; }; postFixup = '' @@ -62,14 +61,6 @@ python3Packages.buildPythonApplication rec { src = ./fix-rpath.patch; inherit (builtins) storeDir; }) - - # Fix detecting incorrect compiler in the store path hash. - # https://github.com/NixOS/nixpkgs/issues/73417#issuecomment-554077964 - # https://github.com/mesonbuild/meson/pull/6185 - (fetchpatch { - url = "https://github.com/mesonbuild/meson/commit/972ede1d14fdf17fe5bb8fb99be220f9395c2392.patch"; - sha256 = "19bfsylhpy0b2xv3ks8ac9x3q6vvvyj1wjcy971v9d5f1455xhbb"; - }) ]; setupHook = ./setup-hook.sh; @@ -107,7 +98,7 @@ python3Packages.buildPythonApplication rec { homepage = https://mesonbuild.com; description = "SCons-like build system that use python as a front-end language and Ninja as a building backend"; license = licenses.asl20; - maintainers = with maintainers; [ mbe rasendubi ]; + maintainers = with maintainers; [ jtojnar mbe rasendubi ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix index 72ea74c9aad..4c8fa3f234b 100644 --- a/pkgs/development/tools/build-managers/waf/default.nix +++ b/pkgs/development/tools/build-managers/waf/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { python waf-light build${wafToolsArg} ''; installPhase = '' - install waf $out + install -D waf $out/bin/waf ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/build-managers/wafHook/setup-hook.sh b/pkgs/development/tools/build-managers/wafHook/setup-hook.sh index 3da86d3201f..38998e8db34 100644 --- a/pkgs/development/tools/build-managers/wafHook/setup-hook.sh +++ b/pkgs/development/tools/build-managers/wafHook/setup-hook.sh @@ -3,7 +3,7 @@ wafConfigurePhase() { if ! [ -f "${wafPath:=./waf}" ]; then echo "copying waf to $wafPath..." - cp @waf@ "$wafPath" + cp @waf@/bin/waf "$wafPath" fi if [ -z "${dontAddPrefix:-}" ] && [ -n "$prefix" ]; then diff --git a/pkgs/development/tools/cloudflare-wrangler/default.nix b/pkgs/development/tools/cloudflare-wrangler/default.nix index 88c52318da4..a13433e784b 100644 --- a/pkgs/development/tools/cloudflare-wrangler/default.nix +++ b/pkgs/development/tools/cloudflare-wrangler/default.nix @@ -1,20 +1,17 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, darwin -}: +{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, darwin }: rustPlatform.buildRustPackage rec { pname = "cloudflare-wrangler"; - version = "1.7.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "wrangler"; - rev = "v" + version; - sha256 = "0vc7f3jki2fdwlgpwhaxzm58g2898wpwbib7dmibb9kxv4jna8gj"; + rev = "v${version}"; + sha256 = "0lh06cnjddmy5h5xvbkg8f97vw2v0wr5fi7vrs3nnidiz7x4rsja"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - cargoSha256 = "1f3gy3agpdg6pck5acxjfrd89hyp9x1byqhfizlizbfmwrqs4il8"; + cargoSha256 = "1q7vilh0bynhdz5bbpig5ibaqvk2153n07gmc715qb80w92sjw7w"; nativeBuildInputs = [ pkg-config ]; @@ -29,8 +26,8 @@ rustPlatform.buildRustPackage rec { doCheck = false; meta = with stdenv.lib; { - description = "A CLI tool designed for folks who are interested in using Cloudflare Workers."; - homepage = https://github.com/cloudflare/wrangler; + description = "A CLI tool designed for folks who are interested in using Cloudflare Workers"; + homepage = "https://github.com/cloudflare/wrangler"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ ]; platforms = platforms.all; diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 3f6a7229b30..0fe4de98f1d 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 47f62573675..b9ebba55477 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/diesel-cli/default.nix b/pkgs/development/tools/diesel-cli/default.nix index d2888dc616a..5c59703af3e 100644 --- a/pkgs/development/tools/diesel-cli/default.nix +++ b/pkgs/development/tools/diesel-cli/default.nix @@ -37,10 +37,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--no-default-features --features \"${features}\"" ]; cargoPatches = [ ./cargo-lock.patch ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0xlcskddhy7xsiwj54gmn1xlgkfxb4dwrys7rbamfz1h8aa6ixjx"; + cargoSha256 = "1vbb7r0dpmq8363i040bkhf279pz51c59kcq9v5qr34hs49ish8g"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ] diff --git a/pkgs/development/tools/documentation/mkdocs/default.nix b/pkgs/development/tools/documentation/mkdocs/default.nix index e9e116280a0..605bb3f18c6 100644 --- a/pkgs/development/tools/documentation/mkdocs/default.nix +++ b/pkgs/development/tools/documentation/mkdocs/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, python, fetchFromGitHub }: +{ stdenv, lib, python3, fetchFromGitHub }: -with python.pkgs; +with python3.pkgs; buildPythonApplication rec { pname = "mkdocs"; diff --git a/pkgs/development/tools/gir/default.nix b/pkgs/development/tools/gir/default.nix index 90acfce1ecb..8cfcbf26dcd 100644 --- a/pkgs/development/tools/gir/default.nix +++ b/pkgs/development/tools/gir/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1kn5kgdma9j6dwpmv6jmydak7ajlgdkw9sfkh3q7h8c2a8yikvxr"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1ybd9h2f13fxmnkzbacd39rcyzjcjd2ra52y8kncg1s0dc0m8rjb"; + cargoSha256 = "048qhlc4f5khxi7dnakgqkhgww44r6h3mlx2fm7y2wqivr3rj8p1"; meta = with stdenv.lib; { description = "Tool to generate rust bindings and user API for glib-based libraries"; diff --git a/pkgs/development/tools/git-ftp/default.nix b/pkgs/development/tools/git-ftp/default.nix index b0a59e632f1..c0001774252 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/git-series/default.nix b/pkgs/development/tools/git-series/default.nix index e94f1f1e14a..4a09e2225be 100644 --- a/pkgs/development/tools/git-series/default.nix +++ b/pkgs/development/tools/git-series/default.nix @@ -15,10 +15,7 @@ buildRustPackage rec { sha256 = "07mgq5h6r1gf3jflbv2khcz32bdazw7z1s8xcsafdarnm13ps014"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "16qjbvppc01yxk8x9jk7gs8jaag5nkfl30j3lyv3dc27vv9mckjv"; + cargoSha256 = "0ijgx8fksg2najb336dhddxlqfzc338f9ylydkpw6b39k72mm00d"; cargoPatches = [ (fetchpatch { diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index e31d27f710b..56b81f494e1 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -10,13 +10,13 @@ let }; in stdenv.mkDerivation rec { pname = "godot"; - version = "3.1.2"; + version = "3.2"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; rev = "${version}-stable"; - sha256 = "12305wj2i4067jc50l8r0wmb7zjcna24fli8vb8kiaild0jrlip6"; + sha256 = "0f15izjl4i2xlz1xj5pcslzl9gm3rmr3c21gh256ynpi2zhhkcdd"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/godot/dont_clobber_environment.patch b/pkgs/development/tools/godot/dont_clobber_environment.patch index 96a8464b566..3782aced1a4 100644 --- a/pkgs/development/tools/godot/dont_clobber_environment.patch +++ b/pkgs/development/tools/godot/dont_clobber_environment.patch @@ -11,7 +11,6 @@ + if (k in os.environ): + env_base["ENV"][k] = os.environ[k] + - env_base.android_maven_repos = [] - env_base.android_flat_dirs = [] - env_base.android_dependencies = [] - + env_base.disabled_modules = [] + env_base.use_ptrcall = False + env_base.module_version_string = "" diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 89d21b5cb5a..36c3bde97af 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.23.7"; + version = "1.23.8"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "1dcayxblim97hlgdx0wdlbj2jxvdqfk8912hz7ylb1007x7y5da5"; + sha256 = "166pwgf86lkd277dq98vjry0ad0avrz12zxb9rfgbhl1z4ccwi1g"; }; modSha256 = "0sckz298bvkf4p4fdmsmza0zrj2s2pvc86qwg6i76vdh9yzvq5gx"; diff --git a/pkgs/development/tools/haskell/vaultenv/default.nix b/pkgs/development/tools/haskell/vaultenv/default.nix index 6c339bf31b5..1d901cb723c 100644 --- a/pkgs/development/tools/haskell/vaultenv/default.nix +++ b/pkgs/development/tools/haskell/vaultenv/default.nix @@ -6,15 +6,20 @@ }: 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 ]; + prePatch = '' + substituteInPlace package.yaml \ + --replace -Werror "" + ''; + isLibrary = false; isExecutable = true; executableHaskellDepends = [ diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index 480456ff21d..477a476dfe7 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 1e2359f1003..1867f33bfa8 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 00000000000..b56afc0a435 --- /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/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix index 1d928292cd5..09684ea9986 100644 --- a/pkgs/development/tools/java/cfr/default.nix +++ b/pkgs/development/tools/java/cfr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cfr"; - version = "0.148"; + version = "0.149"; src = fetchurl { url = "http://www.benf.org/other/cfr/cfr_${version}.jar"; - sha256 = "04nhbzcb0n5xckkbl1rz4xa2bz53hrlm938wrh0gfkzrwwgzj1ql"; + sha256 = "1jksjr1345wj42nfad7k6skvpg5qsm4xgjdwzb90zhn27ddkns6v"; }; nativeBuildInputs = [ makeWrapper ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { Java beta 103 changes), Java 7 String switches etc, but is written entirely in Java 6. ''; - homepage = http://www.benf.org/other/cfr/; + homepage = "http://www.benf.org/other/cfr/"; license = licenses.mit; platforms = platforms.all; }; diff --git a/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix new file mode 100644 index 00000000000..cadaf8238b3 --- /dev/null +++ b/pkgs/development/tools/kubie/default.nix @@ -0,0 +1,26 @@ +{ stdenv, rustPlatform, fetchFromGitHub }: + +with rustPlatform; + +buildRustPackage rec { + pname = "kubie"; + version = "0.7.1"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "sbstp"; + repo = "kubie"; + sha256 = "0c94ggrkzyy8zl2z5r4pgfscyhcjp4x64k3bl2byqp3ysgjwkjqx"; + }; + + cargoSha256 = "1lzyda838s9fmg8hibg2w2wszwyvvqsy20w9877skfcx370rvndi"; + + meta = with stdenv.lib; { + description = + "Shell independent context and namespace switcher for kubectl"; + homepage = "https://github.com/sbstp/kubie"; + license = with licenses; [ zlib ]; + maintainers = with maintainers; [ illiusdope ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index 37c6396e2e3..9a27c7d44e9 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "lazygit"; - version = "0.15.7"; + version = "0.16.2"; goPackagePath = "github.com/jesseduffield/lazygit"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "18scwla36bjpylha4fwis0aa333r14bavzd7xhx4677xgaz7l73j"; + sha256 = "0lvhj4iz74h97lkylqg7hl18xcxcl9msxxvap7jqdj2mf2iwxi32"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index 415479edc84..6ac2d4404eb 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/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index 19e825a32f9..6466f1c4a28 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "1.3.0"; + version = "1.3.2"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-core/releases/download/v${version}/${pname}-${version}.zip"; - sha256 = "1dpg1j0004k6ykj9i2nhkxlyq7vq2c96bwggppq2k7ckma0i4x6z"; + sha256 = "0jwvbymwaz4whw08n9scz6vk57sx7l3qddh4m5dlv2cxishwf7n3"; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/minizinc/ide.nix b/pkgs/development/tools/minizinc/ide.nix index 3b1ac92a96e..921ee3d158c 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 03bd2696cce..de1cf939e6a 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 6261ffc9b01..53356e53a78 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/gdb/darwin-target-match.patch b/pkgs/development/tools/misc/gdb/darwin-target-match.patch index 1328d919503..978a6795056 100644 --- a/pkgs/development/tools/misc/gdb/darwin-target-match.patch +++ b/pkgs/development/tools/misc/gdb/darwin-target-match.patch @@ -1,6 +1,6 @@ --- a/configure 2017-06-05 00:51:26.000000000 +0900 +++ b/configure 2018-03-06 23:12:58.000000000 +0900 -@@ -3603,7 +3603,7 @@ +@@ -3644,7 +3644,7 @@ noconfigdirs="$noconfigdirs ld gprof" noconfigdirs="$noconfigdirs sim target-rda" ;; diff --git a/pkgs/development/tools/misc/gdb/debug-info-from-env.patch b/pkgs/development/tools/misc/gdb/debug-info-from-env.patch index 499b61ba869..de59bd2d17b 100644 --- a/pkgs/development/tools/misc/gdb/debug-info-from-env.patch +++ b/pkgs/development/tools/misc/gdb/debug-info-from-env.patch @@ -1,15 +1,24 @@ -Initialize debug-file-directory from NIX_DEBUG_INFO_DIRS, a colon-separated list -of directories with separate debugging information files. - ---- a/gdb/main.c -+++ b/gdb/main.c -@@ -556,3 +556,8 @@ captured_main_1 (struct captured_main_args *context) +diff -ur a/gdb/main.c b/gdb/main.c +--- a/gdb/main.c 2020-02-08 13:50:14.000000000 +0100 ++++ b/gdb/main.c 2020-02-24 10:02:07.731806739 +0100 +@@ -567,9 +567,17 @@ + gdb_sysroot = xstrdup (TARGET_SYSROOT_PREFIX); + } -- debug_file_directory = relocate_gdb_directory (DEBUGDIR, -+ debug_file_directory = getenv("NIX_DEBUG_INFO_DIRS"); -+ +- debug_file_directory +- = xstrdup (relocate_gdb_directory (DEBUGDIR, +- DEBUGDIR_RELOCATABLE).c_str ()); ++ debug_file_directory = getenv ("NIX_DEBUG_INFO_DIRS"); + if (debug_file_directory != NULL) -+ debug_file_directory = xstrdup(debug_file_directory); ++ // This might be updated later using ++ // $ set debug-file-directory /to/some/path ++ // which will use xfree. We must then have a xmallocated ++ // copy of the string that can be xfeed later. ++ debug_file_directory = xstrdup (debug_file_directory); + else -+ debug_file_directory = relocate_gdb_directory (DEBUGDIR, - DEBUGDIR_RELOCATABLE); ++ debug_file_directory ++ = xstrdup (relocate_gdb_directory (DEBUGDIR, ++ DEBUGDIR_RELOCATABLE).c_str ()); + + gdb_datadir = relocate_gdb_directory (GDB_DATADIR, + GDB_DATADIR_RELOCATABLE); diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index e125b7418f6..baaba624570 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -18,7 +18,7 @@ let basename = "gdb-${version}"; - version = "8.3.1"; + version = "9.1"; in assert pythonSupport -> python3 != null; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/gdb/${basename}.tar.xz"; - sha256 = "1i2pjwaafrlz7wqm40b4znr77ai32rjsxkpl2az38yyarpbv8m8y"; + sha256 = "0dqp1p7w836iwijg1zb4a784n0j4pyjiw5v6h8fg5lpx6b40x7k9"; }; postPatch = if stdenv.isDarwin then '' @@ -65,6 +65,13 @@ stdenv.mkDerivation rec { # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target"; + # GDB have to be built out of tree. + preConfigure = '' + mkdir _build + cd _build + ''; + configureScript = "../configure"; + configureFlags = with stdenv.lib; [ "--enable-targets=all" "--enable-64-bit-bfd" "--disable-install-libbfd" @@ -100,6 +107,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; platforms = with platforms; linux ++ cygwin ++ darwin; - maintainers = with maintainers; [ pierron globin ]; + maintainers = with maintainers; [ pierron globin lsix ]; }; } diff --git a/pkgs/development/tools/misc/inotify-tools/default.nix b/pkgs/development/tools/misc/inotify-tools/default.nix index b04de1832ab..ead13e340d5 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/misc/teensy-loader-cli/default.nix b/pkgs/development/tools/misc/teensy-loader-cli/default.nix index 2975d64113e..e03320f8429 100644 --- a/pkgs/development/tools/misc/teensy-loader-cli/default.nix +++ b/pkgs/development/tools/misc/teensy-loader-cli/default.nix @@ -1,26 +1,31 @@ -{ stdenv, libusb, fetchgit }: -let - version = "2.1"; -in -stdenv.mkDerivation { +{ stdenv, fetchFromGitHub, go-md2man, installShellFiles, libusb }: + +stdenv.mkDerivation rec { pname = "teensy-loader-cli"; - inherit version; - src = fetchgit { - url = "git://github.com/PaulStoffregen/teensy_loader_cli.git"; - rev = "f5b6d7aafda9a8b014b4bb08660833ca45c136d2"; - sha256 = "1a663bv3lvm7bsf2wcaj2c0vpmniak7w5hwix5qgz608bvm2v781"; + version = "2.1.20191110"; + + src = fetchFromGitHub { + owner = "PaulStoffregen"; + repo = "teensy_loader_cli"; + rev = "e98b5065cdb9f04aa4dde3f2e6e6e6f12dd97592"; + sha256 = "1yx8vsh6b29pqr4zb6sx47429i9x51hj9psn8zksfz75j5ivfd5i"; }; buildInputs = [ libusb ]; + nativeBuildInputs = [ go-md2man installShellFiles ]; + installPhase = '' - install -Dm755 teensy_loader_cli $out/bin/teensy-loader-cli + install -Dm555 teensy_loader_cli $out/bin/teensy-loader-cli + install -Dm444 -t $out/share/doc/${pname} *.md *.txt + go-md2man -in README.md -out ${pname}.1 + installManPage *.1 ''; meta = with stdenv.lib; { - license = licenses.gpl3; description = "Firmware uploader for the Teensy microcontroller boards"; - homepage = https://www.pjrc.com/teensy/; + homepage = "https://www.pjrc.com/teensy/"; + license = licenses.gpl3; maintainers = with maintainers; [ the-kenny ]; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix index 45a2a312304..47e71c41568 100644 --- a/pkgs/development/tools/ocaml/dune/2.nix +++ b/pkgs/development/tools/ocaml/dune/2.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "2.3.1"; + version = "2.4.0"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "1jzm29z58l34kpqll9jcz5dkkhh36lncba1yb32ghknkvyfdvcxj"; + sha256 = "096wp6aawgh1ffhbnjfxgakwqd02kfkz2i6m6cc040w1g554iw98"; }; buildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index 801e4142780..90e0a7935de 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -1,23 +1,23 @@ { lib, fetchFromGitHub, buildDunePackage -, ocaml, findlib, cmdliner, dune, cppo, yojson +, ocaml, findlib, cmdliner, dune, cppo, yojson, ocaml-migrate-parsetree }: buildDunePackage rec { pname = "js_of_ocaml-compiler"; - version = "3.4.0"; + version = "3.5.2"; src = fetchFromGitHub { owner = "ocsigen"; repo = "js_of_ocaml"; rev = version; - sha256 = "0c537say0f3197zn8d83nrihabrxyn28xc6d7c9c3l0vvrv6qvfj"; + sha256 = "1fm855iavljx7rf9hii2qb7ky920zv082d9zlcl504by1bxp1yg8"; }; nativeBuildInputs = [ ocaml findlib dune cppo ]; buildInputs = [ cmdliner ]; configurePlatforms = []; - propagatedBuildInputs = [ yojson ]; + propagatedBuildInputs = [ yojson ocaml-migrate-parsetree ]; meta = { description = "Compiler from OCaml bytecode to Javascript"; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix index 2ff9ddbcf9e..47396829f8a 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix @@ -1,5 +1,5 @@ { stdenv, ocaml, findlib, dune, js_of_ocaml-compiler -, js_of_ocaml, ppx_deriving +, js_of_ocaml, ppxlib }: stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { buildInputs = [ ocaml findlib dune ]; - propagatedBuildInputs = [ js_of_ocaml ppx_deriving ]; + propagatedBuildInputs = [ js_of_ocaml ppxlib ]; buildPhase = "dune build -p js_of_ocaml-ppx_deriving_json"; } diff --git a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix index 09ab9587ddb..5144af97f75 100644 --- a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix +++ b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchurl, ocamlPackages }: +{ stdenv, fetchzip, ocamlPackages }: stdenv.mkDerivation rec { pname = "ocsigen-i18n"; - version = "3.4.0"; - - buildInputs = with ocamlPackages; [ ocaml findlib ]; + version = "3.5.0"; + buildInputs = with ocamlPackages; [ ocaml findlib ppx_tools ]; dontStrip = true; @@ -15,9 +14,9 @@ stdenv.mkDerivation rec make bindir=$out/bin install ''; - src = fetchurl { + src = fetchzip { url = "https://github.com/besport/${pname}/archive/${version}.tar.gz"; - sha256 = "0i7cck6zlgwjpksb4s1jpy193h85jixf4d0nmqj09y3zcpn2i8gb"; + sha256 = "1qsgwfl64b53w235wm7nnchqinzgsvd2gb52xm0kra2wlwp69rfq"; }; meta = { diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix index 784895845e5..310ef0be151 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 bfc330276b0..1430f0fc2a3 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/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index 0e69fa3259f..e77b338a20a 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -2,6 +2,7 @@ , fetchgit, fetchFromGitHub, fetchurl , writeShellScript, runCommand, which , rustPlatform, jq, nix-prefetch-git, xe, curl, emscripten +, callPackage }: # TODO: move to carnix or https://github.com/kolloch/crate2nix @@ -26,15 +27,23 @@ let inherit writeShellScript nix-prefetch-git curl jq xe src; }; + fetchGrammar = (v: fetchgit {inherit (v) url rev sha256 fetchSubmodules; }); + grammars = - let fetch = - (v: fetchgit {inherit (v) url rev sha256 fetchSubmodules; }); - in runCommand "grammars" {} ('' + runCommand "grammars" {} ('' mkdir $out '' + (lib.concatStrings (lib.mapAttrsToList - (name: grammar: "ln -s ${fetch grammar} $out/${name}\n") + (name: grammar: "ln -s ${fetchGrammar grammar} $out/${name}\n") (import ./grammars)))); + builtGrammars = let + change = name: grammar: + callPackage ./library.nix { + language = name; inherit version; source = fetchGrammar grammar; + }; + in + # typescript doesn't have parser.c in the same place as others + lib.mapAttrs change (removeAttrs (import ./grammars) ["typescript"]); in rustPlatform.buildRustPackage { pname = "tree-sitter"; @@ -64,6 +73,7 @@ in rustPlatform.buildRustPackage { inherit update-all-grammars; }; inherit grammars; + inherit builtGrammars; }; meta = { diff --git a/pkgs/development/tools/parsing/tree-sitter/library.nix b/pkgs/development/tools/parsing/tree-sitter/library.nix new file mode 100644 index 00000000000..2d5d3e7d0b4 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/library.nix @@ -0,0 +1,30 @@ +{ stdenv +, language +, tree-sitter +, version +, source +}: + +stdenv.mkDerivation { + + pname = "tree-sitter-${language}-library"; + inherit version; + + src = source; + + buildInputs = [ tree-sitter ]; + + dontUnpack = true; + configurePhase= ":"; + buildPhase = '' + runHook preBuild + $CC -I$src/src/ -shared -o parser -Os $src/src/parser.c + runHook postBuild + ''; + installPhase = '' + runHook preInstall + mkdir $out + mv parser $out/ + runHook postInstall + ''; +} diff --git a/pkgs/development/tools/pax-rs/default.nix b/pkgs/development/tools/pax-rs/default.nix index f2fff99d153..aa83a1b8e1b 100644 --- a/pkgs/development/tools/pax-rs/default.nix +++ b/pkgs/development/tools/pax-rs/default.nix @@ -36,8 +36,5 @@ buildRustPackage rec { cp ${cargo-lock} $out/Cargo.lock ''; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "132a9vnlyp78zxiw5xrazadvx0scs7h2vbm5wz612dmh436mwnxg"; + cargoSha256 = "0wx5x7ll21bb6v34csk63kkvxdk3as720hdkaj0izdkpy0xf1knr"; } diff --git a/pkgs/development/tools/purescript/spago/spago.nix b/pkgs/development/tools/purescript/spago/spago.nix index 433639ff330..adf019eef57 100644 --- a/pkgs/development/tools/purescript/spago/spago.nix +++ b/pkgs/development/tools/purescript/spago/spago.nix @@ -44,5 +44,4 @@ mkDerivation { prePatch = "hpack"; homepage = "https://github.com/purescript/spago#readme"; license = stdenv.lib.licenses.bsd3; - broken = true; # Build is broken in lts-15.x. } diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/development/tools/repository-managers/nexus/default.nix index a727eebe054..416dafe2872 100644 --- a/pkgs/development/tools/repository-managers/nexus/default.nix +++ b/pkgs/development/tools/repository-managers/nexus/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { homepage = http://www.sonatype.org/nexus; license = licenses.epl10; platforms = platforms.all; - maintainers = with maintainers; [ aespinosa ironpinguin ma27 zaninime ]; + maintainers = with maintainers; [ aespinosa ironpinguin zaninime ]; }; } diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index c064ebc4e7e..2ca4b8070aa 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/tools/rust/cargo-geiger/default.nix b/pkgs/development/tools/rust/cargo-geiger/default.nix index b6f3bb7af00..7678db0a386 100644 --- a/pkgs/development/tools/rust/cargo-geiger/default.nix +++ b/pkgs/development/tools/rust/cargo-geiger/default.nix @@ -15,10 +15,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0kvmjahyx5dcjhry2hkvcshi0lbgipfj0as74a3h3bllfvdfkkg0"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0aykhhxk416p237safmqh5dhwjgrhvgc6zikkmxi9rq567ypp914"; + cargoSha256 = "0v50fkyf0a77l7whxalwnfqfi8lxy82z2gpd0fa0ib80qjla2n5z"; cargoPatches = [ ./cargo-lock.patch ]; # Multiple tests require internet connectivity, so they are disabled here. diff --git a/pkgs/development/tools/rust/cargo-make/cargo.patch b/pkgs/development/tools/rust/cargo-make/cargo.patch new file mode 100644 index 00000000000..b75a5a29887 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-make/cargo.patch @@ -0,0 +1,1053 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..fe75e29 +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,1047 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "adler32" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "aho-corasick" ++version = "0.7.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "memchr 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ansi_term" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "arrayref" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "arrayvec" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "attohttpc" ++version = "0.11.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl 0.10.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "atty" ++version = "0.2.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "autocfg" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "autocfg" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "base64" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "bitflags" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "blake2b_simd" ++version = "0.5.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "arrayref 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "bytes" ++version = "0.5.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "c2-chacha" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cargo-make" ++version = "0.27.0" ++dependencies = [ ++ "ci_info 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "colored 1.9.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "duckscript 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "duckscriptsdk 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "envmnt 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fern 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "git_info 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "home 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "indexmap 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "run_script 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rust_info 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++ "shell2batch 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cc" ++version = "1.0.50" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "chrono" ++version = "0.4.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ci_info" ++version = "0.9.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "envmnt 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "clap" ++version = "2.33.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "colored" ++version = "1.9.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "constant_time_eq" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "core-foundation" ++version = "0.6.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "core-foundation-sys" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "crc32fast" ++version = "1.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "crossbeam-utils" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "dirs" ++version = "2.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "dirs-sys" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_users 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "duckscript" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "duckscriptsdk" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "attohttpc 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "duckscript 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "home 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "java-properties 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "meval 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "whoami 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "encoding" ++version = "0.2.33" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "encoding-index-simpchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "encoding-index-japanese" ++version = "1.20141219.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "encoding-index-korean" ++version = "1.20141219.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "encoding-index-simpchinese" ++version = "1.20141219.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "encoding-index-singlebyte" ++version = "1.20141219.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "encoding-index-tradchinese" ++version = "1.20141219.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "encoding_index_tests" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "envmnt" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "indexmap 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "fern" ++version = "0.5.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "flate2" ++version = "1.0.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "miniz_oxide 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "fnv" ++version = "1.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "foreign-types" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "foreign-types-shared" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "fs_extra" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "getrandom" ++version = "0.1.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "git_info" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "glob" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "home" ++version = "0.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "http" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "idna" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "indexmap" ++version = "1.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "itoa" ++version = "0.4.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "java-properties" ++version = "1.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "lazy_static" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "libc" ++version = "0.2.66" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "log" ++version = "0.4.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "matches" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "memchr" ++version = "2.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "meval" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "nom 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "miniz_oxide" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "native-tls" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl 0.10.28 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)", ++ "schannel 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", ++ "security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "nom" ++version = "1.2.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "num-integer" ++version = "0.1.42" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num-traits" ++version = "0.2.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "openssl" ++version = "0.10.28" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "openssl-probe" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "openssl-sys" ++version = "0.9.54" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "percent-encoding" ++version = "2.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "pkg-config" ++version = "0.3.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "ppv-lite86" ++version = "0.2.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand" ++version = "0.7.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_hc" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.1.56" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "redox_users" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rust-argon2 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "regex" ++version = "1.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "aho-corasick 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex-syntax 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "remove_dir_all" ++version = "0.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "run_script" ++version = "0.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "users 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rust-argon2" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rust_info" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "same-file" ++version = "1.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "schannel" ++version = "0.1.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "security-framework" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "security-framework-sys" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "semver" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "semver-parser" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "serde" ++version = "1.0.104" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.104" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "shell2batch" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "smallvec" ++version = "1.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "strsim" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "syn" ++version = "1.0.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tempfile" ++version = "3.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ++ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "textwrap" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "thread_local" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "time" ++version = "0.1.42" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "toml" ++version = "0.5.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "unicode-bidi" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "unicode-normalization" ++version = "0.1.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "url" ++version = "2.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "users" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "vcpkg" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "vec_map" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "walkdir" ++version = "2.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "wasi" ++version = "0.9.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "whoami" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi-util" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[metadata] ++"checksum adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" ++"checksum aho-corasick 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)" = "743ad5a418686aad3b87fd14c43badd828cf26e214a00f92a384291cf22e1811" ++"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" ++"checksum arrayref 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" ++"checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" ++"checksum attohttpc 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ac9fd7bdf8ff0a1b9d73b41f95cb189d77528110295c80e3c858bf343db24fa3" ++"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" ++"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" ++"checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" ++"checksum base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" ++"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++"checksum blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" ++"checksum bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1" ++"checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" ++"checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd" ++"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" ++"checksum chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "31850b4a4d6bae316f7a09e691c944c28299298837edc0a03f755618c23cbc01" ++"checksum ci_info 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a9c4ad4399f16ccee06f6a62acad539f42de4a80fa21cbe994df1bbb51bee3b9" ++"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" ++"checksum colored 1.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8815e2ab78f3a59928fc32e141fbeece88320a240e43f47b2fd64ea3a88a5b3d" ++"checksum constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" ++"checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" ++"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" ++"checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" ++"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4" ++"checksum dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" ++"checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b" ++"checksum duckscript 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "747bb4e541a0830b4581bffc001045d3dc259683546fbf35a35f47af831634b5" ++"checksum duckscriptsdk 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "799c03843d05bb809ea1ee653c4f9ba9a5ee766c07490cc684cf6b259b68ba94" ++"checksum encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" ++"checksum encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" ++"checksum encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" ++"checksum encoding-index-simpchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7" ++"checksum encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" ++"checksum encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" ++"checksum encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" ++"checksum envmnt 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db101f16134ca37f91a6e30c32d9df5bbfcbe8d926f0c1f03602baf2fc2f7352" ++"checksum fern 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e69ab0d5aca163e388c3a49d284fed6c3d0810700e77c5ae2756a50ec1a4daaa" ++"checksum flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd6d6f4752952feb71363cffc9ebac9411b75b87c6ab6058c40c8900cf43c0f" ++"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" ++"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" ++"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" ++"checksum fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674" ++"checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" ++"checksum git_info 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "add3a9c3c08c8905a2165ff06891dd1c3bb32d81b2a32d79528abc9793dfb06f" ++"checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" ++"checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772" ++"checksum home 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654" ++"checksum http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b708cc7f06493459026f53b9a61a7a121a5d1ec6238dee58ea4941132b30156b" ++"checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" ++"checksum indexmap 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "076f042c5b7b98f31d205f1249267e12a6518c1481e9dae9764af19b707d2292" ++"checksum itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e" ++"checksum java-properties 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "caf4418ade5bde22a283a7f2fb537ea397ec102718f259f2630714e7a5b389fa" ++"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" ++"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" ++"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" ++"checksum memchr 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53445de381a1f436797497c61d851644d0e8e88e6140f22872ad33a704933978" ++"checksum meval 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f79496a5651c8d57cd033c5add8ca7ee4e3d5f7587a4777484640d9cb60392d9" ++"checksum miniz_oxide 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aa679ff6578b1cddee93d7e82e263b94a575e0bfced07284eb0c037c1d2416a5" ++"checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e" ++"checksum nom 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b8c256fd9471521bcb84c3cdba98921497f1a331cbc15b8030fc63b82050ce" ++"checksum num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba" ++"checksum num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096" ++"checksum openssl 0.10.28 (registry+https://github.com/rust-lang/crates.io-index)" = "973293749822d7dd6370d6da1e523b0d1db19f06c459134c658b2a4261378b52" ++"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" ++"checksum openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)" = "1024c0a59774200a555087a6da3f253a9095a5f344e353b212ac4c8b8e450986" ++"checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" ++"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" ++"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" ++"checksum proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548" ++"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" ++"checksum rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" ++"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" ++"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" ++"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" ++"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" ++"checksum redox_users 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431" ++"checksum regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "322cf97724bea3ee221b78fe25ac9c46114ebb51747ad5babd51a2fc6a8235a8" ++"checksum regex-syntax 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)" = "b28dfe3fe9badec5dbf0a79a9cccad2cfc2ab5484bdb3e44cbd1ae8b3ba2be06" ++"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" ++"checksum run_script 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "80a217951e2afacc57d3129bd52aeddc550559f5a82f57529a31fc5675bd6621" ++"checksum rust-argon2 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017" ++"checksum rust_info 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "be941f2b996df7ffaf093366039c9dc182b3ca2e00f3e81df44e08c3611e773d" ++"checksum same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" ++"checksum schannel 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "507a9e6e8ffe0a4e0ebb9a10293e62fdf7657c06f1b8bb07a8fcf697d2abf295" ++"checksum security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8ef2429d7cefe5fd28bd1d2ed41c944547d4ff84776f5935b456da44593a16df" ++"checksum security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e31493fc37615debb8c5090a7aeb4a9730bc61e77ab10b9af59f1a202284f895" ++"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" ++"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" ++"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449" ++"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64" ++"checksum shell2batch 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "185a52ee351c1001753c9e3b2eb48c525ff7f51803a4f2cef4365b5c3b743f65" ++"checksum smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5c2fb2ec9bcd216a5b0d0ccf31ab17b5ed1d627960edff65bbe95d3ce221cefc" ++"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" ++"checksum syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5" ++"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" ++"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" ++"checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" ++"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" ++"checksum toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" ++"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" ++"checksum unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4" ++"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" ++"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" ++"checksum url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb" ++"checksum users 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c72f4267aea0c3ec6d07eaabea6ead7c5ddacfafc5e22bcf8d186706851fb4cf" ++"checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" ++"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" ++"checksum walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" ++"checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" ++"checksum whoami 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "622a663c45e12b7ae198748afb532d0c53d2daea11037312221e26198ca4e8e9" ++"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" ++"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++"checksum winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4ccfbf554c6ad11084fb7517daca16cfdcaccbdadba4fc336f032a8b12c2ad80" ++"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 35dba114982..53849e4176f 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -24,8 +24,6 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; - legacyCargoFetcher = false; - cargoSha256 = "1x0lb68d47nhggnj7jf90adz7shb0cg305mavgqvxizd2s9789dx"; # Some tests fail because they need network access. diff --git a/pkgs/development/tools/rust/cargo-raze/default.nix b/pkgs/development/tools/rust/cargo-raze/default.nix index 48579e43106..f892263dd69 100644 --- a/pkgs/development/tools/rust/cargo-raze/default.nix +++ b/pkgs/development/tools/rust/cargo-raze/default.nix @@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec { }; sourceRoot = "source/impl"; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "06rl7v0f1lgj9ii07fcnaxmhn28ckr03cpf5b93q8ripm5qh7my9"; + cargoSha256 = "1z20xc508a3slc1ii3hy09swvlyib14zwf9akxc0h24d5m48as1c"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ curl libgit2 openssl ] diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index 8edd69c28be..70c424ee008 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -5,16 +5,16 @@ let inherit (darwin.apple_sdk.frameworks) Security; in rustPlatform.buildRustPackage rec { name = "maturin-${version}"; - version = "0.7.6"; + version = "0.7.9"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - sha256 = "1siqd8k6grlbj9n1a75jq8px1pzvzpr2ph689g53rjngf1k44zqk"; + sha256 = "1l8i1mz97zsc8kayvryv6xznwpby9k9jxy7lsx45acs5yksqchrv"; }; - cargoSha256 = "10x8kr4qxvvmzpr1n41ybsb6rnii2qz5bdhnk0zpfnr2n9215p8s"; + cargoSha256 = "0ly0f64acn1hxnj7vg1m860xpl06rklwqh545c386nnxaj839b0r"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index 8839464e9f6..82b415bc8a3 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0svvdkfqpk2rw0wxyrhkxy553k55lg7jxc0ly4w1195iwv14ad3y"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1qxg9r6wpv811fh2l889jm0ya96gsra00kqpyxh41fb7myvl2a4i"; + cargoSha256 = "0zaqa89z3nf23s2q1jpmfz4lygh4zq9ymql71d748fgjy9psr449"; buildInputs = [ makeWrapper ] ++ stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix index c9b89abb0b0..c49ea2aaf12 100644 --- a/pkgs/development/tools/rust/racerd/default.nix +++ b/pkgs/development/tools/rust/racerd/default.nix @@ -1,10 +1,9 @@ { stdenv, fetchFromGitHub, rustPlatform, makeWrapper , Security }: -with rustPlatform; - -buildRustPackage rec { +rustPlatform.buildRustPackage rec { pname = "racerd"; version = "unstable-2019-09-02"; + src = fetchFromGitHub { owner = "jwilm"; repo = "racerd"; @@ -12,16 +11,13 @@ buildRustPackage rec { sha256 = "13jqdvjk4savcl03mrn2vzgdsd7vxv2racqbyavrxp2cm9h6cjln"; }; + cargoSha256 = "1nwjr7v8hkhsql93wbwk5gqqiq725gj5iwwsbd250my9g5kkfdbw"; + # a nightly compiler is required unless we use this cheat code. RUSTC_BOOTSTRAP=1; doCheck = false; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "07130587drrdkrk7aqb8pl8i3p485qr6xh1m86630ydlnb9z6s6i"; - nativeBuildInputs = [ makeWrapper ]; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; @@ -35,7 +31,7 @@ buildRustPackage rec { meta = with stdenv.lib; { description = "JSON/HTTP Server based on racer for adding Rust support to editors and IDEs"; - homepage = https://github.com/jwilm/racerd; + homepage = "https://github.com/jwilm/racerd"; license = licenses.asl20; platforms = platforms.all; }; diff --git a/pkgs/development/tools/rust/rainicorn/default.nix b/pkgs/development/tools/rust/rainicorn/default.nix deleted file mode 100644 index 94ee2a773f2..00000000000 --- a/pkgs/development/tools/rust/rainicorn/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: - -with rustPlatform; - -buildRustPackage rec { - pname = "rainicorn"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "RustDT"; - repo = "Rainicorn"; - rev = "0f8594079a7f302f4940cc4320f5e4f39f95cdc4"; - sha256 = "07vh4g120sx569wkzclq91blkkd7q7z582pl8vz0li1l9ij8md01"; - }; - - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "07zsj12g4ff0cdb9pwz302vxvajr8g6nl3bpz4vdyi84csfvmahz"; - - meta = with stdenv.lib; { - broken = true; - description = "Rust IDEs. parse-analysis"; - homepage = https://github.com/RustDT/Rainicorn; - license = with licenses; [ mit asl20 ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix index fa457477b58..ecc7537267a 100644 --- a/pkgs/development/tools/rust/svd2rust/default.nix +++ b/pkgs/development/tools/rust/svd2rust/default.nix @@ -14,10 +14,7 @@ buildRustPackage rec { }; cargoPatches = [ ./cargo-lock.patch ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "03rfb8swxbcc9qm4mhxz5nm4b1gw7g7389wrdc91abxl4mw733ac"; + cargoSha256 = "0n0xc8b982ra007l6gygssf1n60gfc2rphwyi7n95dbys1chciyg"; # doc tests fail due to missing dependency doCheck = false; diff --git a/pkgs/development/tools/scaff/default.nix b/pkgs/development/tools/scaff/default.nix index f81ca70c6a9..97f94e2d61b 100644 --- a/pkgs/development/tools/scaff/default.nix +++ b/pkgs/development/tools/scaff/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "scaff"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitLab { owner = "jD91mZM2"; repo = pname; rev = version; - sha256 = "1s5v50205l2h33pccyafrjv3a6lpb62inhm8z81hkvx53bqifvd7"; + sha256 = "01yf2clf156qv2a6w866a2p8rc2dl8innxnsqrj244x54s1pk27r"; }; - cargoSha256 = "0k6msvly3yhzl1hhs4zv31qzbllwmw16i55dbznlgp1c8icy2pwr"; + cargoSha256 = "1v6580mj70d7cqbjw32slz65lg6c8ficq5mdkfbivs63hqkv4hgx"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ]; diff --git a/pkgs/development/tools/shellcheck/default.nix b/pkgs/development/tools/shellcheck/default.nix new file mode 100644 index 00000000000..ca3e801e3ed --- /dev/null +++ b/pkgs/development/tools/shellcheck/default.nix @@ -0,0 +1,47 @@ +{ stdenv, lib, haskellPackages, haskell }: + +# this wraps around the haskell package +# and puts the documentation into place + +let + # TODO: move to lib/ in separate PR + overrideMeta = drv: overrideFn: + let + drv' = if drv ? meta then drv else drv // { meta = {}; }; + pos = (builtins.unsafeGetAttrPos "pname" drv'); + meta' = drv'.meta // { + # copied from the mkDerivation code + position = pos.file + ":" + toString pos.line; + }; + in drv' // { meta = meta' // overrideFn meta'; }; + + bin = haskell.lib.justStaticExecutables haskellPackages.ShellCheck; + src = haskellPackages.ShellCheck.src; + + shellcheck = stdenv.mkDerivation { + pname = "shellcheck"; + version = bin.version; + + inherit src; + + outputs = [ "bin" "man" "doc" "out" ]; + + phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + + installPhase = '' + install -Dm755 ${bin}/bin/shellcheck $bin/bin/shellcheck + install -Dm644 README.md $doc/share/shellcheck/README.md + install -Dm644 shellcheck.1 $man/share/man/man1/shellcheck.1 + mkdir $out + ''; + + # just some file copying + preferLocalBuild = true; + allowSubstitutes = false; + }; + +in + overrideMeta shellcheck (old: { + maintainers = with lib.maintainers; [ Profpatsch ]; + outputsToInstall = [ "bin" "man" "doc" ]; + }) diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 957f691d225..c065629018c 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -33,8 +33,8 @@ buildGoPackage { buildFlagsArray = '' -ldflags= - -X github.com/containers/skopeo/vendor/github.com/containers/image/signature.systemDefaultPolicyPath=${defaultPolicyFile} - -X github.com/containers/skopeo/vendor/github.com/containers/image/internal/tmpdir.unixTempDirForBigFiles=/tmp + -X github.com/containers/skopeo/vendor/github.com/containers/image/v5/signature.systemDefaultPolicyPath=${defaultPolicyFile} + -X github.com/containers/skopeo/vendor/github.com/containers/image/v5/internal/tmpdir.unixTempDirForBigFiles=/tmp ''; preBuild = '' diff --git a/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch b/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch index cd06dc30fbe..e30e9c3d7e5 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch +++ b/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch @@ -1,1215 +1,1360 @@ -From db555b49901f6f9175abaa8e4a6c4ea0253c0acb Mon Sep 17 00:00:00 2001 +From 792dcf4aef3144222e3fab9498bda620879664ab Mon Sep 17 00:00:00 2001 From: Maximilian Bosch -Date: Tue, 7 Jan 2020 21:24:10 +0100 +Date: Sat, 7 Mar 2020 22:56:36 +0100 Subject: [PATCH] Add cargo.lock --- - Cargo.lock | 2365 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 2365 insertions(+) + Cargo.lock | 2432 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 2432 insertions(+) create mode 100644 Cargo.lock diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 -index 00000000..852644b8 +index 00000000..2cd91628 --- /dev/null +++ b/Cargo.lock -@@ -0,0 +1,2365 @@ +@@ -0,0 +1,2432 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "add" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.58", ++ "wasm-bindgen", +] + +[[package]] +name = "adler32" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" + +[[package]] +name = "aho-corasick" -+version = "0.7.6" ++version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d5e63fd144e18ba274ae7095c0197a870a7b9468abc801dd62f190d80817d2ec" +dependencies = [ -+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr", ++] ++ ++[[package]] ++name = "ansi_term" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" ++dependencies = [ ++ "winapi", +] + +[[package]] +name = "anyhow" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7825f6833612eb2414095684fcf6c635becf3ce97fe48cf6421321e93bfbd53c" + +[[package]] +name = "arrayref" -+version = "0.3.5" ++version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" + +[[package]] +name = "arrayvec" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" + +[[package]] +name = "ascii" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "97be891acc47ca214468e09425d02cef3af2c94d0d82081cd02061f996802f14" + +[[package]] +name = "askama" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "eed81479263c8753e06f4981f5a313b3fe6cbff30c3ff8d9ae15ef0c72d93fb5" +dependencies = [ -+ "askama_derive 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "askama_shared 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "askama_derive", ++ "askama_shared", +] + +[[package]] +name = "askama_derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "46580c08e5520afadc6e9064759e15fc743489a4db78f9c751113e3d32a1e083" +dependencies = [ -+ "askama_shared 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", ++ "askama_shared", ++ "nom 4.2.3", ++ "proc-macro2 0.4.30", ++ "quote 0.6.13", ++ "syn 0.15.44", +] + +[[package]] +name = "askama_shared" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "64509fd5c2fa767fa7ea973b732c61f0b8d30d1adf084e5164523e51a5e35d71" +dependencies = [ -+ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+ "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.11", ++ "serde", ++ "serde_derive", ++ "toml 0.4.10", +] + +[[package]] +name = "assert_cmd" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2dc477793bd82ec39799b6f6b3df64938532fdf2ab0d49ef817eac65856a5a1e" +dependencies = [ -+ "escargot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "predicates 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "predicates-tree 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "escargot", ++ "predicates", ++ "predicates-core", ++ "predicates-tree", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ -+ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hermit-abi", ++ "libc", ++ "winapi", +] + +[[package]] +name = "autocfg" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" + +[[package]] -+name = "backtrace" -+version = "0.3.40" ++name = "autocfg" ++version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "backtrace-sys" -+version = "0.1.32" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+] ++checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" + +[[package]] +name = "base64" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" +dependencies = [ -+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder", ++ "safemem", +] + +[[package]] +name = "base64" -+version = "0.10.1" ++version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+] ++checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" + +[[package]] +name = "bitflags" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d" + +[[package]] +name = "bitflags" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" + +[[package]] +name = "blake2b_simd" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" +dependencies = [ -+ "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "arrayref", ++ "arrayvec", ++ "constant_time_eq", +] + +[[package]] +name = "buf_redux" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b953a6887648bb07a535631f2bc00fbdb2a2216f135552cb3f534ed136b9c07f" +dependencies = [ -+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr", ++ "safemem", +] + +[[package]] +name = "bumpalo" -+version = "3.1.2" ++version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1f359dc14ff8911330a51ef78022d376f25ed00248912803b58f00cb1c27f742" + +[[package]] +name = "byteorder" -+version = "1.3.2" ++version = "1.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" + +[[package]] +name = "c2-chacha" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" +dependencies = [ -+ "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ppv-lite86", +] + +[[package]] +name = "canvas" +version = "0.1.0" +dependencies = [ -+ "js-sys 0.3.35", -+ "wasm-bindgen 0.2.58", -+ "web-sys 0.3.35", ++ "js-sys", ++ "wasm-bindgen", ++ "web-sys", +] + +[[package]] +name = "cc" -+version = "1.0.49" ++version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd" + +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + +[[package]] +name = "char" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.58", ++ "wasm-bindgen", +] + +[[package]] +name = "chrono" -+version = "0.4.10" ++version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "80094f509cf8b5ae86a4966a39b3ff66cd7e2a3e594accec3743ff3fabeab5b2" +dependencies = [ -+ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-integer", ++ "num-traits 0.2.11", ++ "time", +] + +[[package]] +name = "chunked_transfer" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "498d20a7aaf62625b9bf26e637cf7736417cde1d0c99f1d04d1170229a85cf87" ++ ++[[package]] ++name = "clap" ++version = "2.33.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" ++dependencies = [ ++ "ansi_term", ++ "atty", ++ "bitflags 1.2.1", ++ "strsim 0.8.0", ++ "textwrap", ++ "unicode-width", ++ "vec_map", ++] + +[[package]] +name = "closures" +version = "0.1.0" +dependencies = [ -+ "js-sys 0.3.35", -+ "wasm-bindgen 0.2.58", -+ "web-sys 0.3.35", ++ "js-sys", ++ "wasm-bindgen", ++ "web-sys", +] + +[[package]] +name = "cloudabi" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" +dependencies = [ -+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.2.1", +] + +[[package]] +name = "color_quant" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0dbbb57365263e881e805dc77d94697c9118fd94d8da011240555aa7b23445bd" + +[[package]] +name = "console_error_panic_hook" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211" +dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen 0.2.58", ++ "cfg-if", ++ "wasm-bindgen", +] + +[[package]] +name = "console_log" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.58", -+ "web-sys 0.3.35", ++ "wasm-bindgen", ++ "web-sys", +] + +[[package]] +name = "constant_time_eq" -+version = "0.1.4" ++version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" + +[[package]] +name = "crossbeam-deque" -+version = "0.7.2" ++version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" +dependencies = [ -+ "crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-epoch", ++ "crossbeam-utils", ++ "maybe-uninit", +] + +[[package]] +name = "crossbeam-epoch" -+version = "0.8.0" ++version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" +dependencies = [ -+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 1.0.0", ++ "cfg-if", ++ "crossbeam-utils", ++ "lazy_static", ++ "maybe-uninit", ++ "memoffset", ++ "scopeguard", +] + +[[package]] +name = "crossbeam-queue" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c695eeca1e7173472a32221542ae469b3e9aac3a4fc81f7696bcad82029493db" +dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" -+version = "0.6.6" ++version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" +dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "crossbeam-utils" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 1.0.0", ++ "cfg-if", ++ "lazy_static", +] + +[[package]] +name = "curl" -+version = "0.4.25" ++version = "0.4.26" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ecb534fed9060d04bccaa8b8e1e2d3d5a0d7a9ec6d9c667691c80a3c6b7d19ef" +dependencies = [ -+ "curl-sys 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "curl-sys", ++ "libc", ++ "openssl-probe", ++ "openssl-sys", ++ "schannel", ++ "socket2", ++ "winapi", +] + +[[package]] +name = "curl-sys" -+version = "0.4.24" ++version = "0.4.28+curl-7.69.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2c6b7fa5d36aa192e410788b77af65f339af24c8786419e8b48173689a484bf" +dependencies = [ -+ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", -+ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc", ++ "libc", ++ "libz-sys", ++ "openssl-sys", ++ "pkg-config", ++ "vcpkg", ++ "winapi", +] + +[[package]] +name = "deflate" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4" +dependencies = [ -+ "adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "adler32", ++ "byteorder", +] + +[[package]] +name = "diff" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499" + +[[package]] +name = "difference" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" + +[[package]] +name = "dirs" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" +dependencies = [ -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "redox_users", ++ "winapi", +] + +[[package]] +name = "docopt" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7f525a586d310c87df72ebcd98009e57f1cc030c8c268305287a476beb653969" +dependencies = [ -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+ "strsim 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static", ++ "regex", ++ "serde", ++ "strsim 0.9.3", +] + +[[package]] +name = "dom" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.58", -+ "web-sys 0.3.35", ++ "wasm-bindgen", ++ "web-sys", +] + +[[package]] +name = "either" +version = "1.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" + +[[package]] +name = "enum_primitive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "be4551092f4d519593039259a9ed8daedf0da12e5109c5280338073eaeb81180" +dependencies = [ -+ "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.1.43", +] + +[[package]] +name = "env_logger" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +dependencies = [ -+ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "atty", ++ "humantime", ++ "log 0.4.8", ++ "regex", ++ "termcolor", +] + +[[package]] +name = "escargot" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ceb9adbf9874d5d028b5e4c5739d22b71988252b25c9c98fe7cf9738bee84597" +dependencies = [ -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "failure" -+version = "0.1.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)", -+ "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "failure_derive" -+version = "0.1.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static", ++ "log 0.4.8", ++ "serde", ++ "serde_json", +] + +[[package]] +name = "fetch" +version = "0.1.0" +dependencies = [ -+ "js-sys 0.3.35", -+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen 0.2.58", -+ "wasm-bindgen-futures 0.4.8", -+ "web-sys 0.3.35", ++ "js-sys", ++ "serde", ++ "serde_derive", ++ "wasm-bindgen", ++ "wasm-bindgen-futures", ++ "web-sys", +] + +[[package]] +name = "filetime" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1ff6d4dab0aa0c8e6346d46052e93b13a16cf847b54ed357087c35011048cc7d" +dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "libc", ++ "redox_syscall", ++ "winapi", +] + +[[package]] +name = "float-cmp" -+version = "0.5.3" ++version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "da62c4f1b81918835a8c6a484a397775fff5953fe83529afd51b05f5c6a6617d" +dependencies = [ -+ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.11", +] + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ -+ "foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "fuchsia-cprng" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" + +[[package]] +name = "futures-channel-preview" +version = "0.3.0-alpha.19" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d5e5f4df964fa9c1c2f8bddeb5c3611631cacd93baf810fc8bb2fb4b495c263a" +dependencies = [ -+ "futures-core-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", ++ "futures-core-preview", +] + +[[package]] +name = "futures-core-preview" +version = "0.3.0-alpha.19" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b35b6263fb1ef523c3056565fa67b1d16f0a8604ff12b11b08c25f28a734c60a" + +[[package]] +name = "getrandom" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" +dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "libc", ++ "wasi", +] + +[[package]] +name = "gif" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2e41945ba23db3bf51b24756d73d81acb4f28d85c3dccc32c6fae904438c25f" +dependencies = [ -+ "color_quant 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lzw 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "color_quant", ++ "lzw", +] + +[[package]] +name = "glob" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" + +[[package]] +name = "guide-supported-types-examples" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.58", ++ "wasm-bindgen", +] + +[[package]] +name = "heck" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" +dependencies = [ -+ "unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-segmentation", +] + +[[package]] +name = "hello_world" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.58", ++ "wasm-bindgen", +] + +[[package]] +name = "hermit-abi" -+version = "0.1.6" ++version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1010591b26bbfe835e9faeabeb11866061cc7dcebffd56ad7d0942d0e61aefd8" +dependencies = [ -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", +] + +[[package]] +name = "httparse" +version = "1.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" + +[[package]] +name = "humantime" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" +dependencies = [ -+ "quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quick-error", +] + +[[package]] +name = "id-arena" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" +dependencies = [ -+ "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rayon", +] + +[[package]] +name = "idna" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" +dependencies = [ -+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-normalization 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "matches", ++ "unicode-bidi", ++ "unicode-normalization", +] + +[[package]] +name = "image" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d95816db758249fe16f23a4e23f1a3a817fe11892dbfd1c5836f625324702158" +dependencies = [ -+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "enum_primitive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "gif 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "jpeg-decoder 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-rational 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", -+ "png 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder", ++ "enum_primitive", ++ "gif", ++ "jpeg-decoder", ++ "num-iter", ++ "num-rational", ++ "num-traits 0.1.43", ++ "png", ++ "scoped_threadpool", +] + +[[package]] +name = "import_js" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.58", ++ "wasm-bindgen", +] + +[[package]] +name = "inflate" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e7e0062d2dc2f17d2f13750d95316ae8a2ff909af0fda957084f5defd87c43bb" + +[[package]] +name = "itoa" -+version = "0.4.4" ++version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e" + +[[package]] +name = "jpeg-decoder" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0256f0aec7352539102a9efbcb75543227b7ab1117e0f95450023af730128451" +dependencies = [ -+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder", ++ "rayon", +] + +[[package]] +name = "js-sys" -+version = "0.3.35" ++version = "0.3.36" +dependencies = [ -+ "wasm-bindgen 0.2.58", -+ "wasm-bindgen-futures 0.4.8", -+ "wasm-bindgen-test 0.3.8", ++ "wasm-bindgen", ++ "wasm-bindgen-futures", ++ "wasm-bindgen-test", +] + +[[package]] +name = "julia_set" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.58", -+ "web-sys 0.3.35", ++ "wasm-bindgen", ++ "web-sys", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "leb128" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a" + +[[package]] +name = "libc" -+version = "0.2.66" ++version = "0.2.67" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "eb147597cdf94ed43ab7a9038716637d2d1bf2bc571da995d0028dec06bd3018" + +[[package]] +name = "libz-sys" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe" +dependencies = [ -+ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", -+ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc", ++ "libc", ++ "pkg-config", ++ "vcpkg", +] + +[[package]] +name = "log" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" +dependencies = [ -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8", +] + +[[package]] +name = "log" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" +dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", +] + +[[package]] +name = "lzw" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7d947cbb889ed21c2a84be6ffbaebf5b4e0f4340638cba0444907e38b56be084" + +[[package]] +name = "matches" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" ++ ++[[package]] ++name = "maybe-uninit" ++version = "2.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" + +[[package]] +name = "memchr" -+version = "2.2.1" ++version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" + +[[package]] +name = "memoffset" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9" +dependencies = [ -+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc_version", +] + +[[package]] +name = "mime" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0" +dependencies = [ -+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.3.9", +] + +[[package]] +name = "mime_guess" -+version = "1.8.7" ++version = "1.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "216929a5ee4dd316b1702eedf5e74548c123d370f47841ceaac38ca154690ca3" +dependencies = [ -+ "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", -+ "phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mime", ++ "phf", ++ "phf_codegen", ++ "unicase", +] + +[[package]] +name = "multipart" +version = "0.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "adba94490a79baf2d6a23eac897157047008272fa3eecb3373ae6377b91eca28" +dependencies = [ -+ "buf_redux 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "twoway 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "buf_redux", ++ "httparse", ++ "log 0.4.8", ++ "mime", ++ "mime_guess", ++ "quick-error", ++ "rand 0.4.6", ++ "safemem", ++ "tempdir", ++ "twoway", +] + +[[package]] +name = "no-std" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.58", ++ "wasm-bindgen", +] + +[[package]] +name = "nom" +version = "4.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" +dependencies = [ -+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr", ++ "version_check 0.1.5", ++] ++ ++[[package]] ++name = "nom" ++version = "5.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0b471253da97532da4b61552249c521e01e736071f71c1a4f7ebbfbf0a06aad6" ++dependencies = [ ++ "memchr", ++ "version_check 0.9.1", +] + +[[package]] +name = "normalize-line-endings" -+version = "0.2.2" ++version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" + +[[package]] +name = "num-integer" -+version = "0.1.41" ++version = "0.1.42" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba" +dependencies = [ -+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 1.0.0", ++ "num-traits 0.2.11", +] + +[[package]] +name = "num-iter" -+version = "0.1.39" ++version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dfb0800a0291891dd9f4fe7bd9c19384f98f7fbe0cd0f39a2c6b88b9868bbc00" +dependencies = [ -+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 1.0.0", ++ "num-integer", ++ "num-traits 0.2.11", +] + +[[package]] +name = "num-rational" +version = "0.1.42" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e" +dependencies = [ -+ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-integer", ++ "num-traits 0.2.11", +] + +[[package]] +name = "num-traits" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" +dependencies = [ -+ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.11", +] + +[[package]] +name = "num-traits" -+version = "0.2.10" ++version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096" +dependencies = [ -+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 1.0.0", +] + +[[package]] +name = "num_cpus" -+version = "1.11.1" ++version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "46203554f085ff89c235cd12f7075f3233af9b11ed7c9e16dfe2560d03313ce6" +dependencies = [ -+ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hermit-abi", ++ "libc", +] + +[[package]] +name = "openssl" -+version = "0.10.26" ++version = "0.10.28" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "973293749822d7dd6370d6da1e523b0d1db19f06c459134c658b2a4261378b52" +dependencies = [ -+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.2.1", ++ "cfg-if", ++ "foreign-types", ++ "lazy_static", ++ "libc", ++ "openssl-sys", +] + +[[package]] +name = "openssl-probe" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" + +[[package]] +name = "openssl-src" +version = "111.6.1+1.1.1d" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c91b04cb43c1a8a90e934e0cd612e2a5715d976d2d6cff4490278a0cddf35005" +dependencies = [ -+ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc", +] + +[[package]] +name = "openssl-sys" -+version = "0.9.53" ++version = "0.9.54" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1024c0a59774200a555087a6da3f253a9095a5f344e353b212ac4c8b8e450986" +dependencies = [ -+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl-src 111.6.1+1.1.1d (registry+https://github.com/rust-lang/crates.io-index)", -+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", -+ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 1.0.0", ++ "cc", ++ "libc", ++ "openssl-src", ++ "pkg-config", ++ "vcpkg", +] + +[[package]] +name = "percent-encoding" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" + +[[package]] +name = "performance" +version = "0.1.0" +dependencies = [ -+ "humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen 0.2.58", -+ "web-sys 0.3.35", ++ "humantime", ++ "wasm-bindgen", ++ "web-sys", +] + +[[package]] +name = "phf" +version = "0.7.24" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" +dependencies = [ -+ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "phf_shared", +] + +[[package]] +name = "phf_codegen" +version = "0.7.24" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" +dependencies = [ -+ "phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", -+ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "phf_generator", ++ "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.7.24" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" +dependencies = [ -+ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "phf_shared", ++ "rand 0.6.5", +] + +[[package]] +name = "phf_shared" +version = "0.7.24" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" +dependencies = [ -+ "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "siphasher", ++ "unicase", +] + +[[package]] +name = "pkg-config" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" + +[[package]] +name = "png" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3cb773e9a557edb568ce9935cf783e3cdcabe06a9449d41b3e5506d88e582c82" +dependencies = [ -+ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "deflate 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)", -+ "inflate 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 0.7.0", ++ "deflate", ++ "inflate", ++ "num-iter", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" + +[[package]] +name = "predicates" -+version = "1.0.2" ++version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "347a1b6f0b21e636bc9872fb60b83b8e185f6f5516298b8238699f7f9a531030" +dependencies = [ -+ "difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "float-cmp 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "normalize-line-endings 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "difference", ++ "float-cmp", ++ "normalize-line-endings", ++ "predicates-core", ++ "regex", +] + +[[package]] +name = "predicates-core" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "06075c3a3e92559ff8929e7a280684489ea27fe44805174c3ebd9328dcb37178" + +[[package]] +name = "predicates-tree" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8e63c4859013b38a76eca2414c64911fba30def9e3202ac461a2d22831220124" +dependencies = [ -+ "predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "treeline 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "predicates-core", ++ "treeline", ++] ++ ++[[package]] ++name = "proc-macro-error" ++version = "0.4.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e7959c6467d962050d639361f7703b2051c43036d03493c36f01d440fdd3138a" ++dependencies = [ ++ "proc-macro-error-attr", ++ "proc-macro2 1.0.9", ++ "quote 1.0.3", ++ "syn 1.0.16", ++ "version_check 0.9.1", ++] ++ ++[[package]] ++name = "proc-macro-error-attr" ++version = "0.4.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e4002d9f55991d5e019fb940a90e1a95eb80c24e77cb2462dd4dc869604d543a" ++dependencies = [ ++ "proc-macro2 1.0.9", ++ "quote 1.0.3", ++ "syn 1.0.16", ++ "syn-mid", ++ "version_check 0.9.1", +] + +[[package]] +name = "proc-macro2" +version = "0.4.30" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" +dependencies = [ -+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.1.0", +] + +[[package]] +name = "proc-macro2" -+version = "1.0.7" ++version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6c09721c6781493a2a492a96b5a5bf19b65917fe6728884e7c44dd0c60ca3435" +dependencies = [ -+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.2.0", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quote" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" +dependencies = [ -+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30", +] + +[[package]] +name = "quote" -+version = "1.0.2" ++version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f" +dependencies = [ -+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.9", +] + +[[package]] +name = "rand" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" +dependencies = [ -+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fuchsia-cprng", ++ "libc", ++ "rand_core 0.3.1", ++ "rdrand", ++ "winapi", +] + +[[package]] +name = "rand" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9" +dependencies = [ -+ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cloudabi", ++ "fuchsia-cprng", ++ "libc", ++ "rand_core 0.3.1", ++ "winapi", +] + +[[package]] +name = "rand" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" +dependencies = [ -+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.7", ++ "libc", ++ "rand_chacha 0.1.1", ++ "rand_core 0.4.2", ++ "rand_hc 0.1.0", ++ "rand_isaac", ++ "rand_jitter", ++ "rand_os", ++ "rand_pcg", ++ "rand_xorshift", ++ "winapi", +] + +[[package]] +name = "rand" -+version = "0.7.2" ++version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ -+ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "getrandom", ++ "libc", ++ "rand_chacha 0.2.1", ++ "rand_core 0.5.1", ++ "rand_hc 0.2.0", +] + +[[package]] +name = "rand_chacha" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" +dependencies = [ -+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.7", ++ "rand_core 0.3.1", +] + +[[package]] +name = "rand_chacha" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" +dependencies = [ -+ "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "c2-chacha", ++ "rand_core 0.5.1", +] + +[[package]] +name = "rand_core" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" +dependencies = [ -+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2", +] + +[[package]] +name = "rand_core" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ -+ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", ++ "getrandom", +] + +[[package]] +name = "rand_hc" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" +dependencies = [ -+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ -+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.5.1", +] + +[[package]] +name = "rand_isaac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" +dependencies = [ -+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1", +] + +[[package]] +name = "rand_jitter" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" +dependencies = [ -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "rand_core 0.4.2", ++ "winapi", +] + +[[package]] +name = "rand_os" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" +dependencies = [ -+ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cloudabi", ++ "fuchsia-cprng", ++ "libc", ++ "rand_core 0.4.2", ++ "rdrand", ++ "winapi", +] + +[[package]] +name = "rand_pcg" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" +dependencies = [ -+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.7", ++ "rand_core 0.4.2", +] + +[[package]] +name = "rand_xorshift" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" +dependencies = [ -+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1", +] + +[[package]] +name = "rayon" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098" +dependencies = [ -+ "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-deque", ++ "either", ++ "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9" +dependencies = [ -+ "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-queue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-deque", ++ "crossbeam-queue", ++ "crossbeam-utils", ++ "lazy_static", ++ "num_cpus", +] + +[[package]] +name = "raytrace-parallel" +version = "0.1.0" +dependencies = [ -+ "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "futures-channel-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -+ "js-sys 0.3.35", -+ "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "raytracer 0.1.0 (git+https://github.com/alexcrichton/raytracer?branch=update-deps)", -+ "wasm-bindgen 0.2.58", -+ "wasm-bindgen-futures 0.4.8", -+ "web-sys 0.3.35", ++ "console_error_panic_hook", ++ "futures-channel-preview", ++ "js-sys", ++ "rayon", ++ "rayon-core", ++ "raytracer", ++ "wasm-bindgen", ++ "wasm-bindgen-futures", ++ "web-sys", +] + +[[package]] @@ -1217,1168 +1362,1090 @@ index 00000000..852644b8 +version = "0.1.0" +source = "git+https://github.com/alexcrichton/raytracer?branch=update-deps#42faa13859f7d8d47fd18be785c108003a207786" +dependencies = [ -+ "image 0.12.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++ "image", ++ "serde", ++ "serde_derive", +] + +[[package]] +name = "rdrand" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" +dependencies = [ -+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1", +] + +[[package]] +name = "redox_syscall" +version = "0.1.56" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" + +[[package]] +name = "redox_users" -+version = "0.3.1" ++version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431" +dependencies = [ -+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "getrandom", ++ "redox_syscall", ++ "rust-argon2", +] + +[[package]] +name = "regex" -+version = "1.3.1" ++version = "1.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "322cf97724bea3ee221b78fe25ac9c46114ebb51747ad5babd51a2fc6a8235a8" +dependencies = [ -+ "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "aho-corasick", ++ "memchr", ++ "regex-syntax", ++ "thread_local", +] + +[[package]] +name = "regex-syntax" -+version = "0.6.12" ++version = "0.6.16" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1132f845907680735a84409c3bebc64d1364a5683ffbce899550cd09d5eaefc1" + +[[package]] +name = "remove_dir_all" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" +dependencies = [ -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi", +] + +[[package]] +name = "request-animation-frame" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.58", -+ "web-sys 0.3.35", ++ "wasm-bindgen", ++ "web-sys", +] + +[[package]] +name = "rouille" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "112568052ec17fa26c6c11c40acbb30d3ad244bf3d6da0be181f5e7e42e5004f" +dependencies = [ -+ "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "filetime 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "multipart 0.15.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", -+ "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", -+ "tiny_http 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "base64 0.9.3", ++ "chrono", ++ "filetime", ++ "multipart", ++ "num_cpus", ++ "rand 0.5.6", ++ "serde", ++ "serde_derive", ++ "serde_json", ++ "sha1", ++ "term", ++ "threadpool", ++ "time", ++ "tiny_http", ++ "url", +] + +[[package]] +name = "rust-argon2" -+version = "0.5.1" ++version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017" +dependencies = [ -+ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "base64 0.11.0", ++ "blake2b_simd", ++ "constant_time_eq", ++ "crossbeam-utils", +] + +[[package]] +name = "rust-duck-typed-interfaces" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.58", ++ "wasm-bindgen", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" + +[[package]] +name = "rustc_version" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ -+ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "semver", +] + +[[package]] +name = "ryu" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8" + +[[package]] +name = "safemem" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" + +[[package]] +name = "sample" +version = "0.1.0" +dependencies = [ -+ "js-sys 0.3.35", -+ "wasm-bindgen 0.2.58", -+ "wasm-bindgen-futures 0.4.8", -+ "wasm-bindgen-test 0.3.8", ++ "js-sys", ++ "wasm-bindgen", ++ "wasm-bindgen-futures", ++ "wasm-bindgen-test", +] + +[[package]] +name = "schannel" -+version = "0.1.16" ++version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "507a9e6e8ffe0a4e0ebb9a10293e62fdf7657c06f1b8bb07a8fcf697d2abf295" +dependencies = [ -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static", ++ "winapi", +] + +[[package]] +name = "scoped-tls" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" + +[[package]] +name = "scoped_threadpool" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" + +[[package]] +name = "scopeguard" -+version = "1.0.0" ++version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ -+ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "semver-parser", +] + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + +[[package]] +name = "serde" +version = "1.0.104" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449" +dependencies = [ -+ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.104" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64" +dependencies = [ -+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.9", ++ "quote 1.0.3", ++ "syn 1.0.16", +] + +[[package]] +name = "serde_json" -+version = "1.0.44" ++version = "1.0.48" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9371ade75d4c2d6cb154141b9752cf3781ec9c05e0e5cf35060e1e70ee7b9c25" +dependencies = [ -+ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++ "itoa", ++ "ryu", ++ "serde", +] + +[[package]] +name = "sha1" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" + +[[package]] +name = "siphasher" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" + +[[package]] +name = "smallvec" -+version = "1.1.0" ++version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c2fb2ec9bcd216a5b0d0ccf31ab17b5ed1d627960edff65bbe95d3ce221cefc" + +[[package]] +name = "socket2" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85" +dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "libc", ++ "redox_syscall", ++ "winapi", +] + +[[package]] +name = "sourcefile" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3" ++ ++[[package]] ++name = "strsim" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "strsim" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" ++ ++[[package]] ++name = "structopt" ++version = "0.3.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3fe43617218c0805c6eb37160119dc3c548110a67786da7218d1c6555212f073" ++dependencies = [ ++ "clap", ++ "lazy_static", ++ "structopt-derive", ++] ++ ++[[package]] ++name = "structopt-derive" ++version = "0.4.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c6e79c80e0f4efd86ca960218d4e056249be189ff1c42824dcd9a7f51a56f0bd" ++dependencies = [ ++ "heck", ++ "proc-macro-error", ++ "proc-macro2 1.0.9", ++ "quote 1.0.3", ++ "syn 1.0.16", ++] + +[[package]] +name = "syn" +version = "0.15.44" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" +dependencies = [ -+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30", ++ "quote 0.6.13", ++ "unicode-xid 0.1.0", +] + +[[package]] +name = "syn" -+version = "1.0.13" ++version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "123bd9499cfb380418d509322d7a6d52e5315f064fe4b3ad18a53d6b92c07859" +dependencies = [ -+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.9", ++ "quote 1.0.3", ++ "unicode-xid 0.2.0", +] + +[[package]] -+name = "synstructure" -+version = "0.12.3" ++name = "syn-mid" ++version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a" +dependencies = [ -+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.9", ++ "quote 1.0.3", ++ "syn 1.0.16", +] + +[[package]] +name = "tempdir" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" +dependencies = [ -+ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.4.6", ++ "remove_dir_all", +] + +[[package]] +name = "tempfile" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" +dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", -+ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "libc", ++ "rand 0.7.3", ++ "redox_syscall", ++ "remove_dir_all", ++ "winapi", +] + +[[package]] +name = "term" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42" +dependencies = [ -+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder", ++ "dirs", ++ "winapi", +] + +[[package]] +name = "termcolor" -+version = "1.0.5" ++version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" +dependencies = [ -+ "wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-util", ++] ++ ++[[package]] ++name = "textwrap" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" ++dependencies = [ ++ "unicode-width", +] + +[[package]] +name = "thread_local" -+version = "0.3.6" ++version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" +dependencies = [ -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static", +] + +[[package]] +name = "threadpool" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2f0c90a5f3459330ac8bc0d2f879c693bb7a2f59689c1083fc4ef83834da865" +dependencies = [ -+ "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num_cpus", +] + +[[package]] +name = "time" +version = "0.1.42" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" +dependencies = [ -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "redox_syscall", ++ "winapi", +] + +[[package]] +name = "tiny_http" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1661fa0a44c95d01604bd05c66732a446c657efb62b5164a7a083a3b552b4951" +dependencies = [ -+ "ascii 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "chunked_transfer 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ascii", ++ "chrono", ++ "chunked_transfer", ++ "log 0.4.8", ++ "url", +] + +[[package]] +name = "todomvc" +version = "0.1.0" +dependencies = [ -+ "askama 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "js-sys 0.3.35", -+ "wasm-bindgen 0.2.58", -+ "web-sys 0.3.35", ++ "askama", ++ "console_error_panic_hook", ++ "js-sys", ++ "wasm-bindgen", ++ "web-sys", +] + +[[package]] +name = "toml" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" +dependencies = [ -+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde", +] + +[[package]] +name = "toml" -+version = "0.5.5" ++version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" +dependencies = [ -+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde", +] + +[[package]] +name = "treeline" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41" + +[[package]] +name = "trybuild" -+version = "1.0.19" ++version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "26ff1b18659a2218332848d76ad1c867ce4c6ee37b085e6bc8de9a6d11401220" +dependencies = [ -+ "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", -+ "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glob", ++ "lazy_static", ++ "serde", ++ "serde_json", ++ "termcolor", ++ "toml 0.5.6", +] + +[[package]] +name = "twoway" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1" +dependencies = [ -+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr", +] + +[[package]] +name = "typescript-tests" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.58", ++ "js-sys", ++ "wasm-bindgen", ++ "web-sys", +] + +[[package]] +name = "unicase" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33" +dependencies = [ -+ "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "version_check 0.1.5", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" +dependencies = [ -+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "matches", +] + +[[package]] +name = "unicode-normalization" -+version = "0.1.11" ++version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4" +dependencies = [ -+ "smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "smallvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" + +[[package]] +name = "unicode-xid" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" + +[[package]] +name = "unicode-xid" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" + +[[package]] +name = "url" +version = "1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" +dependencies = [ -+ "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "idna", ++ "matches", ++ "percent-encoding", +] + +[[package]] +name = "vcpkg" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" ++ ++[[package]] ++name = "vec_map" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" + +[[package]] +name = "version_check" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" ++ ++[[package]] ++name = "version_check" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce" + +[[package]] +name = "walrus" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4d96e9ec3f81fdb3210b12b2b1e9e39369c8050a3a28e692e5247e3ab5196410" +dependencies = [ -+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "id-arena 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "walrus-macro 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmparser 0.42.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow", ++ "id-arena", ++ "leb128", ++ "log 0.4.8", ++ "rayon", ++ "walrus-macro", ++ "wasmparser 0.42.1", +] + +[[package]] +name = "walrus-macro" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2bc16925d405153a91e01cdac2a5549aa25ca9148b5176e25e601f6536344d94" +dependencies = [ -+ "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "heck", ++ "proc-macro2 1.0.9", ++ "quote 1.0.3", ++ "syn 1.0.16", +] + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "wasm-bindgen" -+version = "0.2.58" ++version = "0.2.59" +dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "js-sys 0.3.35", -+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen-futures 0.4.8", -+ "wasm-bindgen-macro 0.2.58", -+ "wasm-bindgen-test 0.3.8", -+ "wasm-bindgen-test-crate-a 0.1.0", -+ "wasm-bindgen-test-crate-b 0.1.0", ++ "cfg-if", ++ "js-sys", ++ "serde", ++ "serde_derive", ++ "serde_json", ++ "wasm-bindgen-futures", ++ "wasm-bindgen-macro", ++ "wasm-bindgen-test", ++ "wasm-bindgen-test-crate-a", ++ "wasm-bindgen-test-crate-b", +] + +[[package]] +name = "wasm-bindgen-anyref-xform" -+version = "0.2.58" ++version = "0.2.59" +dependencies = [ -+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "walrus 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmprinter 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wast 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wat 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow", ++ "rayon", ++ "walrus", ++ "wasmprinter", ++ "wast 3.0.4", ++ "wat", +] + +[[package]] +name = "wasm-bindgen-backend" -+version = "0.2.58" ++version = "0.2.59" +dependencies = [ -+ "bumpalo 3.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen-shared 0.2.58", ++ "bumpalo", ++ "lazy_static", ++ "log 0.4.8", ++ "proc-macro2 1.0.9", ++ "quote 1.0.3", ++ "syn 1.0.16", ++ "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-benchmark" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.58", -+ "web-sys 0.3.35", ++ "wasm-bindgen", ++ "web-sys", +] + +[[package]] +name = "wasm-bindgen-cli" -+version = "0.2.58" ++version = "0.2.59" +dependencies = [ -+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "assert_cmd 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "curl 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)", -+ "diff 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "predicates 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rouille 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", -+ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "walrus 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen-cli-support 0.2.58", -+ "wasm-bindgen-shared 0.2.58", -+ "wit-printer 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wit-text 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wit-validator 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wit-walrus 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow", ++ "assert_cmd", ++ "curl", ++ "diff", ++ "docopt", ++ "env_logger", ++ "log 0.4.8", ++ "openssl", ++ "predicates", ++ "rayon", ++ "rouille", ++ "serde", ++ "serde_derive", ++ "serde_json", ++ "tempfile", ++ "walrus", ++ "wasm-bindgen-cli-support", ++ "wasm-bindgen-shared", ++ "wit-printer", ++ "wit-text", ++ "wit-validator", ++ "wit-walrus", +] + +[[package]] +name = "wasm-bindgen-cli-support" -+version = "0.2.58" ++version = "0.2.59" +dependencies = [ -+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", -+ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "walrus 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen-anyref-xform 0.2.58", -+ "wasm-bindgen-multi-value-xform 0.2.58", -+ "wasm-bindgen-shared 0.2.58", -+ "wasm-bindgen-threads-xform 0.2.58", -+ "wasm-bindgen-wasm-conventions 0.2.58", -+ "wasm-bindgen-wasm-interpreter 0.2.58", -+ "wit-text 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wit-validator 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wit-walrus 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow", ++ "base64 0.9.3", ++ "log 0.4.8", ++ "rustc-demangle", ++ "serde_json", ++ "tempfile", ++ "walrus", ++ "wasm-bindgen-anyref-xform", ++ "wasm-bindgen-multi-value-xform", ++ "wasm-bindgen-shared", ++ "wasm-bindgen-threads-xform", ++ "wasm-bindgen-wasm-conventions", ++ "wasm-bindgen-wasm-interpreter", ++ "wit-text", ++ "wit-validator", ++ "wit-walrus", +] + +[[package]] +name = "wasm-bindgen-futures" -+version = "0.4.8" ++version = "0.4.9" +dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "futures-channel-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -+ "js-sys 0.3.35", -+ "wasm-bindgen 0.2.58", -+ "wasm-bindgen-test 0.3.8", -+ "web-sys 0.3.35", ++ "cfg-if", ++ "futures-channel-preview", ++ "js-sys", ++ "wasm-bindgen", ++ "wasm-bindgen-test", ++ "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" -+version = "0.2.58" ++version = "0.2.59" +dependencies = [ -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "trybuild 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen 0.2.58", -+ "wasm-bindgen-futures 0.4.8", -+ "wasm-bindgen-macro-support 0.2.58", ++ "quote 1.0.3", ++ "trybuild", ++ "wasm-bindgen", ++ "wasm-bindgen-futures", ++ "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" -+version = "0.2.58" ++version = "0.2.59" +dependencies = [ -+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen-backend 0.2.58", -+ "wasm-bindgen-shared 0.2.58", ++ "proc-macro2 1.0.9", ++ "quote 1.0.3", ++ "syn 1.0.16", ++ "wasm-bindgen-backend", ++ "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-multi-value-xform" -+version = "0.2.58" ++version = "0.2.59" +dependencies = [ -+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "walrus 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmprinter 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wast 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wat 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow", ++ "rayon", ++ "walrus", ++ "wasmprinter", ++ "wast 3.0.4", ++ "wat", +] + +[[package]] +name = "wasm-bindgen-paint" +version = "0.1.0" +dependencies = [ -+ "js-sys 0.3.35", -+ "wasm-bindgen 0.2.58", -+ "web-sys 0.3.35", ++ "js-sys", ++ "wasm-bindgen", ++ "web-sys", +] + +[[package]] +name = "wasm-bindgen-shared" -+version = "0.2.58" ++version = "0.2.59" + +[[package]] +name = "wasm-bindgen-test" -+version = "0.3.8" ++version = "0.3.9" +dependencies = [ -+ "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "js-sys 0.3.35", -+ "scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen 0.2.58", -+ "wasm-bindgen-futures 0.4.8", -+ "wasm-bindgen-test-macro 0.3.8", ++ "console_error_panic_hook", ++ "js-sys", ++ "scoped-tls", ++ "wasm-bindgen", ++ "wasm-bindgen-futures", ++ "wasm-bindgen-test-macro", +] + +[[package]] +name = "wasm-bindgen-test-crate-a" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.58", ++ "wasm-bindgen", +] + +[[package]] +name = "wasm-bindgen-test-crate-b" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.58", ++ "wasm-bindgen", +] + +[[package]] +name = "wasm-bindgen-test-macro" -+version = "0.3.8" ++version = "0.3.9" +dependencies = [ -+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.9", ++ "quote 1.0.3", +] + +[[package]] +name = "wasm-bindgen-threads-xform" -+version = "0.2.58" ++version = "0.2.59" +dependencies = [ -+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "walrus 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen-wasm-conventions 0.2.58", ++ "anyhow", ++ "walrus", ++ "wasm-bindgen-wasm-conventions", +] + +[[package]] +name = "wasm-bindgen-wasm-conventions" -+version = "0.2.58" ++version = "0.2.59" +dependencies = [ -+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "walrus 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow", ++ "walrus", +] + +[[package]] +name = "wasm-bindgen-wasm-interpreter" -+version = "0.2.58" ++version = "0.2.59" +dependencies = [ -+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "walrus 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wat 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow", ++ "log 0.4.8", ++ "tempfile", ++ "walrus", ++ "wat", +] + +[[package]] +name = "wasm-bindgen-webidl" -+version = "0.2.58" ++version = "0.2.59" +dependencies = [ -+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen-backend 0.2.58", -+ "weedle 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow", ++ "env_logger", ++ "heck", ++ "lazy_static", ++ "log 0.4.8", ++ "proc-macro2 1.0.9", ++ "quote 1.0.3", ++ "sourcefile", ++ "structopt", ++ "syn 1.0.16", ++ "wasm-bindgen-backend", ++ "weedle", +] + +[[package]] +name = "wasm-in-wasm" +version = "0.1.0" +dependencies = [ -+ "js-sys 0.3.35", -+ "wasm-bindgen 0.2.58", -+ "wasm-bindgen-futures 0.4.8", ++ "js-sys", ++ "wasm-bindgen", ++ "wasm-bindgen-futures", +] + +[[package]] +name = "wasm2js" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.58", ++ "wasm-bindgen", +] + +[[package]] +name = "wasmparser" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1527c84a5bd585215f29c06b0e2a5274e478ad4dfc970d26ffad66fdc6cb311d" ++ ++[[package]] ++name = "wasmparser" ++version = "0.51.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aeb1956b19469d1c5e63e459d29e7b5aa0f558d9f16fcef09736f8a265e6c10a" + +[[package]] +name = "wasmprinter" -+version = "0.2.0" ++version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8bd423d45b95fcee11775472bfdce66c63c45ada23c1b338e0a63d623a6c475b" +dependencies = [ -+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmparser 0.42.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow", ++ "wasmparser 0.51.4", +] + +[[package]] +name = "wast" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "233648f540f07fce9b972436f2fbcae8a750c1121b6d32d949e1a44b4d9fc7b1" +dependencies = [ -+ "leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "leb128", +] + +[[package]] +name = "wast" -+version = "5.0.1" ++version = "9.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ee7b16105405ca2aa2376ba522d8d4b1a11604941dd3bb7df9fd2ece60f8d16a" +dependencies = [ -+ "leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "leb128", +] + +[[package]] +name = "wat" -+version = "1.0.6" ++version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "56173f7f4fb59aebe35a7e71423845e1c6c7144bfb56362d497931b6b3bed0f6" +dependencies = [ -+ "wast 5.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wast 9.0.0", +] + +[[package]] +name = "web-sys" -+version = "0.3.35" ++version = "0.3.36" +dependencies = [ -+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "js-sys 0.3.35", -+ "sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen 0.2.58", -+ "wasm-bindgen-futures 0.4.8", -+ "wasm-bindgen-test 0.3.8", -+ "wasm-bindgen-webidl 0.2.58", ++ "js-sys", ++ "wasm-bindgen", ++ "wasm-bindgen-futures", ++ "wasm-bindgen-test", +] + +[[package]] +name = "webaudio" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.58", -+ "web-sys 0.3.35", ++ "wasm-bindgen", ++ "web-sys", +] + +[[package]] +name = "webgl" +version = "0.1.0" +dependencies = [ -+ "js-sys 0.3.35", -+ "wasm-bindgen 0.2.58", -+ "web-sys 0.3.35", ++ "js-sys", ++ "wasm-bindgen", ++ "web-sys", +] + +[[package]] +name = "webidl-tests" +version = "0.1.0" +dependencies = [ -+ "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "js-sys 0.3.35", -+ "wasm-bindgen 0.2.58", -+ "wasm-bindgen-test 0.3.8", -+ "wasm-bindgen-webidl 0.2.58", ++ "js-sys", ++ "wasm-bindgen", ++ "wasm-bindgen-test", ++ "wasm-bindgen-webidl", +] + +[[package]] +name = "websockets" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.58", -+ "web-sys 0.3.35", ++ "wasm-bindgen", ++ "web-sys", +] + +[[package]] +name = "weedle" -+version = "0.10.0" ++version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8a7d4f9feb723a800d8f7b74edc9fa44ff35cb0b2ec64886714362f423427f37" +dependencies = [ -+ "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "nom 5.1.1", +] + +[[package]] +name = "winapi" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" +dependencies = [ -+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" -+version = "0.1.2" ++version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4ccfbf554c6ad11084fb7517daca16cfdcaccbdadba4fc336f032a8b12c2ad80" +dependencies = [ -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "wincolor" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+] ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "wit-parser" -+version = "0.1.0" ++version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "29a378ab795034efe2c4a6c8a388a2d9b31d360ad441c0bc9859b3d4d37e62a3" +dependencies = [ -+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wit-schema-version 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow", ++ "leb128", ++ "wit-schema-version", +] + +[[package]] +name = "wit-printer" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8c76e17384f4feb766d109a42c309b78de75ea2b3745f663ac3f5f331633f77f" +dependencies = [ -+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmprinter 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wit-parser 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wit-schema-version 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow", ++ "wasmprinter", ++ "wit-parser", ++ "wit-schema-version", +] + +[[package]] +name = "wit-schema-version" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bfee4a6a4716eefa0682e7a3b836152e894a3e4f34a9d6c2c3e1c94429bfe36a" + +[[package]] +name = "wit-text" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2aa19a002c984e25356af8938a8f4b7f0c9fe3963498e7ae1f90d64da9e563f5" +dependencies = [ -+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wast 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wit-writer 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow", ++ "wast 3.0.4", ++ "wit-writer", +] + +[[package]] +name = "wit-validator" -+version = "0.1.1" ++version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2454229f760a433842db154c9bb54da896fdf2352b1d63261f617bcdf20be0bd" +dependencies = [ -+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmparser 0.42.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wit-parser 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wit-schema-version 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow", ++ "wasmparser 0.51.4", ++ "wit-parser", ++ "wit-schema-version", +] + +[[package]] +name = "wit-walrus" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8e14fbb9453201558c582d227c2b75df5c050409f467e8c220fcd57dc369280a" +dependencies = [ -+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "id-arena 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "walrus 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wit-parser 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wit-schema-version 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wit-writer 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow", ++ "id-arena", ++ "walrus", ++ "wit-parser", ++ "wit-schema-version", ++ "wit-writer", +] + +[[package]] +name = "wit-writer" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ebeb128df9e103e61f8ddd8a190259f3c48b73fe86a5932f40f4de526ef357e8" +dependencies = [ -+ "leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wit-schema-version 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "leb128", ++ "wit-schema-version", +] + +[[package]] +name = "without-a-bundler" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.58", -+ "web-sys 0.3.35", ++ "wasm-bindgen", ++ "web-sys", +] + +[[package]] +name = "without-a-bundler-no-modules" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.58", -+ "web-sys 0.3.35", ++ "wasm-bindgen", ++ "web-sys", +] -+ -+[metadata] -+"checksum adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" -+"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" -+"checksum anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)" = "7825f6833612eb2414095684fcf6c635becf3ce97fe48cf6421321e93bfbd53c" -+"checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee" -+"checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" -+"checksum ascii 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "97be891acc47ca214468e09425d02cef3af2c94d0d82081cd02061f996802f14" -+"checksum askama 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "eed81479263c8753e06f4981f5a313b3fe6cbff30c3ff8d9ae15ef0c72d93fb5" -+"checksum askama_derive 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "46580c08e5520afadc6e9064759e15fc743489a4db78f9c751113e3d32a1e083" -+"checksum askama_shared 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "64509fd5c2fa767fa7ea973b732c61f0b8d30d1adf084e5164523e51a5e35d71" -+"checksum assert_cmd 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2dc477793bd82ec39799b6f6b3df64938532fdf2ab0d49ef817eac65856a5a1e" -+"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -+"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" -+"checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea" -+"checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491" -+"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" -+"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" -+"checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d" -+"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -+"checksum blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" -+"checksum buf_redux 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b953a6887648bb07a535631f2bc00fbdb2a2216f135552cb3f534ed136b9c07f" -+"checksum bumpalo 3.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5fb8038c1ddc0a5f73787b130f4cc75151e96ed33e417fde765eb5a81e3532f4" -+"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" -+"checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" -+"checksum cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)" = "e450b8da92aa6f274e7c6437692f9f2ce6d701fb73bacfcf87897b3f89a4c20e" -+"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" -+"checksum chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "31850b4a4d6bae316f7a09e691c944c28299298837edc0a03f755618c23cbc01" -+"checksum chunked_transfer 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "498d20a7aaf62625b9bf26e637cf7736417cde1d0c99f1d04d1170229a85cf87" -+"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -+"checksum color_quant 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0dbbb57365263e881e805dc77d94697c9118fd94d8da011240555aa7b23445bd" -+"checksum console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211" -+"checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120" -+"checksum crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca" -+"checksum crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5064ebdbf05ce3cb95e45c8b086f72263f4166b29b97f6baff7ef7fe047b55ac" -+"checksum crossbeam-queue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c695eeca1e7173472a32221542ae469b3e9aac3a4fc81f7696bcad82029493db" -+"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" -+"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4" -+"checksum curl 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)" = "06aa71e9208a54def20792d877bc663d6aae0732b9852e612c4a933177c31283" -+"checksum curl-sys 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)" = "f659f3ffac9582d6177bb86d1d2aa649f4eb9d0d4de9d03ccc08b402832ea340" -+"checksum deflate 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)" = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4" -+"checksum diff 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499" -+"checksum difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" -+"checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" -+"checksum docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7f525a586d310c87df72ebcd98009e57f1cc030c8c268305287a476beb653969" -+"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" -+"checksum enum_primitive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "be4551092f4d519593039259a9ed8daedf0da12e5109c5280338073eaeb81180" -+"checksum env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" -+"checksum escargot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ceb9adbf9874d5d028b5e4c5739d22b71988252b25c9c98fe7cf9738bee84597" -+"checksum failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9" -+"checksum failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08" -+"checksum filetime 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1ff6d4dab0aa0c8e6346d46052e93b13a16cf847b54ed357087c35011048cc7d" -+"checksum float-cmp 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75224bec9bfe1a65e2d34132933f2de7fe79900c96a0174307554244ece8150e" -+"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -+"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" -+"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" -+"checksum futures-channel-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)" = "d5e5f4df964fa9c1c2f8bddeb5c3611631cacd93baf810fc8bb2fb4b495c263a" -+"checksum futures-core-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)" = "b35b6263fb1ef523c3056565fa67b1d16f0a8604ff12b11b08c25f28a734c60a" -+"checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" -+"checksum gif 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e2e41945ba23db3bf51b24756d73d81acb4f28d85c3dccc32c6fae904438c25f" -+"checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" -+"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" -+"checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772" -+"checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" -+"checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -+"checksum id-arena 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" -+"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" -+"checksum image 0.12.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d95816db758249fe16f23a4e23f1a3a817fe11892dbfd1c5836f625324702158" -+"checksum inflate 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e7e0062d2dc2f17d2f13750d95316ae8a2ff909af0fda957084f5defd87c43bb" -+"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" -+"checksum jpeg-decoder 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "0256f0aec7352539102a9efbcb75543227b7ab1117e0f95450023af730128451" -+"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -+"checksum leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a" -+"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" -+"checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe" -+"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" -+"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" -+"checksum lzw 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7d947cbb889ed21c2a84be6ffbaebf5b4e0f4340638cba0444907e38b56be084" -+"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" -+"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" -+"checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9" -+"checksum mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0" -+"checksum mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0d977de9ee851a0b16e932979515c0f3da82403183879811bc97d50bd9cc50f7" -+"checksum multipart 0.15.4 (registry+https://github.com/rust-lang/crates.io-index)" = "adba94490a79baf2d6a23eac897157047008272fa3eecb3373ae6377b91eca28" -+"checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" -+"checksum normalize-line-endings 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2e0a1a39eab95caf4f5556da9289b9e68f0aafac901b2ce80daaf020d3b733a8" -+"checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" -+"checksum num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "76bd5272412d173d6bf9afdf98db8612bbabc9a7a830b7bfc9c188911716132e" -+"checksum num-rational 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e" -+"checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" -+"checksum num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c81ffc11c212fa327657cb19dd85eb7419e163b5b076bede2bdb5c974c07e4" -+"checksum num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72" -+"checksum openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)" = "3a3cc5799d98e1088141b8e01ff760112bbd9f19d850c124500566ca6901a585" -+"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" -+"checksum openssl-src 111.6.1+1.1.1d (registry+https://github.com/rust-lang/crates.io-index)" = "c91b04cb43c1a8a90e934e0cd612e2a5715d976d2d6cff4490278a0cddf35005" -+"checksum openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)" = "465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f" -+"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" -+"checksum phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" -+"checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" -+"checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" -+"checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" -+"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" -+"checksum png 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3cb773e9a557edb568ce9935cf783e3cdcabe06a9449d41b3e5506d88e582c82" -+"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" -+"checksum predicates 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a9bfe52247e5cc9b2f943682a85a5549fb9662245caf094504e69a2f03fe64d4" -+"checksum predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "06075c3a3e92559ff8929e7a280684489ea27fe44805174c3ebd9328dcb37178" -+"checksum predicates-tree 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8e63c4859013b38a76eca2414c64911fba30def9e3202ac461a2d22831220124" -+"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -+"checksum proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0319972dcae462681daf4da1adeeaa066e3ebd29c69be96c6abb1259d2ee2bcc" -+"checksum quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" -+"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" -+"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" -+"checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" -+"checksum rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9" -+"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" -+"checksum rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412" -+"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" -+"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" -+"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -+"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" -+"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -+"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" -+"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -+"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" -+"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" -+"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" -+"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" -+"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" -+"checksum rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098" -+"checksum rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9" -+"checksum raytracer 0.1.0 (git+https://github.com/alexcrichton/raytracer?branch=update-deps)" = "" -+"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -+"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" -+"checksum redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecedbca3bf205f8d8f5c2b44d83cd0690e39ee84b951ed649e9f1841132b66d" -+"checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd" -+"checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716" -+"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" -+"checksum rouille 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "112568052ec17fa26c6c11c40acbb30d3ad244bf3d6da0be181f5e7e42e5004f" -+"checksum rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf" -+"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" -+"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -+"checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8" -+"checksum safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" -+"checksum schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021" -+"checksum scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" -+"checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" -+"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" -+"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -+"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -+"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449" -+"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64" -+"checksum serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)" = "48c575e0cc52bdd09b47f330f646cf59afc586e9c4e3ccd6fc1f625b8ea1dad7" -+"checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" -+"checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" -+"checksum smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44e59e0c9fa00817912ae6e4e6e3c4fe04455e75699d06eedc7d85917ed8e8f4" -+"checksum socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85" -+"checksum sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3" -+"checksum strsim 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" -+"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" -+"checksum syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1e4ff033220a41d1a57d8125eab57bf5263783dfdcc18688b1dacc6ce9651ef8" -+"checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" -+"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" -+"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" -+"checksum term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42" -+"checksum termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e" -+"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" -+"checksum threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e2f0c90a5f3459330ac8bc0d2f879c693bb7a2f59689c1083fc4ef83834da865" -+"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" -+"checksum tiny_http 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1661fa0a44c95d01604bd05c66732a446c657efb62b5164a7a083a3b552b4951" -+"checksum toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" -+"checksum toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf" -+"checksum treeline 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41" -+"checksum trybuild 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)" = "987d6fdc45ddd7f3be5aa7386c8c8a844d1655c95b9ed948a9cd9cded8f2b79f" -+"checksum twoway 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1" -+"checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33" -+"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -+"checksum unicode-normalization 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b561e267b2326bb4cebfc0ef9e68355c7abe6c6f522aeac2f5bf95d56c59bdcf" -+"checksum unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" -+"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" -+"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" -+"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" -+"checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" -+"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" -+"checksum walrus 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4d96e9ec3f81fdb3210b12b2b1e9e39369c8050a3a28e692e5247e3ab5196410" -+"checksum walrus-macro 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2bc16925d405153a91e01cdac2a5549aa25ca9148b5176e25e601f6536344d94" -+"checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -+"checksum wasmparser 0.42.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1527c84a5bd585215f29c06b0e2a5274e478ad4dfc970d26ffad66fdc6cb311d" -+"checksum wasmprinter 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "89101d1890503f4d87cc0512ff2568c00d6c13ed9de3880569e5c9c21556c06c" -+"checksum wast 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "233648f540f07fce9b972436f2fbcae8a750c1121b6d32d949e1a44b4d9fc7b1" -+"checksum wast 5.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8d1de68310854a9840d39487701a8c1acccb5c9f9f2650d5fce3cdfe6650c372" -+"checksum wat 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d916cc60b1b79ac1ca7683af8d6ec56b789167f7f696b3f1ab3d98961129f192" -+"checksum weedle 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3bb43f70885151e629e2a19ce9e50bd730fd436cfd4b666894c9ce4de9141164" -+"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" -+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -+"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9" -+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -+"checksum wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "96f5016b18804d24db43cebf3c77269e7569b8954a8464501c216cc5e070eaa9" -+"checksum wit-parser 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6bb31e17473db76d44713485a85dec22d7786958a9a9b9693cfe0d7162c1b4f5" -+"checksum wit-printer 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8c76e17384f4feb766d109a42c309b78de75ea2b3745f663ac3f5f331633f77f" -+"checksum wit-schema-version 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bfee4a6a4716eefa0682e7a3b836152e894a3e4f34a9d6c2c3e1c94429bfe36a" -+"checksum wit-text 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2aa19a002c984e25356af8938a8f4b7f0c9fe3963498e7ae1f90d64da9e563f5" -+"checksum wit-validator 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "676e5641088526a9bdcab24dc2f675f464f4ca1a4714aa90307464aa6658b5ba" -+"checksum wit-walrus 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8e14fbb9453201558c582d227c2b75df5c050409f467e8c220fcd57dc369280a" -+"checksum wit-writer 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ebeb128df9e103e61f8ddd8a190259f3c48b73fe86a5932f40f4de526ef357e8" -- -2.23.1 +2.25.0 diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix index 9e83aae8a05..e5afcb30a81 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -2,22 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "wasm-bindgen-cli"; - version = "0.2.58"; + version = "0.2.59"; src = fetchFromGitHub { owner = "rustwasm"; repo = "wasm-bindgen"; rev = version; - sha256 = "18n30i1pzrhm2wasa1737j9gihx1d6pwx77z552dcj1rdp7ar6ir"; + sha256 = "1i0hdky5dlkrzcphddm122yxfhgcvnszh4q1as0r41vhfs5ss597"; }; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; nativeBuildInputs = [ pkgconfig ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1kkvgqvn08pv0654b7s40vs92myzfiv965561mwfzhj8fx8f1y18"; + cargoSha256 = "1ylk9vrpajslx1zy4vqmlyqa5ygcmvir1gcn8hsr6liigf5kcz7p"; cargoPatches = [ ./0001-Add-cargo.lock.patch ]; cargoBuildFlags = [ "-p" pname ]; diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index daf46ec4896..9db4472f672 100644 --- a/pkgs/development/tools/yarn/default.nix +++ b/pkgs/development/tools/yarn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yarn"; - version = "1.22.0"; + version = "1.22.2"; src = fetchzip { url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; - sha256 = "0hbsdbrqx5xhr171ik862v51xwjzbfncic92pgbnhnlmxy2y974x"; + sha256 = "1av52k5hl7xylxz5c0h64akz6ccd1vm64v0pzmny1661pbihiwp5"; }; buildInputs = [ nodejs ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://yarnpkg.com/; + homepage = "https://yarnpkg.com/"; description = "Fast, reliable, and secure dependency management for javascript"; license = licenses.bsd2; maintainers = with maintainers; [ offline screendriver ]; diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix new file mode 100644 index 00000000000..85165d501d9 --- /dev/null +++ b/pkgs/development/web/flyctl/default.nix @@ -0,0 +1,32 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "flyctl"; + version = "0.0.102"; + + src = fetchFromGitHub { + owner = "superfly"; + repo = "flyctl"; + rev = "v${version}"; + sha256 = "181j248i8j9g7kz5krg0bkbxkvmcwpz2vlknii5q3dy7yhgg19h3"; + }; + + preBuild = '' + go generate ./... + ''; + + preFixup = '' + rm $out/bin/doc + rm $out/bin/helpgen + ''; + + modSha256 = "1mqkc7hnavvpbqar9f1d2vnm47p4car9abnk2ikyf27jr5glwmsd"; + + meta = with lib; { + description = "Command line tools for fly.io services"; + homepage = "https://fly.io/"; + license = licenses.asl20; + maintainers = with maintainers; [ aaronjanse ]; + }; +} + diff --git a/pkgs/development/web/nodejs/v13.nix b/pkgs/development/web/nodejs/v13.nix index affb86bece8..c5e3f7c4bdb 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/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index 647bdf6f3af..aea451ff8ae 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "postman"; - version = "7.19.1"; + version = "7.20.0"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha256 = "1p3614lhyn0qwqj99iqclpg4xfd3x4n1m34ya79530phqrrmnsh7"; + sha256 = "1al0kl2snbxzmprn13vbna4wyd72dya5lyfkhjgqabm4b7mign6c"; name = "${pname}.tar.gz"; }; @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.getpostman.com; + homepage = "https://www.getpostman.com"; description = "API Development Environment"; license = licenses.postman; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/games/crispy-doom/default.nix b/pkgs/games/crispy-doom/default.nix index e6b669b8d67..5a988862a93 100644 --- a/pkgs/games/crispy-doom/default.nix +++ b/pkgs/games/crispy-doom/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "crispy-doom"; - version = "5.7"; + version = "5.7.1"; src = fetchFromGitHub { owner = "fabiangreffrath"; repo = pname; rev = "${pname}-${version}"; - sha256 = "1m9bk7hp3d4sdd3y3isvf26rxya7511mnwyv99l2f80adbsv3nq2"; + sha256 = "1gqivy4pxasy7phyznixsagylf9f70bk33b0knpfzzlks6cc6zzj"; }; postPatch = '' diff --git a/pkgs/games/devilutionx/default.nix b/pkgs/games/devilutionx/default.nix index ac7d61b31c7..69d7e3ca666 100644 --- a/pkgs/games/devilutionx/default.nix +++ b/pkgs/games/devilutionx/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, SDL2_ttf, libsodium, pkg-config }: stdenv.mkDerivation rec { - version = "1.0.0"; + version = "1.0.1"; pname = "devilutionx"; src = fetchFromGitHub { owner = "diasurgical"; repo = "devilutionX"; rev = version; - sha256 = "0lx903gchda4bgr71469yn63rx5ya6xv9j1azx18nrv3sskrphn4"; + sha256 = "1jvjlch9ql5s5jx9g5y5pkc2xn62199qylsmzpqzx1jc3k2vmw5i"; }; NIX_CFLAGS_COMPILE = [ diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index 4f88e36a2f6..0664af117e1 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 b27dc9c058c..2467053cc1a 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 be0d57f45d9..4485b3ae784 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 daef15575d5..f5f1f389904 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 86ff8a6bc44..011284bcff5 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 e9d172f212d..ccf44ee5ca1 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/eidolon/default.nix b/pkgs/games/eidolon/default.nix index f6bc271ec02..5461304d334 100644 --- a/pkgs/games/eidolon/default.nix +++ b/pkgs/games/eidolon/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { }; cargoPatches = [ ./cargo-lock.patch ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1887fjkk641cn6dpmyc5r3r2li61yw1nvfb0f2dp3169gycka15h"; + cargoSha256 = "1i8qfphynwi42pkhhgllxq42dnw9f0dd6f829z94a3g91czyqvsw"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ]; diff --git a/pkgs/games/empty-epsilon/default.nix b/pkgs/games/empty-epsilon/default.nix index 6560db48cb3..29a789b4084 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/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix index c7c618c0c18..1c0a47e4b61 100644 --- a/pkgs/games/extremetuxracer/default.nix +++ b/pkgs/games/extremetuxracer/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "0.7.5"; + version = "0.8.0"; pname = "extremetuxracer"; src = fetchurl { url = "mirror://sourceforge/extremetuxracer/etr-${version}.tar.xz"; - sha256 = "1ly63316c07i0gyqqmyzsyvygsvygn0fpk3bnbg25fi6li99rlsg"; + sha256 = "05ysaxvsgps9fxc421kdifsxmc1sn6n79cjaa0k0i3fs9qqrja2b"; }; buildInputs = [ @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ExtremeTuxRacer - Tux lies on his belly and accelerates down ice slopes. ''; license = stdenv.lib.licenses.gpl2Plus; - homepage = https://sourceforge.net/projects/extremetuxracer/; + homepage = "https://sourceforge.net/projects/extremetuxracer/"; maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/games/ja2-stracciatella/default.nix b/pkgs/games/ja2-stracciatella/default.nix index a08ce593012..89d75dd837f 100644 --- a/pkgs/games/ja2-stracciatella/default.nix +++ b/pkgs/games/ja2-stracciatella/default.nix @@ -1,5 +1,4 @@ { stdenv, fetchFromGitHub, cmake, SDL2, boost, fltk, rustPlatform }: -with rustPlatform; let version = "0.16.1"; src = fetchFromGitHub { @@ -18,12 +17,11 @@ let cp ${lockfile} $out/Cargo.lock ''; }; - libstracciatella = buildRustPackage { - name = "libstracciatella-${version}"; + libstracciatella = rustPlatform.buildRustPackage { + pname = "libstracciatella"; inherit version; src = libstracciatellaSrc; - legacyCargoFetcher = true; - cargoSha256 = "0a1pc8wyvgmna0a5cbpv3mh0h4nzjxlm887ymcq00cy1ciq5nmj4"; + cargoSha256 = "15djs4xaz4y1hpfyfqxdgdasxr0b5idy9i5a7c8cmh0jkxjv8bqc"; doCheck = false; }; in @@ -37,15 +35,17 @@ stdenv.mkDerivation { patches = [ ./remove-rust-buildstep.patch ]; + preConfigure = '' sed -i -e 's|rust-stracciatella|${libstracciatella}/lib/libstracciatella.so|g' CMakeLists.txt cmakeFlagsArray+=("-DEXTRA_DATA_DIR=$out/share/ja2") ''; enableParallelBuilding = true; + meta = { description = "Jagged Alliance 2, with community fixes"; license = "SFI Source Code license agreement"; - homepage = https://ja2-stracciatella.github.io/; + homepage = "https://ja2-stracciatella.github.io/"; }; } diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index 5bc2157a70b..157fb4b93b9 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -2,6 +2,8 @@ , fetchurl , makeDesktopItem , makeWrapper +, wrapGAppsHook +, gobject-introspection , jre # old or modded versions of the game may require Java 8 (https://aur.archlinux.org/packages/minecraft-launcher/#pinned-674960) , xorg , zlib @@ -96,10 +98,12 @@ in sha256 = "0w8z21ml79kblv20wh5lz037g130pxkgs8ll9s3bi94zn2pbrhim"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; + buildInputs = [ gobject-introspection ]; sourceRoot = "."; + dontWrapGApps = true; dontConfigure = true; dontBuild = true; @@ -109,11 +113,6 @@ in ${desktopItem.buildCommand} install -D $icon $out/share/icons/hicolor/symbolic/apps/minecraft-launcher.svg - - makeWrapper $out/opt/minecraft-launcher/minecraft-launcher $out/bin/minecraft-launcher \ - --prefix LD_LIBRARY_PATH : ${envLibPath} \ - --prefix PATH : ${stdenv.lib.makeBinPath [ jre ]} \ - --run "cd /tmp" # Do not create `GPUCache` in current directory ''; preFixup = '' @@ -129,6 +128,15 @@ in $out/opt/minecraft-launcher/liblauncher.so ''; + postFixup = '' + # Do not create `GPUCache` in current directory + makeWrapper $out/opt/minecraft-launcher/minecraft-launcher $out/bin/minecraft-launcher \ + --prefix LD_LIBRARY_PATH : ${envLibPath} \ + --prefix PATH : ${stdenv.lib.makeBinPath [ jre ]} \ + --run "cd /tmp" \ + "''${gappsWrapperArgs[@]}" + ''; + meta = with stdenv.lib; { description = "Official launcher for Minecraft, a sandbox-building game"; homepage = "https://minecraft.net"; diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix index 2fb67535951..38763073ac8 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 3002fc75e63..fc6f50ef97e 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/games/tome4/default.nix b/pkgs/games/tome4/default.nix index 81bc7f4a13c..99391f2e301 100644 --- a/pkgs/games/tome4/default.nix +++ b/pkgs/games/tome4/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "1.6.6"; + version = "1.6.7"; src = fetchurl { url = "https://te4.org/dl/t-engine/t-engine4-src-${version}.tar.bz2"; - sha256 = "1amx0y49scy9hq71wjvkdzvgclwa2g54vkv4bf40mxyp4pl0bq7m"; + sha256 = "0283hvms5hr29zr0grd6gq059k0hg8hcz3fsmwjmysiih8790i68"; }; prePatch = '' @@ -72,7 +72,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tales of Maj'eyal (rogue-like game)"; - homepage = https://te4.org/; + homepage = "https://te4.org/"; license = licenses.gpl3; maintainers = with maintainers; [ chattered peterhoeg ]; platforms = with platforms; [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index e9f8d6984af..9e76693ce8f 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 00335eddce8..deeedf67995 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 e2c0dccb2e1..68f48a2db64 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 36dbcf170dd..1036f474b14 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/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 9d6a47e507d..a5ef9e6b799 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -61,12 +61,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2020-02-25"; + version = "2020-03-11"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "634c81fd465269f59e3db878fe8405828e6d2da9"; - sha256 = "1lcqyj0yjdhm2kdk0p6pr8avjnb7gm4hg0dygm6fpjz3f078n9py"; + rev = "bbe5153fcb36dec9860ced33ae8ff0b5d76ac02a"; + sha256 = "1xvmh66lgii98z6f4lk1mjs73ysrvs55xdlcmf224k3as822jmw0"; }; }; @@ -347,23 +347,23 @@ let coc-git = buildVimPluginFrom2Nix { pname = "coc-git"; - version = "2020-02-27"; + version = "2020-03-11"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-git"; - rev = "fc720742d1f7fed7a0737ee92235d743f2a86a12"; - sha256 = "0qx3wsdnjnfxi6dg3z9pdcqnj2rhwnprz3ypch6ysyshlbvbs9ag"; + rev = "8a8517c44589cef8c7061e6d352f77627b5a79b4"; + sha256 = "1qg3mk43wl8shx66nydykdr1vsfx4n5lmgngndwnjjkf1csppg9q"; }; }; coc-go = buildVimPluginFrom2Nix { pname = "coc-go"; - version = "2020-02-13"; + version = "2020-03-10"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-go"; - rev = "fa76d5c34d048b97eb53cf5e13f6d9acf975c92e"; - sha256 = "0wizc10g7jxrf2da15hdnjn471w0fgyaw13j9qf7gyhcsmdx1x5w"; + rev = "587501a4445c1edb5d5e10927c5f8274f0e0ea52"; + sha256 = "16cgdxn93zf0q5d80xb9c6khzgx02qvsjdaw3kf07qqsmdjvy4gj"; }; }; @@ -435,23 +435,23 @@ let coc-lists = buildVimPluginFrom2Nix { pname = "coc-lists"; - version = "2020-02-10"; + version = "2020-03-03"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-lists"; - rev = "25c1f7661a9ce6898924228115b671469c958a1a"; - sha256 = "1cqy6a9cs0ns5ifglxhrmd6lvfnlfx6ni44xq3gayh4lnyxdlc8p"; + rev = "21761f5e9a48baf3dbb6540ff180f6071c1ed8c6"; + sha256 = "101n3cmhvm4hxznk5w4n7lbk552cwsyf28axa1d5rr838r3zg5wi"; }; }; coc-metals = buildVimPluginFrom2Nix { pname = "coc-metals"; - version = "2020-02-27"; + version = "2020-03-09"; src = fetchFromGitHub { owner = "ckipp01"; repo = "coc-metals"; - rev = "4dd4685ef44f1a38ea20b373f2a20b82304d68e0"; - sha256 = "1q165kh4k59ikivs9pwp6w9jla6li8hcln5zbpkxhis6sh9g3bn6"; + rev = "11725273f6f5bb62836890a5df09831ac15a2f59"; + sha256 = "16wy97jnw6i8f3nkac3abdi2sjnql4jkbb82hgd67i0lzjjvarzd"; }; }; @@ -468,12 +468,12 @@ let coc-pairs = buildVimPluginFrom2Nix { pname = "coc-pairs"; - version = "2020-01-02"; + version = "2020-03-09"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-pairs"; - rev = "0203f18c66f8bb06a6845aef1fff26a56e4a7bbd"; - sha256 = "08z0c0a1cizyv15h8d4mxb6casrgmfpdgj0w8g1v9zqra2rmkmv5"; + rev = "79deeaabdc4f091c22f3dd67d439a0a336e8aa7e"; + sha256 = "1w6p2dk7yj8ldxg1qxh9zpn9ypm6gn66gi0vbax33wf5c0dmp0v9"; }; }; @@ -534,12 +534,12 @@ let coc-snippets = buildVimPluginFrom2Nix { pname = "coc-snippets"; - version = "2020-02-19"; + version = "2020-03-10"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-snippets"; - rev = "aaa059bb998418850ec2d7958a5df16e96e76d59"; - sha256 = "1ardzqassj1kgfjp0vxsi0kimi7w61rxdhr8ng272nrkaxbxz25j"; + rev = "e4f36338b3fd11277f9dd8021fdbfe8b1ed85f6f"; + sha256 = "0a3a02yj7kfnz4hgz7ylmq5zl3id4kfmp1ynnl8wc1439m5hvi84"; }; }; @@ -600,12 +600,12 @@ let coc-tsserver = buildVimPluginFrom2Nix { pname = "coc-tsserver"; - version = "2020-02-07"; + version = "2020-03-09"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tsserver"; - rev = "89998609d4b117083738aa06cb138765810ac0e7"; - sha256 = "118acn2vzb51mqxnx50lhibfqivzzfqsbyd5hy5qfl2p8gd67c0k"; + rev = "dae0cc36b0245a601d4431ae8dd2319eaa919058"; + sha256 = "1559c0hwyknz1j6vbigywg1fjads4wf8by59z0sri6aah9q77q2z"; }; }; @@ -644,12 +644,12 @@ let coc-yaml = buildVimPluginFrom2Nix { pname = "coc-yaml"; - version = "2020-02-09"; + version = "2020-03-06"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-yaml"; - rev = "d9b2a7ec6275e25bb89e875f73d99ff8a3e58877"; - sha256 = "05xgz3lhfzd93ldac0jw7i68f1s3p3ikg22gvl3v2va8r1rf01hh"; + rev = "338192a2434b96b139fb8c07d260da00b3100997"; + sha256 = "020jpsm9ss2v3x1g43m920w2yamv8khl7mg7wm4sx6qsl3rlfq4g"; }; }; @@ -766,12 +766,12 @@ let csv-vim = buildVimPluginFrom2Nix { pname = "csv-vim"; - version = "2020-02-05"; + version = "2020-03-10"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "0663b09f9203cb38ef113254b461047c7e3c43e7"; - sha256 = "14icc2a5hylknz8sigmbxwamf9ck4lsjjykyxjycrnwjrpasl8sv"; + rev = "e7fb581122df54fe9770cc5e565bef450e7d2478"; + sha256 = "1h15n1pdci34idks218r4kpwna1zb25hk8prsqzvjkj8mc6ch67y"; }; }; @@ -821,12 +821,12 @@ let dart-vim-plugin = buildVimPluginFrom2Nix { pname = "dart-vim-plugin"; - version = "2019-12-03"; + version = "2020-03-07"; src = fetchFromGitHub { owner = "dart-lang"; repo = "dart-vim-plugin"; - rev = "ff468225ce2c8834b944ba6e040fe18a28a67cff"; - sha256 = "1h4yw71dj67q57d7iiw22silcmji5ibp4bj18kgm0gvwa53hy7hh"; + rev = "c16efc107e8bccd927f71bc2815d48f3bf94f1b8"; + sha256 = "133yivm5wp4m7sx62mcjr0vy7br6gcrh0k25nszy3vpdnnyc1mh6"; }; }; @@ -887,34 +887,34 @@ let denite-git = buildVimPluginFrom2Nix { pname = "denite-git"; - version = "2020-02-26"; + version = "2020-03-02"; src = fetchFromGitHub { owner = "chemzqm"; repo = "denite-git"; - rev = "0c7ffefa872ca19d61ecec6e014a797f0c25e98f"; - sha256 = "11mz76x7pj2p3k3d8ycjvrwdjrabrdcssw5lr529r9dardkqchzl"; + rev = "88b5323a6fc0ace197eed5205215d80f3b613f91"; + sha256 = "0b687i64hr8hll7pv7r1xz906b46cl2q62zm18ipikhkpva6iv13"; }; }; denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2020-02-23"; + version = "2020-03-08"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "e435b78c3fa878dba7bbb03ee7cd95df6ce7a836"; - sha256 = "10lz16l34ran96i5902hw9zw3qbfdz712bdjkdwvaijmgnj464s5"; + rev = "b6e2c7df9402f293bad1dc45f5d41b3dc5d8a9b1"; + sha256 = "1rnxaj1ah7k5l2bcc2x7pdlqjb9fki5r732yanp4r3c4mlx28rvp"; }; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2019-11-27"; + version = "2020-03-08"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "856041638e98fc3bf4d4de5d90dee525f3dfa9a5"; - sha256 = "1y6kp56n26kabmp60nnyaw46yxv9nqv5bp15hzvfpwvzq7gvpm10"; + rev = "cb0e2fdb75a2d37e75972933c25dd2781d8e6ebb"; + sha256 = "13miw4z14fj11afs8x5yxcbpn4an8vhvx8k3rl3xrvn1hq5jhwqx"; }; }; @@ -999,12 +999,12 @@ let deoplete-jedi = buildVimPluginFrom2Nix { pname = "deoplete-jedi"; - version = "2020-02-03"; + version = "2020-03-10"; src = fetchFromGitHub { owner = "deoplete-plugins"; repo = "deoplete-jedi"; - rev = "2d2ff2382fd67574c233d0ce48150b26eb7f6809"; - sha256 = "1hwmf0hnyvznciysj3k0gcycmvl2mvv8krmc26bi430q89gxgq56"; + rev = "29187f9d71ea415afa71e9e416ffcf32619aa65f"; + sha256 = "1xlgfngaahbnwk6bfnmzv63jdz70w0lvqzpa5zbsyb5p52p4a58i"; fetchSubmodules = true; }; }; @@ -1033,12 +1033,12 @@ let deoplete-lsp = buildVimPluginFrom2Nix { pname = "deoplete-lsp"; - version = "2020-01-10"; + version = "2020-03-07"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete-lsp"; - rev = "7a8c44f423bc4339c092a759abaad40131d2c98a"; - sha256 = "1gg9j26xq668s4gbww0p2x8pkh3ssbzgyp2hxppk2ws7x8c2cihi"; + rev = "6aa2bfd73a181fa6b55021264c4a8a83237ce558"; + sha256 = "1bcvfbv046fk34vnc1ly8civ3sibqlzli8vm2548dfxc55wcwsys"; }; }; @@ -1110,12 +1110,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2020-02-27"; + version = "2020-03-10"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "08582f7c52aa53d63f9a7a714fab9137d6ea48f0"; - sha256 = "1bnz9q6rz95w8xw9vhzhfrfr6r8zdgf0ihylvjaa2kzxir7sngm2"; + rev = "2538bd3d542ee6d89802ace15ab87aa783e8a1cb"; + sha256 = "0pq6c9m64mgx7zyc9nng18w0xdyr9s36gxv1rkpd14srwgxw0ilf"; }; }; @@ -1154,12 +1154,12 @@ let echodoc-vim = buildVimPluginFrom2Nix { pname = "echodoc-vim"; - version = "2020-02-27"; + version = "2020-03-06"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; - rev = "577b7e7d083e37c0c15158cbd761de7cd831e682"; - sha256 = "1cmp80s4k7sslj4vd919wwlinzmy0yghnczwzrwgk9yf0jclk4nv"; + rev = "cd9beff92b52990d991a0b6a0f4d20aa600e570c"; + sha256 = "14z9di1x0zbq1d4vvpn8pvnp3fscdv7iqyymaiavw096nvj3d1cc"; }; }; @@ -1188,12 +1188,12 @@ let emmet-vim = buildVimPluginFrom2Nix { pname = "emmet-vim"; - version = "2019-10-08"; + version = "2020-03-07"; src = fetchFromGitHub { owner = "mattn"; repo = "emmet-vim"; - rev = "5f559fae12a8babf414376906197dbd751e11380"; - sha256 = "0z9lny12hckc635zafh1mdh58pikz5k19kkhxj1m77h15rwwms7f"; + rev = "c7643e5b616430f766528b225528a5228adb43df"; + sha256 = "0wjxx648lp11nqzgrdcbqikjs85knpvk594b9l25hadhd5awgahv"; fetchSubmodules = true; }; }; @@ -1222,23 +1222,23 @@ let falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2020-02-26"; + version = "2020-03-02"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "7128e3a6778347ff7848d9f8a423f63b94e6d9b9"; - sha256 = "0s4sd982z3f8cppcz4hja788jgcm1gsh6qn8lw9535i6bmphn027"; + rev = "b7ef5d0e1b15ce007ecf6adb94270c0d3468d90e"; + sha256 = "1dcf6ic74r1lg0a3zqhfp1wk2f7j8nsykfvrk2d0j7waj2xsni4v"; }; }; far-vim = buildVimPluginFrom2Nix { pname = "far-vim"; - version = "2020-02-15"; + version = "2020-03-09"; src = fetchFromGitHub { owner = "brooth"; repo = "far.vim"; - rev = "f9d916497e2bf26e6e7072b0375f6c484170311a"; - sha256 = "02ych1rrj8n6caczphnmvmir8x661p94kc0kh9bffmz7hjk6586q"; + rev = "2a8a9c22237d224f2c24680901b61b6f9bffb061"; + sha256 = "0hk2p10cx36dz6vf22v4hx3shkkhqhkmxp6s1l517kkchh98m4bg"; }; }; @@ -1289,12 +1289,12 @@ let float-preview-nvim = buildVimPluginFrom2Nix { pname = "float-preview-nvim"; - version = "2019-04-07"; + version = "2020-02-29"; src = fetchFromGitHub { owner = "ncm2"; repo = "float-preview.nvim"; - rev = "c5431b6d9bd4a8002f1a3eec42e9458ef4453ff3"; - sha256 = "0ylrp0pmg822m7zp7dhyhmb05zbiy4gbq40l4whs249v0v4s9vyd"; + rev = "cbc23a28e8ea92d7c8dc22e727a62d42ef65086a"; + sha256 = "1qv05qv89sbh1cafl2597lj95yv8yxpxm3sxbbclrls1962f7hgy"; }; }; @@ -1333,12 +1333,12 @@ let fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2020-02-19"; + version = "2020-03-11"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "48a2d80a24d19bfaafd91005786653bc49303c62"; - sha256 = "0p4ifdl70iwsdqsgpbs66lam7fzdc2jxa9hvzslwi0gllccpfsm5"; + rev = "ed9d66c2a65333a0d49509a2d53098392683eec1"; + sha256 = "0jb62nwfs2bv33b3rfk0pndia97wsi88rdixvarkkimdi09sa6cp"; }; }; @@ -1355,23 +1355,23 @@ let gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2019-12-13"; + version = "2020-03-08"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "946aac94d5690e9ca1ca2db21a254fea56e45b2b"; - sha256 = "1q1rq1rxxq5hyglz90d7vd1m6az12lr2wz9aafn6zir68n3ak0lj"; + rev = "42163237b57c56de9a24fe6549e46c805fab2bb3"; + sha256 = "1bg3ismjlp99drsfyrkjb137ypxmp0qpy8pp9ry9i8ljmnffbgal"; }; }; ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2020-01-27"; + version = "2020-03-10"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "dfa37af1baa37c1eb0a34d9bf303b5f2aa9fbc4c"; - sha256 = "1cx0bj1c1ynzqqvjx0rrbkbhkql6zs11k6sbpbn7gdch4437cjzs"; + rev = "3c4569cd8cf93545bedeaf692c5d50ef16ca0226"; + sha256 = "1n96c5az0ls5hd9ahvskl3f6ygss7m6hmkj3ijlsh5hwga17zrhz"; }; }; @@ -1498,12 +1498,12 @@ let iceberg-vim = buildVimPluginFrom2Nix { pname = "iceberg-vim"; - version = "2019-11-07"; + version = "2020-03-06"; src = fetchFromGitHub { owner = "cocopon"; repo = "iceberg.vim"; - rev = "dc4b4b5838d126c22c44229a3ee170f6ac79ba86"; - sha256 = "1hicambipbgwf22fax782gpfmcndcpikj3bpf8v91wd5fxm7ik74"; + rev = "1740235846c92666fe521e550a27fa47ebe5f5a3"; + sha256 = "13zf899kgwjhrksznz2212ywml7nnqwq2dyam39nzywf8msg8va6"; }; }; @@ -1531,12 +1531,12 @@ let increment-activator = buildVimPluginFrom2Nix { pname = "increment-activator"; - version = "2019-05-09"; + version = "2020-03-09"; src = fetchFromGitHub { owner = "nishigori"; repo = "increment-activator"; - rev = "f341baf93b172aee646c90ff2ce28de0f897561b"; - sha256 = "0hda6h3qz6ynpl996rk1rm6xnxgkaz108v28qg0w6wm7qzynbmnv"; + rev = "bff5516da9103fb093ffc0dc993b8d535eacbceb"; + sha256 = "1swlv1mrck9s3n7fdg10c2nmlasf2fx8yfk01x3vii7l4aaa9w2y"; }; }; @@ -1564,12 +1564,12 @@ let indentLine = buildVimPluginFrom2Nix { pname = "indentLine"; - version = "2019-10-26"; + version = "2020-03-06"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "indentLine"; - rev = "bb548a975ebe4576073ca025eeb2743b4465ce1d"; - sha256 = "0r3jppigc6i562par0l36z7g5zyk2djvjvbl61vjzi0jk1d0gvjn"; + rev = "15aceda8c4eea621b66faa8673fca0b9fbe2f457"; + sha256 = "1icb1h811lp86hg4w8y8mmmsfm4c80n7m8r1wi58lnm60mjasas4"; }; }; @@ -1619,12 +1619,12 @@ let jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2020-02-27"; + version = "2020-03-07"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "686f39ac002ca31acd663ae8749982144484ff95"; - sha256 = "0ll0rnw00kl58a3dpvcx85dmd5j2figg6cc87qld2mn169qcx354"; + rev = "e83112f9aab147ab485ee7af72e01d047c5206d3"; + sha256 = "0yj1bsfn43crmfn0ylyzyz41z0vmvapl5cgm7k1rnbj96i7vifx7"; fetchSubmodules = true; }; }; @@ -1664,12 +1664,12 @@ let julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2020-02-13"; + version = "2020-03-02"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "8c0b9e8f87091ff17abbca752fa30e3a34ebb5a1"; - sha256 = "013c0zgh0d0zanys38k3q0bxp9xd5xjz92kjsr3b0in371yc7wv1"; + rev = "1db5eed71d7f5fe4b95b0dadfb3f798983485554"; + sha256 = "1rrmapsaly4kinq8aab2kbnpxnrpibgyrp6ri9qqyk2wdrlgq9lk"; }; }; @@ -1774,23 +1774,23 @@ let lh-brackets = buildVimPluginFrom2Nix { pname = "lh-brackets"; - version = "2020-02-02"; + version = "2020-03-02"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-brackets"; - rev = "05aaec7d82f15c135f97063d534332b3fd388474"; - sha256 = "11vp244x912fipfp8h61v7m361kjs6jq6g843avwskpjb2b4b40f"; + rev = "dc91bb1e8ef45a0810d9c1ad412863977c8c4baf"; + sha256 = "1yjmykn92i54cajr5wrj7m0wvaigy106c3hm8ks30xn4zm970x03"; }; }; lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2020-02-19"; + version = "2020-03-06"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "3077a653988ff1f3d6483a2281650ac6da5b7559"; - sha256 = "04g5rf1wcvxpkqbf3vkyjmkykqwi4dhp3l8i0mvng03gwpzfp0ym"; + rev = "3a8383f2efbd7496c17a70bf4593773f6149435f"; + sha256 = "0c6gnksyjyvsxqbp13q8bp9j4cg9x9m0kzrkx01p9k6wq297kpd9"; }; }; @@ -1884,12 +1884,12 @@ let ncm2 = buildVimPluginFrom2Nix { pname = "ncm2"; - version = "2020-02-10"; + version = "2020-03-05"; src = fetchFromGitHub { owner = "ncm2"; repo = "ncm2"; - rev = "605ea0ddcec45b33ec7db69119822a9a5d538823"; - sha256 = "1pjmxx3wxss25vdb5dqppr7ngkd9w52gzf6ani99flw3rzkmg9c5"; + rev = "6596df4631ee1ee17351a78f382d4efd0b82c05e"; + sha256 = "16276cjviij92ypqj9148828k4dhiywam0dz07v3rikknak11cra"; }; }; @@ -2016,12 +2016,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2020-01-05"; + version = "2020-03-03"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "b7ccdb2a7f9d20a1bbb6a5e4774104eb06969bb9"; - sha256 = "136qg04z92dnrgbwbjlc06qcd656sc004hznxdaic3pyq3lh25z4"; + rev = "69140aedb7da5a5a0b25b82e7f756f91d08170ea"; + sha256 = "132ksy20rb01xm18zwwl3lv5zapfhfvaf5zz6md8dnr5hvkvvrgx"; }; }; @@ -2038,12 +2038,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2020-02-20"; + version = "2020-03-08"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "76e5b2bad8e98e805ff4749068e6be6206bec2a0"; - sha256 = "17713a1bd405c8k2qa0b7mgw2pj58r83qnz3qhjxvg877vybag6n"; + rev = "1fe306e5feeb9423fd5c78b8623e38998bb149ae"; + sha256 = "1bixsgdraf3kzn8h3fv4a4jw58kd5r09binhjsx8622sla3j3pzy"; }; }; @@ -2071,23 +2071,23 @@ let neosnippet-vim = buildVimPluginFrom2Nix { pname = "neosnippet-vim"; - version = "2020-02-06"; + version = "2020-03-07"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "caa9b82220237865a2fbb846b0fa63f4a6a9eb7a"; - sha256 = "1rvc4za0vb5if144v07vj0aw7axq3mh1idhismyc4y31pfz59nap"; + rev = "8870feb5ab31e1acf8d80a3619f4ce47abf51a54"; + sha256 = "1q7sb4adpxkzdzyx7rlmkqzi612nsjkcs489m16j2jc20wsc2d9a"; }; }; NeoSolarized = buildVimPluginFrom2Nix { pname = "NeoSolarized"; - version = "2018-05-07"; + version = "2020-03-10"; src = fetchFromGitHub { owner = "icymind"; repo = "NeoSolarized"; - rev = "1af4bf6835f0fbf156c6391dc228cae6ea967053"; - sha256 = "1l98yh3438anq33a094p5qrnhcm60nr28crs0v4nfah7lfdy5mc2"; + rev = "70609c44215c8d2c43ad8c631296caae08a9c8d4"; + sha256 = "0bxrm2vm3z1y37sm6m2hdn72g2sw31dx1xhmjvd0ng72cnp84d9k"; }; }; @@ -2225,12 +2225,12 @@ let nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2020-02-13"; + version = "2020-03-03"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "64c471aa17ec1980a8f3304c11f00fa4174234bf"; - sha256 = "0nc6rn1wvdhka23jc52r7kccq81qda1ilal5c1qp0x0hr9ada58l"; + rev = "598a7ecd75bfe4ef32a09830f133afcf7b6d3927"; + sha256 = "1l9dljzmyxlnd6pxx7ivxlzw1sis4igqdpkm05khljvn2n6asyvp"; }; }; @@ -2247,12 +2247,12 @@ let nvim-lsp = buildVimPluginFrom2Nix { pname = "nvim-lsp"; - version = "2020-02-25"; + version = "2020-03-09"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lsp"; - rev = "1739274e24087565760b35a789a28bc217308ecf"; - sha256 = "08lmpagkxqgn06375bib8z9k3hm7b6q139vbkzc2hxpbg3xd4jfs"; + rev = "78b16eb3623c1c0d4433ca8e09c2cb661fa1a852"; + sha256 = "0fgj2yhfcdvpqs7012nwcinlndpfhzfzq9ac7kk0cib4m4vg1zxm"; }; }; @@ -2313,12 +2313,12 @@ let open-browser-vim = buildVimPluginFrom2Nix { pname = "open-browser-vim"; - version = "2020-02-20"; + version = "2020-03-06"; src = fetchFromGitHub { owner = "tyru"; repo = "open-browser.vim"; - rev = "a1091492328a57fac02e80641a86c9c64a95ebe1"; - sha256 = "10pbad4ad3lslx0kl4a79z8rlg19xcqi7wicfldk1l003badw7cw"; + rev = "57b894d0aa5f800220d25fdeeccf28d8a7f6ac89"; + sha256 = "0q87hna0irl431kmd4knblzkahrmw3mrnvw1cq19indfky85516v"; }; }; @@ -2456,12 +2456,12 @@ let quick-scope = buildVimPluginFrom2Nix { pname = "quick-scope"; - version = "2019-04-22"; + version = "2020-03-09"; src = fetchFromGitHub { owner = "unblevable"; repo = "quick-scope"; - rev = "994576d997a52b4c7828149e9f1325d1c4691ae2"; - sha256 = "0lr27vwv2bzva9s7f9d856vvls10icwli0kwj5v5f1q8y83fa4zd"; + rev = "2a12d429144cf083382a87743c1cb658cd314309"; + sha256 = "16cf9jdjkf7igqvf40snq71n52kpszdi76ijhxk03dxgycj0hfkb"; }; }; @@ -2610,12 +2610,12 @@ let rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2020-02-03"; + version = "2020-03-06"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "db0137dfad4690621e01dbae780fb4a2dd7dbf27"; - sha256 = "1c5yynl6clq6rvr17ma49npfiw5ssarrn8hdz9vgqwkvf879icmd"; + rev = "255a81f091a08786e004f215651227a2fef3a64c"; + sha256 = "0kn0yhh2cmd6h5wwz5y8v9j3mqb8ywmzzmdhglr6wmdlr7bkk75g"; }; }; @@ -2720,12 +2720,12 @@ let SpaceCamp = buildVimPluginFrom2Nix { pname = "SpaceCamp"; - version = "2020-02-23"; + version = "2020-03-06"; src = fetchFromGitHub { owner = "jaredgorski"; repo = "SpaceCamp"; - rev = "c35ee8509a9f690366b7d8c04cded9d9f07d8a86"; - sha256 = "18y7z79469lkcn293zyly306hm7dr1sq9dvnl69nc4a82cdpaha8"; + rev = "17b7f8cba9cc83ee684f72cc6f354f0677c0acf5"; + sha256 = "0rb9dx0lvqvfqyiizfjf812zi0ladjiq5hxjc15rgiw13ivxix0d"; }; }; @@ -3018,12 +3018,12 @@ let tsuquyomi = buildVimPluginFrom2Nix { pname = "tsuquyomi"; - version = "2020-01-21"; + version = "2020-03-10"; src = fetchFromGitHub { owner = "Quramy"; repo = "tsuquyomi"; - rev = "785af7476e0db2522372ef585c86947fc5625c81"; - sha256 = "1grjd7zpds9vgllf4y7iymbkxi9kaks1dccgmhkp0vas8hlvpiy6"; + rev = "85fffd5939c8fc5750b35a937b965af2ad5b0b15"; + sha256 = "1j5wdh0xa5yld4fy2msyjf1qvj8zx0iccc1bw63zzbrcl6rs30gx"; }; }; @@ -3040,12 +3040,12 @@ let ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2020-02-27"; + version = "2020-03-02"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "129d33fc34a72ced857f3cfb72ff10caf10f0020"; - sha256 = "1hf6d4rr2y4msjxqh0pjpdh6237992497wfj8jy0jalnp2j8icbx"; + rev = "e910b4fb9e276d18ed140fc492f30967ef9ace59"; + sha256 = "0fbrwmk4plg1zyz5vyay7jsj240l9p2ksjlp7yjs1g3l7qf71xxz"; }; }; @@ -3128,12 +3128,12 @@ let vim = buildVimPluginFrom2Nix { pname = "vim"; - version = "2020-01-02"; + version = "2020-03-03"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "5a633625615c79f87786d74ea925790ccdd82aba"; - sha256 = "0ng2qnwccpbqkhqilm7nj61217rvczxfcgkhdsxj3h2v4fj5ryy5"; + rev = "ed490ae07168ecd1636b9fe0998baeb770b87cd9"; + sha256 = "0b23r37az36kzlzr3k483r1yy142nmz09hc9wkwchs2zns30bqky"; }; }; @@ -3359,12 +3359,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-02-27"; + version = "2020-03-02"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "774cd8b08ff1569f86cba78e24ee06e448f86b4f"; - sha256 = "09hhgsbg5nnmzdpz4wclwgjnkxg2l1rvizhmv0wd7g6sshs9i83w"; + rev = "4e2546a2098954b74cbc612f573826f13d6fb88e"; + sha256 = "1z1xnvkaz1yjjq87kdyplx0zh0il0qkmr5lzwfq33jcnwlafz6xw"; }; }; @@ -3425,12 +3425,23 @@ let vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2020-02-21"; + version = "2020-03-02"; src = fetchFromGitHub { owner = "Chiel92"; repo = "vim-autoformat"; - rev = "db57d849f31cd81075c82d4827426a326de76dae"; - sha256 = "057clz1p9lkb0nvrqxgdsmm760sksg8pwa2wny3vc69hi7m1wr9w"; + rev = "b757f58c67908772a17300cf853ed0da653edeb2"; + sha256 = "0cl858hk7gaaxlj22d61mqiaypv76q85srskjay9s3px0mm5fanc"; + }; + }; + + vim-automkdir = buildVimPluginFrom2Nix { + pname = "vim-automkdir"; + version = "2016-01-17"; + src = fetchFromGitHub { + owner = "benizi"; + repo = "vim-automkdir"; + rev = "dec143a8d9b266f73a42c63ede85bfc26280f79d"; + sha256 = "00ix0y1ijbis8pj7pf6gv2g5z2s7kxwlr0viybwrs0li5acym6jp"; }; }; @@ -3678,12 +3689,12 @@ let vim-cursorword = buildVimPluginFrom2Nix { pname = "vim-cursorword"; - version = "2020-02-01"; + version = "2020-03-10"; src = fetchFromGitHub { owner = "itchyny"; repo = "vim-cursorword"; - rev = "80c4a28ad90a32fb40f01df44e6208bb7709753d"; - sha256 = "1cn605aj3qa11df8arhdsd6x0rpkz83w1r6a3g21cwd5j37x6gkr"; + rev = "8e859e4c54fda0728e8f0b5cc4f61c7ff193083f"; + sha256 = "0nq7x957xwz6fibb4m4daq2xp74n922lm46117lfhvpa0ii2rz0i"; }; }; @@ -3711,12 +3722,12 @@ let vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2020-02-08"; + version = "2020-03-08"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "b06f5418a434644f64ba9f218472b5aa86eb03a6"; - sha256 = "0prfygwiwv6i59p45rrvk0d5s68fc25hw5r44z9a90n6f8xsn740"; + rev = "ebaf80de4b4e12cc8ee068ad2f134f0b23ea039d"; + sha256 = "1lq2fqhca2dm55pa0rlq9l7acfif8vlkjd04hagxjbpa9ja348kl"; }; }; @@ -3843,12 +3854,12 @@ let vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2020-02-21"; + version = "2020-03-11"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "vim-elixir"; - rev = "85afa5e0de0ba0d640898e9d232552795fc726d2"; - sha256 = "1askl7ridl6np25ldf4mwqp7iavb9wj119qjqmjga8niylq80hnm"; + rev = "088cfc407460dea7b81c10b29db23843f85e7919"; + sha256 = "1w9w4arzlbjhd5kcvyv5fykq9djc4n4j1nc75qqlzsfggbjjwhbk"; }; }; @@ -4019,12 +4030,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2020-02-23"; + version = "2020-03-10"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "c452181975761f8b055b88eb1c98f736323510fd"; - sha256 = "0zx9p9y45h26imrzw9nm5balxw7dmv94ynd7cn8mvml29v0awv2g"; + rev = "4a24804adc25f915520c57a5504c45ca70e590e6"; + sha256 = "0rlyrljinnzp058cajchlzqr66fdnwrzznwfahj0y1wb1alfz45a"; }; }; @@ -4096,12 +4107,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-02-27"; + version = "2020-03-05"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "1bf0d57e01f930ccc1db3dacb3c169d6dc78d2cb"; - sha256 = "18imfrn948c20y7ymgh1xqsd82939dswj7hkf0b0fnsi0w9ydddk"; + rev = "52b66c0b125e095bc5a1d54d9810c5a0c8141906"; + sha256 = "05h3yz4f3zci5pdpxbgg9kmhfh65rc8kxq7l6mpk04v92b7pq6m9"; }; }; @@ -4206,12 +4217,12 @@ let vim-highlightedyank = buildVimPluginFrom2Nix { pname = "vim-highlightedyank"; - version = "2020-01-30"; + version = "2020-03-05"; src = fetchFromGitHub { owner = "machakann"; repo = "vim-highlightedyank"; - rev = "3871624ec89c9e8257b20044fd48a1836c05cbfc"; - sha256 = "0n99rva98m6qillax8anx9kby5n2826qql83wa4x3ibdjk1zng69"; + rev = "931cc6bd53e4a1fdbe592751f0e13c0e401f0a49"; + sha256 = "091qw0zlc80micn29wb6r8m4f7pplcv8bx1yfvbn3cba77qyj3nb"; }; }; @@ -4669,12 +4680,12 @@ let vim-monokai-pro = buildVimPluginFrom2Nix { pname = "vim-monokai-pro"; - version = "2019-10-12"; + version = "2020-03-03"; src = fetchFromGitHub { owner = "phanviet"; repo = "vim-monokai-pro"; - rev = "d99c93733f3461466773b52b26392cf9b35717c0"; - sha256 = "05vk9hgdldgmijawblslf4sly67lqxljx1y9qs4dl2cbvz8gw882"; + rev = "c18f35725a5b0d569bfe6921fc4f56c029324828"; + sha256 = "1nz8jnlhd6z9zqa9dfbxa9fabihpzz8ajlf4plkaxdy9137z1zqc"; }; }; @@ -4823,12 +4834,12 @@ let vim-orgmode = buildVimPluginFrom2Nix { pname = "vim-orgmode"; - version = "2019-12-13"; + version = "2020-03-03"; src = fetchFromGitHub { owner = "jceb"; repo = "vim-orgmode"; - rev = "c6cd668ed13af85d8292b524f827e729bf70ea0f"; - sha256 = "1239c0yc51jyp5shwpx2j7kbsb63qj6zp3k2lirppy8c2lls4nsv"; + rev = "44faafa1d846691645b66e83f198f46afa755a6e"; + sha256 = "1s649hksrwq70xyi8cvcd9bqcfyczga5c1g4fsas50rs107fcccn"; }; }; @@ -4966,12 +4977,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2020-01-25"; + version = "2020-03-05"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "35ea4d2b9072594b6c0ccf87bde7978ed9f94755"; - sha256 = "0r72q4wbja6qxk64lhqh6871xlndwi87w5cnxfq9bh7cnrx9dzhy"; + rev = "e86e0ad36ef9501acbc3e8c63a1d4fab104e47cb"; + sha256 = "0xr0fv26bxas315bvz0fkw11cg5j301vmy02a2aii90ljvyviv77"; }; }; @@ -5021,12 +5032,12 @@ let vim-ps1 = buildVimPluginFrom2Nix { pname = "vim-ps1"; - version = "2020-02-17"; + version = "2020-02-28"; src = fetchFromGitHub { owner = "PProvost"; repo = "vim-ps1"; - rev = "72de10080dcb7a906a51ed4eba67611c400df142"; - sha256 = "1ml521kkgiazjizpmn25p4kbmwdl46sc5mq6yzp9cskssbj2c416"; + rev = "7283c6bb25bbd45d8f6019da34c4f7e48c7644a3"; + sha256 = "0gfl5b5qnbgh9kdm6kfl7xn5jdkkgw1w78ckwvw6v6y72c0mhhhq"; }; }; @@ -5065,12 +5076,12 @@ let vim-racer = buildVimPluginFrom2Nix { pname = "vim-racer"; - version = "2020-02-06"; + version = "2020-03-06"; src = fetchFromGitHub { owner = "racer-rust"; repo = "vim-racer"; - rev = "bbfc89cef6ceda1a1bad2ece124be323134b74a8"; - sha256 = "1x6y95zps8bxdbcj5939yvw2nz65w1038rs60cjz0xjk0h6360zz"; + rev = "950b78f36e568134f5dcabc9a146c61e0084d220"; + sha256 = "0k62yybilh2052w6zfscw7daz7y1qnqv1311zngjim5z8xmp7j1l"; }; }; @@ -5307,12 +5318,12 @@ let vim-sneak = buildVimPluginFrom2Nix { pname = "vim-sneak"; - version = "2020-01-05"; + version = "2020-02-29"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-sneak"; - rev = "7afd63b4552b0827622ae27ff4c9eca056dd3521"; - sha256 = "0g9vsxbrsfcc0n7rq9m0331rcjyv35z0yc0d2cwkg939bzqw75qx"; + rev = "98a5c946d6dc76528b9d9b044059b5ef1fab5a48"; + sha256 = "0xcxr658i5vzdkxfssd7zx6n3ar9b6dg4b2ddaswgnwq75xphrh9"; }; }; @@ -5329,12 +5340,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2020-02-27"; + version = "2020-03-11"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "66975121c7c824cb7c4fa8f2ea53f824e538e3cb"; - sha256 = "0m1pw3iq29jpp439yzkaszjg1jiz5qkd16vfkskmk2kkg84y3kqn"; + rev = "8eafafe246152c94b64149dd04d9e03b87527eac"; + sha256 = "1mfw69283w3xk9kawn2ms160sjzmxpfdh4drdis27fg27i58yadd"; }; }; @@ -5461,12 +5472,12 @@ let vim-table-mode = buildVimPluginFrom2Nix { pname = "vim-table-mode"; - version = "2019-12-17"; + version = "2020-03-02"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-table-mode"; - rev = "0af25d72ebc0271648c8f91c0ce5c59174d2761b"; - sha256 = "1wqfc8bilknz1j1spk3iag99hmz5f1w87v95rb3cyp46ymrf9dcv"; + rev = "6412352b544bda764a9616c3090abb09729526bc"; + sha256 = "1z5v849vjbk4mdgkxs73b2nnvmqx7l6h3ycdb16qdhp9kppwmbvv"; }; }; @@ -5494,23 +5505,23 @@ let vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2020-02-27"; + version = "2020-03-03"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "a0046044670c412bcccc44aa80e5642785fb57a2"; - sha256 = "0c1qzc3ds7gvsp2vk7cszy11x57angmjwq1skfsk1zz7vgzhcj2i"; + rev = "89c47c6c68f6260ba34ee0733437d863046fbe95"; + sha256 = "1gkr3akvx44802i8cv4zw8j3bk5qk0h0rgz5k9jgkfch2yc76gzg"; }; }; vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2020-02-24"; + version = "2020-03-10"; src = fetchFromGitHub { owner = "janko-m"; repo = "vim-test"; - rev = "1dba5d0328b2d632a418dfc7b417ae83455cc342"; - sha256 = "0rm1ckriwajhskyybnq83m027lhki8p7c5cykzl5f05ax9rfiva6"; + rev = "e5c7c57a28a2ce8cba4ef6ff567d051d9f13014e"; + sha256 = "0iqv2mirwxmv3y194j64b317v34cbzljlfw2vhl993gccirfz960"; }; }; @@ -5582,12 +5593,12 @@ let vim-themis = buildVimPluginFrom2Nix { pname = "vim-themis"; - version = "2020-02-16"; + version = "2020-03-08"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-themis"; - rev = "734262315544ec4c78acdabd1ac9aae18644fcad"; - sha256 = "0sh9kqnkbbbiqsl8qwqslygl72h3wi83iw9iy2aj4zmw7k2g3i8w"; + rev = "2d10aee9c9982f4f5974e88351934759c69640e7"; + sha256 = "06ab0kjamzpyql71qmc8qhvb72rx07x2g598aidk8nqkk36x87ai"; }; }; @@ -5923,12 +5934,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-02-27"; + version = "2020-03-10"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "63593e05440bde5f1f4dbcd30447f410940f94c3"; - sha256 = "19fxcqbvxx2b60cj03qcaawwi88b7y4wamw9fk278d7q64933h2z"; + rev = "efa5d6e927fa47a1f48f85d34a4760a1447f2df8"; + sha256 = "1d44ihgcdl0j942vgjg59rzib4m7jy94k583hcnv3v9z8np4g0zp"; }; }; @@ -5967,12 +5978,12 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2020-02-27"; + version = "2020-03-11"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "6c8173a10633541fe99d54cc693874806e08858c"; - sha256 = "08p4xkrgzfb9b3r738lnsp4hrly9p5bbzcv446qcflbxmbmy3fw4"; + rev = "7c5301d87236999a6029640ca1cf86bfecf3bc29"; + sha256 = "1ghp69f4q365vvkq3081qhnasjgi00i3vfs97llnqachmqbwig2k"; }; }; @@ -5989,12 +6000,12 @@ let wal-vim = buildVimPluginFrom2Nix { pname = "wal-vim"; - version = "2020-01-31"; + version = "2020-03-06"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "wal.vim"; - rev = "4c880407bcb6a873e83f845168e8a4ce90dfa856"; - sha256 = "1ms9v8zwijz15m0vj2pg1p1svbvh9ghd072hgiqlbwphi2a5g9gn"; + rev = "10f228ce1e7947f62be412f916229131b7710239"; + sha256 = "0aiwsrcqnazam56cvwmck4bf7w543cr219bkmq0ngqzna72h9735"; }; }; @@ -6077,24 +6088,24 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2020-02-20"; + version = "2020-03-02"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "97f53f67097ddc87ab64bf8931c2798ea56e6184"; - sha256 = "15g38zl0x0a9vn4xql4siwvshlnvlz404d7w2falqp72hr91zzmn"; + rev = "68ef9623656fe9aaa53c1d9ab906f09c2c095f06"; + sha256 = "0cn1k8lda71vm4gx14ly9gdvk1j17jds0axx9jvjp4w9jid6ksqk"; fetchSubmodules = true; }; }; youcompleteme = buildVimPluginFrom2Nix { pname = "youcompleteme"; - version = "2020-02-19"; + version = "2020-03-10"; src = fetchFromGitHub { owner = "valloric"; repo = "youcompleteme"; - rev = "dd4a583e06f64751ac1439c30a9a40d82cdb741d"; - sha256 = "1imlp6sw6a2qgr6ih5fap1x83fzil5glq44lrs9d5an6wf1z8jzk"; + rev = "4dda6a71d9df17d8b44c9694bcfcdd55aac5b01d"; + sha256 = "0h8ywblhv8dhblsxpm431fqz6cy38a77hvvc0r6fsj7vlbcx1n2s"; fetchSubmodules = true; }; }; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 79418c62aa8..9729d223e85 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -64,10 +64,7 @@ self: super: { name = "LanguageClient-neovim-bin"; src = LanguageClient-neovim-src; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1w8g7pxwnjqp9zi47h4lz2mcg5daldsk5z72h8cjj750wng8a82c"; + cargoSha256 = "0w66fcrlaxf6zgkrfpgfybfbm759fzimnr3pjq6sm14frar7lhr6"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; # FIXME: Use impure version of CoreFoundation because of missing symbols. diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 0dc770ea29e..8defd658e53 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -21,6 +21,7 @@ ayu-theme/ayu-vim bazelbuild/vim-bazel bbchung/clighter8 benmills/vimux +benizi/vim-automkdir bhurlow/vim-parinfer bitc/vim-hdevtools bkad/camelcasemotion diff --git a/pkgs/misc/vscode-extensions/vscode-utils.nix b/pkgs/misc/vscode-extensions/vscode-utils.nix index 2216e425897..df8f24fcce7 100644 --- a/pkgs/misc/vscode-extensions/vscode-utils.nix +++ b/pkgs/misc/vscode-extensions/vscode-utils.nix @@ -1,9 +1,6 @@ -{ stdenv, lib, fetchurl, vscode, unzip }: +{ stdenv, lib, fetchurl, unzip }: let - extendedPkgVersion = lib.getVersion vscode; - extendedPkgName = lib.removeSuffix "-${extendedPkgVersion}" vscode.name; - mktplcExtRefToFetchArgs = ext: { url = "https://${ext.publisher}.gallery.vsassets.io/_apis/public/gallery/publisher/${ext.publisher}/extension/${ext.name}/${ext.version}/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage"; sha256 = ext.sha256; @@ -14,7 +11,6 @@ let buildVscodeExtension = a@{ name, - namePrefix ? "${extendedPkgName}-extension-", src, # Same as "Unique Identifier" on the extension's web page. # For the moment, only serve as unique extension dir. @@ -28,12 +24,12 @@ let }: stdenv.mkDerivation ((removeAttrs a [ "vscodeExtUniqueId" ]) // { - name = namePrefix + name; + name = "vscode-extension-${name}"; inherit vscodeExtUniqueId; inherit configurePhase buildPhase dontPatchELF dontStrip; - installPrefix = "share/${extendedPkgName}/extensions/${vscodeExtUniqueId}"; + installPrefix = "${vscodeExtUniqueId}"; buildInputs = [ unzip ] ++ buildInputs; diff --git a/pkgs/os-specific/linux/alsa-firmware/cross.patch b/pkgs/os-specific/linux/alsa-firmware/cross.patch new file mode 100644 index 00000000000..989ccea2b98 --- /dev/null +++ b/pkgs/os-specific/linux/alsa-firmware/cross.patch @@ -0,0 +1,347 @@ +--- a/hdsploader/Makefile.am 2015-02-26 20:36:03.000000000 +0800 ++++ b/hdsploader/Makefile.am 2019-06-28 00:43:41.557803832 +0800 +@@ -32,5 +32,14 @@ + tobin.c + CLEANFILES = $(dsp_hex_files) + +-$(dsp_hex_files): tobin +- ./tobin ++LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD) ++ ++$(tobin_OBJECTS) : CC=$(CC_FOR_BUILD) ++$(tobin_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD) ++$(tobin_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD) ++ ++tobin$(BUILD_EXEEXT): $(tobin_OBJECTS) ++ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@ ++ ++$(dsp_hex_files): tobin$(BUILD_EXEEXT) ++ ./$< +--- a/m4/ax_prog_cc_for_build.m4 2019-06-27 15:50:02.274134717 +0800 ++++ b/m4/ax_prog_cc_for_build.m4 2019-06-28 01:32:45.088117432 +0800 +@@ -0,0 +1,125 @@ ++# =========================================================================== ++# https://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html ++# =========================================================================== ++# ++# SYNOPSIS ++# ++# AX_PROG_CC_FOR_BUILD ++# ++# DESCRIPTION ++# ++# This macro searches for a C compiler that generates native executables, ++# that is a C compiler that surely is not a cross-compiler. This can be ++# useful if you have to generate source code at compile-time like for ++# example GCC does. ++# ++# The macro sets the CC_FOR_BUILD and CPP_FOR_BUILD macros to anything ++# needed to compile or link (CC_FOR_BUILD) and preprocess (CPP_FOR_BUILD). ++# The value of these variables can be overridden by the user by specifying ++# a compiler with an environment variable (like you do for standard CC). ++# ++# It also sets BUILD_EXEEXT and BUILD_OBJEXT to the executable and object ++# file extensions for the build platform, and GCC_FOR_BUILD to `yes' if ++# the compiler we found is GCC. All these variables but GCC_FOR_BUILD are ++# substituted in the Makefile. ++# ++# LICENSE ++# ++# Copyright (c) 2008 Paolo Bonzini ++# ++# Copying and distribution of this file, with or without modification, are ++# permitted in any medium without royalty provided the copyright notice ++# and this notice are preserved. This file is offered as-is, without any ++# warranty. ++ ++#serial 9 ++ ++AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD]) ++AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl ++AC_REQUIRE([AC_PROG_CC])dnl ++AC_REQUIRE([AC_PROG_CPP])dnl ++AC_REQUIRE([AC_EXEEXT])dnl ++AC_REQUIRE([AC_CANONICAL_HOST])dnl ++ ++dnl Use the standard macros, but make them use other variable names ++dnl ++pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl ++pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl ++pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl ++pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl ++pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl ++pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl ++pushdef([ac_cv_objext], ac_cv_build_objext)dnl ++pushdef([ac_exeext], ac_build_exeext)dnl ++pushdef([ac_objext], ac_build_objext)dnl ++pushdef([CC], CC_FOR_BUILD)dnl ++pushdef([CPP], CPP_FOR_BUILD)dnl ++pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl ++pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl ++pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl ++pushdef([host], build)dnl ++pushdef([host_alias], build_alias)dnl ++pushdef([host_cpu], build_cpu)dnl ++pushdef([host_vendor], build_vendor)dnl ++pushdef([host_os], build_os)dnl ++pushdef([ac_cv_host], ac_cv_build)dnl ++pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl ++pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl ++pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl ++pushdef([ac_cv_host_os], ac_cv_build_os)dnl ++pushdef([ac_cpp], ac_build_cpp)dnl ++pushdef([ac_compile], ac_build_compile)dnl ++pushdef([ac_link], ac_build_link)dnl ++ ++save_cross_compiling=$cross_compiling ++save_ac_tool_prefix=$ac_tool_prefix ++cross_compiling=no ++ac_tool_prefix= ++ ++AC_PROG_CC ++AC_PROG_CPP ++AC_EXEEXT ++ ++ac_tool_prefix=$save_ac_tool_prefix ++cross_compiling=$save_cross_compiling ++ ++dnl Restore the old definitions ++dnl ++popdef([ac_link])dnl ++popdef([ac_compile])dnl ++popdef([ac_cpp])dnl ++popdef([ac_cv_host_os])dnl ++popdef([ac_cv_host_vendor])dnl ++popdef([ac_cv_host_cpu])dnl ++popdef([ac_cv_host_alias])dnl ++popdef([ac_cv_host])dnl ++popdef([host_os])dnl ++popdef([host_vendor])dnl ++popdef([host_cpu])dnl ++popdef([host_alias])dnl ++popdef([host])dnl ++popdef([LDFLAGS])dnl ++popdef([CPPFLAGS])dnl ++popdef([CFLAGS])dnl ++popdef([CPP])dnl ++popdef([CC])dnl ++popdef([ac_objext])dnl ++popdef([ac_exeext])dnl ++popdef([ac_cv_objext])dnl ++popdef([ac_cv_exeext])dnl ++popdef([ac_cv_prog_cc_g])dnl ++popdef([ac_cv_prog_cc_cross])dnl ++popdef([ac_cv_prog_cc_works])dnl ++popdef([ac_cv_prog_gcc])dnl ++popdef([ac_cv_prog_CPP])dnl ++ ++dnl Finally, set Makefile variables ++dnl ++BUILD_EXEEXT=$ac_build_exeext ++BUILD_OBJEXT=$ac_build_objext ++AC_SUBST(BUILD_EXEEXT)dnl ++AC_SUBST(BUILD_OBJEXT)dnl ++AC_SUBST([CFLAGS_FOR_BUILD])dnl ++AC_SUBST([CPPFLAGS_FOR_BUILD])dnl ++AC_SUBST([LDFLAGS_FOR_BUILD])dnl ++]) +--- a/configure.ac 2019-06-27 23:58:31.045413144 +0800 ++++ b/configure.ac 2019-06-28 01:45:36.511771656 +0800 +@@ -1,6 +1,8 @@ + AC_PREREQ(2.59) + AC_INIT(alsa-firmware, 1.0.29) ++AC_CONFIG_MACRO_DIR([m4]) + AC_PROG_CC ++AC_PROG_CC_FOR_BUILD + AC_PROG_INSTALL + AC_PROG_LN_S + AC_HEADER_STDC +--- a/vxloader/Makefile.am 2015-02-26 20:36:03.000000000 +0800 ++++ b/vxloader/Makefile.am 2019-06-28 01:55:19.525947146 +0800 +@@ -43,5 +43,14 @@ + hotplugfw_DATA = + endif + +-%.xlx: %.rbt toxlx +- ./toxlx < $< > $@ ++LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD) ++ ++$(toxlx_OBJECTS) : CC=$(CC_FOR_BUILD) ++$(toxlx_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD) ++$(toxlx_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD) ++ ++toxlx$(BUILD_EXEEXT): $(toxlx_OBJECTS) ++ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@ ++ ++%.xlx: %.rbt toxlx$(BUILD_EXEEXT) ++ ./toxlx$(BUILD_EXEEXT) < $< > $@ +--- a/echoaudio/Makefile.am 2015-02-26 20:36:03.000000000 +0800 ++++ b/echoaudio/Makefile.am 2019-06-28 02:00:00.579426080 +0800 +@@ -74,33 +74,42 @@ + hotplugfw_DATA = + endif + +-$(firmware_files): fw_writer +- ./fw_writer DSP/LoaderDSP.c loader_dsp.fw +- ./fw_writer DSP/Darla20DSP.c darla20_dsp.fw +- ./fw_writer DSP/Gina20DSP.c gina20_dsp.fw +- ./fw_writer DSP/Layla20DSP.c layla20_dsp.fw +- ./fw_writer ASIC/LaylaASIC.c layla20_asic.fw +- ./fw_writer DSP/Darla24DSP.c darla24_dsp.fw +- ./fw_writer DSP/Gina24DSP.c gina24_301_dsp.fw +- ./fw_writer ASIC/Gina24ASIC.c gina24_301_asic.fw +- ./fw_writer DSP/Gina24_361DSP.c gina24_361_dsp.fw +- ./fw_writer ASIC/Gina24ASIC_361.c gina24_361_asic.fw +- ./fw_writer DSP/Layla24DSP.c layla24_dsp.fw +- ./fw_writer ASIC/Layla24_1ASIC.c layla24_1_asic.fw +- ./fw_writer ASIC/Layla24_2A_ASIC.c layla24_2A_asic.fw +- ./fw_writer ASIC/Layla24_2S_ASIC.c layla24_2S_asic.fw +- ./fw_writer DSP/MonaDSP.c mona_301_dsp.fw +- ./fw_writer ASIC/Mona1ASIC48.c mona_301_1_asic_48.fw +- ./fw_writer ASIC/Mona1ASIC96.c mona_301_1_asic_96.fw +- ./fw_writer DSP/Mona361DSP.c mona_361_dsp.fw +- ./fw_writer ASIC/Mona1ASIC48_361.c mona_361_1_asic_48.fw +- ./fw_writer ASIC/Mona1ASIC96_361.c mona_361_1_asic_96.fw +- ./fw_writer ASIC/Mona2ASIC.c mona_2_asic.fw +- ./fw_writer DSP/MiaDSP.c mia_dsp.fw +- ./fw_writer DSP/Echo3gDSP.c echo3g_dsp.fw +- ./fw_writer ASIC/3G_ASIC.c 3g_asic.fw +- ./fw_writer DSP/IndigoDSP.c indigo_dsp.fw +- ./fw_writer DSP/IndigoIODSP.c indigo_io_dsp.fw +- ./fw_writer DSP/IndigoIOxDSP.c indigo_iox_dsp.fw +- ./fw_writer DSP/IndigoDJDSP.c indigo_dj_dsp.fw +- ./fw_writer DSP/IndigoDJxDSP.c indigo_djx_dsp.fw ++LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD) ++ ++$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD) ++$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD) ++$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD) ++ ++fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS) ++ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@ ++ ++$(firmware_files): fw_writer$(BUILD_EXEEXT) ++ ./fw_writer$(BUILD_EXEEXT) DSP/LoaderDSP.c loader_dsp.fw ++ ./fw_writer$(BUILD_EXEEXT) DSP/Darla20DSP.c darla20_dsp.fw ++ ./fw_writer$(BUILD_EXEEXT) DSP/Gina20DSP.c gina20_dsp.fw ++ ./fw_writer$(BUILD_EXEEXT) DSP/Layla20DSP.c layla20_dsp.fw ++ ./fw_writer$(BUILD_EXEEXT) ASIC/LaylaASIC.c layla20_asic.fw ++ ./fw_writer$(BUILD_EXEEXT) DSP/Darla24DSP.c darla24_dsp.fw ++ ./fw_writer$(BUILD_EXEEXT) DSP/Gina24DSP.c gina24_301_dsp.fw ++ ./fw_writer$(BUILD_EXEEXT) ASIC/Gina24ASIC.c gina24_301_asic.fw ++ ./fw_writer$(BUILD_EXEEXT) DSP/Gina24_361DSP.c gina24_361_dsp.fw ++ ./fw_writer$(BUILD_EXEEXT) ASIC/Gina24ASIC_361.c gina24_361_asic.fw ++ ./fw_writer$(BUILD_EXEEXT) DSP/Layla24DSP.c layla24_dsp.fw ++ ./fw_writer$(BUILD_EXEEXT) ASIC/Layla24_1ASIC.c layla24_1_asic.fw ++ ./fw_writer$(BUILD_EXEEXT) ASIC/Layla24_2A_ASIC.c layla24_2A_asic.fw ++ ./fw_writer$(BUILD_EXEEXT) ASIC/Layla24_2S_ASIC.c layla24_2S_asic.fw ++ ./fw_writer$(BUILD_EXEEXT) DSP/MonaDSP.c mona_301_dsp.fw ++ ./fw_writer$(BUILD_EXEEXT) ASIC/Mona1ASIC48.c mona_301_1_asic_48.fw ++ ./fw_writer$(BUILD_EXEEXT) ASIC/Mona1ASIC96.c mona_301_1_asic_96.fw ++ ./fw_writer$(BUILD_EXEEXT) DSP/Mona361DSP.c mona_361_dsp.fw ++ ./fw_writer$(BUILD_EXEEXT) ASIC/Mona1ASIC48_361.c mona_361_1_asic_48.fw ++ ./fw_writer$(BUILD_EXEEXT) ASIC/Mona1ASIC96_361.c mona_361_1_asic_96.fw ++ ./fw_writer$(BUILD_EXEEXT) ASIC/Mona2ASIC.c mona_2_asic.fw ++ ./fw_writer$(BUILD_EXEEXT) DSP/MiaDSP.c mia_dsp.fw ++ ./fw_writer$(BUILD_EXEEXT) DSP/Echo3gDSP.c echo3g_dsp.fw ++ ./fw_writer$(BUILD_EXEEXT) ASIC/3G_ASIC.c 3g_asic.fw ++ ./fw_writer$(BUILD_EXEEXT) DSP/IndigoDSP.c indigo_dsp.fw ++ ./fw_writer$(BUILD_EXEEXT) DSP/IndigoIODSP.c indigo_io_dsp.fw ++ ./fw_writer$(BUILD_EXEEXT) DSP/IndigoIOxDSP.c indigo_iox_dsp.fw ++ ./fw_writer$(BUILD_EXEEXT) DSP/IndigoDJDSP.c indigo_dj_dsp.fw ++ ./fw_writer$(BUILD_EXEEXT) DSP/IndigoDJxDSP.c indigo_djx_dsp.fw +--- a/emu/Makefile.am 2015-02-26 20:36:03.000000000 +0800 ++++ b/emu/Makefile.am 2019-06-28 02:01:37.856710042 +0800 +@@ -22,5 +22,14 @@ + hotplugfw_DATA = + endif + +-$(firmware_files): fw_writer +- ./fw_writer ++LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD) ++ ++$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD) ++$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD) ++$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD) ++ ++fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS) ++ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@ ++ ++$(firmware_files): fw_writer$(BUILD_EXEEXT) ++ ./fw_writer$(BUILD_EXEEXT) +--- a/maestro3/Makefile.am 2015-02-26 20:36:03.000000000 +0800 ++++ b/maestro3/Makefile.am 2019-06-28 02:03:13.704828106 +0800 +@@ -17,5 +17,14 @@ + hotplugfw_DATA = + endif + +-$(firmware_files): fw_writer +- ./fw_writer ++LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD) ++ ++$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD) ++$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD) ++$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD) ++ ++fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS) ++ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@ ++ ++$(firmware_files): fw_writer$(BUILD_EXEEXT) ++ ./fw_writer$(BUILD_EXEEXT) +--- a/sb16/Makefile.am 2015-02-26 20:36:03.000000000 +0800 ++++ b/sb16/Makefile.am 2019-06-28 02:04:37.121743871 +0800 +@@ -18,5 +18,14 @@ + hotplugfw_DATA = + endif + +-$(firmware_files): fw_writer +- ./fw_writer ++LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD) ++ ++$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD) ++$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD) ++$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD) ++ ++fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS) ++ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@ ++ ++$(firmware_files): fw_writer$(BUILD_EXEEXT) ++ ./fw_writer$(BUILD_EXEEXT) +--- a/wavefront/Makefile.am 2019-06-28 02:07:27.003727160 +0800 ++++ b/wavefront/Makefile.am 2019-06-28 02:07:46.477947626 +0800 +@@ -17,5 +17,14 @@ + hotplugfw_DATA = + endif + +-$(firmware_files): fw_writer +- ./fw_writer ++LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD) ++ ++$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD) ++$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD) ++$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD) ++ ++fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS) ++ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@ ++ ++$(firmware_files): fw_writer$(BUILD_EXEEXT) ++ ./fw_writer$(BUILD_EXEEXT) +--- a/ymfpci/Makefile.am 2015-02-26 20:36:03.000000000 +0800 ++++ b/ymfpci/Makefile.am 2019-06-28 02:09:02.487797826 +0800 +@@ -17,5 +17,14 @@ + hotplugfw_DATA = + endif + +-$(firmware_files): fw_writer +- ./fw_writer ++LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD) ++ ++$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD) ++$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD) ++$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD) ++ ++fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS) ++ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@ ++ ++$(firmware_files): fw_writer$(BUILD_EXEEXT) ++ ./fw_writer$(BUILD_EXEEXT) diff --git a/pkgs/os-specific/linux/alsa-firmware/default.nix b/pkgs/os-specific/linux/alsa-firmware/default.nix index 7f0ba5498df..d0a3d7645b3 100644 --- a/pkgs/os-specific/linux/alsa-firmware/default.nix +++ b/pkgs/os-specific/linux/alsa-firmware/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{ stdenv, buildPackages, autoreconfHook, fetchurl, fetchpatch }: stdenv.mkDerivation rec { name = "alsa-firmware-1.2.1"; @@ -8,6 +8,13 @@ stdenv.mkDerivation rec { sha256 = "1aq8z8ajpjvcx7bwhwp36bh5idzximyn77ygk3ifs0my3mbpr8mf"; }; + patches = [ (fetchpatch { + url = "https://github.com/alsa-project/alsa-firmware/commit/a8a478485a999ff9e4a8d8098107d3b946b70288.patch"; + sha256 = "0zd7vrgz00hn02va5bkv7qj2395a1rl6f8jq1mwbryxs7hiysb78"; + }) ]; + + nativeBuildInputs = [ autoreconfHook buildPackages.stdenv.cc ]; + configureFlags = [ "--with-hotplug-dir=$(out)/lib/firmware" ]; diff --git a/pkgs/os-specific/linux/apparmor/cross.patch b/pkgs/os-specific/linux/apparmor/cross.patch deleted file mode 100644 index f7e95ecfb40..00000000000 --- a/pkgs/os-specific/linux/apparmor/cross.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/parser/libapparmor_re/Makefile 2018-10-14 07:38:06.000000000 +0800 -+++ b/parser/libapparmor_re/Makefile 2019-06-28 16:16:33.741916660 +0800 -@@ -10,6 +10,7 @@ - - TARGET=libapparmor_re.a - -+AR ?= ar - CFLAGS ?= -g -Wall -O2 ${EXTRA_CFLAGS} -std=gnu++0x - CXXFLAGS := ${CFLAGS} ${INCLUDE_APPARMOR} - -@@ -22,7 +23,7 @@ - UNITTESTS = tst_parse - - libapparmor_re.a: parse.o expr-tree.o hfa.o chfa.o aare_rules.o -- ar ${ARFLAGS} $@ $^ -+ ${AR} ${ARFLAGS} $@ $^ - - expr-tree.o: expr-tree.cc expr-tree.h - diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index de9601dc85e..9bdd1ae029f 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -14,7 +14,7 @@ let apparmor-series = "2.13"; - apparmor-patchver = "3"; + apparmor-patchver = "4"; apparmor-version = apparmor-series + "." + apparmor-patchver; apparmor-meta = component: with stdenv.lib; { @@ -27,7 +27,7 @@ let apparmor-sources = fetchurl { url = "https://launchpad.net/apparmor/${apparmor-series}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz"; - sha256 = "0fbnk9fzjsffwcijsv2wwykmybvfdckpqk99qlib3kb89him6w16"; + sha256 = "03nislxccnbxld89giak2s8xa4mdbwscfxbdwhmw5qpvgz08dgwh"; }; prePatchCommon = '' @@ -49,13 +49,6 @@ let sha256 = "1m4dx901biqgnr4w4wz8a2z9r9dxyw7wv6m6mqglqwf2lxinqmp4"; }) # (alpine patches {1,4,5,6,8} are needed for apparmor 2.11, but not 2.12) - ] ++ [ - ./cross.patch - # Support Python 3.8 - (fetchpatch { - url = https://gitlab.com/apparmor/apparmor/commit/ccbf1e0bf1bf5c3bbab47029fbbc5415ef73bac1.patch; - sha256 = "0kfzc0wyjybj38n10yvwakaaqvglalzigd3kk7gcrbp1xdn70pq2"; - }) ]; # Set to `true` after the next FIXME gets fixed or this gets some diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index ffb14e9c3c1..949d953c3bd 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -1,18 +1,15 @@ -{ stdenv, fetchFromGitHub, makeWrapper, cmake, llvmPackages, kernel +{ stdenv, fetchurl, makeWrapper, cmake, llvmPackages, kernel , flex, bison, elfutils, python, luajit, netperf, iperf, libelf , systemtap, bash }: python.pkgs.buildPythonApplication rec { - version = "0.12.0"; + version = "0.13.0"; name = "bcc-${version}"; - src = fetchFromGitHub { - owner = "iovisor"; - repo = "bcc"; - rev = "v${version}"; - sha256 = "1r2yjxam23k56prsvjhqf8i8d3irhcvmy0bly6x23h1jc3zc6yym"; - fetchSubmodules = true; + src = fetchurl { + url = "https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"; + sha256 = "15xpwf17x2j1c1wcb84cgfs35dp5w0rjd9mllmddmdjvn303wffx"; }; format = "other"; diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index 6dbf6ace693..2a6ce13c162 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -2,26 +2,19 @@ stdenv.mkDerivation rec { pname = "evdi"; - version = "-unstable-20190116"; + version = "unstable-20200222"; src = fetchFromGitHub { owner = "DisplayLink"; repo = pname; - rev = "391f1f71e4c86fc18de27947c78e02b5e3e9f128"; - sha256 = "147cwmk57ldchvzr06lila6av7jvcdggs9jgifqscklp9x6dc4ny"; + rev = "bb3038c1b10aae99feddc7354c74a5bf22341246"; + sha256 = "058f8gdma6fndg2w512l08mwl79h4hffacx4rnfkjxrb2ard3gd1"; }; nativeBuildInputs = kernel.moduleBuildDependencies; buildInputs = [ kernel libdrm ]; - patches = [ - (fetchpatch { - url = "https://crazy.dev.frugalware.org/evdi-all-in-one-fixes.patch"; - sha256 = "03hs68v8c2akf8a4rc02m15fzyp14ay70rcx8kwg2y98qkqh7w30"; - }) - ]; - makeFlags = [ "KVER=${kernel.modDirVersion}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" diff --git a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch index 262c2cbc4f1..a13251476de 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch +++ b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch @@ -1,8 +1,8 @@ diff --git a/data/meson.build b/data/meson.build -index d59bdc88..4a4cfc35 100644 +index 0667bd78..92d6c7b9 100644 --- a/data/meson.build +++ b/data/meson.build -@@ -16,7 +16,7 @@ +@@ -17,7 +17,7 @@ endif if build_standalone install_data(['daemon.conf'], @@ -15,7 +15,7 @@ diff --git a/data/pki/meson.build b/data/pki/meson.build index eefcc914..dc801fa1 100644 --- a/data/pki/meson.build +++ b/data/pki/meson.build -@@ -4,14 +4,14 @@ +@@ -4,14 +4,14 @@ if get_option('gpg') 'GPG-KEY-Linux-Foundation-Firmware', 'GPG-KEY-Linux-Vendor-Firmware-Service', ], @@ -32,7 +32,7 @@ index eefcc914..dc801fa1 100644 ) endif -@@ -19,12 +19,12 @@ +@@ -19,12 +19,12 @@ if get_option('pkcs7') install_data([ 'LVFS-CA.pem', ], @@ -51,7 +51,7 @@ diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build index 826a3c1d..b78db663 100644 --- a/data/remotes.d/meson.build +++ b/data/remotes.d/meson.build -@@ -3,7 +3,7 @@ +@@ -3,7 +3,7 @@ if build_daemon and get_option('lvfs') 'lvfs.conf', 'lvfs-testing.conf', ], @@ -60,7 +60,7 @@ index 826a3c1d..b78db663 100644 ) i18n.merge_file( input: 'lvfs.metainfo.xml', -@@ -37,12 +37,12 @@ +@@ -37,12 +37,12 @@ configure_file( output : 'vendor.conf', configuration : con2, install: true, @@ -79,7 +79,7 @@ diff --git a/meson.build b/meson.build index b1a523d2..aacb8e0a 100644 --- a/meson.build +++ b/meson.build -@@ -169,6 +169,12 @@ +@@ -169,6 +169,12 @@ endif mandir = join_paths(prefix, get_option('mandir')) localedir = join_paths(prefix, get_option('localedir')) @@ -96,7 +96,7 @@ diff --git a/meson_options.txt b/meson_options.txt index be0adfef..73983333 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -26,6 +26,7 @@ +@@ -26,6 +26,7 @@ option('plugin_coreboot', type : 'boolean', value : true, description : 'enable option('systemd', type : 'boolean', value : true, description : 'enable systemd support') option('systemdunitdir', type: 'string', value: '', description: 'Directory for systemd units') option('elogind', type : 'boolean', value : false, description : 'enable elogind support') @@ -108,7 +108,7 @@ diff --git a/plugins/dell-esrt/meson.build b/plugins/dell-esrt/meson.build index ed4eee70..76dbdb1d 100644 --- a/plugins/dell-esrt/meson.build +++ b/plugins/dell-esrt/meson.build -@@ -37,5 +37,5 @@ +@@ -37,5 +37,5 @@ configure_file( output : 'dell-esrt.conf', configuration : con2, install: true, @@ -119,7 +119,7 @@ diff --git a/plugins/redfish/meson.build b/plugins/redfish/meson.build index 25fc5c7d..77eb9a83 100644 --- a/plugins/redfish/meson.build +++ b/plugins/redfish/meson.build -@@ -27,7 +27,7 @@ +@@ -27,7 +27,7 @@ shared_module('fu_plugin_redfish', ) install_data(['redfish.conf'], @@ -132,7 +132,7 @@ diff --git a/plugins/thunderbolt/meson.build b/plugins/thunderbolt/meson.build index 06ab34ee..297a9182 100644 --- a/plugins/thunderbolt/meson.build +++ b/plugins/thunderbolt/meson.build -@@ -46,7 +46,7 @@ +@@ -46,7 +46,7 @@ executable('tbtfwucli', ) install_data(['thunderbolt.conf'], @@ -142,11 +142,11 @@ index 06ab34ee..297a9182 100644 # we use functions from 2.52 in the tests if get_option('tests') and umockdev.found() and gio.version().version_compare('>= 2.52') diff --git a/plugins/uefi/meson.build b/plugins/uefi/meson.build -index 39b5f566..0f904a22 100644 +index 7252580d..7188d1c5 100644 --- a/plugins/uefi/meson.build +++ b/plugins/uefi/meson.build -@@ -87,7 +87,7 @@ - ) +@@ -104,7 +104,7 @@ if get_option('man') + endif install_data(['uefi.conf'], - install_dir: join_paths(sysconfdir, 'fwupd') @@ -154,3 +154,14 @@ index 39b5f566..0f904a22 100644 ) if get_option('tests') +diff --git a/plugins/upower/meson.build b/plugins/upower/meson.build +index 290a3eb6..9ab2f452 100644 +--- a/plugins/upower/meson.build ++++ b/plugins/upower/meson.build +@@ -23,5 +23,5 @@ shared_module('fu_plugin_upower', + ) + + install_data(['upower.conf'], +- install_dir: join_paths(sysconfdir, 'fwupd') ++ install_dir: join_paths(sysconfdir_install, 'fwupd') + ) diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index aa6aeca9549..86a2bfbcc9e 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -2,7 +2,6 @@ { stdenv , fetchurl -, fetchpatch , substituteAll , gtk-doc , pkgconfig @@ -88,11 +87,11 @@ in stdenv.mkDerivation rec { pname = "fwupd"; - version = "1.3.8"; + version = "1.3.9"; src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "14hbwp3263n4z61ws62vj50kh9a89fz2l29hyv7f1xlas4zz6j8x"; + sha256 = "ZuRG+UN8ebXv5Z8fOYWT0eCtHykGXoB8Ysu3wAeqx0A="; }; # libfwupd goes to lib @@ -163,12 +162,6 @@ stdenv.mkDerivation rec { # needs a different set of modules than po/make-images inherit installedTestsPython; }) - - # Find the correct lds and crt name when specifying -Defi_ldsdir - (fetchpatch { - url = "https://github.com/fwupd/fwupd/commit/52cda3db9ca9ab4faf99310edf29df926a713b5c.patch"; - sha256 = "0hsj79dzamys7ryz33iwxwd58kb1h7gaw637whm0nkvzkqq6rm16"; - }) ]; postPatch = '' @@ -271,6 +264,7 @@ stdenv.mkDerivation rec { "fwupd/remotes.d/vendor.conf" "fwupd/remotes.d/vendor-directory.conf" "fwupd/thunderbolt.conf" + "fwupd/upower.conf" # "fwupd/uefi.conf" # already created by the module "pki/fwupd/GPG-KEY-Hughski-Limited" "pki/fwupd/GPG-KEY-Linux-Foundation-Firmware" diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/os-specific/linux/ipset/default.nix index 6696252678d..2c433ba8c29 100644 --- a/pkgs/os-specific/linux/ipset/default.nix +++ b/pkgs/os-specific/linux/ipset/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ipset"; - version = "7.5"; + version = "7.6"; src = fetchurl { url = "http://ipset.netfilter.org/${pname}-${version}.tar.bz2"; - sha256 = "02vangpxdyyk9z84vc0ba1vbjvfnd6zlniisc029xzkgmdafwym5"; + sha256 = "1ny2spcm6bmpj8vnazssg99k59impr7n84jzkdmdjly1m7548z8f"; }; nativeBuildInputs = [ pkgconfig ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-kmod=no" ]; meta = with stdenv.lib; { - homepage = http://ipset.netfilter.org/; + homepage = "http://ipset.netfilter.org/"; description = "Administration tool for IP sets"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index e925068421d..2c8b8de65b3 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 156a4cf4423..3010d87a178 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-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index dc961e116d7..363f8eb9174 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.172"; + version = "4.14.173"; # 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/v4.x/linux-${version}.tar.xz"; - sha256 = "0yi13cky6jdswca7nrjgcrdxk8rnqdbhblhy6mws103mjfms2613"; + sha256 = "0kxp3mgiags8hdax15masab9zr89xraqvl9ri7zwgksx8ixav0m2"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 6fc004a57ae..ae5da9fe92f 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.107"; + version = "4.19.109"; # 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/v4.x/linux-${version}.tar.xz"; - sha256 = "0h02pxzzwc5w2kfqw686bpxc13a93yq449lyzxxkxq1qilcsqjv5"; + sha256 = "0kwnlv5336vqdf38dzn077ic17zkb4rl5khxmc47syzd9zm4fhnh"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index a76f2fc7562..27fcb5020d7 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.215"; + version = "4.4.216"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "00zy6cxwb16pqziiqs25pz5llryx2v2nbk9vvzpzxa8x43ad7g18"; + sha256 = "1hjgh9brvxzi6ypgfnk07l3j28xsxgz88sdshnz19vj96bn1w70q"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index e065257af82..4d12bec7617 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.215"; + version = "4.9.216"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0j4z2al318654z40w4f8zhh73zwpgn8igjr5k4mz401phm3jyvr3"; + sha256 = "0lgv5k8v5xz9z2z4k42566bh0akyk1gr0dx6s1m1rjrzsf9k86l6"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index c1ea3b1cd97..5773b171f74 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.23"; + 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 = "1jhyg2yc03fka92l7hwdajim6q5rk538hjdr1gwgvpfyyp6sla1z"; + sha256 = "09ay0adc3s3m7qk0nj5lkmrp5i0q76a9kax0xix8914d115rgvf0"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.5.nix b/pkgs/os-specific/linux/kernel/linux-5.5.nix index 3f8f3b774c8..bcd67b0af42 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.5.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.5.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.5.7"; + version = "5.5.9"; # 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 = "0j3ykz9yym2hvv3qx286g4yrx2ala4b1d5p9zif9qmch28ryyhxq"; + sha256 = "0y58gkzadjwfqfry5568g4w4p2mpx2sw50sk95i07s5va1ly2dd4"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 77a4327e89f..4098c30c744 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.6-rc3"; + version = "5.6-rc5"; extraMeta.branch = "5.6"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1w265k9rspg9rkmay6cy6r1rxy4javpj1f6ify4jc3zpwqmp4ymk"; + sha256 = "0ys4wdv1rf9vshras1n6syy2pgg8kv50f27nprfzhrllni044whr"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/kernel/mptcp-config.nix b/pkgs/os-specific/linux/kernel/mptcp-config.nix index e5e3ee283ff..9752e63d9f9 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/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index 1294bd3d268..b9626aac22d 100644 --- a/pkgs/os-specific/linux/libbpf/default.nix +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchFromGitHub, pkgconfig -, libelf +, libelf, zlib }: with builtins; stdenv.mkDerivation rec { pname = "libbpf"; - version = "0.0.3pre114_${substring 0 7 src.rev}"; + version = "0.0.7"; src = fetchFromGitHub { - owner = "libbpf"; - repo = "libbpf"; - rev = "672ae75b66fd8780a4214fe7b116c427e0809a52"; - sha256 = "1bdw1hc4m95irmybqlwax85b6m856g07p2slcw8b7jw3k4j9x075"; + owner = "libbpf"; + repo = "libbpf"; + rev = "v${version}"; + sha256 = "1jcqhqvfbnbijm4jn949ibw1qywai9rwhyijf6lg8cvnyxkib2bs"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libelf ]; + buildInputs = [ libelf zlib ]; sourceRoot = "source/src"; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix index 7acee410a4e..15a3fa5f04f 100644 --- a/pkgs/os-specific/linux/lxcfs/default.nix +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -3,13 +3,13 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "lxcfs-3.1.2"; + name = "lxcfs-4.0.0"; src = fetchFromGitHub { owner = "lxc"; repo = "lxcfs"; rev = name; - sha256 = "195skz6wc2gfcf99f1fz1yaw29ngzg9lphnkag7yxnk3ffbhv40s"; + sha256 = "0p9fl7zya65wsxg2vabdc0jrhw6mdz081cacd7np4zrppv16v6dx"; }; nativeBuildInputs = [ pkgconfig help2man autoreconfHook ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://linuxcontainers.org/lxcfs; + homepage = "https://linuxcontainers.org/lxcfs"; description = "FUSE filesystem for LXC"; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/pkgs/os-specific/linux/net-tools/default.nix index 3cd8f224ce4..7b1a0234a4f 100644 --- a/pkgs/os-specific/linux/net-tools/default.nix +++ b/pkgs/os-specific/linux/net-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "net-tools"; - version = "1.60_p20170221182432"; + version = "1.60_p20180626073013"; src = fetchurl { url = "mirror://gentoo/distfiles/${pname}-${version}.tar.xz"; - sha256 = "08r4r2a24g5bm8jwgfa998gs1fld7fgbdf7pilrpsw1m974xn04a"; + sha256 = "0mzsjjmz5kn676w2glmxwwd8bj0xy9dhhn21aplb435b767045q4"; }; preBuild = diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix index 34e2591d44a..43859dc9af3 100644 --- a/pkgs/os-specific/linux/open-iscsi/default.nix +++ b/pkgs/os-specific/linux/open-iscsi/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "open-iscsi"; - version = "2.1.0"; + version = "2.1.1"; nativeBuildInputs = [ autoconf automake gettext libtool perl pkgconf ]; buildInputs = [ kmod openisns.lib openssl systemd utillinux ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "open-iscsi"; repo = "open-iscsi"; rev = version; - sha256 = "0z7rnbfa48j3r4ij7335xgjfb835gnnp10v7q6lvwg7bq6v5xvih"; + sha256 = "1xa3mbid9mkajp8mr8jx6cymv0kd7yqs96jvff54n6wb9qhn9qll"; }; DESTDIR = "$(out)"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A high performance, transport independent, multi-platform implementation of RFC3720"; license = licenses.gpl2; - homepage = https://www.open-iscsi.com; + homepage = "https://www.open-iscsi.com"; platforms = platforms.linux; maintainers = with maintainers; [ cleverca22 zaninime ]; }; diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index 53fc986d9f6..f0fb0a834ff 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -8,12 +8,12 @@ let _kernel = kernel; pythonEnv = python3.withPackages (ps: with ps; [ six ]); in stdenv.mkDerivation rec { - version = "2.12.0"; + version = "2.13.0"; pname = "openvswitch"; src = fetchurl { url = "https://www.openvswitch.org/releases/${pname}-${version}.tar.gz"; - sha256 = "1y78ix5inhhcvicbvyy2ij38am1215nr55vydhab3d4065q45z8k"; + sha256 = "0cd5vmfr6zwgcnkwys6rag6cmz68v0librpaplianv734xs74pyx"; }; kernel = optional (_kernel != null) _kernel.dev; @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { support distribution across multiple physical servers similar to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V. ''; - homepage = https://www.openvswitch.org/; + homepage = "https://www.openvswitch.org/"; license = licenses.asl20; maintainers = with maintainers; [ netixx kmcopper ]; }; diff --git a/pkgs/os-specific/linux/r8125/default.nix b/pkgs/os-specific/linux/r8125/default.nix new file mode 100644 index 00000000000..a837b226138 --- /dev/null +++ b/pkgs/os-specific/linux/r8125/default.nix @@ -0,0 +1,45 @@ +{ stdenv, lib, fetchFromGitHub, kernel }: + +stdenv.mkDerivation rec { + pname = "r8125"; + # On update please verify (using `diff -r`) that the source matches the + # realtek version. + version = "9.003.02"; + + # This is a mirror. The original website[1] doesn't allow non-interactive + # downloads, instead emailing you a download link. + # [1] https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software + src = fetchFromGitHub { + owner = "ibmibmibm"; + repo = "r8125"; + rev = "${version}"; + sha256 = "09ip17x8nhcpxkkhyyawkmd10n73j2ffh1i2nmsr7l3jfq7f9zac"; + }; + + hardeningDisable = [ "pic" ]; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + preBuild = '' + substituteInPlace src/Makefile --replace "BASEDIR :=" "BASEDIR ?=" + substituteInPlace src/Makefile --replace "modules_install" "INSTALL_MOD_PATH=$out modules_install" + ''; + + makeFlags = [ + "BASEDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}" + ]; + + buildFlags = [ "modules" ]; + + meta = with lib; { + homepage = "https://github.com/ibmibmibm/r8125"; + downloadPage = "https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"; + description = "Realtek r8125 driver"; + longDescription = '' + A kernel module for Realtek 8125 2.5G network cards. + ''; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ peelz ]; + }; +} diff --git a/pkgs/os-specific/linux/sdparm/default.nix b/pkgs/os-specific/linux/sdparm/default.nix index 5517f163b3e..e0392e442bf 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/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index c66b4cbab83..baaa90e431b 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { substituteInPlace include/pathnames.h \ --replace "/bin/login" "${shadow}/bin/login" substituteInPlace sys-utils/eject.c \ - --replace "/bin/umount" "$out/bin/umount" + --replace "/bin/umount" "$bin/bin/umount" ''; # !!! It would be better to obtain the path to the mount helpers diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 8fd207e9175..e7f0eb73c86 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -2,17 +2,18 @@ , docbook_xml_dtd_45, docbook_xsl, zip, unzip, rsync, getconf, socat , procps, coreutils, gnused, systemd, glibcLocales , AppKit, Carbon, Cocoa +, nixosTests }: stdenv.mkDerivation rec { pname = "rabbitmq-server"; - version = "3.8.2"; + version = "3.8.3"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "17gixahxass9n4d697my8sq4an51rw3cicb36fqvl8fbhnwjjrwc"; + sha256 = "1fhs3g2pgrq2xi4hnlc437hkv3261l4i134m6mxid00sf1c89p5f"; }; buildInputs = @@ -59,10 +60,14 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://www.rabbitmq.com/; + homepage = "https://www.rabbitmq.com/"; description = "An implementation of the AMQP messaging protocol"; license = stdenv.lib.licenses.mpl11; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ Profpatsch ]; }; + + passthru.tests = { + vm-test = nixosTests.rabbitmq; + }; } diff --git a/pkgs/servers/ankisyncd/default.nix b/pkgs/servers/ankisyncd/default.nix new file mode 100644 index 00000000000..e1098670123 --- /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 a4eed02af71..611db53d645 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/blockbook/default.nix b/pkgs/servers/blockbook/default.nix index b95c3d41b39..b931e8cfcb2 100644 --- a/pkgs/servers/blockbook/default.nix +++ b/pkgs/servers/blockbook/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { pname = "blockbook"; - version = "0.3.1"; + version = "0.3.2"; goPackagePath = "blockbook"; @@ -22,7 +22,7 @@ buildGoPackage rec { owner = "trezor"; repo = "blockbook"; rev = "v${version}"; - sha256 = "0qgd1f3b4vavw55mvpvwvlya39dx1c3kjsc7n46nn7kpc152jv1l"; + sha256 = "0hcgz4b7k8ia4dnjg6bbii95sqg3clc40ybwwc4qz3jv21ikc54x"; }; goDeps = ./deps.nix; diff --git a/pkgs/servers/blockbook/deps.nix b/pkgs/servers/blockbook/deps.nix index 90ff098581a..9f9ae0a4704 100644 --- a/pkgs/servers/blockbook/deps.nix +++ b/pkgs/servers/blockbook/deps.nix @@ -9,6 +9,33 @@ sha256 = "02davg672v9sz8l7a8s0b8m87154p42hkm5r6pavf4gqziw8bmr4"; }; } + { + goPackagePath = "github.com/allegro/bigcache"; + fetch = { + type = "git"; + url = "https://github.com/allegro/bigcache"; + rev = "69ea0af04088faa57adb9ac683934277141e92a5"; + sha256 = "0ac9pgzgi9lhklkqmc5f5x3d0cbyxjfpadc6mdbd7hdr7rfrjmxf"; + }; + } + { + goPackagePath = "github.com/aristanetworks/goarista"; + fetch = { + type = "git"; + url = "https://github.com/aristanetworks/goarista"; + rev = "8e7d5b18fe7ad671e07097d5445dbc70422663b2"; + sha256 = "1jbjviz8qi8izhvdvnbc5d9nqyxfww75ffcvxyhw5yxw9r1v0sn2"; + }; + } + { + goPackagePath = "github.com/agl/ed25519"; + fetch = { + type = "git"; + url = "https://github.com/agl/ed25519"; + rev = "5312a61534124124185d41f09206b9fef1d88403"; + sha256 = "1v8mhkf1m3ga5262s75vabskxvsw5rpqvi5nwhxwiv7gfk6h823i"; + }; + } { goPackagePath = "github.com/beorn7/perks"; fetch = { @@ -45,6 +72,15 @@ sha256 = "02dl46wcnfpg9sqvg0ipipkpnd7lrf4fnvb9zy56jqa7mfcwc7wk"; }; } + { + goPackagePath = "github.com/dchest/blake256"; + fetch = { + type = "git"; + url = "https://github.com/dchest/blake256"; + rev = "dee3fe6eb0e98dc774a94fc231f85baf7c29d360"; + sha256 = "18hkfm1zlkf6fsjzljiz5cjxxcf3kl5p9617si8xjggb33adzhyg"; + }; + } { goPackagePath = "github.com/deckarep/golang-set"; fetch = { @@ -54,13 +90,40 @@ sha256 = "01kaqrc5ywbwa46b6lz3db7kkg8q6v383h4lnxds4z3kjglkqaff"; }; } + { + goPackagePath = "github.com/decred/base58"; + fetch = { + type = "git"; + url = "https://github.com/decred/base58"; + rev = "dbeddd8aab76c31eb2ea98351a63fa2c6bf46888"; + sha256 = "0fm0gsz5myin4n15gx3fhi9pk82p6v0sxza945yvny7n13q44ns5"; + }; + } + { + goPackagePath = "github.com/decred/dcrd"; + fetch = { + type = "git"; + url = "https://github.com/decred/dcrd"; + rev = "e3e8c47c68b010dbddeb783ebad32a3a4993dd71"; + sha256 = "0zifsxhrjx282kvsqj80qr3v4af8hx4g6dqvrb6xggpkcaski8b4"; + }; + } + { + goPackagePath = "github.com/decred/slog"; + fetch = { + type = "git"; + url = "https://github.com/decred/slog"; + rev = "fbd821ef791ba2b8ae945f5d44f4e49396d230c5"; + sha256 = "0n3c7saiv4j22kjc1pf3771n6khx4g99n8vn4qvvv0i5vv04585n"; + }; + } { goPackagePath = "github.com/ethereum/go-ethereum"; fetch = { type = "git"; url = "https://github.com/ethereum/go-ethereum"; - rev = "8bbe72075e4e16442c4e28d999edee12e294329e"; - sha256 = "0q0w0vz85d94wym3xni8y22vly886j6g6zn9hizcww1nanvk4nl6"; + rev = "24d727b6d6e2c0cde222fa12155c4a6db5caaf2e"; + sha256 = "0vrhwfavx3gciihf406f2qfrhvhnygvlj2icbswq0d01dx3s566m"; }; } { @@ -140,8 +203,8 @@ fetch = { type = "git"; url = "https://github.com/martinboehm/btcutil"; - rev = "225ed00dbbd5cb8d8b3949a0ee7c9ea540754585"; - sha256 = "0dn5s6h1524q38glp6fcdws97lyvmchq26dhbd3dqazrq61dhdvy"; + rev = "a3d2b8457b77d37c3813742d4030e199b6e09111"; + sha256 = "0152cyabklv9l39dm1g30jb7hzdv9rj45mp3v9x4kvaza58nz0x4"; }; } { @@ -275,8 +338,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "d6449816ce06963d9d136eee5a56fca5b0616e7e"; - sha256 = "17dkprbbk84q165275zwhcn0s6pcarigq37zlhsxj23pq2qz3aqy"; + rev = "a832865fa7ada6126f4c6124ac49f71be71bff2a"; + sha256 = "0bikp74pdi9fsvfdgy0k0r8ipzz96hy28zm8qpky0vdbwqci0a8p"; }; } { diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index e5fc3ac5bb9..7d6fa7d9c91 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.2.1"; + version = "4.3.0"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "07w9av3v9zjnb1fhknmza168yxsq4zr2jqcla7yg10ajrhsk534d"; + sha256 = "13v2iah7z10wc43v9agcjrzi3wds4jna8f0b7ph35nyzhzr31h9b"; }; nativeBuildInputs = [ pkgconfig ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "A recursive DNS server"; - homepage = https://www.powerdns.com/; + homepage = "https://www.powerdns.com/"; platforms = platforms.linux; license = licenses.gpl2; maintainers = with maintainers; [ rnhmjoj ]; diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index cbd71085340..c7d6c509f09 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, talloc, finger_bsd, perl +{ stdenv, fetchurl, fetchpatch, autoreconfHook, talloc, finger_bsd, perl , openssl , linkOpenssl? true , openldap @@ -71,13 +71,29 @@ stdenv.mkDerivation rec { "--localstatedir=/var" ] ++ optional (!linkOpenssl) "--with-openssl=no"; + patches = stdenv.lib.optional withRest (fetchpatch { + # Fix HTTP/2 in rest + url = "https://github.com/FreeRADIUS/freeradius-server/commit/6286520698a3cc4053b4d49eb0a61d9ba77632aa.patch"; + sha256 = "1ycvr3ql1mfkvzydnn4aiygnidicv2hgllppv37nb1p2pk02159g"; + }); + postPatch = '' substituteInPlace src/main/checkrad.in --replace "/usr/bin/finger" "${finger_bsd}/bin/finger" ''; + # By default, freeradius will generate Diffie-Hellman parameters and + # self-signed TLS certificates during installation. We don't want + # this, for several reasons: + # - reproducibility (random generation) + # - we don't want _anybody_ to use a cert where the private key is on our public binary cache! + # - we don't want the certs to change each time the package is rebuilt + # So let's avoid anything getting into our output. + makeFlags = [ "LOCAL_CERT_FILES=" ]; + installFlags = [ "sysconfdir=\${out}/etc" "localstatedir=\${TMPDIR}" + "INSTALL_CERT_FILES=" # see comment at makeFlags ]; outputs = [ "out" "dev" "man" "doc" ]; @@ -86,7 +102,7 @@ stdenv.mkDerivation rec { homepage = https://freeradius.org/; description = "A modular, high performance free RADIUS suite"; license = licenses.gpl2; - maintainers = with maintainers; [ sheenobu willibutz ]; + maintainers = with maintainers; [ sheenobu willibutz fpletz lheckemann elseym ]; platforms = with platforms; linux; }; diff --git a/pkgs/servers/grocy/config-locations.patch b/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch similarity index 54% rename from pkgs/servers/grocy/config-locations.patch rename to pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch index 475be78ec20..654d96ae4e1 100644 --- a/pkgs/servers/grocy/config-locations.patch +++ b/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch @@ -1,8 +1,20 @@ -diff --git a/app.php b/app.php -index 5f91e4d..09c6010 100644 ---- a/app.php -+++ b/app.php -@@ -23,7 +23,7 @@ else +From 931958d8f11cb55f2e88a178a3b828f3c537eba8 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Fri, 6 Mar 2020 23:43:58 +0100 +Subject: [PATCH] Define configs with env vars + +--- + app.php | 4 ++-- + services/DatabaseService.php | 2 +- + services/FilesService.php | 2 +- + services/StockService.php | 2 +- + 4 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/app.php b/app.php +index af65ad1..4963c28 100644 +--- a/app.php ++++ b/app.php +@@ -25,7 +25,7 @@ else require_once __DIR__ . '/vendor/autoload.php'; // Load config files @@ -11,20 +23,20 @@ index 5f91e4d..09c6010 100644 require_once __DIR__ . '/config-dist.php'; // For not in own config defined values we use the default ones // Definitions for dev/demo/prerelease mode -@@ -49,7 +49,7 @@ $appContainer = new \Slim\Container([ - ], - 'view' => function($container) - { -- return new \Slim\Views\Blade(__DIR__ . '/views', GROCY_DATAPATH . '/viewcache'); -+ return new \Slim\Views\Blade(__DIR__ . '/views', getenv('GROCY_CACHE_DIR')); - }, - 'LoginControllerInstance' => function($container) - { -diff --git a/services/DatabaseService.php b/services/DatabaseService.php -index 0bcf9b8..ec45e93 100644 ---- a/services/DatabaseService.php -+++ b/services/DatabaseService.php -@@ -13,7 +13,7 @@ class DatabaseService +@@ -50,7 +50,7 @@ $app = AppFactory::create(); + $container = $app->getContainer(); + $container->set('view', function(Container $container) + { +- return new Slim\Views\Blade(__DIR__ . '/views', GROCY_DATAPATH . '/viewcache'); ++ return new \Slim\Views\Blade(__DIR__ . '/views', getenv('GROCY_CACHE_DIR')); + }); + $container->set('LoginControllerInstance', function(Container $container) + { +diff --git a/services/DatabaseService.php b/services/DatabaseService.php +index 23fc7b9..daa1993 100644 +--- a/services/DatabaseService.php ++++ b/services/DatabaseService.php +@@ -25,7 +25,7 @@ class DatabaseService return GROCY_DATAPATH . '/grocy_' . GROCY_CULTURE . '.db'; } @@ -32,25 +44,25 @@ index 0bcf9b8..ec45e93 100644 + return getenv('GROCY_DB_FILE'); } - private $DbConnectionRaw; -diff --git a/services/FilesService.php b/services/FilesService.php -index 7933b73..f52657e 100644 ---- a/services/FilesService.php -+++ b/services/FilesService.php -@@ -12,7 +12,7 @@ class FilesService extends BaseService + private static $DbConnectionRaw = null; +diff --git a/services/FilesService.php b/services/FilesService.php +index cecdae3..357298d 100644 +--- a/services/FilesService.php ++++ b/services/FilesService.php +@@ -12,7 +12,7 @@ class FilesService extends BaseService { parent::__construct(); - + - $this->StoragePath = GROCY_DATAPATH . '/storage'; + $this->StoragePath = getenv('GROCY_STORAGE_DIR'); - + if (!file_exists($this->StoragePath)) { -diff --git a/services/StockService.php b/services/StockService.php -index d7482ef..d1399a7 100644 ---- a/services/StockService.php -+++ b/services/StockService.php -@@ -933,7 +933,7 @@ class StockService extends BaseService +diff --git a/services/StockService.php b/services/StockService.php +index bfde3fc..53b2245 100644 +--- a/services/StockService.php ++++ b/services/StockService.php +@@ -934,7 +934,7 @@ class StockService extends BaseService throw new \Exception('No barcode lookup plugin defined'); } @@ -59,3 +71,6 @@ index d7482ef..d1399a7 100644 if (file_exists($path)) { require_once $path; +-- +2.25.0 + diff --git a/pkgs/servers/grocy/default.nix b/pkgs/servers/grocy/default.nix index 7af59f6904c..718d4b1bcde 100644 --- a/pkgs/servers/grocy/default.nix +++ b/pkgs/servers/grocy/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "grocy"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { url = "https://github.com/grocy/grocy/releases/download/v${version}/grocy_${version}.zip"; - sha256 = "1d4hy495in7p0i4fnhai1yqhjhmblv1g30siggmqpjrzdiiw3bak"; + sha256 = "1fq1zlxxhpcxj67xxlgf20dia95xcimgnm13cr56sy9f2vjx58m6"; }; nativeBuildInputs = [ unzip ]; @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { unzip ${src} -d . ''; - patches = [ ./config-locations.patch ]; + patches = [ ./0001-Define-configs-with-env-vars.patch ]; + patchFlags = [ "--binary" "-p1" ]; dontBuild = true; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 2b2bdabc626..6b18dd30f30 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 9f7b3fed4a5..2b571fe96bf 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 f297212442c..1446518fbc5 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 65c2bcfbfd4..a5c6e9d0961 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 138864aec7d..0e07454bbc5 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 b5282d862af..16782966944 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 8b36e7de69f..c56e994ed54 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/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix new file mode 100644 index 00000000000..be78e1aa831 --- /dev/null +++ b/pkgs/servers/imgproxy/default.nix @@ -0,0 +1,32 @@ +{ lib, buildGoModule, fetchFromGitHub, pkg-config, vips, gobject-introspection }: + +buildGoModule rec { + pname = "imgproxy"; + version = "2.8.1"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + sha256 = "00hhgh6nrzg2blc6yl8rph5h5w7swlkbh0zgsj7xr0lkm10879pc"; + rev = "v${version}"; + }; + + modSha256 = "0kgd8lwcdns3skvd4bj4z85mq6hkk79mb0zzwky0wqxni8f73s6w"; + + buildInputs = [ + gobject-introspection + pkg-config + vips + ]; + + preBuild = '' + export CGO_LDFLAGS_ALLOW='-(s|w)' + ''; + + meta = with lib; { + description = "Fast and secure on-the-fly image processing server written in Go"; + homepage = "https://imgproxy.net"; + license = licenses.mit; + maintainers = with maintainers; [ paluh ]; + }; +} diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index cbac1a42352..9d9ae4e25b4 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.12.1301"; + version = "0.13.467"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.LinuxAMDx64.tar.gz"; - sha256 = "03glp5qhyb6bldslbhivywcfbxpv374q9aaybz5f2s0r9il5cb35"; + sha256 = "1hjihafb8w9gcqdi2i8dmimbbg17c5hwwqhav3avfizq2drsrv5c"; }; buildInputs = [ makeWrapper ]; @@ -32,9 +32,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "API Support for your favorite torrent trackers."; - homepage = https://github.com/Jackett/Jackett/; + homepage = "https://github.com/Jackett/Jackett/"; license = licenses.gpl2; maintainers = with maintainers; [ edwtjo nyanloutre ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index 6da342ae880..6cac79bdd4e 100644 --- a/pkgs/servers/jellyfin/default.nix +++ b/pkgs/servers/jellyfin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, unzip, sqlite, makeWrapper, dotnet-netcore, ffmpeg, +{ stdenv, lib, fetchurl, unzip, sqlite, makeWrapper, dotnetCorePackages, ffmpeg, fontconfig, freetype }: let @@ -18,12 +18,12 @@ let in stdenv.mkDerivation rec { pname = "jellyfin"; - version = "10.4.3"; + version = "10.5.0"; # Impossible to build anything offline with dotnet src = fetchurl { url = "https://github.com/jellyfin/jellyfin/releases/download/v${version}/jellyfin_${version}_portable.tar.gz"; - sha256 = "11scxcwf02h6gvll0jwwac1wcpwz8d2y16yc3da0hrhy34yhysbl"; + sha256 = "1r6ljl535f8jchm5zvrwfl4aqjk5bg7sqbwr03yyjxgriqgf36lp"; }; buildInputs = [ @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - dotnet-netcore + dotnetCorePackages.aspnetcore_3_1 sqlite ]; @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { install -dm 755 "$out/opt/jellyfin" cp -r * "$out/opt/jellyfin" - makeWrapper "${dotnet-netcore}/bin/dotnet" $out/bin/jellyfin \ + makeWrapper "${dotnetCorePackages.aspnetcore_3_1}/bin/dotnet" $out/bin/jellyfin \ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ sqlite fontconfig freetype stdenv.cc.cc.lib ]}:$out/opt/jellyfin/runtimes/${runtimeDir}/native/" \ diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 12da51f9f23..fd27d18b503 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -9,7 +9,7 @@ }: stdenv.mkDerivation rec { - name = "dovecot-2.3.9.3"; + name = "dovecot-2.3.10"; nativeBuildInputs = [ perl pkgconfig ]; buildInputs = @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dovecot.org/releases/2.3/${name}.tar.gz"; - sha256 = "0lcnqib63nv32xr3nr4s3x8k77mbgrhc13swjl2xqnzw4fabd7zq"; + sha256 = "1ibiz3k2flablkcqbkvfzsjnq5b5kxximhcrplflsjl57mr88ca7"; }; enableParallelBuilding = true; @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { ++ lib.optional withSQLite "--with-sqlite"; meta = { - homepage = https://dovecot.org/; + homepage = "https://dovecot.org/"; description = "Open source IMAP and POP3 email server written with security primarily in mind"; maintainers = with stdenv.lib.maintainers; [ peti rickynils fpletz globin ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index 583c6b739cd..2a4ac3e1776 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.34.2"; + version = "0.34.3"; src = fetchurl { url = "http://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "02hpm8h98dsxyjs736bss3pk253aayf9dr7csj6qn3y68hs67jpk"; + sha256 = "0kvjqdzr9zb65c2kaqb39x8s71ynpp56aax2h1x37rds4zxdg2yg"; }; nativeBuildInputs = [ makeWrapper ]; 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 ec1f82507ce..39adc6b78ee 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 aa4db2239f0..715a52ec99c 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 46e1460d795..22f768b94e1 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/mikrotik-exporter.nix b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix new file mode 100644 index 00000000000..12341eee911 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix @@ -0,0 +1,22 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "mikrotik-exporter-unstable"; + version = "2020-02-10"; + + src = fetchFromGitHub { + owner = "nshttpd"; + repo = "mikrotik-exporter"; + sha256 = "193zh06rqp9ybsnkxwmv7l4p2h2xisw4f01jjirshsb784j44bh6"; + rev = "3b33400d24abcfdc07dc31c15ca5ba7b82de444f"; + }; + + modSha256 = "1cqjn6j3dfq51ssjx0qrajprlac1h0lb1r4af44lfpigzmrfyi07"; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "Prometheus MikroTik device(s) exporter"; + license = licenses.bsd3; + maintainers = with maintainers; [ mmilata ]; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index 48afc610c61..0a707519c64 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/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix index 15802510da3..1a7a2ebdf21 100644 --- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "18khym7ygj29w98zf6i1l5c2pz84zla2z34l5jnh595xvwfl94pc"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1bi9nr1dhyv322pq6fjrhs12h3wdak53mvwkbyim1hmrp62vky4m"; + cargoSha256 = "0m7xa610k260gxn2xg6bc2y6fww0p72mvvik7278j2d15044c4yl"; buildInputs = lib.optional stdenv.isDarwin Security; @@ -26,8 +23,8 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A Prometheus exporter for WireGuard, written in Rust."; + homepage = "https://github.com/MindFlavor/prometheus_wireguard_exporter"; license = licenses.mit; - homepage = https://github.com/MindFlavor/prometheus_wireguard_exporter; maintainers = with maintainers; [ ma27 globin ]; }; } diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 22fc4ebf39e..9b23e9ac501 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/plex/raw.nix b/pkgs/servers/plex/raw.nix index 24422842e35..666da136351 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -8,13 +8,13 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.18.7.2438-f342a5a43"; + version = "1.18.7.2457-77cb9455c"; pname = "plexmediaserver"; # Fetch the source src = fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm"; - sha256 = "07lill29ck5h6lnrxj4k709afh36d6giy4jzv1jwcvcq1hdrvmzh"; + sha256 = "1lhsf4qrq77vqj63a6r0gm90nnlqg50b6v24lrpld1aia9akm9f1"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index 61fee03a7a1..b0871a99f67 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "radarr"; - version = "0.2.0.1450"; + version = "0.2.0.1480"; src = fetchurl { url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz"; - sha256 = "1sknq6fifpmgzryr07dnriaw2x425v2zxdcqzm65viw5p5j9xh00"; + sha256 = "066kr9fk2ipid11aq057rqzy3b2kgd5qf9msq1fsmxixqg82m64h"; }; nativeBuildInputs = [ makeWrapper ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Usenet/BitTorrent movie downloader"; - homepage = https://radarr.video/; + homepage = "https://radarr.video/"; license = licenses.gpl3; maintainers = with maintainers; [ edwtjo ]; platforms = platforms.all; diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index 92cee87197d..8df674111ad 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 298e771fa7a..5a58a52210a 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 866dd8021d0..f57a6e8fa50 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/trezord/default.nix b/pkgs/servers/trezord/default.nix index e6427e5970f..7bdee09fca3 100644 --- a/pkgs/servers/trezord/default.nix +++ b/pkgs/servers/trezord/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "trezord-go"; - version = "2.0.28"; + version = "2.0.29"; goPackagePath = "github.com/trezor/trezord-go"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "trezor"; repo = "trezord-go"; rev = "v${version}"; - sha256 = "02c1mvn01gcfls37sa0c7v2lwffg14x54np8z7d4hjzxxzwg4gpw"; + sha256 = "1ks1fa0027s3xp0z6qp0dxmayvrb4dwwscfhbx7da0khp153f2cp"; }; propagatedBuildInputs = [ trezor-udev-rules ]; diff --git a/pkgs/servers/ums/default.nix b/pkgs/servers/ums/default.nix index 3fb2817277a..503ff16caee 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/servers/unpfs/default.nix b/pkgs/servers/unpfs/default.nix index dc228c25915..9b67a901693 100644 --- a/pkgs/servers/unpfs/default.nix +++ b/pkgs/servers/unpfs/default.nix @@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec { sourceRoot = "source/example/unpfs"; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1d33nwj3i333a6ji3r3037mgg553lc3wsawm0pz13kbvhjf336i8"; + cargoSha256 = "13mk86d8ql2196039qb7z0rx4svwffw1mzpiyxp35gg5fhcphriq"; RUSTC_BOOTSTRAP = 1; diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index 09a8d21c4ce..90a9a88986e 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -3,16 +3,16 @@ let versions = { matomo = { - version = "3.13.2"; - sha256 = "1psysdz60h5rvgbsflkfprygxnh3kq60snqamyss07rk0ahbcb16"; + version = "3.13.3"; + sha256 = "11mv7q33nhlz9ylsmwrhs315p14imr7sgr70gdbmi9p8jxc7kxrz"; }; matomo-beta = { - version = "3.13.2"; + version = "3.13.3"; # `beta` examples: "b1", "rc1", null # TOOD when updating: use null if stable version is >= latest beta or release candidate beta = null; - sha256 = "1psysdz60h5rvgbsflkfprygxnh3kq60snqamyss07rk0ahbcb16"; + sha256 = "11mv7q33nhlz9ylsmwrhs315p14imr7sgr70gdbmi9p8jxc7kxrz"; }; }; common = pname: { version, sha256, beta ? null }: diff --git a/pkgs/servers/web-apps/moodle/default.nix b/pkgs/servers/web-apps/moodle/default.nix index 3de6005a3cf..98bd8e0027f 100644 --- a/pkgs/servers/web-apps/moodle/default.nix +++ b/pkgs/servers/web-apps/moodle/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, writeText }: let - version = "3.8.1"; + version = "3.8.2"; stableVersion = builtins.substring 0 2 (builtins.replaceStrings ["."] [""] version); in @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz"; - sha256 = "1xz2wq16blw9p2b6wlrn9lr524gddm5jyac5prka8kp6lrk0v0y1"; + sha256 = "134vxsbslk7sfalmgcp744aygaxz2k080d14j8nkivk9zhplds53"; }; phpConfig = writeText "config.php" '' diff --git a/pkgs/servers/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch b/pkgs/servers/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch new file mode 100644 index 00000000000..6ca55a14768 --- /dev/null +++ b/pkgs/servers/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch @@ -0,0 +1,32 @@ +From db38a11228eceea10dc97ecc87023b4919caa918 Mon Sep 17 00:00:00 2001 +From: Daniel Fullmer +Date: Fri, 21 Feb 2020 21:52:00 -0500 +Subject: [PATCH] Don't use file timestamp in cache filename + +Every file in the nix store has a timestamp of "1", meaning that the +filename would remain constant even when changing zoneminder versions. +This would mean that newer versions would use the existing symlink to an +older version of the source file. We replace SRC_HASH in nix with a +hash of the source used to build zoneminder to ensure this filename is +unique. +--- + web/includes/functions.php | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/web/includes/functions.php b/web/includes/functions.php +index 19567a5c1..0242c09bc 100644 +--- a/web/includes/functions.php ++++ b/web/includes/functions.php +@@ -2223,7 +2223,8 @@ function cache_bust($file) { + $parts = pathinfo($file); + global $css; + $dirname = preg_replace('/\//', '_', $parts['dirname']); +- $cacheFile = $dirname.'_'.$parts['filename'].'-'.$css.'-'.filemtime($file).'.'.$parts['extension']; ++ $srcHash = '@srcHash@'; ++ $cacheFile = $dirname.'_'.$parts['filename'].'-'.$css.'-'.$srcHash.'.'.$parts['extension']; + if ( file_exists(ZM_DIR_CACHE.'/'.$cacheFile) or symlink(ZM_PATH_WEB.'/'.$file, ZM_DIR_CACHE.'/'.$cacheFile) ) { + return 'cache/'.$cacheFile; + } else { +-- +2.25.1 + diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix index e536ea0373c..93f22e77f87 100644 --- a/pkgs/servers/zoneminder/default.nix +++ b/pkgs/servers/zoneminder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchurl, cmake, makeWrapper, pkgconfig +{ stdenv, lib, fetchFromGitHub, fetchurl, substituteAll, cmake, makeWrapper, pkgconfig , curl, ffmpeg, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mysql, pcre, perl, perlPackages , polkit, utillinuxMinimal, x264, zlib , coreutils, procps, psmisc }: @@ -78,19 +78,18 @@ let in stdenv.mkDerivation rec { pname = "zoneminder"; - version = "1.32.3"; + version = "1.34.3"; src = fetchFromGitHub { owner = "ZoneMinder"; repo = "zoneminder"; rev = version; - sha256 = "1sx2fn99861zh0gp8g53ynr1q6yfmymxamn82y54jqj6nv475njz"; + sha256 = "0jp7950v36gxxzkwdp5i0312s26czhfsl5ixdxfzn21cx31hhlg0"; }; patches = [ ./default-to-http-1dot1.patch - # Explicitly link with dynamic linking library to fix build - ./link-with-libdl.patch + ./0001-Don-t-use-file-timestamp-in-cache-filename.patch ]; postPatch = '' @@ -125,6 +124,10 @@ in stdenv.mkDerivation rec { substituteInPlace scripts/zmdbbackup.in \ --replace /usr/bin/mysqldump ${mysql.client}/bin/mysqldump + substituteInPlace scripts/zmupdate.pl.in \ + --replace "'mysql'" "'${mysql.client}/bin/mysql'" \ + --replace "'mysqldump'" "'${mysql.client}/bin/mysqldump'" + for f in scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in \ scripts/zmupdate.pl.in \ src/zm_config.h.in \ @@ -133,10 +136,14 @@ in stdenv.mkDerivation rec { substituteInPlace $f --replace @ZM_CONFIG_SUBDIR@ /etc/zoneminder done - for f in includes/Event.php views/image.php skins/classic/views/image-ffmpeg.php ; do - substituteInPlace web/$f \ - --replace "'ffmpeg " "'${ffmpeg}/bin/ffmpeg " - done + for f in includes/Event.php views/image.php ; do + substituteInPlace web/$f \ + --replace "'ffmpeg " "'${ffmpeg}/bin/ffmpeg " + done + + substituteInPlace web/includes/functions.php \ + --replace "'date " "'${coreutils}/bin/date " \ + --subst-var-by srcHash "`basename $out`" ''; buildInputs = [ @@ -147,6 +154,7 @@ in stdenv.mkDerivation rec { DateManip DBI DBDmysql LWP SysMmap # run-time dependencies not checked at build-time ClassStdFast DataDump DeviceSerialPort JSONMaybeXS LWPProtocolHttps NumberBytesHuman SysCPU SysMemInfo TimeDate + CryptEksblowfish DataEntropy # zmupdate.pl ]); nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; diff --git a/pkgs/servers/zoneminder/link-with-libdl.patch b/pkgs/servers/zoneminder/link-with-libdl.patch deleted file mode 100644 index 53aaf9b25f7..00000000000 --- a/pkgs/servers/zoneminder/link-with-libdl.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -20,10 +20,10 @@ add_executable(zms zms.cpp) - include_directories(libbcrypt/include/bcrypt) - include_directories(jwt-cpp/include/jwt-cpp) - --target_link_libraries(zmc zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS}) --target_link_libraries(zma zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS}) --target_link_libraries(zmu zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS}) --target_link_libraries(zms zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS}) -+target_link_libraries(zmc zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS} ${CMAKE_DL_LIBS}) -+target_link_libraries(zma zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS} ${CMAKE_DL_LIBS}) -+target_link_libraries(zmu zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS} ${CMAKE_DL_LIBS}) -+target_link_libraries(zms zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS} ${CMAKE_DL_LIBS}) - - # Generate man files for the binaries destined for the bin folder - FOREACH(CBINARY zma zmc zmu) diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix index 80b0f386051..ad2e845f9bc 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/ion/default.nix b/pkgs/shells/ion/default.nix index 5886fdb5574..c58302df210 100644 --- a/pkgs/shells/ion/default.nix +++ b/pkgs/shells/ion/default.nix @@ -13,10 +13,7 @@ buildRustPackage rec { sha256 = "0i0acl5nw254mw8dbfmb4792rr71is98a5wg32yylfnlrk7zlf8z"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1hs01b1rhbpafxlhw661k907rznqhcgyng85njkb99bg4lxwxaap"; + cargoSha256 = "0f266kygvw2id771g49s25qsbqb6a0gr1r0czkcj96n5r0wg8wrn"; meta = with stdenv.lib; { description = "Modern system shell with simple (and powerful) syntax"; @@ -24,10 +21,12 @@ buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ dywedir ]; platforms = platforms.all; - broken = stdenv.isDarwin; + # This has not had a release since 2017, and no longer compiles with the + # latest Rust compiler. + broken = false; }; passthru = { - shellPath = "/bin/ion"; + shellPath = "/bin/ion"; }; } diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 811ef762f78..9f3f0da75c9 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 2bc65164d58..2a1688480db 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 e1bfc68dc4d..c0ae5e03e6c 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 ea43057a07f..5a61cd2e90a 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 = "2f345a3d0c9a94891c909a9ae6f6e2e2dc6df5b2"; + rev = "07e3236bc5c8dbf9d818a4f0145f09bdb4bec6f0"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "1xs6rz73i04b91ans8j3k46xxb64ljvx7v06j2wmr38lqfplw0ym"; + sha256 = "1imjvig60r250ljbnajxq4zv4fgs3l3jrrda0dvlnax5v5psxb12"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index 7daa8fa1fd7..35355bf2975 100644 --- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "powerlevel10k"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "romkatv"; repo = "powerlevel10k"; rev = "v${version}"; - sha256 = "1hvhql7564j6n6xwg4wckzvzs4fk5zlrdxkx5nd9i3g2d477nbac"; + sha256 = "1w2iy9anc3cxb5kffrdz8knml8nsl6v3lcrdsigfzfp0zignb4cw"; }; patches = [ diff --git a/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix b/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix index 37471e9ce42..c5426431b3c 100644 --- a/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix +++ b/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix @@ -1,12 +1,12 @@ { busybox = import { - url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv5tel/busybox; - sha256 = "00mxas5xg2j9n1g0q0nklr0dy87qqxk0jja5qz1yi7xl7zzsnpnw"; + url = https://hydra.nixos.org/build/112609163/download/2/busybox; + sha256 = "0dc5471dc6a5f69ad98eb7445f51a61e88aa5792d7a677025bf012bdb513b763"; executable = true; }; bootstrapTools = import { - url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv5tel/bootstrap-tools.tar.xz; - sha256 = "0fhiy9l3mbmlhpkby31c2s63bhjiqx25qqr3wdp8cb7fxz8ayx2f"; + url = https://hydra.nixos.org/build/112609163/download/1/bootstrap-tools.tar.xz; + sha256 = "ca0564eca4eb944649ce10ec70859640427bf2241243af62812b163176487e02"; }; } diff --git a/pkgs/stdenv/linux/bootstrap-files/armv6l.nix b/pkgs/stdenv/linux/bootstrap-files/armv6l.nix index 44718975682..caf7df66cef 100644 --- a/pkgs/stdenv/linux/bootstrap-files/armv6l.nix +++ b/pkgs/stdenv/linux/bootstrap-files/armv6l.nix @@ -1,12 +1,12 @@ { busybox = import { - url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv6l/busybox; - sha256 = "06n8dy8y2v28yx9ws8x64wxrvn9pszgpd299hc90nv9x21m79jzd"; + url = https://hydra.nixos.org/build/112609441/download/2/busybox; + sha256 = "e6f6aecb675e924a96516f4379445dd2c0ba8b9c438fbfbaa2dc14ccce2802e0"; executable = true; }; bootstrapTools = import { - url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv6l/bootstrap-tools.tar.xz; - sha256 = "1gg2q3sw81vi65g1gmpvx0nnd6hxb76vlz73wfp292m90z1mym7f"; + url = https://hydra.nixos.org/build/112609441/download/1/bootstrap-tools.tar.xz; + sha256 = "7a3f20def1a17ebf0edb5a92c403558429bcc2ac3d931b5e1bd88606cb217778"; }; } diff --git a/pkgs/stdenv/linux/bootstrap-files/armv7l.nix b/pkgs/stdenv/linux/bootstrap-files/armv7l.nix index b97fd9967ea..67bca39eaf6 100644 --- a/pkgs/stdenv/linux/bootstrap-files/armv7l.nix +++ b/pkgs/stdenv/linux/bootstrap-files/armv7l.nix @@ -1,12 +1,12 @@ { busybox = import { - url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv7l/busybox; - sha256 = "187xwzsng5lpak1nanrk88y4mlydmrbhx6la00rrd6kjx376s565"; + url = https://hydra.nixos.org/build/112609103/download/2/busybox; + sha256 = "566a469dac214b31e4abdb0a91d32550bab1be5858d329e1b6074eef05370ca3"; executable = true; }; bootstrapTools = import { - url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv7l/bootstrap-tools.tar.xz; - sha256 = "05ayki2kak3i5lw97qidd5h9jv00dmlhx9h7l771bj331yamyqdn"; + url = https://hydra.nixos.org/build/112609103/download/1/bootstrap-tools.tar.xz; + sha256 = "79fa2d7722aeb856c7c9b62a3fd64b6d261fd6f6bcbac486f0a2a7d823210550"; }; } diff --git a/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh b/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh index 64583f80fa8..f394869ea91 100644 --- a/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh +++ b/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh @@ -35,12 +35,7 @@ for i in $out/lib/librt-*.so $out/lib/libpcre*; do $out/bin/patchelf --set-rpath $out/lib --force-rpath "$i" done -# Fix the libc linker script. export PATH=$out/bin -cat $out/lib/libc.so | sed "s|/nix/store/e*-[^/]*/|$out/|g" > $out/lib/libc.so.tmp -mv $out/lib/libc.so.tmp $out/lib/libc.so -cat $out/lib/libpthread.so | sed "s|/nix/store/e*-[^/]*/|$out/|g" > $out/lib/libpthread.so.tmp -mv $out/lib/libpthread.so.tmp $out/lib/libpthread.so # Provide some additional symlinks. ln -s bash $out/bin/sh diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 90a679756d7..ec5f1092a46 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -123,6 +123,8 @@ in with pkgs; rec { cp -d ${bootGCC.out}/bin/g++ $out/bin cp -d ${bootGCC.lib}/lib/libgcc_s.so* $out/lib cp -d ${bootGCC.lib}/lib/libstdc++.so* $out/lib + cp -d ${bootGCC.out}/lib/libssp.a* $out/lib + cp -d ${bootGCC.out}/lib/libssp_nonshared.a $out/lib cp -rd ${bootGCC.out}/lib/gcc $out/lib chmod -R u+w $out/lib rm -f $out/lib/gcc/*/*/include*/linux diff --git a/pkgs/tools/X11/vdpauinfo/default.nix b/pkgs/tools/X11/vdpauinfo/default.nix index 153ff45d2a7..c0956fb1dec 100644 --- a/pkgs/tools/X11/vdpauinfo/default.nix +++ b/pkgs/tools/X11/vdpauinfo/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, pkgconfig, libvdpau }: stdenv.mkDerivation rec { - name = "vdpauinfo-1.0"; + pname = "vdpauinfo"; + version = "1.3"; src = fetchurl { - url = "https://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz"; - sha256 = "1i2b0k9h8r0lnxlrkgqzmrjakgaw3f1ygqqwzx8w6676g85rcm20"; + url = "https://gitlab.freedesktop.org/vdpau/vdpauinfo/uploads/6fa9718c507ef0fb6966170ef55344bf/${pname}-${version}.tar.gz"; + sha256 = "0s6jdadnycyd1agsnfx7hrf17hmipasx1fpmppd4m1z6i9sp1i6g"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/X11/xob/default.nix b/pkgs/tools/X11/xob/default.nix index 164802470e5..cf74fa3d867 100644 --- a/pkgs/tools/X11/xob/default.nix +++ b/pkgs/tools/X11/xob/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xob"; - version = "0.1.1"; + version = "0.2"; src = fetchFromGitHub { owner = "florentc"; repo = pname; rev = "v${version}"; - sha256 = "0i163avpij8iy04a0wsds237sjqi5dfvi6ny2z8zicnl4crp34xg"; + sha256 = "0jbj61adwrpscfaadjman4hbyxhxv3ac8b4d88d623samx6kbvkk"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/admin/awsweeper/default.nix b/pkgs/tools/admin/awsweeper/default.nix index 91ef7ee022e..661747c2fd0 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/intecture/agent.nix b/pkgs/tools/admin/intecture/agent.nix index 5f0e6334115..7fc3da2f19c 100644 --- a/pkgs/tools/admin/intecture/agent.nix +++ b/pkgs/tools/admin/intecture/agent.nix @@ -14,10 +14,7 @@ buildRustPackage rec { sha256 = "0j27qdgyxybaixggh7k57mpm6rifimn4z2vydk463msc8b3kgywj"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "093ipd8lg2ngnln55x5j40g2n8f3y8aysgz9rjn95a4npxrg4yxw"; + cargoSha256 = "1is1cbbwxf00dc64h76h57s0wxsai0zm5vfrrss7598cim6a4yxb"; buildInputs = [ openssl zeromq czmq zlib ]; diff --git a/pkgs/tools/admin/intecture/auth.nix b/pkgs/tools/admin/intecture/auth.nix index 4807cd89aac..f60cbaf7b6e 100644 --- a/pkgs/tools/admin/intecture/auth.nix +++ b/pkgs/tools/admin/intecture/auth.nix @@ -14,10 +14,7 @@ buildRustPackage rec { sha256 = "0c7ar3pc7n59lzfy74lwz51p09s2bglc870rfr4c0vmc91jl0pj2"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1rnhhb4mpf1j7c7a2pz4741hzbf2s2wb0bm25j049n64j49j3jq8"; + cargoSha256 = "17k4a3jd7n2fkalx7vvgah62pj77n536jvm17d60sj0yz2fxx799"; buildInputs = [ openssl zeromq czmq zlib ]; diff --git a/pkgs/tools/admin/intecture/cli.nix b/pkgs/tools/admin/intecture/cli.nix index e5aa379e9c3..73865bdea78 100644 --- a/pkgs/tools/admin/intecture/cli.nix +++ b/pkgs/tools/admin/intecture/cli.nix @@ -14,10 +14,7 @@ buildRustPackage rec { sha256 = "16a5fkpyqkf8w20k3ircc1d0qmif7nygkzxj6mzk9609dlb0dmxq"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0dhrx6njfbd8w27ifk13g6s3ick579bhc4ijf54rfb9g6n8abafx"; + cargoSha256 = "11r551baz3hrkyf9nv68mdf09nqyvbcfjh2rgy8babmi7jljpzav"; buildInputs = [ openssl zeromq czmq zlib ]; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index fd8ee9e04a3..c7c2881a567 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 7c2c66f9fba..db6f27a3010 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/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix index 1edc80c24e2..8a8888b2aa0 100644 --- a/pkgs/tools/admin/pulumi/data.nix +++ b/pkgs/tools/admin/pulumi/data.nix @@ -1,50 +1,50 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "1.4.0"; + version = "1.12.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v1.4.0-linux-x64.tar.gz"; - sha256 = "00ywy2ba4xha6gwd42i3fdrk1myivkd1r6ijdr2vkianmg524k6f"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v1.12.0-linux-x64.tar.gz"; + sha256 = "14j8f43h920k62h8bhywapphhfbj7whb9l6pjmyigld6x2jpr4mc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v0.2.0-linux-amd64.tar.gz"; - sha256 = "1hj4gysjipd091f106a7xz02g9cail5d11rn6j08m0xphg9cf3fn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v1.5.0-linux-amd64.tar.gz"; + sha256 = "1vdd5ghlsxqrfd1nrdj7hsl745k8myhxmd3gh1fq6ksa3apnh1ca"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v1.4.1-linux-amd64.tar.gz"; - sha256 = "0r6xpsb2riqmxwxw28lbi3xd7w4ds510gw99j1rr57h5b9bq19jj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v2.8.0-linux-amd64.tar.gz"; + sha256 = "1q34kv41dbmz45s1sg0rqdxp1qlfq0ii0hy9p95lkzd7qj19qrvv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v1.2.3-linux-amd64.tar.gz"; - sha256 = "0m7fajy3cy1agsz787ak548khwj8rwahs1ibaswqfyyw092iyzb9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v1.5.6-linux-amd64.tar.gz"; + sha256 = "1g5zgkqnzjqfri61p8876czn0ab2n3mjqf1acdyn8kg5q52sd8ix"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v1.7.0-linux-amd64.tar.gz"; - sha256 = "1qw90l7h8yn06bz2l2995nbrc3svs223dm3ys1807amj4n2jyfwb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v1.24.0-linux-amd64.tar.gz"; + sha256 = "1fwnad5p1v4bigcr2icgzmxdn1b3x0j8c361546pqzk67vskn9fg"; } ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v1.4.0-darwin-x64.tar.gz"; - sha256 = "02vqw9gn17dy3rfh0j00k9f827l42g3nl3rhlcbc8jbgx3n9c9qy"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v1.12.0-darwin-x64.tar.gz"; + sha256 = "1bg6vnxic8fzycgv8q7m1bf8pk2bxvcn0b6lwy7aa2f3kzw70q46"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v0.2.0-darwin-amd64.tar.gz"; - sha256 = "077j9fp8ix00rcqrq8qxk3kvz6gz6sknzb2iv3qjvkh6yh292mz3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v1.5.0-darwin-amd64.tar.gz"; + sha256 = "1skvfg8s8f81l4yfgm49jca38cx96khk3f9rpq4ywa3r3f450kni"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v1.4.1-darwin-amd64.tar.gz"; - sha256 = "1i2vf3bxwf8awvw183hq9bbnmznda1jpv1zqghgz2ybx4s0915nx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v2.8.0-darwin-amd64.tar.gz"; + sha256 = "0f0gnbiv2gbam5n3ng9j5rbrml0jfv9k402vd4j9ryfkly4grpa9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v1.2.3-darwin-amd64.tar.gz"; - sha256 = "123czx1c31r5r91k2jhdgmnffypnl8w1a6h9mr2rdhwgbx8hzq40"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v1.5.6-darwin-amd64.tar.gz"; + sha256 = "1l610a0bvwrsbqv4s00ghbplwnk11q3c0n3py0l7w0a2mpl8izzd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v1.7.0-darwin-amd64.tar.gz"; - sha256 = "0cl0vakppxi0v8ym8b4fzhzb10nl84wd0vfik8gpfwsg7zwdzhlp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v1.24.0-darwin-amd64.tar.gz"; + sha256 = "17qq7w2wk0803y0if7dn3gnxxnfqnb4n2gcil3zgbc4yhqz4py0y"; } ]; }; diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix index 977c1991fab..d6fc6e8a837 100644 --- a/pkgs/tools/admin/pulumi/default.nix +++ b/pkgs/tools/admin/pulumi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoPatchelfHook }: +{ lib, stdenv, fetchurl, autoPatchelfHook, makeWrapper }: with lib; @@ -17,9 +17,10 @@ in stdenv.mkDerivation { installPhase = '' mkdir -p $out/bin cp * $out/bin/ + wrapProgram $out/bin/pulumi --set LD_LIBRARY_PATH "${stdenv.cc.cc.lib}/lib" ''; - buildInputs = optionals stdenv.isLinux [ autoPatchelfHook ]; + buildInputs = optionals stdenv.isLinux [ autoPatchelfHook makeWrapper ]; meta = { homepage = https://pulumi.io/; diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh index 7cb500ee9d3..35494235d36 100644 --- a/pkgs/tools/admin/pulumi/update.sh +++ b/pkgs/tools/admin/pulumi/update.sh @@ -1,13 +1,13 @@ #!/usr/bin/env bash -VERSION="1.4.0" +VERSION="1.12.0" declare -A plugins plugins=( - ["aws"]="1.7.0" - ["gcp"]="1.4.1" - ["kubernetes"]="1.2.3" - ["random"]="0.2.0" + ["aws"]="1.24.0" + ["gcp"]="2.8.0" + ["random"]="1.5.0" + ["kubernetes"]="1.5.6" ) function genMainSrc() { diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index ed8fbbf76cd..a12cc368ee5 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -2,11 +2,11 @@ python3.pkgs.buildPythonApplication rec { pname = "borgbackup"; - version = "1.1.10"; + version = "1.1.11"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "1pp70p4n5kamvcbl4d8021ggrxhyykmg9isjg4yd3wags8b19d7g"; + sha256 = "190gjzx83b6p64nqj840x382dgz9gfv0gm7wj585lnkrpa90j29n"; }; nativeBuildInputs = with python3.pkgs; [ @@ -58,7 +58,7 @@ python3.pkgs.buildPythonApplication rec { HOME=$(mktemp -d) py.test --pyargs borg.testsuite ''; - # 63 failures, needs pytest-benchmark + # 64 failures, needs pytest-benchmark doCheck = false; meta = with stdenv.lib; { diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 1a7fb5c3a08..e351867ca1b 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 81686a456d0..398641faf15 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/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index fd967fce9c6..6bc365b8e1e 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -4,23 +4,15 @@ stdenv.mkDerivation rec { pname = "lz4"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { - sha256 = "1l1caxrik1hqs40vj3bpv1pikw6b74cfazv5c0v6g48zpcbmshl0"; + sha256 = "0lpaypmk70ag2ks3kf2dl4ac3ba40n5kc1ainkp9wfjawz76mh61"; rev = "v${version}"; repo = pname; owner = pname; }; - patches = [ - # Fix detection of Darwin - (fetchpatch { - url = "https://github.com/lz4/lz4/commit/024216ef7394b6411eeaa5b52d0cec9953a44249.patch"; - sha256 = "0j0j2pr6pkplxf083hlwl5q4cfp86q3wd8mc64bcfcr7ysc5pzl3"; - }) - ]; - # TODO(@Ericson2314): Separate binaries and libraries outputs = [ "bin" "out" "dev" ]; @@ -61,7 +53,7 @@ stdenv.mkDerivation rec { multiple GB/s per core, typically reaching RAM speed limits on multi-core systems. ''; - homepage = https://lz4.github.io/lz4/; + homepage = "https://lz4.github.io/lz4/"; license = with licenses; [ bsd2 gpl2Plus ]; platforms = platforms.all; }; diff --git a/pkgs/tools/filesystems/btrfs-dedupe/default.nix b/pkgs/tools/filesystems/btrfs-dedupe/default.nix deleted file mode 100644 index 40a58e4227f..00000000000 --- 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 e3b1d7c661c..abf6ed1361b 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/filesystems/moosefs/default.nix b/pkgs/tools/filesystems/moosefs/default.nix index 5d3c2d15fb2..fe9f1ae11e6 100644 --- a/pkgs/tools/filesystems/moosefs/default.nix +++ b/pkgs/tools/filesystems/moosefs/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "moosefs"; - version = "3.0.109"; + version = "3.0.110"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1pwackc511fzx28w3an5qk738ykhpspvc1063w2hv901f213xjzw"; + sha256 = "16m3mxmik2ifrv1g9cp68k57w8xwsxacws3sh1ajlba4azj9sf8v"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/tools/filesystems/rmount/default.nix b/pkgs/tools/filesystems/rmount/default.nix index 46be9e30f70..72172ef5baa 100644 --- a/pkgs/tools/filesystems/rmount/default.nix +++ b/pkgs/tools/filesystems/rmount/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "rmount"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "Luis-Hebendanz"; repo = "rmount"; - sha256 = "1wjmfvbsq3126z51f2ivj85cjmkrzdm2acqsiyqs57qga2g6w5p9"; + sha256 = "0j1ayncw1nnmgna7vyx44vwinh4ah1b0l5y8agc7i4s8clbvy3h0"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/filesystems/romdirfs/default.nix b/pkgs/tools/filesystems/romdirfs/default.nix new file mode 100644 index 00000000000..8085eb5f234 --- /dev/null +++ b/pkgs/tools/filesystems/romdirfs/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, fuse }: + +stdenv.mkDerivation rec { + pname = "romdirfs"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "mlafeldt"; + repo = "romdirfs"; + rev = "v${version}"; + sha256 = "1jbsmpklrycz5q86qmzvbz4iz2g5fvd7p9nca160aw2izwpws0g7"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ fuse ]; + + meta = with stdenv.lib; { + description = "FUSE for access Playstation 2 IOP IOPRP images and BIOS dumps"; + homepage = https://github.com/mlafeldt/romdirfs; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ genesis ]; + }; +} diff --git a/pkgs/tools/filesystems/vmfs-tools/default.nix b/pkgs/tools/filesystems/vmfs-tools/default.nix index c15a782fa3c..f473fa04334 100644 --- a/pkgs/tools/filesystems/vmfs-tools/default.nix +++ b/pkgs/tools/filesystems/vmfs-tools/default.nix @@ -1,25 +1,39 @@ -{ stdenv, fetchFromGitHub, pkgconfig -, asciidoc, docbook_xsl, fuse, libuuid, libxslt }: +{ stdenv +, fetchFromGitHub +, pkgconfig +, asciidoc +, docbook_xsl +, fuse +, libuuid +, libxslt +}: -stdenv.mkDerivation { - name = "vmfs-tools"; +stdenv.mkDerivation rec { + pname = "vmfs-tools"; + version = "0.2.5.20160116"; src = fetchFromGitHub { - owner = "glandium"; - repo = "vmfs-tools"; - rev = "4ab76ef5b074bdf06e4b518ff6d50439de05ae7f"; + owner = "glandium"; + repo = pname; + rev = "4ab76ef5b074bdf06e4b518ff6d50439de05ae7f"; sha256 = "14y412ww5hxk336ils62s3fwykfh6mx1j0iiaa5cwc615pi6qvi4"; }; - nativeBuildInputs = [ asciidoc docbook_xsl fuse libuuid libxslt pkgconfig ]; + nativeBuildInputs = [ asciidoc docbook_xsl libxslt pkgconfig ]; + + buildInputs = [ fuse libuuid ]; enableParallelBuilding = true; + postInstall = '' + install -Dm444 -t $out/share/doc/${pname} AUTHORS LICENSE README TODO + ''; + meta = with stdenv.lib; { - homepage = https://github.com/glandium/vmfs-tools; - description = "FUSE-based VMFS (vmware) mounting tools"; + description = "FUSE-based VMFS (vmware) file system tools"; maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.linux; license = licenses.gpl2; + platforms = platforms.linux; + inherit (src.meta) homepage; }; } diff --git a/pkgs/tools/graphics/dpic/default.nix b/pkgs/tools/graphics/dpic/default.nix index 62fa83800cb..0621d885694 100644 --- a/pkgs/tools/graphics/dpic/default.nix +++ b/pkgs/tools/graphics/dpic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dpic"; - version = "2019.11.30"; + version = "2020.03.01"; src = fetchurl { url = "https://ece.uwaterloo.ca/~aplevich/dpic/${pname}-${version}.tar.gz"; - sha256 = "0rgd31mdbaqbm9rz49872s17n25n5ajxcn61xailz3f0kzr4f3dg"; + sha256 = "1wa1b8m98wdyryf0czn5g3g50znrjcdhsrzpqp6zgwr5w4a086mj"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://ece.uwaterloo.ca/~aplevich/dpic/; + homepage = "https://ece.uwaterloo.ca/~aplevich/dpic/"; description = "An implementation of the pic little language for creating drawings"; license = stdenv.lib.licenses.bsd2; maintainers = [ stdenv.lib.maintainers.aespinosa ]; diff --git a/pkgs/tools/graphics/svgbob/default.nix b/pkgs/tools/graphics/svgbob/default.nix index 68640d45bb2..d11f715464d 100644 --- a/pkgs/tools/graphics/svgbob/default.nix +++ b/pkgs/tools/graphics/svgbob/default.nix @@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec { sourceRoot = "source/svgbob_cli"; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0mnq1s809f394x83gjv9zljr07c94k48zkrwxs6ibi19shgmrnnd"; + cargoSha256 = "1y9jsnxmz51zychmmzp6mi29pb5ks2qww7lk5bshkhp56v51sm8d"; # Test tries to build outdated examples doCheck = false; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix index 2dc200b9ddb..831161df2b7 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ibus-table"; - version = "1.9.22"; + version = "1.9.25"; src = fetchFromGitHub { owner = "kaio"; repo = "ibus-table"; rev = version; - sha256 = "1a1dr3l6aa69llfyd0k5w29qalvyap369kmnwww9fhppmwfclgd1"; + sha256 = "0v570qpnb2q79aqr9f0xnska34y7hw34ibiwsf7ybcw69fhi1zkg"; }; postPatch = '' @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { isIbusEngine = true; description = "An IBus framework for table-based input methods"; - homepage = https://github.com/kaio/ibus-table/wiki; + homepage = "https://github.com/kaio/ibus-table/wiki"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ mudri ]; diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/tools/misc/bepasty/default.nix index 532d1155fbe..cc63dab9645 100644 --- a/pkgs/tools/misc/bepasty/default.nix +++ b/pkgs/tools/misc/bepasty/default.nix @@ -1,13 +1,25 @@ -{ python3Packages +{ python3 , lib }: -with python3Packages; +let + python = python3.override { + self = python; + packageOverrides = self: super : { + xstatic-bootstrap = super.xstatic-bootstrap.overridePythonAttrs(oldAttrs: rec { + version = "3.3.7.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0cgihyjb9rg6r2ddpzbjm31y0901vyc8m9h3v0zrhxydx1w9x50c"; + }; + }); + }; + }; #We need to use buildPythonPackage here to get the PYTHONPATH build correctly. #This is needed for services.bepasty #https://github.com/NixOS/nixpkgs/pull/38300 -buildPythonPackage rec { +in with python.pkgs; buildPythonPackage rec { pname = "bepasty"; version = "0.5.0"; @@ -36,6 +48,9 @@ buildPythonPackage rec { selenium ]; + # No tests in sdist + doCheck = false; + meta = { homepage = https://github.com/bepasty/bepasty-server; description = "Binary pastebin server"; diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 572bee3d262..b7e2fb00a14 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.1"; + version = "0.13.4"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "13b1w9g68aj3r70w9bmrmdc772y959n77ajbdm2cpjs5f4kgfpak"; + sha256 = "0xd7vsybv6w5llvb85g6bx6r33lr0ki077rwzdvwb9c8w64fvs2h"; }; - cargoSha256 = "0zrwpmsrzwnjml0964zky8w222zmlargha3z0n6hf8cfshx23s4k"; + cargoSha256 = "16qad0m2vygwrbz40ww0mb0ba5wn2wna1n78bc8nxh60x0qiigi9"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix index 89a5154adda..ad17c5edd6e 100644 --- a/pkgs/tools/misc/byobu/default.nix +++ b/pkgs/tools/misc/byobu/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, python3, perl, textual-window-manager }: stdenv.mkDerivation rec { - version = "5.131"; + version = "5.133"; name = "byobu-" + version; src = fetchurl { url = "https://launchpad.net/byobu/trunk/${version}/+download/byobu_${version}.orig.tar.gz"; - sha256 = "0ljyk0fkpdjjyqpqsss6d26sd3vkr55vcr5cfw1kz3lxwwd7bb3p"; + sha256 = "0qvmmdnvwqbgbhn5c8asmrmjhclcl029py2d2zvmd7h5ij7s93jd"; }; doCheck = true; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ textual-window-manager ]; meta = { - homepage = https://launchpad.net/byobu/; + homepage = "https://launchpad.net/byobu/"; description = "Text-based window manager and terminal multiplexer"; longDescription = diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 54379ec08f0..c6dbcfdda02 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { description = "System service to manage, install and generate color profiles to accurately color manage input and output devices"; homepage = https://www.freedesktop.org/software/colord/; license = licenses.lgpl2Plus; - maintainers = [ maintainers.marcweber ]; + maintainers = [ maintainers.marcweber ] ++ teams.freedesktop.members; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/docui/default.nix b/pkgs/tools/misc/docui/default.nix index 66c0cfc82b1..0329c1bc4a6 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/dust/default.nix b/pkgs/tools/misc/dust/default.nix index 7fa9ac9c971..53594494a83 100644 --- a/pkgs/tools/misc/dust/default.nix +++ b/pkgs/tools/misc/dust/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - pname = "dust"; + pname = "du-dust"; version = "0.5.1"; src = fetchFromGitHub { @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "1sjzcawyg1xsi4xrx2zwnj8yavzph8k1wgxsffgp55wghzypafwl"; + cargoSha256 = "0s8z8cg9q0gfqm0ann8rkxwp5y25si97kgginh6b6lbnaai7y4fj"; doCheck = false; diff --git a/pkgs/tools/misc/eva/default.nix b/pkgs/tools/misc/eva/default.nix index c720361b9cd..dee181d95c2 100644 --- a/pkgs/tools/misc/eva/default.nix +++ b/pkgs/tools/misc/eva/default.nix @@ -4,10 +4,7 @@ rustPlatform.buildRustPackage rec { pname = "eva"; version = "0.2.7"; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0n3xvlmp4l925nbz8lx6dr9yrrfh6z7b9z8wd6sli3a1dq26d6bg"; + cargoSha256 = "1lycjw5i169xx73qw8gknbakrxikdbr65fmqx7xq2mafc0hb1zyn"; src = fetchFromGitHub { owner = "NerdyPepper"; diff --git a/pkgs/tools/misc/fselect/default.nix b/pkgs/tools/misc/fselect/default.nix index 2a3813eb184..e508eb02ad0 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 0694d5931ef..d337731888f 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses, }: +{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses }: buildGoModule rec { pname = "fzf"; - version = "0.20.0"; + version = "0.21.0-1"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - sha256 = "02zy3c4k84rzqdkaf04idbj10v286hi0ix1xl2qsz1wrblh168w8"; + sha256 = "1d4bwcmjirwkkv0m01sx9rxp01iik57iy54zxhdkkz842pxlr2xv"; }; - modSha256 = "12lnv8b96adpcg9qfizcyd9nxz590nxd82xch6ij719zlqyps143"; + modSha256 = "16bb0a9z49jqhh9lmq8rvl7x9vh79mi4ygkb9sm04g41g5z6ag1s"; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/misc/heatseeker/default.nix b/pkgs/tools/misc/heatseeker/default.nix index d7944e55d32..22a7d8ec4a7 100644 --- a/pkgs/tools/misc/heatseeker/default.nix +++ b/pkgs/tools/misc/heatseeker/default.nix @@ -1,22 +1,17 @@ { stdenv, fetchFromGitHub, rustPlatform }: -with rustPlatform; - -buildRustPackage rec { +rustPlatform.buildRustPackage rec { pname = "heatseeker"; - version = "1.5.1"; + version = "1.7.1"; src = fetchFromGitHub { owner = "rschmitt"; repo = "heatseeker"; rev = "v${version}"; - sha256 = "1fcrbjwnhcz71i70ppy0rcgk5crwwmbkm9nrk1kapvks33pv0az7"; + sha256 = "1x7mdyf1m17s55f6yjdr1j510kb7a8f3zkd7lb2kzdc7nd3vgaxg"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0m3sxbz1iii31s30cnv1970i1mwfhl6gm19k8wv0n7zji30ayx07"; + cargoSha256 = "0jnlcm7v29m4nc318qgf7r7jvs80s7n04fw83imm506vwr9rxbx9"; # some tests require a tty, this variable turns them off for Travis CI, # which we can also make use of @@ -24,7 +19,7 @@ buildRustPackage rec { meta = with stdenv.lib; { description = "A general-purpose fuzzy selector"; - homepage = https://github.com/rschmitt/heatseeker; + homepage = "https://github.com/rschmitt/heatseeker"; license = licenses.mit; maintainers = [ maintainers.michaelpj ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/hexyl/default.nix b/pkgs/tools/misc/hexyl/default.nix index caef41cb394..e67b0116df1 100644 --- a/pkgs/tools/misc/hexyl/default.nix +++ b/pkgs/tools/misc/hexyl/default.nix @@ -2,18 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "hexyl"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "1n2q5a6697bxvl0askywhad2x560cajv456gxihdqqmmyq2vf63h"; + sha256 = "0blq81zpmzldngk9ymcg56syspjp1g1ziap4z69idv05mfkf6sp3"; }; - cargoSha256 = "0dd7b6iibjmmriwi081pc65crq0y1j2pmbm1iq0lkqdd89c9f1yp"; + cargoSha256 = "09kccd1brcbvzimm05dyybwrkganqxdkjrvzgcf1l93xs1z2h94b"; meta = with stdenv.lib; { + changelog = "https://github.com/sharkdp/hexyl/releases/tag/v${version}"; description = "A command-line hex viewer"; longDescription = '' `hexyl` is a simple hex viewer for the terminal. It uses a colored @@ -21,7 +22,7 @@ rustPlatform.buildRustPackage rec { printable ASCII characters, ASCII whitespace characters, other ASCII characters and non-ASCII). ''; - homepage = https://github.com/sharkdp/hexyl; + homepage = "https://github.com/sharkdp/hexyl"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ dywedir ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/misc/licensor/default.nix b/pkgs/tools/misc/licensor/default.nix index 246684c6638..a6570adf120 100644 --- a/pkgs/tools/misc/licensor/default.nix +++ b/pkgs/tools/misc/licensor/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub, fetchpatch }: rustPlatform.buildRustPackage rec { pname = "licensor"; @@ -11,10 +11,12 @@ rustPlatform.buildRustPackage rec { sha256 = "0zr8hcq7crmhrdhwcclc0nap68wvg5kqn5l93ha0vn9xgjy8z11p"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; + patches = [ (fetchpatch { + url = "https://github.com/raftario/licensor/commit/77ae1ea6d9b6de999ee7590d9dbd3c8465d70bb6.patch"; + sha256 = "0kfyg06wa2v7swm7hs9kkazjg34mircd4nm4qmljyzjh2yh8icg3"; + })]; - cargoSha256 = "042dplm0cdxkv73m5qlkc61h0x9fpzxn2b0c8gjx2hwvigcia139"; + cargoSha256 = "1z2r8nfizifj8sk1ghppyqk5r65sgmbk47fiq95pnwpadm5drvqa"; meta = with lib; { description = "Write licenses to stdout"; diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index 168afc7efed..07c5f9b3517 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/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix index 5850c4a90af..a1a0c159bb4 100644 --- a/pkgs/tools/misc/neofetch/default.nix +++ b/pkgs/tools/misc/neofetch/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "neofetch"; - version = "6.1.0"; + version = "7.0.0"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "neofetch"; rev = version; - sha256 = "022xzn9jk18k2f4b6011d8jk5nbl84i3mw3inlz4q52p2hvk8fch"; + sha256 = "0xc0fdc7n5bhqirh83agqiy8r14l14zwca07czvj8vgnsnfybslr"; }; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A fast, highly customizable system info script"; - homepage = https://github.com/dylanaraps/neofetch; + homepage = "https://github.com/dylanaraps/neofetch"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ alibabzo konimex ]; diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix index 9c5ffc260ff..58abf6f72f8 100644 --- a/pkgs/tools/misc/onefetch/default.nix +++ b/pkgs/tools/misc/onefetch/default.nix @@ -12,10 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1sgpai3gx3w7w3ilmbnmzgdxdim6klkfiqaqxmffpyap6qgksfqs"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1phv06zf47bv5cmhypivljfiynrblha0kj13c5al9l0hd1xx749h"; + cargoSha256 = "18z887mklynxpjci6va4i5zhg90j824avykym24vbz9w97nqpdd5"; buildInputs = with stdenv; lib.optionals isDarwin [ CoreFoundation libiconv libresolv Security ]; diff --git a/pkgs/tools/misc/opentimestamps-client/default.nix b/pkgs/tools/misc/opentimestamps-client/default.nix index 94984c57e49..8cc5cd7f6f2 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/pfetch/default.nix b/pkgs/tools/misc/pfetch/default.nix index a858ad696af..49867331780 100644 --- a/pkgs/tools/misc/pfetch/default.nix +++ b/pkgs/tools/misc/pfetch/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "pfetch"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "pfetch"; rev = version; - sha256 = "180vvbmvak888vs4dgzlmqk0ss4qfsz09700n4p8s68j7krkxsfq"; + sha256 = "0yg9nlrjnm2404ysm2qp1klpq1wlmyih302kzfqchn6l2sibsm4j"; }; dontBuild = true; diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix index b9a59dffae7..00ed2db1073 100644 --- a/pkgs/tools/misc/phoronix-test-suite/default.nix +++ b/pkgs/tools/misc/phoronix-test-suite/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "phoronix-test-suite"; - version = "9.4.0"; + version = "9.4.1"; src = fetchurl { url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz"; - sha256 = "108h3zs7p9vmb56dwlw7wicv9z4kxbndl82075sx4c12rzrmssi9"; + sha256 = "1c33c8aihsfdxaqkwy4isrvmjam5j5rdz98vv2apy73638vx3q04"; }; buildInputs = [ php ]; diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix index c1496e0dbc9..9c07254e587 100644 --- a/pkgs/tools/misc/profile-sync-daemon/default.nix +++ b/pkgs/tools/misc/profile-sync-daemon/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, utillinux}: stdenv.mkDerivation rec { - version = "6.35"; + version = "6.36"; pname = "profile-sync-daemon"; src = fetchurl { url = "https://github.com/graysky2/profile-sync-daemon/archive/v${version}.tar.gz"; - sha256 = "0hd3cjhf9nv4q5gvc8lbh5c82095lll7mxll1mj5hkzmnijzsf0v"; + sha256 = "0zw9fqpfiz1ld443cw2vp54y86maksmq4mnjs73nlp00nn5z2047"; }; installPhase = '' @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { between the two. One of the major design goals of psd is a completely transparent user experience. ''; - homepage = https://github.com/graysky2/profile-sync-daemon; + homepage = "https://github.com/graysky2/profile-sync-daemon"; downloadPage = https://github.com/graysky2/profile-sync-daemon/releases; license = licenses.mit; maintainers = [ maintainers.prikhi ]; diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index e0aba2724af..db1938160b3 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "4.0.2"; + version = "4.2.0"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "0kkk718s65r3j5k3a3wz9p0q1v8rjz0yshmfwxak3aw99nj9yyvq"; + sha256 = "02rcgz1sklll0gpxjwb7y3jc6flzr4492qp72blra6a26qpb7vxp"; }; - cargoSha256 = "1g6jzbmicyqnp0dkcbw7sa36b3qxag8f596mb47wq2fl25pg0d3x"; + cargoSha256 = "1kd4q2ddm5byf62xj923n140k9x89yf9yswwgsnvkbpvrnpl4mwj"; buildInputs = lib.optional stdenv.isDarwin Foundation; diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index 2f8bb36990b..52eec555b16 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -19,10 +19,7 @@ python3Packages.buildPythonApplication rec { name = "${name}-native"; inherit src; sourceRoot = "source/rust"; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1n1dxq3klsry5mmbfff2jv7ih8mr5zvpncrdgba6qs93wi77qi0y"; + cargoSha256 = "0cqy0s55pkg6hww86h7qip4xaidh6g8lcypdj84n2x374jq38c5d"; buildInputs = [ pkgconfig openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; }; diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 92bcf98c919..17e764698d5 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "vector"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "timberio"; repo = pname; rev = "v${version}"; - sha256 = "0girph2icl95klwqh3ksyr7fwril2pyb2gmnphgxrs6bibp1a2ha"; + sha256 = "0k15scvjcg2v4z80vq27yrn2wm50fp8xj8lga2czzs0zxhlv21nl"; }; - cargoSha256 = "1f4c982i2r2y63h0a79nlwdwrp81ps93zan7a6ag5w7c4223ab5g"; + cargoSha256 = "1al8jzjxjhxwb5n1d52pvl59d11g0bdg2dcw8ir2nclya1w68f2w"; buildInputs = [ openssl pkg-config protobuf rdkafka ] ++ stdenv.lib.optional stdenv.isDarwin [ Security libiconv ]; diff --git a/pkgs/tools/misc/vttest/default.nix b/pkgs/tools/misc/vttest/default.nix index 0aa51363ff8..38fedbbf099 100644 --- a/pkgs/tools/misc/vttest/default.nix +++ b/pkgs/tools/misc/vttest/default.nix @@ -2,19 +2,19 @@ stdenv.mkDerivation rec { pname = "vttest"; - version = "20190710"; + version = "20200303"; src = fetchurl { urls = [ "https://invisible-mirror.net/archives/${pname}/${pname}-${version}.tgz" "ftp://ftp.invisible-island.net/${pname}/${pname}-${version}.tgz" ]; - sha256 = "00v3a94vpmbdziizdw2dj4bfwzfzfs2lc0ijxv98ln1w01w412q4"; + sha256 = "1g27yp37kh57hmwicw3ndnsapsbqzk2cnjccmvyj4zw2z0l5iaj9"; }; meta = with stdenv.lib; { description = "Tests the compatibility so-called 'VT100-compatible' terminals"; - homepage = https://invisible-island.net/vttest/; + homepage = "https://invisible-island.net/vttest/"; license = licenses.mit; platforms = platforms.all; }; diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index 466813ee75f..ab1a3e66825 100644 --- a/pkgs/tools/misc/you-get/default.nix +++ b/pkgs/tools/misc/you-get/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "you-get"; - version = "0.4.1403"; + version = "0.4.1410"; # Tests aren't packaged, but they all hit the real network so # probably aren't suitable for a build environment anyway. @@ -10,12 +10,12 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "195c91xxcv3l3rd0v8ls5ghncf92ndfx0lpcbjr5zb41bl8alkcl"; + sha256 = "0isjmx1z5w3m2v25sb7fpi7lyd4h8bl9n9691ylvl5w3bxf6ynm9"; }; meta = with stdenv.lib; { description = "A tiny command line utility to download media contents from the web"; - homepage = https://you-get.org; + homepage = "https://you-get.org"; license = licenses.mit; maintainers = with maintainers; [ ryneeverett ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 151e520e5d1..2f875e01f3f 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2020.03.01"; + version = "2020.03.08"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "01hk00nbxxa81yajkbv65nv5amwyavhjs127xkyqqcrq6ws3z92w"; + sha256 = "1xbka14wnalcqkhibfcqw8f5bw1m9b1f44719yifv1jk0614q4bn"; }; nativeBuildInputs = [ makeWrapper ]; @@ -54,7 +54,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = "https://rg3.github.io/youtube-dl/"; + homepage = "https://ytdl-org.github.io/youtube-dl/"; description = "Command-line tool to download videos from YouTube.com and other sites"; longDescription = '' youtube-dl is a small, Python-based command-line program diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index f081f94a147..39150cfed7e 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/misc/zoxide/default.nix b/pkgs/tools/misc/zoxide/default.nix new file mode 100644 index 00000000000..33d6a8bbcac --- /dev/null +++ b/pkgs/tools/misc/zoxide/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, rustPlatform, fzf }: + +rustPlatform.buildRustPackage rec { + pname = "zoxide"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "ajeetdsouza"; + repo = "zoxide"; + rev = "v${version}"; + sha256 = "0s0zrkn48rgsf2fqpgsl0kix4l6w7k7pwssvdja6y3a4c097qmnm"; + }; + + buildInputs = [ + fzf + ]; + + cargoSha256 = "1p65ml2qj5dpc6nczfvf341fk7y4yi5ma1x6kfr3d32wnv6m4hgh"; + + meta = with stdenv.lib; { + description = "A fast cd command that learns your habits"; + homepage = "https://github.com/ajeetdsouza/zoxide"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ ysndr ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/networking/arping/default.nix b/pkgs/tools/networking/arping/default.nix index 5d1ebc74800..ad0139b184d 100644 --- a/pkgs/tools/networking/arping/default.nix +++ b/pkgs/tools/networking/arping/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, libnet, libpcap }: stdenv.mkDerivation rec { - version = "2.20"; + version = "2.21"; pname = "arping"; buildInputs = [ libnet libpcap ]; @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { owner = "ThomasHabets"; repo = pname; rev = "${pname}-${version}"; - sha256 = "0gmyip552k6mq7013cvy5yc4akn2rz28s3g4x4vdq35vnxf66cyk"; + sha256 = "1i7rjn863bnq51ahbvypm1bkzhyshlm5b32yzdd9iaqyz7sa7pa7"; }; nativeBuildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { description = "Broadcasts a who-has ARP packet on the network and prints answers"; - homepage = https://github.com/ThomasHabets/arping; + homepage = "https://github.com/ThomasHabets/arping"; license = with licenses; [ gpl2 ]; maintainers = [ maintainers.michalrus ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix index 517cb111c51..96798c1c17e 100644 --- a/pkgs/tools/networking/corerad/default.nix +++ b/pkgs/tools/networking/corerad/default.nix @@ -2,17 +2,23 @@ buildGoModule rec { pname = "corerad"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "mdlayher"; repo = "corerad"; rev = "v${version}"; - sha256 = "04w77cahnphgd8b09a67dkrgx9jh8mvgjfjydj6drcw67v0d18c0"; + sha256 = "0nxrksv98mxs5spykhzpydwjzii5cc6gk8az7irs3fdi4jx6pq1w"; }; modSha256 = "0vbbpndqwwz1mc59j7liaayxaj53cs8s3javgj3pvhkn4vp65p7c"; + buildFlagsArray = '' + -ldflags= + -X github.com/mdlayher/corerad/internal/build.linkTimestamp=1583280117 + -X github.com/mdlayher/corerad/internal/build.linkVersion=v${version} + ''; + meta = with stdenv.lib; { homepage = "https://github.com/mdlayher/corerad"; description = "CoreRAD extensible and observable IPv6 NDP RA daemon"; diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 6554dd465d4..8296600cf3d 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/gnirehtet/default.nix b/pkgs/tools/networking/gnirehtet/default.nix index 913d1c1a52b..601f70e187a 100644 --- a/pkgs/tools/networking/gnirehtet/default.nix +++ b/pkgs/tools/networking/gnirehtet/default.nix @@ -25,10 +25,7 @@ rustPlatform.buildRustPackage { sha256 = "1c99d6zpjxa8xlrg0n1825am20d2pjiicfcjwv8iay9ylfdnvygl"; }; sourceRoot = "source/relay-rust"; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1l1cirhmfkpa466vksynlhwggsfiahws7cpsxydrc414l415l283"; + cargoSha256 = "0rb5xcqg5ikgrxpmzrql5n298j50aqgkkp45znbfv2x2n40dywad"; patchFlags = [ "-p2" ]; patches = [ diff --git a/pkgs/tools/networking/httplz/default.nix b/pkgs/tools/networking/httplz/default.nix index c394f216e0f..5d59010ac1e 100644 --- a/pkgs/tools/networking/httplz/default.nix +++ b/pkgs/tools/networking/httplz/default.nix @@ -21,10 +21,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--bin httplz" ]; cargoPatches = [ ./cargo-lock.patch ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1ajxfvj1pv6yq84zgrh7vjzghpb2y8qd5r09gzwdvww5rbj920fq"; + cargoSha256 = "13hk9m09jff3bxbixsjvksiir4j4mak4ckvlq45bx5d5lh8sapxl"; postInstall = '' wrapProgram $out/bin/httplz \ diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix index afe37dc0770..71fdcc947d3 100644 --- a/pkgs/tools/networking/libreswan/default.nix +++ b/pkgs/tools/networking/libreswan/default.nix @@ -6,7 +6,7 @@ let optional = stdenv.lib.optional; - version = "3.30"; + version = "3.31"; name = "libreswan-${version}"; binPath = stdenv.lib.makeBinPath [ bash iproute iptables procps coreutils gnused gawk nss.tools which python @@ -22,7 +22,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://download.libreswan.org/${name}.tar.gz"; - sha256 = "1bww4w5r6hx0xf9xdxvkfmcv7zyas58ls1mklk6k197kv2i0p24w"; + sha256 = "1wxqsv11nqgfj5and5xzfgh6ayqvl47midcghd5ryynh60mp7naa"; }; # These flags were added to compile v3.18. Try to lift them when updating. @@ -83,7 +83,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://libreswan.org; + homepage = "https://libreswan.org"; description = "A free software implementation of the VPN protocol based on IPSec and the Internet Key Exchange"; platforms = platforms.linux ++ platforms.darwin ++ platforms.freebsd; license = licenses.gpl2; diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index dcf377ca0c0..3e5300549db 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/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix index 70107d2c74d..e9d925fb930 100644 --- a/pkgs/tools/networking/modem-manager/default.nix +++ b/pkgs/tools/networking/modem-manager/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "modem-manager"; - version = "1.12.4"; + version = "1.12.6"; package = "ModemManager"; src = fetchurl { url = "https://www.freedesktop.org/software/${package}/${package}-${version}.tar.xz"; - sha256 = "0nx9b6wfz2r29gb3wgsi5vflycibfhnij5wvc068s6hcbrsn2bc5"; + sha256 = "0k32rjh06p3q9yq054gxya6c7n39bilhi4s23p2hb02iwlz3bcrf"; }; nativeBuildInputs = [ vala gobject-introspection gettext pkgconfig ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "WWAN modem manager, part of NetworkManager"; - homepage = https://www.freedesktop.org/wiki/Software/ModemManager/; + homepage = "https://www.freedesktop.org/wiki/Software/ModemManager/"; license = licenses.gpl2Plus; maintainers = [ ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/par2cmdline/default.nix b/pkgs/tools/networking/par2cmdline/default.nix index 9bc4c178665..29d3230c6d3 100644 --- a/pkgs/tools/networking/par2cmdline/default.nix +++ b/pkgs/tools/networking/par2cmdline/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "par2cmdline"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "Parchive"; repo = "par2cmdline"; rev = "v${version}"; - sha256 = "0f1jsd5sw2wynjzi7yjqjaf13yhyjfdid91p8yh0jn32y03kjyrz"; + sha256 = "11mx8q29cr0sryd11awab7y4mhqgbamb1ss77rffjj6in8pb4hdk"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix index 3446157df7a..1579823450b 100644 --- a/pkgs/tools/networking/ppp/default.nix +++ b/pkgs/tools/networking/ppp/default.nix @@ -1,21 +1,18 @@ -{ stdenv, fetchurl, substituteAll, libpcap, openssl }: +{ stdenv, fetchurl, fetchpatch, fetchFromGitHub, substituteAll, libpcap, openssl }: stdenv.mkDerivation rec { - version = "2.4.7"; + version = "2.4.8"; pname = "ppp"; - src = fetchurl { - url = "mirror://samba/ppp/${pname}-${version}.tar.gz"; - sha256 = "0c7vrjxl52pdwi4ckrvfjr08b31lfpgwf3pp0cqy76a77vfs7q02"; + src = fetchFromGitHub { + owner = "paulusmack"; + repo = "ppp"; + rev = "ppp-${version}"; + sha256 = "1i88m79h6g3fzsb4yw3k8bq1grsx3hsyawm7id2vcaab0gfqzjjv"; }; patches = [ - # fix for glibc>=2.28 - (fetchurl { - url = "https://github.com/paulusmack/ppp/commit/3c7b86229f7bd2600d74db14b1fe5b3896be3875.patch"; - sha256 = "0qlbi247lx3injpy8a1gcij9yilik0vfaibkpvdp88k3sa1rs69z"; - }) ( substituteAll { src = ./nix-purity.patch; inherit libpcap; @@ -25,19 +22,20 @@ stdenv.mkDerivation rec { # Without nonpriv.patch, pppd --version doesn't work when not run as # root. ./nonpriv.patch - (fetchurl { + (fetchpatch { name = "CVE-2015-3310.patch"; - url = "https://salsa.debian.org/roam/ppp/raw/ef5d585aca6b1200a52c7109caa66ef97964d76e/debian/patches/rc_mksid-no-buffer-overflow"; - sha256 = "1dk00j7bg9nfgskw39fagnwv1xgsmyv0xnkd6n1v5gy0psw0lvqh"; - }) - (fetchurl { - url = "https://salsa.debian.org/roam/ppp/raw/ef5d585aca6b1200a52c7109caa66ef97964d76e/debian/patches/0016-pppoe-include-netinet-in.h-before-linux-in.h.patch"; - sha256 = "1xnmqn02kc6g5y84xynjwnpv9cvrfn3nyv7h7r8j8xi7qf2aj4q8"; + url = "https://github.com/paulusmack/ppp/commit/858976b1fc3107f1261aae337831959b511b83c2.patch"; + sha256 = "0wirmcis67xjwllqhz9lsz1b7dcvl8shvz78lxgybc70j2sv7ih4"; }) (fetchurl { url = https://www.nikhef.nl/~janjust/ppp/ppp-2.4.7-eaptls-mppe-1.102.patch; sha256 = "04war8l5szql53l36043hvzgfwqp3v76kj8brbz7wlf7vs2mlkia"; }) + (fetchpatch { + name = "CVE-2020-8597.patch"; + url = "https://github.com/paulusmack/ppp/commit/8d7970b8f3db727fe798b65f3377fe6787575426.patch"; + sha256 = "129wnhwxmzvr3y9gzxv82jnb5y8m4yg8vkpa0xl2rwkl8anbzgkh"; + }) ./musl-fix-headers.patch ]; @@ -49,6 +47,7 @@ stdenv.mkDerivation rec { # everything anyway so we remove it from the Makefiles for file in $(find -name Makefile.linux); do substituteInPlace "$file" --replace '$(INSTALL) -s' '$(INSTALL)' + substituteInPlace "$file" --replace '-m 4550' '-m 550' done ''; diff --git a/pkgs/tools/networking/ppp/musl-fix-headers.patch b/pkgs/tools/networking/ppp/musl-fix-headers.patch index 030cc97d157..d6252a52675 100644 --- a/pkgs/tools/networking/ppp/musl-fix-headers.patch +++ b/pkgs/tools/networking/ppp/musl-fix-headers.patch @@ -34,8 +34,8 @@ index c81213b..305aece 100644 +#include + - void magic_init __P((void)); /* Initialize the magic number generator */ - u_int32_t magic __P((void)); /* Returns the next magic number */ + void magic_init (void); /* Initialize the magic number generator */ + u_int32_t magic (void); /* Returns the next magic number */ diff --git a/pppd/plugins/rp-pppoe/if.c b/pppd/plugins/rp-pppoe/if.c index 91e9a57..9c0fac3 100644 @@ -119,7 +119,7 @@ index 6d71530..86d224e 100644 #define MAX_ADDR_LEN 7 #endif --#if __GLIBC__ >= 2 +-#if !defined(__GLIBC__) || __GLIBC__ >= 2 #include /* glibc 2 conflicts with linux/types.h */ #include #include diff --git a/pkgs/tools/networking/ppp/nix-purity.patch b/pkgs/tools/networking/ppp/nix-purity.patch index 5321a472e73..975ea9db609 100644 --- a/pkgs/tools/networking/ppp/nix-purity.patch +++ b/pkgs/tools/networking/ppp/nix-purity.patch @@ -1,26 +1,26 @@ diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux -index 1ebebec..bf90c62 100644 +index 9664f70..d07e01e 100644 --- a/pppd/Makefile.linux +++ b/pppd/Makefile.linux -@@ -120,7 +120,7 @@ CFLAGS += -DHAS_SHADOW +@@ -125,7 +125,7 @@ CFLAGS += -DHAS_SHADOW #LIBS += -lshadow $(LIBS) endif --ifneq ($(wildcard /usr/include/crypt.h),) +-ifneq ($(wildcard $(shell $(CC) --print-sysroot)/usr/include/crypt.h),) +ifneq ($(wildcard @glibc@/include/crypt.h),) CFLAGS += -DHAVE_CRYPT_H=1 - LIBS += -lcrypt + LIBS += -lcrypt endif -@@ -132,7 +132,7 @@ endif +@@ -137,7 +137,7 @@ endif ifdef NEEDDES ifndef USE_CRYPT --CFLAGS += -I/usr/include/openssl +-CFLAGS += -I$(shell $(CC) --print-sysroot)/usr/include/openssl +CFLAGS += -I@openssl@/include/openssl LIBS += -lcrypto else CFLAGS += -DUSE_CRYPT=1 -@@ -178,7 +178,7 @@ LIBS += -ldl +@@ -188,7 +188,7 @@ LIBS += -ldl endif ifdef FILTER diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 18d9defdd94..e7493ada058 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "unbound"; - version = "1.9.5"; + version = "1.10.0"; src = fetchurl { url = "https://unbound.net/downloads/${pname}-${version}.tar.gz"; - sha256 = "0myv8l886gmlh9nh4j3q5549idxnl51hf9cw20yxfqbwd47l13ca"; + sha256 = "0mg9divpysr42sp0m693a70693dp8025v6c9dv1yabr4g1jlhbqm"; }; # https://github.com/NLnetLabs/unbound/pull/90 diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix index 8832560b3b1..a722a8016bc 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 ca10adae0e4..3bf3b97c235 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/appimage-run/default.nix b/pkgs/tools/package-management/appimage-run/default.nix index 426cc7943e5..3bc59f2ad14 100644 --- a/pkgs/tools/package-management/appimage-run/default.nix +++ b/pkgs/tools/package-management/appimage-run/default.nix @@ -1,56 +1,11 @@ -{ writeScript, buildFHSUserEnv, coreutils, file, libarchive, runtimeShell -, extraPkgs ? pkgs: [], appimageTools }: +{ appimageTools, buildFHSUserEnv, extraPkgs ? pkgs: [] }: let fhsArgs = appimageTools.defaultFhsEnvArgs; in buildFHSUserEnv (fhsArgs // { name = "appimage-run"; - targetPkgs = pkgs: fhsArgs.targetPkgs pkgs ++ extraPkgs pkgs; - - runScript = writeScript "appimage-exec" '' - #!${runtimeShell} - if [ $# -eq 0 ]; then - echo "Usage: $0 FILE [OPTION...]" - echo - echo 'Options are passed on to the appimage.' - echo "If you want to execute a custom command in the appimage's environment, set the APPIMAGE_DEBUG_EXEC environment variable." - exit 1 - fi - APPIMAGE="$(realpath "$1")" - shift - - if [ ! -x "$APPIMAGE" ]; then - echo "fatal: $APPIMAGE is not executable" - exit 1 - fi - - SHA256="$(${coreutils}/bin/sha256sum "$APPIMAGE" | cut -d ' ' -f 1)" - SQUASHFS_ROOT="''${XDG_CACHE_HOME:-$HOME/.cache}/appimage-run/$SHA256/" - mkdir -p "$SQUASHFS_ROOT" - - export APPDIR="$SQUASHFS_ROOT/squashfs-root" - if [ ! -x "$APPDIR" ]; then - cd "$SQUASHFS_ROOT" - - if ${file}/bin/file --mime-type --brief --keep-going "$APPIMAGE" | grep -q iso; then - # is type-1 appimage - mkdir "$APPDIR" - ${libarchive}/bin/bsdtar -x -C "$APPDIR" -f "$APPIMAGE" - else - # is type-2 appimage - "$APPIMAGE" --appimage-extract 2>/dev/null - fi - fi - - cd "$APPDIR" - export PATH="$PATH:$PWD/usr/bin" - export APPIMAGE_SILENT_INSTALL=1 - - if [ -n "$APPIMAGE_DEBUG_EXEC" ]; then - exec "$APPIMAGE_DEBUG_EXEC" - fi - - exec ./AppRun "$@" - ''; + targetPkgs = pkgs: [ appimageTools.appimage-exec ] + ++ fhsArgs.targetPkgs pkgs ++ extraPkgs pkgs; + runScript = "appimage-exec.sh"; }) diff --git a/pkgs/tools/package-management/cargo-license/default.nix b/pkgs/tools/package-management/cargo-license/default.nix index e91f099da85..b3c404f476f 100644 --- a/pkgs/tools/package-management/cargo-license/default.nix +++ b/pkgs/tools/package-management/cargo-license/default.nix @@ -1,4 +1,5 @@ { lib, rustPlatform, fetchFromGitHub }: + rustPlatform.buildRustPackage rec { pname = "cargo-license"; version = "0.3.0"; @@ -12,10 +13,7 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ ./add-Cargo.lock.patch ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0ksxvbrx8d8d09i167mdrhz5m46nbr6l0vyn7xpdanmha31xiaz9"; + cargoSha256 = "0bkaj54avvib1kipk8ky7gyxfs00qm80jd415zp53hhvinphzb5v"; meta = with lib; { description = "Cargo subcommand to see license of dependencies"; diff --git a/pkgs/tools/package-management/cargo-outdated/0001-Fix-outdated-Cargo.lock.patch b/pkgs/tools/package-management/cargo-outdated/0001-Fix-outdated-Cargo.lock.patch new file mode 100644 index 00000000000..4b8bc874e67 --- /dev/null +++ b/pkgs/tools/package-management/cargo-outdated/0001-Fix-outdated-Cargo.lock.patch @@ -0,0 +1,25 @@ +From fd0ccac1b3d4f78faa4c642dc2a413dfb54200fd Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Wed, 11 Mar 2020 22:27:23 +0100 +Subject: [PATCH] Fix outdated Cargo.lock + +--- + Cargo.lock | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 8458954..8083e81 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -171,7 +171,7 @@ dependencies = [ + + [[package]] + name = "cargo-outdated" +-version = "0.9.6" ++version = "0.9.7" + dependencies = [ + "cargo", + "docopt", +-- +2.25.0 + diff --git a/pkgs/tools/package-management/cargo-outdated/default.nix b/pkgs/tools/package-management/cargo-outdated/default.nix index 7fc7d93f927..6f8a415c5cb 100644 --- a/pkgs/tools/package-management/cargo-outdated/default.nix +++ b/pkgs/tools/package-management/cargo-outdated/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "cargo-outdated"; - version = "0.9.5"; + version = "0.9.7"; src = fetchFromGitHub { owner = "kbknapp"; repo = pname; - # This is the git commit that produced 0.9.5, according to crates.io, but - # the tag is missing in git. See here for details: - # https://github.com/kbknapp/cargo-outdated/issues/206 - rev = "7685da3265749bb7ae2b436a132f51d19b409bff"; - sha256 = "08prksns7d3g7ha601z8p28p36rg44rjl5ph76vg6nriww96zzca"; + rev = "v${version}"; + sha256 = "0g91cfja4h9qhpxgnimczjna528ml645iz7hgpwl6yp0742qcal4"; }; - cargoSha256 = "0kxfavyd9slpp2kzxhjp47q1pzw9rlmn7yhxnjsg88sxbjxfzv95"; + # Can be removed when updating to the next release. + cargoPatches = [ ./0001-Fix-outdated-Cargo.lock.patch ]; + + cargoSha256 = "0pr57g41lnn8srcbc11sb15qchf01zwqcb1802xdayj6wlc3g3dy"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ] diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index 9b7d915a349..c85bcf5b66c 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/cargo-update/0001-Generate-lockfile-for-cargo-update-v3.0.0.patch b/pkgs/tools/package-management/cargo-update/0001-Generate-lockfile-for-cargo-update-v3.0.0.patch new file mode 100644 index 00000000000..40cd310b643 --- /dev/null +++ b/pkgs/tools/package-management/cargo-update/0001-Generate-lockfile-for-cargo-update-v3.0.0.patch @@ -0,0 +1,651 @@ +From 893ee8e76cc8b4096c84fe3a537e312304ce214b Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Wed, 11 Mar 2020 22:32:47 +0100 +Subject: [PATCH] Generate lockfile for cargo-update v3.0.0 + +--- + Cargo.lock | 632 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 632 insertions(+) + create mode 100644 Cargo.lock + +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 000000000..0b3a75632 +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,632 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "aho-corasick" ++version = "0.7.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "ansi_term" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" ++dependencies = [ ++ "winapi", ++] ++ ++[[package]] ++name = "array_tool" ++version = "1.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8f8cb5d814eb646a863c4f24978cff2880c4be96ad8cde2c0f0678732902e271" ++ ++[[package]] ++name = "arrayref" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" ++ ++[[package]] ++name = "arrayvec" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" ++ ++[[package]] ++name = "atty" ++version = "0.2.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++ "winapi", ++] ++ ++[[package]] ++name = "autocfg" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" ++ ++[[package]] ++name = "base64" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" ++ ++[[package]] ++name = "bitflags" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++ ++[[package]] ++name = "blake2b_simd" ++version = "0.5.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" ++dependencies = [ ++ "arrayref", ++ "arrayvec", ++ "constant_time_eq", ++] ++ ++[[package]] ++name = "cargo-update" ++version = "3.0.0" ++dependencies = [ ++ "array_tool", ++ "clap", ++ "dirs", ++ "embed-resource", ++ "git2", ++ "hex", ++ "json", ++ "lazy_static", ++ "lazysort", ++ "regex", ++ "semver", ++ "serde", ++ "serde_derive", ++ "tabwriter", ++ "toml", ++ "unicode-normalization", ++ "url", ++] ++ ++[[package]] ++name = "cc" ++version = "1.0.50" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd" ++dependencies = [ ++ "jobserver", ++] ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" ++ ++[[package]] ++name = "clap" ++version = "2.33.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" ++dependencies = [ ++ "ansi_term", ++ "atty", ++ "bitflags", ++ "strsim", ++ "textwrap", ++ "unicode-width", ++ "vec_map", ++] ++ ++[[package]] ++name = "constant_time_eq" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" ++ ++[[package]] ++name = "crossbeam-utils" ++version = "0.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" ++dependencies = [ ++ "autocfg", ++ "cfg-if", ++ "lazy_static", ++] ++ ++[[package]] ++name = "dirs" ++version = "2.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" ++dependencies = [ ++ "cfg-if", ++ "dirs-sys", ++] ++ ++[[package]] ++name = "dirs-sys" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "redox_users", ++ "winapi", ++] ++ ++[[package]] ++name = "embed-resource" ++version = "1.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8398b939acbb266ade6939090e9f634147e7b426a33054a833d9ec935d814882" ++dependencies = [ ++ "vswhom", ++ "winreg", ++] ++ ++[[package]] ++name = "getrandom" ++version = "0.1.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "wasi", ++] ++ ++[[package]] ++name = "git2" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "77519ef7c5beee314d0804d4534f01e0f9e8d9acdee2b7a48627e590b27e0ec4" ++dependencies = [ ++ "bitflags", ++ "libc", ++ "libgit2-sys", ++ "log", ++ "openssl-probe", ++ "openssl-sys", ++ "url", ++] ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1010591b26bbfe835e9faeabeb11866061cc7dcebffd56ad7d0942d0e61aefd8" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "hex" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35" ++ ++[[package]] ++name = "idna" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" ++dependencies = [ ++ "matches", ++ "unicode-bidi", ++ "unicode-normalization", ++] ++ ++[[package]] ++name = "jobserver" ++version = "0.1.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "json" ++version = "0.11.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "92c245af8786f6ac35f95ca14feca9119e71339aaab41e878e7cdd655c97e9e5" ++ ++[[package]] ++name = "lazy_static" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++ ++[[package]] ++name = "lazysort" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d0e22ff43b231e0e2f87d74984e53ebc73b90ae13397e041214fb07efc64168f" ++ ++[[package]] ++name = "libc" ++version = "0.2.67" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "eb147597cdf94ed43ab7a9038716637d2d1bf2bc571da995d0028dec06bd3018" ++ ++[[package]] ++name = "libgit2-sys" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9ec6bca50549d34a392611dde775123086acbd994e3fff64954777ce2dc2e51" ++dependencies = [ ++ "cc", ++ "libc", ++ "libssh2-sys", ++ "libz-sys", ++ "openssl-sys", ++ "pkg-config", ++] ++ ++[[package]] ++name = "libssh2-sys" ++version = "0.2.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7bb70f29dc7c31d32c97577f13f41221af981b31248083e347b7f2c39225a6bc" ++dependencies = [ ++ "cc", ++ "libc", ++ "libz-sys", ++ "openssl-sys", ++ "pkg-config", ++ "vcpkg", ++] ++ ++[[package]] ++name = "libz-sys" ++version = "1.0.25" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe" ++dependencies = [ ++ "cc", ++ "libc", ++ "pkg-config", ++ "vcpkg", ++] ++ ++[[package]] ++name = "log" ++version = "0.4.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" ++dependencies = [ ++ "cfg-if", ++] ++ ++[[package]] ++name = "matches" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" ++ ++[[package]] ++name = "maybe-uninit" ++version = "2.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" ++ ++[[package]] ++name = "memchr" ++version = "2.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" ++ ++[[package]] ++name = "openssl-probe" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" ++ ++[[package]] ++name = "openssl-sys" ++version = "0.9.54" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1024c0a59774200a555087a6da3f253a9095a5f344e353b212ac4c8b8e450986" ++dependencies = [ ++ "autocfg", ++ "cc", ++ "libc", ++ "pkg-config", ++ "vcpkg", ++] ++ ++[[package]] ++name = "percent-encoding" ++version = "2.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" ++ ++[[package]] ++name = "pkg-config" ++version = "0.3.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6c09721c6781493a2a492a96b5a5bf19b65917fe6728884e7c44dd0c60ca3435" ++dependencies = [ ++ "unicode-xid", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.1.56" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" ++ ++[[package]] ++name = "redox_users" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431" ++dependencies = [ ++ "getrandom", ++ "redox_syscall", ++ "rust-argon2", ++] ++ ++[[package]] ++name = "regex" ++version = "1.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "322cf97724bea3ee221b78fe25ac9c46114ebb51747ad5babd51a2fc6a8235a8" ++dependencies = [ ++ "aho-corasick", ++ "memchr", ++ "regex-syntax", ++ "thread_local", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1132f845907680735a84409c3bebc64d1364a5683ffbce899550cd09d5eaefc1" ++ ++[[package]] ++name = "rust-argon2" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017" ++dependencies = [ ++ "base64", ++ "blake2b_simd", ++ "constant_time_eq", ++ "crossbeam-utils", ++] ++ ++[[package]] ++name = "semver" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" ++dependencies = [ ++ "semver-parser", ++ "serde", ++] ++ ++[[package]] ++name = "semver-parser" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" ++ ++[[package]] ++name = "serde" ++version = "1.0.104" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449" ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.104" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "smallvec" ++version = "0.6.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" ++dependencies = [ ++ "maybe-uninit", ++] ++ ++[[package]] ++name = "strsim" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" ++ ++[[package]] ++name = "syn" ++version = "1.0.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "123bd9499cfb380418d509322d7a6d52e5315f064fe4b3ad18a53d6b92c07859" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-xid", ++] ++ ++[[package]] ++name = "tabwriter" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "36205cfc997faadcc4b0b87aaef3fbedafe20d38d4959a7ca6ff803564051111" ++dependencies = [ ++ "unicode-width", ++] ++ ++[[package]] ++name = "textwrap" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" ++dependencies = [ ++ "unicode-width", ++] ++ ++[[package]] ++name = "thread_local" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" ++dependencies = [ ++ "lazy_static", ++] ++ ++[[package]] ++name = "toml" ++version = "0.5.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" ++dependencies = [ ++ "serde", ++] ++ ++[[package]] ++name = "unicode-bidi" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" ++dependencies = [ ++ "matches", ++] ++ ++[[package]] ++name = "unicode-normalization" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "09c8070a9942f5e7cfccd93f490fdebd230ee3c3c9f107cb25bad5351ef671cf" ++dependencies = [ ++ "smallvec", ++] ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" ++ ++[[package]] ++name = "url" ++version = "2.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb" ++dependencies = [ ++ "idna", ++ "matches", ++ "percent-encoding", ++] ++ ++[[package]] ++name = "vcpkg" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" ++ ++[[package]] ++name = "vec_map" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" ++ ++[[package]] ++name = "vswhom" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" ++dependencies = [ ++ "libc", ++ "vswhom-sys", ++] ++ ++[[package]] ++name = "vswhom-sys" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fc2f5402d3d0e79a069714f7b48e3ecc60be7775a2c049cb839457457a239532" ++dependencies = [ ++ "cc", ++ "libc", ++] ++ ++[[package]] ++name = "wasi" ++version = "0.9.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" ++ ++[[package]] ++name = "winapi" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", ++] ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++ ++[[package]] ++name = "winreg" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" ++dependencies = [ ++ "winapi", ++] +-- +2.25.0 + diff --git a/pkgs/tools/package-management/cargo-update/cargo-lock.patch b/pkgs/tools/package-management/cargo-update/cargo-lock.patch deleted file mode 100644 index 7872a4bf18b..00000000000 --- a/pkgs/tools/package-management/cargo-update/cargo-lock.patch +++ /dev/null @@ -1,739 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -new file mode 100644 -index 000000000..76f256f46 ---- /dev/null -+++ b/Cargo.lock -@@ -0,0 +1,733 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. -+[[package]] -+name = "aho-corasick" -+version = "0.7.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "ansi_term" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "array_tool" -+version = "1.0.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "arrayref" -+version = "0.3.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "arrayvec" -+version = "0.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "atty" -+version = "0.2.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "autocfg" -+version = "0.1.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "backtrace" -+version = "0.3.40" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "backtrace-sys" -+version = "0.1.32" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "base64" -+version = "0.10.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "bitflags" -+version = "1.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "blake2b_simd" -+version = "0.5.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "byteorder" -+version = "1.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "cargo-update" -+version = "2.5.0" -+dependencies = [ -+ "array_tool 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "embed-resource 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "git2 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "json 0.11.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazysort 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+ "tabwriter 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-normalization 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "cc" -+version = "1.0.50" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "jobserver 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "cfg-if" -+version = "0.1.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "clap" -+version = "2.33.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "cloudabi" -+version = "0.0.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "constant_time_eq" -+version = "0.1.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "crossbeam-utils" -+version = "0.6.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "dirs" -+version = "2.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "dirs-sys" -+version = "0.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "embed-resource" -+version = "1.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "vswhom 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "failure" -+version = "0.1.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)", -+ "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "failure_derive" -+version = "0.1.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "fuchsia-cprng" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "git2" -+version = "0.10.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libgit2-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "hermit-abi" -+version = "0.1.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "idna" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-normalization 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "jobserver" -+version = "0.1.18" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "json" -+version = "0.11.15" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "lazy_static" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "lazysort" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "libc" -+version = "0.2.66" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "libgit2-sys" -+version = "0.9.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libssh2-sys 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "libssh2-sys" -+version = "0.2.13" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", -+ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "libz-sys" -+version = "1.0.25" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", -+ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "log" -+version = "0.4.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "matches" -+version = "0.1.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "maybe-uninit" -+version = "2.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "memchr" -+version = "2.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "openssl-probe" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "openssl-sys" -+version = "0.9.53" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", -+ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "percent-encoding" -+version = "2.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "pkg-config" -+version = "0.3.17" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "proc-macro2" -+version = "1.0.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "quote" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "rand_core" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "rand_core" -+version = "0.4.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "rand_os" -+version = "0.1.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "rdrand" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "redox_syscall" -+version = "0.1.56" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "redox_users" -+version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "regex" -+version = "1.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "regex-syntax" -+version = "0.6.12" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "rust-argon2" -+version = "0.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "rustc-demangle" -+version = "0.1.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "semver" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "semver-parser" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "serde" -+version = "1.0.104" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "serde_derive" -+version = "1.0.104" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "smallvec" -+version = "0.6.13" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "strsim" -+version = "0.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "syn" -+version = "1.0.13" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "synstructure" -+version = "0.12.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "tabwriter" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "textwrap" -+version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "thread_local" -+version = "0.3.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "toml" -+version = "0.5.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "unicode-bidi" -+version = "0.3.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "unicode-normalization" -+version = "0.1.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "unicode-width" -+version = "0.1.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "unicode-xid" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "url" -+version = "2.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "vcpkg" -+version = "0.2.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "vec_map" -+version = "0.8.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "vswhom" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "vswhom-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "vswhom-sys" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "winapi" -+version = "0.3.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "winapi-i686-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "winapi-x86_64-pc-windows-gnu" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "winreg" -+version = "0.6.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[metadata] -+"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" -+"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -+"checksum array_tool 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8f8cb5d814eb646a863c4f24978cff2880c4be96ad8cde2c0f0678732902e271" -+"checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee" -+"checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" -+"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -+"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" -+"checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea" -+"checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491" -+"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" -+"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -+"checksum blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" -+"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" -+"checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd" -+"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" -+"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" -+"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -+"checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120" -+"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" -+"checksum dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" -+"checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b" -+"checksum embed-resource 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bbaba4684ab0af1cbb3ef0b1f540ddc4b57b31940c920ea594efe09ab86e2a6c" -+"checksum failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9" -+"checksum failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08" -+"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" -+"checksum git2 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c1af51ea8a906616af45a4ce78eacf25860f7a13ae7bf8a814693f0f4037a26" -+"checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772" -+"checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" -+"checksum jobserver 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "230ae9adf468173aecd4176c7233bddc84a15871a586c5971ace9a55f881c075" -+"checksum json 0.11.15 (registry+https://github.com/rust-lang/crates.io-index)" = "92c245af8786f6ac35f95ca14feca9119e71339aaab41e878e7cdd655c97e9e5" -+"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -+"checksum lazysort 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e22ff43b231e0e2f87d74984e53ebc73b90ae13397e041214fb07efc64168f" -+"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" -+"checksum libgit2-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4870c781f6063efb83150cd22c1ddf6ecf58531419e7570cdcced46970f64a16" -+"checksum libssh2-sys 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "5fcd5a428a31cbbfe059812d74f4b6cd3b9b7426c2bdaec56993c5365da1c328" -+"checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe" -+"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" -+"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" -+"checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" -+"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" -+"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" -+"checksum openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)" = "465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f" -+"checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" -+"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" -+"checksum proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0319972dcae462681daf4da1adeeaa066e3ebd29c69be96c6abb1259d2ee2bcc" -+"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" -+"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -+"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" -+"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" -+"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -+"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" -+"checksum redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecedbca3bf205f8d8f5c2b44d83cd0690e39ee84b951ed649e9f1841132b66d" -+"checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd" -+"checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716" -+"checksum rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf" -+"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" -+"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -+"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -+"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449" -+"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64" -+"checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" -+"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -+"checksum syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1e4ff033220a41d1a57d8125eab57bf5263783dfdcc18688b1dacc6ce9651ef8" -+"checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" -+"checksum tabwriter 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9128e3a9149e51494cad59712a286e149fcb74e443d2298d69bd6eaa42cc4ebb" -+"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -+"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" -+"checksum toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf" -+"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -+"checksum unicode-normalization 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "09c8070a9942f5e7cfccd93f490fdebd230ee3c3c9f107cb25bad5351ef671cf" -+"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" -+"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" -+"checksum url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb" -+"checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" -+"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" -+"checksum vswhom 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" -+"checksum vswhom-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc2f5402d3d0e79a069714f7b48e3ecc60be7775a2c049cb839457457a239532" -+"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" -+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -+"checksum winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" diff --git a/pkgs/tools/package-management/cargo-update/default.nix b/pkgs/tools/package-management/cargo-update/default.nix index 241213b9409..c0a1e8edc0f 100644 --- a/pkgs/tools/package-management/cargo-update/default.nix +++ b/pkgs/tools/package-management/cargo-update/default.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-update"; - version = "2.5.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "nabijaczleweli"; repo = pname; rev = "v${version}"; - sha256 = "143aczay7i3zbhbvv4cjf6hns5w8j52rfdaq8ff0r8v3qghd2972"; + sha256 = "1jyfv8aa0gp67pvv8l2vkqq4j9rgjl4rq1wn4nqxb44gmvkg15l3"; }; - cargoPatches = [ ./cargo-lock.patch ]; - cargoSha256 = "0mxc752hmd7r29camq4f4qzwx0w008rqlq07j2r26z4ygvlrkc3a"; + cargoPatches = [ ./0001-Generate-lockfile-for-cargo-update-v3.0.0.patch ]; + cargoSha256 = "034v1ql5k3n3rgi3aqszkybvv3vc80v263c9nlwxcwbswsh9jpp1"; nativeBuildInputs = [ cmake ]; buildInputs = [ libgit2 libssh2 openssl pkg-config zlib ] diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix index 69821ca5136..6914f1af5f1 100644 --- a/pkgs/tools/package-management/librepo/default.nix +++ b/pkgs/tools/package-management/librepo/default.nix @@ -13,7 +13,7 @@ }: stdenv.mkDerivation rec { - version = "1.11.2"; + version = "1.11.3"; pname = "librepo"; outputs = [ "out" "dev" "py" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "rpm-software-management"; repo = "librepo"; rev = version; - sha256 = "0f04qky61dlh5h71xdmpngpy98cmlsfyp2pkyj5sbkplvrmh1wzw"; + sha256 = "1kdv0xyrbd942if82yvm9ykcskziq2xhw5cpb3xv4wx32a9kc8yz"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index 60091742e0d..0b5f5edf399 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 21000bf6353..0322faa4c88 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 00000000000..aa2950bf157 --- /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 + #include + #include ++#include // https://lkml.org/lkml/2019/6/3/988 + #include + #include + #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 479de4b4185..b841ccb93d3 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 db5524ce365..6f783d07ced 100644 --- a/pkgs/tools/security/b3sum/default.nix +++ b/pkgs/tools/security/b3sum/default.nix @@ -13,11 +13,7 @@ rustPlatform.buildRustPackage rec { sourceRoot = "source/b3sum"; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0qw7sr817lmj9xicc03cj1k49lwjwc1whllc7sj2g4c0nl2vndir"; - verifyCargoDeps = false; + cargoSha256 = "1rqhz2r60603mylazn37mkm783qb7qhjcg8cqss0iy1g752f3f2i"; cargoPatches = [ ./add-cargo-lock.patch ]; diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index fbef98df82d..71f39eaf2ee 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/bitwarden_rs/vault.nix b/pkgs/tools/security/bitwarden_rs/vault.nix index b5f00a4abf9..0ce9d43f967 100644 --- a/pkgs/tools/security/bitwarden_rs/vault.nix +++ b/pkgs/tools/security/bitwarden_rs/vault.nix @@ -10,9 +10,10 @@ stdenv.mkDerivation rec { }; buildCommand = '' - mkdir -p $out/share/bitwarden_rs/vault - cd $out/share/bitwarden_rs/vault + mkdir -p $out/share/bitwarden_rs/ + cd $out/share/bitwarden_rs/ tar xf $src + mv web-vault vault ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/brutespray/default.nix b/pkgs/tools/security/brutespray/default.nix new file mode 100644 index 00000000000..be7c99f5252 --- /dev/null +++ b/pkgs/tools/security/brutespray/default.nix @@ -0,0 +1,40 @@ +{ stdenv, python3, fetchFromGitHub, makeWrapper, medusa }: + +stdenv.mkDerivation rec { + pname = "brutespray"; + version = "1.6.6"; + + src = fetchFromGitHub { + owner = "x90skysn3k"; + repo = pname; + rev = "brutespray-${version}"; + sha256 = "1rj8fkq1xz4ph1pmldphlsa25mg6xl7i7dranb0qjx00jhfxjxjh"; + }; + + postPatch = '' + substituteInPlace brutespray.py \ + --replace "/usr/share/brutespray" "$out/share/brutespray" + ''; + + dontBuild = true; + nativeBuildInputs = [ python3.pkgs.wrapPython makeWrapper ]; + buildInputs = [ python3 ]; + + installPhase = '' + install -Dm0755 brutespray.py $out/bin/brutespray + patchShebangs $out/bin + patchPythonScript $out/bin/brutespray + wrapProgram $out/bin/brutespray \ + --prefix PATH : ${stdenv.lib.makeBinPath [ medusa ]} + + mkdir -p $out/share/brutespray + cp -r wordlist/ $out/share/brutespray/wordlist + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/x90skysn3k/brutespray"; + description = "Brute-Forcing from Nmap output - Automatically attempts default creds on found services"; + license = licenses.mit; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 9aa92fd6829..203f50a9c0e 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -33,6 +33,9 @@ stdenv.mkDerivation rec { patches = [ ./fix-libusb-include-path.patch ./0001-dirmngr-Only-use-SKS-pool-CA-for-SKS-pool.patch + ./tests-add-test-cases-for-import-without-uid.patch + ./allow-import-of-previously-known-keys-even-without-UI.patch + ./accept-subkeys-with-a-good-revocation-but-no-self-sig.patch ]; postPatch = '' sed -i 's,hkps://hkps.pool.sks-keyservers.net,hkps://keys.openpgp.org,g' \ diff --git a/pkgs/tools/security/gnupg/accept-subkeys-with-a-good-revocation-but-no-self-sig.patch b/pkgs/tools/security/gnupg/accept-subkeys-with-a-good-revocation-but-no-self-sig.patch new file mode 100644 index 00000000000..5cbec92ae68 --- /dev/null +++ b/pkgs/tools/security/gnupg/accept-subkeys-with-a-good-revocation-but-no-self-sig.patch @@ -0,0 +1,32 @@ +From: Vincent Breitmoser +Date: Thu, 13 Jun 2019 21:27:43 +0200 +Subject: gpg: accept subkeys with a good revocation but no self-sig during + import + +* g10/import.c (chk_self_sigs): Set the NODE_GOOD_SELFSIG flag when we +encounter a valid revocation signature. This allows import of subkey +revocation signatures, even in the absence of a corresponding subkey +binding signature. + +-- + +This fixes the remaining test in import-incomplete.scm. + +GnuPG-Bug-id: 4393 +Signed-off-by: Daniel Kahn Gillmor +--- + g10/import.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/g10/import.c b/g10/import.c +index 4fdf248..ee2fed8 100644 +--- a/g10/import.c ++++ b/g10/import.c +@@ -3613,6 +3613,7 @@ chk_self_sigs (ctrl_t ctrl, kbnode_t keyblock, u32 *keyid, int *non_self) + /* It's valid, so is it newer? */ + if (sig->timestamp >= rsdate) + { ++ knode->flag |= NODE_GOOD_SELFSIG; /* Subkey is valid. */ + if (rsnode) + { + /* Delete the last revocation sig since diff --git a/pkgs/tools/security/gnupg/allow-import-of-previously-known-keys-even-without-UI.patch b/pkgs/tools/security/gnupg/allow-import-of-previously-known-keys-even-without-UI.patch new file mode 100644 index 00000000000..723a6952044 --- /dev/null +++ b/pkgs/tools/security/gnupg/allow-import-of-previously-known-keys-even-without-UI.patch @@ -0,0 +1,106 @@ +From: Vincent Breitmoser +Date: Thu, 13 Jun 2019 21:27:42 +0200 +Subject: gpg: allow import of previously known keys, even without UIDs + +* g10/import.c (import_one): Accept an incoming OpenPGP certificate that +has no user id, as long as we already have a local variant of the cert +that matches the primary key. + +-- + +This fixes two of the three broken tests in import-incomplete.scm. + +GnuPG-Bug-id: 4393 +Signed-off-by: Daniel Kahn Gillmor +--- + g10/import.c | 44 +++++++++++--------------------------------- + 1 file changed, 11 insertions(+), 33 deletions(-) + +diff --git a/g10/import.c b/g10/import.c +index 95d419a..4fdf248 100644 +--- a/g10/import.c ++++ b/g10/import.c +@@ -1792,7 +1792,6 @@ import_one_real (ctrl_t ctrl, + size_t an; + char pkstrbuf[PUBKEY_STRING_SIZE]; + int merge_keys_done = 0; +- int any_filter = 0; + KEYDB_HANDLE hd = NULL; + + if (r_valid) +@@ -1829,14 +1828,6 @@ import_one_real (ctrl_t ctrl, + log_printf ("\n"); + } + +- +- if (!uidnode ) +- { +- if (!silent) +- log_error( _("key %s: no user ID\n"), keystr_from_pk(pk)); +- return 0; +- } +- + if (screener && screener (keyblock, screener_arg)) + { + log_error (_("key %s: %s\n"), keystr_from_pk (pk), +@@ -1911,17 +1902,10 @@ import_one_real (ctrl_t ctrl, + } + } + +- if (!delete_inv_parts (ctrl, keyblock, keyid, options ) ) +- { +- if (!silent) +- { +- log_error( _("key %s: no valid user IDs\n"), keystr_from_pk(pk)); +- if (!opt.quiet ) +- log_info(_("this may be caused by a missing self-signature\n")); +- } +- stats->no_user_id++; +- return 0; +- } ++ /* Delete invalid parts, and note if we have any valid ones left. ++ * We will later abort import if this key is new but contains ++ * no valid uids. */ ++ delete_inv_parts (ctrl, keyblock, keyid, options); + + /* Get rid of deleted nodes. */ + commit_kbnode (&keyblock); +@@ -1931,24 +1915,11 @@ import_one_real (ctrl_t ctrl, + { + apply_keep_uid_filter (ctrl, keyblock, import_filter.keep_uid); + commit_kbnode (&keyblock); +- any_filter = 1; + } + if (import_filter.drop_sig) + { + apply_drop_sig_filter (ctrl, keyblock, import_filter.drop_sig); + commit_kbnode (&keyblock); +- any_filter = 1; +- } +- +- /* If we ran any filter we need to check that at least one user id +- * is left in the keyring. Note that we do not use log_error in +- * this case. */ +- if (any_filter && !any_uid_left (keyblock)) +- { +- if (!opt.quiet ) +- log_info ( _("key %s: no valid user IDs\n"), keystr_from_pk (pk)); +- stats->no_user_id++; +- return 0; + } + + /* The keyblock is valid and ready for real import. */ +@@ -2006,6 +1977,13 @@ import_one_real (ctrl_t ctrl, + err = 0; + stats->skipped_new_keys++; + } ++ else if (err && !any_uid_left (keyblock)) ++ { ++ if (!silent) ++ log_info( _("key %s: new key but contains no user ID - skipped\n"), keystr(keyid)); ++ err = 0; ++ stats->no_user_id++; ++ } + else if (err) /* Insert this key. */ + { + /* Note: ERR can only be NO_PUBKEY or UNUSABLE_PUBKEY. */ diff --git a/pkgs/tools/security/gnupg/tests-add-test-cases-for-import-without-uid.patch b/pkgs/tools/security/gnupg/tests-add-test-cases-for-import-without-uid.patch new file mode 100644 index 00000000000..37ddeea2249 --- /dev/null +++ b/pkgs/tools/security/gnupg/tests-add-test-cases-for-import-without-uid.patch @@ -0,0 +1,201 @@ +From: Vincent Breitmoser +Date: Thu, 13 Jun 2019 21:27:41 +0200 +Subject: tests: add test cases for import without uid + +This commit adds a test case that does the following, in order: +- Import of a primary key plus user id +- Check that import of a subkey works, without a user id present in the +imported key +- Check that import of a subkey revocation works, without a user id or +subkey binding signature present in the imported key +- Check that import of a primary key revocation works, without a user id +present in the imported key + +-- + +Note that this test currently fails. The following changesets will +fix gpg so that the tests pass. + +GnuPG-Bug-id: 4393 +Signed-Off-By: Daniel Kahn Gillmor +--- + tests/openpgp/Makefile.am | 1 + + tests/openpgp/import-incomplete.scm | 68 ++++++++++++++++++++++ + .../import-incomplete/primary+revocation.asc | 9 +++ + .../primary+subkey+sub-revocation.asc | 10 ++++ + .../import-incomplete/primary+subkey+sub-sig.asc | 10 ++++ + .../openpgp/import-incomplete/primary+uid-sig.asc | 10 ++++ + tests/openpgp/import-incomplete/primary+uid.asc | 10 ++++ + 7 files changed, 118 insertions(+) + create mode 100755 tests/openpgp/import-incomplete.scm + create mode 100644 tests/openpgp/import-incomplete/primary+revocation.asc + create mode 100644 tests/openpgp/import-incomplete/primary+subkey+sub-revocation.asc + create mode 100644 tests/openpgp/import-incomplete/primary+subkey+sub-sig.asc + create mode 100644 tests/openpgp/import-incomplete/primary+uid-sig.asc + create mode 100644 tests/openpgp/import-incomplete/primary+uid.asc + +diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am +index f6014c9..6423da1 100644 +--- a/tests/openpgp/Makefile.am ++++ b/tests/openpgp/Makefile.am +@@ -78,6 +78,7 @@ XTESTS = \ + gpgv-forged-keyring.scm \ + armor.scm \ + import.scm \ ++ import-incomplete.scm \ + import-revocation-certificate.scm \ + ecc.scm \ + 4gb-packet.scm \ +diff --git a/tests/openpgp/import-incomplete.scm b/tests/openpgp/import-incomplete.scm +new file mode 100755 +index 0000000..727a027 +--- /dev/null ++++ b/tests/openpgp/import-incomplete.scm +@@ -0,0 +1,68 @@ ++#!/usr/bin/env gpgscm ++ ++;; Copyright (C) 2016 g10 Code GmbH ++;; ++;; This file is part of GnuPG. ++;; ++;; GnuPG is free software; you can redistribute it and/or modify ++;; it under the terms of the GNU General Public License as published by ++;; the Free Software Foundation; either version 3 of the License, or ++;; (at your option) any later version. ++;; ++;; GnuPG is distributed in the hope that it will be useful, ++;; but WITHOUT ANY WARRANTY; without even the implied warranty of ++;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++;; GNU General Public License for more details. ++;; ++;; You should have received a copy of the GNU General Public License ++;; along with this program; if not, see . ++ ++(load (in-srcdir "tests" "openpgp" "defs.scm")) ++(setup-environment) ++ ++(call-check `(,(tool 'gpg) --import ,(in-srcdir "tests" "openpgp" "import-incomplete" "primary+uid.asc"))) ++ ++(info "Test import of new subkey, from a certificate without uid") ++(define keyid "573EA710367356BB") ++(call-check `(,(tool 'gpg) --import ,(in-srcdir "tests" "openpgp" "import-incomplete" "primary+subkey+sub-sig.asc"))) ++(tr:do ++ (tr:pipe-do ++ (pipe:gpg `(--list-keys --with-colons ,keyid))) ++ (tr:call-with-content ++ (lambda (c) ++ ;; XXX we do not have a regexp library ++ (unless (any (lambda (line) ++ (and (string-prefix? line "sub:") ++ (string-contains? line "573EA710367356BB"))) ++ (string-split-newlines c)) ++ (exit 1))))) ++ ++(info "Test import of a subkey revocation, from a certificate without uid") ++(define keyid "573EA710367356BB") ++(call-check `(,(tool 'gpg) --import ,(in-srcdir "tests" "openpgp" "import-incomplete" "primary+subkey+sub-revocation.asc"))) ++(tr:do ++ (tr:pipe-do ++ (pipe:gpg `(--list-keys --with-colons ,keyid))) ++ (tr:call-with-content ++ (lambda (c) ++ ;; XXX we do not have a regexp library ++ (unless (any (lambda (line) ++ (and (string-prefix? line "sub:r:") ++ (string-contains? line "573EA710367356BB"))) ++ (string-split-newlines c)) ++ (exit 1))))) ++ ++(info "Test import of revocation, from a certificate without uid") ++(call-check `(,(tool 'gpg) --import ,(in-srcdir "tests" "openpgp" "import-incomplete" "primary+revocation.asc"))) ++(tr:do ++ (tr:pipe-do ++ (pipe:gpg `(--list-keys --with-colons ,keyid))) ++ (tr:call-with-content ++ (lambda (c) ++ ;; XXX we do not have a regexp library ++ (unless (any (lambda (line) ++ (and (string-prefix? line "pub:r:") ++ (string-contains? line "0843DA969AA8DAFB"))) ++ (string-split-newlines c)) ++ (exit 1))))) ++ +diff --git a/tests/openpgp/import-incomplete/primary+revocation.asc b/tests/openpgp/import-incomplete/primary+revocation.asc +new file mode 100644 +index 0000000..6b7b608 +--- /dev/null ++++ b/tests/openpgp/import-incomplete/primary+revocation.asc +@@ -0,0 +1,9 @@ ++-----BEGIN PGP PUBLIC KEY BLOCK----- ++Comment: [E] primary key, revocation signature over primary (no user ID) ++ ++mDMEXNmUGRYJKwYBBAHaRw8BAQdA75R8VlchvmEd2Iz/8l07RoKUaUPDB71Ao1zZ ++631VAN2IeAQgFggAIBYhBLRpj5W82H/gSMzKKQhD2paaqNr7BQJc2ZQZAh0AAAoJ ++EAhD2paaqNr7qAwA/2jBUpnN0BxwRO/4CrxvrLIsL+C9aSXJUOTv8XkP4lvtAQD3 ++XsDFfFNgEueiTfF7HtOGt5LPmRqVvUpQSMVgJJW6CQ== ++=tM90 ++-----END PGP PUBLIC KEY BLOCK----- +diff --git a/tests/openpgp/import-incomplete/primary+subkey+sub-revocation.asc b/tests/openpgp/import-incomplete/primary+subkey+sub-revocation.asc +new file mode 100644 +index 0000000..83a51a5 +--- /dev/null ++++ b/tests/openpgp/import-incomplete/primary+subkey+sub-revocation.asc +@@ -0,0 +1,10 @@ ++-----BEGIN PGP PUBLIC KEY BLOCK----- ++Comment: [D] primary key, subkey, subkey revocation (no user ID) ++ ++mDMEXNmUGRYJKwYBBAHaRw8BAQdA75R8VlchvmEd2Iz/8l07RoKUaUPDB71Ao1zZ ++631VAN24OARc2ZQhEgorBgEEAZdVAQUBAQdABsd5ha0AWXdXcSmfeiWIfrNcGqQK ++j++lwwWDAOlkVicDAQgHiHgEKBYIACAWIQS0aY+VvNh/4EjMyikIQ9qWmqja+wUC ++XNmnkAIdAgAKCRAIQ9qWmqja+ylaAQDmIKf86BJEq4OpDqU+V9D+wn2cyuxbyWVQ ++3r9LiL9qNwD/QAjyrhSN8L3Mfq+wdTHo5i0yB9ZCCpHLXSbhCqfWZwQ= ++=dwx2 ++-----END PGP PUBLIC KEY BLOCK----- +diff --git a/tests/openpgp/import-incomplete/primary+subkey+sub-sig.asc b/tests/openpgp/import-incomplete/primary+subkey+sub-sig.asc +new file mode 100644 +index 0000000..dc47a02 +--- /dev/null ++++ b/tests/openpgp/import-incomplete/primary+subkey+sub-sig.asc +@@ -0,0 +1,10 @@ ++-----BEGIN PGP PUBLIC KEY BLOCK----- ++Comment: [B] primary key, subkey, subkey binding sig (no user ID) ++ ++mDMEXNmUGRYJKwYBBAHaRw8BAQdA75R8VlchvmEd2Iz/8l07RoKUaUPDB71Ao1zZ ++631VAN24OARc2ZQhEgorBgEEAZdVAQUBAQdABsd5ha0AWXdXcSmfeiWIfrNcGqQK ++j++lwwWDAOlkVicDAQgHiHgEGBYIACAWIQS0aY+VvNh/4EjMyikIQ9qWmqja+wUC ++XNmUIQIbDAAKCRAIQ9qWmqja++vFAP98G1L+1/rWTGbsnxOAV2RocBYIroAvsbkR ++Ly6FdP8YNwEA7jOgT05CoKIe37MstpOz23mM80AK369Ca3JMmKKCQgg= ++=xuDu ++-----END PGP PUBLIC KEY BLOCK----- +diff --git a/tests/openpgp/import-incomplete/primary+uid-sig.asc b/tests/openpgp/import-incomplete/primary+uid-sig.asc +new file mode 100644 +index 0000000..134607d +--- /dev/null ++++ b/tests/openpgp/import-incomplete/primary+uid-sig.asc +@@ -0,0 +1,10 @@ ++-----BEGIN PGP PUBLIC KEY BLOCK----- ++Comment: [C] primary key and self-sig expiring in 2024 (no user ID) ++ ++mDMEXNmUGRYJKwYBBAHaRw8BAQdA75R8VlchvmEd2Iz/8l07RoKUaUPDB71Ao1zZ ++631VAN2IlgQTFggAPgIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgBYhBLRpj5W8 ++2H/gSMzKKQhD2paaqNr7BQJc2ZR1BQkJZgHcAAoJEAhD2paaqNr79soA/0lWkUsu ++3NLwgbni6EzJxnTzgeNMpljqNpipHAwfix9hAP93AVtFdC8g7hdUZxawobl9lnSN ++9ohXOEBWvdJgVv2YAg== ++=KWIK ++-----END PGP PUBLIC KEY BLOCK----- +diff --git a/tests/openpgp/import-incomplete/primary+uid.asc b/tests/openpgp/import-incomplete/primary+uid.asc +new file mode 100644 +index 0000000..055f300 +--- /dev/null ++++ b/tests/openpgp/import-incomplete/primary+uid.asc +@@ -0,0 +1,10 @@ ++-----BEGIN PGP PUBLIC KEY BLOCK----- ++Comment: [A] primary key, user ID, and self-sig expiring in 2021 ++ ++mDMEXNmUGRYJKwYBBAHaRw8BAQdA75R8VlchvmEd2Iz/8l07RoKUaUPDB71Ao1zZ ++631VAN20CHRlc3Qga2V5iJYEExYIAD4WIQS0aY+VvNh/4EjMyikIQ9qWmqja+wUC ++XNmUGQIbAwUJA8JnAAULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRAIQ9qWmqja +++0G1AQDdQiwhXxjXLMqoth+D4SigVHTJK8ORwifzsy3UE7mPGwD/aZ67XbAF/lgI ++kv2O1Jo0u9BL9RNNF+L0DM7rAFbfMAs= ++=1eII ++-----END PGP PUBLIC KEY BLOCK----- diff --git a/pkgs/tools/security/medusa/default.nix b/pkgs/tools/security/medusa/default.nix new file mode 100644 index 00000000000..bc18f165be7 --- /dev/null +++ b/pkgs/tools/security/medusa/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, pkg-config, freerdp, openssl, libssh2 }: + +stdenv.mkDerivation rec { + pname = "medusa-unstable"; + version = "2018-12-16"; + + src = fetchFromGitHub { + owner = "jmk-foofus"; + repo = "medusa"; + rev = "292193b3995444aede53ff873899640b08129fc7"; + sha256 = "0njlz4fqa0165wdmd5y8lfnafayf3c4la0r8pf3hixkdwsss1509"; + }; + + outputs = [ "out" "man" ]; + + configureFlags = [ "--enable-module-ssh=yes" ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ freerdp openssl libssh2 ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/jmk-foofus/medusa"; + description = "A speedy, parallel, and modular, login brute-forcer"; + license = licenses.gpl2; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/tools/security/pcsctools/default.nix b/pkgs/tools/security/pcsctools/default.nix index fa53b91a02f..c9c677e64c0 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/security/ripasso/cursive.nix b/pkgs/tools/security/ripasso/cursive.nix index f0e9cb8959d..70c4ee864b6 100644 --- a/pkgs/tools/security/ripasso/cursive.nix +++ b/pkgs/tools/security/ripasso/cursive.nix @@ -12,10 +12,7 @@ buildRustPackage rec { sha256 = "164da20j727p8l7hh37j2r8pai9sj402nhswvg0nrlgj53nr6083"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1vyhdbia7khh0ixim00knai5d270jl5a5crqik1qaz7bkwc02bsp"; + cargoSha256 = "1wpn67v0xmxhn1dgzhh1pwz1yc3cizmfxhpb7qv9b27ynx4486ji"; cargoBuildFlags = [ "-p ripasso-cursive -p ripasso-man" ]; diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix index 45dfddf7c14..fe0b13bbb97 100644 --- a/pkgs/tools/security/sequoia/default.nix +++ b/pkgs/tools/security/sequoia/default.nix @@ -9,16 +9,16 @@ assert pythonSupport -> pythonPackages != null; rustPlatform.buildRustPackage rec { pname = "sequoia"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitLab { owner = "sequoia-pgp"; repo = pname; rev = "v${version}"; - sha256 = "1p17y6vsya8daglvl6yal3759x44dc062ah5vyra0k7dk82cc4pq"; + sha256 = "1l6isis0ddb0b306z3cv2f5qz2bhw5pmf42shnrxzg7778dnmwhw"; }; - cargoSha256 = "1x0iwcp7dppxyrggmszd62s52j54szw69n3qnlyl7cdpdr64ckqc"; + cargoSha256 = "0cfi42wx93yc9yib9lpxl6ph991ra39yfhw1lr16z2qzzbzj2b1j"; nativeBuildInputs = [ pkgconfig diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 3b209d5c068..ff4d6f01493 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "vault"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "17zymmm1r4yxwazn2qx2l01i7g91rn40h7hzgwf0pr6pwmdxvkzg"; + sha256 = "1scwclkpb7v5pcx1afgjqrfgcp0c1bd9gqvwdmjbpfcyxv1f032d"; }; goPackagePath = "github.com/hashicorp/vault"; @@ -26,7 +26,7 @@ buildGoPackage rec { ''; meta = with stdenv.lib; { - homepage = https://www.vaultproject.io; + homepage = "https://www.vaultproject.io/"; description = "A tool for managing secrets"; platforms = platforms.linux ++ platforms.darwin; license = licenses.mpl20; diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index 517d0afb95f..9118fc55ea9 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -8,21 +8,14 @@ let plugins = callPackage ./plugins.nix args; in stdenv.mkDerivation rec { - version = "5.8.1"; + version = "5.10.0"; pname = "collectd"; src = fetchurl { url = "https://collectd.org/files/${pname}-${version}.tar.bz2"; - sha256 = "1njk8hh56gb755xafsh7ahmqr9k2d4lam4ddj7s7fqz0gjigv5p7"; + sha256 = "0nrpq09q6vbbv0hjc1vfa36z8j5802500hy75m678gh2cgsmjcx0"; }; - patches = [ - (fetchpatch { - url = "https://github.com/rpv-tomsk/collectd/commit/d5a3c020d33cc33ee8049f54c7b4dffcd123bf83.patch"; - sha256 = "1n65zw4d2k2bxapayaaw51ym7hy72a0cwi2abd8jgxcw3d0m5g15"; - }) - ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ libtool @@ -50,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Daemon which collects system performance statistics periodically"; - homepage = https://collectd.org; + homepage = "https://collectd.org"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ bjornfor fpletz ]; diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/tools/system/collectd/plugins.nix index f1a87847a5c..defeed4c892 100644 --- a/pkgs/tools/system/collectd/plugins.nix +++ b/pkgs/tools/system/collectd/plugins.nix @@ -25,6 +25,7 @@ , mongoc , mosquitto , net-snmp +, perl , postgresql , protobufc , python @@ -205,7 +206,9 @@ let ovs_stats = { buildInputs = [ yajl ]; }; - perl = {}; + perl = { + buildInputs = [ perl ]; + }; pf = {}; pinba = { buildInputs = [ protobufc ]; diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix index c2d3b33c749..8efcf22312f 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/facter/default.nix b/pkgs/tools/system/facter/default.nix index acc3990378f..89c79be2ce3 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "facter"; - version = "3.14.7"; + version = "3.14.8"; src = fetchFromGitHub { - sha256 = "1x71ynnp8l5bf6m1a56rwcjya2swrhpxmd0cg9ndjplam6zys2v7"; + sha256 = "1rq28sg1yqyx2xpbhb8hj18ar5pva2rwz7v3ylg8kq112cnlngyh"; rev = version; repo = pname; owner = "puppetlabs"; diff --git a/pkgs/tools/system/java-service-wrapper/default.nix b/pkgs/tools/system/java-service-wrapper/default.nix index 512bb7341ca..758942c0549 100644 --- a/pkgs/tools/system/java-service-wrapper/default.nix +++ b/pkgs/tools/system/java-service-wrapper/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "java-service-wrapper"; - version = "3.5.42"; + version = "3.5.43"; src = fetchurl { url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz"; - sha256 = "1gi4zc7fhqm7rb1ajpnxx0n7ngpa06ja46mb5p65h025mz567ywd"; + sha256 = "19cx3854rk7b2056z8pvxnf4simsg5js7czsy2bys7jl6vh2x02b"; }; buildInputs = [ jdk ]; diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix index 9fd6c4ea81a..3e357d37d83 100644 --- a/pkgs/tools/system/logrotate/default.nix +++ b/pkgs/tools/system/logrotate/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "logrotate"; - version = "3.15.1"; + version = "3.16.0"; src = fetchFromGitHub { owner = "logrotate"; repo = "logrotate"; rev = version; - sha256 = "0l92zarygp34qnw3p5rcwqsvgz7zmmhi7lgh00vj2jb9zkjbldc0"; + sha256 = "0dsz9cfh9glicrnh1rc3jrc176mimnasslihqnj0aknkv8ajq1jh"; }; # Logrotate wants to access the 'mail' program; to be done. @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ popt ]; meta = { - homepage = https://fedorahosted.org/releases/l/o/logrotate/; + homepage = "https://fedorahosted.org/releases/l/o/logrotate/"; description = "Rotates and compresses system logs"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.viric ]; diff --git a/pkgs/tools/system/r10k/Gemfile.lock b/pkgs/tools/system/r10k/Gemfile.lock index f399068b56e..3ff9b646215 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 b918fe788b5..d0e955d4cea 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 67145bc3cc5..45e3287511a 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 8066f07afa9..ed104f3a9ba 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/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix index 6f7b4d487ef..83d0bdd92c7 100644 --- a/pkgs/tools/text/ocrmypdf/default.nix +++ b/pkgs/tools/text/ocrmypdf/default.nix @@ -29,14 +29,14 @@ let in buildPythonApplication rec { pname = "ocrmypdf"; - version = "9.6.0"; + version = "9.6.1"; disabled = ! python3Packages.isPy3k; src = fetchFromGitHub { owner = "jbarlow83"; repo = "OCRmyPDF"; rev = "v${version}"; - sha256 = "1cpj8fj1mzp6mbd1z9dj38fmlcg5q2gbya4vbag1ddd4vp7rvn2m"; + sha256 = "0lbld11r8zds79183hh5y2f5fi7cacl7bx9f7f2g58j38y1c65vj"; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix index 1090ad300f7..cbd4fa569d1 100644 --- a/pkgs/tools/typesetting/pdf2djvu/default.nix +++ b/pkgs/tools/typesetting/pdf2djvu/default.nix @@ -1,42 +1,60 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }: +{ stdenv +, lib +, fetchFromGitHub +, autoreconfHook +, gettext +, libtool +, pkgconfig +, djvulibre +, exiv2 +, fontconfig +, graphicsmagick +, libjpeg +, libuuid +, poppler +}: stdenv.mkDerivation rec { - version = "0.9.14"; + version = "0.9.17"; pname = "pdf2djvu"; - src = fetchurl { - url = "https://github.com/jwilk/pdf2djvu/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "05z2bbg54pfsi668fwcjrcr5iz9llf9gprzdsrn6fw5wjv4876zi"; + src = fetchFromGitHub { + owner = "jwilk"; + repo = "pdf2djvu"; + rev = version; + sha256 = "1iff5ha5ls9hni9ivj05r1vzbnjrb326ivjb8d05q2sfng3gfp3z"; }; - patches = [ - # fix build with Poppler 0.83 - (fetchpatch { - url = "https://github.com/jwilk/pdf2djvu/commit/0aa17bb79dbcdfc249e4841f5b5398e27cfdfd41.patch"; - sha256 = "0mr14nz5w7z4ri2556bxkf3cnn2f7dhwsld7csrh6z5qqb7d5805"; - }) - (fetchpatch { - url = "https://github.com/jwilk/pdf2djvu/commit/27b9e028091a2f370367e9eaf37b4bb1cde87b62.patch"; - sha256 = "03apsg1487jl800q8j70hicvg6xsndd593bg7babm4vgivkxb0da"; - }) + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ + djvulibre + exiv2 + fontconfig + graphicsmagick + libjpeg + libuuid + poppler ]; - nativeBuildInputs = [ pkgconfig ]; + postPatch = '' + substituteInPlace private/autogen \ + --replace /usr/share/gettext ${gettext}/share/gettext \ + --replace /usr/share/libtool ${libtool}/share/libtool - buildInputs = [ djvulibre poppler fontconfig libjpeg ]; + substituteInPlace configure.ac \ + --replace '$djvulibre_bin_path' ${djvulibre.bin}/bin + ''; - preConfigure = '' - sed -i 's#\$djvulibre_bin_path#${djvulibre.bin}/bin#g' configure - - # Configure skips the failing check for usability of windres when it is nonempty. - unset WINDRES + preAutoreconf = '' + private/autogen ''; enableParallelBuilding = true; meta = with stdenv.lib; { description = "Creates djvu files from PDF files"; - homepage = https://jwilk.net/software/pdf2djvu; + homepage = "https://jwilk.net/software/pdf2djvu"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; inherit version; diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix index 099a02e8f65..8a5e6c9eb40 100644 --- a/pkgs/tools/video/rav1e/default.nix +++ b/pkgs/tools/video/rav1e/default.nix @@ -25,10 +25,7 @@ rustPlatform.buildRustPackage rec { ''; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0jxc8qsp5fasnh5cbg6yl9d878n7dppay9gzjndlb65kj9j43h84"; + cargoSha256 = "0n6gkn4iyqk4bijrvcpq884hiihl4mpw1p417w1m0dw7j4y4karn"; nativeBuildInputs = [ nasm ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3a504f20d94..19bf75f20a0 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -385,6 +385,8 @@ mapAliases ({ ruby_2_5_0 = throw "deprecated 2018-0213: use a newer version of ruby"; rubyPackages_2_4 = throw "deprecated 2019-12: use a newer version of rubyPackages instead"; rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby"; + rust_1_38_0 = rust_1_38; # added 2020-03-13 + rust_1_42_0 = rust_1_42; # added 2020-03-13 rxvt_unicode-with-plugins = rxvt-unicode; # added 2020-02-02 rxvt_unicode = rxvt-unicode-unwrapped; # added 2020-02-02 urxvt_autocomplete_all_the_things = rxvt-unicode-plugins.autocomplete-all-the-things; # added 2020-02-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5574d0cc76a..471016e6765 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 {}; @@ -933,6 +939,8 @@ in glasgow = with python3Packages; toPythonApplication glasgow; + gomatrix = callPackage ../applications/misc/gomatrix { }; + gucci = callPackage ../tools/text/gucci { }; grc = callPackage ../tools/misc/grc { }; @@ -1284,6 +1292,8 @@ in bruteforce-luks = callPackage ../tools/security/bruteforce-luks { }; + brutespray = callPackage ../tools/security/brutespray { }; + breakpointHook = assert stdenv.isLinux; makeSetupHook { } ../build-support/setup-hooks/breakpoint-hook.sh; @@ -1291,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; }; @@ -1336,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 ]; @@ -1457,6 +1463,8 @@ in clingo = callPackage ../applications/science/logic/potassco/clingo.nix { }; + clingcon = callPackage ../applications/science/logic/potassco/clingcon.nix { }; + clprover = callPackage ../applications/science/logic/clprover/clprover.nix { }; coloredlogs = with python3Packages; toPythonApplication coloredlogs; @@ -1904,6 +1912,8 @@ in jellyfin = callPackage ../servers/jellyfin { ffmpeg = ffmpeg_4; }; + jellyfin-mpv-shim = python3Packages.callPackage ../applications/video/jellyfin-mpv-shim { }; + jotta-cli = callPackage ../applications/misc/jotta-cli { }; jwt-cli = callPackage ../tools/security/jwt-cli { @@ -1964,6 +1974,8 @@ in massren = callPackage ../tools/misc/massren { }; + medusa = callPackage ../tools/security/medusa { }; + megasync = libsForQt5.callPackage ../applications/misc/megasync { }; megacmd = callPackage ../applications/misc/megacmd { }; @@ -2683,7 +2695,8 @@ in cudatoolkit_9_2 cudatoolkit_10 cudatoolkit_10_0 - cudatoolkit_10_1; + cudatoolkit_10_1 + cudatoolkit_10_2; cudatoolkit = cudatoolkit_10; @@ -2699,7 +2712,8 @@ in cudnn_cudatoolkit_9_2 cudnn_cudatoolkit_10 cudnn_cudatoolkit_10_0 - cudnn_cudatoolkit_10_1; + cudnn_cudatoolkit_10_1 + cudnn_cudatoolkit_10_2; cudnn = cudnn_cudatoolkit_10; @@ -3068,6 +3082,8 @@ in zeek = callPackage ../applications/networking/ids/zeek { }; + zoxide = callPackage ../tools/misc/zoxide { }; + zzuf = callPackage ../tools/security/zzuf { }; ### DEVELOPMENT / EMSCRIPTEN @@ -3078,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 { }; @@ -3489,6 +3505,8 @@ in fuse-overlayfs = callPackage ../tools/filesystems/fuse-overlayfs {}; + fusee-interfacee-tk = callPackage ../applications/misc/fusee-interfacee-tk { }; + fusee-launcher = callPackage ../development/tools/fusee-launcher { }; fwknop = callPackage ../tools/security/fwknop { }; @@ -4535,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 { }; @@ -4804,6 +4823,8 @@ in libgumath = callPackage ../development/libraries/libgumath { }; + libinsane = callPackage ../development/libraries/libinsane { }; + libipfix = callPackage ../development/libraries/libipfix { }; libircclient = callPackage ../development/libraries/libircclient { }; @@ -8002,6 +8023,8 @@ in }; fasm-bin = callPackage ../development/compilers/fasm/bin.nix { }; + flyctl = callPackage ../development/web/flyctl { }; + fpc = callPackage ../development/compilers/fpc { }; gambit = callPackage ../development/compilers/gambit { stdenv = gccStdenv; }; @@ -8288,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; @@ -8341,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 {}); @@ -8807,17 +8832,17 @@ in inherit (darwin) apple_sdk; }; - rust_1_41_0 = callPackage ../development/compilers/rust/1_41_0.nix { + rust_1_42 = callPackage ../development/compilers/rust/1_42.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; - rust_1_38_0 = callPackage ../development/compilers/rust/1_38_0.nix { + rust_1_38 = callPackage ../development/compilers/rust/1_38.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; - rust = rust_1_41_0; + rust = rust_1_42; - rustPackages_1_41_0 = rust_1_41_0.packages.stable; - rustPackages_1_38_0 = rust_1_38_0.packages.stable; - rustPackages = rustPackages_1_41_0; + rustPackages_1_42 = rust_1_42.packages.stable; + rustPackages_1_38 = rust_1_38.packages.stable; + rustPackages = rustPackages_1_42; inherit (rustPackages) cargo clippy rustc rustPlatform; inherit (rust) makeRustPlatform; @@ -8894,14 +8919,13 @@ in }; maturin = callPackage ../development/tools/rust/maturin { }; - rainicorn = callPackage ../development/tools/rust/rainicorn { }; inherit (rustPackages) rls; rustfmt = rustPackages.rustfmt; rustracer = callPackage ../development/tools/rust/racer { inherit (darwin.apple_sdk.frameworks) Security; }; rustracerd = callPackage ../development/tools/rust/racerd { - inherit (rustPackages_1_38_0) rustPlatform; + inherit (rustPackages_1_38) rustPlatform; inherit (darwin.apple_sdk.frameworks) Security; }; rust-bindgen = callPackage ../development/tools/rust/bindgen { }; @@ -8915,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 { }; @@ -9277,8 +9301,8 @@ in pachyderm = callPackage ../applications/networking/cluster/pachyderm { }; - php = php73; - phpPackages = php73Packages; + php = php74; + phpPackages = php74Packages; php72Packages = recurseIntoAttrs (callPackage ./php-packages.nix { php = php72; @@ -9292,7 +9316,7 @@ in php = php74; }); - phpPackages-unit = php72Packages-unit; + phpPackages-unit = php74Packages-unit; php72Packages-unit = recurseIntoAttrs (callPackage ./php-packages.nix { php = php72-unit; @@ -9313,7 +9337,7 @@ in php73 php72; - php-embed = php73-embed; + php-embed = php74-embed; php72-embed = php72.override { config.php.embed = true; @@ -9330,7 +9354,7 @@ in config.php.apxs2 = false; }; - php-unit = php73-unit; + php-unit = php74-unit; php72-unit = php72.override { config.php.embed = true; @@ -10144,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; }; @@ -10355,6 +10380,8 @@ in kubicorn = callPackage ../development/tools/kubicorn { }; + kubie = callPackage ../development/tools/kubie { }; + kustomize = callPackage ../development/tools/kustomize { }; ktlint = callPackage ../development/tools/ktlint { }; @@ -10646,7 +10673,7 @@ in shards = callPackage ../development/tools/build-managers/shards { }; - shellcheck = haskell.lib.justStaticExecutables haskellPackages.ShellCheck; + shellcheck = callPackage ../development/tools/shellcheck {}; schemaspy = callPackage ../development/tools/database/schemaspy { }; @@ -10706,7 +10733,7 @@ in sqlite-web = callPackage ../development/tools/database/sqlite-web { }; - sqlmap = python3Packages.sqlmap; + sqlmap = with python3Packages; toPythonApplication sqlmap; sselp = callPackage ../tools/X11/sselp{ }; @@ -10802,6 +10829,7 @@ in gdb = callPackage ../development/tools/misc/gdb { guile = null; + readline = readline80; }; jhiccup = callPackage ../development/tools/java/jhiccup { }; @@ -11034,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 { }; @@ -12754,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 { }; @@ -12878,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 { }; @@ -14553,6 +14574,8 @@ in tidyp = callPackage ../development/libraries/tidyp { }; + tinycdb = callPackage ../development/libraries/tinycdb { }; + tinyxml = tinyxml2; tinyxml2 = callPackage ../development/libraries/tinyxml/2.6.2.nix { }; @@ -14881,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 { }; @@ -14929,6 +14954,8 @@ in zita-resampler = callPackage ../development/libraries/audio/zita-resampler { }; + zz = callPackage ../development/compilers/zz { }; + zziplib = callPackage ../development/libraries/zziplib { }; gsignond = callPackage ../development/libraries/gsignond { @@ -15409,6 +15436,8 @@ in theme-spring = callPackage ../servers/icingaweb2/theme-spring { }; }; + imgproxy = callPackage ../servers/imgproxy { }; + ircdHybrid = callPackage ../servers/irc/ircd-hybrid { }; jboss = callPackage ../servers/http/jboss { }; @@ -15797,6 +15826,7 @@ in prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { }; prometheus-mail-exporter = callPackage ../servers/monitoring/prometheus/mail-exporter.nix { }; prometheus-mesos-exporter = callPackage ../servers/monitoring/prometheus/mesos-exporter.nix { }; + prometheus-mikrotik-exporter = callPackage ../servers/monitoring/prometheus/mikrotik-exporter.nix { }; prometheus-minio-exporter = callPackage ../servers/monitoring/prometheus/minio-exporter { }; prometheus-mysqld-exporter = callPackage ../servers/monitoring/prometheus/mysqld-exporter.nix { }; prometheus-nextcloud-exporter = callPackage ../servers/monitoring/prometheus/nextcloud-exporter.nix { }; @@ -16685,6 +16715,8 @@ in ply = callPackage ../os-specific/linux/ply { }; + r8125 = callPackage ../os-specific/linux/r8125 { }; + r8168 = callPackage ../os-specific/linux/r8168 { }; rtl8192eu = callPackage ../os-specific/linux/rtl8192eu { }; @@ -16828,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; @@ -18411,8 +18442,6 @@ in glew = glew110; }; - bitcoinarmory = callPackage ../applications/misc/bitcoinarmory { pythonPackages = python2Packages; }; - bitkeeper = callPackage ../applications/version-management/bitkeeper { gperf = gperf_3_0; }; @@ -18597,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 { }; @@ -21373,6 +21405,8 @@ in ries = callPackage ../applications/science/math/ries { }; + ripcord = qt5.callPackage ../applications/networking/instant-messengers/ripcord { }; + ripser = callPackage ../applications/science/math/ripser { }; rkt = callPackage ../applications/virtualization/rkt { }; @@ -21590,6 +21624,10 @@ in lightdm-mini-greeter = callPackage ../applications/display-managers/lightdm-mini-greeter { }; + lightdm-tiny-greeter = callPackage ../applications/display-managers/lightdm-tiny-greeter { + conf = config.lightdm-tiny-greeter.conf or ""; + }; + ly = callPackage ../applications/display-managers/ly { }; slic3r = callPackage ../applications/misc/slic3r { }; @@ -21687,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 { }; @@ -21872,7 +21910,7 @@ in thunderbird = callPackage ../applications/networking/mailreaders/thunderbird { inherit (gnome2) libIDL; - inherit (rustPackages_1_38_0) cargo rustc; + inherit (rustPackages_1_38) cargo rustc; libpng = libpng_apng; gtk3Support = true; }; @@ -22010,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 { }; @@ -23851,6 +23892,7 @@ in mpris-indicator-button = callPackage ../desktops/gnome-3/extensions/mpris-indicator-button { }; night-theme-switcher = callPackage ../desktops/gnome-3/extensions/night-theme-switcher { }; no-title-bar = callPackage ../desktops/gnome-3/extensions/no-title-bar { }; + paperwm = callPackage ../desktops/gnome-3/extensions/paperwm { }; pidgin-im-integration = callPackage ../desktops/gnome-3/extensions/pidgin-im-integration { }; remove-dropdown-arrows = callPackage ../desktops/gnome-3/extensions/remove-dropdown-arrows { }; sound-output-device-chooser = callPackage ../desktops/gnome-3/extensions/sound-output-device-chooser { }; @@ -24370,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 {}; @@ -24378,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; @@ -24726,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 { }; @@ -25108,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 { }; @@ -25490,6 +25534,8 @@ in rmount = callPackage ../tools/filesystems/rmount {}; + romdirfs = callPackage ../tools/filesystems/romdirfs {}; + rss-glx = callPackage ../misc/screensavers/rss-glx { }; run-scaled = callPackage ../tools/X11/run-scaled { }; @@ -25613,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 @@ -26142,4 +26191,8 @@ in quartus-prime-lite = callPackage ../applications/editors/quartus-prime {}; go-license-detector = callPackage ../development/tools/misc/go-license-detector { }; + + fluxboxlauncher = callPackage ../applications/misc/fluxboxlauncher {}; + + btcdeb = callPackage ../applications/blockchains/btcdeb {}; } diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 565410cc5f6..bc39a477a7a 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -31,13 +31,14 @@ let flocq = callPackage ../development/coq-modules/flocq {}; gappalib = callPackage ../development/coq-modules/gappalib {}; heq = callPackage ../development/coq-modules/heq {}; + hierarchy-builder = callPackage ../development/coq-modules/hierarchy-builder {}; HoTT = callPackage ../development/coq-modules/HoTT {}; interval = callPackage ../development/coq-modules/interval {}; InfSeqExt = callPackage ../development/coq-modules/InfSeqExt {}; iris = callPackage ../development/coq-modules/iris {}; ltac2 = callPackage ../development/coq-modules/ltac2 {}; math-classes = callPackage ../development/coq-modules/math-classes { }; - inherit (callPackage ../development/coq-modules/mathcomp { }) + inherit (callPackage ../development/coq-modules/mathcomp {}) mathcompGen mathcompGenSingle ssreflect mathcompCorePkgs mathcomp diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 15bd1d61677..e8a6bc21035 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -413,7 +413,9 @@ let js_of_ocaml-ppx = callPackage ../development/tools/ocaml/js_of_ocaml/ppx.nix {}; - js_of_ocaml-ppx_deriving_json = callPackage ../development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix {}; + js_of_ocaml-ppx_deriving_json = callPackage ../development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix { + ppxlib = ppxlib.override { version = "0.12.0"; }; + }; js_of_ocaml-tyxml = callPackage ../development/tools/ocaml/js_of_ocaml/tyxml.nix {}; @@ -1196,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; @@ -1231,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/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 316be153152..1a4fd0da81a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -878,6 +878,39 @@ let }; }; + AuthenSASLSASLprep = buildPerlModule { + pname = "Authen-SASL-SASLprep"; + version = "1.100"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CF/CFAERBER/Authen-SASL-SASLprep-1.100.tar.gz"; + sha256 = "a4cccc34bb3f53acf0ba78c9fc61af8d156d109d1c10487ba5988a55077d1f70"; + }; + buildInputs = [ TestNoWarnings ]; + propagatedBuildInputs = [ UnicodeStringprep ]; + meta = { + description = "A Stringprep Profile for User Names and Passwords (RFC 4013)"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + + AuthenSCRAM = buildPerlPackage { + pname = "Authen-SCRAM"; + version = "0.011"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Authen-SCRAM-0.011.tar.gz"; + sha256 = "45108c239a7373d00941dcf0d171acd03e7c16a63ce6f7d9568ff052b17cf5a8"; + }; + buildInputs = [ TestFailWarnings TestFatal ]; + propagatedBuildInputs = [ AuthenSASLSASLprep CryptURandom Moo PBKDF2Tiny TryTiny TypeTiny namespaceclean ]; + meta = { + homepage = "https://github.com/dagolden/Authen-SCRAM"; + description = "Salted Challenge Response Authentication Mechanism (RFC 5802)"; + license = stdenv.lib.licenses.asl20; + maintainers = [ maintainers.sgo ]; + }; + }; + AuthenSimple = buildPerlPackage { pname = "Authen-Simple"; version = "0.5"; @@ -3634,6 +3667,20 @@ let }; }; + CryptURandom = buildPerlPackage { + pname = "Crypt-URandom"; + version = "0.36"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DD/DDICK/Crypt-URandom-0.36.tar.gz"; + sha256 = "81fec9921adc5d3c91cbe0ad8cb2bb89b045c4fb0de9cb3c43f17e58e477f8a1"; + }; + meta = { + description = "Provide non blocking randomness"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + CryptScryptKDF = buildPerlModule { pname = "Crypt-ScryptKDF"; version = "0.010"; @@ -14555,6 +14602,21 @@ let }; }; + PBKDF2Tiny = buildPerlPackage { + pname = "PBKDF2-Tiny"; + version = "0.005"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/PBKDF2-Tiny-0.005.tar.gz"; + sha256 = "b4e21dc59b30265eaaa41b705087ec03447d9c655a14ac40ff46e4de29eabf8e"; + }; + meta = { + homepage = "https://github.com/dagolden/PBKDF2-Tiny"; + description = "Minimalist PBKDF2 (RFC 2898) with HMAC-SHA1 or HMAC-SHA2"; + license = stdenv.lib.licenses.asl20; + maintainers = [ maintainers.sgo ]; + }; + }; + pcscperl = buildPerlPackage { pname = "pcsc-perl"; version = "1.4.14"; @@ -19159,7 +19221,7 @@ let install_name_tool -change "$oldPath" "$newPath" "$out/bin/biblex" install_name_tool -change "$oldPath" "$newPath" "$out/bin/bibparse" install_name_tool -change "$oldPath" "$newPath" "$out/bin/dumpnames" - install_name_tool -change "$oldPath" "$newPath" "$out/${perl.libPrefix}/${perl.version}/darwin-2level/auto/Text/BibTeX/BibTeX.bundle" + install_name_tool -change "$oldPath" "$newPath" "$out/${perl.libPrefix}/${perl.version}/darwin"*"-2level/auto/Text/BibTeX/BibTeX.bundle" ''; meta = { description = "Interface to read and parse BibTeX files"; @@ -20243,6 +20305,21 @@ let }; }; + UnicodeStringprep = buildPerlModule { + pname = "Unicode-Stringprep"; + version = "1.105"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CF/CFAERBER/Unicode-Stringprep-1.105.tar.gz"; + sha256 = "e6bebbc58408231fd1317db9102449b3e7da4fa437e79f637382d36313efd011"; + }; + buildInputs = [ TestNoWarnings ]; + meta = { + description = "Preparation of Internationalized Strings (RFC 3454)"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + UnixGetrusage = buildPerlPackage { pname = "Unix-Getrusage"; version = "0.03"; @@ -21056,6 +21133,10 @@ let url = mirror://cpan/authors/id/M/MI/MIROD/XML-Twig-3.52.tar.gz; sha256 = "1bc0hrz4jp6199hi29sdxmb9gyy45whla9hd19yqfasgq8k5ixzy"; }; + postInstall = '' + mkdir -p $out/bin + cp tools/xml_grep/xml_grep $out/bin + ''; propagatedBuildInputs = [ XMLParser ]; doCheck = false; # requires lots of extra packages }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 50bf1ae5dbf..5ef8e722620 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -664,6 +664,8 @@ let doCheck = true; checkTarget = "test"; + + zendExtension = true; }; yaml = buildPecl { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 29fbf3cd8a1..7f9f28b4539 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -108,7 +108,7 @@ in { inherit buildSetupcfg; inherit (callPackage ../development/interpreters/python/hooks { }) - eggUnpackHook eggBuildHook eggInstallHook flitBuildHook pipBuildHook pipInstallHook pytestCheckHook pythonCatchConflictsHook pythonImportsCheckHook pythonRemoveBinBytecodeHook setuptoolsBuildHook setuptoolsCheckHook venvShellHook wheelUnpackHook; + eggUnpackHook eggBuildHook eggInstallHook flitBuildHook pipBuildHook pipInstallHook pytestCheckHook pythonCatchConflictsHook pythonImportsCheckHook pythonRemoveBinBytecodeHook pythonRemoveTestsDirHook setuptoolsBuildHook setuptoolsCheckHook venvShellHook wheelUnpackHook; # helpers @@ -121,7 +121,10 @@ in { recursivePthLoader = callPackage ../development/python-modules/recursive-pth-loader { }; - setuptools = callPackage ../development/python-modules/setuptools { }; + setuptools = if isPy27 then + callPackage ../development/python-modules/setuptools/44.0.nix { } + else + callPackage ../development/python-modules/setuptools { }; vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit { }; @@ -508,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 { }; @@ -522,6 +527,8 @@ in { bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27 + bugsnag = callPackage ../development/python-modules/bugsnag { }; + cachecontrol = callPackage ../development/python-modules/cachecontrol { }; cachelib = callPackage ../development/python-modules/cachelib { }; @@ -566,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 { }; @@ -799,12 +808,16 @@ in { inquirer = callPackage ../development/python-modules/inquirer { }; + ipympl = callPackage ../development/python-modules/ipympl { }; + itanium_demangler = callPackage ../development/python-modules/itanium_demangler { }; janus = callPackage ../development/python-modules/janus { }; jc = callPackage ../development/python-modules/jc { }; + jellyfin-apiclient-python = callPackage ../development/python-modules/jellyfin-apiclient-python { }; + jira = callPackage ../development/python-modules/jira { }; jsonpath = callPackage ../development/python-modules/jsonpath { }; @@ -1166,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 { }; @@ -1243,6 +1258,8 @@ in { pystache = callPackage ../development/python-modules/pystache { }; + pystray = callPackage ../development/python-modules/pystray { }; + pytelegrambotapi = callPackage ../development/python-modules/pyTelegramBotAPI { }; pytesseract = callPackage ../development/python-modules/pytesseract { }; @@ -1343,6 +1360,8 @@ in { pywebpush = callPackage ../development/python-modules/pywebpush { }; + pywebview = callPackage ../development/python-modules/pywebview { }; + pywick = callPackage ../development/python-modules/pywick { }; pyxml = disabledIf isPy3k (callPackage ../development/python-modules/pyxml{ }); @@ -5086,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 { }; @@ -5452,6 +5469,8 @@ in { Pyro4 = callPackage ../development/python-modules/pyro4 { }; + Pyro5 = callPackage ../development/python-modules/pyro5 { }; + rope = callPackage ../development/python-modules/rope { }; ropper = callPackage ../development/python-modules/ropper { };